Don't advertise the snapshot that the node was loaded from

snapshot_packager_service will remove this snapshot hash from gossip
when it starts

.gitbook.yaml

@@ -1,4 +1,4 @@
-root: ./book/src
+root: ./docs/src
 
 structure:
     readme: introduction.md

.gitignore

@@ -1,6 +1,6 @@
-/book/html/
+/docs/html/
-/book/src/tests.ok
+/docs/src/tests.ok
-/book/src/.gitbook/assets/*.svg
+/docs/src/.gitbook/assets/*.svg
 /farf/
 /solana-release/
 /solana-release.tar.bz2

CONTRIBUTING.md

@@ -45,7 +45,7 @@ $ git pull --rebase upstream master
 
 If there are no functional changes, PRs can be very large and that's no
 problem. If, however, your changes are making meaningful changes or additions,
-then about 1,000 lines of changes is about the most you should ask a Solana
+then about 1.0.2 lines of changes is about the most you should ask a Solana
 maintainer to review.
 
 ### Should I send small PRs as I develop large, new components?
@@ -224,21 +224,20 @@ Inventing new terms is allowed, but should only be done when the term is widely
 used and understood. Avoid introducing new 3-letter terms, which can be
 confused with 3-letter acronyms.
 
-[Terms currently in use](book/src/terminology.md)
+[Terms currently in use](docs/src/terminology.md)
 
 
 ## Design Proposals
 
-Solana's architecture is described by a book generated from markdown files in
+Solana's architecture is described by docs generated from markdown files in
-the `book/src/` directory, maintained by an *editor* (currently @garious). To
+the `docs/src/` directory, maintained by an *editor* (currently @garious). To
-add a design proposal, you'll need to at least propose a change the content
+add a design proposal, you'll need to include it in the
-under the [Accepted Design
+[Accepted Design Proposals](https://docs.solana.com/proposals)
-Proposals](https://docs.solana.com/book/v/master/proposals) chapter.  Here's
+section of the Solana docs.  Here's the full process:
-the full process:
 
 1. Propose a design by creating a PR that adds a markdown document to the
-   directory `book/src/` and references it from the [table of
+   `docs/src/proposals` directory and references it from the [table of
-   contents](book/src/SUMMARY.md). Add any relevant *maintainers* to the PR
+   contents](docs/src/SUMMARY.md). Add any relevant *maintainers* to the PR
    review.
 2. The PR being merged indicates your proposed change was accepted and that the
    maintainers support your plan of attack.

README.md

@@ -23,12 +23,12 @@ It's possible for a centralized database to process 710,000 transactions per sec
 
 Furthermore, and much to our surprise, it can be implemented using a mechanism that has existed in Bitcoin since day one. The Bitcoin feature is called nLocktime and it can be used to postdate transactions using block height instead of a timestamp. As a Bitcoin client, you'd use block height instead of a timestamp if you don't trust the network. Block height turns out to be an instance of what's being called a Verifiable Delay Function in cryptography circles. It's a cryptographically secure way to say time has passed. In Solana, we use a far more granular verifiable delay function, a SHA 256 hash chain, to checkpoint the ledger and coordinate consensus. With it, we implement Optimistic Concurrency Control and are now well en route towards that theoretical limit of 710,000 transactions per second.
 
-Architecture
+Documentation
 ===
 
-Before you jump into the code, review the online book [Solana: Blockchain Rebuilt for Scale](https://docs.solana.com/book/).
+Before you jump into the code, review the documentation [Solana: Blockchain Rebuilt for Scale](https://docs.solana.com).
 
-(The _latest_ development version of the online book is also [available here](https://docs.solana.com/book/v/master/).)
+(The _latest_ development version of the docs is [available here](https://docs.solana.com/v/master).)
 
 Release Binaries
 ===
@@ -121,7 +121,7 @@ $ cargo test
 Local Testnet
 ---
 
-Start your own testnet locally, instructions are in the book [Solana: Blockchain Rebuild for Scale: Getting Started](https://docs.solana.com/book/building-from-source).
+Start your own testnet locally, instructions are in the online docs [Solana: Blockchain Rebuild for Scale: Getting Started](https://docs.solana.com/building-from-source).
 
 Remote Testnets
 ---

RELEASE.md

@@ -138,7 +138,7 @@ There are three release channels that map to branches as follows:
 ### Update documentation
 TODO: Documentation update procedure is WIP as we move to gitbook
 
-Document the new recommended version by updating `book/src/running-archiver.md` and `book/src/validator-testnet.md` on the release (beta) branch to point at the `solana-install` for the upcoming release version.
+Document the new recommended version by updating `docs/src/running-archiver.md` and `docs/src/validator-testnet.md` on the release (beta) branch to point at the `solana-install` for the upcoming release version.
 
 ### Update software on devnet.solana.com
 

archiver-lib/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "solana-archiver-lib"
-version = "1.0.0"
+version = "1.0.2"
 description = "Solana Archiver Library"
 authors = ["Solana Maintainers <maintainers@solana.com>"]
 repository = "https://github.com/solana-labs/solana"
@@ -15,22 +15,22 @@ ed25519-dalek = "=1.0.0-pre.1"
 log = "0.4.8"
 rand = "0.6.5"
 rand_chacha = "0.1.1"
-solana-client = { path = "../client", version = "1.0.0" }
+solana-client = { path = "../client", version = "1.0.2" }
-solana-storage-program = { path = "../programs/storage", version = "1.0.0" }
+solana-storage-program = { path = "../programs/storage", version = "1.0.2" }
 thiserror = "1.0"
 serde = "1.0.104"
 serde_json = "1.0.46"
 serde_derive = "1.0.103"
-solana-net-utils = { path = "../net-utils", version = "1.0.0" }
+solana-net-utils = { path = "../net-utils", version = "1.0.2" }
-solana-chacha = { path = "../chacha", version = "1.0.0" }
+solana-chacha = { path = "../chacha", version = "1.0.2" }
-solana-chacha-sys = { path = "../chacha-sys", version = "1.0.0" }
+solana-chacha-sys = { path = "../chacha-sys", version = "1.0.2" }
-solana-ledger = { path = "../ledger", version = "1.0.0" }
+solana-ledger = { path = "../ledger", version = "1.0.2" }
-solana-logger = { path = "../logger", version = "1.0.0" }
+solana-logger = { path = "../logger", version = "1.0.2" }
-solana-perf = { path = "../perf", version = "1.0.0" }
+solana-perf = { path = "../perf", version = "1.0.2" }
-solana-sdk = { path = "../sdk", version = "1.0.0" }
+solana-sdk = { path = "../sdk", version = "1.0.2" }
-solana-core = { path = "../core", version = "1.0.0" }
+solana-core = { path = "../core", version = "1.0.2" }
-solana-archiver-utils = { path = "../archiver-utils", version = "1.0.0" }
+solana-archiver-utils = { path = "../archiver-utils", version = "1.0.2" }
-solana-metrics = { path = "../metrics", version = "1.0.0" }
+solana-metrics = { path = "../metrics", version = "1.0.2" }
 
 [dev-dependencies]
 hex = "0.4.0"

archiver-utils/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "solana-archiver-utils"
-version = "1.0.0"
+version = "1.0.2"
 description = "Solana Archiver Utils"
 authors = ["Solana Maintainers <maintainers@solana.com>"]
 repository = "https://github.com/solana-labs/solana"
@@ -11,12 +11,12 @@ edition = "2018"
 [dependencies]
 log = "0.4.8"
 rand = "0.6.5"
-solana-chacha = { path = "../chacha", version = "1.0.0" }
+solana-chacha = { path = "../chacha", version = "1.0.2" }
-solana-chacha-sys = { path = "../chacha-sys", version = "1.0.0" }
+solana-chacha-sys = { path = "../chacha-sys", version = "1.0.2" }
-solana-ledger = { path = "../ledger", version = "1.0.0" }
+solana-ledger = { path = "../ledger", version = "1.0.2" }
-solana-logger = { path = "../logger", version = "1.0.0" }
+solana-logger = { path = "../logger", version = "1.0.2" }
-solana-perf = { path = "../perf", version = "1.0.0" }
+solana-perf = { path = "../perf", version = "1.0.2" }
-solana-sdk = { path = "../sdk", version = "1.0.0" }
+solana-sdk = { path = "../sdk", version = "1.0.2" }
 
 [dev-dependencies]
 hex = "0.4.0"

archiver/Cargo.toml

@@ -2,7 +2,7 @@
 authors = ["Solana Maintainers <maintainers@solana.com>"]
 edition = "2018"
 name = "solana-archiver"
-version = "1.0.0"
+version = "1.0.2"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
@@ -10,11 +10,11 @@ homepage = "https://solana.com/"
 [dependencies]
 clap = "2.33.0"
 console = "0.9.2"
-solana-clap-utils = { path = "../clap-utils", version = "1.0.0" }
+solana-clap-utils = { path = "../clap-utils", version = "1.0.2" }
-solana-core = { path = "../core", version = "1.0.0" }
+solana-core = { path = "../core", version = "1.0.2" }
-solana-logger = { path = "../logger", version = "1.0.0" }
+solana-logger = { path = "../logger", version = "1.0.2" }
-solana-metrics = { path = "../metrics", version = "1.0.0" }
+solana-metrics = { path = "../metrics", version = "1.0.2" }
-solana-archiver-lib = { path = "../archiver-lib", version = "1.0.0" }
+solana-archiver-lib = { path = "../archiver-lib", version = "1.0.2" }
-solana-net-utils = { path = "../net-utils", version = "1.0.0" }
+solana-net-utils = { path = "../net-utils", version = "1.0.2" }
-solana-sdk = { path = "../sdk", version = "1.0.0" }
+solana-sdk = { path = "../sdk", version = "1.0.2" }
 

banking-bench/Cargo.toml

@@ -2,7 +2,7 @@
 authors = ["Solana Maintainers <maintainers@solana.com>"]
 edition = "2018"
 name = "solana-banking-bench"
-version = "1.0.0"
+version = "1.0.2"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
@@ -10,11 +10,11 @@ homepage = "https://solana.com/"
 [dependencies]
 log = "0.4.6"
 rayon = "1.2.0"
-solana-core = { path = "../core", version = "1.0.0" }
+solana-core = { path = "../core", version = "1.0.2" }
-solana-ledger = { path = "../ledger", version = "1.0.0" }
+solana-ledger = { path = "../ledger", version = "1.0.2" }
-solana-logger = { path = "../logger", version = "1.0.0" }
+solana-logger = { path = "../logger", version = "1.0.2" }
-solana-runtime = { path = "../runtime", version = "1.0.0" }
+solana-runtime = { path = "../runtime", version = "1.0.2" }
-solana-measure = { path = "../measure", version = "1.0.0" }
+solana-measure = { path = "../measure", version = "1.0.2" }
-solana-sdk = { path = "../sdk", version = "1.0.0" }
+solana-sdk = { path = "../sdk", version = "1.0.2" }
 rand = "0.6.5"
 crossbeam-channel = "0.3"

bench-exchange/Cargo.toml

@@ -2,7 +2,7 @@
 authors = ["Solana Maintainers <maintainers@solana.com>"]
 edition = "2018"
 name = "solana-bench-exchange"
-version = "1.0.0"
+version = "1.0.2"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
@@ -18,17 +18,17 @@ rand = "0.6.5"
 rayon = "1.2.0"
 serde_json = "1.0.46"
 serde_yaml = "0.8.11"
-solana-clap-utils = { path = "../clap-utils", version = "1.0.0" }
+solana-clap-utils = { path = "../clap-utils", version = "1.0.2" }
-solana-core = { path = "../core", version = "1.0.0" }
+solana-core = { path = "../core", version = "1.0.2" }
-solana-genesis = { path = "../genesis", version = "1.0.0" }
+solana-genesis = { path = "../genesis", version = "1.0.2" }
-solana-client = { path = "../client", version = "1.0.0" }
+solana-client = { path = "../client", version = "1.0.2" }
-solana-faucet = { path = "../faucet", version = "1.0.0" }
+solana-faucet = { path = "../faucet", version = "1.0.2" }
-solana-exchange-program = { path = "../programs/exchange", version = "1.0.0" }
+solana-exchange-program = { path = "../programs/exchange", version = "1.0.2" }
-solana-logger = { path = "../logger", version = "1.0.0" }
+solana-logger = { path = "../logger", version = "1.0.2" }
-solana-metrics = { path = "../metrics", version = "1.0.0" }
+solana-metrics = { path = "../metrics", version = "1.0.2" }
-solana-net-utils = { path = "../net-utils", version = "1.0.0" }
+solana-net-utils = { path = "../net-utils", version = "1.0.2" }
-solana-runtime = { path = "../runtime", version = "1.0.0" }
+solana-runtime = { path = "../runtime", version = "1.0.2" }
-solana-sdk = { path = "../sdk", version = "1.0.0" }
+solana-sdk = { path = "../sdk", version = "1.0.2" }
 
 [dev-dependencies]
-solana-local-cluster = { path = "../local-cluster", version = "1.0.0" }
+solana-local-cluster = { path = "../local-cluster", version = "1.0.2" }

bench-streamer/Cargo.toml

@@ -2,14 +2,14 @@
 authors = ["Solana Maintainers <maintainers@solana.com>"]
 edition = "2018"
 name = "solana-bench-streamer"
-version = "1.0.0"
+version = "1.0.2"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
 
 [dependencies]
 clap = "2.33.0"
-solana-clap-utils = { path = "../clap-utils", version = "1.0.0" }
+solana-clap-utils = { path = "../clap-utils", version = "1.0.2" }
-solana-core = { path = "../core", version = "1.0.0" }
+solana-core = { path = "../core", version = "1.0.2" }
-solana-logger = { path = "../logger", version = "1.0.0" }
+solana-logger = { path = "../logger", version = "1.0.2" }
-solana-net-utils = { path = "../net-utils", version = "1.0.0" }
+solana-net-utils = { path = "../net-utils", version = "1.0.2" }

bench-tps/Cargo.toml

@@ -2,7 +2,7 @@
 authors = ["Solana Maintainers <maintainers@solana.com>"]
 edition = "2018"
 name = "solana-bench-tps"
-version = "1.0.0"
+version = "1.0.2"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
@@ -14,24 +14,24 @@ log = "0.4.8"
 rayon = "1.2.0"
 serde_json = "1.0.46"
 serde_yaml = "0.8.11"
-solana-clap-utils = { path = "../clap-utils", version = "1.0.0" }
+solana-clap-utils = { path = "../clap-utils", version = "1.0.2" }
-solana-core = { path = "../core", version = "1.0.0" }
+solana-core = { path = "../core", version = "1.0.2" }
-solana-genesis = { path = "../genesis", version = "1.0.0" }
+solana-genesis = { path = "../genesis", version = "1.0.2" }
-solana-client = { path = "../client", version = "1.0.0" }
+solana-client = { path = "../client", version = "1.0.2" }
-solana-faucet = { path = "../faucet", version = "1.0.0" }
+solana-faucet = { path = "../faucet", version = "1.0.2" }
-solana-librapay = { path = "../programs/librapay", version = "1.0.0", optional = true }
+solana-librapay = { path = "../programs/librapay", version = "1.0.2", optional = true }
-solana-logger = { path = "../logger", version = "1.0.0" }
+solana-logger = { path = "../logger", version = "1.0.2" }
-solana-metrics = { path = "../metrics", version = "1.0.0" }
+solana-metrics = { path = "../metrics", version = "1.0.2" }
-solana-measure = { path = "../measure", version = "1.0.0" }
+solana-measure = { path = "../measure", version = "1.0.2" }
-solana-net-utils = { path = "../net-utils", version = "1.0.0" }
+solana-net-utils = { path = "../net-utils", version = "1.0.2" }
-solana-runtime = { path = "../runtime", version = "1.0.0" }
+solana-runtime = { path = "../runtime", version = "1.0.2" }
-solana-sdk = { path = "../sdk", version = "1.0.0" }
+solana-sdk = { path = "../sdk", version = "1.0.2" }
-solana-move-loader-program = { path = "../programs/move_loader", version = "1.0.0", optional = true }
+solana-move-loader-program = { path = "../programs/move_loader", version = "1.0.2", optional = true }
 
 [dev-dependencies]
 serial_test = "0.3.2"
 serial_test_derive = "0.4.0"
-solana-local-cluster = { path = "../local-cluster", version = "1.0.0" }
+solana-local-cluster = { path = "../local-cluster", version = "1.0.2" }
 
 [features]
 move = ["solana-librapay", "solana-move-loader-program"]

book/src/implemented-proposals/ed_overview/ed_validation_client_economics/ed_vce_replication_validation_transaction_fees.md

@@ -1,11 +0,0 @@
-# Replication-validation Transaction Fees
-
-**Subject to change.**
-
-As previously mentioned, validator-clients will also be responsible for validating PoReps submitted into the PoH stream by archiver-clients. In this case, validators are providing compute \(CPU/GPU\) and light storage resources to confirm that these replication proofs could only be generated by a client that is storing the referenced PoH leger block.
-
-While replication-clients are incentivized and rewarded through protocol-based rewards schedule \(see [Replication-client Economics](../ed_replication_client_economics/)\), validator-clients will be incentivized to include and validate PoReps in PoH through collection of transaction fees associated with the submitted PoReps and distribution of protocol rewards proportional to the validated PoReps. As will be described in detail in the Section 3.1, replication-client rewards are protocol-based and designed to reward based on a global data redundancy factor. I.e. the protocol will incentivize replication-client participation through rewards based on a target ledger redundancy \(e.g. 10x data redundancy\).
-
-The validation of PoReps by validation-clients is computationally more expensive than state-validation \(detail in the [Economic Sustainability](../ed_economic_sustainability.md) chapter\), thus the transaction fees are expected to be proportionally higher.
-
-There are various attack vectors available for colluding validation and replication clients, also described in detail below in [Economic Sustainability](../ed_economic_sustainability/README.md). To protect against various collusion attack vectors, for a given epoch, validator rewards are distributed across participating validation-clients in proportion to the number of validated PoReps in the epoch less the number of PoReps that mismatch the archivers challenge. The PoRep challenge game is described in [Ledger Replication](https://github.com/solana-labs/solana/blob/master/book/src/ledger-replication.md#the-porep-game). This design rewards validators proportional to the number of PoReps they process and validate, while providing negative pressure for validation-clients to submit lazy or malicious invalid votes on submitted PoReps \(note that it is computationally prohibitive to determine whether a validator-client has marked a valid PoRep as invalid\).

chacha-cuda/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "solana-chacha-cuda"
-version = "1.0.0"
+version = "1.0.2"
 description = "Solana Chacha Cuda APIs"
 authors = ["Solana Maintainers <maintainers@solana.com>"]
 repository = "https://github.com/solana-labs/solana"
@@ -10,12 +10,12 @@ edition = "2018"
 
 [dependencies]
 log = "0.4.8"
-solana-archiver-utils = { path = "../archiver-utils", version = "1.0.0" }
+solana-archiver-utils = { path = "../archiver-utils", version = "1.0.2" }
-solana-chacha = { path = "../chacha", version = "1.0.0" }
+solana-chacha = { path = "../chacha", version = "1.0.2" }
-solana-ledger = { path = "../ledger", version = "1.0.0" }
+solana-ledger = { path = "../ledger", version = "1.0.2" }
-solana-logger = { path = "../logger", version = "1.0.0" }
+solana-logger = { path = "../logger", version = "1.0.2" }
-solana-perf = { path = "../perf", version = "1.0.0" }
+solana-perf = { path = "../perf", version = "1.0.2" }
-solana-sdk = { path = "../sdk", version = "1.0.0" }
+solana-sdk = { path = "../sdk", version = "1.0.2" }
 
 [dev-dependencies]
 hex-literal = "0.2.1"

chacha-sys/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "solana-chacha-sys"
-version = "1.0.0"
+version = "1.0.2"
 description = "Solana chacha-sys"
 authors = ["Solana Maintainers <maintainers@solana.com>"]
 repository = "https://github.com/solana-labs/solana"

chacha/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "solana-chacha"
-version = "1.0.0"
+version = "1.0.2"
 description = "Solana Chacha APIs"
 authors = ["Solana Maintainers <maintainers@solana.com>"]
 repository = "https://github.com/solana-labs/solana"
@@ -12,11 +12,11 @@ edition = "2018"
 log = "0.4.8"
 rand = "0.6.5"
 rand_chacha = "0.1.1"
-solana-chacha-sys = { path = "../chacha-sys", version = "1.0.0" }
+solana-chacha-sys = { path = "../chacha-sys", version = "1.0.2" }
-solana-ledger = { path = "../ledger", version = "1.0.0" }
+solana-ledger = { path = "../ledger", version = "1.0.2" }
-solana-logger = { path = "../logger", version = "1.0.0" }
+solana-logger = { path = "../logger", version = "1.0.2" }
-solana-perf = { path = "../perf", version = "1.0.0" }
+solana-perf = { path = "../perf", version = "1.0.2" }
-solana-sdk = { path = "../sdk", version = "1.0.0" }
+solana-sdk = { path = "../sdk", version = "1.0.2" }
 
 [dev-dependencies]
 hex-literal = "0.2.1"

ci/affects-files.sh

@@ -9,7 +9,7 @@
 #     ./affects-files.sh ^snap/  -- anything under the snap/ subdirectory
 #     ./affects-files.sh snap/   -- also matches foo/snap/
 # Any pattern starting with the ! character will be negated:
-#     ./affects-files.sh !^book/  -- anything *not* under the book/ subdirectory
+#     ./affects-files.sh !^docs/  -- anything *not* under the docs/ subdirectory
 #
 set -e
 cd "$(dirname "$0")"/..

ci/buildkite-secondary.yml

@@ -6,7 +6,7 @@ steps:
     timeout_in_minutes: 60
     name: "publish docker"
   - command: "ci/publish-crate.sh"
-    timeout_in_minutes: 120
+    timeout_in_minutes: 240
     name: "publish crate"
     branches: "!master"
   - command: "ci/publish-bpf-sdk.sh"
@@ -15,6 +15,6 @@ steps:
   - command: "ci/publish-tarball.sh"
     timeout_in_minutes: 60
     name: "publish tarball"
-  - command: "ci/publish-book.sh"
+  - command: "ci/publish-docs.sh"
     timeout_in_minutes: 15
-    name: "publish book"
+    name: "publish docs"

ci/docker-rust-nightly/Dockerfile

@@ -1,4 +1,4 @@
-FROM solanalabs/rust:1.41.0
+FROM solanalabs/rust:1.41.1
 ARG date
 
 RUN set -x \

ci/docker-rust/Dockerfile

@@ -1,6 +1,6 @@
 # Note: when the rust version is changed also modify
 # ci/rust-version.sh to pick up the new image tag
-FROM rust:1.41.0
+FROM rust:1.41.1
 
 # Add Google Protocol Buffers for Libra's metrics library.
 ENV PROTOC_VERSION 3.8.0

ci/publish-docs.sh

@@ -11,10 +11,10 @@ if [[ -n $CI_BRANCH ]]; then
     set -x
     (
       . ci/rust-version.sh stable
-      ci/docker-run.sh "$rust_stable_docker_image" make -Cbook -B svg
+      ci/docker-run.sh "$rust_stable_docker_image" make -C docs -B svg
     )
     # make a local commit for the svgs
-    git add -A -f book/src/.gitbook/assets/.
+    git add -A -f docs/src/.gitbook/assets/.
     if ! git diff-index --quiet HEAD; then
       git config user.email maintainers@solana.com
       git config user.name "$me"

ci/rust-version.sh

@@ -16,13 +16,13 @@
 if [[ -n $RUST_STABLE_VERSION ]]; then
   stable_version="$RUST_STABLE_VERSION"
 else
-  stable_version=1.41.0
+  stable_version=1.41.1
 fi
 
 if [[ -n $RUST_NIGHTLY_VERSION ]]; then
   nightly_version="$RUST_NIGHTLY_VERSION"
 else
-  nightly_version=2020-02-06
+  nightly_version=2020-02-27
 fi
 
 

ci/test-checks.sh

@@ -25,7 +25,7 @@ _ cargo +"$rust_stable" audit --version
 _ cargo +"$rust_stable" audit --ignore RUSTSEC-2020-0002
 _ ci/nits.sh
 _ ci/order-crates-for-publishing.py
-_ book/build.sh
+_ docs/build.sh
 _ ci/check-ssh-keys.sh
 
 {

ci/test-stable.sh

@@ -13,12 +13,12 @@ annotate() {
 # Run the appropriate test based on entrypoint
 testName=$(basename "$0" .sh)
 
-# Skip if only the book has been modified
+# Skip if only the docs have been modified
 ci/affects-files.sh \
-  \!^book/ \
+  \!^docs/ \
 || {
   annotate --style info \
-    "Skipped $testName as only book files were modified"
+    "Skipped $testName as only docs/ files were modified"
   exit 0
 }
 

clap-utils/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "solana-clap-utils"
-version = "1.0.0"
+version = "1.0.2"
 description = "Solana utilities for the clap"
 authors = ["Solana Maintainers <maintainers@solana.com>"]
 repository = "https://github.com/solana-labs/solana"
@@ -11,8 +11,8 @@ edition = "2018"
 [dependencies]
 clap = "2.33.0"
 rpassword = "4.0"
-solana-remote-wallet = { path = "../remote-wallet", version = "1.0.0" }
+solana-remote-wallet = { path = "../remote-wallet", version = "1.0.2" }
-solana-sdk = { path = "../sdk", version = "1.0.0" }
+solana-sdk = { path = "../sdk", version = "1.0.2" }
 tiny-bip39 = "0.7.0"
 url = "2.1.0"
 chrono = "0.4"

clap-utils/src/input_parsers.rs

@@ -119,8 +119,8 @@ pub fn derivation_of(matches: &ArgMatches<'_>, name: &str) -> Option<DerivationP
     matches.value_of(name).map(|derivation_str| {
         let derivation_str = derivation_str.replace("'", "");
         let mut parts = derivation_str.split('/');
-        let account = parts.next().unwrap().parse::<u16>().unwrap();
+        let account = parts.next().map(|account| account.parse::<u32>().unwrap());
-        let change = parts.next().map(|change| change.parse::<u16>().unwrap());
+        let change = parts.next().map(|change| change.parse::<u32>().unwrap());
         DerivationPath { account, change }
     })
 }
@@ -308,7 +308,7 @@ mod tests {
         assert_eq!(
             derivation_of(&matches, "single"),
             Some(DerivationPath {
-                account: 2,
+                account: Some(2),
                 change: Some(3)
             })
         );
@@ -319,7 +319,7 @@ mod tests {
         assert_eq!(
             derivation_of(&matches, "single"),
             Some(DerivationPath {
-                account: 2,
+                account: Some(2),
                 change: None
             })
         );
@@ -330,7 +330,7 @@ mod tests {
         assert_eq!(
             derivation_of(&matches, "single"),
             Some(DerivationPath {
-                account: 2,
+                account: Some(2),
                 change: Some(3)
             })
         );

clap-utils/src/input_validators.rs

@@ -1,6 +1,7 @@
 use crate::keypair::{parse_keypair_path, KeypairUrl, ASK_KEYWORD};
 use chrono::DateTime;
 use solana_sdk::{
+    clock::Slot,
     hash::Hash,
     pubkey::Pubkey,
     signature::{read_keypair_file, Signature},
@@ -93,6 +94,12 @@ pub fn is_url(string: String) -> Result<(), String> {
     }
 }
 
+pub fn is_slot(slot: String) -> Result<(), String> {
+    slot.parse::<Slot>()
+        .map(|_| ())
+        .map_err(|e| format!("{:?}", e))
+}
+
 pub fn is_port(port: String) -> Result<(), String> {
     port.parse::<u16>()
         .map(|_| ())
@@ -142,7 +149,7 @@ pub fn is_derivation(value: String) -> Result<(), String> {
     let mut parts = value.split('/');
     let account = parts.next().unwrap();
     account
-        .parse::<u16>()
+        .parse::<u32>()
         .map_err(|e| {
             format!(
                 "Unable to parse derivation, provided: {}, err: {:?}",
@@ -151,7 +158,7 @@ pub fn is_derivation(value: String) -> Result<(), String> {
         })
         .and_then(|_| {
             if let Some(change) = parts.next() {
-                change.parse::<u16>().map_err(|e| {
+                change.parse::<u32>().map_err(|e| {
                     format!(
                         "Unable to parse derivation, provided: {}, err: {:?}",
                         change, e
@@ -172,11 +179,12 @@ mod tests {
     fn test_is_derivation() {
         assert_eq!(is_derivation("2".to_string()), Ok(()));
         assert_eq!(is_derivation("0".to_string()), Ok(()));
+        assert_eq!(is_derivation("65537".to_string()), Ok(()));
         assert_eq!(is_derivation("0/2".to_string()), Ok(()));
         assert_eq!(is_derivation("0'/2'".to_string()), Ok(()));
         assert!(is_derivation("a".to_string()).is_err());
-        assert!(is_derivation("65537".to_string()).is_err());
+        assert!(is_derivation("4294967296".to_string()).is_err());
         assert!(is_derivation("a/b".to_string()).is_err());
-        assert!(is_derivation("0/65537".to_string()).is_err());
+        assert!(is_derivation("0/4294967296".to_string()).is_err());
     }
 }

clap-utils/src/keypair.rs

@@ -39,7 +39,7 @@ pub fn parse_keypair_path(path: &str) -> KeypairUrl {
     } else if path == ASK_KEYWORD {
         KeypairUrl::Ask
     } else if path.starts_with("usb://") {
-        KeypairUrl::Usb(path.split_at(6).1.to_string())
+        KeypairUrl::Usb(path.to_string())
     } else if let Ok(pubkey) = Pubkey::from_str(path) {
         KeypairUrl::Pubkey(pubkey)
     } else {
@@ -86,6 +86,7 @@ pub fn signer_from_path(
                     path,
                     derivation_of(matches, "derivation_path"),
                     wallet_manager,
+                    matches.is_present("confirm_key"),
                 )?))
             } else {
                 Err(RemoteWalletError::NoDeviceFound.into())

cli-config/Cargo.toml

@@ -3,7 +3,7 @@ authors = ["Solana Maintainers <maintainers@solana.com>"]
 edition = "2018"
 name = "solana-cli-config"
 description = "Blockchain, Rebuilt for Scale"
-version = "1.0.0"
+version = "1.0.2"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"

cli-config/src/config.rs

@@ -18,13 +18,15 @@ lazy_static! {
 #[derive(Serialize, Deserialize, Default, Debug, PartialEq)]
 pub struct Config {
     pub url: String,
+    pub websocket_url: String,
     pub keypair_path: String,
 }
 
 impl Config {
-    pub fn new(url: &str, keypair_path: &str) -> Self {
+    pub fn new(url: &str, websocket_url: &str, keypair_path: &str) -> Self {
         Self {
             url: url.to_string(),
+            websocket_url: websocket_url.to_string(),
             keypair_path: keypair_path.to_string(),
         }
     }

cli/Cargo.toml

@@ -3,7 +3,7 @@ authors = ["Solana Maintainers <maintainers@solana.com>"]
 edition = "2018"
 name = "solana-cli"
 description = "Blockchain, Rebuilt for Scale"
-version = "1.0.0"
+version = "1.0.2"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
@@ -26,27 +26,27 @@ reqwest = { version = "0.10.1", default-features = false, features = ["blocking"
 serde = "1.0.104"
 serde_derive = "1.0.103"
 serde_json = "1.0.46"
-solana-budget-program = { path = "../programs/budget", version = "1.0.0" }
+solana-budget-program = { path = "../programs/budget", version = "1.0.2" }
-solana-clap-utils = { path = "../clap-utils", version = "1.0.0" }
+solana-clap-utils = { path = "../clap-utils", version = "1.0.2" }
-solana-cli-config = { path = "../cli-config", version = "1.0.0" }
+solana-cli-config = { path = "../cli-config", version = "1.0.2" }
-solana-client = { path = "../client", version = "1.0.0" }
+solana-client = { path = "../client", version = "1.0.2" }
-solana-config-program = { path = "../programs/config", version = "1.0.0" }
+solana-config-program = { path = "../programs/config", version = "1.0.2" }
-solana-faucet = { path = "../faucet", version = "1.0.0" }
+solana-faucet = { path = "../faucet", version = "1.0.2" }
-solana-logger = { path = "../logger", version = "1.0.0" }
+solana-logger = { path = "../logger", version = "1.0.2" }
-solana-net-utils = { path = "../net-utils", version = "1.0.0" }
+solana-net-utils = { path = "../net-utils", version = "1.0.2" }
-solana-remote-wallet = { path = "../remote-wallet", version = "1.0.0" }
+solana-remote-wallet = { path = "../remote-wallet", version = "1.0.2" }
-solana-runtime = { path = "../runtime", version = "1.0.0" }
+solana-runtime = { path = "../runtime", version = "1.0.2" }
-solana-sdk = { path = "../sdk", version = "1.0.0" }
+solana-sdk = { path = "../sdk", version = "1.0.2" }
-solana-stake-program = { path = "../programs/stake", version = "1.0.0" }
+solana-stake-program = { path = "../programs/stake", version = "1.0.2" }
-solana-storage-program = { path = "../programs/storage", version = "1.0.0" }
+solana-storage-program = { path = "../programs/storage", version = "1.0.2" }
-solana-vote-program = { path = "../programs/vote", version = "1.0.0" }
+solana-vote-program = { path = "../programs/vote", version = "1.0.2" }
-solana-vote-signer = { path = "../vote-signer", version = "1.0.0" }
+solana-vote-signer = { path = "../vote-signer", version = "1.0.2" }
 titlecase = "1.1.0"
 url = "2.1.1"
 
 [dev-dependencies]
-solana-core = { path = "../core", version = "1.0.0" }
+solana-core = { path = "../core", version = "1.0.2" }
-solana-budget-program = { path = "../programs/budget", version = "1.0.0" }
+solana-budget-program = { path = "../programs/budget", version = "1.0.2" }
 tempfile = "3.1.0"
 
 [[bin]]

cli/src/cli.rs

@@ -40,7 +40,10 @@ use solana_sdk::{
     system_instruction::{self, create_address_with_seed, SystemError, MAX_ADDRESS_SEED_LEN},
     transaction::{Transaction, TransactionError},
 };
-use solana_stake_program::stake_state::{Lockup, StakeAuthorize};
+use solana_stake_program::{
+    stake_instruction::LockupArgs,
+    stake_state::{Lockup, StakeAuthorize},
+};
 use solana_storage_program::storage_instruction::StorageAccountType;
 use solana_vote_program::vote_state::VoteAuthorize;
 use std::{
@@ -52,6 +55,7 @@ use std::{
     time::Duration,
     {error, fmt},
 };
+use url::Url;
 
 pub type CliSigners = Vec<Box<dyn Signer>>;
 pub type SignerIndex = usize;
@@ -185,9 +189,7 @@ pub enum CliCommand {
         commitment_config: CommitmentConfig,
     },
     LeaderSchedule,
-    LiveSlots {
+    LiveSlots,
-        url: String,
-    },
     Ping {
         lamports: u64,
         interval: Duration,
@@ -303,7 +305,7 @@ pub enum CliCommand {
     },
     StakeSetLockup {
         stake_account_pubkey: Pubkey,
-        lockup: Lockup,
+        lockup: LockupArgs,
         custodian: SignerIndex,
         sign_only: bool,
         blockhash_query: BlockhashQuery,
@@ -435,9 +437,16 @@ impl From<Box<dyn error::Error>> for CliError {
     }
 }
 
+pub enum SettingType {
+    Explicit,
+    Computed,
+    SystemDefault,
+}
+
 pub struct CliConfig<'a> {
     pub command: CliCommand,
     pub json_rpc_url: String,
+    pub websocket_url: String,
     pub signers: Vec<&'a dyn Signer>,
     pub keypair_path: String,
     pub derivation_path: Option<DerivationPath>,
@@ -446,16 +455,97 @@ pub struct CliConfig<'a> {
 }
 
 impl CliConfig<'_> {
-    pub fn default_keypair_path() -> String {
+    fn default_keypair_path() -> String {
         let mut keypair_path = dirs::home_dir().expect("home directory");
         keypair_path.extend(&[".config", "solana", "id.json"]);
         keypair_path.to_str().unwrap().to_string()
     }
 
-    pub fn default_json_rpc_url() -> String {
+    fn default_json_rpc_url() -> String {
         "http://127.0.0.1:8899".to_string()
     }
 
+    fn default_websocket_url() -> String {
+        Self::compute_ws_url(&Self::default_json_rpc_url())
+    }
+
+    fn compute_ws_url(rpc_url: &str) -> String {
+        let rpc_url: Option<Url> = rpc_url.parse().ok();
+        if rpc_url.is_none() {
+            return "".to_string();
+        }
+        let rpc_url = rpc_url.unwrap();
+        let is_secure = rpc_url.scheme().to_ascii_lowercase() == "https";
+        let mut ws_url = rpc_url.clone();
+        ws_url
+            .set_scheme(if is_secure { "wss" } else { "ws" })
+            .expect("unable to set scheme");
+        let ws_port = match rpc_url.port() {
+            Some(port) => port + 1,
+            None => {
+                if is_secure {
+                    8901
+                } else {
+                    8900
+                }
+            }
+        };
+        ws_url.set_port(Some(ws_port)).expect("unable to set port");
+        ws_url.to_string()
+    }
+
+    fn first_nonempty_setting(
+        settings: std::vec::Vec<(SettingType, String)>,
+    ) -> (SettingType, String) {
+        settings
+            .into_iter()
+            .find(|(_, value)| value != "")
+            .expect("no nonempty setting")
+    }
+
+    pub fn compute_websocket_url_setting(
+        websocket_cmd_url: &str,
+        websocket_cfg_url: &str,
+        json_rpc_cmd_url: &str,
+        json_rpc_cfg_url: &str,
+    ) -> (SettingType, String) {
+        Self::first_nonempty_setting(vec![
+            (SettingType::Explicit, websocket_cmd_url.to_string()),
+            (SettingType::Explicit, websocket_cfg_url.to_string()),
+            (
+                SettingType::Computed,
+                Self::compute_ws_url(json_rpc_cmd_url),
+            ),
+            (
+                SettingType::Computed,
+                Self::compute_ws_url(json_rpc_cfg_url),
+            ),
+            (SettingType::SystemDefault, Self::default_websocket_url()),
+        ])
+    }
+
+    pub fn compute_json_rpc_url_setting(
+        json_rpc_cmd_url: &str,
+        json_rpc_cfg_url: &str,
+    ) -> (SettingType, String) {
+        Self::first_nonempty_setting(vec![
+            (SettingType::Explicit, json_rpc_cmd_url.to_string()),
+            (SettingType::Explicit, json_rpc_cfg_url.to_string()),
+            (SettingType::SystemDefault, Self::default_json_rpc_url()),
+        ])
+    }
+
+    pub fn compute_keypair_path_setting(
+        keypair_cmd_path: &str,
+        keypair_cfg_path: &str,
+    ) -> (SettingType, String) {
+        Self::first_nonempty_setting(vec![
+            (SettingType::Explicit, keypair_cmd_path.to_string()),
+            (SettingType::Explicit, keypair_cfg_path.to_string()),
+            (SettingType::SystemDefault, Self::default_keypair_path()),
+        ])
+    }
+
     pub(crate) fn pubkey(&self) -> Result<Pubkey, SignerError> {
         if !self.signers.is_empty() {
             self.signers[0].try_pubkey()
@@ -475,6 +565,7 @@ impl Default for CliConfig<'_> {
                 use_lamports_unit: false,
             },
             json_rpc_url: Self::default_json_rpc_url(),
+            websocket_url: Self::default_websocket_url(),
             signers: Vec::new(),
             keypair_path: Self::default_keypair_path(),
             derivation_path: None,
@@ -514,7 +605,10 @@ pub fn parse_command(
             signers: vec![],
         }),
         ("ping", Some(matches)) => parse_cluster_ping(matches, default_signer_path, wallet_manager),
-        ("live-slots", Some(matches)) => parse_live_slots(matches),
+        ("live-slots", Some(_matches)) => Ok(CliCommandInfo {
+            command: CliCommand::LiveSlots,
+            signers: vec![],
+        }),
         ("block-production", Some(matches)) => parse_show_block_production(matches),
         ("gossip", Some(_matches)) => Ok(CliCommandInfo {
             command: CliCommand::ShowGossip,
@@ -620,7 +714,7 @@ pub fn parse_command(
         ),
         ("vote-account", Some(matches)) => parse_vote_get_account_command(matches),
         // Wallet Commands
-        ("address", Some(_matches)) => Ok(CliCommandInfo {
+        ("address", Some(matches)) => Ok(CliCommandInfo {
             command: CliCommand::Address,
             signers: vec![signer_from_path(
                 matches,
@@ -1474,7 +1568,7 @@ pub fn process_command(config: &CliConfig) -> ProcessResult {
             process_get_transaction_count(&rpc_client, commitment_config)
         }
         CliCommand::LeaderSchedule => process_leader_schedule(&rpc_client),
-        CliCommand::LiveSlots { url } => process_live_slots(&url),
+        CliCommand::LiveSlots => process_live_slots(&config.websocket_url),
         CliCommand::Ping {
             lamports,
             interval,
@@ -2064,7 +2158,16 @@ pub fn app<'ab, 'v>(name: &str, about: &'ab str, version: &'v str) -> App<'ab, '
         .about(about)
         .version(version)
         .setting(AppSettings::SubcommandRequiredElseHelp)
-        .subcommand(SubCommand::with_name("address").about("Get your public key"))
+        .subcommand(
+            SubCommand::with_name("address")
+                .about("Get your public key")
+                .arg(
+                    Arg::with_name("confirm_key")
+                        .long("confirm-key")
+                        .takes_value(false)
+                        .help("Confirm key on device; only relevant if using remote wallet"),
+                ),
+        )
         .cluster_query_subcommands()
         .nonce_subcommands()
         .stake_subcommands()

cli/src/cluster_query.rs

@@ -170,16 +170,7 @@ impl ClusterQuerySubCommands for App<'_, '_> {
         )
         .subcommand(
             SubCommand::with_name("live-slots")
-                .about("Show information about the current slot progression")
+                .about("Show information about the current slot progression"),
-                .arg(
-                    Arg::with_name("websocket_url")
-                        .short("w")
-                        .long("ws")
-                        .value_name("URL")
-                        .takes_value(true)
-                        .default_value("ws://127.0.0.1:8900")
-                        .help("WebSocket URL for PubSub RPC connection"),
-                ),
         )
         .subcommand(
             SubCommand::with_name("block-production")
@@ -279,14 +270,6 @@ pub fn parse_cluster_ping(
     })
 }
 
-pub fn parse_live_slots(matches: &ArgMatches<'_>) -> Result<CliCommandInfo, CliError> {
-    let url: String = value_t_or_exit!(matches, "websocket_url", String);
-    Ok(CliCommandInfo {
-        command: CliCommand::LiveSlots { url },
-        signers: vec![],
-    })
-}
-
 pub fn parse_get_block_time(matches: &ArgMatches<'_>) -> Result<CliCommandInfo, CliError> {
     let slot = value_t_or_exit!(matches, "slot", u64);
     Ok(CliCommandInfo {
@@ -855,11 +838,15 @@ pub fn process_ping(
 
 pub fn process_live_slots(url: &str) -> ProcessResult {
     let exit = Arc::new(AtomicBool::new(false));
-    let exit_clone = exit.clone();
 
+    // Disable Ctrl+C handler as sometimes the PubsubClient shutdown can stall.  Also it doesn't
+    // really matter that the shutdown is clean because the process is terminating.
+    /*
+    let exit_clone = exit.clone();
     ctrlc::set_handler(move || {
         exit_clone.store(true, Ordering::Relaxed);
     })?;
+    */
 
     let mut current: Option<SlotInfoMessage> = None;
     let mut message = "".to_string();
