terminology update, nonce to bump seed (#12840) (#12851)

(cherry picked from commit 56211378d3)

Co-authored-by: Jack May <jack@solana.com>

.buildkite/env/secrets.ejson

@@ -1,5 +1,6 @@
 {
     "_public_key": "ae29f4f7ad2fc92de70d470e411c8426d5d48db8817c9e3dae574b122192335f",
+    "_comment": "These credentials are encrypted and pose no risk",
     "environment": {
       "CODECOV_TOKEN": "EJ[1:Z7OneT3RdJJ0DipCHQ7rC84snQ+FPbgHwZADQiz54wk=:3K68mE38LJ2RB98VWmjuNLFBNn1XTGR4:cR4r05/TOZQKmEZp1v4CSgUJtC6QJiOaL85QjXW0qZ061fMnsBA8AtAPMDoDq4WCGOZM1A==]"
     }

.buildkite/hooks/pre-command

@@ -31,9 +31,4 @@ export CARGO_TARGET_CACHE=$HOME/cargo-target-cache/"$CHANNEL"-"$BUILDKITE_LABEL"
 
   mkdir -p "$CARGO_TARGET_CACHE"/target
   rsync -a --delete --link-dest="$CARGO_TARGET_CACHE" "$CARGO_TARGET_CACHE"/target .
-
-  # Don't reuse BPF target build artifacts due to incremental build issues with
-  # `std:
-  #    "found possibly newer version of crate `std` which `xyz` depends on
-  rm -rf target/bpfel-unknown-unknown
 )

.github/stale.yml

@@ -1,11 +1,3 @@
-only: pulls
-
-# Number of days of inactivity before a pull request becomes stale
-daysUntilStale: 7
-
-# Number of days of inactivity before a stale pull request is closed
-daysUntilClose: 7
-
 # Issues with these labels will never be considered stale
 exemptLabels:
   - security
@@ -14,12 +6,34 @@ exemptLabels:
 # Label to use when marking a pull request as stale
 staleLabel: stale
 
-# Comment to post when marking a pull request as stale. Set to `false` to disable
-markComment: >
-  This pull request has been automatically marked as stale because it has not had
-  recent activity. It will be closed if no further activity occurs.
+pulls:
+  # Number of days of inactivity before a pull request becomes stale
+  daysUntilStale: 7
 
-# Comment to post when closing a stale pull request. Set to `false` to disable
-closeComment: >
-  This stale pull request has been automatically closed.
-  Thank you for your contributions.
+  # Number of days of inactivity before a stale pull request is closed
+  daysUntilClose: 7
+  # Comment to post when marking a pull request as stale. Set to `false` to disable
+  markComment: >
+    This pull request has been automatically marked as stale because it has not had
+    recent activity. It will be closed if no further activity occurs.
+
+  # Comment to post when closing a stale pull request. Set to `false` to disable
+  closeComment: >
+    This stale pull request has been automatically closed.
+    Thank you for your contributions.
+
+issues:
+  # Number of days of inactivity before a issue becomes stale
+  daysUntilStale: 365
+
+  # Number of days of inactivity before a stale issue is closed
+  daysUntilClose: 7
+  # Comment to post when marking a issue as stale. Set to `false` to disable
+  markComment: >
+    This issue has been automatically marked as stale because it has not had
+    recent activity. It will be closed if no further activity occurs.
+
+  # Comment to post when closing a stale issue. Set to `false` to disable
+  closeComment: >
+    This stale issue has been automatically closed.
+    Thank you for your contributions.

.mergify.yml

@@ -50,14 +50,6 @@ pull_request_rules:
       label:
         add:
           - automerge
-  - name: v1.1 backport
-    conditions:
-      - label=v1.1
-    actions:
-      backport:
-        ignore_conflicts: true
-        branches:
-          - v1.1
   - name: v1.2 backport
     conditions:
       - label=v1.2
@@ -74,3 +66,11 @@ pull_request_rules:
         ignore_conflicts: true
         branches:
           - v1.3
+  - name: v1.4 backport
+    conditions:
+      - label=v1.4
+    actions:
+      backport:
+        ignore_conflicts: true
+        branches:
+          - v1.4

CONTRIBUTING.md

@@ -232,7 +232,7 @@ confused with 3-letter acronyms.
 Solana's architecture is described by docs generated from markdown files in
 the `docs/src/` directory, maintained by an *editor* (currently @garious). To
 add a design proposal, you'll need to include it in the
-[Accepted Design Proposals](https://docs.solana.com/proposals)
+[Accepted Design Proposals](https://docs.solana.com/proposals/accepted-design-proposals)
 section of the Solana docs.  Here's the full process:
 
 1. Propose a design by creating a PR that adds a markdown document to the

README.md

@@ -19,7 +19,7 @@ $ source $HOME/.cargo/env
 $ rustup component add rustfmt
 ```
 
-If your rustc version is lower than 1.39.0, please update it:
+Please sure you are always using the latest stable rust version by running:
 
 ```bash
 $ rustup update
@@ -59,11 +59,10 @@ $ cargo test
 ```
 
 ### Starting a local testnet
-Start your own testnet locally, instructions are in the [online docs](https://docs.solana.com/bench-tps).
+Start your own testnet locally, instructions are in the [online docs](https://docs.solana.com/cluster/bench-tps).
 
-### Accessing the remote development cluster
-* `devnet` - stable public cluster for development accessible via
-devnet.solana.com. Runs 24/7. Learn more about the [public clusters](https://docs.solana.com/clusters)
+### Accessing the remote testnet
+* `testnet` - public stable testnet accessible via devnet.solana.com. Runs 24/7
 
 # Benchmarking
 

RELEASE.md

@@ -107,11 +107,15 @@ Alternatively use the Github UI.
    1.  If the Cargo.toml version field is **0.12.3**, then the release tag must be **v0.12.3**
 1. Make sure the Target Branch field matches the branch you want to make a release on.
    1.  If you want to release v0.12.0, the target branch must be v0.12
-1. If this is the first release on the branch (e.g. v0.13.**0**), paste in [this
-   template](https://raw.githubusercontent.com/solana-labs/solana/master/.github/RELEASE_TEMPLATE.md).  Engineering Lead can provide summary contents for release notes if needed.  If this is a patch release, review all the commits since the previous release on this branch and add details as needed.
+1. Fill the release notes.
+   1.  If this is the first release on the branch (e.g. v0.13.**0**), paste in [this
+   template](https://raw.githubusercontent.com/solana-labs/solana/master/.github/RELEASE_TEMPLATE.md).  Engineering Lead can provide summary contents for release notes if needed.
+   1. If this is a patch release, review all the commits since the previous release on this branch and add details as needed.
 1. Click "Save Draft", then confirm the release notes look good and the tag name and branch are correct.
-1. Ensure the release is marked **"This is a pre-release"**.  This flag will then need to be be removed once the the Linux binary artifacts appear later.
-1. Go back into edit the release and click "Publish release" when ready.
+1. Ensure all desired commits (usually backports) are landed on the branch by now.
+1. Ensure the release is marked **"This is a pre-release"**.  This flag will need to be be removed manually after confirming the the Linux binary artifacts appear at a later step.
+1. Go back into edit the release and click "Publish release" while being marked as a pre-release.
+1. Confirm there is new git tag with intended version number at the intended revision after running `git fetch` locally.
 
 
 ### Update release branch with the next patch version
@@ -131,7 +135,8 @@ Alternatively use the Github UI.
 1. Open a PR against origin/vX.Y and then merge the PR after passing CI.
 
 ### Prepare for the next release
-1.  Go to [GitHub Releases](https://github.com/solana-labs/solana/releases) and create a new draft release for `X.Y.Z+1` with empty release nodes.  This allows people to incrementally add new release notes until it's time for the next release
+1.  Go to [GitHub Releases](https://github.com/solana-labs/solana/releases) and create a new draft release for `X.Y.Z+1` with empty release notes.  This allows people to incrementally add new release notes until it's time for the next release
+    1. Also, point the branch field to the same branch and mark the relese as **"This is a pre-release"**.
 1.  Go to the [Github Milestones](https://github.com/solana-labs/solana/milestones).  Create a new milestone for the `X.Y.Z+1`, move over
 unresolved issues still in the `X.Y.Z` milestone, then close the `X.Y.Z` milestone.
 
@@ -147,5 +152,5 @@ appearing.  To check for progress:
 [Crates.io](https://crates.io/crates/solana) should have an updated Solana version.  This can take 2-3 hours, and sometimes fails in the `solana-secondary` job.
 If this happens and the error is non-fatal, click "Retry" on the "publish crate" job
 
-### Update software on devnet.solana.com/testnet.solama.com/mainnet-beta.solana.com
+### Update software on devnet.solana.com/testnet.solana.com/mainnet-beta.solana.com
 See the documentation at https://github.com/solana-labs/cluster-ops/

account-decoder/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "solana-account-decoder"
-version = "1.3.23"
+version = "1.4.0"
 description = "Solana account decoder"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -18,10 +18,10 @@ lazy_static = "1.4.0"
 serde = "1.0.112"
 serde_derive = "1.0.103"
 serde_json = "1.0.56"
-solana-config-program = { path = "../programs/config", version = "1.3.23" }
-solana-sdk = { path = "../sdk", version = "1.3.23" }
-solana-stake-program = { path = "../programs/stake", version = "1.3.23" }
-solana-vote-program = { path = "../programs/vote", version = "1.3.23" }
+solana-config-program = { path = "../programs/config", version = "1.4.0" }
+solana-sdk = { path = "../sdk", version = "1.4.0" }
+solana-stake-program = { path = "../programs/stake", version = "1.4.0" }
+solana-vote-program = { path = "../programs/vote", version = "1.4.0" }
 spl-token-v2-0 = { package = "spl-token", version = "=2.0.6", features = ["skip-no-mangle"] }
 thiserror = "1.0"
 

account-decoder/src/parse_account_data.rs

@@ -111,8 +111,8 @@ mod test {
 
     #[test]
     fn test_parse_account_data() {
-        let account_pubkey = solana_sdk::pubkey::new_rand();
-        let other_program = solana_sdk::pubkey::new_rand();
+        let account_pubkey = Pubkey::new_rand();
+        let other_program = Pubkey::new_rand();
         let data = vec![0; 4];
         assert!(parse_account_data(&account_pubkey, &other_program, &data, None).is_err());
 

account-decoder/src/parse_config.rs

@@ -117,7 +117,7 @@ mod test {
             }))
             .unwrap(),
         };
-        let info_pubkey = solana_sdk::pubkey::new_rand();
+        let info_pubkey = Pubkey::new_rand();
         let validator_info_config_account = create_config_account(
             vec![(validator_info::id(), false), (info_pubkey, true)],
             &validator_info,

account-decoder/src/parse_stake.rs

@@ -134,6 +134,7 @@ impl From<Delegation> for UiDelegation {
 mod test {
     use super::*;
     use bincode::serialize;
+    use solana_sdk::pubkey::Pubkey;
 
     #[test]
     fn test_parse_stake() {
@@ -144,8 +145,8 @@ mod test {
             StakeAccountType::Uninitialized
         );
 
-        let pubkey = solana_sdk::pubkey::new_rand();
-        let custodian = solana_sdk::pubkey::new_rand();
+        let pubkey = Pubkey::new_rand();
+        let custodian = Pubkey::new_rand();
         let authorized = Authorized::auto(&pubkey);
         let lockup = Lockup {
             unix_timestamp: 0,
@@ -179,7 +180,7 @@ mod test {
             })
         );
 
-        let voter_pubkey = solana_sdk::pubkey::new_rand();
+        let voter_pubkey = Pubkey::new_rand();
         let stake = Stake {
             delegation: Delegation {
                 voter_pubkey,

account-decoder/src/parse_sysvar.rs

@@ -319,7 +319,7 @@ mod test {
             }]),
         );
 
-        let bad_pubkey = solana_sdk::pubkey::new_rand();
+        let bad_pubkey = Pubkey::new_rand();
         assert!(parse_sysvar(&stake_history_sysvar.data, &bad_pubkey).is_err());
 
         let bad_data = vec![0; 4];

accounts-bench/Cargo.toml

@@ -2,7 +2,7 @@
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 edition = "2018"
 name = "solana-accounts-bench"
-version = "1.3.23"
+version = "1.4.0"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
@@ -11,11 +11,11 @@ publish = false
 [dependencies]
 log = "0.4.6"
 rayon = "1.4.0"
-solana-logger = { path = "../logger", version = "1.3.23" }
-solana-runtime = { path = "../runtime", version = "1.3.23" }
-solana-measure = { path = "../measure", version = "1.3.23" }
-solana-sdk = { path = "../sdk", version = "1.3.23" }
-solana-version = { path = "../version", version = "1.3.23" }
+solana-logger = { path = "../logger", version = "1.4.0" }
+solana-runtime = { path = "../runtime", version = "1.4.0" }
+solana-measure = { path = "../measure", version = "1.4.0" }
+solana-sdk = { path = "../sdk", version = "1.4.0" }
+solana-version = { path = "../version", version = "1.4.0" }
 rand = "0.7.0"
 clap = "2.33.1"
 crossbeam-channel = "0.4"

accounts-bench/src/main.rs

@@ -88,7 +88,7 @@ fn main() {
     for x in 0..iterations {
         if clean {
             let mut time = Measure::start("clean");
-            accounts.accounts_db.clean_accounts();
+            accounts.accounts_db.clean_accounts(None);
             time.stop();
             println!("{}", time);
             for slot in 0..num_slots {

banking-bench/Cargo.toml

@@ -2,7 +2,7 @@
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 edition = "2018"
 name = "solana-banking-bench"
-version = "1.3.23"
+version = "1.4.0"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
@@ -14,16 +14,16 @@ crossbeam-channel = "0.4"
 log = "0.4.6"
 rand = "0.7.0"
 rayon = "1.4.0"
-solana-core = { path = "../core", version = "1.3.23" }
-solana-clap-utils = { path = "../clap-utils", version = "1.3.23" }
-solana-streamer = { path = "../streamer", version = "1.3.23" }
-solana-perf = { path = "../perf", version = "1.3.23" }
-solana-ledger = { path = "../ledger", version = "1.3.23" }
-solana-logger = { path = "../logger", version = "1.3.23" }
-solana-runtime = { path = "../runtime", version = "1.3.23" }
-solana-measure = { path = "../measure", version = "1.3.23" }
-solana-sdk = { path = "../sdk", version = "1.3.23" }
-solana-version = { path = "../version", version = "1.3.23" }
+solana-core = { path = "../core", version = "1.4.0" }
+solana-clap-utils = { path = "../clap-utils", version = "1.4.0" }
+solana-streamer = { path = "../streamer", version = "1.4.0" }
+solana-perf = { path = "../perf", version = "1.4.0" }
+solana-ledger = { path = "../ledger", version = "1.4.0" }
+solana-logger = { path = "../logger", version = "1.4.0" }
+solana-runtime = { path = "../runtime", version = "1.4.0" }
+solana-measure = { path = "../measure", version = "1.4.0" }
+solana-sdk = { path = "../sdk", version = "1.4.0" }
+solana-version = { path = "../version", version = "1.4.0" }
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]

banking-bench/src/main.rs

@@ -20,6 +20,7 @@ use solana_perf::packet::to_packets_chunked;
 use solana_runtime::{bank::Bank, bank_forks::BankForks};
 use solana_sdk::{
     hash::Hash,
+    pubkey::Pubkey,
     signature::Keypair,
     signature::Signature,
     system_transaction,
@@ -68,7 +69,7 @@ fn make_accounts_txs(
     hash: Hash,
     same_payer: bool,
 ) -> Vec<Transaction> {
-    let to_pubkey = solana_sdk::pubkey::new_rand();
+    let to_pubkey = Pubkey::new_rand();
     let payer_key = Keypair::new();
     let dummy = system_transaction::transfer(&payer_key, &to_pubkey, 1, hash);
     (0..total_num_transactions)
@@ -77,9 +78,9 @@ fn make_accounts_txs(
             let mut new = dummy.clone();
             let sig: Vec<u8> = (0..64).map(|_| thread_rng().gen()).collect();
             if !same_payer {
-                new.message.account_keys[0] = solana_sdk::pubkey::new_rand();
+                new.message.account_keys[0] = Pubkey::new_rand();
             }
-            new.message.account_keys[1] = solana_sdk::pubkey::new_rand();
+            new.message.account_keys[1] = Pubkey::new_rand();
             new.signatures = vec![Signature::new(&sig[0..64])];
             new
         })
@@ -240,7 +241,7 @@ fn main() {
         let base_tx_count = bank.transaction_count();
         let mut txs_processed = 0;
         let mut root = 1;
-        let collector = solana_sdk::pubkey::new_rand();
+        let collector = Pubkey::new_rand();
         let config = Config {
             packets_per_batch: packets_per_chunk,
             chunk_len,

banks-client/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "solana-banks-client"
-version = "1.3.23"
+version = "1.4.0"
 description = "Solana banks client"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -12,15 +12,15 @@ edition = "2018"
 async-trait = "0.1.36"
 bincode = "1.3.1"
 futures = "0.3"
-solana-banks-interface = { path = "../banks-interface", version = "1.3.23" }
-solana-sdk = { path = "../sdk", version = "1.3.23" }
-tarpc = { version = "0.21.0", features = ["full"] }
+solana-banks-interface = { path = "../banks-interface", version = "1.4.0" }
+solana-sdk = { path = "../sdk", version = "1.4.0" }
+tarpc = { version = "0.22.0", features = ["full"] }
 tokio = "0.2"
 tokio-serde = { version = "0.6", features = ["bincode"] }
 
 [dev-dependencies]
-solana-runtime = { path = "../runtime", version = "1.3.23" }
-solana-banks-server = { path = "../banks-server", version = "1.3.23" }
+solana-runtime = { path = "../runtime", version = "1.4.0" }
+solana-banks-server = { path = "../banks-server", version = "1.4.0" }
 
 [lib]
 crate-type = ["lib"]

banks-client/src/lib.rs

@@ -204,7 +204,7 @@ pub async fn start_client(
 }
 
 pub async fn start_tcp_client<T: ToSocketAddrs>(addr: T) -> io::Result<BanksClient> {
-    let transport = tcp::connect(addr, Bincode::default()).await?;
+    let transport = tcp::connect(addr, Bincode::default).await?;
     BanksClient::new(client::Config::default(), transport).spawn()
 }
 
@@ -213,7 +213,7 @@ mod tests {
     use super::*;
     use solana_banks_server::banks_server::start_local_server;
     use solana_runtime::{bank::Bank, bank_forks::BankForks, genesis_utils::create_genesis_config};
-    use solana_sdk::{message::Message, signature::Signer, system_instruction};
+    use solana_sdk::{message::Message, pubkey::Pubkey, signature::Signer, system_instruction};
     use std::sync::{Arc, RwLock};
     use tarpc::transport;
     use tokio::{runtime::Runtime, time::delay_for};
@@ -235,7 +235,7 @@ mod tests {
             &genesis.genesis_config,
         ))));
 
-        let bob_pubkey = solana_sdk::pubkey::new_rand();
+        let bob_pubkey = Pubkey::new_rand();
         let mint_pubkey = genesis.mint_keypair.pubkey();
         let instruction = system_instruction::transfer(&mint_pubkey, &bob_pubkey, 1);
         let message = Message::new(&[instruction], Some(&mint_pubkey));
@@ -265,7 +265,7 @@ mod tests {
         ))));
 
         let mint_pubkey = &genesis.mint_keypair.pubkey();
-        let bob_pubkey = solana_sdk::pubkey::new_rand();
+        let bob_pubkey = Pubkey::new_rand();
         let instruction = system_instruction::transfer(&mint_pubkey, &bob_pubkey, 1);
         let message = Message::new(&[instruction], Some(&mint_pubkey));
 

banks-interface/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "solana-banks-interface"
-version = "1.3.23"
+version = "1.4.0"
 description = "Solana banks RPC interface"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -10,8 +10,8 @@ edition = "2018"
 
 [dependencies]
 serde = { version = "1.0.112", features = ["derive"] }
-solana-sdk = { path = "../sdk", version = "1.3.23" }
-tarpc = { version = "0.21.0", features = ["full"] }
+solana-sdk = { path = "../sdk", version = "1.4.0" }
+tarpc = { version = "0.22.0", features = ["full"] }
 
 [lib]
 crate-type = ["lib"]

banks-server/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "solana-banks-server"
-version = "1.3.23"
+version = "1.4.0"
 description = "Solana banks server"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -12,11 +12,11 @@ edition = "2018"
 bincode = "1.3.1"
 futures = "0.3"
 log = "0.4.8"
-solana-banks-interface = { path = "../banks-interface", version = "1.3.23" }
-solana-runtime = { path = "../runtime", version = "1.3.23" }
-solana-sdk = { path = "../sdk", version = "1.3.23" }
-solana-metrics = { path = "../metrics", version = "1.3.23" }
-tarpc = { version = "0.21.0", features = ["full"] }
+solana-banks-interface = { path = "../banks-interface", version = "1.4.0" }
+solana-runtime = { path = "../runtime", version = "1.4.0" }
+solana-sdk = { path = "../sdk", version = "1.4.0" }
+solana-metrics = { path = "../metrics", version = "1.4.0" }
+tarpc = { version = "0.22.0", features = ["full"] }
 tokio = "0.2"
 tokio-serde = { version = "0.6", features = ["bincode"] }
 

banks-server/src/banks_server.rs

@@ -87,12 +87,7 @@ impl BanksServer {
         let block_commitment_cache = Arc::new(RwLock::new(BlockCommitmentCache::new(
             HashMap::default(),
             0,
-            CommitmentSlots {
-                slot,
-                root: 0,
-                highest_confirmed_slot: 0,
-                highest_confirmed_root: 0,
-            },
+            CommitmentSlots::new_from_slot(slot),
         )));
         Builder::new()
             .name("solana-bank-forks-client".to_string())

bench-exchange/Cargo.toml

@@ -2,7 +2,7 @@
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 edition = "2018"
 name = "solana-bench-exchange"
-version = "1.3.23"
+version = "1.4.0"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
@@ -18,21 +18,21 @@ rand = "0.7.0"
 rayon = "1.4.0"
 serde_json = "1.0.56"
 serde_yaml = "0.8.13"
-solana-clap-utils = { path = "../clap-utils", version = "1.3.23" }
-solana-core = { path = "../core", version = "1.3.23" }
-solana-genesis = { path = "../genesis", version = "1.3.23" }
-solana-client = { path = "../client", version = "1.3.23" }
-solana-faucet = { path = "../faucet", version = "1.3.23" }
-solana-exchange-program = { path = "../programs/exchange", version = "1.3.23" }
-solana-logger = { path = "../logger", version = "1.3.23" }
-solana-metrics = { path = "../metrics", version = "1.3.23" }
-solana-net-utils = { path = "../net-utils", version = "1.3.23" }
-solana-runtime = { path = "../runtime", version = "1.3.23" }
-solana-sdk = { path = "../sdk", version = "1.3.23" }
-solana-version = { path = "../version", version = "1.3.23" }
+solana-clap-utils = { path = "../clap-utils", version = "1.4.0" }
+solana-core = { path = "../core", version = "1.4.0" }
+solana-genesis = { path = "../genesis", version = "1.4.0" }
+solana-client = { path = "../client", version = "1.4.0" }
+solana-faucet = { path = "../faucet", version = "1.4.0" }
+solana-exchange-program = { path = "../programs/exchange", version = "1.4.0" }
+solana-logger = { path = "../logger", version = "1.4.0" }
+solana-metrics = { path = "../metrics", version = "1.4.0" }
+solana-net-utils = { path = "../net-utils", version = "1.4.0" }
+solana-runtime = { path = "../runtime", version = "1.4.0" }
+solana-sdk = { path = "../sdk", version = "1.4.0" }
+solana-version = { path = "../version", version = "1.4.0" }
 
 [dev-dependencies]
-solana-local-cluster = { path = "../local-cluster", version = "1.3.23" }
+solana-local-cluster = { path = "../local-cluster", version = "1.4.0" }
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]

bench-streamer/Cargo.toml

@@ -2,7 +2,7 @@
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 edition = "2018"
 name = "solana-bench-streamer"
-version = "1.3.23"
+version = "1.4.0"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
@@ -10,11 +10,11 @@ publish = false
 
 [dependencies]
 clap = "2.33.1"
-solana-clap-utils = { path = "../clap-utils", version = "1.3.23" }
-solana-streamer = { path = "../streamer", version = "1.3.23" }
-solana-logger = { path = "../logger", version = "1.3.23" }
-solana-net-utils = { path = "../net-utils", version = "1.3.23" }
-solana-version = { path = "../version", version = "1.3.23" }
+solana-clap-utils = { path = "../clap-utils", version = "1.4.0" }
+solana-streamer = { path = "../streamer", version = "1.4.0" }
+solana-logger = { path = "../logger", version = "1.4.0" }
+solana-net-utils = { path = "../net-utils", version = "1.4.0" }
+solana-version = { path = "../version", version = "1.4.0" }
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]

bench-tps/Cargo.toml

@@ -2,7 +2,7 @@
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 edition = "2018"
 name = "solana-bench-tps"
-version = "1.3.23"
+version = "1.4.0"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
@@ -15,23 +15,23 @@ log = "0.4.8"
 rayon = "1.4.0"
 serde_json = "1.0.56"
 serde_yaml = "0.8.13"
-solana-clap-utils = { path = "../clap-utils", version = "1.3.23" }
-solana-core = { path = "../core", version = "1.3.23" }
-solana-genesis = { path = "../genesis", version = "1.3.23" }
-solana-client = { path = "../client", version = "1.3.23" }
-solana-faucet = { path = "../faucet", version = "1.3.23" }
-solana-logger = { path = "../logger", version = "1.3.23" }
-solana-metrics = { path = "../metrics", version = "1.3.23" }
-solana-measure = { path = "../measure", version = "1.3.23" }
-solana-net-utils = { path = "../net-utils", version = "1.3.23" }
-solana-runtime = { path = "../runtime", version = "1.3.23" }
-solana-sdk = { path = "../sdk", version = "1.3.23" }
-solana-version = { path = "../version", version = "1.3.23" }
+solana-clap-utils = { path = "../clap-utils", version = "1.4.0" }
+solana-core = { path = "../core", version = "1.4.0" }
+solana-genesis = { path = "../genesis", version = "1.4.0" }
+solana-client = { path = "../client", version = "1.4.0" }
+solana-faucet = { path = "../faucet", version = "1.4.0" }
+solana-logger = { path = "../logger", version = "1.4.0" }
+solana-metrics = { path = "../metrics", version = "1.4.0" }
+solana-measure = { path = "../measure", version = "1.4.0" }
+solana-net-utils = { path = "../net-utils", version = "1.4.0" }
+solana-runtime = { path = "../runtime", version = "1.4.0" }
+solana-sdk = { path = "../sdk", version = "1.4.0" }
+solana-version = { path = "../version", version = "1.4.0" }
 
 [dev-dependencies]
 serial_test = "0.4.0"
 serial_test_derive = "0.4.0"
-solana-local-cluster = { path = "../local-cluster", version = "1.3.23" }
+solana-local-cluster = { path = "../local-cluster", version = "1.4.0" }
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]

cargo

@@ -17,10 +17,6 @@ case "$1" in
     toolchain="$rust_nightly"
     shift
     ;;
-  +*)
-    toolchain="${1#+}"
-    shift
-    ;;
   *)
     # shellcheck disable=SC2054 # rust_stable is sourced from rust-version.sh
     toolchain="$rust_stable"

ci/channel-info.sh

@@ -95,12 +95,14 @@ elif [[ -n $CI_BRANCH ]]; then
   BRANCH="$CI_BRANCH"
 fi
 
-if [[ $BRANCH = "$STABLE_CHANNEL" ]]; then
-  CHANNEL=stable
-elif [[ $BRANCH = "$EDGE_CHANNEL" ]]; then
-  CHANNEL=edge
-elif [[ $BRANCH = "$BETA_CHANNEL" ]]; then
-  CHANNEL=beta
+if [[ -z "$CHANNEL" ]]; then
+  if [[ $BRANCH = "$STABLE_CHANNEL" ]]; then
+    CHANNEL=stable
+  elif [[ $BRANCH = "$EDGE_CHANNEL" ]]; then
+    CHANNEL=edge
+  elif [[ $BRANCH = "$BETA_CHANNEL" ]]; then
+    CHANNEL=beta
+  fi
 fi
 
 echo EDGE_CHANNEL="$EDGE_CHANNEL"

ci/docker-rust-nightly/Dockerfile

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

ci/docker-rust-nightly/README.md

@@ -20,7 +20,7 @@ To update the pinned version:
    specific YYYY-MM-DD that is desired (default is today's build).
    Check https://rust-lang.github.io/rustup-components-history/ for build
    status
-1. Update `ci/rust-version.sh` to reflect the new nightly `YYY-MM-DD`
+1. Update `ci/rust-version.sh` to reflect the new nightly `YYYY-MM-DD`
 1. Run `SOLANA_ALLOCATE_TTY=1 SOLANA_DOCKER_RUN_NOSETUID=1 ci/docker-run.sh --nopull solanalabs/rust-nightly:YYYY-MM-DD ci/test-checks.sh`
    and `SOLANA_ALLOCATE_TTY=1 SOLANA_DOCKER_RUN_NOSETUID=1 ci/docker-run.sh --nopull solanalabs/rust-nightly:YYYY-MM-DD ci/test-coverage.sh [args]...`
    to confirm the new nightly image builds.  Fix any issues as needed

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.45.1
+FROM rust:1.46.0
 
 # Add Google Protocol Buffers for Libra's metrics library.
 ENV PROTOC_VERSION 3.8.0

ci/nits.sh

@@ -27,6 +27,7 @@ declare print_free_tree=(
   ':sdk/bpf/rust/rust-utils/**.rs'
   ':sdk/**.rs'
   ':^sdk/src/program_option.rs'
+  ':^sdk/src/program_stubs.rs'
   ':programs/**.rs'
   ':^**bin**.rs'
   ':^**bench**.rs'

ci/publish-crate.sh

@@ -38,7 +38,7 @@ for Cargo_toml in $Cargo_tomls; do
   crate_name=$(grep -m 1 '^name = ' "$Cargo_toml" | cut -f 3 -d ' ' | tr -d \")
 
   if grep -q "^publish = false" "$Cargo_toml"; then
-    echo "$crate_name is is marked as unpublishable"
+    echo "$crate_name is marked as unpublishable"
     continue
   fi
 

ci/publish-tarball.sh

@@ -91,15 +91,17 @@ echo --- Creating release tarball
   cp "${RELEASE_BASENAME}"/version.yml "${TARBALL_BASENAME}"-$TARGET.yml
 )
 
-# Maybe tarballs are platform agnostic, only publish them from the Linux build
+# Metrics tarball is platform agnostic, only publish it from Linux
 MAYBE_TARBALLS=
 if [[ "$CI_OS_NAME" = linux ]]; then
+  metrics/create-metrics-tarball.sh
   (
     set -x
     sdk/bpf/scripts/package.sh
     [[ -f bpf-sdk.tar.bz2 ]]
+
   )
-  MAYBE_TARBALLS="bpf-sdk.tar.bz2"
+  MAYBE_TARBALLS="bpf-sdk.tar.bz2 solana-metrics.tar.bz2"
 fi
 
 source ci/upload-ci-artifact.sh
@@ -124,7 +126,7 @@ for file in "${TARBALL_BASENAME}"-$TARGET.tar.bz2 "${TARBALL_BASENAME}"-$TARGET.
         /usr/bin/s3cmd --acl-public put /solana/"$file" s3://release.solana.com/"$CHANNEL_OR_TAG"/"$file"
 
       echo Published to:
-      $DRYRUN ci/format-url.sh https://release.solana.com/"$CHANNEL_OR_TAG"/"$file"
+      $DRYRUN ci/format-url.sh http://release.solana.com/"$CHANNEL_OR_TAG"/"$file"
     )
 
     if [[ -n $TAG ]]; then
@@ -147,30 +149,4 @@ for file in "${TARBALL_BASENAME}"-$TARGET.tar.bz2 "${TARBALL_BASENAME}"-$TARGET.
   fi
 done
 
-
-# Create install wrapper for release.solana.com
-if [[ -n $BUILDKITE ]]; then
-  cat > release.solana.com-install <<EOF
-SOLANA_RELEASE=$CHANNEL_OR_TAG
-SOLANA_INSTALL_INIT_ARGS=$CHANNEL_OR_TAG
-SOLANA_DOWNLOAD_ROOT=http://release.solana.com
-EOF
-  cat install/solana-install-init.sh >> release.solana.com-install
-
-  echo --- AWS S3 Store: "install"
-  (
-    set -x
-    $DRYRUN docker run \
-      --rm \
-      --env AWS_ACCESS_KEY_ID \
-      --env AWS_SECRET_ACCESS_KEY \
-      --volume "$PWD:/solana" \
-      eremite/aws-cli:2018.12.18 \
-      /usr/bin/s3cmd --acl-public put /solana/release.solana.com-install s3://release.solana.com/"$CHANNEL_OR_TAG"/install
-
-    echo Published to:
-    $DRYRUN ci/format-url.sh https://release.solana.com/"$CHANNEL_OR_TAG"/install
-  )
-fi
-
 echo --- ok

ci/rust-version.sh

@@ -18,13 +18,13 @@
 if [[ -n $RUST_STABLE_VERSION ]]; then
   stable_version="$RUST_STABLE_VERSION"
 else
-  stable_version=1.45.1
+  stable_version=1.46.0
 fi
 
 if [[ -n $RUST_NIGHTLY_VERSION ]]; then
   nightly_version="$RUST_NIGHTLY_VERSION"
 else
-  nightly_version=2020-07-27
+  nightly_version=2020-08-17
 fi
 
 

ci/test-checks.sh

@@ -9,8 +9,6 @@ source ci/rust-version.sh stable
 source ci/rust-version.sh nightly
 eval "$(ci/channel-info.sh)"
 
-scripts/increment-cargo-version.sh check
-
 echo --- build environment
 (
   set -x
@@ -46,7 +44,6 @@ if [[ $CI_BASE_BRANCH = "$EDGE_CHANNEL" ]]; then
 
   # Ensure nightly and --benches
   _ scripts/cargo-for-all-lock-files.sh +"$rust_nightly" check --locked --all-targets
-
 else
   echo "Note: cargo-for-all-lock-files.sh skipped because $CI_BASE_BRANCH != $EDGE_CHANNEL"
 fi
@@ -56,8 +53,9 @@ _ cargo +"$rust_stable" fmt --all -- --check
 
 # -Z... is needed because of clippy bug: https://github.com/rust-lang/rust-clippy/issues/4612
 # run nightly clippy for `sdk/` as there's a moderate amount of nightly-only code there
-_ cargo +"$rust_nightly" clippy -Zunstable-options --workspace --all-targets -- --deny=warnings
-
+_ cargo +"$rust_nightly" clippy \
+  -Zunstable-options --workspace --all-targets \
+  -- --deny=warnings --allow=clippy::stable_sort_primitive
 
 cargo_audit_ignores=(
   # failure is officially deprecated/unmaintained
@@ -69,16 +67,6 @@ cargo_audit_ignores=(
   #
   # Blocked on https://github.com/paritytech/jsonrpc/issues/575
   --ignore RUSTSEC-2020-0016
-
-  # stdweb is unmaintained
-  #
-  # Blocked on multiple upstream crates removing their `stdweb` dependency.
-  --ignore RUSTSEC-2020-0056
-
-  # Potential segfault in the time crate
-  #
-  # Blocked on multiple crates updating `time` to >= 0.2.23
-  --ignore RUSTSEC-2020-0071
 )
 _ scripts/cargo-for-all-lock-files.sh +"$rust_stable" audit "${cargo_audit_ignores[@]}"
 

clap-utils/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "solana-clap-utils"
-version = "1.3.23"
+version = "1.4.0"
 description = "Solana utilities for the clap"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 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.3.23" }
-solana-sdk = { path = "../sdk", version = "1.3.23" }
+solana-remote-wallet = { path = "../remote-wallet", version = "1.4.0" }
+solana-sdk = { path = "../sdk", version = "1.4.0" }
 thiserror = "1.0.20"
 tiny-bip39 = "0.7.0"
 url = "2.1.0"

clap-utils/src/input_parsers.rs

@@ -228,8 +228,8 @@ mod tests {
         assert_eq!(values_of(&matches, "multiple"), Some(vec![50, 39]));
         assert_eq!(values_of::<u64>(&matches, "single"), None);
 
-        let pubkey0 = solana_sdk::pubkey::new_rand();
-        let pubkey1 = solana_sdk::pubkey::new_rand();
+        let pubkey0 = Pubkey::new_rand();
+        let pubkey1 = Pubkey::new_rand();
         let matches = app().clone().get_matches_from(vec![
             "test",
             "--multiple",
@@ -251,7 +251,7 @@ mod tests {
         assert_eq!(value_of(&matches, "single"), Some(50));
         assert_eq!(value_of::<u64>(&matches, "multiple"), None);
 
-        let pubkey = solana_sdk::pubkey::new_rand();
+        let pubkey = Pubkey::new_rand();
         let matches = app()
             .clone()
             .get_matches_from(vec!["test", "--single", &pubkey.to_string()]);
@@ -331,8 +331,8 @@ mod tests {
 
     #[test]
     fn test_pubkeys_sigs_of() {
-        let key1 = solana_sdk::pubkey::new_rand();
-        let key2 = solana_sdk::pubkey::new_rand();
+        let key1 = Pubkey::new_rand();
+        let key2 = Pubkey::new_rand();
         let sig1 = Keypair::new().sign_message(&[0u8]);
         let sig2 = Keypair::new().sign_message(&[1u8]);
         let signer1 = format!("{}={}", key1, sig1);

clap-utils/src/keypair.rs

@@ -298,24 +298,7 @@ pub fn keypair_from_seed_phrase(
         keypair_from_seed_phrase_and_passphrase(&seed_phrase, &passphrase)?
     } else {
         let sanitized = sanitize_seed_phrase(seed_phrase);
-        let parse_language_fn = || {
-            for language in &[
-                Language::English,
-                Language::ChineseSimplified,
-                Language::ChineseTraditional,
-                Language::Japanese,
-                Language::Spanish,
-                Language::Korean,
-                Language::French,
-                Language::Italian,
-            ] {
-                if let Ok(mnemonic) = Mnemonic::from_phrase(&sanitized, *language) {
-                    return Ok(mnemonic);
-                }
-            }
-            Err("Can't get mnemonic from seed phrases")
-        };
-        let mnemonic = parse_language_fn()?;
+        let mnemonic = Mnemonic::from_phrase(&sanitized, Language::English)?;
         let passphrase = prompt_passphrase(&passphrase_prompt)?;
         let seed = Seed::new(&mnemonic, &passphrase);
         keypair_from_seed(seed.as_bytes())?

clap-utils/src/offline.rs

@@ -47,14 +47,32 @@ fn signer_arg<'a, 'b>() -> Arg<'a, 'b> {
         .help(SIGNER_ARG.help)
 }
 
+pub trait ArgsConfig {
+    fn blockhash_arg<'a, 'b>(&self, arg: Arg<'a, 'b>) -> Arg<'a, 'b> {
+        arg
+    }
+    fn sign_only_arg<'a, 'b>(&self, arg: Arg<'a, 'b>) -> Arg<'a, 'b> {
+        arg
+    }
+    fn signer_arg<'a, 'b>(&self, arg: Arg<'a, 'b>) -> Arg<'a, 'b> {
+        arg
+    }
+}
+
 pub trait OfflineArgs {
-    fn offline_args(self, global: bool) -> Self;
+    fn offline_args(self) -> Self;
+    fn offline_args_config(self, config: &dyn ArgsConfig) -> Self;
 }
 
 impl OfflineArgs for App<'_, '_> {
-    fn offline_args(self, global: bool) -> Self {
-        self.arg(blockhash_arg().global(global))
-            .arg(sign_only_arg().global(global))
-            .arg(signer_arg().global(global))
+    fn offline_args_config(self, config: &dyn ArgsConfig) -> Self {
+        self.arg(config.blockhash_arg(blockhash_arg()))
+            .arg(config.sign_only_arg(sign_only_arg()))
+            .arg(config.signer_arg(signer_arg()))
+    }
+    fn offline_args(self) -> Self {
+        struct NullArgsConfig {}
+        impl ArgsConfig for NullArgsConfig {}
+        self.offline_args_config(&NullArgsConfig {})
     }
 }

cli-config/Cargo.toml

@@ -3,13 +3,13 @@ authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 edition = "2018"
 name = "solana-cli-config"
 description = "Blockchain, Rebuilt for Scale"
-version = "1.3.23"
+version = "1.4.0"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
 
 [dependencies]
-dirs-next = "2.0.0"
+dirs = "2.0.2"
 lazy_static = "1.4.0"
 serde = "1.0.112"
 serde_derive = "1.0.103"

cli-config/src/config.rs

@@ -5,7 +5,7 @@ use url::Url;
 
 lazy_static! {
     pub static ref CONFIG_FILE: Option<String> = {
-        dirs_next::home_dir().map(|mut path| {
+        dirs::home_dir().map(|mut path| {
             path.extend(&[".config", "solana", "cli", "config.yml"]);
             path.to_str().unwrap().to_string()
         })
@@ -25,7 +25,7 @@ pub struct Config {
 impl Default for Config {
     fn default() -> Self {
         let keypair_path = {
-            let mut keypair_path = dirs_next::home_dir().expect("home directory");
+            let mut keypair_path = dirs::home_dir().expect("home directory");
             keypair_path.extend(&[".config", "solana", "id.json"]);
             keypair_path.to_str().unwrap().to_string()
         };

cli-output/Cargo.toml

@@ -3,7 +3,7 @@ authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 edition = "2018"
 name = "solana-cli-output"
 description = "Blockchain, Rebuilt for Scale"
-version = "1.3.23"
+version = "1.4.0"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
@@ -17,13 +17,13 @@ indicatif = "0.15.0"
 serde = "1.0.112"
 serde_derive = "1.0.103"
 serde_json = "1.0.56"
-solana-account-decoder = { path = "../account-decoder", version = "1.3.23" }
-solana-clap-utils = { path = "../clap-utils", version = "1.3.23" }
-solana-client = { path = "../client", version = "1.3.23" }
-solana-sdk = { path = "../sdk", version = "1.3.23" }
-solana-stake-program = { path = "../programs/stake", version = "1.3.23" }
-solana-transaction-status = { path = "../transaction-status", version = "1.3.23" }
-solana-vote-program = { path = "../programs/vote", version = "1.3.23" }
+solana-account-decoder = { path = "../account-decoder", version = "1.4.0" }
+solana-clap-utils = { path = "../clap-utils", version = "1.4.0" }
+solana-client = { path = "../client", version = "1.4.0" }
+solana-sdk = { path = "../sdk", version = "1.4.0" }
+solana-stake-program = { path = "../programs/stake", version = "1.4.0" }
+solana-transaction-status = { path = "../transaction-status", version = "1.4.0" }
+solana-vote-program = { path = "../programs/vote", version = "1.4.0" }
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]

cli-output/src/cli_output.rs

@@ -661,8 +661,13 @@ impl fmt::Display for CliStakeState {
                 if lockup.unix_timestamp != UnixTimestamp::default() {
                     writeln!(
                         f,
-                        "Lockup Timestamp: {}",
-                        unix_timestamp_to_string(lockup.unix_timestamp)
+                        "Lockup Timestamp: {} (UnixTimestamp: {})",
+                        DateTime::<Utc>::from_utc(
+                            NaiveDateTime::from_timestamp(lockup.unix_timestamp, 0),
+                            Utc
+                        )
+                        .to_rfc3339_opts(SecondsFormat::Secs, true),
+                        lockup.unix_timestamp
                     )?;
                 }
                 if lockup.epoch != Epoch::default() {
@@ -1003,12 +1008,7 @@ impl fmt::Display for CliVoteAccount {
                 None => "~".to_string(),
             }
         )?;
-        writeln!(
-            f,
-            "Recent Timestamp: {} from slot {}",
-            unix_timestamp_to_string(self.recent_timestamp.timestamp),
-            self.recent_timestamp.slot
-        )?;
+        writeln!(f, "Recent Timestamp: {:?}", self.recent_timestamp)?;
         if !self.votes.is_empty() {
             writeln!(f, "Recent Votes:")?;
             for vote in &self.votes {
@@ -1093,22 +1093,19 @@ pub struct CliBlockTime {
 impl QuietDisplay for CliBlockTime {}
 impl VerboseDisplay for CliBlockTime {}
 
-fn unix_timestamp_to_string(unix_timestamp: UnixTimestamp) -> String {
-    format!(
-        "{} (UnixTimestamp: {})",
-        match NaiveDateTime::from_timestamp_opt(unix_timestamp, 0) {
-            Some(ndt) =>
-                DateTime::<Utc>::from_utc(ndt, Utc).to_rfc3339_opts(SecondsFormat::Secs, true),
-            None => "unknown".to_string(),
-        },
-        unix_timestamp,
-    )
-}
-
 impl fmt::Display for CliBlockTime {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         writeln_name_value(f, "Block:", &self.slot.to_string())?;
-        writeln_name_value(f, "Date:", &unix_timestamp_to_string(self.timestamp))
+        writeln_name_value(
+            f,
+            "Date:",
+            &format!(
+                "{} (UnixTimestamp: {})",
+                DateTime::<Utc>::from_utc(NaiveDateTime::from_timestamp(self.timestamp, 0), Utc)
+                    .to_rfc3339_opts(SecondsFormat::Secs, true),
+                self.timestamp
+            ),
+        )
     }
 }
 

cli/Cargo.toml

@@ -3,7 +3,7 @@ authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 edition = "2018"
 name = "solana-cli"
 description = "Blockchain, Rebuilt for Scale"
-version = "1.3.23"
+version = "1.4.0"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
@@ -16,44 +16,41 @@ clap = "2.33.1"
 criterion-stats = "0.3.0"
 ctrlc = { version = "3.1.5", features = ["termination"] }
 console = "0.11.3"
-dirs-next = "2.0.0"
+dirs = "2.0.2"
 log = "0.4.8"
 Inflector = "0.11.4"
 indicatif = "0.15.0"
 humantime = "2.0.1"
 num-traits = "0.2"
 pretty-hex = "0.1.1"
-reqwest = { version = "0.10.6", default-features = false, features = ["blocking", "rustls-tls", "json"] }
+reqwest = { version = "0.10.8", default-features = false, features = ["blocking", "rustls-tls", "json"] }
 serde = "1.0.112"
 serde_derive = "1.0.103"
 serde_json = "1.0.56"
-solana-account-decoder = { path = "../account-decoder", version = "1.3.23" }
-solana-budget-program = { path = "../programs/budget", version = "1.3.23" }
-solana-bpf-loader-program = { path = "../programs/bpf_loader", version = "1.3.23" }
-solana-clap-utils = { path = "../clap-utils", version = "1.3.23" }
-solana-cli-config = { path = "../cli-config", version = "1.3.23" }
-solana-cli-output = { path = "../cli-output", version = "1.3.23" }
-solana-client = { path = "../client", version = "1.3.23" }
-solana-config-program = { path = "../programs/config", version = "1.3.23" }
-solana-faucet = { path = "../faucet", version = "1.3.23" }
-solana-logger = { path = "../logger", version = "1.3.23" }
-solana-net-utils = { path = "../net-utils", version = "1.3.23" }
+solana-account-decoder = { path = "../account-decoder", version = "1.4.0" }
+solana-bpf-loader-program = { path = "../programs/bpf_loader", version = "1.4.0" }
+solana-clap-utils = { path = "../clap-utils", version = "1.4.0" }
+solana-cli-config = { path = "../cli-config", version = "1.4.0" }
+solana-cli-output = { path = "../cli-output", version = "1.4.0" }
+solana-client = { path = "../client", version = "1.4.0" }
+solana-config-program = { path = "../programs/config", version = "1.4.0" }
+solana-faucet = { path = "../faucet", version = "1.4.0" }
+solana-logger = { path = "../logger", version = "1.4.0" }
+solana-net-utils = { path = "../net-utils", version = "1.4.0" }
 solana_rbpf = "=0.1.32"
-solana-remote-wallet = { path = "../remote-wallet", version = "1.3.23" }
-solana-runtime = { path = "../runtime", version = "1.3.23" }
-solana-sdk = { path = "../sdk", version = "1.3.23" }
-solana-stake-program = { path = "../programs/stake", version = "1.3.23" }
-solana-transaction-status = { path = "../transaction-status", version = "1.3.23" }
-solana-version = { path = "../version", version = "1.3.23" }
-solana-vote-program = { path = "../programs/vote", version = "1.3.23" }
-solana-vote-signer = { path = "../vote-signer", version = "1.3.23" }
+solana-remote-wallet = { path = "../remote-wallet", version = "1.4.0" }
+solana-runtime = { path = "../runtime", version = "1.4.0" }
+solana-sdk = { path = "../sdk", version = "1.4.0" }
+solana-stake-program = { path = "../programs/stake", version = "1.4.0" }
+solana-transaction-status = { path = "../transaction-status", version = "1.4.0" }
+solana-version = { path = "../version", version = "1.4.0" }
+solana-vote-program = { path = "../programs/vote", version = "1.4.0" }
+solana-vote-signer = { path = "../vote-signer", version = "1.4.0" }
 thiserror = "1.0.20"
-tiny-bip39 = "0.7.0"
 url = "2.1.1"
 
 [dev-dependencies]
-solana-core = { path = "../core", version = "1.3.23" }
-solana-budget-program = { path = "../programs/budget", version = "1.3.23" }
+solana-core = { path = "../core", version = "1.4.0" }
 tempfile = "3.1.0"
 
 [[bin]]

cli/src/checks.rs

@@ -54,42 +54,12 @@ pub fn check_account_for_multiple_fees_with_commitment(
     fee_calculator: &FeeCalculator,
     messages: &[&Message],
     commitment: CommitmentConfig,
-) -> Result<(), CliError> {
-    check_account_for_spend_multiple_fees_with_commitment(
-        rpc_client,
-        account_pubkey,
-        0,
-        fee_calculator,
-        messages,
-        commitment,
-    )
-}
-
-pub fn check_account_for_spend_multiple_fees_with_commitment(
-    rpc_client: &RpcClient,
-    account_pubkey: &Pubkey,
-    balance: u64,
-    fee_calculator: &FeeCalculator,
-    messages: &[&Message],
-    commitment: CommitmentConfig,
 ) -> Result<(), CliError> {
     let fee = calculate_fee(fee_calculator, messages);
-    if !check_account_for_balance_with_commitment(
-        rpc_client,
-        account_pubkey,
-        balance + fee,
-        commitment,
-    )
-    .map_err(Into::<ClientError>::into)?
+    if !check_account_for_balance_with_commitment(rpc_client, account_pubkey, fee, commitment)
+        .map_err(Into::<ClientError>::into)?
     {
-        if balance > 0 {
-            return Err(CliError::InsufficientFundsForSpendAndFee(
-                lamports_to_sol(balance),
-                lamports_to_sol(fee),
-            ));
-        } else {
-            return Err(CliError::InsufficientFundsForFee(lamports_to_sol(fee)));
-        }
+        return Err(CliError::InsufficientFundsForFee(lamports_to_sol(fee)));
     }
     Ok(())
 }
@@ -161,7 +131,7 @@ mod tests {
             context: RpcResponseContext { slot: 1 },
             value: json!(account_balance),
         });
-        let pubkey = solana_sdk::pubkey::new_rand();
+        let pubkey = Pubkey::new_rand();
         let fee_calculator = FeeCalculator::new(1);
 
         let pubkey0 = Pubkey::new(&[0; 32]);
@@ -221,7 +191,7 @@ mod tests {
             context: RpcResponseContext { slot: 1 },
             value: json!(account_balance),
         });
-        let pubkey = solana_sdk::pubkey::new_rand();
+        let pubkey = Pubkey::new_rand();
 
         let mut mocks = HashMap::new();
         mocks.insert(RpcRequest::GetBalance, account_balance_response);
@@ -267,9 +237,9 @@ mod tests {
 
     #[test]
     fn test_check_unique_pubkeys() {
-        let pubkey0 = solana_sdk::pubkey::new_rand();
+        let pubkey0 = Pubkey::new_rand();
         let pubkey_clone = pubkey0;
-        let pubkey1 = solana_sdk::pubkey::new_rand();
+        let pubkey1 = Pubkey::new_rand();
 
         check_unique_pubkeys((&pubkey0, "foo".to_string()), (&pubkey1, "bar".to_string()))
             .expect("unexpected result");

cli/src/cluster_query.rs

@@ -1,7 +1,6 @@
 use crate::{
     cli::{CliCommand, CliCommandInfo, CliConfig, CliError, ProcessResult},
     spend_utils::{resolve_spend_tx_and_check_account_balance, SpendAmount},
-    stake::is_stake_program_v2_enabled,
 };
 use chrono::{Local, TimeZone};
 use clap::{value_t, value_t_or_exit, App, AppSettings, Arg, ArgMatches, SubCommand};
@@ -1268,16 +1267,14 @@ pub fn process_show_gossip(rpc_client: &RpcClient, config: &CliConfig) -> Proces
         .into_iter()
         .map(|node| {
             format!(
-                "{:15} | {:44} | {:6} | {:5} | {:21} | {}",
+                "{:15} | {:44} | {:6} | {:5} | {:5} | {}",
                 node.gossip
                     .map(|addr| addr.ip().to_string())
                     .unwrap_or_else(|| "none".to_string()),
                 format_labeled_address(&node.pubkey, &config.address_labels),
                 format_port(node.gossip),
                 format_port(node.tpu),
-                node.rpc
-                    .map(|addr| addr.to_string())
-                    .unwrap_or_else(|| "none".to_string()),
+                format_port(node.rpc),
                 node.version.unwrap_or_else(|| "unknown".to_string()),
             )
         })
@@ -1285,9 +1282,9 @@ pub fn process_show_gossip(rpc_client: &RpcClient, config: &CliConfig) -> Proces
 
     Ok(format!(
         "IP Address      | Node identifier                              \
-         | Gossip | TPU   | RPC Address           | Version\n\
+         | Gossip | TPU   | RPC   | Version\n\
          ----------------+----------------------------------------------+\
-         --------+-------+-----------------------+----------------\n\
+         --------+-------+-------+----------------\n\
          {}\n\
          Nodes: {}",
         s.join("\n"),
@@ -1350,8 +1347,6 @@ pub fn process_show_stakes(
     let stake_history = StakeHistory::from_account(&stake_history_account).ok_or_else(|| {
         CliError::RpcRequestError("Failed to deserialize stake history".to_string())
     })?;
-    // At v1.6, this check can be removed and simply passed as `true`
-    let stake_program_v2_enabled = is_stake_program_v2_enabled(rpc_client);
 
     let mut stake_accounts: Vec<CliKeyedStakeState> = vec![];
     for (stake_pubkey, stake_account) in all_stake_accounts {
@@ -1367,7 +1362,6 @@ pub fn process_show_stakes(
                                 use_lamports_unit,
                                 &stake_history,
                                 &clock,
-                                stake_program_v2_enabled,
                             ),
                         });
                     }
@@ -1386,7 +1380,6 @@ pub fn process_show_stakes(
                                 use_lamports_unit,
                                 &stake_history,
                                 &clock,
-                                stake_program_v2_enabled,
                             ),
                         });
                     }

cli/src/feature.rs

@@ -230,7 +230,7 @@ fn active_stake_by_feature_set(rpc_client: &RpcClient) -> Result<HashMap<u32, u6
 }
 
 // Feature activation is only allowed when 95% of the active stake is on the current feature set
-fn feature_activation_allowed(rpc_client: &RpcClient, quiet: bool) -> Result<bool, ClientError> {
+fn feature_activation_allowed(rpc_client: &RpcClient) -> Result<bool, ClientError> {
     let my_feature_set = solana_version::Version::default().feature_set;
 
     let active_stake_by_feature_set = active_stake_by_feature_set(rpc_client)?;
@@ -240,8 +240,8 @@ fn feature_activation_allowed(rpc_client: &RpcClient, quiet: bool) -> Result<boo
         .map(|percentage| *percentage >= 95)
         .unwrap_or(false);
 
-    if !feature_activation_allowed && !quiet {
-        println!("{}", style("Stake By Feature Set:").bold());
+    if !feature_activation_allowed {
+        println!("\n{}", style("Stake By Feature Set:").bold());
         for (feature_set, percentage) in active_stake_by_feature_set.iter() {
             if *feature_set == 0 {
                 println!("unknown - {}%", percentage);
@@ -258,7 +258,6 @@ fn feature_activation_allowed(rpc_client: &RpcClient, quiet: bool) -> Result<boo
                 );
             }
         }
-        println!();
     }
 
     Ok(feature_activation_allowed)
@@ -300,10 +299,9 @@ fn process_status(
         });
     }
 
-    let feature_activation_allowed = feature_activation_allowed(rpc_client, features.len() <= 1)?;
     let feature_set = CliFeatures {
         features,
-        feature_activation_allowed,
+        feature_activation_allowed: feature_activation_allowed(rpc_client)?,
         inactive,
     };
     Ok(config.output_format.formatted_string(&feature_set))
@@ -325,7 +323,7 @@ fn process_activate(
         }
     }
 
-    if !feature_activation_allowed(rpc_client, false)? {
+    if !feature_activation_allowed(rpc_client)? {
         return Err("Feature activation is not allowed at this time".into());
     }
 

cli/src/lib.rs

@@ -26,7 +26,6 @@ pub mod cluster_query;
 pub mod feature;
 pub mod inflation;
 pub mod nonce;
-pub mod send_tpu;
 pub mod spend_utils;
 pub mod stake;
 pub mod test_utils;

cli/src/nonce.rs

@@ -833,7 +833,7 @@ mod tests {
     #[test]
     fn test_check_nonce_account() {
         let blockhash = Hash::default();
-        let nonce_pubkey = solana_sdk::pubkey::new_rand();
+        let nonce_pubkey = Pubkey::new_rand();
         let data = Versions::new_current(State::Initialized(nonce::state::Data {
             authority: nonce_pubkey,
             blockhash,
@@ -869,7 +869,7 @@ mod tests {
         }
 
         let data = Versions::new_current(State::Initialized(nonce::state::Data {
-            authority: solana_sdk::pubkey::new_rand(),
+            authority: Pubkey::new_rand(),
             blockhash,
             fee_calculator: FeeCalculator::default(),
         }));

cli/src/send_tpu.rs

@@ -1,29 +0,0 @@
-use log::*;
-use solana_client::rpc_response::{RpcContactInfo, RpcLeaderSchedule};
-use std::net::{SocketAddr, UdpSocket};
-
-pub fn get_leader_tpu(
-    slot_index: u64,
-    leader_schedule: Option<&RpcLeaderSchedule>,
-    cluster_nodes: Option<&Vec<RpcContactInfo>>,
-) -> Option<SocketAddr> {
-    leader_schedule?
-        .iter()
-        .find(|(_pubkey, slots)| slots.iter().any(|slot| *slot as u64 == slot_index))
-        .and_then(|(pubkey, _)| {
-            cluster_nodes?
-                .iter()
-                .find(|contact_info| contact_info.pubkey == *pubkey)
-                .and_then(|contact_info| contact_info.tpu)
-        })
-}
-
-pub fn send_transaction_tpu(
-    send_socket: &UdpSocket,
-    tpu_address: &SocketAddr,
-    wire_transaction: &[u8],
-) {
-    if let Err(err) = send_socket.send_to(wire_transaction, tpu_address) {
-        warn!("Failed to send transaction to {}: {:?}", tpu_address, err);
-    }
-}

cli/src/stake.rs

@@ -31,7 +31,6 @@ use solana_client::{
     rpc_request::{self, DELINQUENT_VALIDATOR_SLOT_DISTANCE},
 };
 use solana_remote_wallet::remote_wallet::RemoteWalletManager;
-use solana_runtime::{feature::Feature, feature_set};
 use solana_sdk::{
     account_utils::StateMut,
     clock::{Clock, Epoch, Slot, UnixTimestamp, SECONDS_PER_DAY},
@@ -161,7 +160,7 @@ impl StakeSubCommands for App<'_, '_> {
                         .validator(is_valid_signer)
                         .help("Source account of funds [default: cli config keypair]"),
                 )
-                .offline_args(false)
+                .offline_args()
                 .nonce_args(false)
                 .arg(fee_payer_arg())
         )
@@ -190,7 +189,7 @@ impl StakeSubCommands for App<'_, '_> {
                         "The vote account to which the stake will be delegated")
                 )
                 .arg(stake_authority_arg())
-                .offline_args(false)
+                .offline_args()
                 .nonce_args(false)
                 .arg(fee_payer_arg())
         )
@@ -220,7 +219,7 @@ impl StakeSubCommands for App<'_, '_> {
                 )
                 .arg(stake_authority_arg())
                 .arg(withdraw_authority_arg())
-                .offline_args(false)
+                .offline_args()
                 .nonce_args(false)
                 .arg(fee_payer_arg())
         )
@@ -235,7 +234,7 @@ impl StakeSubCommands for App<'_, '_> {
                         "Stake account to be deactivated. ")
                 )
                 .arg(stake_authority_arg())
-                .offline_args(false)
+                .offline_args()
                 .nonce_args(false)
                 .arg(fee_payer_arg())
         )
@@ -275,7 +274,7 @@ impl StakeSubCommands for App<'_, '_> {
                         .help("Seed for address generation; if specified, the resulting account will be at a derived address of the SPLIT STAKE ACCOUNT pubkey")
                 )
                 .arg(stake_authority_arg())
-                .offline_args(false)
+                .offline_args()
                 .nonce_args(false)
                 .arg(fee_payer_arg())
         )
@@ -297,7 +296,7 @@ impl StakeSubCommands for App<'_, '_> {
                         "Source stake account for the merge.  If successful, this stake account will no longer exist after the merge")
                 )
                 .arg(stake_authority_arg())
-                .offline_args(false)
+                .offline_args()
                 .nonce_args(false)
                 .arg(fee_payer_arg())
         )
@@ -328,7 +327,7 @@ impl StakeSubCommands for App<'_, '_> {
                         .help("The amount to withdraw from the stake account, in SOL")
                 )
                 .arg(withdraw_authority_arg())
-                .offline_args(false)
+                .offline_args()
                 .nonce_args(false)
                 .arg(fee_payer_arg())
                 .arg(
@@ -383,7 +382,7 @@ impl StakeSubCommands for App<'_, '_> {
                         .validator(is_valid_signer)
                         .help("Keypair of the existing custodian [default: cli config pubkey]")
                 )
-                .offline_args(false)
+                .offline_args()
                 .nonce_args(false)
                 .arg(fee_payer_arg())
         )
@@ -1502,7 +1501,6 @@ pub fn build_stake_state(
     use_lamports_unit: bool,
     stake_history: &StakeHistory,
     clock: &Clock,
-    stake_program_v2_enabled: bool,
 ) -> CliStakeState {
     match stake_state {
         StakeState::Stake(
@@ -1514,12 +1512,9 @@ pub fn build_stake_state(
             stake,
         ) => {
             let current_epoch = clock.epoch;
-            let (active_stake, activating_stake, deactivating_stake) =
-                stake.delegation.stake_activating_and_deactivating(
-                    current_epoch,
-                    Some(stake_history),
-                    stake_program_v2_enabled,
-                );
+            let (active_stake, activating_stake, deactivating_stake) = stake
+                .delegation
+                .stake_activating_and_deactivating(current_epoch, Some(stake_history));
             let lockup = if lockup.is_in_force(clock, None) {
                 Some(lockup.into())
             } else {
@@ -1716,7 +1711,6 @@ pub fn process_show_stake_account(
                 use_lamports_unit,
                 &stake_history,
                 &clock,
-                is_stake_program_v2_enabled(rpc_client), // At v1.6, this check can be removed and simply passed as `true`
             );
 
             if state.stake_type == CliStakeType::Stake {
@@ -1887,15 +1881,6 @@ pub fn process_delegate_stake(
     }
 }
 
-pub fn is_stake_program_v2_enabled(rpc_client: &RpcClient) -> bool {
-    rpc_client
-        .get_account(&feature_set::stake_program_v2::id())
-        .ok()
-        .and_then(|account| Feature::from_account(&account))
-        .and_then(|feature| feature.activated_at)
-        .is_some()
-}
-
 #[cfg(test)]
 mod tests {
     use super::*;
@@ -2441,9 +2426,9 @@ mod tests {
         );
 
         // Test CreateStakeAccount SubCommand
-        let custodian = solana_sdk::pubkey::new_rand();
+        let custodian = Pubkey::new_rand();
         let custodian_string = format!("{}", custodian);
-        let authorized = solana_sdk::pubkey::new_rand();
+        let authorized = Pubkey::new_rand();
         let authorized_string = format!("{}", authorized);
         let test_create_stake_account = test_commands.clone().get_matches_from(vec![
             "test",
@@ -2581,7 +2566,7 @@ mod tests {
         );
 
         // Test DelegateStake Subcommand
-        let vote_account_pubkey = solana_sdk::pubkey::new_rand();
+        let vote_account_pubkey = Pubkey::new_rand();
         let vote_account_string = vote_account_pubkey.to_string();
         let test_delegate_stake = test_commands.clone().get_matches_from(vec![
             "test",
@@ -2608,7 +2593,7 @@ mod tests {
         );
 
         // Test DelegateStake Subcommand w/ authority
-        let vote_account_pubkey = solana_sdk::pubkey::new_rand();
+        let vote_account_pubkey = Pubkey::new_rand();
         let vote_account_string = vote_account_pubkey.to_string();
         let test_delegate_stake = test_commands.clone().get_matches_from(vec![
             "test",
@@ -2727,7 +2712,7 @@ mod tests {
         );
 
         // Test Delegate Subcommand w/ absent fee payer
-        let key1 = solana_sdk::pubkey::new_rand();
+        let key1 = Pubkey::new_rand();
         let sig1 = Keypair::new().sign_message(&[0u8]);
         let signer1 = format!("{}={}", key1, sig1);
         let test_delegate_stake = test_commands.clone().get_matches_from(vec![
@@ -2767,7 +2752,7 @@ mod tests {
         );
 
         // Test Delegate Subcommand w/ absent fee payer and absent nonce authority
-        let key2 = solana_sdk::pubkey::new_rand();
+        let key2 = Pubkey::new_rand();
         let sig2 = Keypair::new().sign_message(&[0u8]);
         let signer2 = format!("{}={}", key2, sig2);
         let test_delegate_stake = test_commands.clone().get_matches_from(vec![
@@ -3095,7 +3080,7 @@ mod tests {
         );
 
         // Test Deactivate Subcommand w/ absent fee payer
-        let key1 = solana_sdk::pubkey::new_rand();
+        let key1 = Pubkey::new_rand();
         let sig1 = Keypair::new().sign_message(&[0u8]);
         let signer1 = format!("{}={}", key1, sig1);
         let test_deactivate_stake = test_commands.clone().get_matches_from(vec![
@@ -3132,7 +3117,7 @@ mod tests {
         );
 
         // Test Deactivate Subcommand w/ absent fee payer and nonce authority
-        let key2 = solana_sdk::pubkey::new_rand();
+        let key2 = Pubkey::new_rand();
         let sig2 = Keypair::new().sign_message(&[0u8]);
         let signer2 = format!("{}={}", key2, sig2);
         let test_deactivate_stake = test_commands.clone().get_matches_from(vec![
@@ -3311,7 +3296,7 @@ mod tests {
         let stake_account_keypair = Keypair::new();
         write_keypair(&stake_account_keypair, tmp_file.as_file_mut()).unwrap();
 
-        let source_stake_account_pubkey = solana_sdk::pubkey::new_rand();
+        let source_stake_account_pubkey = Pubkey::new_rand();
         let test_merge_stake_account = test_commands.clone().get_matches_from(vec![
             "test",
             "merge-stake",

cli/src/validator_info.rs

@@ -486,7 +486,7 @@ mod tests {
 
     #[test]
     fn test_parse_validator_info() {
-        let pubkey = solana_sdk::pubkey::new_rand();
+        let pubkey = Pubkey::new_rand();
         let keys = vec![(validator_info::id(), false), (pubkey, true)];
         let config = ConfigKeys { keys };
 

cli/src/vote.rs

@@ -915,7 +915,7 @@ mod tests {
         );
 
         // test init with an authed voter
-        let authed = solana_sdk::pubkey::new_rand();
+        let authed = Pubkey::new_rand();
         let (keypair_file, mut tmp_file) = make_tmp_file();
         let keypair = Keypair::new();
         write_keypair(&keypair, tmp_file.as_file_mut()).unwrap();

cli/tests/deploy.rs

@@ -55,7 +55,7 @@ fn test_cli_deploy_program() {
         faucet_host: None,
         faucet_port: faucet_addr.port(),
         pubkey: None,
-        lamports: 4 * minimum_balance_for_rent_exemption, // min balance for rent exemption for three programs + leftover for tx processing
+        lamports: 3 * minimum_balance_for_rent_exemption, // min balance for rent exemption for two programs + leftover for tx processing
     };
     config.signers = vec![&keypair];
     process_command(&config).unwrap();
@@ -64,7 +64,6 @@ fn test_cli_deploy_program() {
         program_location: pathbuf.to_str().unwrap().to_string(),
         address: None,
         use_deprecated_loader: false,
-        allow_excessive_balance: false,
     };
 
     let response = process_command(&config);
@@ -99,7 +98,6 @@ fn test_cli_deploy_program() {
         program_location: pathbuf.to_str().unwrap().to_string(),
         address: Some(1),
         use_deprecated_loader: false,
-        allow_excessive_balance: false,
     };
     process_command(&config).unwrap();
     let account1 = rpc_client
@@ -115,44 +113,6 @@ fn test_cli_deploy_program() {
     // Attempt to redeploy to the same address
     process_command(&config).unwrap_err();
 
-    // Attempt to deploy to account with excess balance
-    let custom_address_keypair = Keypair::new();
-    config.command = CliCommand::Airdrop {
-        faucet_host: None,
-        faucet_port: faucet_addr.port(),
-        pubkey: None,
-        lamports: 2 * minimum_balance_for_rent_exemption, // Anything over minimum_balance_for_rent_exemption should trigger err
-    };
-    config.signers = vec![&custom_address_keypair];
-    process_command(&config).unwrap();
-
-    config.signers = vec![&keypair, &custom_address_keypair];
-    config.command = CliCommand::Deploy {
-        program_location: pathbuf.to_str().unwrap().to_string(),
-        address: Some(1),
-        use_deprecated_loader: false,
-        allow_excessive_balance: false,
-    };
-    process_command(&config).unwrap_err();
-
-    // Use forcing parameter to deploy to account with excess balance
-    config.command = CliCommand::Deploy {
-        program_location: pathbuf.to_str().unwrap().to_string(),
-        address: Some(1),
-        use_deprecated_loader: false,
-        allow_excessive_balance: true,
-    };
-    process_command(&config).unwrap();
-    let account2 = rpc_client
-        .get_account_with_commitment(&custom_address_keypair.pubkey(), CommitmentConfig::recent())
-        .unwrap()
-        .value
-        .unwrap();
-    assert_eq!(account2.lamports, 2 * minimum_balance_for_rent_exemption);
-    assert_eq!(account2.owner, bpf_loader::id());
-    assert_eq!(account2.executable, true);
-    assert_eq!(account0.data, account2.data);
-
     server.close().unwrap();
     remove_dir_all(ledger_path).unwrap();
 }

cli/tests/nonce.rs

@@ -10,7 +10,7 @@ use solana_client::{
     rpc_client::RpcClient,
 };
 use solana_core::contact_info::ContactInfo;
-use solana_core::test_validator::TestValidator;
+use solana_core::test_validator::{TestValidator, TestValidatorOptions};
 use solana_faucet::faucet::run_local_faucet;
 use solana_sdk::{
     commitment_config::CommitmentConfig,
@@ -172,7 +172,7 @@ fn full_battery_tests(
     assert_ne!(first_nonce, third_nonce);
 
     // Withdraw from nonce account
-    let payee_pubkey = solana_sdk::pubkey::new_rand();
+    let payee_pubkey = Pubkey::new_rand();
     config_payer.signers = authorized_signers;
     config_payer.command = CliCommand::WithdrawFromNonceAccount {
         nonce_account,
@@ -231,14 +231,17 @@ fn full_battery_tests(
 
 #[test]
 fn test_create_account_with_seed() {
-    solana_logger::setup();
     let TestValidator {
         server,
         leader_data,
         alice: mint_keypair,
         ledger_path,
         ..
-    } = TestValidator::run_with_fees(1);
+    } = TestValidator::run_with_options(TestValidatorOptions {
+        fees: 1,
+        bootstrap_validator_lamports: 42_000,
+        ..TestValidatorOptions::default()
+    });
 
     let (sender, receiver) = channel();
     run_local_faucet(mint_keypair, sender, None);

cli/tests/pay.rs

@@ -1,452 +0,0 @@
-use chrono::prelude::*;
-use serde_json::Value;
-use solana_cli::{
-    cli::{process_command, request_and_confirm_airdrop, CliCommand, CliConfig, PayCommand},
-    spend_utils::SpendAmount,
-    test_utils::check_recent_balance,
-};
-use solana_cli_output::{parse_sign_only_reply_string, OutputFormat};
-use solana_client::{
-    blockhash_query::{self, BlockhashQuery},
-    nonce_utils,
-    rpc_client::RpcClient,
-};
-use solana_core::test_validator::TestValidator;
-use solana_faucet::faucet::run_local_faucet;
-use solana_sdk::{
-    commitment_config::CommitmentConfig,
-    nonce::State as NonceState,
-    pubkey::Pubkey,
-    signature::{Keypair, Signer},
-};
-use std::{fs::remove_dir_all, sync::mpsc::channel};
-
-#[test]
-fn test_cli_timestamp_tx() {
-    let TestValidator {
-        server,
-        leader_data,
-        alice,
-        ledger_path,
-        ..
-    } = TestValidator::run();
-    let bob_pubkey = solana_sdk::pubkey::new_rand();
-
-    let (sender, receiver) = channel();
-    run_local_faucet(alice, sender, None);
-    let faucet_addr = receiver.recv().unwrap();
-
-    let rpc_client = RpcClient::new_socket(leader_data.rpc);
-    let default_signer0 = Keypair::new();
-    let default_signer1 = Keypair::new();
-
-    let mut config_payer = CliConfig::recent_for_tests();
-    config_payer.json_rpc_url =
-        format!("http://{}:{}", leader_data.rpc.ip(), leader_data.rpc.port());
-    config_payer.signers = vec![&default_signer0];
-
-    let mut config_witness = CliConfig::recent_for_tests();
-    config_witness.json_rpc_url = config_payer.json_rpc_url.clone();
-    config_witness.signers = vec![&default_signer1];
-
-    assert_ne!(
-        config_payer.signers[0].pubkey(),
-        config_witness.signers[0].pubkey()
-    );
-
-    request_and_confirm_airdrop(
-        &rpc_client,
-        &faucet_addr,
-        &config_payer.signers[0].pubkey(),
-        50,
-        &config_witness,
-    )
-    .unwrap();
-    check_recent_balance(50, &rpc_client, &config_payer.signers[0].pubkey());
-
-    request_and_confirm_airdrop(
-        &rpc_client,
-        &faucet_addr,
-        &config_witness.signers[0].pubkey(),
-        1,
-        &config_witness,
-    )
-    .unwrap();
-
-    // Make transaction (from config_payer to bob_pubkey) requiring timestamp from config_witness
-    let date_string = "\"2018-09-19T17:30:59Z\"";
-    let dt: DateTime<Utc> = serde_json::from_str(&date_string).unwrap();
-    config_payer.command = CliCommand::Pay(PayCommand {
-        amount: SpendAmount::Some(10),
-        to: bob_pubkey,
-        timestamp: Some(dt),
-        timestamp_pubkey: Some(config_witness.signers[0].pubkey()),
-        ..PayCommand::default()
-    });
-    let sig_response = process_command(&config_payer);
-
-    let object: Value = serde_json::from_str(&sig_response.unwrap()).unwrap();
-    let process_id_str = object.get("processId").unwrap().as_str().unwrap();
-    let process_id_vec = bs58::decode(process_id_str)
-        .into_vec()
-        .expect("base58-encoded public key");
-    let process_id = Pubkey::new(&process_id_vec);
-
-    check_recent_balance(40, &rpc_client, &config_payer.signers[0].pubkey()); // config_payer balance
-    check_recent_balance(10, &rpc_client, &process_id); // contract balance
-    check_recent_balance(0, &rpc_client, &bob_pubkey); // recipient balance
-
-    // Sign transaction by config_witness
-    config_witness.command = CliCommand::TimeElapsed(bob_pubkey, process_id, dt);
-    process_command(&config_witness).unwrap();
-
-    check_recent_balance(40, &rpc_client, &config_payer.signers[0].pubkey()); // config_payer balance
-    check_recent_balance(0, &rpc_client, &process_id); // contract balance
-    check_recent_balance(10, &rpc_client, &bob_pubkey); // recipient balance
-
-    server.close().unwrap();
-    remove_dir_all(ledger_path).unwrap();
-}
-
-#[test]
-fn test_cli_witness_tx() {
-    let TestValidator {
-        server,
-        leader_data,
-        alice,
-        ledger_path,
-        ..
-    } = TestValidator::run();
-    let bob_pubkey = solana_sdk::pubkey::new_rand();
-
-    let (sender, receiver) = channel();
-    run_local_faucet(alice, sender, None);
-    let faucet_addr = receiver.recv().unwrap();
-
-    let rpc_client = RpcClient::new_socket(leader_data.rpc);
-    let default_signer0 = Keypair::new();
-    let default_signer1 = Keypair::new();
-
-    let mut config_payer = CliConfig::recent_for_tests();
-    config_payer.json_rpc_url =
-        format!("http://{}:{}", leader_data.rpc.ip(), leader_data.rpc.port());
-    config_payer.signers = vec![&default_signer0];
-
-    let mut config_witness = CliConfig::recent_for_tests();
-    config_witness.json_rpc_url = config_payer.json_rpc_url.clone();
-    config_witness.signers = vec![&default_signer1];
-
-    assert_ne!(
-        config_payer.signers[0].pubkey(),
-        config_witness.signers[0].pubkey()
-    );
-
-    request_and_confirm_airdrop(
-        &rpc_client,
-        &faucet_addr,
-        &config_payer.signers[0].pubkey(),
-        50,
-        &config_witness,
-    )
-    .unwrap();
-    request_and_confirm_airdrop(
-        &rpc_client,
-        &faucet_addr,
-        &config_witness.signers[0].pubkey(),
-        1,
-        &config_witness,
-    )
-    .unwrap();
-
-    // Make transaction (from config_payer to bob_pubkey) requiring witness signature from config_witness
-    config_payer.command = CliCommand::Pay(PayCommand {
-        amount: SpendAmount::Some(10),
-        to: bob_pubkey,
-        witnesses: Some(vec![config_witness.signers[0].pubkey()]),
-        ..PayCommand::default()
-    });
-    let sig_response = process_command(&config_payer);
-
-    let object: Value = serde_json::from_str(&sig_response.unwrap()).unwrap();
-    let process_id_str = object.get("processId").unwrap().as_str().unwrap();
-    let process_id_vec = bs58::decode(process_id_str)
-        .into_vec()
-        .expect("base58-encoded public key");
-    let process_id = Pubkey::new(&process_id_vec);
-
-    check_recent_balance(40, &rpc_client, &config_payer.signers[0].pubkey()); // config_payer balance
-    check_recent_balance(10, &rpc_client, &process_id); // contract balance
-    check_recent_balance(0, &rpc_client, &bob_pubkey); // recipient balance
-
-    // Sign transaction by config_witness
-    config_witness.command = CliCommand::Witness(bob_pubkey, process_id);
-    process_command(&config_witness).unwrap();
-
-    check_recent_balance(40, &rpc_client, &config_payer.signers[0].pubkey()); // config_payer balance
-    check_recent_balance(0, &rpc_client, &process_id); // contract balance
-    check_recent_balance(10, &rpc_client, &bob_pubkey); // recipient balance
-
-    server.close().unwrap();
-    remove_dir_all(ledger_path).unwrap();
-}
-
-#[test]
-fn test_cli_cancel_tx() {
-    let TestValidator {
-        server,
-        leader_data,
-        alice,
-        ledger_path,
-        ..
-    } = TestValidator::run();
-    let bob_pubkey = solana_sdk::pubkey::new_rand();
-
-    let (sender, receiver) = channel();
-    run_local_faucet(alice, sender, None);
-    let faucet_addr = receiver.recv().unwrap();
-
-    let rpc_client = RpcClient::new_socket(leader_data.rpc);
-    let default_signer0 = Keypair::new();
-    let default_signer1 = Keypair::new();
-
-    let mut config_payer = CliConfig::recent_for_tests();
-    config_payer.json_rpc_url =
-        format!("http://{}:{}", leader_data.rpc.ip(), leader_data.rpc.port());
-    config_payer.signers = vec![&default_signer0];
-
-    let mut config_witness = CliConfig::recent_for_tests();
-    config_witness.json_rpc_url = config_payer.json_rpc_url.clone();
-    config_witness.signers = vec![&default_signer1];
-
-    assert_ne!(
-        config_payer.signers[0].pubkey(),
-        config_witness.signers[0].pubkey()
-    );
-
-    request_and_confirm_airdrop(
-        &rpc_client,
-        &faucet_addr,
-        &config_payer.signers[0].pubkey(),
-        50,
-        &config_witness,
-    )
-    .unwrap();
-
-    // Make transaction (from config_payer to bob_pubkey) requiring witness signature from config_witness
-    config_payer.command = CliCommand::Pay(PayCommand {
-        amount: SpendAmount::Some(10),
-        to: bob_pubkey,
-        witnesses: Some(vec![config_witness.signers[0].pubkey()]),
-        cancelable: true,
-        ..PayCommand::default()
-    });
-    let sig_response = process_command(&config_payer).unwrap();
-
-    let object: Value = serde_json::from_str(&sig_response).unwrap();
-    let process_id_str = object.get("processId").unwrap().as_str().unwrap();
-    let process_id_vec = bs58::decode(process_id_str)
-        .into_vec()
-        .expect("base58-encoded public key");
-    let process_id = Pubkey::new(&process_id_vec);
-
-    check_recent_balance(40, &rpc_client, &config_payer.signers[0].pubkey()); // config_payer balance
-    check_recent_balance(10, &rpc_client, &process_id); // contract balance
-    check_recent_balance(0, &rpc_client, &bob_pubkey); // recipient balance
-
-    // Sign transaction by config_witness
-    config_payer.command = CliCommand::Cancel(process_id);
-    process_command(&config_payer).unwrap();
-
-    check_recent_balance(50, &rpc_client, &config_payer.signers[0].pubkey()); // config_payer balance
-    check_recent_balance(0, &rpc_client, &process_id); // contract balance
-    check_recent_balance(0, &rpc_client, &bob_pubkey); // recipient balance
-
-    server.close().unwrap();
-    remove_dir_all(ledger_path).unwrap();
-}
-
-#[test]
-fn test_offline_pay_tx() {
-    let TestValidator {
-        server,
-        leader_data,
-        alice,
-        ledger_path,
-        ..
-    } = TestValidator::run();
-    let bob_pubkey = solana_sdk::pubkey::new_rand();
-
-    let (sender, receiver) = channel();
-    run_local_faucet(alice, sender, None);
-    let faucet_addr = receiver.recv().unwrap();
-
-    let rpc_client = RpcClient::new_socket(leader_data.rpc);
-    let default_signer = Keypair::new();
-    let default_offline_signer = Keypair::new();
-
-    let mut config_offline = CliConfig::recent_for_tests();
-    config_offline.json_rpc_url =
-        format!("http://{}:{}", leader_data.rpc.ip(), leader_data.rpc.port());
-    config_offline.signers = vec![&default_offline_signer];
-    let mut config_online = CliConfig::recent_for_tests();
-    config_online.json_rpc_url =
-        format!("http://{}:{}", leader_data.rpc.ip(), leader_data.rpc.port());
-    config_online.signers = vec![&default_signer];
-    assert_ne!(
-        config_offline.signers[0].pubkey(),
-        config_online.signers[0].pubkey()
-    );
-
-    request_and_confirm_airdrop(
-        &rpc_client,
-        &faucet_addr,
-        &config_offline.signers[0].pubkey(),
-        50,
-        &config_offline,
-    )
-    .unwrap();
-
-    request_and_confirm_airdrop(
-        &rpc_client,
-        &faucet_addr,
-        &config_online.signers[0].pubkey(),
-        50,
-        &config_offline,
-    )
-    .unwrap();
-    check_recent_balance(50, &rpc_client, &config_offline.signers[0].pubkey());
-    check_recent_balance(50, &rpc_client, &config_online.signers[0].pubkey());
-
-    let (blockhash, _) = rpc_client.get_recent_blockhash().unwrap();
-    config_offline.command = CliCommand::Pay(PayCommand {
-        amount: SpendAmount::Some(10),
-        to: bob_pubkey,
-        blockhash_query: BlockhashQuery::None(blockhash),
-        sign_only: true,
-        ..PayCommand::default()
-    });
-    config_offline.output_format = OutputFormat::JsonCompact;
-    let sig_response = process_command(&config_offline).unwrap();
-
-    check_recent_balance(50, &rpc_client, &config_offline.signers[0].pubkey());
-    check_recent_balance(50, &rpc_client, &config_online.signers[0].pubkey());
-    check_recent_balance(0, &rpc_client, &bob_pubkey);
-
-    let sign_only = parse_sign_only_reply_string(&sig_response);
-    assert!(sign_only.has_all_signers());
-    let offline_presigner = sign_only
-        .presigner_of(&config_offline.signers[0].pubkey())
-        .unwrap();
-    let online_pubkey = config_online.signers[0].pubkey();
-    config_online.signers = vec![&offline_presigner];
-    config_online.command = CliCommand::Pay(PayCommand {
-        amount: SpendAmount::Some(10),
-        to: bob_pubkey,
-        blockhash_query: BlockhashQuery::FeeCalculator(blockhash_query::Source::Cluster, blockhash),
-        ..PayCommand::default()
-    });
-    process_command(&config_online).unwrap();
-
-    check_recent_balance(40, &rpc_client, &config_offline.signers[0].pubkey());
-    check_recent_balance(50, &rpc_client, &online_pubkey);
-    check_recent_balance(10, &rpc_client, &bob_pubkey);
-
-    server.close().unwrap();
-    remove_dir_all(ledger_path).unwrap();
-}
-
-#[test]
-fn test_nonced_pay_tx() {
-    solana_logger::setup();
-
-    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();
-
-    let rpc_client = RpcClient::new_socket(leader_data.rpc);
-    let default_signer = Keypair::new();
-
-    let mut config = CliConfig::recent_for_tests();
-    config.json_rpc_url = format!("http://{}:{}", leader_data.rpc.ip(), leader_data.rpc.port());
-    config.signers = vec![&default_signer];
-
-    let minimum_nonce_balance = rpc_client
-        .get_minimum_balance_for_rent_exemption(NonceState::size())
-        .unwrap();
-
-    request_and_confirm_airdrop(
-        &rpc_client,
-        &faucet_addr,
-        &config.signers[0].pubkey(),
-        50 + minimum_nonce_balance,
-        &config,
-    )
-    .unwrap();
-    check_recent_balance(
-        50 + minimum_nonce_balance,
-        &rpc_client,
-        &config.signers[0].pubkey(),
-    );
-
-    // Create nonce account
-    let nonce_account = Keypair::new();
-    config.command = CliCommand::CreateNonceAccount {
-        nonce_account: 1,
-        seed: None,
-        nonce_authority: Some(config.signers[0].pubkey()),
-        amount: SpendAmount::Some(minimum_nonce_balance),
-    };
-    config.signers.push(&nonce_account);
-    process_command(&config).unwrap();
-
-    check_recent_balance(50, &rpc_client, &config.signers[0].pubkey());
-    check_recent_balance(minimum_nonce_balance, &rpc_client, &nonce_account.pubkey());
-
-    // Fetch nonce hash
-    let nonce_hash = nonce_utils::get_account_with_commitment(
-        &rpc_client,
-        &nonce_account.pubkey(),
-        CommitmentConfig::recent(),
-    )
-    .and_then(|ref a| nonce_utils::data_from_account(a))
-    .unwrap()
-    .blockhash;
-
-    let bob_pubkey = solana_sdk::pubkey::new_rand();
-    config.signers = vec![&default_signer];
-    config.command = CliCommand::Pay(PayCommand {
-        amount: SpendAmount::Some(10),
-        to: bob_pubkey,
-        blockhash_query: BlockhashQuery::FeeCalculator(
-            blockhash_query::Source::NonceAccount(nonce_account.pubkey()),
-            nonce_hash,
-        ),
-        nonce_account: Some(nonce_account.pubkey()),
-        ..PayCommand::default()
-    });
-    process_command(&config).expect("failed to process pay command");
-
-    check_recent_balance(40, &rpc_client, &config.signers[0].pubkey());
-    check_recent_balance(10, &rpc_client, &bob_pubkey);
-
-    // Verify that nonce has been used
-    let nonce_hash2 = nonce_utils::get_account_with_commitment(
-        &rpc_client,
-        &nonce_account.pubkey(),
-        CommitmentConfig::recent(),
-    )
-    .and_then(|ref a| nonce_utils::data_from_account(a))
-    .unwrap()
-    .blockhash;
-    assert_ne!(nonce_hash, nonce_hash2);
-
-    server.close().unwrap();
-    remove_dir_all(ledger_path).unwrap();
-}

cli/tests/stake.rs

@@ -9,7 +9,7 @@ use solana_client::{
     nonce_utils,
     rpc_client::RpcClient,
 };
-use solana_core::test_validator::TestValidator;
+use solana_core::test_validator::{TestValidator, TestValidatorOptions};
 use solana_faucet::faucet::run_local_faucet;
 use solana_sdk::{
     account_utils::StateMut,
@@ -848,7 +848,11 @@ fn test_stake_authorize_with_fee_payer() {
         alice,
         ledger_path,
         ..
-    } = TestValidator::run_with_fees(SIG_FEE);
+    } = TestValidator::run_with_options(TestValidatorOptions {
+        fees: SIG_FEE,
+        bootstrap_validator_lamports: 42_000,
+        ..TestValidatorOptions::default()
+    });
     let (sender, receiver) = channel();
     run_local_faucet(alice, sender, None);
     let faucet_addr = receiver.recv().unwrap();
@@ -981,7 +985,11 @@ fn test_stake_split() {
         alice,
         ledger_path,
         ..
-    } = TestValidator::run_with_fees(1);
+    } = TestValidator::run_with_options(TestValidatorOptions {
+        fees: 1,
+        bootstrap_validator_lamports: 42_000,
+        ..TestValidatorOptions::default()
+    });
     let (sender, receiver) = channel();
     run_local_faucet(alice, sender, None);
     let faucet_addr = receiver.recv().unwrap();
@@ -1132,7 +1140,11 @@ fn test_stake_set_lockup() {
         alice,
         ledger_path,
         ..
-    } = TestValidator::run_with_fees(1);
+    } = TestValidator::run_with_options(TestValidatorOptions {
+        fees: 1,
+        bootstrap_validator_lamports: 42_000,
+        ..TestValidatorOptions::default()
+    });
     let (sender, receiver) = channel();
     run_local_faucet(alice, sender, None);
     let faucet_addr = receiver.recv().unwrap();

cli/tests/transfer.rs

@@ -9,7 +9,7 @@ use solana_client::{
     nonce_utils,
     rpc_client::RpcClient,
 };
-use solana_core::test_validator::TestValidator;
+use solana_core::test_validator::{TestValidator, TestValidatorOptions};
 use solana_faucet::faucet::run_local_faucet;
 use solana_sdk::{
     commitment_config::CommitmentConfig,
@@ -21,14 +21,17 @@ use std::{fs::remove_dir_all, sync::mpsc::channel};
 
 #[test]
 fn test_transfer() {
-    solana_logger::setup();
     let TestValidator {
         server,
         leader_data,
         alice: mint_keypair,
         ledger_path,
         ..
-    } = TestValidator::run_with_fees(1);
+    } = TestValidator::run_with_options(TestValidatorOptions {
+        fees: 1,
+        bootstrap_validator_lamports: 42_000,
+        ..TestValidatorOptions::default()
+    });
 
     let (sender, receiver) = channel();
     run_local_faucet(mint_keypair, sender, None);
@@ -249,14 +252,17 @@ fn test_transfer() {
 
 #[test]
 fn test_transfer_multisession_signing() {
-    solana_logger::setup();
     let TestValidator {
         server,
         leader_data,
         alice: mint_keypair,
         ledger_path,
         ..
-    } = TestValidator::run_with_fees(1);
+    } = TestValidator::run_with_options(TestValidatorOptions {
+        fees: 1,
+        bootstrap_validator_lamports: 42_000,
+        ..TestValidatorOptions::default()
+    });
 
     let (sender, receiver) = channel();
     run_local_faucet(mint_keypair, sender, None);
@@ -376,14 +382,17 @@ fn test_transfer_multisession_signing() {
 
 #[test]
 fn test_transfer_all() {
-    solana_logger::setup();
     let TestValidator {
         server,
         leader_data,
         alice: mint_keypair,
         ledger_path,
         ..
-    } = TestValidator::run_with_fees(1);
+    } = TestValidator::run_with_options(TestValidatorOptions {
+        fees: 1,
+        bootstrap_validator_lamports: 42_000,
+        ..TestValidatorOptions::default()
+    });
 
     let (sender, receiver) = channel();
     run_local_faucet(mint_keypair, sender, None);

cli/tests/vote.rs

@@ -12,6 +12,7 @@ use solana_faucet::faucet::run_local_faucet;
 use solana_sdk::{
     account_utils::StateMut,
     commitment_config::CommitmentConfig,
+    pubkey::Pubkey,
     signature::{Keypair, Signer},
 };
 use solana_vote_program::vote_state::{VoteAuthorize, VoteState, VoteStateVersions};
@@ -109,7 +110,7 @@ fn test_vote_authorize_and_withdraw() {
     assert_eq!(authorized_withdrawer, withdraw_authority.pubkey());
 
     // Withdraw from vote account
-    let destination_account = solana_sdk::pubkey::new_rand(); // Send withdrawal to new account to make balance check easy
+    let destination_account = Pubkey::new_rand(); // Send withdrawal to new account to make balance check easy
     config.signers = vec![&default_signer, &withdraw_authority];
     config.command = CliCommand::WithdrawFromVoteAccount {
         vote_account_pubkey,

client/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "solana-client"
-version = "1.3.23"
+version = "1.4.0"
 description = "Solana Client"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -17,18 +17,16 @@ indicatif = "0.15.0"
 jsonrpc-core = "15.0.0"
 log = "0.4.8"
 rayon = "1.4.0"
-reqwest = { version = "0.10.6", default-features = false, features = ["blocking", "rustls-tls", "json"] }
-semver = "0.11.0"
+reqwest = { version = "0.10.8", default-features = false, features = ["blocking", "rustls-tls", "json"] }
 serde = "1.0.112"
 serde_derive = "1.0.103"
 serde_json = "1.0.56"
-solana-account-decoder = { path = "../account-decoder", version = "1.3.23" }
-solana-clap-utils = { path = "../clap-utils", version = "1.3.23" }
-solana-net-utils = { path = "../net-utils", version = "1.3.23" }
-solana-sdk = { path = "../sdk", version = "1.3.23" }
-solana-transaction-status = { path = "../transaction-status", version = "1.3.23" }
-solana-version = { path = "../version", version = "1.3.23" }
-solana-vote-program = { path = "../programs/vote", version = "1.3.23" }
+solana-account-decoder = { path = "../account-decoder", version = "1.4.0" }
+solana-clap-utils = { path = "../clap-utils", version = "1.4.0" }
+solana-net-utils = { path = "../net-utils", version = "1.4.0" }
+solana-sdk = { path = "../sdk", version = "1.4.0" }
+solana-transaction-status = { path = "../transaction-status", version = "1.4.0" }
+solana-vote-program = { path = "../programs/vote", version = "1.4.0" }
 thiserror = "1.0"
 tungstenite = "0.10.1"
 url = "2.1.1"
@@ -37,7 +35,7 @@ url = "2.1.1"
 assert_matches = "1.3.0"
 jsonrpc-core = "15.0.0"
 jsonrpc-http-server = "15.0.0"
-solana-logger = { path = "../logger", version = "1.3.23" }
+solana-logger = { path = "../logger", version = "1.4.0" }
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]

client/src/blockhash_query.rs

@@ -179,7 +179,7 @@ mod tests {
     fn test_blockhash_query_new_from_matches_ok() {
         let test_commands = App::new("blockhash_query_test")
             .nonce_args(false)
-            .offline_args(false);
+            .offline_args();
         let blockhash = hash(&[1u8]);
         let blockhash_string = blockhash.to_string();
 

client/src/mock_sender.rs

@@ -1,19 +1,17 @@
 use crate::{
     client_error::Result,
     rpc_request::RpcRequest,
-    rpc_response::{Response, RpcResponseContext, RpcVersionInfo},
+    rpc_response::{Response, RpcResponseContext},
     rpc_sender::RpcSender,
 };
-use serde_json::{json, Number, Value};
+use serde_json::{Number, Value};
 use solana_sdk::{
-    epoch_info::EpochInfo,
     fee_calculator::{FeeCalculator, FeeRateGovernor},
     instruction::InstructionError,
     signature::Signature,
     transaction::{self, Transaction, TransactionError},
 };
 use solana_transaction_status::TransactionStatus;
-use solana_version::Version;
 use std::{collections::HashMap, sync::RwLock};
 
 pub const PUBKEY: &str = "7RoSF9fUmdphVCpabEoefH81WwrW7orsWonXWqTXkKV8";
@@ -59,13 +57,6 @@ impl RpcSender for MockSender {
                     serde_json::to_value(FeeCalculator::default()).unwrap(),
                 ),
             })?,
-            RpcRequest::GetEpochInfo => serde_json::to_value(EpochInfo {
-                epoch: 1,
-                slot_index: 2,
-                slots_in_epoch: 32,
-                absolute_slot: 34,
-                block_height: 34,
-            })?,
             RpcRequest::GetFeeCalculatorForBlockhash => {
                 let value = if self.url == "blockhash_expired" {
                     Value::Null
@@ -128,13 +119,6 @@ impl RpcSender for MockSender {
                 Value::String(signature)
             }
             RpcRequest::GetMinimumBalanceForRentExemption => Value::Number(Number::from(20)),
-            RpcRequest::GetVersion => {
-                let version = Version::default();
-                json!(RpcVersionInfo {
-                    solana_core: version.to_string(),
-                    feature_set: Some(version.feature_set),
-                })
-            }
             _ => Value::Null,
         };
         Ok(val)

client/src/rpc_client.rs

@@ -41,14 +41,12 @@ use solana_transaction_status::{
 use solana_vote_program::vote_state::MAX_LOCKOUT_HISTORY;
 use std::{
     net::SocketAddr,
-    sync::RwLock,
     thread::sleep,
     time::{Duration, Instant},
 };
 
 pub struct RpcClient {
     sender: Box<dyn RpcSender + Send + Sync + 'static>,
-    default_cluster_transaction_encoding: RwLock<Option<UiTransactionEncoding>>,
 }
 
 fn serialize_encode_transaction(
@@ -75,7 +73,6 @@ impl RpcClient {
     pub fn new_sender<T: RpcSender + Send + Sync + 'static>(sender: T) -> Self {
         Self {
             sender: Box::new(sender),
-            default_cluster_transaction_encoding: RwLock::new(None),
         }
     }
 
@@ -131,41 +128,12 @@ impl RpcClient {
         self.send_transaction_with_config(transaction, RpcSendTransactionConfig::default())
     }
 
-    fn default_cluster_transaction_encoding(&self) -> Result<UiTransactionEncoding, RpcError> {
-        let default_cluster_transaction_encoding =
-            self.default_cluster_transaction_encoding.read().unwrap();
-        if let Some(encoding) = *default_cluster_transaction_encoding {
-            Ok(encoding)
-        } else {
-            drop(default_cluster_transaction_encoding);
-            let cluster_version = self.get_version().map_err(|e| {
-                RpcError::RpcRequestError(format!("cluster version query failed: {}", e))
-            })?;
-            let cluster_version =
-                semver::Version::parse(&cluster_version.solana_core).map_err(|e| {
-                    RpcError::RpcRequestError(format!("failed to parse cluster version: {}", e))
-                })?;
-            // Prefer base64 since 1.3.16
-            let encoding = if cluster_version < semver::Version::new(1, 3, 16) {
-                UiTransactionEncoding::Base58
-            } else {
-                UiTransactionEncoding::Base64
-            };
-            *self.default_cluster_transaction_encoding.write().unwrap() = Some(encoding);
-            Ok(encoding)
-        }
-    }
-
     pub fn send_transaction_with_config(
         &self,
         transaction: &Transaction,
         config: RpcSendTransactionConfig,
     ) -> ClientResult<Signature> {
-        let encoding = if let Some(encoding) = config.encoding {
-            encoding
-        } else {
-            self.default_cluster_transaction_encoding()?
-        };
+        let encoding = config.encoding.unwrap_or(UiTransactionEncoding::Base64);
         let config = RpcSendTransactionConfig {
             encoding: Some(encoding),
             ..config
@@ -206,11 +174,7 @@ impl RpcClient {
         transaction: &Transaction,
         config: RpcSimulateTransactionConfig,
     ) -> RpcResult<RpcSimulateTransactionResult> {
-        let encoding = if let Some(encoding) = config.encoding {
-            encoding
-        } else {
-            self.default_cluster_transaction_encoding()?
-        };
+        let encoding = config.encoding.unwrap_or(UiTransactionEncoding::Base64);
         let config = RpcSimulateTransactionConfig {
             encoding: Some(encoding),
             ..config
@@ -1456,7 +1420,7 @@ mod tests {
         let rpc_client = RpcClient::new_mock("succeeds".to_string());
 
         let key = Keypair::new();
-        let to = solana_sdk::pubkey::new_rand();
+        let to = Pubkey::new_rand();
         let blockhash = Hash::default();
         let tx = system_transaction::transfer(&key, &to, 50, blockhash);
 
@@ -1509,7 +1473,7 @@ mod tests {
         let rpc_client = RpcClient::new_mock("succeeds".to_string());
 
         let key = Keypair::new();
-        let to = solana_sdk::pubkey::new_rand();
+        let to = Pubkey::new_rand();
         let blockhash = Hash::default();
         let tx = system_transaction::transfer(&key, &to, 50, blockhash);
         let result = rpc_client.send_and_confirm_transaction(&tx);

client/src/rpc_request.rs

@@ -228,7 +228,7 @@ mod tests {
 
         // Test request with CommitmentConfig and params
         let test_request = RpcRequest::GetTokenAccountsByOwner;
-        let mint = solana_sdk::pubkey::new_rand();
+        let mint = Pubkey::new_rand();
         let token_account_filter = RpcTokenAccountsFilter::Mint(mint.to_string());
         let request = test_request
             .build_request_json(1, json!([addr, token_account_filter, commitment_config]));

core/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "solana-core"
 description = "Blockchain, Rebuilt for Scale"
-version = "1.3.23"
+version = "1.4.0"
 documentation = "https://docs.rs/solana"
 homepage = "https://solana.com/"
 readme = "../README.md"
@@ -34,54 +34,52 @@ jsonrpc-http-server = "15.0.0"
 jsonrpc-pubsub = "15.0.0"
 jsonrpc-ws-server = "15.0.0"
 log = "0.4.8"
-lru = "0.6.0"
 num_cpus = "1.13.0"
 num-traits = "0.2"
 rand = "0.7.0"
 rand_chacha = "0.2.2"
 raptorq = "1.4.2"
-rayon = "1.4.0"
+rayon = "1.4.1"
 regex = "1.3.9"
 serde = "1.0.112"
 serde_derive = "1.0.103"
 serde_json = "1.0.56"
-solana-account-decoder = { path = "../account-decoder", version = "1.3.23" }
-solana-banks-server = { path = "../banks-server", version = "1.3.23" }
-solana-budget-program = { path = "../programs/budget", version = "1.3.23" }
-solana-clap-utils = { path = "../clap-utils", version = "1.3.23" }
-solana-client = { path = "../client", version = "1.3.23" }
-solana-faucet = { path = "../faucet", version = "1.3.23" }
-solana-ledger = { path = "../ledger", version = "1.3.23" }
-solana-logger = { path = "../logger", version = "1.3.23" }
-solana-merkle-tree = { path = "../merkle-tree", version = "1.3.23" }
-solana-metrics = { path = "../metrics", version = "1.3.23" }
-solana-measure = { path = "../measure", version = "1.3.23" }
-solana-net-utils = { path = "../net-utils", version = "1.3.23" }
-solana-perf = { path = "../perf", version = "1.3.23" }
-solana-runtime = { path = "../runtime", version = "1.3.23" }
-solana-sdk = { path = "../sdk", version = "1.3.23" }
-solana-sdk-macro-frozen-abi = { path = "../sdk/macro-frozen-abi", version = "1.3.23" }
-solana-stake-program = { path = "../programs/stake", version = "1.3.23" }
-solana-storage-bigtable = { path = "../storage-bigtable", version = "1.3.23" }
-solana-streamer = { path = "../streamer", version = "1.3.23" }
-solana-sys-tuner = { path = "../sys-tuner", version = "1.3.23" }
-solana-transaction-status = { path = "../transaction-status", version = "1.3.23" }
-solana-version = { path = "../version", version = "1.3.23" }
-solana-vote-program = { path = "../programs/vote", version = "1.3.23" }
-solana-vote-signer = { path = "../vote-signer", version = "1.3.23" }
+solana-account-decoder = { path = "../account-decoder", version = "1.4.0" }
+solana-banks-server = { path = "../banks-server", version = "1.4.0" }
+solana-clap-utils = { path = "../clap-utils", version = "1.4.0" }
+solana-client = { path = "../client", version = "1.4.0" }
+solana-faucet = { path = "../faucet", version = "1.4.0" }
+solana-ledger = { path = "../ledger", version = "1.4.0" }
+solana-logger = { path = "../logger", version = "1.4.0" }
+solana-merkle-tree = { path = "../merkle-tree", version = "1.4.0" }
+solana-metrics = { path = "../metrics", version = "1.4.0" }
+solana-measure = { path = "../measure", version = "1.4.0" }
+solana-net-utils = { path = "../net-utils", version = "1.4.0" }
+solana-perf = { path = "../perf", version = "1.4.0" }
+solana-runtime = { path = "../runtime", version = "1.4.0" }
+solana-sdk = { path = "../sdk", version = "1.4.0" }
+solana-sdk-macro-frozen-abi = { path = "../sdk/macro-frozen-abi", version = "1.4.0" }
+solana-stake-program = { path = "../programs/stake", version = "1.4.0" }
+solana-storage-bigtable = { path = "../storage-bigtable", version = "1.4.0" }
+solana-streamer = { path = "../streamer", version = "1.4.0" }
+solana-sys-tuner = { path = "../sys-tuner", version = "1.4.0" }
+solana-transaction-status = { path = "../transaction-status", version = "1.4.0" }
+solana-version = { path = "../version", version = "1.4.0" }
+solana-vote-program = { path = "../programs/vote", version = "1.4.0" }
+solana-vote-signer = { path = "../vote-signer", version = "1.4.0" }
 spl-token-v2-0 = { package = "spl-token", version = "=2.0.6", features = ["skip-no-mangle"] }
 tempfile = "3.1.0"
 thiserror = "1.0"
+tokio = { version = "0.2.22", features = ["full"] }
 tokio_01 = { version = "0.1", package = "tokio" }
 tokio_fs_01 = { version = "0.1", package = "tokio-fs" }
 tokio_io_01 = { version = "0.1", package = "tokio-io" }
-solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "1.3.23" }
-tokio = { version = "0.2.22", features = ["full"] }
+solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "1.4.0" }
 trees = "0.2.1"
 
 [dev-dependencies]
 matches = "0.1.6"
-reqwest = { version = "0.10.6", default-features = false, features = ["blocking", "rustls-tls", "json"] }
+reqwest = { version = "0.10.8", default-features = false, features = ["blocking", "rustls-tls", "json"] }
 serial_test = "0.4.0"
 serial_test_derive = "0.4.0"
 systemstat = "0.1.5"
@@ -95,9 +93,6 @@ name = "banking_stage"
 [[bench]]
 name = "blockstore"
 
-[[bench]]
-name = "crds"
-
 [[bench]]
 name = "crds_gossip_pull"
 

core/benches/banking_stage.rs

@@ -20,6 +20,7 @@ use solana_runtime::bank::Bank;
 use solana_sdk::genesis_config::GenesisConfig;
 use solana_sdk::hash::Hash;
 use solana_sdk::message::Message;
+use solana_sdk::pubkey::Pubkey;
 use solana_sdk::signature::Keypair;
 use solana_sdk::signature::Signature;
 use solana_sdk::signature::Signer;
@@ -55,7 +56,7 @@ fn bench_consume_buffered(bencher: &mut Bencher) {
     let GenesisConfigInfo { genesis_config, .. } = create_genesis_config(100_000);
     let bank = Arc::new(Bank::new(&genesis_config));
     let ledger_path = get_tmp_ledger_path!();
-    let my_pubkey = solana_sdk::pubkey::new_rand();
+    let my_pubkey = Pubkey::new_rand();
     {
         let blockstore = Arc::new(
             Blockstore::open(&ledger_path).expect("Expected to be able to open database ledger"),
@@ -93,21 +94,22 @@ fn bench_consume_buffered(bencher: &mut Bencher) {
 }
 
 fn make_accounts_txs(txes: usize, mint_keypair: &Keypair, hash: Hash) -> Vec<Transaction> {
-    let to_pubkey = solana_sdk::pubkey::new_rand();
+    let to_pubkey = Pubkey::new_rand();
     let dummy = system_transaction::transfer(mint_keypair, &to_pubkey, 1, hash);
     (0..txes)
         .into_par_iter()
         .map(|_| {
             let mut new = dummy.clone();
             let sig: Vec<u8> = (0..64).map(|_| thread_rng().gen()).collect();
-            new.message.account_keys[0] = solana_sdk::pubkey::new_rand();
-            new.message.account_keys[1] = solana_sdk::pubkey::new_rand();
+            new.message.account_keys[0] = Pubkey::new_rand();
+            new.message.account_keys[1] = Pubkey::new_rand();
             new.signatures = vec![Signature::new(&sig[0..64])];
             new
         })
         .collect()
 }
 
+#[allow(clippy::same_item_push)]
 fn make_programs_txs(txes: usize, hash: Hash) -> Vec<Transaction> {
     let progs = 4;
     (0..txes)
@@ -115,7 +117,7 @@ fn make_programs_txs(txes: usize, hash: Hash) -> Vec<Transaction> {
             let mut instructions = vec![];
             let from_key = Keypair::new();
             for _ in 1..progs {
-                let to_key = solana_sdk::pubkey::new_rand();
+                let to_key = Pubkey::new_rand();
                 instructions.push(system_instruction::transfer(&from_key.pubkey(), &to_key, 1));
             }
             let message = Message::new(&instructions, Some(&from_key.pubkey()));
@@ -293,6 +295,7 @@ fn simulate_process_entries(
     process_entries(&bank, &[entry], randomize_txs, None, None).unwrap();
 }
 
+#[allow(clippy::same_item_push)]
 fn bench_process_entries(randomize_txs: bool, bencher: &mut Bencher) {
     // entropy multiplier should be big enough to provide sufficient entropy
     // but small enough to not take too much time while executing the test.

core/benches/cluster_info.rs

@@ -8,6 +8,7 @@ use solana_core::broadcast_stage::{broadcast_shreds, get_broadcast_peers};
 use solana_core::cluster_info::{ClusterInfo, Node};
 use solana_core::contact_info::ContactInfo;
 use solana_ledger::shred::Shred;
+use solana_sdk::pubkey::Pubkey;
 use solana_sdk::timing::timestamp;
 use std::{
     collections::HashMap,
@@ -19,7 +20,7 @@ use test::Bencher;
 #[bench]
 fn broadcast_shreds_bench(bencher: &mut Bencher) {
     solana_logger::setup();
-    let leader_pubkey = solana_sdk::pubkey::new_rand();
+    let leader_pubkey = Pubkey::new_rand();
     let leader_info = Node::new_localhost_with_pubkey(&leader_pubkey);
     let cluster_info = ClusterInfo::new_with_invalid_keypair(leader_info.info);
     let socket = UdpSocket::bind("0.0.0.0:0").unwrap();
@@ -29,7 +30,7 @@ fn broadcast_shreds_bench(bencher: &mut Bencher) {
     let mut stakes = HashMap::new();
     const NUM_PEERS: usize = 200;
     for _ in 0..NUM_PEERS {
-        let id = solana_sdk::pubkey::new_rand();
+        let id = Pubkey::new_rand();
         let contact_info = ContactInfo::new_localhost(&id, timestamp());
         cluster_info.insert_info(contact_info);
         stakes.insert(id, thread_rng().gen_range(1, NUM_PEERS) as u64);

core/benches/consensus.rs

@@ -0,0 +1,36 @@
+#![feature(test)]
+
+extern crate solana_core;
+extern crate test;
+
+use solana_core::consensus::Tower;
+use solana_runtime::bank::Bank;
+use solana_runtime::bank_forks::BankForks;
+use solana_sdk::{
+    pubkey::Pubkey,
+    signature::{Keypair, Signer},
+};
+use std::sync::Arc;
+use tempfile::TempDir;
+use test::Bencher;
+
+#[bench]
+fn bench_save_tower(bench: &mut Bencher) {
+    let dir = TempDir::new().unwrap();
+    let path = dir.path();
+
+    let vote_account_pubkey = &Pubkey::default();
+    let node_keypair = Arc::new(Keypair::new());
+    let heaviest_bank = BankForks::new(Bank::default()).working_bank();
+    let tower = Tower::new(
+        &node_keypair.pubkey(),
+        &vote_account_pubkey,
+        0,
+        &heaviest_bank,
+        &path,
+    );
+
+    bench.iter(move || {
+        tower.save(&node_keypair).unwrap();
+    });
+}

core/benches/crds.rs

@@ -1,31 +0,0 @@
-#![feature(test)]
-
-extern crate test;
-
-use rand::{thread_rng, Rng};
-use rayon::ThreadPoolBuilder;
-use solana_core::crds::Crds;
-use solana_core::crds_gossip_pull::CRDS_GOSSIP_PULL_CRDS_TIMEOUT_MS;
-use solana_core::crds_value::CrdsValue;
-use solana_sdk::pubkey::Pubkey;
-use std::collections::HashMap;
-use test::Bencher;
-
-#[bench]
-fn bench_find_old_labels(bencher: &mut Bencher) {
-    let thread_pool = ThreadPoolBuilder::new().build().unwrap();
-    let mut rng = thread_rng();
-    let mut crds = Crds::default();
-    let now = CRDS_GOSSIP_PULL_CRDS_TIMEOUT_MS + CRDS_GOSSIP_PULL_CRDS_TIMEOUT_MS / 1000;
-    std::iter::repeat_with(|| (CrdsValue::new_rand(&mut rng), rng.gen_range(0, now)))
-        .take(50_000)
-        .for_each(|(v, ts)| assert!(crds.insert(v, ts).is_ok()));
-    let mut timeouts = HashMap::new();
-    timeouts.insert(Pubkey::default(), CRDS_GOSSIP_PULL_CRDS_TIMEOUT_MS);
-    bencher.iter(|| {
-        let out = crds.find_old_labels(&thread_pool, now, &timeouts);
-        assert!(out.len() > 10);
-        assert!(out.len() < 250);
-        out
-    });
-}

core/benches/crds_gossip_pull.rs

@@ -8,12 +8,13 @@ use solana_core::cluster_info::MAX_BLOOM_SIZE;
 use solana_core::crds::Crds;
 use solana_core::crds_gossip_pull::{CrdsFilter, CrdsGossipPull};
 use solana_core::crds_value::CrdsValue;
+use solana_sdk::hash::Hash;
 use test::Bencher;
 
 #[bench]
 fn bench_hash_as_u64(bencher: &mut Bencher) {
     let mut rng = thread_rng();
-    let hashes: Vec<_> = std::iter::repeat_with(|| solana_sdk::hash::new_rand(&mut rng))
+    let hashes: Vec<_> = std::iter::repeat_with(|| Hash::new_rand(&mut rng))
         .take(1000)
         .collect();
     bencher.iter(|| {
@@ -33,7 +34,7 @@ fn bench_build_crds_filters(bencher: &mut Bencher) {
     for _ in 0..50_000 {
         crds_gossip_pull
             .purged_values
-            .push_back((solana_sdk::hash::new_rand(&mut rng), rng.gen()));
+            .push_back((Hash::new_rand(&mut rng), rng.gen()));
     }
     let mut num_inserts = 0;
     for _ in 0..90_000 {

core/benches/crds_shards.rs

@@ -7,16 +7,14 @@ use solana_core::contact_info::ContactInfo;
 use solana_core::crds::VersionedCrdsValue;
 use solana_core::crds_shards::CrdsShards;
 use solana_core::crds_value::{CrdsData, CrdsValue};
+use solana_sdk::pubkey::Pubkey;
 use solana_sdk::timing::timestamp;
 use test::Bencher;
 
 const CRDS_SHARDS_BITS: u32 = 8;
 
 fn new_test_crds_value() -> VersionedCrdsValue {
-    let data = CrdsData::ContactInfo(ContactInfo::new_localhost(
-        &solana_sdk::pubkey::new_rand(),
-        timestamp(),
-    ));
+    let data = CrdsData::ContactInfo(ContactInfo::new_localhost(&Pubkey::new_rand(), timestamp()));
     VersionedCrdsValue::new(timestamp(), CrdsValue::new_unsigned(data))
 }
 

core/benches/retransmit_stage.rs

@@ -14,6 +14,7 @@ use solana_perf::packet::to_packets_chunked;
 use solana_perf::test_tx::test_tx;
 use solana_runtime::bank::Bank;
 use solana_runtime::bank_forks::BankForks;
+use solana_sdk::pubkey::Pubkey;
 use solana_sdk::timing::timestamp;
 use std::net::UdpSocket;
 use std::sync::atomic::{AtomicUsize, Ordering};
@@ -26,13 +27,14 @@ use std::time::Duration;
 use test::Bencher;
 
 #[bench]
+#[allow(clippy::same_item_push)]
 fn bench_retransmitter(bencher: &mut Bencher) {
     solana_logger::setup();
     let cluster_info = ClusterInfo::new_with_invalid_keypair(Node::new_localhost().info);
     const NUM_PEERS: usize = 4;
     let mut peer_sockets = Vec::new();
     for _ in 0..NUM_PEERS {
-        let id = solana_sdk::pubkey::new_rand();
+        let id = Pubkey::new_rand();
         let socket = UdpSocket::bind("0.0.0.0:0").unwrap();
         let mut contact_info = ContactInfo::new_localhost(&id, timestamp());
         contact_info.tvu = socket.local_addr().unwrap();

core/src/accounts_background_service.rs

@@ -1,59 +0,0 @@
-// Service to clean up dead slots in accounts_db
-//
-// This can be expensive since we have to walk the append vecs being cleaned up.
-
-use rand::{thread_rng, Rng};
-use solana_runtime::bank_forks::BankForks;
-use std::sync::{
-    atomic::{AtomicBool, Ordering},
-    Arc, RwLock,
-};
-use std::thread::{self, sleep, Builder, JoinHandle};
-use std::time::Duration;
-
-pub struct AccountsBackgroundService {
-    t_background: JoinHandle<()>,
-}
-
-const INTERVAL_MS: u64 = 100;
-const SHRUNKEN_ACCOUNT_PER_SEC: usize = 250;
-const SHRUNKEN_ACCOUNT_PER_INTERVAL: usize =
-    SHRUNKEN_ACCOUNT_PER_SEC / (1000 / INTERVAL_MS as usize);
-const CLEAN_INTERVAL_SLOTS: u64 = 100;
-
-impl AccountsBackgroundService {
-    pub fn new(bank_forks: Arc<RwLock<BankForks>>, exit: &Arc<AtomicBool>) -> Self {
-        info!("AccountsBackgroundService active");
-        let exit = exit.clone();
-        let mut consumed_budget = 0;
-        let mut last_cleaned_slot = 0;
-        let t_background = Builder::new()
-            .name("solana-accounts-background".to_string())
-            .spawn(move || loop {
-                if exit.load(Ordering::Relaxed) {
-                    break;
-                }
-                let bank = bank_forks.read().unwrap().root_bank().clone();
-
-                bank.process_dead_slots();
-
-                consumed_budget = bank
-                    .process_stale_slot_with_budget(consumed_budget, SHRUNKEN_ACCOUNT_PER_INTERVAL);
-
-                if bank.block_height() - last_cleaned_slot
-                    > (CLEAN_INTERVAL_SLOTS + thread_rng().gen_range(0, 10))
-                {
-                    bank.clean_accounts();
-                    last_cleaned_slot = bank.block_height();
-                }
-
-                sleep(Duration::from_millis(INTERVAL_MS));
-            })
-            .unwrap();
-        Self { t_background }
-    }
-
-    pub fn join(self) -> thread::Result<()> {
-        self.t_background.join()
-    }
-}

core/src/banking_stage.rs

@@ -1097,6 +1097,7 @@ mod tests {
     use solana_sdk::{
         instruction::InstructionError,
         signature::{Keypair, Signer},
+        system_instruction::SystemError,
         system_transaction,
         transaction::TransactionError,
     };
@@ -1245,16 +1246,16 @@ mod tests {
             bank.process_transaction(&fund_tx).unwrap();
 
             // good tx
-            let to = solana_sdk::pubkey::new_rand();
+            let to = Pubkey::new_rand();
             let tx = system_transaction::transfer(&mint_keypair, &to, 1, start_hash);
 
             // good tx, but no verify
-            let to2 = solana_sdk::pubkey::new_rand();
+            let to2 = Pubkey::new_rand();
             let tx_no_ver = system_transaction::transfer(&keypair, &to2, 2, start_hash);
 
             // bad tx, AccountNotFound
             let keypair = Keypair::new();
-            let to3 = solana_sdk::pubkey::new_rand();
+            let to3 = Pubkey::new_rand();
             let tx_anf = system_transaction::transfer(&keypair, &to3, 1, start_hash);
 
             // send 'em over
@@ -1447,9 +1448,9 @@ mod tests {
             let poh_recorder = Arc::new(Mutex::new(poh_recorder));
 
             poh_recorder.lock().unwrap().set_working_bank(working_bank);
-            let pubkey = solana_sdk::pubkey::new_rand();
+            let pubkey = Pubkey::new_rand();
             let keypair2 = Keypair::new();
-            let pubkey2 = solana_sdk::pubkey::new_rand();
+            let pubkey2 = Pubkey::new_rand();
 
             let transactions = vec![
                 system_transaction::transfer(&mint_keypair, &pubkey, 1, genesis_config.hash()),
@@ -1473,7 +1474,7 @@ mod tests {
             results[0] = (
                 Err(TransactionError::InstructionError(
                     1,
-                    InstructionError::new_result_with_negative_lamports(),
+                    SystemError::ResultWithNegativeLamports.into(),
                 )),
                 Some(HashAgeKind::Extant),
             );
@@ -1527,7 +1528,7 @@ mod tests {
             mint_keypair,
             ..
         } = create_genesis_config(10_000);
-        let pubkey = solana_sdk::pubkey::new_rand();
+        let pubkey = Pubkey::new_rand();
 
         let transactions = vec![
             None,
@@ -1608,7 +1609,7 @@ mod tests {
             mint_keypair,
             ..
         } = create_genesis_config(10_000);
-        let pubkey = solana_sdk::pubkey::new_rand();
+        let pubkey = Pubkey::new_rand();
 
         let transactions = vec![
             system_transaction::transfer(&mint_keypair, &pubkey, 1, genesis_config.hash()),
@@ -1679,8 +1680,8 @@ mod tests {
 
     #[test]
     fn test_should_process_or_forward_packets() {
-        let my_pubkey = solana_sdk::pubkey::new_rand();
-        let my_pubkey1 = solana_sdk::pubkey::new_rand();
+        let my_pubkey = Pubkey::new_rand();
+        let my_pubkey1 = Pubkey::new_rand();
 
         assert_eq!(
             BankingStage::consume_or_forward_packets(&my_pubkey, None, true, false,),
@@ -1726,7 +1727,7 @@ mod tests {
             ..
         } = create_genesis_config(10_000);
         let bank = Arc::new(Bank::new(&genesis_config));
-        let pubkey = solana_sdk::pubkey::new_rand();
+        let pubkey = Pubkey::new_rand();
 
         let transactions = vec![system_transaction::transfer(
             &mint_keypair,
@@ -1823,8 +1824,8 @@ mod tests {
             ..
         } = create_genesis_config(10_000);
         let bank = Arc::new(Bank::new(&genesis_config));
-        let pubkey = solana_sdk::pubkey::new_rand();
-        let pubkey1 = solana_sdk::pubkey::new_rand();
+        let pubkey = Pubkey::new_rand();
+        let pubkey1 = Pubkey::new_rand();
 
         let transactions = vec![
             system_transaction::transfer(&mint_keypair, &pubkey, 1, genesis_config.hash()),
@@ -1919,7 +1920,7 @@ mod tests {
         } = create_genesis_config(10_000);
         let bank = Arc::new(Bank::new(&genesis_config));
 
-        let pubkey = solana_sdk::pubkey::new_rand();
+        let pubkey = Pubkey::new_rand();
 
         let transactions =
             vec![
@@ -1937,7 +1938,7 @@ mod tests {
                 bank.slot(),
                 Some((4, 4)),
                 bank.ticks_per_slot(),
-                &solana_sdk::pubkey::new_rand(),
+                &Pubkey::new_rand(),
                 &Arc::new(blockstore),
                 &Arc::new(LeaderScheduleCache::new_from_bank(&bank)),
                 &Arc::new(PohConfig::default()),
@@ -1977,8 +1978,8 @@ mod tests {
             ..
         } = create_genesis_config(10_000);
         let bank = Arc::new(Bank::new(&genesis_config));
-        let pubkey = solana_sdk::pubkey::new_rand();
-        let pubkey1 = solana_sdk::pubkey::new_rand();
+        let pubkey = Pubkey::new_rand();
+        let pubkey1 = Pubkey::new_rand();
         let keypair1 = Keypair::new();
 
         let success_tx =
@@ -2053,7 +2054,8 @@ mod tests {
                 confirmed_block.transactions.into_iter()
             {
                 if transaction.signatures[0] == success_signature {
-                    assert_eq!(meta.unwrap().status, Ok(()));
+                    let meta = meta.unwrap();
+                    assert_eq!(meta.status, Ok(()));
                 } else if transaction.signatures[0] == ix_error_signature {
                     let meta = meta.unwrap();
                     assert_eq!(

core/src/broadcast_stage.rs

@@ -203,6 +203,7 @@ impl BroadcastStage {
     /// which will then close FetchStage in the Tpu, and then the rest of the Tpu,
     /// completing the cycle.
     #[allow(clippy::too_many_arguments)]
+    #[allow(clippy::same_item_push)]
     fn new(
         socks: Vec<UdpSocket>,
         cluster_info: Arc<ClusterInfo>,

core/src/broadcast_stage/broadcast_fake_shreds_run.rs

@@ -140,12 +140,13 @@ impl BroadcastRun for BroadcastFakeShredsRun {
 mod tests {
     use super::*;
     use crate::contact_info::ContactInfo;
+    use solana_sdk::pubkey::Pubkey;
     use std::net::{IpAddr, Ipv4Addr, SocketAddr};
 
     #[test]
     fn test_tvu_peers_ordering() {
         let cluster = ClusterInfo::new_with_invalid_keypair(ContactInfo::new_localhost(
-            &solana_sdk::pubkey::new_rand(),
+            &Pubkey::new_rand(),
             0,
         ));
         cluster.insert_info(ContactInfo::new_with_socketaddr(&SocketAddr::new(

core/src/broadcast_stage/broadcast_utils.rs

@@ -92,7 +92,7 @@ mod tests {
         let bank0 = Arc::new(Bank::new(&genesis_config));
         let tx = system_transaction::transfer(
             &mint_keypair,
-            &solana_sdk::pubkey::new_rand(),
+            &Pubkey::new_rand(),
             1,
             genesis_config.hash(),
         );

core/src/cluster_info_vote_listener.rs

@@ -27,7 +27,7 @@ use solana_runtime::{
     vote_sender_types::{ReplayVoteReceiver, ReplayedVote},
 };
 use solana_sdk::{
-    clock::{Epoch, Slot, DEFAULT_MS_PER_SLOT},
+    clock::{Epoch, Slot},
     epoch_schedule::EpochSchedule,
     hash::Hash,
     pubkey::Pubkey,
@@ -98,7 +98,7 @@ impl VoteTracker {
             epoch_schedule: *root_bank.epoch_schedule(),
             ..VoteTracker::default()
         };
-        vote_tracker.progress_with_new_root_bank(&root_bank);
+        vote_tracker.process_new_root_bank(&root_bank);
         assert_eq!(
             *vote_tracker.leader_schedule_epoch.read().unwrap(),
             root_bank.get_leader_schedule_epoch(root_bank.slot())
@@ -174,7 +174,7 @@ impl VoteTracker {
         self.keys.get_or_insert(&pubkey);
     }
 
-    fn progress_leader_schedule_epoch(&self, root_bank: &Bank) {
+    fn update_leader_schedule_epoch(&self, root_bank: &Bank) {
         // Update with any newly calculated epoch state about future epochs
         let start_leader_schedule_epoch = *self.leader_schedule_epoch.read().unwrap();
         let mut greatest_leader_schedule_epoch = start_leader_schedule_epoch;
@@ -205,7 +205,7 @@ impl VoteTracker {
         }
     }
 
-    fn purge_stale_state(&self, root_bank: &Bank) {
+    fn update_new_root(&self, root_bank: &Bank) {
         // Purge any outdated slot data
         let new_root = root_bank.slot();
         let root_epoch = root_bank.epoch();
@@ -220,15 +220,15 @@ impl VoteTracker {
             self.epoch_authorized_voters
                 .write()
                 .unwrap()
-                .retain(|epoch, _| *epoch >= root_epoch);
+                .retain(|epoch, _| epoch >= &root_epoch);
             self.keys.purge();
             *self.current_epoch.write().unwrap() = root_epoch;
         }
     }
 
-    fn progress_with_new_root_bank(&self, root_bank: &Bank) {
-        self.progress_leader_schedule_epoch(root_bank);
-        self.purge_stale_state(root_bank);
+    fn process_new_root_bank(&self, root_bank: &Bank) {
+        self.update_leader_schedule_epoch(root_bank);
+        self.update_new_root(root_bank);
     }
 }
 
@@ -425,7 +425,7 @@ impl ClusterInfoVoteListener {
         blockstore: Arc<Blockstore>,
         bank_notification_sender: Option<BankNotificationSender>,
     ) -> Result<()> {
-        let mut confirmation_verifier =
+        let mut optimistic_confirmation_verifier =
             OptimisticConfirmationVerifier::new(bank_forks.read().unwrap().root());
         let mut last_process_root = Instant::now();
         loop {
@@ -434,21 +434,21 @@ impl ClusterInfoVoteListener {
             }
 
             let root_bank = bank_forks.read().unwrap().root_bank().clone();
-            if last_process_root.elapsed().as_millis() > DEFAULT_MS_PER_SLOT as u128 {
-                let unrooted_optimistic_slots = confirmation_verifier
-                    .verify_for_unrooted_optimistic_slots(&root_bank, &blockstore);
+            if last_process_root.elapsed().as_millis() > 400 {
+                let unrooted_optimistic_slots = optimistic_confirmation_verifier
+                    .get_unrooted_optimistic_slots(&root_bank, &blockstore);
                 // SlotVoteTracker's for all `slots` in `unrooted_optimistic_slots`
                 // should still be available because we haven't purged in
-                // `progress_with_new_root_bank()` yet, which is called below
+                // `process_new_root_bank()` yet, which is called below
                 OptimisticConfirmationVerifier::log_unrooted_optimistic_slots(
                     &root_bank,
                     &vote_tracker,
                     &unrooted_optimistic_slots,
                 );
-                vote_tracker.progress_with_new_root_bank(&root_bank);
+                vote_tracker.process_new_root_bank(&root_bank);
                 last_process_root = Instant::now();
             }
-            let confirmed_slots = Self::listen_and_confirm_votes(
+            let optimistic_confirmed_slots = Self::get_and_process_votes(
                 &gossip_vote_txs_receiver,
                 &vote_tracker,
                 &root_bank,
@@ -457,17 +457,19 @@ impl ClusterInfoVoteListener {
                 &replay_votes_receiver,
                 &bank_notification_sender,
             );
-            match confirmed_slots {
-                Ok(confirmed_slots) => {
-                    confirmation_verifier.add_new_optimistic_confirmed_slots(confirmed_slots);
-                }
-                Err(e) => match e {
+
+            if let Err(e) = optimistic_confirmed_slots {
+                match e {
                     Error::CrossbeamRecvTimeoutError(RecvTimeoutError::Timeout)
                     | Error::ReadyTimeoutError => (),
                     _ => {
                         error!("thread {:?} error {:?}", thread::current().name(), e);
                     }
-                },
+                }
+            } else {
+                let optimistic_confirmed_slots = optimistic_confirmed_slots.unwrap();
+                optimistic_confirmation_verifier
+                    .add_new_optimistic_confirmed_slots(optimistic_confirmed_slots);
             }
         }
     }
@@ -481,7 +483,7 @@ impl ClusterInfoVoteListener {
         verified_vote_sender: &VerifiedVoteSender,
         replay_votes_receiver: &ReplayVoteReceiver,
     ) -> Result<Vec<(Slot, Hash)>> {
-        Self::listen_and_confirm_votes(
+        Self::get_and_process_votes(
             gossip_vote_txs_receiver,
             vote_tracker,
             root_bank,
@@ -492,7 +494,7 @@ impl ClusterInfoVoteListener {
         )
     }
 
-    fn listen_and_confirm_votes(
+    fn get_and_process_votes(
         gossip_vote_txs_receiver: &VerifiedVoteTransactionsReceiver,
         vote_tracker: &VoteTracker,
         root_bank: &Bank,
@@ -521,7 +523,7 @@ impl ClusterInfoVoteListener {
             let gossip_vote_txs: Vec<_> = gossip_vote_txs_receiver.try_iter().flatten().collect();
             let replay_votes: Vec<_> = replay_votes_receiver.try_iter().collect();
             if !gossip_vote_txs.is_empty() || !replay_votes.is_empty() {
-                return Ok(Self::filter_and_confirm_with_new_votes(
+                return Ok(Self::process_votes(
                     vote_tracker,
                     gossip_vote_txs,
                     replay_votes,
@@ -539,7 +541,7 @@ impl ClusterInfoVoteListener {
     }
 
     #[allow(clippy::too_many_arguments)]
-    fn track_new_votes_and_notify_confirmations(
+    fn update_new_votes(
         vote: Vote,
         vote_pubkey: &Pubkey,
         vote_tracker: &VoteTracker,
@@ -555,52 +557,56 @@ impl ClusterInfoVoteListener {
             return;
         }
 
-        let last_vote_slot = *vote.slots.last().unwrap();
-        let last_vote_hash = vote.hash;
+        let last_vote_slot = vote.slots.last().unwrap();
 
         let root = root_bank.slot();
+        let last_vote_hash = vote.hash;
         let mut is_new_vote = false;
-        // If slot is before the root, ignore it
-        for slot in vote.slots.iter().filter(|slot| **slot > root).rev() {
-            let slot = *slot;
-
-            // if we don't have stake information, ignore it
-            let epoch = root_bank.epoch_schedule().get_epoch(slot);
+        for slot in vote.slots.iter().rev() {
+            // If slot is before the root, or so far ahead we don't have
+            // stake information, then ignore it
+            let epoch = root_bank.epoch_schedule().get_epoch(*slot);
             let epoch_stakes = root_bank.epoch_stakes(epoch);
-            if epoch_stakes.is_none() {
+            if *slot <= root || epoch_stakes.is_none() {
                 continue;
             }
             let epoch_stakes = epoch_stakes.unwrap();
+            let epoch_vote_accounts = Stakes::vote_accounts(epoch_stakes.stakes());
+            let total_epoch_stake = epoch_stakes.total_stake();
             let unduplicated_pubkey = vote_tracker.keys.get_or_insert(&vote_pubkey);
 
             // The last vote slot, which is the greatest slot in the stack
             // of votes in a vote transaction, qualifies for optimistic confirmation.
-            if slot == last_vote_slot {
-                let vote_accounts = Stakes::vote_accounts(epoch_stakes.stakes());
-                let stake = vote_accounts
+            let update_optimistic_confirmation_info = if slot == last_vote_slot {
+                let stake = epoch_vote_accounts
                     .get(&vote_pubkey)
                     .map(|(stake, _)| *stake)
-                    .unwrap_or_default();
-                let total_stake = epoch_stakes.total_stake();
+                    .unwrap_or(0);
+                Some((stake, last_vote_hash))
+            } else {
+                None
+            };
 
+            // If this vote for this slot qualifies for optimistic confirmation
+            if let Some((stake, hash)) = update_optimistic_confirmation_info {
                 // Fast track processing of the last slot in a vote transactions
                 // so that notifications for optimistic confirmation can be sent
                 // as soon as possible.
-                let (is_confirmed, is_new) = Self::track_optimistic_confirmation_vote(
+                let (is_confirmed, is_new) = Self::add_optimistic_confirmation_vote(
                     vote_tracker,
-                    last_vote_slot,
-                    last_vote_hash,
+                    *slot,
+                    hash,
                     unduplicated_pubkey.clone(),
                     stake,
-                    total_stake,
+                    total_epoch_stake,
                 );
 
                 if is_confirmed {
-                    new_optimistic_confirmed_slots.push((last_vote_slot, last_vote_hash));
+                    new_optimistic_confirmed_slots.push((*slot, last_vote_hash));
                     // Notify subscribers about new optimistic confirmation
                     if let Some(sender) = bank_notification_sender {
                         sender
-                            .send(BankNotification::OptimisticallyConfirmed(last_vote_slot))
+                            .send(BankNotification::OptimisticallyConfirmed(*slot))
                             .unwrap_or_else(|err| {
                                 warn!("bank_notification_sender failed: {:?}", err)
                             });
@@ -611,7 +617,7 @@ impl ClusterInfoVoteListener {
                     // By now:
                     // 1) The vote must have come from ReplayStage,
                     // 2) We've seen this vote from replay for this hash before
-                    // (`track_optimistic_confirmation_vote()` will not set `is_new == true`
+                    // (`add_optimistic_confirmation_vote()` will not set `is_new == true`
                     // for same slot different hash), so short circuit because this vote
                     // has no new information
 
@@ -623,7 +629,7 @@ impl ClusterInfoVoteListener {
                 is_new_vote = is_new;
             }
 
-            diff.entry(slot)
+            diff.entry(*slot)
                 .or_default()
                 .entry(unduplicated_pubkey)
                 .and_modify(|seen_in_gossip_previously| {
@@ -638,40 +644,7 @@ impl ClusterInfoVoteListener {
         }
     }
 
-    fn filter_gossip_votes(
-        vote_tracker: &VoteTracker,
-        vote_pubkey: &Pubkey,
-        vote: &Vote,
-        gossip_tx: &Transaction,
-    ) -> bool {
-        if vote.slots.is_empty() {
-            return false;
-        }
-        let last_vote_slot = vote.slots.last().unwrap();
-        // Votes from gossip need to be verified as they have not been
-        // verified by the replay pipeline. Determine the authorized voter
-        // based on the last vote slot. This will  drop votes from authorized
-        // voters trying to make votes for slots earlier than the epoch for
-        // which they are authorized
-        let actual_authorized_voter =
-            vote_tracker.get_authorized_voter(&vote_pubkey, *last_vote_slot);
-
-        if actual_authorized_voter.is_none() {
-            return false;
-        }
-
-        // Voting without the correct authorized pubkey, dump the vote
-        if !VoteTracker::vote_contains_authorized_voter(
-            &gossip_tx,
-            &actual_authorized_voter.unwrap(),
-        ) {
-            return false;
-        }
-
-        true
-    }
-
-    fn filter_and_confirm_with_new_votes(
+    fn process_votes(
         vote_tracker: &VoteTracker,
         gossip_vote_txs: Vec<Transaction>,
         replayed_votes: Vec<ReplayedVote>,
@@ -689,13 +662,37 @@ impl ClusterInfoVoteListener {
             .filter_map(|gossip_tx| {
                 vote_transaction::parse_vote_transaction(gossip_tx)
                     .filter(|(vote_pubkey, vote, _)| {
-                        Self::filter_gossip_votes(vote_tracker, vote_pubkey, vote, gossip_tx)
+                        if vote.slots.is_empty() {
+                            return false;
+                        }
+                        let last_vote_slot = vote.slots.last().unwrap();
+                        // Votes from gossip need to be verified as they have not been
+                        // verified by the replay pipeline. Determine the authorized voter
+                        // based on the last vote slot. This will  drop votes from authorized
+                        // voters trying to make votes for slots earlier than the epoch for
+                        // which they are authorized
+                        let actual_authorized_voter =
+                            vote_tracker.get_authorized_voter(&vote_pubkey, *last_vote_slot);
+
+                        if actual_authorized_voter.is_none() {
+                            return false;
+                        }
+
+                        // Voting without the correct authorized pubkey, dump the vote
+                        if !VoteTracker::vote_contains_authorized_voter(
+                            &gossip_tx,
+                            &actual_authorized_voter.unwrap(),
+                        ) {
+                            return false;
+                        }
+
+                        true
                     })
                     .map(|v| (true, v))
             })
             .chain(replayed_votes.into_iter().map(|v| (false, v)))
         {
-            Self::track_new_votes_and_notify_confirmations(
+            Self::update_new_votes(
                 vote,
                 &vote_pubkey,
                 &vote_tracker,
@@ -760,7 +757,7 @@ impl ClusterInfoVoteListener {
 
     // Returns if the slot was optimistically confirmed, and whether
     // the slot was new
-    fn track_optimistic_confirmation_vote(
+    fn add_optimistic_confirmation_vote(
         vote_tracker: &VoteTracker,
         slot: Slot,
         hash: Hash,
@@ -901,7 +898,7 @@ mod tests {
         let (vote_tracker, bank, _, _) = setup();
 
         // Check outdated slots are purged with new root
-        let new_voter = Arc::new(solana_sdk::pubkey::new_rand());
+        let new_voter = Arc::new(Pubkey::new_rand());
         // Make separate copy so the original doesn't count toward
         // the ref count, which would prevent cleanup
         let new_voter_ = Arc::new(*new_voter);
@@ -912,7 +909,7 @@ mod tests {
             .unwrap()
             .contains_key(&bank.slot()));
         let bank1 = Bank::new_from_parent(&bank, &Pubkey::default(), bank.slot() + 1);
-        vote_tracker.progress_with_new_root_bank(&bank1);
+        vote_tracker.process_new_root_bank(&bank1);
         assert!(!vote_tracker
             .slot_vote_trackers
             .read()
@@ -929,7 +926,7 @@ mod tests {
             bank.epoch_schedule()
                 .get_first_slot_in_epoch(current_epoch + 1),
         );
-        vote_tracker.progress_with_new_root_bank(&new_epoch_bank);
+        vote_tracker.process_new_root_bank(&new_epoch_bank);
         assert!(!vote_tracker.keys.0.read().unwrap().contains(&new_voter));
         assert_eq!(
             *vote_tracker.current_epoch.read().unwrap(),
@@ -959,7 +956,7 @@ mod tests {
         );
         let next_leader_schedule_bank =
             Bank::new_from_parent(&bank, &Pubkey::default(), next_leader_schedule_computed);
-        vote_tracker.progress_leader_schedule_epoch(&next_leader_schedule_bank);
+        vote_tracker.update_leader_schedule_epoch(&next_leader_schedule_bank);
         assert_eq!(
             *vote_tracker.leader_schedule_epoch.read().unwrap(),
             next_leader_schedule_epoch
@@ -1010,7 +1007,7 @@ mod tests {
             &votes_sender,
             &replay_votes_sender,
         );
-        ClusterInfoVoteListener::listen_and_confirm_votes(
+        ClusterInfoVoteListener::get_and_process_votes(
             &votes_receiver,
             &vote_tracker,
             &bank3,
@@ -1039,7 +1036,7 @@ mod tests {
             &votes_sender,
             &replay_votes_sender,
         );
-        ClusterInfoVoteListener::listen_and_confirm_votes(
+        ClusterInfoVoteListener::get_and_process_votes(
             &votes_receiver,
             &vote_tracker,
             &bank3,
@@ -1117,7 +1114,7 @@ mod tests {
         );
 
         // Check that all the votes were registered for each validator correctly
-        ClusterInfoVoteListener::listen_and_confirm_votes(
+        ClusterInfoVoteListener::get_and_process_votes(
             &votes_txs_receiver,
             &vote_tracker,
             &bank0,
@@ -1236,7 +1233,7 @@ mod tests {
         }
 
         // Read and process votes from channel `votes_receiver`
-        ClusterInfoVoteListener::listen_and_confirm_votes(
+        ClusterInfoVoteListener::get_and_process_votes(
             &votes_txs_receiver,
             &vote_tracker,
             &bank0,
@@ -1331,7 +1328,7 @@ mod tests {
                         ))
                         .unwrap();
                 }
-                let _ = ClusterInfoVoteListener::listen_and_confirm_votes(
+                let _ = ClusterInfoVoteListener::get_and_process_votes(
                     &votes_receiver,
                     &vote_tracker,
                     &bank,
@@ -1477,7 +1474,7 @@ mod tests {
         )];
 
         let (verified_vote_sender, _verified_vote_receiver) = unbounded();
-        ClusterInfoVoteListener::filter_and_confirm_with_new_votes(
+        ClusterInfoVoteListener::process_votes(
             &vote_tracker,
             vote_tx,
             // Add gossip vote for same slot, should not affect outcome
@@ -1548,7 +1545,7 @@ mod tests {
 
         let new_root_bank =
             Bank::new_from_parent(&bank, &Pubkey::default(), first_slot_in_new_epoch - 2);
-        ClusterInfoVoteListener::filter_and_confirm_with_new_votes(
+        ClusterInfoVoteListener::process_votes(
             &vote_tracker,
             vote_txs,
             vec![(
@@ -1684,7 +1681,7 @@ mod tests {
     fn run_test_verify_votes_1_pass(hash: Option<Hash>) {
         let vote_tx = test_vote_tx(hash);
         let votes = vec![vote_tx];
-        let labels = vec![CrdsValueLabel::Vote(0, solana_sdk::pubkey::new_rand())];
+        let labels = vec![CrdsValueLabel::Vote(0, Pubkey::new_rand())];
         let (vote_txs, packets) = ClusterInfoVoteListener::verify_votes(votes, labels);
         assert_eq!(vote_txs.len(), 1);
         verify_packets_len(&packets, 1);
@@ -1701,7 +1698,7 @@ mod tests {
         let mut bad_vote = vote_tx.clone();
         bad_vote.signatures[0] = Signature::default();
         let votes = vec![vote_tx.clone(), bad_vote, vote_tx];
-        let label = CrdsValueLabel::Vote(0, solana_sdk::pubkey::new_rand());
+        let label = CrdsValueLabel::Vote(0, Pubkey::new_rand());
         let labels: Vec<_> = (0..votes.len()).map(|_| label.clone()).collect();
         let (vote_txs, packets) = ClusterInfoVoteListener::verify_votes(votes, labels);
         assert_eq!(vote_txs.len(), 2);

core/src/cluster_slots.rs

@@ -237,8 +237,8 @@ mod tests {
         let mut c1 = ContactInfo::default();
         let mut c2 = ContactInfo::default();
         let mut map = HashMap::new();
-        let k1 = solana_sdk::pubkey::new_rand();
-        let k2 = solana_sdk::pubkey::new_rand();
+        let k1 = Pubkey::new_rand();
+        let k2 = Pubkey::new_rand();
         map.insert(Arc::new(k1), std::u64::MAX / 2);
         map.insert(Arc::new(k2), 0);
         cs.cluster_slots
@@ -259,8 +259,8 @@ mod tests {
         let mut c1 = ContactInfo::default();
         let mut c2 = ContactInfo::default();
         let mut map = HashMap::new();
-        let k1 = solana_sdk::pubkey::new_rand();
-        let k2 = solana_sdk::pubkey::new_rand();
+        let k1 = Pubkey::new_rand();
+        let k2 = Pubkey::new_rand();
         map.insert(Arc::new(k2), 0);
         cs.cluster_slots
             .write()
@@ -290,7 +290,7 @@ mod tests {
         let cs = ClusterSlots::default();
         let mut contact_infos = vec![ContactInfo::default(); 2];
         for ci in contact_infos.iter_mut() {
-            ci.id = solana_sdk::pubkey::new_rand();
+            ci.id = Pubkey::new_rand();
         }
         let slot = 9;
 
@@ -359,7 +359,7 @@ mod tests {
         let mut epoch_slot = EpochSlots::default();
         epoch_slot.fill(&[1], 0);
         cs.update_internal(0, (vec![epoch_slot], None));
-        let self_id = solana_sdk::pubkey::new_rand();
+        let self_id = Pubkey::new_rand();
         assert_eq!(
             cs.generate_repairs_for_missing_slots(&self_id, 0),
             vec![RepairType::HighestShred(1, 0)]

core/src/commitment_service.rs

@@ -375,22 +375,19 @@ mod tests {
 
         let rooted_stake_amount = 40;
 
-        let sk1 = solana_sdk::pubkey::new_rand();
-        let pk1 = solana_sdk::pubkey::new_rand();
-        let mut vote_account1 =
-            vote_state::create_account(&pk1, &solana_sdk::pubkey::new_rand(), 0, 100);
+        let sk1 = Pubkey::new_rand();
+        let pk1 = Pubkey::new_rand();
+        let mut vote_account1 = vote_state::create_account(&pk1, &Pubkey::new_rand(), 0, 100);
         let stake_account1 =
             stake_state::create_account(&sk1, &pk1, &vote_account1, &genesis_config.rent, 100);
-        let sk2 = solana_sdk::pubkey::new_rand();
-        let pk2 = solana_sdk::pubkey::new_rand();
-        let mut vote_account2 =
-            vote_state::create_account(&pk2, &solana_sdk::pubkey::new_rand(), 0, 50);
+        let sk2 = Pubkey::new_rand();
+        let pk2 = Pubkey::new_rand();
+        let mut vote_account2 = vote_state::create_account(&pk2, &Pubkey::new_rand(), 0, 50);
         let stake_account2 =
             stake_state::create_account(&sk2, &pk2, &vote_account2, &genesis_config.rent, 50);
-        let sk3 = solana_sdk::pubkey::new_rand();
-        let pk3 = solana_sdk::pubkey::new_rand();
-        let mut vote_account3 =
-            vote_state::create_account(&pk3, &solana_sdk::pubkey::new_rand(), 0, 1);
+        let sk3 = Pubkey::new_rand();
+        let pk3 = Pubkey::new_rand();
+        let mut vote_account3 = vote_state::create_account(&pk3, &Pubkey::new_rand(), 0, 1);
         let stake_account3 = stake_state::create_account(
             &sk3,
             &pk3,
@@ -398,10 +395,9 @@ mod tests {
             &genesis_config.rent,
             rooted_stake_amount,
         );
-        let sk4 = solana_sdk::pubkey::new_rand();
-        let pk4 = solana_sdk::pubkey::new_rand();
-        let mut vote_account4 =
-            vote_state::create_account(&pk4, &solana_sdk::pubkey::new_rand(), 0, 1);
+        let sk4 = Pubkey::new_rand();
+        let pk4 = Pubkey::new_rand();
+        let mut vote_account4 = vote_state::create_account(&pk4, &Pubkey::new_rand(), 0, 1);
         let stake_account4 = stake_state::create_account(
             &sk4,
             &pk4,

core/src/completed_data_sets_service.rs

@@ -1,7 +1,6 @@
 use crate::rpc_subscriptions::RpcSubscriptions;
 use crossbeam_channel::{Receiver, RecvTimeoutError, Sender};
 use solana_ledger::blockstore::{Blockstore, CompletedDataSetInfo};
-use solana_ledger::entry::Entry;
 use solana_sdk::signature::Signature;
 use std::{
     sync::{
@@ -62,7 +61,10 @@ impl CompletedDataSetsService {
             } = completed_set_info;
             match blockstore.get_entries_in_data_block(slot, start_index, end_index, None) {
                 Ok(entries) => {
-                    let transactions = Self::get_transaction_signatures(entries);
+                    let transactions = entries
+                        .into_iter()
+                        .flat_map(|e| e.transactions.into_iter().map(|t| t.signatures[0]))
+                        .collect::<Vec<Signature>>();
                     if !transactions.is_empty() {
                         rpc_subscriptions.notify_signatures_received((slot, transactions));
                     }
@@ -74,51 +76,7 @@ impl CompletedDataSetsService {
         Ok(())
     }
 
-    fn get_transaction_signatures(entries: Vec<Entry>) -> Vec<Signature> {
-        entries
-            .into_iter()
-            .flat_map(|e| {
-                e.transactions
-                    .into_iter()
-                    .filter_map(|mut t| t.signatures.drain(..).next())
-            })
-            .collect::<Vec<Signature>>()
-    }
-
     pub fn join(self) -> thread::Result<()> {
         self.thread_hdl.join()
     }
 }
-
-#[cfg(test)]
-pub mod test {
-    use super::*;
-    use solana_sdk::hash::Hash;
-    use solana_sdk::signature::{Keypair, Signer};
-    use solana_sdk::transaction::Transaction;
-
-    #[test]
-    fn test_zero_signatures() {
-        let tx = Transaction::new_with_payer(&[], None);
-        let entries = vec![Entry::new(&Hash::default(), 1, vec![tx])];
-        let signatures = CompletedDataSetsService::get_transaction_signatures(entries);
-        assert!(signatures.is_empty());
-    }
-
-    #[test]
-    fn test_multi_signatures() {
-        let kp = Keypair::new();
-        let tx =
-            Transaction::new_signed_with_payer(&[], Some(&kp.pubkey()), &[&kp], Hash::default());
-        let entries = vec![Entry::new(&Hash::default(), 1, vec![tx.clone()])];
-        let signatures = CompletedDataSetsService::get_transaction_signatures(entries);
-        assert_eq!(signatures.len(), 1);
-
-        let entries = vec![
-            Entry::new(&Hash::default(), 1, vec![tx.clone(), tx.clone()]),
-            Entry::new(&Hash::default(), 1, vec![tx]),
-        ];
-        let signatures = CompletedDataSetsService::get_transaction_signatures(entries);
-        assert_eq!(signatures.len(), 3);
-    }
-}

core/src/contact_info.rs

@@ -130,7 +130,7 @@ impl ContactInfo {
         let addr = socketaddr!("224.0.1.255:1000");
         assert!(addr.ip().is_multicast());
         Self {
-            id: solana_sdk::pubkey::new_rand(),
+            id: Pubkey::new_rand(),
             gossip: addr,
             tvu: addr,
             tvu_forwards: addr,

core/src/crds.rs

@@ -28,7 +28,6 @@ use crate::crds_shards::CrdsShards;
 use crate::crds_value::{CrdsValue, CrdsValueLabel};
 use bincode::serialize;
 use indexmap::map::{Entry, IndexMap};
-use rayon::{prelude::*, ThreadPool};
 use solana_sdk::hash::{hash, Hash};
 use solana_sdk::pubkey::Pubkey;
 use std::cmp;
@@ -177,40 +176,37 @@ impl Crds {
     /// * timeouts - Pubkey specific timeouts with Pubkey::default() as the default timeout.
     pub fn find_old_labels(
         &self,
-        thread_pool: &ThreadPool,
         now: u64,
         timeouts: &HashMap<Pubkey, u64>,
     ) -> Vec<CrdsValueLabel> {
         let default_timeout = *timeouts
             .get(&Pubkey::default())
             .expect("must have default timeout");
-        thread_pool.install(|| {
-            self.table
-                .par_iter()
-                .with_min_len(1024)
-                .filter_map(|(k, v)| {
-                    let timeout = timeouts.get(&k.pubkey()).unwrap_or(&default_timeout);
-                    if v.local_timestamp.saturating_add(*timeout) <= now {
-                        Some(k.clone())
-                    } else {
-                        None
-                    }
-                })
-                .collect()
-        })
+        self.table
+            .iter()
+            .filter_map(|(k, v)| {
+                let timeout = timeouts.get(&k.pubkey()).unwrap_or(&default_timeout);
+                if v.local_timestamp.saturating_add(*timeout) <= now {
+                    Some(k)
+                } else {
+                    None
+                }
+            })
+            .cloned()
+            .collect()
     }
 
-    pub fn remove(&mut self, key: &CrdsValueLabel) -> Option<VersionedCrdsValue> {
-        let (index, _, value) = self.table.swap_remove_full(key)?;
-        assert!(self.shards.remove(index, &value));
-        // The previously last element in the table is now moved to the
-        // 'index' position. Shards need to be updated accordingly.
-        if index < self.table.len() {
-            let value = self.table.index(index);
-            assert!(self.shards.remove(self.table.len(), value));
-            assert!(self.shards.insert(index, value));
+    pub fn remove(&mut self, key: &CrdsValueLabel) {
+        if let Some((index, _, value)) = self.table.swap_remove_full(key) {
+            assert!(self.shards.remove(index, &value));
+            // The previously last element in the table is now moved to the
+            // 'index' position. Shards need to be updated accordingly.
+            if index < self.table.len() {
+                let value = self.table.index(index);
+                assert!(self.shards.remove(self.table.len(), value));
+                assert!(self.shards.insert(index, value));
+            }
         }
-        Some(value)
     }
 }
 
@@ -220,7 +216,6 @@ mod test {
     use crate::contact_info::ContactInfo;
     use crate::crds_value::CrdsData;
     use rand::{thread_rng, Rng};
-    use rayon::ThreadPoolBuilder;
 
     #[test]
     fn test_insert() {
@@ -293,67 +288,48 @@ mod test {
     }
     #[test]
     fn test_find_old_records_default() {
-        let thread_pool = ThreadPoolBuilder::new().build().unwrap();
         let mut crds = Crds::default();
         let val = CrdsValue::new_unsigned(CrdsData::ContactInfo(ContactInfo::default()));
         assert_eq!(crds.insert(val.clone(), 1), Ok(None));
         let mut set = HashMap::new();
         set.insert(Pubkey::default(), 0);
-        assert!(crds.find_old_labels(&thread_pool, 0, &set).is_empty());
+        assert!(crds.find_old_labels(0, &set).is_empty());
         set.insert(Pubkey::default(), 1);
-        assert_eq!(
-            crds.find_old_labels(&thread_pool, 2, &set),
-            vec![val.label()]
-        );
+        assert_eq!(crds.find_old_labels(2, &set), vec![val.label()]);
         set.insert(Pubkey::default(), 2);
-        assert_eq!(
-            crds.find_old_labels(&thread_pool, 4, &set),
-            vec![val.label()]
-        );
+        assert_eq!(crds.find_old_labels(4, &set), vec![val.label()]);
     }
     #[test]
     fn test_find_old_records_with_override() {
-        let thread_pool = ThreadPoolBuilder::new().build().unwrap();
         let mut rng = thread_rng();
         let mut crds = Crds::default();
         let mut timeouts = HashMap::new();
         let val = CrdsValue::new_rand(&mut rng);
         timeouts.insert(Pubkey::default(), 3);
         assert_eq!(crds.insert(val.clone(), 0), Ok(None));
-        assert!(crds.find_old_labels(&thread_pool, 2, &timeouts).is_empty());
+        assert!(crds.find_old_labels(2, &timeouts).is_empty());
         timeouts.insert(val.pubkey(), 1);
-        assert_eq!(
-            crds.find_old_labels(&thread_pool, 2, &timeouts),
-            vec![val.label()]
-        );
+        assert_eq!(crds.find_old_labels(2, &timeouts), vec![val.label()]);
         timeouts.insert(val.pubkey(), u64::MAX);
-        assert!(crds.find_old_labels(&thread_pool, 2, &timeouts).is_empty());
+        assert!(crds.find_old_labels(2, &timeouts).is_empty());
         timeouts.insert(Pubkey::default(), 1);
-        assert!(crds.find_old_labels(&thread_pool, 2, &timeouts).is_empty());
+        assert!(crds.find_old_labels(2, &timeouts).is_empty());
         timeouts.remove(&val.pubkey());
-        assert_eq!(
-            crds.find_old_labels(&thread_pool, 2, &timeouts),
-            vec![val.label()]
-        );
+        assert_eq!(crds.find_old_labels(2, &timeouts), vec![val.label()]);
     }
     #[test]
     fn test_remove_default() {
-        let thread_pool = ThreadPoolBuilder::new().build().unwrap();
         let mut crds = Crds::default();
         let val = CrdsValue::new_unsigned(CrdsData::ContactInfo(ContactInfo::default()));
         assert_matches!(crds.insert(val.clone(), 1), Ok(_));
         let mut set = HashMap::new();
         set.insert(Pubkey::default(), 1);
-        assert_eq!(
-            crds.find_old_labels(&thread_pool, 2, &set),
-            vec![val.label()]
-        );
+        assert_eq!(crds.find_old_labels(2, &set), vec![val.label()]);
         crds.remove(&val.label());
-        assert!(crds.find_old_labels(&thread_pool, 2, &set).is_empty());
+        assert!(crds.find_old_labels(2, &set).is_empty());
     }
     #[test]
     fn test_find_old_records_staked() {
-        let thread_pool = ThreadPoolBuilder::new().build().unwrap();
         let mut crds = Crds::default();
         let val = CrdsValue::new_unsigned(CrdsData::ContactInfo(ContactInfo::default()));
         assert_eq!(crds.insert(val.clone(), 1), Ok(None));
@@ -361,26 +337,20 @@ mod test {
         //now < timestamp
         set.insert(Pubkey::default(), 0);
         set.insert(val.pubkey(), 0);
-        assert!(crds.find_old_labels(&thread_pool, 0, &set).is_empty());
+        assert!(crds.find_old_labels(0, &set).is_empty());
 
         //pubkey shouldn't expire since its timeout is MAX
         set.insert(val.pubkey(), std::u64::MAX);
-        assert!(crds.find_old_labels(&thread_pool, 2, &set).is_empty());
+        assert!(crds.find_old_labels(2, &set).is_empty());
 
         //default has max timeout, but pubkey should still expire
         set.insert(Pubkey::default(), std::u64::MAX);
         set.insert(val.pubkey(), 1);
-        assert_eq!(
-            crds.find_old_labels(&thread_pool, 2, &set),
-            vec![val.label()]
-        );
+        assert_eq!(crds.find_old_labels(2, &set), vec![val.label()]);
 
         set.insert(val.pubkey(), 2);
-        assert!(crds.find_old_labels(&thread_pool, 2, &set).is_empty());
-        assert_eq!(
-            crds.find_old_labels(&thread_pool, 3, &set),
-            vec![val.label()]
-        );
+        assert!(crds.find_old_labels(2, &set).is_empty());
+        assert_eq!(crds.find_old_labels(3, &set), vec![val.label()]);
     }
 
     #[test]
@@ -391,9 +361,7 @@ mod test {
         }
 
         let mut crds = Crds::default();
-        let pubkeys: Vec<_> = std::iter::repeat_with(solana_sdk::pubkey::new_rand)
-            .take(256)
-            .collect();
+        let pubkeys: Vec<_> = std::iter::repeat_with(Pubkey::new_rand).take(256).collect();
         let mut rng = thread_rng();
         let mut num_inserts = 0;
         for _ in 0..4096 {
@@ -426,7 +394,6 @@ mod test {
 
     #[test]
     fn test_remove_staked() {
-        let thread_pool = ThreadPoolBuilder::new().build().unwrap();
         let mut crds = Crds::default();
         let val = CrdsValue::new_unsigned(CrdsData::ContactInfo(ContactInfo::default()));
         assert_matches!(crds.insert(val.clone(), 1), Ok(_));
@@ -435,12 +402,9 @@ mod test {
         //default has max timeout, but pubkey should still expire
         set.insert(Pubkey::default(), std::u64::MAX);
         set.insert(val.pubkey(), 1);
-        assert_eq!(
-            crds.find_old_labels(&thread_pool, 2, &set),
-            vec![val.label()]
-        );
+        assert_eq!(crds.find_old_labels(2, &set), vec![val.label()]);
         crds.remove(&val.label());
-        assert!(crds.find_old_labels(&thread_pool, 2, &set).is_empty());
+        assert!(crds.find_old_labels(2, &set).is_empty());
     }
 
     #[test]
@@ -520,14 +484,14 @@ mod test {
         let v1 = VersionedCrdsValue::new(
             1,
             CrdsValue::new_unsigned(CrdsData::ContactInfo(ContactInfo::new_localhost(
-                &solana_sdk::pubkey::new_rand(),
+                &Pubkey::new_rand(),
                 0,
             ))),
         );
         let v2 = VersionedCrdsValue::new(
             1,
             CrdsValue::new_unsigned(CrdsData::ContactInfo(ContactInfo::new_localhost(
-                &solana_sdk::pubkey::new_rand(),
+                &Pubkey::new_rand(),
                 0,
             ))),
         );

core/src/crds_gossip.rs

@@ -161,12 +161,9 @@ impl CrdsGossip {
         self.pull.mark_pull_request_creation_time(from, now)
     }
     /// process a pull request and create a response
-    pub fn process_pull_requests<I>(&mut self, callers: I, now: u64)
-    where
-        I: IntoIterator<Item = CrdsValue>,
-    {
+    pub fn process_pull_requests(&mut self, filters: Vec<(CrdsValue, CrdsFilter)>, now: u64) {
         self.pull
-            .process_pull_requests(&mut self.crds, callers, now);
+            .process_pull_requests(&mut self.crds, filters, now);
     }
 
     pub fn generate_pull_responses(
@@ -222,12 +219,7 @@ impl CrdsGossip {
         self.pull.make_timeouts(&self.id, stakes, epoch_ms)
     }
 
-    pub fn purge(
-        &mut self,
-        thread_pool: &ThreadPool,
-        now: u64,
-        timeouts: &HashMap<Pubkey, u64>,
-    ) -> usize {
+    pub fn purge(&mut self, now: u64, timeouts: &HashMap<Pubkey, u64>) -> usize {
         let mut rv = 0;
         if now > self.push.msg_timeout {
             let min = now - self.push.msg_timeout;
@@ -242,9 +234,7 @@ impl CrdsGossip {
             let min = self.pull.crds_timeout;
             assert_eq!(timeouts[&self.id], std::u64::MAX);
             assert_eq!(timeouts[&Pubkey::default()], min);
-            rv = self
-                .pull
-                .purge_active(thread_pool, &mut self.crds, now, &timeouts);
+            rv = self.pull.purge_active(&mut self.crds, now, &timeouts);
         }
         if now > 5 * self.pull.crds_timeout {
             let min = now - 5 * self.pull.crds_timeout;

core/src/crds_gossip_pull.rs

@@ -78,7 +78,7 @@ impl CrdsFilter {
         let seed: u64 = seed.checked_shl(64 - mask_bits).unwrap_or(0x0);
         seed | (!0u64).checked_shr(mask_bits).unwrap_or(!0x0) as u64
     }
-    fn max_items(max_bits: f64, false_rate: f64, num_keys: f64) -> f64 {
+    pub fn max_items(max_bits: f64, false_rate: f64, num_keys: f64) -> f64 {
         let m = max_bits;
         let p = false_rate;
         let k = num_keys;
@@ -92,26 +92,28 @@ impl CrdsFilter {
         let buf = item.as_ref()[..8].try_into().unwrap();
         u64::from_le_bytes(buf)
     }
-    fn test_mask(&self, item: &Hash) -> bool {
+    pub fn test_mask_u64(&self, item: u64, ones: u64) -> bool {
+        let bits = item | ones;
+        bits == self.mask
+    }
+    pub fn test_mask(&self, item: &Hash) -> bool {
         // only consider the highest mask_bits bits from the hash and set the rest to 1.
         let ones = (!0u64).checked_shr(self.mask_bits).unwrap_or(!0u64);
         let bits = Self::hash_as_u64(item) | ones;
         bits == self.mask
     }
-    #[cfg(test)]
-    fn add(&mut self, item: &Hash) {
+    pub fn add(&mut self, item: &Hash) {
         if self.test_mask(item) {
             self.filter.add(item);
         }
     }
-    #[cfg(test)]
-    fn contains(&self, item: &Hash) -> bool {
+    pub fn contains(&self, item: &Hash) -> bool {
         if !self.test_mask(item) {
             return true;
         }
         self.filter.contains(item)
     }
-    fn filter_contains(&self, item: &Hash) -> bool {
+    pub fn filter_contains(&self, item: &Hash) -> bool {
         self.filter.contains(item)
     }
 }
@@ -271,18 +273,20 @@ impl CrdsGossipPull {
     }
 
     /// process a pull request
-    pub fn process_pull_requests<I>(&mut self, crds: &mut Crds, callers: I, now: u64)
-    where
-        I: IntoIterator<Item = CrdsValue>,
-    {
-        for caller in callers {
+    pub fn process_pull_requests(
+        &mut self,
+        crds: &mut Crds,
+        requests: Vec<(CrdsValue, CrdsFilter)>,
+        now: u64,
+    ) {
+        requests.into_iter().for_each(|(caller, _)| {
             let key = caller.label().pubkey();
             if let Ok(Some(val)) = crds.insert(caller, now) {
                 self.purged_values
                     .push_back((val.value_hash, val.local_timestamp));
             }
             crds.update_record_timestamp(&key, now);
-        }
+        });
     }
 
     /// Create gossip responses to pull requests
@@ -533,21 +537,24 @@ impl CrdsGossipPull {
     /// The value_hash of an active item is put into self.purged_values queue
     pub fn purge_active(
         &mut self,
-        thread_pool: &ThreadPool,
         crds: &mut Crds,
         now: u64,
         timeouts: &HashMap<Pubkey, u64>,
     ) -> usize {
-        let num_purged_values = self.purged_values.len();
-        self.purged_values.extend(
-            crds.find_old_labels(thread_pool, now, timeouts)
-                .into_iter()
-                .filter_map(|label| {
-                    let val = crds.remove(&label)?;
-                    Some((val.value_hash, val.local_timestamp))
-                }),
-        );
-        self.purged_values.len() - num_purged_values
+        let old = crds.find_old_labels(now, timeouts);
+        let mut purged: VecDeque<_> = old
+            .iter()
+            .filter_map(|label| {
+                let rv = crds
+                    .lookup_versioned(label)
+                    .map(|val| (val.value_hash, val.local_timestamp));
+                crds.remove(label);
+                rv
+            })
+            .collect();
+        let ret = purged.len();
+        self.purged_values.append(&mut purged);
+        ret
     }
     /// Purge values from the `self.purged_values` queue that are older then purge_timeout
     pub fn purge_purged(&mut self, min_ts: u64) {
@@ -619,7 +626,7 @@ mod test {
         }
         let mut rng = thread_rng();
         for _ in 0..100 {
-            let hash = solana_sdk::hash::new_rand(&mut rng);
+            let hash = Hash::new_rand(&mut rng);
             assert_eq!(CrdsFilter::hash_as_u64(&hash), hash_as_u64_bitops(&hash));
         }
     }
@@ -631,7 +638,7 @@ mod test {
         assert_eq!(filter.mask, mask);
         let mut rng = thread_rng();
         for _ in 0..10 {
-            let hash = solana_sdk::hash::new_rand(&mut rng);
+            let hash = Hash::new_rand(&mut rng);
             assert!(filter.test_mask(&hash));
         }
     }
@@ -642,13 +649,13 @@ mod test {
         let mut stakes = HashMap::new();
         let node = CrdsGossipPull::default();
         let me = CrdsValue::new_unsigned(CrdsData::ContactInfo(ContactInfo::new_localhost(
-            &solana_sdk::pubkey::new_rand(),
+            &Pubkey::new_rand(),
             0,
         )));
         crds.insert(me.clone(), 0).unwrap();
         for i in 1..=30 {
             let entry = CrdsValue::new_unsigned(CrdsData::ContactInfo(ContactInfo::new_localhost(
-                &solana_sdk::pubkey::new_rand(),
+                &Pubkey::new_rand(),
                 0,
             )));
             let id = entry.label().pubkey();
@@ -675,25 +682,25 @@ mod test {
         let gossip = socketaddr!("127.0.0.1:1234");
 
         let me = CrdsValue::new_unsigned(CrdsData::ContactInfo(ContactInfo {
-            id: solana_sdk::pubkey::new_rand(),
+            id: Pubkey::new_rand(),
             shred_version: 123,
             gossip,
             ..ContactInfo::default()
         }));
         let spy = CrdsValue::new_unsigned(CrdsData::ContactInfo(ContactInfo {
-            id: solana_sdk::pubkey::new_rand(),
+            id: Pubkey::new_rand(),
             shred_version: 0,
             gossip,
             ..ContactInfo::default()
         }));
         let node_123 = CrdsValue::new_unsigned(CrdsData::ContactInfo(ContactInfo {
-            id: solana_sdk::pubkey::new_rand(),
+            id: Pubkey::new_rand(),
             shred_version: 123,
             gossip,
             ..ContactInfo::default()
         }));
         let node_456 = CrdsValue::new_unsigned(CrdsData::ContactInfo(ContactInfo {
-            id: solana_sdk::pubkey::new_rand(),
+            id: Pubkey::new_rand(),
             shred_version: 456,
             gossip,
             ..ContactInfo::default()
@@ -734,12 +741,12 @@ mod test {
         let gossip = socketaddr!("127.0.0.1:1234");
 
         let me = CrdsValue::new_unsigned(CrdsData::ContactInfo(ContactInfo {
-            id: solana_sdk::pubkey::new_rand(),
+            id: Pubkey::new_rand(),
             gossip,
             ..ContactInfo::default()
         }));
         let node_123 = CrdsValue::new_unsigned(CrdsData::ContactInfo(ContactInfo {
-            id: solana_sdk::pubkey::new_rand(),
+            id: Pubkey::new_rand(),
             gossip,
             ..ContactInfo::default()
         }));
@@ -760,7 +767,7 @@ mod test {
         assert!(options.is_empty());
 
         // Unknown pubkey in gossip_validators -- will pull from nobody
-        gossip_validators.insert(solana_sdk::pubkey::new_rand());
+        gossip_validators.insert(Pubkey::new_rand());
         let options = node.pull_options(
             &crds,
             &me.label().pubkey(),
@@ -790,7 +797,7 @@ mod test {
         let mut rng = thread_rng();
         let crds_filter_set =
             CrdsFilterSet::new(/*num_items=*/ 9672788, /*max_bytes=*/ 8196);
-        let hash_values: Vec<_> = std::iter::repeat_with(|| solana_sdk::hash::new_rand(&mut rng))
+        let hash_values: Vec<_> = std::iter::repeat_with(|| Hash::new_rand(&mut rng))
             .take(1024)
             .collect();
         for hash_value in &hash_values {
@@ -842,7 +849,7 @@ mod test {
         for _ in 0..10_000 {
             crds_gossip_pull
                 .purged_values
-                .push_back((solana_sdk::hash::new_rand(&mut rng), rng.gen()));
+                .push_back((Hash::new_rand(&mut rng), rng.gen()));
         }
         let mut num_inserts = 0;
         for _ in 0..20_000 {
@@ -891,7 +898,7 @@ mod test {
         let thread_pool = ThreadPoolBuilder::new().build().unwrap();
         let mut crds = Crds::default();
         let entry = CrdsValue::new_unsigned(CrdsData::ContactInfo(ContactInfo::new_localhost(
-            &solana_sdk::pubkey::new_rand(),
+            &Pubkey::new_rand(),
             0,
         )));
         let id = entry.label().pubkey();
@@ -926,7 +933,7 @@ mod test {
         );
 
         let new = CrdsValue::new_unsigned(CrdsData::ContactInfo(ContactInfo::new_localhost(
-            &solana_sdk::pubkey::new_rand(),
+            &Pubkey::new_rand(),
             0,
         )));
         crds.insert(new.clone(), 0).unwrap();
@@ -950,19 +957,19 @@ mod test {
         let thread_pool = ThreadPoolBuilder::new().build().unwrap();
         let mut crds = Crds::default();
         let entry = CrdsValue::new_unsigned(CrdsData::ContactInfo(ContactInfo::new_localhost(
-            &solana_sdk::pubkey::new_rand(),
+            &Pubkey::new_rand(),
             0,
         )));
         let node_pubkey = entry.label().pubkey();
         let mut node = CrdsGossipPull::default();
         crds.insert(entry.clone(), 0).unwrap();
         let old = CrdsValue::new_unsigned(CrdsData::ContactInfo(ContactInfo::new_localhost(
-            &solana_sdk::pubkey::new_rand(),
+            &Pubkey::new_rand(),
             0,
         )));
         crds.insert(old.clone(), 0).unwrap();
         let new = CrdsValue::new_unsigned(CrdsData::ContactInfo(ContactInfo::new_localhost(
-            &solana_sdk::pubkey::new_rand(),
+            &Pubkey::new_rand(),
             0,
         )));
         crds.insert(new.clone(), 0).unwrap();
@@ -993,14 +1000,14 @@ mod test {
         let thread_pool = ThreadPoolBuilder::new().build().unwrap();
         let mut node_crds = Crds::default();
         let entry = CrdsValue::new_unsigned(CrdsData::ContactInfo(ContactInfo::new_localhost(
-            &solana_sdk::pubkey::new_rand(),
+            &Pubkey::new_rand(),
             0,
         )));
         let node_pubkey = entry.label().pubkey();
         let node = CrdsGossipPull::default();
         node_crds.insert(entry, 0).unwrap();
         let new = CrdsValue::new_unsigned(CrdsData::ContactInfo(ContactInfo::new_localhost(
-            &solana_sdk::pubkey::new_rand(),
+            &Pubkey::new_rand(),
             0,
         )));
         node_crds.insert(new, 0).unwrap();
@@ -1024,7 +1031,7 @@ mod test {
         assert_eq!(rsp[0].len(), 0);
 
         let new = CrdsValue::new_unsigned(CrdsData::ContactInfo(ContactInfo::new_localhost(
-            &solana_sdk::pubkey::new_rand(),
+            &Pubkey::new_rand(),
             CRDS_GOSSIP_PULL_MSG_TIMEOUT_MS,
         )));
         dest_crds
@@ -1040,7 +1047,7 @@ mod test {
         filters.push(filters[0].clone());
         //should return new value since caller is new
         filters[1].0 = CrdsValue::new_unsigned(CrdsData::ContactInfo(ContactInfo::new_localhost(
-            &solana_sdk::pubkey::new_rand(),
+            &Pubkey::new_rand(),
             CRDS_GOSSIP_PULL_MSG_TIMEOUT_MS + 1,
         )));
 
@@ -1056,14 +1063,14 @@ mod test {
         let thread_pool = ThreadPoolBuilder::new().build().unwrap();
         let mut node_crds = Crds::default();
         let entry = CrdsValue::new_unsigned(CrdsData::ContactInfo(ContactInfo::new_localhost(
-            &solana_sdk::pubkey::new_rand(),
+            &Pubkey::new_rand(),
             0,
         )));
         let node_pubkey = entry.label().pubkey();
         let node = CrdsGossipPull::default();
         node_crds.insert(entry, 0).unwrap();
         let new = CrdsValue::new_unsigned(CrdsData::ContactInfo(ContactInfo::new_localhost(
-            &solana_sdk::pubkey::new_rand(),
+            &Pubkey::new_rand(),
             0,
         )));
         node_crds.insert(new, 0).unwrap();
@@ -1083,11 +1090,7 @@ mod test {
         let (_, filters, caller) = req.unwrap();
         let filters: Vec<_> = filters.into_iter().map(|f| (caller.clone(), f)).collect();
         let rsp = dest.generate_pull_responses(&dest_crds, &filters, 0);
-        dest.process_pull_requests(
-            &mut dest_crds,
-            filters.into_iter().map(|(caller, _)| caller),
-            1,
-        );
+        dest.process_pull_requests(&mut dest_crds, filters, 1);
         assert!(rsp.iter().all(|rsp| rsp.is_empty()));
         assert!(dest_crds.lookup(&caller.label()).is_some());
         assert_eq!(
@@ -1110,7 +1113,7 @@ mod test {
         let thread_pool = ThreadPoolBuilder::new().build().unwrap();
         let mut node_crds = Crds::default();
         let entry = CrdsValue::new_unsigned(CrdsData::ContactInfo(ContactInfo::new_localhost(
-            &solana_sdk::pubkey::new_rand(),
+            &Pubkey::new_rand(),
             1,
         )));
         let node_pubkey = entry.label().pubkey();
@@ -1118,14 +1121,14 @@ mod test {
         node_crds.insert(entry, 0).unwrap();
 
         let new = CrdsValue::new_unsigned(CrdsData::ContactInfo(ContactInfo::new_localhost(
-            &solana_sdk::pubkey::new_rand(),
+            &Pubkey::new_rand(),
             1,
         )));
         node_crds.insert(new, 0).unwrap();
 
         let mut dest = CrdsGossipPull::default();
         let mut dest_crds = Crds::default();
-        let new_id = solana_sdk::pubkey::new_rand();
+        let new_id = Pubkey::new_rand();
         let new = CrdsValue::new_unsigned(CrdsData::ContactInfo(ContactInfo::new_localhost(
             &new_id, 1,
         )));
@@ -1161,11 +1164,7 @@ mod test {
             let (_, filters, caller) = req.unwrap();
             let filters: Vec<_> = filters.into_iter().map(|f| (caller.clone(), f)).collect();
             let mut rsp = dest.generate_pull_responses(&dest_crds, &filters, 0);
-            dest.process_pull_requests(
-                &mut dest_crds,
-                filters.into_iter().map(|(caller, _)| caller),
-                0,
-            );
+            dest.process_pull_requests(&mut dest_crds, filters, 0);
             // if there is a false positive this is empty
             // prob should be around 0.1 per iteration
             if rsp.is_empty() {
@@ -1211,7 +1210,7 @@ mod test {
         let thread_pool = ThreadPoolBuilder::new().build().unwrap();
         let mut node_crds = Crds::default();
         let entry = CrdsValue::new_unsigned(CrdsData::ContactInfo(ContactInfo::new_localhost(
-            &solana_sdk::pubkey::new_rand(),
+            &Pubkey::new_rand(),
             0,
         )));
         let node_label = entry.label();
@@ -1219,7 +1218,7 @@ mod test {
         let mut node = CrdsGossipPull::default();
         node_crds.insert(entry, 0).unwrap();
         let old = CrdsValue::new_unsigned(CrdsData::ContactInfo(ContactInfo::new_localhost(
-            &solana_sdk::pubkey::new_rand(),
+            &Pubkey::new_rand(),
             0,
         )));
         node_crds.insert(old.clone(), 0).unwrap();
@@ -1230,7 +1229,7 @@ mod test {
 
         // purge
         let timeouts = node.make_timeouts_def(&node_pubkey, &HashMap::new(), 0, 1);
-        node.purge_active(&thread_pool, &mut node_crds, 2, &timeouts);
+        node.purge_active(&mut node_crds, 2, &timeouts);
 
         //verify self is still valid after purge
         assert_eq!(node_crds.lookup(&node_label).unwrap().label(), node_label);
@@ -1331,7 +1330,7 @@ mod test {
         let mut node_crds = Crds::default();
         let mut node = CrdsGossipPull::default();
 
-        let peer_pubkey = solana_sdk::pubkey::new_rand();
+        let peer_pubkey = Pubkey::new_rand();
         let peer_entry = CrdsValue::new_unsigned(CrdsData::ContactInfo(
             ContactInfo::new_localhost(&peer_pubkey, 0),
         ));

core/src/crds_gossip_push.rs

@@ -35,7 +35,7 @@ pub const CRDS_GOSSIP_PUSH_FANOUT: usize = 6;
 pub const CRDS_GOSSIP_PUSH_MSG_TIMEOUT_MS: u64 = 30000;
 pub const CRDS_GOSSIP_PRUNE_MSG_TIMEOUT_MS: u64 = 500;
 pub const CRDS_GOSSIP_PRUNE_STAKE_THRESHOLD_PCT: f64 = 0.15;
-pub const CRDS_GOSSIP_PRUNE_MIN_INGRESS_NODES: usize = 3;
+pub const CRDS_GOSSIP_PRUNE_MIN_INGRESS_NODES: usize = 2;
 // Do not push to peers which have not been updated for this long.
 const PUSH_ACTIVE_TIMEOUT_MS: u64 = 60_000;
 
@@ -136,12 +136,8 @@ impl CrdsGossipPush {
 
         let mut keep = HashSet::new();
         let mut peer_stake_sum = 0;
-        keep.insert(*origin);
         for next in shuffle {
             let (next_peer, next_stake) = staked_peers[next];
-            if next_peer == *origin {
-                continue;
-            }
             keep.insert(next_peer);
             peer_stake_sum += next_stake;
             if peer_stake_sum >= prune_stake_threshold
@@ -288,11 +284,12 @@ impl CrdsGossipPush {
 
     /// add the `from` to the peer's filter of nodes
     pub fn process_prune_msg(&mut self, self_pubkey: &Pubkey, peer: &Pubkey, origins: &[Pubkey]) {
-        if let Some(peer) = self.active_set.get_mut(peer) {
-            for origin in origins {
-                if origin != self_pubkey {
-                    peer.add(origin);
-                }
+        for origin in origins {
+            if origin == self_pubkey {
+                continue;
+            }
+            if let Some(p) = self.active_set.get_mut(peer) {
+                p.add(origin)
             }
         }
     }
@@ -441,15 +438,15 @@ mod test {
         let mut push = CrdsGossipPush::default();
         let mut stakes = HashMap::new();
 
-        let self_id = solana_sdk::pubkey::new_rand();
-        let origin = solana_sdk::pubkey::new_rand();
+        let self_id = Pubkey::new_rand();
+        let origin = Pubkey::new_rand();
         stakes.insert(self_id, 100);
         stakes.insert(origin, 100);
 
         let value = CrdsValue::new_unsigned(CrdsData::ContactInfo(ContactInfo::new_localhost(
             &origin, 0,
         )));
-        let low_staked_peers = (0..10).map(|_| solana_sdk::pubkey::new_rand());
+        let low_staked_peers = (0..10).map(|_| Pubkey::new_rand());
         let mut low_staked_set = HashSet::new();
         low_staked_peers.for_each(|p| {
             let _ = push.process_push_message(&mut crds, &p, value.clone(), 0);
@@ -463,7 +460,7 @@ mod test {
             "should not prune if min threshold has not been reached"
         );
 
-        let high_staked_peer = solana_sdk::pubkey::new_rand();
+        let high_staked_peer = Pubkey::new_rand();
         let high_stake = CrdsGossipPush::prune_stake_threshold(100, 100) + 10;
         stakes.insert(high_staked_peer, high_stake);
         let _ = push.process_push_message(&mut crds, &high_staked_peer, value, 0);
@@ -486,7 +483,7 @@ mod test {
         let mut crds = Crds::default();
         let mut push = CrdsGossipPush::default();
         let value = CrdsValue::new_unsigned(CrdsData::ContactInfo(ContactInfo::new_localhost(
-            &solana_sdk::pubkey::new_rand(),
+            &Pubkey::new_rand(),
             0,
         )));
         let label = value.label();
@@ -507,7 +504,7 @@ mod test {
     fn test_process_push_old_version() {
         let mut crds = Crds::default();
         let mut push = CrdsGossipPush::default();
-        let mut ci = ContactInfo::new_localhost(&solana_sdk::pubkey::new_rand(), 0);
+        let mut ci = ContactInfo::new_localhost(&Pubkey::new_rand(), 0);
         ci.wallclock = 1;
         let value = CrdsValue::new_unsigned(CrdsData::ContactInfo(ci.clone()));
 
@@ -530,7 +527,7 @@ mod test {
         let mut crds = Crds::default();
         let mut push = CrdsGossipPush::default();
         let timeout = push.msg_timeout;
-        let mut ci = ContactInfo::new_localhost(&solana_sdk::pubkey::new_rand(), 0);
+        let mut ci = ContactInfo::new_localhost(&Pubkey::new_rand(), 0);
 
         // push a version to far in the future
         ci.wallclock = timeout + 1;
@@ -552,7 +549,7 @@ mod test {
     fn test_process_push_update() {
         let mut crds = Crds::default();
         let mut push = CrdsGossipPush::default();
-        let mut ci = ContactInfo::new_localhost(&solana_sdk::pubkey::new_rand(), 0);
+        let mut ci = ContactInfo::new_localhost(&Pubkey::new_rand(), 0);
         ci.wallclock = 0;
         let value_old = CrdsValue::new_unsigned(CrdsData::ContactInfo(ci.clone()));
 
@@ -587,7 +584,7 @@ mod test {
         let mut crds = Crds::default();
         let mut push = CrdsGossipPush::default();
         let value1 = CrdsValue::new_unsigned(CrdsData::ContactInfo(ContactInfo::new_localhost(
-            &solana_sdk::pubkey::new_rand(),
+            &Pubkey::new_rand(),
             0,
         )));
 
@@ -596,7 +593,7 @@ mod test {
 
         assert!(push.active_set.get(&value1.label().pubkey()).is_some());
         let value2 = CrdsValue::new_unsigned(CrdsData::ContactInfo(ContactInfo::new_localhost(
-            &solana_sdk::pubkey::new_rand(),
+            &Pubkey::new_rand(),
             0,
         )));
         assert!(push.active_set.get(&value2.label().pubkey()).is_none());
@@ -611,7 +608,7 @@ mod test {
 
         for _ in 0..push.num_active {
             let value2 = CrdsValue::new_unsigned(CrdsData::ContactInfo(
-                ContactInfo::new_localhost(&solana_sdk::pubkey::new_rand(), 0),
+                ContactInfo::new_localhost(&Pubkey::new_rand(), 0),
             ));
             assert_eq!(crds.insert(value2.clone(), now), Ok(None));
         }
@@ -627,7 +624,7 @@ mod test {
         let mut stakes = HashMap::new();
         for i in 1..=100 {
             let peer = CrdsValue::new_unsigned(CrdsData::ContactInfo(ContactInfo::new_localhost(
-                &solana_sdk::pubkey::new_rand(),
+                &Pubkey::new_rand(),
                 time,
             )));
             let id = peer.label().pubkey();
@@ -655,25 +652,25 @@ mod test {
         let gossip = socketaddr!("127.0.0.1:1234");
 
         let me = CrdsValue::new_unsigned(CrdsData::ContactInfo(ContactInfo {
-            id: solana_sdk::pubkey::new_rand(),
+            id: Pubkey::new_rand(),
             shred_version: 123,
             gossip,
             ..ContactInfo::default()
         }));
         let spy = CrdsValue::new_unsigned(CrdsData::ContactInfo(ContactInfo {
-            id: solana_sdk::pubkey::new_rand(),
+            id: Pubkey::new_rand(),
             shred_version: 0,
             gossip,
             ..ContactInfo::default()
         }));
         let node_123 = CrdsValue::new_unsigned(CrdsData::ContactInfo(ContactInfo {
-            id: solana_sdk::pubkey::new_rand(),
+            id: Pubkey::new_rand(),
             shred_version: 123,
             gossip,
             ..ContactInfo::default()
         }));
         let node_456 = CrdsValue::new_unsigned(CrdsData::ContactInfo(ContactInfo {
-            id: solana_sdk::pubkey::new_rand(),
+            id: Pubkey::new_rand(),
             shred_version: 456,
             gossip,
             ..ContactInfo::default()
@@ -712,12 +709,12 @@ mod test {
         let gossip = socketaddr!("127.0.0.1:1234");
 
         let me = CrdsValue::new_unsigned(CrdsData::ContactInfo(ContactInfo {
-            id: solana_sdk::pubkey::new_rand(),
+            id: Pubkey::new_rand(),
             gossip,
             ..ContactInfo::default()
         }));
         let node_123 = CrdsValue::new_unsigned(CrdsData::ContactInfo(ContactInfo {
-            id: solana_sdk::pubkey::new_rand(),
+            id: Pubkey::new_rand(),
             gossip,
             ..ContactInfo::default()
         }));
@@ -738,7 +735,7 @@ mod test {
         assert!(options.is_empty());
 
         // Unknown pubkey in gossip_validators -- will push to nobody
-        gossip_validators.insert(solana_sdk::pubkey::new_rand());
+        gossip_validators.insert(Pubkey::new_rand());
         let options = node.push_options(
             &crds,
             &me.label().pubkey(),
@@ -768,14 +765,14 @@ mod test {
         let mut crds = Crds::default();
         let mut push = CrdsGossipPush::default();
         let peer = CrdsValue::new_unsigned(CrdsData::ContactInfo(ContactInfo::new_localhost(
-            &solana_sdk::pubkey::new_rand(),
+            &Pubkey::new_rand(),
             0,
         )));
         assert_eq!(crds.insert(peer.clone(), now), Ok(None));
         push.refresh_push_active_set(&crds, &HashMap::new(), None, &Pubkey::default(), 0, 1, 1);
 
         let new_msg = CrdsValue::new_unsigned(CrdsData::ContactInfo(ContactInfo::new_localhost(
-            &solana_sdk::pubkey::new_rand(),
+            &Pubkey::new_rand(),
             0,
         )));
         let mut expected = HashMap::new();
@@ -793,17 +790,17 @@ mod test {
         let mut crds = Crds::default();
         let mut push = CrdsGossipPush::default();
         let peer_1 = CrdsValue::new_unsigned(CrdsData::ContactInfo(ContactInfo::new_localhost(
-            &solana_sdk::pubkey::new_rand(),
+            &Pubkey::new_rand(),
             0,
         )));
         assert_eq!(crds.insert(peer_1.clone(), now), Ok(None));
         let peer_2 = CrdsValue::new_unsigned(CrdsData::ContactInfo(ContactInfo::new_localhost(
-            &solana_sdk::pubkey::new_rand(),
+            &Pubkey::new_rand(),
             0,
         )));
         assert_eq!(crds.insert(peer_2.clone(), now), Ok(None));
         let peer_3 = CrdsValue::new_unsigned(CrdsData::ContactInfo(ContactInfo::new_localhost(
-            &solana_sdk::pubkey::new_rand(),
+            &Pubkey::new_rand(),
             now,
         )));
         assert_eq!(
@@ -826,17 +823,17 @@ mod test {
     #[test]
     fn test_process_prune() {
         let mut crds = Crds::default();
-        let self_id = solana_sdk::pubkey::new_rand();
+        let self_id = Pubkey::new_rand();
         let mut push = CrdsGossipPush::default();
         let peer = CrdsValue::new_unsigned(CrdsData::ContactInfo(ContactInfo::new_localhost(
-            &solana_sdk::pubkey::new_rand(),
+            &Pubkey::new_rand(),
             0,
         )));
         assert_eq!(crds.insert(peer.clone(), 0), Ok(None));
         push.refresh_push_active_set(&crds, &HashMap::new(), None, &Pubkey::default(), 0, 1, 1);
 
         let new_msg = CrdsValue::new_unsigned(CrdsData::ContactInfo(ContactInfo::new_localhost(
-            &solana_sdk::pubkey::new_rand(),
+            &Pubkey::new_rand(),
             0,
         )));
         let expected = HashMap::new();
@@ -856,13 +853,13 @@ mod test {
         let mut crds = Crds::default();
         let mut push = CrdsGossipPush::default();
         let peer = CrdsValue::new_unsigned(CrdsData::ContactInfo(ContactInfo::new_localhost(
-            &solana_sdk::pubkey::new_rand(),
+            &Pubkey::new_rand(),
             0,
         )));
         assert_eq!(crds.insert(peer, 0), Ok(None));
         push.refresh_push_active_set(&crds, &HashMap::new(), None, &Pubkey::default(), 0, 1, 1);
 
-        let mut ci = ContactInfo::new_localhost(&solana_sdk::pubkey::new_rand(), 0);
+        let mut ci = ContactInfo::new_localhost(&Pubkey::new_rand(), 0);
         ci.wallclock = 1;
         let new_msg = CrdsValue::new_unsigned(CrdsData::ContactInfo(ci));
         let expected = HashMap::new();
@@ -878,7 +875,7 @@ mod test {
     fn test_purge_old_received_cache() {
         let mut crds = Crds::default();
         let mut push = CrdsGossipPush::default();
-        let mut ci = ContactInfo::new_localhost(&solana_sdk::pubkey::new_rand(), 0);
+        let mut ci = ContactInfo::new_localhost(&Pubkey::new_rand(), 0);
         ci.wallclock = 0;
         let value = CrdsValue::new_unsigned(CrdsData::ContactInfo(ci));
         let label = value.label();

core/src/crds_shards.rs

@@ -135,15 +135,14 @@ mod test {
     use crate::contact_info::ContactInfo;
     use crate::crds_value::{CrdsData, CrdsValue};
     use rand::{thread_rng, Rng};
+    use solana_sdk::pubkey::Pubkey;
     use solana_sdk::timing::timestamp;
     use std::collections::HashSet;
     use std::ops::Index;
 
     fn new_test_crds_value() -> VersionedCrdsValue {
-        let data = CrdsData::ContactInfo(ContactInfo::new_localhost(
-            &solana_sdk::pubkey::new_rand(),
-            timestamp(),
-        ));
+        let data =
+            CrdsData::ContactInfo(ContactInfo::new_localhost(&Pubkey::new_rand(), timestamp()));
         VersionedCrdsValue::new(timestamp(), CrdsValue::new_unsigned(data))
     }
 

core/src/crds_value.rs

@@ -318,7 +318,7 @@ impl CrdsValue {
         R: rand::Rng,
     {
         let now = rng.gen();
-        let contact_info = ContactInfo::new_localhost(&solana_sdk::pubkey::new_rand(), now);
+        let contact_info = ContactInfo::new_localhost(&Pubkey::new_rand(), now);
         Self::new_signed(CrdsData::ContactInfo(contact_info), &Keypair::new())
     }
 

core/src/data_budget.rs

@@ -1,112 +0,0 @@
-use std::sync::atomic::{AtomicU64, AtomicUsize, Ordering};
-
-#[derive(Default)]
-pub struct DataBudget {
-    // Amount of bytes we have in the budget to send.
-    bytes: AtomicUsize,
-    // Last time that we upped the bytes count, used
-    // to detect when to up the bytes budget again
-    last_timestamp_ms: AtomicU64,
-}
-
-impl DataBudget {
-    // If there are enough bytes in the budget, consumes from
-    // the budget and returns true. Otherwise returns false.
-    #[must_use]
-    pub fn take(&self, size: usize) -> bool {
-        let mut budget = self.bytes.load(Ordering::Acquire);
-        loop {
-            if budget < size {
-                return false;
-            }
-            match self.bytes.compare_exchange_weak(
-                budget,
-                budget - size,
-                Ordering::AcqRel,
-                Ordering::Acquire,
-            ) {
-                Ok(_) => return true,
-                Err(bytes) => budget = bytes,
-            }
-        }
-    }
-
-    // Updates timestamp and returns true, if at least given milliseconds
-    // has passed since last update. Otherwise returns false.
-    fn can_update(&self, duration_millis: u64) -> bool {
-        let now = solana_sdk::timing::timestamp();
-        let mut last_timestamp = self.last_timestamp_ms.load(Ordering::Acquire);
-        loop {
-            if now < last_timestamp + duration_millis {
-                return false;
-            }
-            match self.last_timestamp_ms.compare_exchange_weak(
-                last_timestamp,
-                now,
-                Ordering::AcqRel,
-                Ordering::Acquire,
-            ) {
-                Ok(_) => return true,
-                Err(ts) => last_timestamp = ts,
-            }
-        }
-    }
-
-    // Updates the budget if at least given milliseconds has passed since last
-    // update. Updater function maps current value of bytes to the new one.
-    pub fn update<F>(&self, duration_millis: u64, updater: F)
-    where
-        F: Fn(usize) -> usize,
-    {
-        if !self.can_update(duration_millis) {
-            return;
-        }
-        let mut bytes = self.bytes.load(Ordering::Acquire);
-        loop {
-            match self.bytes.compare_exchange_weak(
-                bytes,
-                updater(bytes),
-                Ordering::AcqRel,
-                Ordering::Acquire,
-            ) {
-                Ok(_) => break,
-                Err(b) => bytes = b,
-            }
-        }
-    }
-
-    // Non-atomic clone only for tests and simulations.
-    pub fn clone_non_atomic(&self) -> Self {
-        Self {
-            bytes: AtomicUsize::new(self.bytes.load(Ordering::Acquire)),
-            last_timestamp_ms: AtomicU64::new(self.last_timestamp_ms.load(Ordering::Acquire)),
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use std::time::Duration;
-
-    #[test]
-    fn test_data_budget() {
-        let budget = DataBudget::default();
-        assert!(!budget.take(1)); // budget = 0.
-
-        budget.update(1000, |bytes| bytes + 5); // budget updates to 5.
-        assert!(budget.take(1));
-        assert!(budget.take(2));
-        assert!(!budget.take(3)); // budget = 2, out of budget.
-
-        budget.update(30, |_| 10); // no update, budget = 2.
-        assert!(!budget.take(3)); // budget = 2, out of budget.
-
-        std::thread::sleep(Duration::from_millis(50));
-        budget.update(30, |bytes| bytes * 2); // budget updates to 4.
-
-        assert!(budget.take(3));
-        assert!(budget.take(1));
-        assert!(!budget.take(1)); // budget = 0.
-    }
-}

core/src/epoch_slots.rs

@@ -451,6 +451,7 @@ mod tests {
     }
 
     #[test]
+    #[allow(clippy::same_item_push)]
     fn test_epoch_slots_fill_uncompressed_random_range() {
         use rand::Rng;
         for _ in 0..10 {
@@ -469,6 +470,7 @@ mod tests {
     }
 
     #[test]
+    #[allow(clippy::same_item_push)]
     fn test_epoch_slots_fill_compressed_random_range() {
         use rand::Rng;
         for _ in 0..10 {
@@ -489,6 +491,7 @@ mod tests {
     }
 
     #[test]
+    #[allow(clippy::same_item_push)]
     fn test_epoch_slots_fill_random_range() {
         use rand::Rng;
         for _ in 0..10 {

core/src/gossip_service.rs

@@ -306,8 +306,8 @@ mod tests {
     #[test]
     fn test_gossip_services_spy() {
         let keypair = Keypair::new();
-        let peer0 = solana_sdk::pubkey::new_rand();
-        let peer1 = solana_sdk::pubkey::new_rand();
+        let peer0 = Pubkey::new_rand();
+        let peer1 = Pubkey::new_rand();
         let contact_info = ContactInfo::new_localhost(&keypair.pubkey(), 0);
         let peer0_info = ContactInfo::new_localhost(&peer0, 0);
         let peer1_info = ContactInfo::new_localhost(&peer1, 0);
@@ -335,7 +335,7 @@ mod tests {
             spy_ref.clone(),
             None,
             Some(0),
-            Some(solana_sdk::pubkey::new_rand()),
+            Some(Pubkey::new_rand()),
             None,
         );
         assert_eq!(met_criteria, false);
@@ -349,7 +349,7 @@ mod tests {
             spy_ref.clone(),
             Some(1),
             Some(0),
-            Some(solana_sdk::pubkey::new_rand()),
+            Some(Pubkey::new_rand()),
             None,
         );
         assert_eq!(met_criteria, false);

core/src/heaviest_subtree_fork_choice.rs

@@ -187,7 +187,6 @@ impl HeaviestSubtreeForkChoice {
             .expect("new root must exist in fork_infos map")
             .parent = None;
         self.root = new_root;
-        self.last_root_time = Instant::now();
     }
 
     pub fn add_root_parent(&mut self, root_parent: Slot) {
@@ -492,6 +491,44 @@ impl HeaviestSubtreeForkChoice {
         );
     }
 
+    fn heaviest_slot_on_same_voted_fork(&self, tower: &Tower) -> Option<Slot> {
+        tower
+            .last_voted_slot()
+            .map(|last_voted_slot| {
+                let heaviest_slot_on_same_voted_fork = self.best_slot(last_voted_slot);
+                if heaviest_slot_on_same_voted_fork.is_none() {
+                    if !tower.is_stray_last_vote() {
+                        // Unless last vote is stray, self.bast_slot(last_voted_slot) must return
+                        // Some(_), justifying to panic! here.
+                        // Also, adjust_lockouts_after_replay() correctly makes last_voted_slot None,
+                        // if all saved votes are ancestors of replayed_root_slot. So this code shouldn't be
+                        // touched in that case as well.
+                        // In other words, except being stray, all other slots have been voted on while this
+                        // validator has been running, so we must be able to fetch best_slots for all of
+                        // them.
+                        panic!(
+                            "a bank at last_voted_slot({}) is a frozen bank so must have been\
+                            added to heaviest_subtree_fork_choice at time of freezing",
+                            last_voted_slot,
+                        )
+                    } else {
+                        // fork_infos doesn't have corresponding data for the stray restored last vote,
+                        // meaning some inconsistency between saved tower and ledger.
+                        // (newer snapshot, or only a saved tower is moved over to new setup?)
+                        return None;
+                    }
+                }
+                let heaviest_slot_on_same_voted_fork = heaviest_slot_on_same_voted_fork.unwrap();
+
+                if heaviest_slot_on_same_voted_fork == last_voted_slot {
+                    None
+                } else {
+                    Some(heaviest_slot_on_same_voted_fork)
+                }
+            })
+            .unwrap_or(None)
+    }
+
     #[cfg(test)]
     fn set_stake_voted_at(&mut self, slot: Slot, stake_voted_at: u64) {
         self.fork_infos.get_mut(&slot).unwrap().stake_voted_at = stake_voted_at;
@@ -551,26 +588,17 @@ impl ForkChoice for HeaviestSubtreeForkChoice {
         _ancestors: &HashMap<u64, HashSet<u64>>,
         bank_forks: &RwLock<BankForks>,
     ) -> (Arc<Bank>, Option<Arc<Bank>>) {
-        let last_voted_slot = tower.last_voted_slot();
-        let heaviest_slot_on_same_voted_fork = last_voted_slot.map(|last_voted_slot| {
-            let heaviest_slot_on_same_voted_fork =
-                self.best_slot(last_voted_slot).expect("a bank at last_voted_slot is a frozen bank so must have been added to heaviest_subtree_fork_choice at time of freezing");
-            if heaviest_slot_on_same_voted_fork == last_voted_slot {
-                None
-            } else {
-                Some(heaviest_slot_on_same_voted_fork)
-            }
-        }).unwrap_or(None);
-        let heaviest_slot = self.best_overall_slot();
         let r_bank_forks = bank_forks.read().unwrap();
+
         (
-            r_bank_forks.get(heaviest_slot).unwrap().clone(),
-            heaviest_slot_on_same_voted_fork.map(|heaviest_slot_on_same_voted_fork| {
-                r_bank_forks
-                    .get(heaviest_slot_on_same_voted_fork)
-                    .unwrap()
-                    .clone()
-            }),
+            r_bank_forks.get(self.best_overall_slot()).unwrap().clone(),
+            self.heaviest_slot_on_same_voted_fork(tower)
+                .map(|heaviest_slot_on_same_voted_fork| {
+                    r_bank_forks
+                        .get(heaviest_slot_on_same_voted_fork)
+                        .unwrap()
+                        .clone()
+                }),
         )
     }
 }
@@ -612,6 +640,7 @@ mod test {
     use super::*;
     use crate::consensus::test::VoteSimulator;
     use solana_runtime::{bank::Bank, bank_utils};
+    use solana_sdk::{hash::Hash, slot_history::SlotHistory};
     use std::{collections::HashSet, ops::Range};
     use trees::tr;
 
@@ -1491,6 +1520,48 @@ mod test {
         assert!(heaviest_subtree_fork_choice.subtree_diff(0, 6).is_empty());
     }
 
+    #[test]
+    fn test_stray_restored_slot() {
+        let forks = tr(0) / (tr(1) / tr(2));
+        let heaviest_subtree_fork_choice = HeaviestSubtreeForkChoice::new_from_tree(forks);
+
+        let mut tower = Tower::new_for_tests(10, 0.9);
+        tower.record_vote(1, Hash::default());
+
+        assert_eq!(tower.is_stray_last_vote(), false);
+        assert_eq!(
+            heaviest_subtree_fork_choice.heaviest_slot_on_same_voted_fork(&tower),
+            Some(2)
+        );
+
+        // Make slot 1 (existing in bank_forks) a restored stray slot
+        let mut slot_history = SlotHistory::default();
+        slot_history.add(0);
+        // Work around TooOldSlotHistory
+        slot_history.add(999);
+        tower = tower
+            .adjust_lockouts_after_replay(0, &slot_history)
+            .unwrap();
+
+        assert_eq!(tower.is_stray_last_vote(), true);
+        assert_eq!(
+            heaviest_subtree_fork_choice.heaviest_slot_on_same_voted_fork(&tower),
+            Some(2)
+        );
+
+        // Make slot 3 (NOT existing in bank_forks) a restored stray slot
+        tower.record_vote(3, Hash::default());
+        tower = tower
+            .adjust_lockouts_after_replay(0, &slot_history)
+            .unwrap();
+
+        assert_eq!(tower.is_stray_last_vote(), true);
+        assert_eq!(
+            heaviest_subtree_fork_choice.heaviest_slot_on_same_voted_fork(&tower),
+            None
+        );
+    }
+
     fn setup_forks() -> HeaviestSubtreeForkChoice {
         /*
             Build fork structure:

core/src/lib.rs

@@ -6,7 +6,6 @@
 //! command-line tools to spin up validators and a Rust library
 //!
 
-pub mod accounts_background_service;
 pub mod accounts_hash_verifier;
 pub mod banking_stage;
 pub mod bigtable_upload_service;
@@ -32,7 +31,6 @@ pub mod crds_gossip_pull;
 pub mod crds_gossip_push;
 pub mod crds_shards;
 pub mod crds_value;
-pub mod data_budget;
 pub mod epoch_slots;
 pub mod fetch_stage;
 pub mod fork_choice;
@@ -44,7 +42,6 @@ pub mod local_vote_signer_service;
 pub mod non_circulating_supply;
 pub mod optimistic_confirmation_verifier;
 pub mod optimistically_confirmed_bank_tracker;
-pub mod ping_pong;
 pub mod poh_recorder;
 pub mod poh_service;
 pub mod progress_map;
@@ -81,9 +78,6 @@ pub mod vote_stake_tracker;
 pub mod weighted_shuffle;
 pub mod window_service;
 
-#[macro_use]
-extern crate solana_budget_program;
-
 #[macro_use]
 extern crate log;
 

core/src/non_circulating_supply.rs

@@ -135,7 +135,7 @@ mod tests {
         let num_genesis_accounts = 10;
         for _ in 0..num_genesis_accounts {
             accounts.insert(
-                solana_sdk::pubkey::new_rand(),
+                Pubkey::new_rand(),
                 Account::new(balance, 0, &Pubkey::default()),
             );
         }
@@ -147,7 +147,7 @@ mod tests {
 
         let num_stake_accounts = 3;
         for _ in 0..num_stake_accounts {
-            let pubkey = solana_sdk::pubkey::new_rand();
+            let pubkey = Pubkey::new_rand();
             let meta = Meta {
                 authorized: Authorized::auto(&pubkey),
                 lockup: Lockup {

core/src/optimistic_confirmation_verifier.rs

@@ -20,7 +20,7 @@ impl OptimisticConfirmationVerifier {
     }
 
     // Returns any optimistic slots that were not rooted
-    pub fn verify_for_unrooted_optimistic_slots(
+    pub fn get_unrooted_optimistic_slots(
         &mut self,
         root_bank: &Bank,
         blockstore: &Blockstore,
@@ -34,8 +34,8 @@ impl OptimisticConfirmationVerifier {
         std::mem::swap(&mut slots_before_root, &mut self.unchecked_slots);
         slots_before_root
             .into_iter()
-            .filter(|(optimistic_slot, optimistic_hash)| {
-                (*optimistic_slot == root && *optimistic_hash != root_bank.hash())
+            .filter(|(optimistic_slot, hash)| {
+                (*optimistic_slot == root && *hash != root_bank.hash())
                     || (!root_ancestors.contains_key(&optimistic_slot) &&
                     // In this second part of the `and`, we account for the possibility that
                     // there was some other root `rootX` set in BankForks where:
@@ -76,10 +76,6 @@ impl OptimisticConfirmationVerifier {
         self.last_optimistic_slot_ts = Instant::now();
     }
 
-    pub fn format_optimistic_confirmd_slot_violation_log(slot: Slot) -> String {
-        format!("Optimistically confirmed slot {} was not rooted", slot)
-    }
-
     pub fn log_unrooted_optimistic_slots(
         root_bank: &Bank,
         vote_tracker: &VoteTracker,
@@ -100,7 +96,7 @@ impl OptimisticConfirmationVerifier {
                     .unwrap_or(0);
 
                 error!(
-                    "{},
+                    "Optimistic slot {} was not rooted,
                     hash: {},
                     epoch: {},
                     voted keys: {:?},
@@ -109,7 +105,7 @@ impl OptimisticConfirmationVerifier {
                     voted stake: {},
                     total epoch stake: {},
                     pct: {}",
-                    Self::format_optimistic_confirmd_slot_violation_log(*optimistic_slot),
+                    optimistic_slot,
                     hash,
                     epoch,
                     r_slot_tracker
@@ -185,8 +181,7 @@ mod test {
                 .cloned()
                 .unwrap();
             assert_eq!(
-                optimistic_confirmation_verifier
-                    .verify_for_unrooted_optimistic_slots(&bank1, &blockstore),
+                optimistic_confirmation_verifier.get_unrooted_optimistic_slots(&bank1, &blockstore),
                 vec![(1, bad_bank_hash)]
             );
             assert_eq!(optimistic_confirmation_verifier.unchecked_slots.len(), 1);
@@ -233,7 +228,7 @@ mod test {
                 .cloned()
                 .unwrap();
             assert!(optimistic_confirmation_verifier
-                .verify_for_unrooted_optimistic_slots(&bank5, &blockstore)
+                .get_unrooted_optimistic_slots(&bank5, &blockstore)
                 .is_empty());
             // 5 is >= than all the unchecked slots, so should clear everything
             assert!(optimistic_confirmation_verifier.unchecked_slots.is_empty());
@@ -249,7 +244,7 @@ mod test {
                 .cloned()
                 .unwrap();
             assert!(optimistic_confirmation_verifier
-                .verify_for_unrooted_optimistic_slots(&bank3, &blockstore)
+                .get_unrooted_optimistic_slots(&bank3, &blockstore)
                 .is_empty());
             // 3 is bigger than only slot 1, so slot 5 should be left over
             assert_eq!(optimistic_confirmation_verifier.unchecked_slots.len(), 1);
@@ -269,8 +264,7 @@ mod test {
                 .cloned()
                 .unwrap();
             assert_eq!(
-                optimistic_confirmation_verifier
-                    .verify_for_unrooted_optimistic_slots(&bank4, &blockstore),
+                optimistic_confirmation_verifier.get_unrooted_optimistic_slots(&bank4, &blockstore),
                 vec![optimistic_slots[1]]
             );
             // 4 is bigger than only slots 1 and 3, so slot 5 should be left over
@@ -309,8 +303,7 @@ mod test {
             optimistic_confirmation_verifier
                 .add_new_optimistic_confirmed_slots(optimistic_slots.clone());
             assert_eq!(
-                optimistic_confirmation_verifier
-                    .verify_for_unrooted_optimistic_slots(&bank7, &blockstore),
+                optimistic_confirmation_verifier.get_unrooted_optimistic_slots(&bank7, &blockstore),
                 optimistic_slots[0..=1].to_vec()
             );
             assert!(optimistic_confirmation_verifier.unchecked_slots.is_empty());
@@ -319,7 +312,7 @@ mod test {
             blockstore.set_roots(&[1, 3]).unwrap();
             optimistic_confirmation_verifier.add_new_optimistic_confirmed_slots(optimistic_slots);
             assert!(optimistic_confirmation_verifier
-                .verify_for_unrooted_optimistic_slots(&bank7, &blockstore)
+                .get_unrooted_optimistic_slots(&bank7, &blockstore)
                 .is_empty());
             assert!(optimistic_confirmation_verifier.unchecked_slots.is_empty());
         }

core/src/ping_pong.rs

@@ -1,400 +0,0 @@
-use bincode::{serialize, Error};
-use lru::LruCache;
-use rand::{AsByteSliceMut, CryptoRng, Rng};
-use serde::Serialize;
-use solana_sdk::hash::{self, Hash};
-use solana_sdk::pubkey::Pubkey;
-use solana_sdk::sanitize::{Sanitize, SanitizeError};
-use solana_sdk::signature::{Keypair, Signable, Signature, Signer};
-use std::borrow::Cow;
-use std::net::SocketAddr;
-use std::time::{Duration, Instant};
-
-#[derive(AbiExample, Debug, Deserialize, Serialize)]
-pub struct Ping<T> {
-    from: Pubkey,
-    token: T,
-    signature: Signature,
-}
-
-#[derive(AbiExample, Debug, Deserialize, Serialize)]
-pub struct Pong {
-    from: Pubkey,
-    hash: Hash, // Hash of received ping token.
-    signature: Signature,
-}
-
-/// Maintains records of remote nodes which have returned a valid response to a
-/// ping message, and on-the-fly ping messages pending a pong response from the
-/// remote node.
-pub struct PingCache {
-    // Time-to-live of received pong messages.
-    ttl: Duration,
-    // Timestamp of last ping message sent to a remote node.
-    // Used to rate limit pings to remote nodes.
-    pings: LruCache<(Pubkey, SocketAddr), Instant>,
-    // Verified pong responses from remote nodes.
-    pongs: LruCache<(Pubkey, SocketAddr), Instant>,
-    // Hash of ping tokens sent out to remote nodes,
-    // pending a pong response back.
-    pending_cache: LruCache<Hash, (Pubkey, SocketAddr)>,
-}
-
-impl<T: Serialize> Ping<T> {
-    pub fn new(token: T, keypair: &Keypair) -> Result<Self, Error> {
-        let signature = keypair.sign_message(&serialize(&token)?);
-        let ping = Ping {
-            from: keypair.pubkey(),
-            token,
-            signature,
-        };
-        Ok(ping)
-    }
-}
-
-impl<T> Ping<T>
-where
-    T: Serialize + AsByteSliceMut + Default,
-{
-    pub fn new_rand<R>(rng: &mut R, keypair: &Keypair) -> Result<Self, Error>
-    where
-        R: Rng + CryptoRng,
-    {
-        let mut token = T::default();
-        rng.fill(&mut token);
-        Ping::new(token, keypair)
-    }
-}
-
-impl<T> Sanitize for Ping<T> {
-    fn sanitize(&self) -> Result<(), SanitizeError> {
-        self.from.sanitize()?;
-        // TODO Add self.token.sanitize()?; when rust's
-        // specialization feature becomes stable.
-        self.signature.sanitize()
-    }
-}
-
-impl<T: Serialize> Signable for Ping<T> {
-    fn pubkey(&self) -> Pubkey {
-        self.from
-    }
-
-    fn signable_data(&self) -> Cow<[u8]> {
-        Cow::Owned(serialize(&self.token).unwrap())
-    }
-
-    fn get_signature(&self) -> Signature {
-        self.signature
-    }
-
-    fn set_signature(&mut self, signature: Signature) {
-        self.signature = signature;
-    }
-}
-
-impl Pong {
-    pub fn new<T: Serialize>(ping: &Ping<T>, keypair: &Keypair) -> Result<Self, Error> {
-        let hash = hash::hash(&serialize(&ping.token)?);
-        let pong = Pong {
-            from: keypair.pubkey(),
-            hash,
-            signature: keypair.sign_message(hash.as_ref()),
-        };
-        Ok(pong)
-    }
-}
-
-impl Sanitize for Pong {
-    fn sanitize(&self) -> Result<(), SanitizeError> {
-        self.from.sanitize()?;
-        self.hash.sanitize()?;
-        self.signature.sanitize()
-    }
-}
-
-impl Signable for Pong {
-    fn pubkey(&self) -> Pubkey {
-        self.from
-    }
-
-    fn signable_data(&self) -> Cow<[u8]> {
-        Cow::Owned(self.hash.as_ref().into())
-    }
-
-    fn get_signature(&self) -> Signature {
-        self.signature
-    }
-
-    fn set_signature(&mut self, signature: Signature) {
-        self.signature = signature;
-    }
-}
-
-impl PingCache {
-    pub fn new(ttl: Duration, cap: usize) -> Self {
-        Self {
-            ttl,
-            pings: LruCache::new(cap),
-            pongs: LruCache::new(cap),
-            pending_cache: LruCache::new(cap),
-        }
-    }
-
-    /// Checks if the pong hash, pubkey and socket match a ping message sent
-    /// out previously. If so records current timestamp for the remote node and
-    /// returns true.
-    /// Note: Does not verify the signature.
-    pub fn add(&mut self, pong: &Pong, socket: SocketAddr, now: Instant) -> bool {
-        let node = (pong.pubkey(), socket);
-        match self.pending_cache.peek(&pong.hash) {
-            Some(value) if *value == node => {
-                self.pings.pop(&node);
-                self.pongs.put(node, now);
-                self.pending_cache.pop(&pong.hash);
-                true
-            }
-            _ => false,
-        }
-    }
-
-    /// Checks if the remote node has been pinged recently. If not, calls the
-    /// given function to generates a new ping message, records current
-    /// timestamp and hash of ping token, and returns the ping message.
-    fn maybe_ping<T, F>(
-        &mut self,
-        now: Instant,
-        node: (Pubkey, SocketAddr),
-        mut pingf: F,
-    ) -> Option<Ping<T>>
-    where
-        T: Serialize,
-        F: FnMut() -> Option<Ping<T>>,
-    {
-        // Rate limit consecutive pings sent to a remote node.
-        let delay = self.ttl / 64;
-        match self.pings.peek(&node) {
-            Some(t) if now.saturating_duration_since(*t) < delay => None,
-            _ => {
-                let ping = pingf()?;
-                let hash = hash::hash(&serialize(&ping.token).ok()?);
-                self.pings.put(node, now);
-                self.pending_cache.put(hash, node);
-                Some(ping)
-            }
-        }
-    }
-
-    /// Returns true if the remote node has responded to a ping message.
-    /// Removes expired pong messages. In order to extend verifications before
-    /// expiration, if the pong message is not too recent, and the node has not
-    /// been pinged recently, calls the given function to generates a new ping
-    /// message, records current timestamp and hash of ping token, and returns
-    /// the ping message.
-    /// Caller should verify if the socket address is valid. (e.g. by using
-    /// ContactInfo::is_valid_address).
-    pub fn check<T, F>(
-        &mut self,
-        now: Instant,
-        node: (Pubkey, SocketAddr),
-        pingf: F,
-    ) -> (bool, Option<Ping<T>>)
-    where
-        T: Serialize,
-        F: FnMut() -> Option<Ping<T>>,
-    {
-        let (check, should_ping) = match self.pongs.get(&node) {
-            None => (false, true),
-            Some(t) => {
-                let age = now.saturating_duration_since(*t);
-                // Pop if the pong message has expired.
-                if age > self.ttl {
-                    self.pongs.pop(&node);
-                }
-                // If the pong message is not too recent, generate a new ping
-                // message to extend remote node verification.
-                (true, age > self.ttl / 8)
-            }
-        };
-        let ping = if should_ping {
-            self.maybe_ping(now, node, pingf)
-        } else {
-            None
-        };
-        (check, ping)
-    }
-
-    // Only for tests and simulations.
-    pub(crate) fn mock_clone(&self) -> Self {
-        let mut clone = Self {
-            ttl: self.ttl,
-            pings: LruCache::new(self.pings.cap()),
-            pongs: LruCache::new(self.pongs.cap()),
-            pending_cache: LruCache::new(self.pending_cache.cap()),
-        };
-        for (k, v) in self.pongs.iter().rev() {
-            clone.pings.put(*k, *v);
-        }
-        for (k, v) in self.pongs.iter().rev() {
-            clone.pongs.put(*k, *v);
-        }
-        for (k, v) in self.pending_cache.iter().rev() {
-            clone.pending_cache.put(*k, *v);
-        }
-        clone
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use std::collections::HashSet;
-    use std::iter::repeat_with;
-    use std::net::{Ipv4Addr, SocketAddrV4};
-
-    type Token = [u8; 32];
-
-    #[test]
-    fn test_ping_pong() {
-        let mut rng = rand::thread_rng();
-        let keypair = Keypair::new();
-        let ping = Ping::<Token>::new_rand(&mut rng, &keypair).unwrap();
-        assert!(ping.verify());
-        assert!(ping.sanitize().is_ok());
-
-        let pong = Pong::new(&ping, &keypair).unwrap();
-        assert!(pong.verify());
-        assert!(pong.sanitize().is_ok());
-        assert_eq!(hash::hash(&ping.token), pong.hash);
-    }
-
-    #[test]
-    fn test_ping_cache() {
-        let now = Instant::now();
-        let mut rng = rand::thread_rng();
-        let ttl = Duration::from_millis(256);
-        let mut cache = PingCache::new(ttl, /*cap=*/ 1000);
-        let this_node = Keypair::new();
-        let keypairs: Vec<_> = repeat_with(Keypair::new).take(8).collect();
-        let sockets: Vec<_> = repeat_with(|| {
-            SocketAddr::V4(SocketAddrV4::new(
-                Ipv4Addr::new(rng.gen(), rng.gen(), rng.gen(), rng.gen()),
-                rng.gen(),
-            ))
-        })
-        .take(8)
-        .collect();
-        let remote_nodes: Vec<(&Keypair, SocketAddr)> = repeat_with(|| {
-            let keypair = &keypairs[rng.gen_range(0, keypairs.len())];
-            let socket = sockets[rng.gen_range(0, sockets.len())];
-            (keypair, socket)
-        })
-        .take(128)
-        .collect();
-
-        // Initially all checks should fail. The first observation of each node
-        // should create a ping packet.
-        let mut seen_nodes = HashSet::<(Pubkey, SocketAddr)>::new();
-        let pings: Vec<Option<Ping<Token>>> = remote_nodes
-            .iter()
-            .map(|(keypair, socket)| {
-                let node = (keypair.pubkey(), *socket);
-                let pingf = || Ping::<Token>::new_rand(&mut rng, &this_node).ok();
-                let (check, ping) = cache.check(now, node, pingf);
-                assert!(!check);
-                assert_eq!(seen_nodes.insert(node), ping.is_some());
-                ping
-            })
-            .collect();
-
-        let now = now + Duration::from_millis(1);
-        let panic_ping = || -> Option<Ping<Token>> { panic!("this should not happen!") };
-        for ((keypair, socket), ping) in remote_nodes.iter().zip(&pings) {
-            match ping {
-                None => {
-                    // Already have a recent ping packets for nodes, so no new
-                    // ping packet will be generated.
-                    let node = (keypair.pubkey(), *socket);
-                    let (check, ping) = cache.check(now, node, panic_ping);
-                    assert!(check);
-                    assert!(ping.is_none());
-                }
-                Some(ping) => {
-                    let pong = Pong::new(ping, keypair).unwrap();
-                    assert!(cache.add(&pong, *socket, now));
-                }
-            }
-        }
-
-        let now = now + Duration::from_millis(1);
-        // All nodes now have a recent pong packet.
-        for (keypair, socket) in &remote_nodes {
-            let node = (keypair.pubkey(), *socket);
-            let (check, ping) = cache.check(now, node, panic_ping);
-            assert!(check);
-            assert!(ping.is_none());
-        }
-
-        let now = now + ttl / 8;
-        // All nodes still have a valid pong packet, but the cache will create
-        // a new ping packet to extend verification.
-        seen_nodes.clear();
-        for (keypair, socket) in &remote_nodes {
-            let node = (keypair.pubkey(), *socket);
-            let pingf = || Ping::<Token>::new_rand(&mut rng, &this_node).ok();
-            let (check, ping) = cache.check(now, node, pingf);
-            assert!(check);
-            assert_eq!(seen_nodes.insert(node), ping.is_some());
-        }
-
-        let now = now + Duration::from_millis(1);
-        // All nodes still have a valid pong packet, and a very recent ping
-        // packet pending response. So no new ping packet will be created.
-        for (keypair, socket) in &remote_nodes {
-            let node = (keypair.pubkey(), *socket);
-            let (check, ping) = cache.check(now, node, panic_ping);
-            assert!(check);
-            assert!(ping.is_none());
-        }
-
-        let now = now + ttl;
-        // Pong packets are still valid but expired. The first observation of
-        // each node will remove the pong packet from cache and create a new
-        // ping packet.
-        seen_nodes.clear();
-        for (keypair, socket) in &remote_nodes {
-            let node = (keypair.pubkey(), *socket);
-            let pingf = || Ping::<Token>::new_rand(&mut rng, &this_node).ok();
-            let (check, ping) = cache.check(now, node, pingf);
-            if seen_nodes.insert(node) {
-                assert!(check);
-                assert!(ping.is_some());
-            } else {
-                assert!(!check);
-                assert!(ping.is_none());
-            }
-        }
-
-        let now = now + Duration::from_millis(1);
-        // No valid pong packet in the cache. A recent ping packet already
-        // created, so no new one will be created.
-        for (keypair, socket) in &remote_nodes {
-            let node = (keypair.pubkey(), *socket);
-            let (check, ping) = cache.check(now, node, panic_ping);
-            assert!(!check);
-            assert!(ping.is_none());
-        }
-
-        let now = now + ttl / 64;
-        // No valid pong packet in the cache. Another ping packet will be
-        // created for the first observation of each node.
-        seen_nodes.clear();
-        for (keypair, socket) in &remote_nodes {
-            let node = (keypair.pubkey(), *socket);
-            let pingf = || Ping::<Token>::new_rand(&mut rng, &this_node).ok();
-            let (check, ping) = cache.check(now, node, pingf);
-            assert!(!check);
-            assert_eq!(seen_nodes.insert(node), ping.is_some());
-        }
-    }
-}