@@ -869,6 +856,12 @@ pub fn process_live_slots(url: &str) -> ProcessResult {
     let (mut client, receiver) = PubsubClient::slot_subscribe(url)?;
     slot_progress.set_message("Connected.");
 
+    let spacer = "|";
+    slot_progress.println(spacer);
+
+    let mut last_root = std::u64::MAX;
+    let mut last_root_update = Instant::now();
+    let mut slots_per_second = std::f64::NAN;
     loop {
         if exit.load(Ordering::Relaxed) {
             eprintln!("{}", message);
@@ -878,7 +871,27 @@ pub fn process_live_slots(url: &str) -> ProcessResult {
 
         match receiver.recv() {
             Ok(new_info) => {
-                message = format!("{:?}", new_info).to_owned();
+                if last_root == std::u64::MAX {
+                    last_root = new_info.root;
+                    last_root_update = Instant::now();
+                }
+                if last_root_update.elapsed().as_secs() >= 5 {
+                    let root = new_info.root;
+                    slots_per_second =
+                        (root - last_root) as f64 / last_root_update.elapsed().as_secs() as f64;
+                    last_root_update = Instant::now();
+                    last_root = root;
+                }
+
+                message = if slots_per_second.is_nan() {
+                    format!("{:?}", new_info)
+                } else {
+                    format!(
+                        "{:?} | root slot advancing at {:.2} slots/second",
+                        new_info, slots_per_second
+                    )
+                }
+                .to_owned();
                 slot_progress.set_message(&message);
 
                 if let Some(previous) = current {
@@ -891,11 +904,19 @@ pub fn process_live_slots(url: &str) -> ProcessResult {
                     //
                     if slot_delta != root_delta {
                         let prev_root = format!(
-                            "|<- {} <- … <- {} <- {}",
+                            "|<--- {} <- … <- {} <- {}   (prev)",
                             previous.root, previous.parent, previous.slot
-                        )
+                        );
-                        .to_owned();
                         slot_progress.println(&prev_root);
+
+                        let new_root = format!(
+                            "|  '- {} <- … <- {} <- {}   (next)",
+                            new_info.root, new_info.parent, new_info.slot
+                        );
+
+                        slot_progress.println(prev_root);
+                        slot_progress.println(new_root);
+                        slot_progress.println(spacer);
                     }
                 }
                 current = Some(new_info);

cli/src/display.rs

@@ -1,3 +1,4 @@
+use crate::cli::SettingType;
 use console::style;
 use solana_sdk::transaction::Transaction;
 
@@ -11,17 +12,19 @@ pub fn println_name_value(name: &str, value: &str) {
     println!("{} {}", style(name).bold(), styled_value);
 }
 
-pub fn println_name_value_or(name: &str, value: &str, default_value: &str) {
+pub fn println_name_value_or(name: &str, value: &str, setting_type: SettingType) {
-    if value == "" {
+    let description = match setting_type {
+        SettingType::Explicit => "",
+        SettingType::Computed => "(computed)",
+        SettingType::SystemDefault => "(default)",
+    };
+
     println!(
         "{} {} {}",
         style(name).bold(),
-            style(default_value),
+        style(value),
-            style("(default)").italic()
+        style(description).italic(),
     );
-    } else {
-        println!("{} {}", style(name).bold(), style(value));
-    };
 }
 
 pub fn println_signers(tx: &Transaction) {

cli/src/main.rs

@@ -20,29 +20,31 @@ fn parse_settings(matches: &ArgMatches<'_>) -> Result<bool, Box<dyn error::Error
             ("get", Some(subcommand_matches)) => {
                 if let Some(config_file) = matches.value_of("config_file") {
                     let config = Config::load(config_file).unwrap_or_default();
+
+                    let (url_setting_type, json_rpc_url) =
+                        CliConfig::compute_json_rpc_url_setting("", &config.url);
+                    let (ws_setting_type, websocket_url) = CliConfig::compute_websocket_url_setting(
+                        "",
+                        &config.websocket_url,
+                        "",
+                        &config.url,
+                    );
+                    let (keypair_setting_type, keypair_path) =
+                        CliConfig::compute_keypair_path_setting("", &config.keypair_path);
+
                     if let Some(field) = subcommand_matches.value_of("specific_setting") {
-                        let (field_name, value, default_value) = match field {
+                        let (field_name, value, setting_type) = match field {
-                            "url" => ("RPC URL", config.url, CliConfig::default_json_rpc_url()),
+                            "json_rpc_url" => ("RPC URL", json_rpc_url, url_setting_type),
-                            "keypair" => (
+                            "websocket_url" => ("WS URL", websocket_url, ws_setting_type),
-                                "Key Path",
+                            "keypair" => ("Key Path", keypair_path, keypair_setting_type),
-                                config.keypair_path,
-                                CliConfig::default_keypair_path(),
-                            ),
                             _ => unreachable!(),
                         };
-                        println_name_value_or(&format!("{}:", field_name), &value, &default_value);
+                        println_name_value_or(&format!("{}:", field_name), &value, setting_type);
                     } else {
                         println_name_value("Config File:", config_file);
-                        println_name_value_or(
+                        println_name_value_or("RPC URL:", &json_rpc_url, url_setting_type);
-                            "RPC URL:",
+                        println_name_value_or("WS URL:", &websocket_url, ws_setting_type);
-                            &config.url,
+                        println_name_value_or("Keypair Path:", &keypair_path, keypair_setting_type);
-                            &CliConfig::default_json_rpc_url(),
-                        );
-                        println_name_value_or(
-                            "Keypair Path:",
-                            &config.keypair_path,
-                            &CliConfig::default_keypair_path(),
-                        );
                     }
                 } else {
                     println!(
@@ -58,13 +60,29 @@ fn parse_settings(matches: &ArgMatches<'_>) -> Result<bool, Box<dyn error::Error
                     if let Some(url) = subcommand_matches.value_of("json_rpc_url") {
                         config.url = url.to_string();
                     }
+                    if let Some(url) = subcommand_matches.value_of("websocket_url") {
+                        config.websocket_url = url.to_string();
+                    }
                     if let Some(keypair) = subcommand_matches.value_of("keypair") {
                         config.keypair_path = keypair.to_string();
                     }
                     config.save(config_file)?;
+
+                    let (url_setting_type, json_rpc_url) =
+                        CliConfig::compute_json_rpc_url_setting("", &config.url);
+                    let (ws_setting_type, websocket_url) = CliConfig::compute_websocket_url_setting(
+                        "",
+                        &config.websocket_url,
+                        "",
+                        &config.url,
+                    );
+                    let (keypair_setting_type, keypair_path) =
+                        CliConfig::compute_keypair_path_setting("", &config.keypair_path);
+
                     println_name_value("Config File:", config_file);
-                    println_name_value("RPC URL:", &config.url);
+                    println_name_value_or("RPC URL:", &json_rpc_url, url_setting_type);
-                    println_name_value("Keypair Path:", &config.keypair_path);
+                    println_name_value_or("WS URL:", &websocket_url, ws_setting_type);
+                    println_name_value_or("Keypair Path:", &keypair_path, keypair_setting_type);
                 } else {
                     println!(
                         "{} Either provide the `--config` arg or ensure home directory exists to use the default config location",
@@ -89,22 +107,20 @@ pub fn parse_args<'a>(
     } else {
         Config::default()
     };
-    let json_rpc_url = if let Some(url) = matches.value_of("json_rpc_url") {
+    let (_, json_rpc_url) = CliConfig::compute_json_rpc_url_setting(
-        url.to_string()
+        matches.value_of("json_rpc_url").unwrap_or(""),
-    } else if config.url != "" {
+        &config.url,
-        config.url
+    );
-    } else {
+    let (_, websocket_url) = CliConfig::compute_websocket_url_setting(
-        let default = CliConfig::default();
+        matches.value_of("websocket_url").unwrap_or(""),
-        default.json_rpc_url
+        &config.websocket_url,
-    };
+        matches.value_of("json_rpc_url").unwrap_or(""),
-
+        &config.url,
-    let default_signer_path = if matches.is_present("keypair") {
+    );
-        matches.value_of("keypair").unwrap().to_string()
+    let (_, default_signer_path) = CliConfig::compute_keypair_path_setting(
-    } else if config.keypair_path != "" {
+        matches.value_of("keypair").unwrap_or(""),
-        config.keypair_path
+        &config.keypair_path,
-    } else {
+    );
-        CliConfig::default_keypair_path()
-    };
 
     let CliCommandInfo { command, signers } =
         parse_command(&matches, &default_signer_path, wallet_manager.as_ref())?;
@@ -113,6 +129,7 @@ pub fn parse_args<'a>(
         CliConfig {
             command,
             json_rpc_url,
+            websocket_url,
             signers: vec![],
             keypair_path: default_signer_path,
             derivation_path: derivation_of(matches, "derivation_path"),
@@ -154,6 +171,15 @@ fn main() -> Result<(), Box<dyn error::Error>> {
             .validator(is_url)
             .help("JSON RPC URL for the solana cluster"),
     )
+    .arg(
+        Arg::with_name("websocket_url")
+            .long("ws")
+            .value_name("URL")
+            .takes_value(true)
+            .global(true)
+            .validator(is_url)
+            .help("WebSocket URL for the solana cluster"),
+    )
     .arg(
         Arg::with_name("keypair")
             .short("k")
@@ -198,7 +224,7 @@ fn main() -> Result<(), Box<dyn error::Error>> {
                             .index(1)
                             .value_name("CONFIG_FIELD")
                             .takes_value(true)
-                            .possible_values(&["url", "keypair"])
+                            .possible_values(&["json_rpc_url", "websocket_url", "keypair"])
                             .help("Return a specific config setting"),
                     ),
             )
@@ -207,7 +233,7 @@ fn main() -> Result<(), Box<dyn error::Error>> {
                     .about("Set a config setting")
                     .group(
                         ArgGroup::with_name("config_settings")
-                            .args(&["json_rpc_url", "keypair"])
+                            .args(&["json_rpc_url", "websocket_url", "keypair"])
                             .multiple(true)
                             .required(true),
                     ),

cli/src/stake.rs

@@ -7,7 +7,8 @@ use crate::{
     nonce::{check_nonce_account, nonce_arg, NONCE_ARG, NONCE_AUTHORITY_ARG},
     offline::*,
 };
-use clap::{App, Arg, ArgMatches, SubCommand};
+use chrono::{DateTime, NaiveDateTime, SecondsFormat, Utc};
+use clap::{App, Arg, ArgGroup, ArgMatches, SubCommand};
 use console::style;
 use solana_clap_utils::{input_parsers::*, input_validators::*, offline::*, ArgConstant};
 use solana_client::rpc_client::RpcClient;
@@ -24,7 +25,7 @@ use solana_sdk::{
     transaction::Transaction,
 };
 use solana_stake_program::{
-    stake_instruction::{self, StakeError},
+    stake_instruction::{self, LockupArgs, StakeError},
     stake_state::{Authorized, Lockup, Meta, StakeAuthorize, StakeState},
 };
 use solana_vote_program::vote_state::VoteState;
@@ -364,6 +365,9 @@ impl StakeSubCommands for App<'_, '_> {
                         .validator(is_pubkey_or_keypair)
                         .help("Identity of the new lockup custodian (can withdraw before lockup expires)")
                 )
+                .group(ArgGroup::with_name("lockup_details")
+                    .args(&["lockup_epoch", "lockup_date", "new_custodian"])
+                    .required(true))
                 .arg(
                     Arg::with_name("custodian")
                         .long("custodian")
@@ -672,9 +676,9 @@ pub fn parse_stake_set_lockup(
     wallet_manager: Option<&Arc<RemoteWalletManager>>,
 ) -> Result<CliCommandInfo, CliError> {
     let stake_account_pubkey = pubkey_of(matches, "stake_account_pubkey").unwrap();
-    let epoch = value_of(matches, "lockup_epoch").unwrap_or(0);
+    let epoch = value_of(matches, "lockup_epoch");
-    let unix_timestamp = unix_timestamp_from_rfc3339_datetime(matches, "lockup_date").unwrap_or(0);
+    let unix_timestamp = unix_timestamp_from_rfc3339_datetime(matches, "lockup_date");
-    let new_custodian = pubkey_of(matches, "new_custodian").unwrap_or_default();
+    let new_custodian = pubkey_of(matches, "new_custodian");
 
     let sign_only = matches.is_present(SIGN_ONLY_ARG.name);
     let blockhash_query = BlockhashQuery::new_from_matches(matches);
@@ -695,7 +699,7 @@ pub fn parse_stake_set_lockup(
     Ok(CliCommandInfo {
         command: CliCommand::StakeSetLockup {
             stake_account_pubkey,
-            lockup: Lockup {
+            lockup: LockupArgs {
                 custodian: new_custodian,
                 epoch,
                 unix_timestamp,
@@ -1155,7 +1159,7 @@ pub fn process_stake_set_lockup(
     rpc_client: &RpcClient,
     config: &CliConfig,
     stake_account_pubkey: &Pubkey,
-    lockup: &mut Lockup,
+    lockup: &mut LockupArgs,
     custodian: SignerIndex,
     sign_only: bool,
     blockhash_query: &BlockhashQuery,
@@ -1166,10 +1170,7 @@ pub fn process_stake_set_lockup(
     let (recent_blockhash, fee_calculator) =
         blockhash_query.get_blockhash_fee_calculator(rpc_client)?;
     let custodian = config.signers[custodian];
-    // If new custodian is not explicitly set, default to current custodian
+
-    if lockup.custodian == Pubkey::default() {
-        lockup.custodian = custodian.pubkey();
-    }
     let ixs = vec![stake_instruction::set_lockup(
         stake_account_pubkey,
         lockup,
@@ -1215,6 +1216,12 @@ pub fn print_stake_state(stake_lamports: u64, stake_state: &StakeState, use_lamp
         println!("Authorized Withdrawer: {}", authorized.withdrawer);
     }
     fn show_lockup(lockup: &Lockup) {
+        println!(
+            "Lockup Timestamp: {} (UnixTimestamp: {})",
+            DateTime::<Utc>::from_utc(NaiveDateTime::from_timestamp(lockup.unix_timestamp, 0), Utc)
+                .to_rfc3339_opts(SecondsFormat::Secs, true),
+            lockup.unix_timestamp
+        );
         println!("Lockup Epoch: {}", lockup.epoch);
         println!("Lockup Custodian: {}", lockup.custodian);
     }

cli/src/vote.rs

@@ -457,7 +457,7 @@ pub fn process_show_vote_account(
         build_balance_message(vote_account.lamports, use_lamports_unit, true)
     );
     println!("Validator Identity: {}", vote_state.node_pubkey);
-    println!("Authorized Voter: {}", vote_state.authorized_voter);
+    println!("Authorized Voter: {:?}", vote_state.authorized_voters());
     println!(
         "Authorized Withdrawer: {}",
         vote_state.authorized_withdrawer

cli/tests/deploy.rs

@@ -1,7 +1,7 @@
 use serde_json::Value;
 use solana_cli::cli::{process_command, CliCommand, CliConfig};
 use solana_client::rpc_client::RpcClient;
-use solana_core::validator::new_validator_for_tests;
+use solana_core::validator::TestValidator;
 use solana_faucet::faucet::run_local_faucet;
 use solana_sdk::{bpf_loader, pubkey::Pubkey, signature::Keypair};
 use std::{
@@ -22,7 +22,13 @@ fn test_cli_deploy_program() {
     pathbuf.push("noop");
     pathbuf.set_extension("so");
 
-    let (server, leader_data, alice, ledger_path) = new_validator_for_tests();
+    let TestValidator {
+        server,
+        leader_data,
+        alice,
+        ledger_path,
+        ..
+    } = TestValidator::run();
 
     let (sender, receiver) = channel();
     run_local_faucet(alice, sender, None);

cli/tests/nonce.rs

@@ -1,5 +1,6 @@
 use solana_cli::cli::{process_command, request_and_confirm_airdrop, CliCommand, CliConfig};
 use solana_client::rpc_client::RpcClient;
+use solana_core::validator::TestValidator;
 use solana_faucet::faucet::run_local_faucet;
 use solana_sdk::{
     hash::Hash,
@@ -10,9 +11,6 @@ use solana_sdk::{
 };
 use std::{fs::remove_dir_all, sync::mpsc::channel, thread::sleep, time::Duration};
 
-#[cfg(test)]
-use solana_core::validator::new_validator_for_tests;
-
 fn check_balance(expected_balance: u64, client: &RpcClient, pubkey: &Pubkey) {
     (0..5).for_each(|tries| {
         let balance = client.retry_get_balance(pubkey, 1).unwrap().unwrap();
@@ -28,7 +26,13 @@ fn check_balance(expected_balance: u64, client: &RpcClient, pubkey: &Pubkey) {
 
 #[test]
 fn test_nonce() {
-    let (server, leader_data, alice, ledger_path) = new_validator_for_tests();
+    let TestValidator {
+        server,
+        leader_data,
+        alice,
+        ledger_path,
+        ..
+    } = TestValidator::run();
     let (sender, receiver) = channel();
     run_local_faucet(alice, sender, None);
     let faucet_addr = receiver.recv().unwrap();
@@ -44,7 +48,13 @@ fn test_nonce() {
 
 #[test]
 fn test_nonce_with_seed() {
-    let (server, leader_data, alice, ledger_path) = new_validator_for_tests();
+    let TestValidator {
+        server,
+        leader_data,
+        alice,
+        ledger_path,
+        ..
+    } = TestValidator::run();
     let (sender, receiver) = channel();
     run_local_faucet(alice, sender, None);
     let faucet_addr = receiver.recv().unwrap();
@@ -66,7 +76,13 @@ fn test_nonce_with_seed() {
 
 #[test]
 fn test_nonce_with_authority() {
-    let (server, leader_data, alice, ledger_path) = new_validator_for_tests();
+    let TestValidator {
+        server,
+        leader_data,
+        alice,
+        ledger_path,
+        ..
+    } = TestValidator::run();
     let (sender, receiver) = channel();
     run_local_faucet(alice, sender, None);
     let faucet_addr = receiver.recv().unwrap();

cli/tests/pay.rs

@@ -6,6 +6,7 @@ use solana_cli::{
     offline::{parse_sign_only_reply_string, BlockhashQuery},
 };
 use solana_client::rpc_client::RpcClient;
+use solana_core::validator::TestValidator;
 use solana_faucet::faucet::run_local_faucet;
 use solana_sdk::{
     account_utils::StateMut,
@@ -16,9 +17,6 @@ use solana_sdk::{
 };
 use std::{fs::remove_dir_all, sync::mpsc::channel, thread::sleep, time::Duration};
 
-#[cfg(test)]
-use solana_core::validator::new_validator_for_tests;
-
 fn check_balance(expected_balance: u64, client: &RpcClient, pubkey: &Pubkey) {
     (0..5).for_each(|tries| {
         let balance = client.retry_get_balance(pubkey, 1).unwrap().unwrap();
@@ -34,7 +32,13 @@ fn check_balance(expected_balance: u64, client: &RpcClient, pubkey: &Pubkey) {
 
 #[test]
 fn test_cli_timestamp_tx() {
-    let (server, leader_data, alice, ledger_path) = new_validator_for_tests();
+    let TestValidator {
+        server,
+        leader_data,
+        alice,
+        ledger_path,
+        ..
+    } = TestValidator::run();
     let bob_pubkey = Pubkey::new_rand();
 
     let (sender, receiver) = channel();
@@ -113,7 +117,13 @@ fn test_cli_timestamp_tx() {
 
 #[test]
 fn test_cli_witness_tx() {
-    let (server, leader_data, alice, ledger_path) = new_validator_for_tests();
+    let TestValidator {
+        server,
+        leader_data,
+        alice,
+        ledger_path,
+        ..
+    } = TestValidator::run();
     let bob_pubkey = Pubkey::new_rand();
 
     let (sender, receiver) = channel();
@@ -187,7 +197,13 @@ fn test_cli_witness_tx() {
 
 #[test]
 fn test_cli_cancel_tx() {
-    let (server, leader_data, alice, ledger_path) = new_validator_for_tests();
+    let TestValidator {
+        server,
+        leader_data,
+        alice,
+        ledger_path,
+        ..
+    } = TestValidator::run();
     let bob_pubkey = Pubkey::new_rand();
 
     let (sender, receiver) = channel();
@@ -255,7 +271,13 @@ fn test_cli_cancel_tx() {
 
 #[test]
 fn test_offline_pay_tx() {
-    let (server, leader_data, alice, ledger_path) = new_validator_for_tests();
+    let TestValidator {
+        server,
+        leader_data,
+        alice,
+        ledger_path,
+        ..
+    } = TestValidator::run();
     let bob_pubkey = Pubkey::new_rand();
 
     let (sender, receiver) = channel();
@@ -336,7 +358,13 @@ fn test_offline_pay_tx() {
 fn test_nonced_pay_tx() {
     solana_logger::setup();
 
-    let (server, leader_data, alice, ledger_path) = new_validator_for_tests();
+    let TestValidator {
+        server,
+        leader_data,
+        alice,
+        ledger_path,
+        ..
+    } = TestValidator::run();
     let (sender, receiver) = channel();
     run_local_faucet(alice, sender, None);
     let faucet_addr = receiver.recv().unwrap();

cli/tests/request_airdrop.rs

@@ -1,13 +1,19 @@
 use solana_cli::cli::{process_command, CliCommand, CliConfig};
 use solana_client::rpc_client::RpcClient;
-use solana_core::validator::new_validator_for_tests;
+use solana_core::validator::TestValidator;
 use solana_faucet::faucet::run_local_faucet;
 use solana_sdk::signature::Keypair;
 use std::{fs::remove_dir_all, sync::mpsc::channel};
 
 #[test]
 fn test_cli_request_airdrop() {
-    let (server, leader_data, alice, ledger_path) = new_validator_for_tests();
+    let TestValidator {
+        server,
+        leader_data,
+        alice,
+        ledger_path,
+        ..
+    } = TestValidator::run();
     let (sender, receiver) = channel();
     run_local_faucet(alice, sender, None);
     let faucet_addr = receiver.recv().unwrap();

cli/tests/stake.rs

@@ -4,6 +4,7 @@ use solana_cli::{
     offline::{parse_sign_only_reply_string, BlockhashQuery},
 };
 use solana_client::rpc_client::RpcClient;
+use solana_core::validator::{TestValidator, TestValidatorOptions};
 use solana_faucet::faucet::run_local_faucet;
 use solana_sdk::{
     account_utils::StateMut,
@@ -13,13 +14,11 @@ use solana_sdk::{
     signature::{keypair_from_seed, Keypair, Signer},
     system_instruction::create_address_with_seed,
 };
-use solana_stake_program::stake_state::{Lockup, StakeAuthorize, StakeState};
+use solana_stake_program::{
-use std::{fs::remove_dir_all, sync::mpsc::channel, thread::sleep, time::Duration};
+    stake_instruction::LockupArgs,
-
+    stake_state::{Lockup, StakeAuthorize, StakeState},
-#[cfg(test)]
-use solana_core::validator::{
-    new_validator_for_tests, new_validator_for_tests_ex, new_validator_for_tests_with_vote_pubkey,
 };
+use std::{fs::remove_dir_all, sync::mpsc::channel, thread::sleep, time::Duration};
 
 fn check_balance(expected_balance: u64, client: &RpcClient, pubkey: &Pubkey) {
     (0..5).for_each(|tries| {
@@ -36,7 +35,13 @@ fn check_balance(expected_balance: u64, client: &RpcClient, pubkey: &Pubkey) {
 
 #[test]
 fn test_stake_delegation_force() {
-    let (server, leader_data, alice, ledger_path) = new_validator_for_tests();
+    let TestValidator {
+        server,
+        leader_data,
+        alice,
+        ledger_path,
+        ..
+    } = TestValidator::run();
     let (sender, receiver) = channel();
     run_local_faucet(alice, sender, None);
     let faucet_addr = receiver.recv().unwrap();
@@ -124,8 +129,14 @@ fn test_stake_delegation_force() {
 fn test_seed_stake_delegation_and_deactivation() {
     solana_logger::setup();
 
-    let (server, leader_data, alice, ledger_path, vote_pubkey) =
+    let TestValidator {
-        new_validator_for_tests_with_vote_pubkey();
+        server,
+        leader_data,
+        alice,
+        ledger_path,
+        vote_pubkey,
+        ..
+    } = TestValidator::run();
     let (sender, receiver) = channel();
     run_local_faucet(alice, sender, None);
     let faucet_addr = receiver.recv().unwrap();
@@ -206,8 +217,14 @@ fn test_seed_stake_delegation_and_deactivation() {
 fn test_stake_delegation_and_deactivation() {
     solana_logger::setup();
 
-    let (server, leader_data, alice, ledger_path, vote_pubkey) =
+    let TestValidator {
-        new_validator_for_tests_with_vote_pubkey();
+        server,
+        leader_data,
+        alice,
+        ledger_path,
+        vote_pubkey,
+        ..
+    } = TestValidator::run();
     let (sender, receiver) = channel();
     run_local_faucet(alice, sender, None);
     let faucet_addr = receiver.recv().unwrap();
@@ -284,8 +301,14 @@ fn test_stake_delegation_and_deactivation() {
 fn test_offline_stake_delegation_and_deactivation() {
     solana_logger::setup();
 
-    let (server, leader_data, alice, ledger_path, vote_pubkey) =
+    let TestValidator {
-        new_validator_for_tests_with_vote_pubkey();
+        server,
+        leader_data,
+        alice,
+        ledger_path,
+        vote_pubkey,
+        ..
+    } = TestValidator::run();
     let (sender, receiver) = channel();
     run_local_faucet(alice, sender, None);
     let faucet_addr = receiver.recv().unwrap();
@@ -414,8 +437,14 @@ fn test_offline_stake_delegation_and_deactivation() {
 fn test_nonced_stake_delegation_and_deactivation() {
     solana_logger::setup();
 
-    let (server, leader_data, alice, ledger_path, vote_pubkey) =
+    let TestValidator {
-        new_validator_for_tests_with_vote_pubkey();
+        server,
+        leader_data,
+        alice,
+        ledger_path,
+        vote_pubkey,
+        ..
+    } = TestValidator::run();
     let (sender, receiver) = channel();
     run_local_faucet(alice, sender, None);
     let faucet_addr = receiver.recv().unwrap();
@@ -520,7 +549,13 @@ fn test_nonced_stake_delegation_and_deactivation() {
 fn test_stake_authorize() {
     solana_logger::setup();
 
-    let (server, leader_data, alice, ledger_path) = new_validator_for_tests();
+    let TestValidator {
+        server,
+        leader_data,
+        alice,
+        ledger_path,
+        ..
+    } = TestValidator::run();
     let (sender, receiver) = channel();
     run_local_faucet(alice, sender, None);
     let faucet_addr = receiver.recv().unwrap();
@@ -744,8 +779,16 @@ fn test_stake_authorize_with_fee_payer() {
     solana_logger::setup();
     const SIG_FEE: u64 = 42;
 
-    let (server, leader_data, alice, ledger_path, _voter) =
+    let TestValidator {
-        new_validator_for_tests_ex(SIG_FEE, 42_000);
+        server,
+        leader_data,
+        alice,
+        ledger_path,
+        ..
+    } = TestValidator::run_with_options(TestValidatorOptions {
+        fees: SIG_FEE,
+        bootstrap_validator_lamports: 42_000,
+    });
     let (sender, receiver) = channel();
     run_local_faucet(alice, sender, None);
     let faucet_addr = receiver.recv().unwrap();
@@ -867,7 +910,16 @@ fn test_stake_authorize_with_fee_payer() {
 fn test_stake_split() {
     solana_logger::setup();
 
-    let (server, leader_data, alice, ledger_path, _voter) = new_validator_for_tests_ex(1, 42_000);
+    let TestValidator {
+        server,
+        leader_data,
+        alice,
+        ledger_path,
+        ..
+    } = TestValidator::run_with_options(TestValidatorOptions {
+        fees: 1,
+        bootstrap_validator_lamports: 42_000,
+    });
     let (sender, receiver) = channel();
     run_local_faucet(alice, sender, None);
     let faucet_addr = receiver.recv().unwrap();
@@ -1003,7 +1055,16 @@ fn test_stake_split() {
 fn test_stake_set_lockup() {
     solana_logger::setup();
 
-    let (server, leader_data, alice, ledger_path, _voter) = new_validator_for_tests_ex(1, 42_000);
+    let TestValidator {
+        server,
+        leader_data,
+        alice,
+        ledger_path,
+        ..
+    } = TestValidator::run_with_options(TestValidatorOptions {
+        fees: 1,
+        bootstrap_validator_lamports: 42_000,
+    });
     let (sender, receiver) = channel();
     run_local_faucet(alice, sender, None);
     let faucet_addr = receiver.recv().unwrap();
@@ -1070,10 +1131,10 @@ fn test_stake_set_lockup() {
     );
 
     // Online set lockup
-    let mut lockup = Lockup {
+    let lockup = LockupArgs {
-        unix_timestamp: 1581534570,
+        unix_timestamp: Some(1581534570),
-        epoch: 200,
+        epoch: Some(200),
-        custodian: Pubkey::default(),
+        custodian: None,
     };
     config.signers.pop();
     config.command = CliCommand::StakeSetLockup {
@@ -1093,17 +1154,21 @@ fn test_stake_set_lockup() {
         StakeState::Initialized(meta) => meta.lockup,
         _ => panic!("Unexpected stake state!"),
     };
-    lockup.custodian = config.signers[0].pubkey(); // Default new_custodian is config.signers[0]
+    assert_eq!(
-    assert_eq!(current_lockup, lockup);
+        current_lockup.unix_timestamp,
+        lockup.unix_timestamp.unwrap()
+    );
+    assert_eq!(current_lockup.epoch, lockup.epoch.unwrap());
+    assert_eq!(current_lockup.custodian, config.signers[0].pubkey());
 
     // Set custodian to another pubkey
     let online_custodian = Keypair::new();
     let online_custodian_pubkey = online_custodian.pubkey();
 
-    let lockup = Lockup {
+    let lockup = LockupArgs {
-        unix_timestamp: 1581534571,
+        unix_timestamp: Some(1581534571),
-        epoch: 201,
+        epoch: Some(201),
-        custodian: online_custodian_pubkey,
+        custodian: Some(online_custodian_pubkey),
     };
     config.command = CliCommand::StakeSetLockup {
         stake_account_pubkey,
@@ -1117,10 +1182,10 @@ fn test_stake_set_lockup() {
     };
     process_command(&config).unwrap();
 
-    let mut lockup = Lockup {
+    let lockup = LockupArgs {
-        unix_timestamp: 1581534572,
+        unix_timestamp: Some(1581534572),
-        epoch: 202,
+        epoch: Some(202),
-        custodian: Pubkey::default(),
+        custodian: None,
     };
     config.signers = vec![&default_signer, &online_custodian];
     config.command = CliCommand::StakeSetLockup {
@@ -1140,14 +1205,18 @@ fn test_stake_set_lockup() {
         StakeState::Initialized(meta) => meta.lockup,
         _ => panic!("Unexpected stake state!"),
     };
-    lockup.custodian = online_custodian_pubkey; // Default new_custodian is designated custodian
+    assert_eq!(
-    assert_eq!(current_lockup, lockup);
+        current_lockup.unix_timestamp,
+        lockup.unix_timestamp.unwrap()
+    );
+    assert_eq!(current_lockup.epoch, lockup.epoch.unwrap());
+    assert_eq!(current_lockup.custodian, online_custodian_pubkey);
 
     // Set custodian to offline pubkey
-    let lockup = Lockup {
+    let lockup = LockupArgs {
-        unix_timestamp: 1581534573,
+        unix_timestamp: Some(1581534573),
-        epoch: 203,
+        epoch: Some(203),
-        custodian: offline_pubkey,
+        custodian: Some(offline_pubkey),
     };
     config.command = CliCommand::StakeSetLockup {
         stake_account_pubkey,
@@ -1186,10 +1255,10 @@ fn test_stake_set_lockup() {
     };
 
     // Nonced offline set lockup
-    let lockup = Lockup {
+    let lockup = LockupArgs {
-        unix_timestamp: 1581534576,
+        unix_timestamp: Some(1581534576),
-        epoch: 222,
+        epoch: Some(222),
-        custodian: offline_pubkey,
+        custodian: None,
     };
     config_offline.command = CliCommand::StakeSetLockup {
         stake_account_pubkey,
@@ -1222,7 +1291,12 @@ fn test_stake_set_lockup() {
         StakeState::Initialized(meta) => meta.lockup,
         _ => panic!("Unexpected stake state!"),
     };
-    assert_eq!(current_lockup, lockup);
+    assert_eq!(
+        current_lockup.unix_timestamp,
+        lockup.unix_timestamp.unwrap()
+    );
+    assert_eq!(current_lockup.epoch, lockup.epoch.unwrap());
+    assert_eq!(current_lockup.custodian, offline_pubkey);
 
     server.close().unwrap();
     remove_dir_all(ledger_path).unwrap();
@@ -1232,7 +1306,13 @@ fn test_stake_set_lockup() {
 fn test_offline_nonced_create_stake_account_and_withdraw() {
     solana_logger::setup();
 
-    let (server, leader_data, alice, ledger_path) = new_validator_for_tests();
+    let TestValidator {
+        server,
+        leader_data,
+        alice,
+        ledger_path,
+        ..
+    } = TestValidator::run();
     let (sender, receiver) = channel();
     run_local_faucet(alice, sender, None);
     let faucet_addr = receiver.recv().unwrap();

cli/tests/transfer.rs

@@ -4,6 +4,7 @@ use solana_cli::{
     offline::{parse_sign_only_reply_string, BlockhashQuery},
 };
 use solana_client::rpc_client::RpcClient;
+use solana_core::validator::{TestValidator, TestValidatorOptions};
 use solana_faucet::faucet::run_local_faucet;
 use solana_sdk::{
     account_utils::StateMut,
@@ -14,9 +15,6 @@ use solana_sdk::{
 };
 use std::{fs::remove_dir_all, sync::mpsc::channel, thread::sleep, time::Duration};
 
-#[cfg(test)]
-use solana_core::validator::new_validator_for_tests_ex;
-
 fn check_balance(expected_balance: u64, client: &RpcClient, pubkey: &Pubkey) {
     (0..5).for_each(|tries| {
         let balance = client.retry_get_balance(pubkey, 1).unwrap().unwrap();
@@ -32,7 +30,16 @@ fn check_balance(expected_balance: u64, client: &RpcClient, pubkey: &Pubkey) {
 
 #[test]
 fn test_transfer() {
-    let (server, leader_data, mint_keypair, ledger_path, _) = new_validator_for_tests_ex(1, 42_000);
+    let TestValidator {
+        server,
+        leader_data,
+        alice: mint_keypair,
+        ledger_path,
+        ..
+    } = TestValidator::run_with_options(TestValidatorOptions {
+        fees: 1,
+        bootstrap_validator_lamports: 42_000,
+    });
 
     let (sender, receiver) = channel();
     run_local_faucet(mint_keypair, sender, None);

client/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "solana-client"
-version = "1.0.0"
+version = "1.0.2"
 description = "Solana Client"
 authors = ["Solana Maintainers <maintainers@solana.com>"]
 repository = "https://github.com/solana-labs/solana"
@@ -18,8 +18,8 @@ reqwest = { version = "0.10.1", default-features = false, features = ["blocking"
 serde = "1.0.104"
 serde_derive = "1.0.103"
 serde_json = "1.0.46"
-solana-net-utils = { path = "../net-utils", version = "1.0.0" }
+solana-net-utils = { path = "../net-utils", version = "1.0.2" }
-solana-sdk = { path = "../sdk", version = "1.0.0" }
+solana-sdk = { path = "../sdk", version = "1.0.2" }
 thiserror = "1.0"
 tungstenite = "0.10.1"
 url = "2.1.1"
@@ -28,4 +28,4 @@ url = "2.1.1"
 assert_matches = "1.3.0"
 jsonrpc-core = "14.0.5"
 jsonrpc-http-server = "14.0.6"
-solana-logger = { path = "../logger", version = "1.0.0" }
+solana-logger = { path = "../logger", version = "1.0.2" }

core/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "solana-core"
 description = "Blockchain, Rebuilt for Scale"
-version = "1.0.0"
+version = "1.0.2"
 documentation = "https://docs.rs/solana"
 homepage = "https://solana.com/"
 readme = "../README.md"
@@ -25,6 +25,7 @@ fs_extra = "1.1.0"
 indexmap = "1.3"
 itertools = "0.8.2"
 jsonrpc-core = "14.0.5"
+jsonrpc-core-client = { version = "14.0.5", features = ["ws"] }
 jsonrpc-derive = "14.0.5"
 jsonrpc-http-server = "14.0.6"
 jsonrpc-pubsub = "14.0.6"
@@ -36,29 +37,30 @@ num-traits = "0.2"
 rand = "0.6.5"
 rand_chacha = "0.1.1"
 rayon = "1.2.0"
+regex = "1.3.4"
 serde = "1.0.104"
 serde_derive = "1.0.103"
 serde_json = "1.0.46"
-solana-budget-program = { path = "../programs/budget", version = "1.0.0" }
+solana-budget-program = { path = "../programs/budget", version = "1.0.2" }
-solana-clap-utils = { path = "../clap-utils", version = "1.0.0" }
+solana-clap-utils = { path = "../clap-utils", version = "1.0.2" }
-solana-client = { path = "../client", version = "1.0.0" }
+solana-client = { path = "../client", version = "1.0.2" }
-solana-faucet = { path = "../faucet", version = "1.0.0" }
+solana-faucet = { path = "../faucet", version = "1.0.2" }
 ed25519-dalek = "=1.0.0-pre.1"
-solana-ledger = { path = "../ledger", version = "1.0.0" }
+solana-ledger = { path = "../ledger", version = "1.0.2" }
-solana-logger = { path = "../logger", version = "1.0.0" }
+solana-logger = { path = "../logger", version = "1.0.2" }
-solana-merkle-tree = { path = "../merkle-tree", version = "1.0.0" }
+solana-merkle-tree = { path = "../merkle-tree", version = "1.0.2" }
-solana-metrics = { path = "../metrics", version = "1.0.0" }
+solana-metrics = { path = "../metrics", version = "1.0.2" }
-solana-measure = { path = "../measure", version = "1.0.0" }
+solana-measure = { path = "../measure", version = "1.0.2" }
-solana-net-utils = { path = "../net-utils", version = "1.0.0" }
+solana-net-utils = { path = "../net-utils", version = "1.0.2" }
-solana-chacha-cuda = { path = "../chacha-cuda", version = "1.0.0" }
+solana-chacha-cuda = { path = "../chacha-cuda", version = "1.0.2" }
-solana-perf = { path = "../perf", version = "1.0.0" }
+solana-perf = { path = "../perf", version = "1.0.2" }
-solana-runtime = { path = "../runtime", version = "1.0.0" }
+solana-runtime = { path = "../runtime", version = "1.0.2" }
-solana-sdk = { path = "../sdk", version = "1.0.0" }
+solana-sdk = { path = "../sdk", version = "1.0.2" }
-solana-stake-program = { path = "../programs/stake", version = "1.0.0" }
+solana-stake-program = { path = "../programs/stake", version = "1.0.2" }
-solana-storage-program = { path = "../programs/storage", version = "1.0.0" }
+solana-storage-program = { path = "../programs/storage", version = "1.0.2" }
-solana-vote-program = { path = "../programs/vote", version = "1.0.0" }
+solana-vote-program = { path = "../programs/vote", version = "1.0.2" }
-solana-vote-signer = { path = "../vote-signer", version = "1.0.0" }
+solana-vote-signer = { path = "../vote-signer", version = "1.0.2" }
-solana-sys-tuner = { path = "../sys-tuner", version = "1.0.0" }
+solana-sys-tuner = { path = "../sys-tuner", version = "1.0.2" }
 sys-info = "0.5.9"
 tempfile = "3.1.0"
 thiserror = "1.0"
@@ -66,7 +68,7 @@ tokio = "0.1"
 tokio-codec = "0.1"
 tokio-fs = "0.1"
 tokio-io = "0.1"
-solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "1.0.0" }
+solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "1.0.2" }
 trees = "0.2.1"
 
 [dev-dependencies]

core/src/cluster_info.rs

@@ -84,6 +84,9 @@ const MAX_GOSSIP_TRAFFIC: usize = 128_000_000 / PACKET_DATA_SIZE;
 const NUM_BITS_PER_BYTE: u64 = 8;
 const MIN_SIZE_TO_COMPRESS_GZIP: u64 = 64;
 
+/// Keep the number of snapshot hashes a node publishes under MAX_PROTOCOL_PAYLOAD_SIZE
+pub const MAX_SNAPSHOT_HASHES: usize = 16;
+
 #[derive(Debug, PartialEq, Eq)]
 pub enum ClusterInfoError {
     NoPeers,
@@ -441,6 +444,14 @@ impl ClusterInfo {
     }
 
     pub fn push_snapshot_hashes(&mut self, snapshot_hashes: Vec<(Slot, Hash)>) {
+        if snapshot_hashes.len() > MAX_SNAPSHOT_HASHES {
+            warn!(
+                "snapshot_hashes too large, ignored: {}",
+                snapshot_hashes.len()
+            );
+            return;
+        }
+
         let now = timestamp();
         let entry = CrdsValue::new_signed(
             CrdsData::SnapshotHash(SnapshotHash::new(self.id(), snapshot_hashes, now)),
@@ -1059,7 +1070,7 @@ impl ClusterInfo {
     }
 
     /// Splits a Vec of CrdsValues into a nested Vec, trying to make sure that
-    /// each Vec is no larger than `PROTOCOL_PAYLOAD_SIZE`
+    /// each Vec is no larger than `MAX_PROTOCOL_PAYLOAD_SIZE`
     /// Note: some messages cannot be contained within that size so in the worst case this returns
     /// N nested Vecs with 1 item each.
     fn split_gossip_messages(msgs: Vec<CrdsValue>) -> Vec<Vec<CrdsValue>> {

core/src/commitment.rs

@@ -233,7 +233,7 @@ mod tests {
     use crate::genesis_utils::{create_genesis_config, GenesisConfigInfo};
     use solana_sdk::pubkey::Pubkey;
     use solana_stake_program::stake_state;
-    use solana_vote_program::vote_state;
+    use solana_vote_program::vote_state::{self, VoteStateVersions};
 
     #[test]
     fn test_block_commitment() {
@@ -446,13 +446,15 @@ mod tests {
         let mut vote_state1 = VoteState::from(&vote_account1).unwrap();
         vote_state1.process_slot_vote_unchecked(3);
         vote_state1.process_slot_vote_unchecked(5);
-        vote_state1.to(&mut vote_account1).unwrap();
+        let versioned = VoteStateVersions::Current(Box::new(vote_state1));
+        VoteState::to(&versioned, &mut vote_account1).unwrap();
         bank.store_account(&pk1, &vote_account1);
 
         let mut vote_state2 = VoteState::from(&vote_account2).unwrap();
         vote_state2.process_slot_vote_unchecked(9);
         vote_state2.process_slot_vote_unchecked(10);
-        vote_state2.to(&mut vote_account2).unwrap();
+        let versioned = VoteStateVersions::Current(Box::new(vote_state2));
+        VoteState::to(&versioned, &mut vote_account2).unwrap();
         bank.store_account(&pk2, &vote_account2);
 
         let commitment = AggregateCommitmentService::aggregate_commitment(&ancestors, &bank);

core/src/consensus.rs

@@ -483,7 +483,10 @@ pub mod test {
         signature::{Keypair, Signer},
         transaction::Transaction,
     };
-    use solana_vote_program::{vote_instruction, vote_state::Vote};
+    use solana_vote_program::{
+        vote_instruction,
+        vote_state::{Vote, VoteStateVersions},
+    };
     use std::collections::{HashMap, VecDeque};
     use std::sync::RwLock;
     use std::{thread::sleep, time::Duration};
@@ -510,7 +513,7 @@ pub mod test {
             my_keypairs: &ValidatorVoteKeypairs,
             progress: &mut HashMap<u64, ForkProgress>,
             tower: &mut Tower,
-        ) -> VoteResult {
+        ) -> Vec<VoteFailures> {
             let node = self
                 .find_node_and_update_simulation(vote_slot)
                 .expect("Vote to simulate must be for a slot in the tree");
@@ -585,6 +588,7 @@ pub mod test {
                 .values()
                 .cloned()
                 .collect();
+
             ReplayStage::compute_bank_stats(
                 &my_pubkey,
                 &ancestors,
@@ -592,7 +596,6 @@ pub mod test {
                 tower,
                 progress,
             );
-            ReplayStage::select_fork(&frozen_banks, tower, progress);
 
             let bank = bank_forks
                 .read()
@@ -606,12 +609,15 @@ pub mod test {
                 .expect("Slot for vote must exist in progress map");
             info!("Checking vote: {}", vote_slot);
             info!("lockouts: {:?}", fork_progress.fork_stats.stake_lockouts);
-            if fork_progress.fork_stats.is_locked_out && !fork_progress.fork_stats.vote_threshold {
+            let mut failures = vec![];
-                return VoteResult::FailedAllChecks(vote_slot);
+            if fork_progress.fork_stats.is_locked_out {
-            } else if fork_progress.fork_stats.is_locked_out {
+                failures.push(VoteFailures::LockedOut(vote_slot));
-                return VoteResult::LockedOut(vote_slot);
+            }
-            } else if !fork_progress.fork_stats.vote_threshold {
+            if !fork_progress.fork_stats.vote_threshold {
-                return VoteResult::FailedThreshold(vote_slot);
+                failures.push(VoteFailures::FailedThreshold(vote_slot));
+            }
+            if !failures.is_empty() {
+                return failures;
             }
             let vote = tower.new_vote_from_bank(&bank, &my_vote_pubkey).0;
             if let Some(new_root) = tower.record_bank_vote(vote) {
@@ -621,7 +627,7 @@ pub mod test {
             // Mark the vote for this bank under this node's pubkey so it will be
             // integrated into any future child banks
             cluster_votes.entry(my_pubkey).or_default().push(vote_slot);
-            VoteResult::Ok
+            vec![]
         }
 
         // Find a node representing the given slot
@@ -666,11 +672,9 @@ pub mod test {
     }
 
     #[derive(PartialEq, Debug)]
-    pub(crate) enum VoteResult {
+    pub(crate) enum VoteFailures {
         LockedOut(u64),
         FailedThreshold(u64),
-        FailedAllChecks(u64),
-        Ok,
     }
 
     // Setup BankForks with bank 0 and all the validator accounts
@@ -706,8 +710,10 @@ pub mod test {
             for slot in *votes {
                 vote_state.process_slot_vote_unchecked(*slot);
             }
-            vote_state
+            VoteState::serialize(
-                .serialize(&mut account.data)
+                &VoteStateVersions::Current(Box::new(vote_state)),
+                &mut account.data,
+            )
             .expect("serialize state");
             stakes.push((Pubkey::new_rand(), (*lamports, account)));
         }
@@ -782,9 +788,8 @@ pub mod test {
 
         let mut cluster_votes = HashMap::new();
         for vote in votes {
-            assert_eq!(
+            assert!(voting_simulator
-                VoteResult::Ok,
+                .simulate_vote(
-                voting_simulator.simulate_vote(
                     vote,
                     &bank_forks,
                     &mut cluster_votes,
@@ -793,7 +798,7 @@ pub mod test {
                     &mut progress,
                     &mut tower,
                 )
-            );
+                .is_empty());
         }
 
         for i in 0..5 {
@@ -856,8 +861,8 @@ pub mod test {
         let mut tower = Tower::new_with_key(&node_pubkey);
         for vote in &votes {
             // All these votes should be ok
-            assert_eq!(
+            assert!(voting_simulator
-                voting_simulator.simulate_vote(
+                .simulate_vote(
                     *vote,
                     &bank_forks,
                     &mut cluster_votes,
@@ -865,15 +870,14 @@ pub mod test {
                     keypairs.get(&node_pubkey).unwrap(),
                     &mut progress,
                     &mut tower,
-                ),
+                )
-                VoteResult::Ok
+                .is_empty());
-            );
         }
 
         // Try to come back to main fork
         let next_unlocked_slot = 110;
-        assert_eq!(
+        assert!(voting_simulator
-            voting_simulator.simulate_vote(
+            .simulate_vote(
                 next_unlocked_slot,
                 &bank_forks,
                 &mut cluster_votes,
@@ -881,9 +885,8 @@ pub mod test {
                 keypairs.get(&node_pubkey).unwrap(),
                 &mut progress,
                 &mut tower,
-            ),
+            )
-            VoteResult::Ok
+            .is_empty());
-        );
 
         info!("local tower: {:#?}", tower.lockouts.votes);
         let vote_accounts = bank_forks

core/src/poh_recorder.rs

@@ -28,8 +28,8 @@ use std::sync::{Arc, Mutex};
 use std::time::Instant;
 use thiserror::Error;
 
-const GRACE_TICKS_FACTOR: u64 = 2;
+pub const GRACE_TICKS_FACTOR: u64 = 2;
-const MAX_GRACE_SLOTS: u64 = 2;
+pub const MAX_GRACE_SLOTS: u64 = 2;
 
 #[derive(Error, Debug, Clone)]
 pub enum PohRecorderError {
@@ -85,6 +85,7 @@ impl PohRecorder {
                 bank.slot(),
                 &bank,
                 Some(&self.blockstore),
+                GRACE_TICKS_FACTOR * MAX_GRACE_SLOTS,
             );
             assert_eq!(self.ticks_per_slot, bank.ticks_per_slot());
             let (leader_first_tick_height, leader_last_tick_height, grace_ticks) =
@@ -151,6 +152,17 @@ impl PohRecorder {
         })
     }
 
+    fn prev_slot_was_mine(&self, current_slot: Slot) -> bool {
+        if let Some(leader_id) = self
+            .leader_schedule_cache
+            .slot_leader_at(current_slot.saturating_sub(1), None)
+        {
+            leader_id == self.id
+        } else {
+            false
+        }
+    }
+
     fn reached_leader_tick(&self, leader_first_tick_height: u64) -> bool {
         let target_tick_height = leader_first_tick_height.saturating_sub(1);
         let ideal_target_tick_height = target_tick_height.saturating_sub(self.grace_ticks);
@@ -160,7 +172,8 @@ impl PohRecorder {
         self.tick_height >= target_tick_height
             || self.start_tick_height + self.grace_ticks == leader_first_tick_height
             || (self.tick_height >= ideal_target_tick_height
-                && !self.received_any_previous_leader_data(current_slot))
+                && (self.prev_slot_was_mine(current_slot)
+                    || !self.received_any_previous_leader_data(current_slot)))
     }
 
     /// returns if leader slot has been reached, how many grace ticks were afforded,
@@ -1130,6 +1143,7 @@ mod tests {
             let GenesisConfigInfo { genesis_config, .. } = create_genesis_config(2);
             let bank = Arc::new(Bank::new(&genesis_config));
             let prev_hash = bank.last_blockhash();
+            let leader_schedule_cache = Arc::new(LeaderScheduleCache::new_from_bank(&bank));
             let (mut poh_recorder, _entry_receiver) = PohRecorder::new(
                 0,
                 prev_hash,
@@ -1138,10 +1152,12 @@ mod tests {
                 bank.ticks_per_slot(),
                 &Pubkey::default(),
                 &Arc::new(blockstore),
-                &Arc::new(LeaderScheduleCache::new_from_bank(&bank)),
+                &leader_schedule_cache,
                 &Arc::new(PohConfig::default()),
             );
 
+            let bootstrap_validator_id = leader_schedule_cache.slot_leader_at(0, None).unwrap();
+
             assert_eq!(poh_recorder.reached_leader_tick(0), true);
 
             let grace_ticks = bank.ticks_per_slot() * MAX_GRACE_SLOTS;
@@ -1170,6 +1186,11 @@ mod tests {
                 poh_recorder.reached_leader_tick(new_tick_height + grace_ticks),
                 false
             );
+
+            // From the bootstrap validator's perspective, it should have reached
+            // the tick
+            poh_recorder.id = bootstrap_validator_id;
+            assert!(poh_recorder.reached_leader_tick(new_tick_height + grace_ticks));
         }
     }
 

core/src/repair_service.rs

@@ -317,7 +317,7 @@ impl RepairService {
         );
     }
 
-    // Update the gossiped structure used for the "Repairmen" repair protocol. See book
+    // Update the gossiped structure used for the "Repairmen" repair protocol. See docs
     // for details.
     fn update_epoch_slots(
         id: Pubkey,

core/src/replay_stage.rs

@@ -4,7 +4,7 @@ use crate::{
     cluster_info::ClusterInfo,
     commitment::{AggregateCommitmentService, BlockCommitmentCache, CommitmentAggregationData},
     consensus::{StakeLockout, Tower},
-    poh_recorder::PohRecorder,
+    poh_recorder::{PohRecorder, GRACE_TICKS_FACTOR, MAX_GRACE_SLOTS},
     result::Result,
     rewards_recorder_service::RewardsRecorderSender,
     rpc_subscriptions::RpcSubscriptions,
@@ -252,7 +252,6 @@ impl ReplayStage {
                     );
 
                     let ancestors = Arc::new(bank_forks.read().unwrap().ancestors());
-                    loop {
                     let start = allocated.get();
                     let mut frozen_banks: Vec<_> = bank_forks
                         .read()
@@ -287,7 +286,7 @@ impl ReplayStage {
                         }
                     }
 
-                        let vote_bank = Self::select_fork(&frozen_banks, &tower, &mut progress);
+                    let vote_bank = Self::select_fork(&frozen_banks, &tower, &progress);
                     datapoint_debug!(
                         "replay_stage-memory",
                         ("select_fork", (allocated.get() - start) as i64, i64),
@@ -305,7 +304,6 @@ impl ReplayStage {
                             fork_stats.total_staked,
                         )
                     };
-                        let mut done = false;
                     let mut vote_bank_slot = None;
                     let start = allocated.get();
                     if !is_locked_out && vote_threshold {
@@ -380,17 +378,11 @@ impl ReplayStage {
                             partition = false;
                             inc_new_counter_info!("replay_stage-partition_resolved", 1);
                         }
-                        } else {
-                            done = true;
                     }
                     datapoint_debug!(
                         "replay_stage-memory",
                         ("reset_bank", (allocated.get() - start) as i64, i64),
                     );
-                        if done {
-                            break;
-                        }
-                    }
 
                     let start = allocated.get();
                     if !tpu_has_bank {
@@ -690,6 +682,7 @@ impl ReplayStage {
             bank.slot(),
             &bank,
             Some(blockstore),
+            GRACE_TICKS_FACTOR * MAX_GRACE_SLOTS,
         );
         poh_recorder
             .lock()
@@ -848,7 +841,7 @@ impl ReplayStage {
     pub(crate) fn select_fork(
         frozen_banks: &[Arc<Bank>],
         tower: &Tower,
-        progress: &mut HashMap<u64, ForkProgress>,
+        progress: &HashMap<u64, ForkProgress>,
     ) -> Option<Arc<Bank>> {
         let tower_start = Instant::now();
         let num_frozen_banks = frozen_banks.len();
@@ -1055,7 +1048,7 @@ pub(crate) mod tests {
     use super::*;
     use crate::{
         commitment::BlockCommitment,
-        consensus::test::{initialize_state, VoteResult, VoteSimulator},
+        consensus::test::{initialize_state, VoteSimulator},
         consensus::Tower,
         genesis_utils::{create_genesis_config, create_genesis_config_with_leader},
         replay_stage::ReplayStage,
@@ -1087,7 +1080,7 @@ pub(crate) mod tests {
         transaction::TransactionError,
     };
     use solana_stake_program::stake_state;
-    use solana_vote_program::vote_state::{self, Vote, VoteState};
+    use solana_vote_program::vote_state::{self, Vote, VoteState, VoteStateVersions};
     use std::{
         fs::remove_dir_all,
         iter,
@@ -1122,7 +1115,8 @@ pub(crate) mod tests {
             let mut vote_account = bank.get_account(&pubkey).unwrap();
             let mut vote_state = VoteState::from(&vote_account).unwrap();
             vote_state.process_slot_vote_unchecked(slot);
-            vote_state.to(&mut vote_account).unwrap();
+            let versioned = VoteStateVersions::Current(Box::new(vote_state));
+            VoteState::to(&versioned, &mut vote_account).unwrap();
             bank.store_account(&pubkey, &vote_account);
         }
 
@@ -1298,7 +1292,7 @@ pub(crate) mod tests {
                     &mut fork_progresses[i],
                 );
                 let response =
-                    ReplayStage::select_fork(&frozen_banks, &towers[i], &mut fork_progresses[i]);
+                    ReplayStage::select_fork(&frozen_banks, &towers[i], &fork_progresses[i]);
 
                 if response.is_none() {
                     None
@@ -1706,7 +1700,8 @@ pub(crate) mod tests {
             let mut leader_vote_account = bank.get_account(&pubkey).unwrap();
             let mut vote_state = VoteState::from(&leader_vote_account).unwrap();
             vote_state.process_slot_vote_unchecked(bank.slot());
-            vote_state.to(&mut leader_vote_account).unwrap();
+            let versioned = VoteStateVersions::Current(Box::new(vote_state));
+            VoteState::to(&versioned, &mut leader_vote_account).unwrap();
             bank.store_account(&pubkey, &leader_vote_account);
         }
 
@@ -1937,8 +1932,8 @@ pub(crate) mod tests {
         let mut cluster_votes: HashMap<Pubkey, Vec<Slot>> = HashMap::new();
         let votes: Vec<Slot> = vec![0, 2];
         for vote in &votes {
-            assert_eq!(
+            assert!(voting_simulator
-                voting_simulator.simulate_vote(
+                .simulate_vote(
                     *vote,
                     &bank_forks,
                     &mut cluster_votes,
@@ -1946,9 +1941,8 @@ pub(crate) mod tests {
                     keypairs.get(&node_pubkey).unwrap(),
                     &mut progress,
                     &mut tower,
-                ),
+                )
-                VoteResult::Ok
+                .is_empty());
-            );
         }
 
         let mut frozen_banks: Vec<_> = bank_forks

core/src/rpc_pubsub.rs

@@ -12,7 +12,7 @@ use std::sync::{atomic, Arc};
 //   https://github.com/paritytech/jsonrpc/blob/2d38e6424d8461cdf72e78425ce67d51af9c6586/derive/src/lib.rs#L204
 // Once https://github.com/paritytech/jsonrpc/issues/418 is resolved, try to remove this clippy allow
 #[allow(clippy::needless_return)]
-#[rpc(server)]
+#[rpc]
 pub trait RpcSolPubSub {
     type Metadata;
 

core/src/rpc_pubsub_service.rs

@@ -37,6 +37,8 @@ impl PubSubService {
                         });
                         session
                 })
+                .max_connections(1000) // Arbitrary, default of 100 is too low
+                .max_payload(10 * 1024 * 1024 + 1024) // max account size (10MB) + extra (1K)
                 .start(&pubsub_addr);
 
                 if let Err(e) = server {

core/src/rpc_service.rs

@@ -9,7 +9,12 @@ use jsonrpc_http_server::{
     hyper, AccessControlAllowOrigin, CloseHandle, DomainsValidation, RequestMiddleware,
     RequestMiddlewareAction, ServerBuilder,
 };
-use solana_ledger::{bank_forks::BankForks, blockstore::Blockstore};
+use regex::Regex;
+use solana_ledger::{
+    bank_forks::{BankForks, SnapshotConfig},
+    blockstore::Blockstore,
+    snapshot_utils,
+};
 use solana_sdk::hash::Hash;
 use std::{
     net::SocketAddr,
@@ -28,13 +33,28 @@ pub struct JsonRpcService {
     close_handle: Option<CloseHandle>,
 }
 
-#[derive(Default)]
 struct RpcRequestMiddleware {
     ledger_path: PathBuf,
+    snapshot_archive_path_regex: Regex,
+    snapshot_config: Option<SnapshotConfig>,
 }
+
 impl RpcRequestMiddleware {
-    pub fn new(ledger_path: PathBuf) -> Self {
+    pub fn new(ledger_path: PathBuf, snapshot_config: Option<SnapshotConfig>) -> Self {
-        Self { ledger_path }
+        Self {
+            ledger_path,
+            snapshot_archive_path_regex: Regex::new(r"/snapshot-\d+-[[:alnum:]]+\.tar\.bz2$")
+                .unwrap(),
+            snapshot_config,
+        }
+    }
+
+    fn redirect(location: &str) -> hyper::Response<hyper::Body> {
+        hyper::Response::builder()
+            .status(hyper::StatusCode::SEE_OTHER)
+            .header(hyper::header::LOCATION, location)
+            .body(hyper::Body::from(String::from(location)))
+            .unwrap()
     }
 
     fn not_found() -> hyper::Response<hyper::Body> {
@@ -51,9 +71,25 @@ impl RpcRequestMiddleware {
             .unwrap()
     }
 
-    fn get(&self, filename: &str) -> RequestMiddlewareAction {
+    fn is_get_path(&self, path: &str) -> bool {
-        info!("get {}", filename);
+        match path {
-        let filename = self.ledger_path.join(filename);
+            "/genesis.tar.bz2" => true,
+            _ => {
+                if self.snapshot_config.is_some() {
+                    self.snapshot_archive_path_regex.is_match(path)
+                } else {
+                    false
+                }
+            }
+        }
+    }
+
+    fn get(&self, path: &str) -> RequestMiddlewareAction {
+        let filename = self.ledger_path.join(
+            path.split_at(1).1, // Drop leading '/' from path
+        );
+        info!("get {} -> {:?}", path, filename);
+
         RequestMiddlewareAction::Respond {
             should_validate_hosts: true,
             response: Box::new(
@@ -73,13 +109,40 @@ impl RpcRequestMiddleware {
 impl RequestMiddleware for RpcRequestMiddleware {
     fn on_request(&self, request: hyper::Request<hyper::Body>) -> RequestMiddlewareAction {
         trace!("request uri: {}", request.uri());
-        match request.uri().path() {
+
-            "/snapshot.tar.bz2" => self.get("snapshot.tar.bz2"),
+        if let Some(ref snapshot_config) = self.snapshot_config {
-            "/genesis.tar.bz2" => self.get("genesis.tar.bz2"),
+            if request.uri().path() == "/snapshot.tar.bz2" {
-            _ => RequestMiddlewareAction::Proceed {
+                // Convenience redirect to the latest snapshot
+                return RequestMiddlewareAction::Respond {
+                    should_validate_hosts: true,
+                    response: Box::new(jsonrpc_core::futures::future::ok(
+                        if let Some((snapshot_archive, _)) =
+                            snapshot_utils::get_highest_snapshot_archive_path(
+                                &snapshot_config.snapshot_package_output_path,
+                            )
+                        {
+                            RpcRequestMiddleware::redirect(&format!(
+                                "/{}",
+                                snapshot_archive
+                                    .file_name()
+                                    .unwrap_or_else(|| std::ffi::OsStr::new(""))
+                                    .to_str()
+                                    .unwrap_or(&"")
+                            ))
+                        } else {
+                            RpcRequestMiddleware::not_found()
+                        },
+                    )),
+                };
+            }
+        }
+        if self.is_get_path(request.uri().path()) {
+            self.get(request.uri().path())
+        } else {
+            RequestMiddlewareAction::Proceed {
                 should_continue_on_invalid_cors: false,
                 request,
-            },
+            }
         }
     }
 }
@@ -89,6 +152,7 @@ impl JsonRpcService {
     pub fn new(
         rpc_addr: SocketAddr,
         config: JsonRpcConfig,
+        snapshot_config: Option<SnapshotConfig>,
         bank_forks: Arc<RwLock<BankForks>>,
         block_commitment_cache: Arc<RwLock<BlockCommitmentCache>>,
         blockstore: Arc<Blockstore>,
@@ -132,7 +196,7 @@ impl JsonRpcService {
                             AccessControlAllowOrigin::Any,
                         ]))
                         .cors_max_age(86400)
-                        .request_middleware(RpcRequestMiddleware::new(ledger_path))
+                        .request_middleware(RpcRequestMiddleware::new(ledger_path, snapshot_config))
                         .start_http(&rpc_addr);
                 if let Err(e) = server {
                     warn!("JSON RPC service unavailable error: {:?}. \nAlso, check that port {} is not already in use by another application", e, rpc_addr.port());
@@ -209,6 +273,7 @@ mod tests {
         let mut rpc_service = JsonRpcService::new(
             rpc_addr,
             JsonRpcConfig::default(),
+            None,
             bank_forks,
             block_commitment_cache,
             Arc::new(blockstore),
@@ -234,4 +299,36 @@ mod tests {
         rpc_service.exit();
         rpc_service.join().unwrap();
     }
+
+    #[test]
+    fn test_is_get_path() {
+        let rrm = RpcRequestMiddleware::new(PathBuf::from("/"), None);
+        let rrm_with_snapshot_config = RpcRequestMiddleware::new(
+            PathBuf::from("/"),
+            Some(SnapshotConfig {
+                snapshot_interval_slots: 0,
+                snapshot_package_output_path: PathBuf::from("/"),
+                snapshot_path: PathBuf::from("/"),
+            }),
+        );
+
+        assert!(rrm.is_get_path("/genesis.tar.bz2"));
+        assert!(!rrm.is_get_path("genesis.tar.bz2"));
+
+        assert!(!rrm.is_get_path("/snapshot.tar.bz2")); // This is a redirect
+
+        assert!(
+            !rrm.is_get_path("/snapshot-100-AvFf9oS8A8U78HdjT9YG2sTTThLHJZmhaMn2g8vkWYnr.tar.bz2")
+        );
+        assert!(rrm_with_snapshot_config
+            .is_get_path("/snapshot-100-AvFf9oS8A8U78HdjT9YG2sTTThLHJZmhaMn2g8vkWYnr.tar.bz2"));
+
+        assert!(!rrm.is_get_path(
+            "/snapshot-notaslotnumber-AvFf9oS8A8U78HdjT9YG2sTTThLHJZmhaMn2g8vkWYnr.tar.bz2"
+        ));
+
+        assert!(!rrm.is_get_path("/"));
+        assert!(!rrm.is_get_path(".."));
+        assert!(!rrm.is_get_path("🎣"));
+    }
 }

core/src/rpc_subscriptions.rs

@@ -17,14 +17,16 @@ use std::thread::{Builder, JoinHandle};
 use std::time::Duration;
 use std::{
     collections::{HashMap, HashSet},
+    iter,
     sync::{Arc, Mutex, RwLock},
 };
+use tokio::runtime::{Builder as RuntimeBuilder, Runtime, TaskExecutor};
 
 const RECEIVE_DELAY_MILLIS: u64 = 100;
 
 pub type Confirmations = usize;
 
-#[derive(Serialize, Clone, Copy, Debug)]
+#[derive(Serialize, Deserialize, Clone, Copy, Debug)]
 pub struct SlotInfo {
     pub slot: Slot,
     pub parent: Slot,
@@ -103,19 +105,20 @@ where
     found
 }
 
-fn check_confirmations_and_notify<K, S, F, N, X>(
+fn check_confirmations_and_notify<K, S, B, F, X>(
     subscriptions: &HashMap<K, HashMap<SubscriptionId, (Sink<S>, Confirmations)>>,
     hashmap_key: &K,
     current_slot: Slot,
     bank_forks: &Arc<RwLock<BankForks>>,
-    bank_method: F,
+    bank_method: B,
-    notify: N,
+    filter_results: F,
+    notifier: &RpcNotifier,
 ) -> HashSet<SubscriptionId>
 where
     K: Eq + Hash + Clone + Copy,
     S: Clone + Serialize,
-    F: Fn(&Bank, &K) -> X,
+    B: Fn(&Bank, &K) -> X,
-    N: Fn(X, &Sink<S>, u64) -> bool,
+    F: Fn(X, u64) -> Box<dyn Iterator<Item = S>>,
     X: Clone + Serialize,
 {
     let current_ancestors = bank_forks
@@ -149,8 +152,9 @@ where
                     .get(desired_slot[0])
                     .unwrap()
                     .clone();
-                let result = bank_method(&desired_bank, hashmap_key);
+                let results = bank_method(&desired_bank, hashmap_key);
-                if notify(result, &sink, root) {
+                for result in filter_results(results, root) {
+                    notifier.notify(result, sink);
                     notified_set.insert(bank_sub_id.clone());
                 }
             }
@@ -159,41 +163,49 @@ where
     notified_set
 }
 
-fn notify_account(result: Option<(Account, Slot)>, sink: &Sink<RpcAccount>, root: Slot) -> bool {
+struct RpcNotifier(TaskExecutor);
+
+impl RpcNotifier {
+    fn notify<T>(&self, value: T, sink: &Sink<T>)
+    where
+        T: serde::Serialize,
+    {
+        self.0
+            .spawn(sink.notify(Ok(value)).map(|_| ()).map_err(|_| ()));
+    }
+}
+
+fn filter_account_result(
+    result: Option<(Account, Slot)>,
+    root: Slot,
+) -> Box<dyn Iterator<Item = RpcAccount>> {
     if let Some((account, fork)) = result {
         if fork >= root {
-            sink.notify(Ok(RpcAccount::encode(account))).wait().unwrap();
+            return Box::new(iter::once(RpcAccount::encode(account)));
-            return true;
         }
     }
-    false
+    Box::new(iter::empty())
 }
 
-fn notify_signature<S>(result: Option<S>, sink: &Sink<S>, _root: Slot) -> bool
+fn filter_signature_result<S>(result: Option<S>, _root: Slot) -> Box<dyn Iterator<Item = S>>
 where
-    S: Clone + Serialize,
+    S: 'static + Clone + Serialize,
 {
-    if let Some(result) = result {
+    Box::new(result.into_iter())
-        sink.notify(Ok(result)).wait().unwrap();
-        return true;
-    }
-    false
 }
 
-fn notify_program(
+fn filter_program_results(
     accounts: Vec<(Pubkey, Account)>,
-    sink: &Sink<RpcKeyedAccount>,
     _root: Slot,
-) -> bool {
+) -> Box<dyn Iterator<Item = RpcKeyedAccount>> {
-    for (pubkey, account) in accounts.iter() {
+    Box::new(
-        sink.notify(Ok(RpcKeyedAccount {
+        accounts
+            .into_iter()
+            .map(|(pubkey, account)| RpcKeyedAccount {
                 pubkey: pubkey.to_string(),
-            account: RpcAccount::encode(account.clone()),
+                account: RpcAccount::encode(account),
-        }))
+            }),
-        .wait()
+    )
-        .unwrap();
-    }
-    !accounts.is_empty()
 }
 
 pub struct RpcSubscriptions {
@@ -203,6 +215,7 @@ pub struct RpcSubscriptions {
     slot_subscriptions: Arc<RpcSlotSubscriptions>,
     notification_sender: Arc<Mutex<Sender<NotificationEntry>>>,
     t_cleanup: Option<JoinHandle<()>>,
+    notifier_runtime: Option<Runtime>,
     exit: Arc<AtomicBool>,
 }
 
@@ -239,11 +252,19 @@ impl RpcSubscriptions {
         let signature_subscriptions_clone = signature_subscriptions.clone();
         let slot_subscriptions_clone = slot_subscriptions.clone();
 
+        let notifier_runtime = RuntimeBuilder::new()
+            .core_threads(1)
+            .name_prefix("solana-rpc-notifier-")
+            .build()
+            .unwrap();
+
+        let notifier = RpcNotifier(notifier_runtime.executor());
         let t_cleanup = Builder::new()
             .name("solana-rpc-notifications".to_string())
             .spawn(move || {
                 Self::process_notifications(
                     exit_clone,
+                    notifier,
                     notification_receiver,
                     account_subscriptions_clone,
                     program_subscriptions_clone,
@@ -259,6 +280,7 @@ impl RpcSubscriptions {
             signature_subscriptions,
             slot_subscriptions,
             notification_sender,
+            notifier_runtime: Some(notifier_runtime),
             t_cleanup: Some(t_cleanup),
             exit: exit.clone(),
         }
@@ -269,6 +291,7 @@ impl RpcSubscriptions {
         current_slot: Slot,
         bank_forks: &Arc<RwLock<BankForks>>,
         account_subscriptions: Arc<RpcAccountSubscriptions>,
+        notifier: &RpcNotifier,
     ) {
         let subscriptions = account_subscriptions.read().unwrap();
         check_confirmations_and_notify(
@@ -277,7 +300,8 @@ impl RpcSubscriptions {
             current_slot,
             bank_forks,
             Bank::get_account_modified_since_parent,
-            notify_account,
+            filter_account_result,
+            notifier,
         );
     }
 
@@ -286,6 +310,7 @@ impl RpcSubscriptions {
         current_slot: Slot,
         bank_forks: &Arc<RwLock<BankForks>>,
         program_subscriptions: Arc<RpcProgramSubscriptions>,
+        notifier: &RpcNotifier,
     ) {
         let subscriptions = program_subscriptions.read().unwrap();
         check_confirmations_and_notify(
@@ -294,7 +319,8 @@ impl RpcSubscriptions {
             current_slot,
             bank_forks,
             Bank::get_program_accounts_modified_since_parent,
-            notify_program,
+            filter_program_results,
+            notifier,
         );
     }
 
@@ -303,6 +329,7 @@ impl RpcSubscriptions {
         current_slot: Slot,
         bank_forks: &Arc<RwLock<BankForks>>,
         signature_subscriptions: Arc<RpcSignatureSubscriptions>,
+        notifier: &RpcNotifier,
     ) {
         let mut subscriptions = signature_subscriptions.write().unwrap();
         let notified_ids = check_confirmations_and_notify(
@@ -311,7 +338,8 @@ impl RpcSubscriptions {
             current_slot,
             bank_forks,
             Bank::get_signature_status,
-            notify_signature,
+            filter_signature_result,
+            notifier,
         );
         if let Some(subscription_ids) = subscriptions.get_mut(signature) {
             subscription_ids.retain(|k, _| !notified_ids.contains(k));
@@ -408,6 +436,7 @@ impl RpcSubscriptions {
 
     fn process_notifications(
         exit: Arc<AtomicBool>,
+        notifier: RpcNotifier,
         notification_receiver: Receiver<NotificationEntry>,
         account_subscriptions: Arc<RpcAccountSubscriptions>,
         program_subscriptions: Arc<RpcProgramSubscriptions>,
@@ -423,7 +452,7 @@ impl RpcSubscriptions {
                     NotificationEntry::Slot(slot_info) => {
                         let subscriptions = slot_subscriptions.read().unwrap();
                         for (_, sink) in subscriptions.iter() {
-                            sink.notify(Ok(slot_info)).wait().unwrap();
+                            notifier.notify(slot_info, sink);
                         }
                     }
                     NotificationEntry::Bank((current_slot, bank_forks)) => {
@@ -437,6 +466,7 @@ impl RpcSubscriptions {
                                 current_slot,
                                 &bank_forks,
                                 account_subscriptions.clone(),
+                                &notifier,
                             );
                         }
 
@@ -450,6 +480,7 @@ impl RpcSubscriptions {
                                 current_slot,
                                 &bank_forks,
                                 program_subscriptions.clone(),
+                                &notifier,
                             );
                         }
 
@@ -463,6 +494,7 @@ impl RpcSubscriptions {
                                 current_slot,
                                 &bank_forks,
                                 signature_subscriptions.clone(),
+                                &notifier,
                             );
                         }
                     }
@@ -479,6 +511,12 @@ impl RpcSubscriptions {
     }
 
     fn shutdown(&mut self) -> std::thread::Result<()> {
+        if let Some(runtime) = self.notifier_runtime.take() {
+            info!("RPC Notifier runtime - shutting down");
+            let _ = runtime.shutdown_now().wait();
+            info!("RPC Notifier runtime - shut down");
+        }
+
         if self.t_cleanup.is_some() {
             info!("RPC Notification thread - shutting down");
             self.exit.store(true, Ordering::Relaxed);

core/src/snapshot_packager_service.rs

@@ -1,4 +1,4 @@
-use crate::cluster_info::ClusterInfo;
+use crate::cluster_info::{ClusterInfo, MAX_SNAPSHOT_HASHES};
 use solana_ledger::{
     snapshot_package::SnapshotPackageReceiver, snapshot_utils::archive_snapshot_package,
 };
@@ -16,8 +16,6 @@ pub struct SnapshotPackagerService {
     t_snapshot_packager: JoinHandle<()>,
 }
 
-const MAX_SNAPSHOT_HASHES: usize = 24;
-
 impl SnapshotPackagerService {
     pub fn new(
         snapshot_package_receiver: SnapshotPackageReceiver,
@@ -37,17 +35,16 @@ impl SnapshotPackagerService {
 
                     match snapshot_package_receiver.recv_timeout(Duration::from_secs(1)) {
                         Ok(mut snapshot_package) => {
-                            hashes.push((snapshot_package.root, snapshot_package.hash));
                             // Only package the latest
                             while let Ok(new_snapshot_package) =
                                 snapshot_package_receiver.try_recv()
                             {
                                 snapshot_package = new_snapshot_package;
-                                hashes.push((snapshot_package.root, snapshot_package.hash));
                             }
                             if let Err(err) = archive_snapshot_package(&snapshot_package) {
                                 warn!("Failed to create snapshot archive: {}", err);
-                            }
+                            } else {
+                                hashes.push((snapshot_package.root, snapshot_package.hash));
                                 while hashes.len() > MAX_SNAPSHOT_HASHES {
                                     hashes.remove(0);
                                 }
@@ -56,6 +53,7 @@ impl SnapshotPackagerService {
                                     .unwrap()
                                     .push_snapshot_hashes(hashes.clone());
                             }
+                        }
                         Err(RecvTimeoutError::Disconnected) => break,
                         Err(RecvTimeoutError::Timeout) => (),
                     }
@@ -154,8 +152,10 @@ mod tests {
         }
 
         // Create a packageable snapshot
-        let output_tar_path =
+        let output_tar_path = snapshot_utils::get_snapshot_archive_path(
-            snapshot_utils::get_snapshot_archive_path(&snapshot_package_output_path);
+            &snapshot_package_output_path,
+            &(42, Hash::default()),
+        );
         let snapshot_package = SnapshotPackage::new(
             5,
             vec![],

core/src/streamer.rs

@@ -133,7 +133,7 @@ pub fn responder(name: &'static str, sock: Arc<UdpSocket>, r: PacketReceiver) ->
                 match e {
                     StreamerError::RecvTimeoutError(RecvTimeoutError::Disconnected) => break,
                     StreamerError::RecvTimeoutError(RecvTimeoutError::Timeout) => (),
-                    _ => warn!("{} responder error: {:?}", name, e),
+                    _ => info!("{} responder error: {:?}", name, e),
                 }
             }
         })

core/src/validator.rs

@@ -6,7 +6,7 @@ use crate::{
     commitment::BlockCommitmentCache,
     contact_info::ContactInfo,
     gossip_service::{discover_cluster, GossipService},
-    poh_recorder::PohRecorder,
+    poh_recorder::{PohRecorder, GRACE_TICKS_FACTOR, MAX_GRACE_SLOTS},
     poh_service::PohService,
     rewards_recorder_service::RewardsRecorderService,
     rpc::JsonRpcConfig,
@@ -35,6 +35,7 @@ use solana_metrics::datapoint_info;
 use solana_runtime::bank::Bank;
 use solana_sdk::{
     clock::{Slot, DEFAULT_SLOTS_PER_TURN},
+    epoch_schedule::MAX_LEADER_SCHEDULE_EPOCH_OFFSET,
     genesis_config::GenesisConfig,
     hash::Hash,
     pubkey::Pubkey,
@@ -43,6 +44,7 @@ use solana_sdk::{
     timing::timestamp,
 };
 use std::{
+    collections::HashSet,
     net::{IpAddr, Ipv4Addr, SocketAddr},
     path::{Path, PathBuf},
     process,
@@ -70,8 +72,9 @@ pub struct ValidatorConfig {
     pub broadcast_stage_type: BroadcastStageType,
     pub enable_partition: Option<Arc<AtomicBool>>,
     pub fixed_leader_schedule: Option<FixedSchedule>,
-    pub wait_for_supermajority: bool,
+    pub wait_for_supermajority: Option<Slot>,
     pub new_hard_forks: Option<Vec<Slot>>,
+    pub trusted_validators: Option<HashSet<Pubkey>>, // None = trust all
 }
 
 impl Default for ValidatorConfig {
@@ -92,8 +95,9 @@ impl Default for ValidatorConfig {
             broadcast_stage_type: BroadcastStageType::Standard,
             enable_partition: None,
             fixed_leader_schedule: None,
-            wait_for_supermajority: false,
+            wait_for_supermajority: None,
             new_hard_forks: None,
+            trusted_validators: None,
         }
     }
 }
@@ -238,6 +242,7 @@ impl Validator {
                 JsonRpcService::new(
                     SocketAddr::new(IpAddr::V4(Ipv4Addr::new(0, 0, 0, 0)), rpc_port),
                     config.rpc_config.clone(),
+                    config.snapshot_config.clone(),
                     bank_forks.clone(),
                     block_commitment_cache.clone(),
                     blockstore.clone(),
@@ -305,7 +310,13 @@ impl Validator {
             bank.tick_height(),
             bank.last_blockhash(),
             bank.slot(),
-            leader_schedule_cache.next_leader_slot(&id, bank.slot(), &bank, Some(&blockstore)),
+            leader_schedule_cache.next_leader_slot(
+                &id,
+                bank.slot(),
+                &bank,
+                Some(&blockstore),
+                GRACE_TICKS_FACTOR * MAX_GRACE_SLOTS,
+            ),
             bank.ticks_per_slot(),
             &id,
             &blockstore,
@@ -345,9 +356,7 @@ impl Validator {
         }
 
         if let Some(snapshot_hash) = snapshot_hash {
-            if let Some(ref trusted_validators) =
+            if let Some(ref trusted_validators) = config.trusted_validators {
-                config.snapshot_config.as_ref().unwrap().trusted_validators
-            {
                 let mut trusted = false;
                 for _ in 0..10 {
                     trusted = cluster_info
@@ -372,12 +381,6 @@ impl Validator {
                     process::exit(1);
                 }
             }
-
-            // If the node was loaded from a snapshot, advertise it in gossip
-            cluster_info
-                .write()
-                .unwrap()
-                .push_snapshot_hashes(vec![snapshot_hash]);
         }
 
         wait_for_supermajority(config, &bank, &cluster_info);
@@ -562,6 +565,14 @@ fn new_banks_from_blockstore(
         error!("Failed to load genesis from {:?}: {}", blockstore_path, err);
         process::exit(1);
     });
+
+    // This needs to be limited otherwise the state in the VoteAccount data
+    // grows too large
+    let leader_schedule_slot_offset = genesis_config.epoch_schedule.leader_schedule_slot_offset;
+    let slots_per_epoch = genesis_config.epoch_schedule.slots_per_epoch;
+    let leader_epoch_offset = (leader_schedule_slot_offset + slots_per_epoch - 1) / slots_per_epoch;
+    assert!(leader_epoch_offset <= MAX_LEADER_SCHEDULE_EPOCH_OFFSET);
+
     let genesis_hash = genesis_config.hash();
     info!("genesis hash: {}", genesis_hash);
 
@@ -620,7 +631,7 @@ fn wait_for_supermajority(
     bank: &Arc<Bank>,
     cluster_info: &Arc<RwLock<ClusterInfo>>,
 ) {
-    if !config.wait_for_supermajority {
+    if config.wait_for_supermajority != Some(bank.slot()) {
         return;
     }
 
@@ -639,25 +650,43 @@ fn wait_for_supermajority(
     }
 }
 
-pub fn new_validator_for_tests() -> (Validator, ContactInfo, Keypair, PathBuf) {
+pub struct TestValidator {
-    let (node, contact_info, mint_keypair, ledger_path, _vote_pubkey) =
+    pub server: Validator,
-        new_validator_for_tests_with_vote_pubkey();
+    pub leader_data: ContactInfo,
-    (node, contact_info, mint_keypair, ledger_path)
+    pub alice: Keypair,
+    pub ledger_path: PathBuf,
+    pub genesis_hash: Hash,
+    pub vote_pubkey: Pubkey,
 }
 
-pub fn new_validator_for_tests_with_vote_pubkey(
+pub struct TestValidatorOptions {
-) -> (Validator, ContactInfo, Keypair, PathBuf, Pubkey) {
+    pub fees: u64,
+    pub bootstrap_validator_lamports: u64,
+}
+
+impl Default for TestValidatorOptions {
+    fn default() -> Self {
         use crate::genesis_utils::BOOTSTRAP_VALIDATOR_LAMPORTS;
-    new_validator_for_tests_ex(0, BOOTSTRAP_VALIDATOR_LAMPORTS)
+        TestValidatorOptions {
+            fees: 0,
+            bootstrap_validator_lamports: BOOTSTRAP_VALIDATOR_LAMPORTS,
+        }
+    }
 }
 
-pub fn new_validator_for_tests_ex(
+impl TestValidator {
-    fees: u64,
+    pub fn run() -> Self {
-    bootstrap_validator_lamports: u64,
+        Self::run_with_options(TestValidatorOptions::default())
-) -> (Validator, ContactInfo, Keypair, PathBuf, Pubkey) {
+    }
+
+    pub fn run_with_options(options: TestValidatorOptions) -> Self {
         use crate::genesis_utils::{create_genesis_config_with_leader_ex, GenesisConfigInfo};
         use solana_sdk::fee_calculator::FeeCalculator;
 
+        let TestValidatorOptions {
+            fees,
+            bootstrap_validator_lamports,
+        } = options;
         let node_keypair = Arc::new(Keypair::new());
         let node = Node::new_localhost_with_pubkey(&node_keypair.pubkey());
         let contact_info = node.info.clone();
@@ -680,7 +709,7 @@ pub fn new_validator_for_tests_ex(
         genesis_config.rent.exemption_threshold = 1.0;
         genesis_config.fee_calculator = FeeCalculator::new(fees, 0);
 
-    let (ledger_path, _blockhash) = create_new_tmp_ledger!(&genesis_config);
+        let (ledger_path, blockhash) = create_new_tmp_ledger!(&genesis_config);
 
         let leader_voting_keypair = Arc::new(voting_keypair);
         let storage_keypair = Arc::new(Keypair::new());
@@ -700,13 +729,15 @@ pub fn new_validator_for_tests_ex(
             &config,
         );
         discover_cluster(&contact_info.gossip, 1).expect("Node startup failed");
-    (
+        TestValidator {
-        node,
+            server: node,
-        contact_info,
+            leader_data: contact_info,
-        mint_keypair,
+            alice: mint_keypair,
             ledger_path,
-        leader_voting_keypair.pubkey(),
+            genesis_hash: blockhash,
-    )
+            vote_pubkey: leader_voting_keypair.pubkey(),
+        }
+    }
 }
 
 fn report_target_features() {

core/tests/bank_forks.rs

@@ -55,7 +55,6 @@ mod tests {
             snapshot_interval_slots,
             snapshot_package_output_path: PathBuf::from(snapshot_output_path.path()),
             snapshot_path: PathBuf::from(snapshot_dir.path()),
-            trusted_validators: None,
         };
         bank_forks.set_snapshot_config(Some(snapshot_config.clone()));
         SnapshotTestConfig {
@@ -68,13 +67,19 @@ mod tests {
         }
     }
 
-    fn restore_from_snapshot(old_bank_forks: &BankForks, account_paths: Vec<PathBuf>) {
+    fn restore_from_snapshot(
+        old_bank_forks: &BankForks,
+        old_last_slot: Slot,
+        account_paths: Vec<PathBuf>,
+    ) {
         let (snapshot_path, snapshot_package_output_path) = old_bank_forks
             .snapshot_config
             .as_ref()
             .map(|c| (&c.snapshot_path, &c.snapshot_package_output_path))
             .unwrap();
 
+        let old_last_bank = old_bank_forks.get(old_last_slot).unwrap();
+
         let deserialized_bank = snapshot_utils::bank_from_archive(
             &account_paths,
             &old_bank_forks
@@ -82,7 +87,10 @@ mod tests {
                 .as_ref()
                 .unwrap()
                 .snapshot_path,
-            snapshot_utils::get_snapshot_archive_path(snapshot_package_output_path),
+            snapshot_utils::get_snapshot_archive_path(
+                snapshot_package_output_path,
+                &(old_last_bank.slot(), old_last_bank.get_accounts_hash()),
+            ),
         )
         .unwrap();
 
@@ -140,18 +148,20 @@ mod tests {
             slot_snapshot_paths
                 .last()
                 .expect("no snapshots found in path"),
-            snapshot_utils::get_snapshot_archive_path(
-                &snapshot_config.snapshot_package_output_path,
-            ),
             &snapshot_config.snapshot_path,
             &last_bank.src.roots(),
+            &snapshot_config.snapshot_package_output_path,
             storages,
         )
         .unwrap();
 
         snapshot_utils::archive_snapshot_package(&snapshot_package).unwrap();
 
-        restore_from_snapshot(bank_forks, vec![accounts_dir.path().to_path_buf()]);
+        restore_from_snapshot(
+            bank_forks,
+            last_slot,
+            vec![accounts_dir.path().to_path_buf()],
+        );
     }
 
     #[test]
@@ -222,9 +232,8 @@ mod tests {
         let saved_snapshots_dir = TempDir::new().unwrap();
         let saved_accounts_dir = TempDir::new().unwrap();
         let saved_slot = 4;
-        let saved_tar = snapshot_config
+        let mut saved_archive_path = None;
-            .snapshot_package_output_path
+
-            .join(saved_slot.to_string());
         for forks in 0..MAX_CACHE_ENTRIES + 2 {
             let bank = Bank::new_from_parent(
                 &bank_forks[forks as u64],
@@ -236,6 +245,7 @@ mod tests {
             let tx = system_transaction::transfer(&mint_keypair, &key1, 1, genesis_config.hash());
             assert_eq!(bank.process_transaction(&tx), Ok(()));
             bank.squash();
+            let accounts_hash = bank.update_accounts_hash();
             bank_forks.insert(bank);
 
             let package_sender = {
@@ -250,14 +260,7 @@ mod tests {
             };
 
             bank_forks
-                .generate_snapshot(
+                .generate_snapshot(slot, &vec![], &package_sender)
-                    slot,
-                    &vec![],
-                    &package_sender,
-                    snapshot_config
-                        .snapshot_package_output_path
-                        .join(slot.to_string()),
-                )
                 .unwrap();
 
             if slot == saved_slot as u64 {
@@ -283,6 +286,11 @@ mod tests {
                     &options,
                 )
                 .unwrap();
+
+                saved_archive_path = Some(snapshot_utils::get_snapshot_archive_path(
+                    &snapshot_config.snapshot_package_output_path,
+                    &(slot, accounts_hash),
+                ));
             }
         }
 
@@ -320,7 +328,7 @@ mod tests {
             .join()
             .expect("SnapshotPackagerService exited with error");
 
-        // Check the tar we cached the state for earlier was generated correctly
+        // Check the archive we cached the state for earlier was generated correctly
 
         // before we compare, stick an empty status_cache in this dir so that the package comparision works
         // This is needed since the status_cache is added by the packager and is not collected from
@@ -339,7 +347,7 @@ mod tests {
         .unwrap();
 
         snapshot_utils::verify_snapshot_archive(
-            saved_tar,
+            saved_archive_path.unwrap(),
             saved_snapshots_dir.path(),
             saved_accounts_dir
                 .path()

core/tests/client.rs

@@ -4,7 +4,7 @@ use solana_client::{
 };
 use solana_core::{
     rpc_pubsub_service::PubSubService, rpc_subscriptions::RpcSubscriptions,
-    validator::new_validator_for_tests,
+    validator::TestValidator,
 };
 use solana_sdk::{
     commitment_config::CommitmentConfig, pubkey::Pubkey, rpc_port, signature::Signer,
@@ -26,7 +26,13 @@ use systemstat::Ipv4Addr;
 fn test_rpc_client() {
     solana_logger::setup();
 
-    let (server, leader_data, alice, ledger_path) = new_validator_for_tests();
+    let TestValidator {
+        server,
+        leader_data,
+        alice,
+        ledger_path,
+        ..
+    } = TestValidator::run();
     let bob_pubkey = Pubkey::new_rand();
 
     let client = RpcClient::new_socket(leader_data.rpc);

core/tests/fork-selection.rs

@@ -1,6 +1,6 @@
 //! Fork Selection Simulation
 //!
-//! Description of the algorithm can be found in [book/src/fork-selection.md](book/src/fork-selection.md).
+//! Description of the algorithm can be found in [docs/src/fork-selection.md](docs/src/fork-selection.md).
 //!
 //! A test library function exists for configuring networks.
 //! ```

core/tests/rpc.rs

@@ -1,21 +1,38 @@
 use bincode::serialize;
+use jsonrpc_core::futures::{
+    future::{self, Future},
+    stream::Stream,
+};
+use jsonrpc_core_client::transports::ws;
 use log::*;
 use reqwest::{self, header::CONTENT_TYPE};
 use serde_json::{json, Value};
 use solana_client::rpc_client::get_rpc_request_str;
-use solana_core::validator::new_validator_for_tests;
+use solana_core::{rpc_pubsub::gen_client::Client as PubsubClient, validator::TestValidator};
-use solana_sdk::hash::Hash;
+use solana_sdk::{hash::Hash, pubkey::Pubkey, system_transaction, transaction};
-use solana_sdk::pubkey::Pubkey;
+use std::{
-use solana_sdk::system_transaction;
+    collections::HashSet,
-use std::fs::remove_dir_all;
+    fs::remove_dir_all,
-use std::thread::sleep;
+    net::UdpSocket,
-use std::time::Duration;
+    sync::mpsc::channel,
+    sync::{Arc, Mutex},
+    thread::sleep,
+    time::Duration,
+    time::SystemTime,
+};
+use tokio::runtime::Runtime;
 
 #[test]
 fn test_rpc_send_tx() {
     solana_logger::setup();
 
-    let (server, leader_data, alice, ledger_path) = new_validator_for_tests();
+    let TestValidator {
+        server,
+        leader_data,
+        alice,
+        ledger_path,
+        ..
+    } = TestValidator::run();
     let bob_pubkey = Pubkey::new_rand();
 
     let client = reqwest::blocking::Client::new();
@@ -100,7 +117,12 @@ fn test_rpc_send_tx() {
 fn test_rpc_invalid_requests() {
     solana_logger::setup();
 
-    let (server, leader_data, _alice, ledger_path) = new_validator_for_tests();
+    let TestValidator {
+        server,
+        leader_data,
+        ledger_path,
+        ..
+    } = TestValidator::run();
     let bob_pubkey = Pubkey::new_rand();
 
     // test invalid get_balance request
@@ -166,3 +188,82 @@ fn test_rpc_invalid_requests() {
     server.close().unwrap();
     remove_dir_all(ledger_path).unwrap();
 }
+
+#[test]
+fn test_rpc_subscriptions() {
+    solana_logger::setup();
+
+    let TestValidator {
+        server,
+        leader_data,
+        alice,
+        ledger_path,
+        genesis_hash,
+        ..
+    } = TestValidator::run();
+
+    // Create transaction signatures to subscribe to
+    let transactions_socket = UdpSocket::bind("0.0.0.0:0").unwrap();
+    let mut signature_set: HashSet<String> = (0..1000)
+        .map(|_| {
+            let tx = system_transaction::transfer(&alice, &Pubkey::new_rand(), 1, genesis_hash);
+            transactions_socket
+                .send_to(&bincode::serialize(&tx).unwrap(), leader_data.tpu)
+                .unwrap();
+            tx.signatures[0].to_string()
+        })
+        .collect();
+
+    // Create the pub sub runtime
+    let mut rt = Runtime::new().unwrap();
+    let rpc_pubsub_url = format!("ws://{}/", leader_data.rpc_pubsub);
+    let (sender, receiver) = channel::<(String, transaction::Result<()>)>();
+    let sender = Arc::new(Mutex::new(sender));
+
+    rt.spawn({
+        let connect = ws::try_connect::<PubsubClient>(&rpc_pubsub_url).unwrap();
+        let signature_set = signature_set.clone();
+        connect
+            .and_then(move |client| {
+                for sig in signature_set {
+                    let sender = sender.clone();
+                    tokio::spawn(
+                        client
+                            .signature_subscribe(sig.clone(), None)
+                            .and_then(move |sig_stream| {
+                                sig_stream.for_each(move |result| {
+                                    sender.lock().unwrap().send((sig.clone(), result)).unwrap();
+                                    future::ok(())
+                                })
+                            })
+                            .map_err(|err| {
+                                eprintln!("sig sub err: {:#?}", err);
+                            }),
+                    );
+                }
+                future::ok(())
+            })
+            .map_err(|_| ())
+    });
+
+    // Wait for all signature subscriptions
+    let now = SystemTime::now();
+    let timeout = Duration::from_secs(5);
+    while !signature_set.is_empty() {
+        assert!(now.elapsed().unwrap() < timeout);
+        match receiver.recv_timeout(Duration::from_secs(1)) {
+            Ok((sig, result)) => {
+                assert!(result.is_ok());
+                assert!(signature_set.remove(&sig));
+            }
+            Err(_err) => {
+                eprintln!("unexpected receive timeout");
+                assert!(false)
+            }
+        }
+    }
+
+    rt.shutdown_now().wait().unwrap();
+    server.close().unwrap();
+    remove_dir_all(ledger_path).unwrap();
+}

crate-features/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "solana-crate-features"
-version = "1.0.0"
+version = "1.0.2"
 description = "Solana Crate Features"
 authors = ["Solana Maintainers <maintainers@solana.com>"]
 repository = "https://github.com/solana-labs/solana"

docs/README.md

@@ -1,7 +1,7 @@
 Building the Solana book
 ---
 
-Install the book's dependencies, build, and test the book:
+Install dependencies, build, and test the docs:
 
 ```bash
 $ ./build.sh
@@ -19,7 +19,7 @@ Render markdown as HTML:
 $ make build
 ```
 
-Render and view the book:
+Render and view the docs:
 
 ```bash
 $ make open

docs/src/SUMMARY.md

@@ -3,6 +3,8 @@
 * [Introduction](introduction.md)
 * [Using Solana from the Command-line](cli/README.md)
   * [Command-line Usage](cli/usage.md)
+  * [Remote Wallet](remote-wallet/README.md)
+    * [Ledger Hardware Wallet](remote-wallet/ledger.md)
   * [Paper Wallet](paper-wallet/README.md)
     * [Installation](paper-wallet/installation.md)
     * [Paper Wallet Usage](paper-wallet/usage.md)
@@ -15,6 +17,27 @@
   * [Anatomy of a Transaction](transaction.md)
   * [JSON RPC API](apps/jsonrpc-api.md)
   * [JavaScript API](apps/javascript-api.md)
+* [Participating in Tour de SOL](tour-de-sol/README.md)
+  * [Useful Links & Discussion](tour-de-sol/useful-links.md)
+  * [Registration](tour-de-sol/registration/README.md)
+    * [How To Register](tour-de-sol/registration/how-to-register.md)
+    * [Terms of Participation](tour-de-sol/registration/terms-of-participation.md)
+    * [Rewards](tour-de-sol/registration/rewards.md)
+    * [Confidentiality](tour-de-sol/registration/confidentiality.md)
+    * [Registration FAQ](tour-de-sol/registration/validator-registration-and-rewards-faq.md)
+  * [Participation](tour-de-sol/participation/README.md)
+    * [Requirements to run a validator](tour-de-sol/participation/validator-technical-requirements.md)
+    * [Steps to create a validator](tour-de-sol/participation/steps-to-create-a-validator/README.md)
+      * [Install the Solana software](tour-de-sol/participation/steps-to-create-a-validator/install-the-solana-software.md)
+      * [Create a validator public key](tour-de-sol/participation/steps-to-create-a-validator/validator-public-key-registration.md)
+      * [Create and configure a Solana validator](tour-de-sol/participation/steps-to-create-a-validator/connecting-your-validator.md)
+      * [Confirm the Solana network is running](tour-de-sol/participation/steps-to-create-a-validator/confirm-the-solana-network-is-running.md)
+      * [Connect to the Solana network](tour-de-sol/participation/steps-to-create-a-validator/connect-to-the-solana-network.md)
+      * [Validator catch-up](tour-de-sol/participation/steps-to-create-a-validator/monitoring-your-validator.md)
+      * [Staking](tour-de-sol/participation/steps-to-create-a-validator/delegating-stake.md)
+      * [Publish information about your validator](tour-de-sol/participation/steps-to-create-a-validator/publishing-information-about-your-validator.md)
+    * [Dry Run 6](tour-de-sol/participation/dry-run-6.md)
+  * [Submitting Bugs](tour-de-sol/submitting-bugs.md)
 * [Running a Validator](running-validator/README.md)
   * [Validator Requirements](running-validator/validator-reqs.md)
   * [Choosing a Testnet](running-validator/validator-testnet.md)

docs/src/apps/drones.md

@@ -1,6 +1,6 @@
 # Drones
 
-This chapter defines an off-chain service called a _drone_, which acts as custodian of a user's private key. In its simplest form, it can be used to create _airdrop_ transactions, a token transfer from the drone's account to a client's account.
+This section defines an off-chain service called a _drone_, which acts as custodian of a user's private key. In its simplest form, it can be used to create _airdrop_ transactions, a token transfer from the drone's account to a client's account.
 
 ## Signing Service
 

docs/src/apps/jsonrpc-api.md

@@ -314,13 +314,13 @@ The result field will be an object with the following fields:
 curl -X POST -H "Content-Type: application/json" -d '{"jsonrpc": "2.0","id":1,"method":"getConfirmedBlock","params":[430, "json"]}' localhost:8899
 
 // Result
-{"jsonrpc":"2.0","result":{"blockhash":"Gp3t5bfDsJv1ovP8cB1SuRhXVuoTqDv7p3tymyubYg5","parentSlot":429,"previousBlockhash":"EFejToxii1L5aUF2NrK9dsbAEmZSNyN5nsipmZHQR1eA","transactions":[{"transaction":{"message":{"accountKeys":["6H94zdiaYfRfPfKjYLjyr2VFBg6JHXygy84r3qhc3NsC","39UAy8hsoYPywGPGdmun747omSr79zLSjqvPJN3zetoH","SysvarS1otHashes111111111111111111111111111","SysvarC1ock11111111111111111111111111111111","Vote111111111111111111111111111111111111111"],"header":{"numReadonlySignedAccounts":0,"numReadonlyUnsignedAccounts":3,"numRequiredSignatures":2},"instructions":[{"accounts":[1,2,3],"data":"29z5mr1JoRmJYQ6ynmk3pf31cGFRziAF1M3mT3L6sFXf5cKLdkEaMXMT8AqLpD4CpcupHmuMEmtZHpomrwfdZetSomNy3d","programIdIndex":4}],"recentBlockhash":"EFejToxii1L5aUF2NrK9dsbAEmZSNyN5nsipmZHQR1eA"},"signatures":["35YGay1Lwjwgxe9zaH6APSHbt9gYQUCtBWTNL3aVwVGn9xTFw2fgds7qK5AL29mP63A9j3rh8KpN1TgSR62XCaby","4vANMjSKiwEchGSXwVrQkwHnmsbKQmy9vdrsYxWdCup1bLsFzX8gKrFTSVDCZCae2dbxJB9mPNhqB2sD1vvr4sAD"]},"meta":{"fee":18000,"postBalances":[499999972500,15298080,1,1,1],"preBalances":[499999990500,15298080,1,1,1],"status":{"Ok":null}}}]},"id":1}
+{"jsonrpc":"2.0","result":{"blockhash":"Gp3t5bfDsJv1ovP8cB1SuRhXVuoTqDv7p3tymyubYg5","parentSlot":429,"previousBlockhash":"EFejToxii1L5aUF2NrK9dsbAEmZSNyN5nsipmZHQR1eA","transactions":[{"transaction":{"message":{"accountKeys":["6H94zdiaYfRfPfKjYLjyr2VFBg6JHXygy84r3qhc3NsC","39UAy8hsoYPywGPGdmun747omSr79zLSjqvPJN3zetoH","SysvarS1otHashes111111111111111111111111111","SysvarC1ock11111111111111111111111111111111","Vote111111111111111111111111111111111111111"],"header":{"numReadonlySignedAccounts":0,"numReadonlyUnsignedAccounts":3,"numRequiredSignatures":2},"instructions":[{"accounts":[1,2,3],"data":"29z5mr1JoRmJYQ6ynmk3pf31cGFRziAF1M3mT3L6sFXf5cKLdkEaMXMT8AqLpD4CpcupHmuMEmtZHpomrwfdZetSomNy3d","programIdIndex":4}],"recentBlockhash":"EFejToxii1L5aUF2NrK9dsbAEmZSNyN5nsipmZHQR1eA"},"signatures":["35YGay1Lwjwgxe9zaH6APSHbt9gYQUCtBWTNL3aVwVGn9xTFw2fgds7qK5AL29mP63A9j3rh8KpN1TgSR62XCaby","4vANMjSKiwEchGSXwVrQkwHnmsbKQmy9vdrsYxWdCup1bLsFzX8gKrFTSVDCZCae2dbxJB9mPNhqB2sD1vvr4sAD"]},"meta":{"fee":1.0.2,"postBalances":[499999972500,15298080,1,1,1],"preBalances":[499999990500,15298080,1,1,1],"status":{"Ok":null}}}]},"id":1}
 
 // Request
 curl -X POST -H "Content-Type: application/json" -d '{"jsonrpc": "2.0","id":1,"method":"getConfirmedBlock","params":[430, "binary"]}' localhost:8899
 
 // Result
-{"jsonrpc":"2.0","result":{"blockhash":"Gp3t5bfDsJv1ovP8cB1SuRhXVuoTqDv7p3tymyubYg5","parentSlot":429,"previousBlockhash":"EFejToxii1L5aUF2NrK9dsbAEmZSNyN5nsipmZHQR1eA","transactions":[{"transaction":"81UZJt4dh4Do66jDhrgkQudS8J2N6iG3jaVav7gJrqJSFY4Ug53iA9JFJZh2gxKWcaFdLJwhHx9mRdg9JwDAWB4ywiu5154CRwXV4FMdnPLg7bhxRLwhhYaLsVgMF5AyNRcTzjCVoBvqFgDU7P8VEKDEiMvD3qxzm1pLZVxDG1LTQpT3Dz4Uviv4KQbFQNuC22KupBoyHFB7Zh6KFdMqux4M9PvhoqcoJsJKwXjWpKu7xmEKnnrSbfLadkgjBmmjhW3fdTrFvnhQdTkhtdJxUL1xS9GMuJQer8YgSKNtUXB1eXZQwXU8bU2BjYkZE6Q5Xww8hu9Z4E4Mo4QsooVtHoP6BM3NKw8zjVbWfoCQqxTrwuSzrNCWCWt58C24LHecH67CTt2uXbYSviixvrYkK7A3t68BxTJcF1dXJitEPTFe2ceTkauLJqrJgnER4iUrsjr26T8YgWvpY9wkkWFSviQW6wV5RASTCUasVEcrDiaKj8EQMkgyDoe9HyKitSVg67vMWJFpUXpQobseWJUs5FTWWzmfHmFp8FZ","meta":{"fee":18000,"postBalances":[499999972500,15298080,1,1,1],"preBalances":[499999990500,15298080,1,1,1],"status":{"Ok":null}}}]},"id":1}
+{"jsonrpc":"2.0","result":{"blockhash":"Gp3t5bfDsJv1ovP8cB1SuRhXVuoTqDv7p3tymyubYg5","parentSlot":429,"previousBlockhash":"EFejToxii1L5aUF2NrK9dsbAEmZSNyN5nsipmZHQR1eA","transactions":[{"transaction":"81UZJt4dh4Do66jDhrgkQudS8J2N6iG3jaVav7gJrqJSFY4Ug53iA9JFJZh2gxKWcaFdLJwhHx9mRdg9JwDAWB4ywiu5154CRwXV4FMdnPLg7bhxRLwhhYaLsVgMF5AyNRcTzjCVoBvqFgDU7P8VEKDEiMvD3qxzm1pLZVxDG1LTQpT3Dz4Uviv4KQbFQNuC22KupBoyHFB7Zh6KFdMqux4M9PvhoqcoJsJKwXjWpKu7xmEKnnrSbfLadkgjBmmjhW3fdTrFvnhQdTkhtdJxUL1xS9GMuJQer8YgSKNtUXB1eXZQwXU8bU2BjYkZE6Q5Xww8hu9Z4E4Mo4QsooVtHoP6BM3NKw8zjVbWfoCQqxTrwuSzrNCWCWt58C24LHecH67CTt2uXbYSviixvrYkK7A3t68BxTJcF1dXJitEPTFe2ceTkauLJqrJgnER4iUrsjr26T8YgWvpY9wkkWFSviQW6wV5RASTCUasVEcrDiaKj8EQMkgyDoe9HyKitSVg67vMWJFpUXpQobseWJUs5FTWWzmfHmFp8FZ","meta":{"fee":1.0.2,"postBalances":[499999972500,15298080,1,1,1],"preBalances":[499999990500,15298080,1,1,1],"status":{"Ok":null}}}]},"id":1}
 ```
 
 ### getConfirmedBlocks
@@ -579,7 +579,7 @@ An RpcResponse containing a JSON object consisting of a string blockhash and Fee
 curl -X POST -H "Content-Type: application/json" -d '{"jsonrpc":"2.0","id":1, "method":"getRecentBlockhash"}' http://localhost:8899
 
 // Result
-{"jsonrpc":"2.0","result":{"context":{"slot":1},"value":{"blockhash":"CSymwgTNX1j3E4qhKfJAUE41nBWEwXufoYryPbkde5RR","feeCalculator":{"burnPercent":50,"lamportsPerSignature":5000,"maxLamportsPerSignature":100000,"minLamportsPerSignature":5000,"targetLamportsPerSignature":10000,"targetSignaturesPerSlot":20000}}},"id":1}
+{"jsonrpc":"2.0","result":{"context":{"slot":1},"value":{"blockhash":"CSymwgTNX1j3E4qhKfJAUE41nBWEwXufoYryPbkde5RR","feeCalculator":{"burnPercent":50,"lamportsPerSignature":5000,"maxLamportsPerSignature":1.0.20,"minLamportsPerSignature":5000,"targetLamportsPerSignature":1.0.2,"targetSignaturesPerSlot":20000}}},"id":1}
 ```
 
 ### getSignatureConfirmation
@@ -830,7 +830,7 @@ The result field will be a JSON object with the following fields:
 // Request
 curl -X POST -H "Content-Type: application/json" -d '{"jsonrpc":"2.0","id":1, "method":"getVersion"}' http://localhost:8899
 // Result
-{"jsonrpc":"2.0","result":{"solana-core": "1.0.0"},"id":1}
+{"jsonrpc":"2.0","result":{"solana-core": "1.0.2"},"id":1}
 ```
 
 ### getVoteAccounts