Use type alias

(cherry picked from commit bcfadd6085)

.appveyor.yml

@@ -0,0 +1,42 @@
+version: '{build}'
+
+branches:
+  only:
+  - master
+  - /^v[0-9.]+\.[0-9.]+/
+
+cache:
+  - '%USERPROFILE%\.cargo'
+  - '%APPVEYOR_BUILD_FOLDER%\target'
+
+clone_folder: d:\projects\solana
+
+build_script:
+  - bash ci/publish-tarball.sh
+
+notifications:
+  - provider: Slack
+    incoming_webhook:
+      secure: GJsBey+F5apAtUm86MHVJ68Uqa6WN1SImcuIc4TsTZrDhA8K1QWUNw9FFQPybUWDyOcS5dly3kubnUqlGt9ux6Ad2efsfRIQYWv0tOVXKeY=
+    channel: ci-status
+    on_build_success: false
+    on_build_failure: true
+    on_build_status_changed: true
+
+deploy:
+  - provider: S3
+    access_key_id:
+      secure: fTbJl6JpFebR40J7cOWZ2mXBa3kIvEiXgzxAj6L3N7A=
+    secret_access_key:
+      secure: vItsBXb2rEFLvkWtVn/Rcxu5a5+2EwC+b7GsA0waJy9hXh6XuBAD0lnHd9re3g/4
+    bucket: release.solana.com
+    region: us-west-1
+    set_public: true
+
+  - provider: GitHub
+    auth_token:
+      secure: 81fEmPZ0cV1wLtNuUrcmtgxKF6ROQF1+/ft5m+fHX21z6PoeCbaNo8cTyLioWBj7
+    draft: false
+    prerelease: false
+    on:
+      appveyor_repo_tag: true

.gitbook.yaml

@@ -3,16 +3,3 @@ root: ./docs/src
 structure:
     readme: introduction.md
     summary: SUMMARY.md
-
-redirects:
-    wallet: ./wallet-guide/README.md
-    wallet/app-wallets: ./wallet-guide/apps.md
-    wallet/app-wallets/trust-wallet: ./wallet-guide/trust-wallet.md
-    wallet/app-wallets/ledger-live:  ./wallet-guide/ledger-live.md
-    wallet/cli-wallets:  ./wallet-guide/cli.md
-    wallet/cli-wallets/paper-wallet:  ./paper-wallet/README.md
-    wallet/cli-wallets/paper-wallet/paper-wallet-usage: ./paper-wallet/paper-wallet-usage.md
-    wallet/cli-wallets/remote-wallet: ./hardware-wallets/README.md
-    wallet/cli-wallets/remote-wallet/ledger: ./hardware-wallets/ledger.md
-    wallet/cli-wallets/file-system-wallet: ./file-system-wallet/README.md
-    wallet/support: ./wallet-guide/support.md

.gitignore

@@ -1,6 +1,5 @@
 /docs/html/
 /docs/src/tests.ok
-/docs/src/cli/usage.md
 /docs/src/.gitbook/assets/*.svg
 /farf/
 /solana-release/

.mergify.yml

@@ -19,13 +19,20 @@ pull_request_rules:
       label:
         add:
           - automerge
+  - name: v0.23 backport
+    conditions:
+      - base=master
+      - label=v0.23
+    actions:
+      backport:
+        branches:
+          - v0.23
   - name: v1.0 backport
     conditions:
       - base=master
       - label=v1.0
     actions:
       backport:
-        ignore_conflicts: true
         branches:
           - v1.0
   - name: v1.1 backport
@@ -34,7 +41,6 @@ pull_request_rules:
       - label=v1.1
     actions:
       backport:
-        ignore_conflicts: true
         branches:
           - v1.1
   - name: v1.2 backport
@@ -43,6 +49,5 @@ pull_request_rules:
       - label=v1.2
     actions:
       backport:
-        ignore_conflicts: true
         branches:
           - v1.2

CONTRIBUTING.md

@@ -45,7 +45,7 @@ $ git pull --rebase upstream master
 
 If there are no functional changes, PRs can be very large and that's no
 problem. If, however, your changes are making meaningful changes or additions,
-then about 1,000 lines of changes is about the most you should ask a Solana
+then about 1000 lines of changes is about the most you should ask a Solana
 maintainer to review.
 
 ### Should I send small PRs as I develop large, new components?

Cargo.toml

@@ -3,7 +3,6 @@ members = [
     "bench-exchange",
     "bench-streamer",
     "bench-tps",
-    "accounts-bench",
     "banking-bench",
     "chacha",
     "chacha-cuda",
@@ -11,8 +10,6 @@ members = [
     "cli-config",
     "client",
     "core",
-    "dos",
-    "download-utils",
     "faucet",
     "perf",
     "validator",
@@ -27,7 +24,6 @@ members = [
     "logger",
     "log-analyzer",
     "merkle-tree",
-    "streamer",
     "measure",
     "metrics",
     "net-shaper",
@@ -52,7 +48,6 @@ members = [
     "sdk",
     "sdk-c",
     "scripts",
-    "stake-accounts",
     "stake-monitor",
     "sys-tuner",
     "transaction-status",

README.md

@@ -9,7 +9,46 @@ Blockchain Rebuilt for Scale
 Solana™ is a new blockchain architecture built from the ground up for scale. The architecture supports
 up to 710 thousand transactions per second on a gigabit network.
 
-Read all about it at [Solana: Blockchain Rebuilt for Scale](https://docs.solana.com/v/master).
+Documentation
+===
+
+Before you jump into the code, review the documentation [Solana: Blockchain Rebuilt for Scale](https://docs.solana.com).
+
+(The _latest_ development version of the docs is [available here](https://docs.solana.com/v/master).)
+
+Release Binaries
+===
+Official release binaries are available at [Github Releases](https://github.com/solana-labs/solana/releases).
+
+Additionally we provide pre-release binaries for the latest code on the edge and
+beta channels.  Note that these pre-release binaries may be less stable than an
+official release.
+
+### Edge channel
+#### Linux (x86_64-unknown-linux-gnu)
+* [solana.tar.bz2](http://release.solana.com/edge/solana-release-x86_64-unknown-linux-gnu.tar.bz2)
+* [solana-install-init](http://release.solana.com/edge/solana-install-init-x86_64-unknown-linux-gnu) as a stand-alone executable
+#### mac OS (x86_64-apple-darwin)
+* [solana.tar.bz2](http://release.solana.com/edge/solana-release-x86_64-apple-darwin.tar.bz2)
+* [solana-install-init](http://release.solana.com/edge/solana-install-init-x86_64-apple-darwin) as a stand-alone executable
+#### Windows (x86_64-pc-windows-msvc)
+* [solana.tar.bz2](http://release.solana.com/edge/solana-release-x86_64-pc-windows-msvc.tar.bz2)
+* [solana-install-init.exe](http://release.solana.com/edge/solana-install-init-x86_64-pc-windows-msvc.exe) as a stand-alone executable
+#### All platforms
+* [solana-metrics.tar.bz2](http://release.solana.com.s3.amazonaws.com/edge/solana-metrics.tar.bz2)
+
+### Beta channel
+#### Linux (x86_64-unknown-linux-gnu)
+* [solana.tar.bz2](http://release.solana.com/beta/solana-release-x86_64-unknown-linux-gnu.tar.bz2)
+* [solana-install-init](http://release.solana.com/beta/solana-install-init-x86_64-unknown-linux-gnu) as a stand-alone executable
+#### mac OS (x86_64-apple-darwin)
+* [solana.tar.bz2](http://release.solana.com/beta/solana-release-x86_64-apple-darwin.tar.bz2)
+* [solana-install-init](http://release.solana.com/beta/solana-install-init-x86_64-apple-darwin) as a stand-alone executable
+#### Windows (x86_64-pc-windows-msvc)
+* [solana.tar.bz2](http://release.solana.com/beta/solana-release-x86_64-pc-windows-msvc.tar.bz2)
+* [solana-install-init.exe](http://release.solana.com/beta/solana-install-init-x86_64-pc-windows-msvc.exe) as a stand-alone executable
+#### All platforms
+* [solana-metrics.tar.bz2](http://release.solana.com.s3.amazonaws.com/beta/solana-metrics.tar.bz2)
 
 Developing
 ===

accounts-bench/Cargo.toml

@@ -1,22 +0,0 @@
-[package]
-authors = ["Solana Maintainers <maintainers@solana.com>"]
-edition = "2018"
-name = "solana-accounts-bench"
-version = "1.1.8"
-repository = "https://github.com/solana-labs/solana"
-license = "Apache-2.0"
-homepage = "https://solana.com/"
-
-[dependencies]
-log = "0.4.6"
-rayon = "1.3.0"
-solana-logger = { path = "../logger", version = "1.1.8" }
-solana-runtime = { path = "../runtime", version = "1.1.8" }
-solana-measure = { path = "../measure", version = "1.1.8" }
-solana-sdk = { path = "../sdk", version = "1.1.8" }
-rand = "0.7.0"
-clap = "2.33.0"
-crossbeam-channel = "0.4"
-
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]

accounts-bench/src/main.rs

@@ -1,103 +0,0 @@
-use clap::{value_t, App, Arg};
-use rayon::prelude::*;
-use solana_measure::measure::Measure;
-use solana_runtime::accounts::{create_test_accounts, update_accounts, Accounts};
-use solana_sdk::pubkey::Pubkey;
-use std::collections::HashMap;
-use std::fs;
-use std::path::PathBuf;
-
-fn main() {
-    solana_logger::setup();
-
-    let matches = App::new("crate")
-        .about("about")
-        .version("version")
-        .arg(
-            Arg::with_name("num_slots")
-                .long("num_slots")
-                .takes_value(true)
-                .value_name("SLOTS")
-                .help("Number of slots to store to."),
-        )
-        .arg(
-            Arg::with_name("num_accounts")
-                .long("num_accounts")
-                .takes_value(true)
-                .value_name("NUM_ACCOUNTS")
-                .help("Total number of accounts"),
-        )
-        .arg(
-            Arg::with_name("iterations")
-                .long("iterations")
-                .takes_value(true)
-                .value_name("ITERATIONS")
-                .help("Number of bench iterations"),
-        )
-        .arg(
-            Arg::with_name("clean")
-                .long("clean")
-                .takes_value(false)
-                .help("Run clean"),
-        )
-        .get_matches();
-
-    let num_slots = value_t!(matches, "num_slots", usize).unwrap_or(4);
-    let num_accounts = value_t!(matches, "num_accounts", usize).unwrap_or(10_000);
-    let iterations = value_t!(matches, "iterations", usize).unwrap_or(20);
-    let clean = matches.is_present("clean");
-    println!("clean: {:?}", clean);
-
-    let path = PathBuf::from("farf/accounts-bench");
-    if fs::remove_dir_all(path.clone()).is_err() {
-        println!("Warning: Couldn't remove {:?}", path);
-    }
-    let accounts = Accounts::new(vec![path]);
-    println!("Creating {} accounts", num_accounts);
-    let mut create_time = Measure::start("create accounts");
-    let pubkeys: Vec<_> = (0..num_slots)
-        .into_par_iter()
-        .map(|slot| {
-            let mut pubkeys: Vec<Pubkey> = vec![];
-            create_test_accounts(
-                &accounts,
-                &mut pubkeys,
-                num_accounts / num_slots,
-                slot as u64,
-            );
-            pubkeys
-        })
-        .collect();
-    let pubkeys: Vec<_> = pubkeys.into_iter().flatten().collect();
-    create_time.stop();
-    println!(
-        "created {} accounts in {} slots {}",
-        (num_accounts / num_slots) * num_slots,
-        num_slots,
-        create_time
-    );
-    let mut ancestors: HashMap<u64, usize> = vec![(0, 0)].into_iter().collect();
-    for i in 1..num_slots {
-        ancestors.insert(i as u64, i - 1);
-        accounts.add_root(i as u64);
-    }
-    for x in 0..iterations {
-        if clean {
-            let mut time = Measure::start("clean");
-            accounts.accounts_db.clean_accounts();
-            time.stop();
-            println!("{}", time);
-            for slot in 0..num_slots {
-                update_accounts(&accounts, &pubkeys, ((x + 1) * num_slots + slot) as u64);
-                accounts.add_root((x * num_slots + slot) as u64);
-            }
-        } else {
-            let mut pubkeys: Vec<Pubkey> = vec![];
-            let mut time = Measure::start("hash");
-            let hash = accounts.accounts_db.update_accounts_hash(0, &ancestors);
-            time.stop();
-            println!("hash: {} {}", hash, time);
-            create_test_accounts(&accounts, &mut pubkeys, 1, 0);
-        }
-    }
-}

archiver-lib/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "solana-archiver-lib"
-version = "1.1.8"
+version = "1.0.17"
 description = "Solana Archiver Library"
 authors = ["Solana Maintainers <maintainers@solana.com>"]
 repository = "https://github.com/solana-labs/solana"
@@ -10,34 +10,30 @@ edition = "2018"
 
 [dependencies]
 bincode = "1.2.1"
-crossbeam-channel = "0.4"
-ed25519-dalek = "=1.0.0-pre.3"
+crossbeam-channel = "0.3"
+ed25519-dalek = "=1.0.0-pre.1"
 log = "0.4.8"
-rand = "0.7.0"
-rand_chacha = "0.2.2"
-solana-client = { path = "../client", version = "1.1.8" }
-solana-storage-program = { path = "../programs/storage", version = "1.1.8" }
+rand = "0.6.5"
+rand_chacha = "0.1.1"
+solana-client = { path = "../client", version = "1.0.17" }
+solana-storage-program = { path = "../programs/storage", version = "1.0.17" }
 thiserror = "1.0"
-serde = "1.0.105"
-serde_json = "1.0.48"
+serde = "1.0.104"
+serde_json = "1.0.46"
 serde_derive = "1.0.103"
-solana-net-utils = { path = "../net-utils", version = "1.1.8" }
-solana-chacha = { path = "../chacha", version = "1.1.8" }
-solana-chacha-sys = { path = "../chacha-sys", version = "1.1.8" }
-solana-ledger = { path = "../ledger", version = "1.1.8" }
-solana-logger = { path = "../logger", version = "1.1.8" }
-solana-perf = { path = "../perf", version = "1.1.8" }
-solana-sdk = { path = "../sdk", version = "1.1.8" }
-solana-core = { path = "../core", version = "1.1.8" }
-solana-streamer = { path = "../streamer", version = "1.1.8" }
-solana-archiver-utils = { path = "../archiver-utils", version = "1.1.8" }
-solana-metrics = { path = "../metrics", version = "1.1.8" }
+solana-net-utils = { path = "../net-utils", version = "1.0.17" }
+solana-chacha = { path = "../chacha", version = "1.0.17" }
+solana-chacha-sys = { path = "../chacha-sys", version = "1.0.17" }
+solana-ledger = { path = "../ledger", version = "1.0.17" }
+solana-logger = { path = "../logger", version = "1.0.17" }
+solana-perf = { path = "../perf", version = "1.0.17" }
+solana-sdk = { path = "../sdk", version = "1.0.17" }
+solana-core = { path = "../core", version = "1.0.17" }
+solana-archiver-utils = { path = "../archiver-utils", version = "1.0.17" }
+solana-metrics = { path = "../metrics", version = "1.0.17" }
 
 [dev-dependencies]
-hex = "0.4.2"
+hex = "0.4.0"
 
 [lib]
 name = "solana_archiver_lib"
-
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]

archiver-lib/src/archiver.rs

@@ -1,7 +1,7 @@
 use crate::result::ArchiverError;
 use crossbeam_channel::unbounded;
-use rand::{thread_rng, Rng};
-use rand_chacha::{rand_core::SeedableRng, ChaChaRng};
+use rand::{thread_rng, Rng, SeedableRng};
+use rand_chacha::ChaChaRng;
 use solana_archiver_utils::sample_file;
 use solana_chacha::chacha::{chacha_cbc_encrypt_ledger, CHACHA_BLOCK_SIZE};
 use solana_client::{
@@ -10,15 +10,16 @@ use solana_client::{
 };
 use solana_core::{
     cluster_info::{ClusterInfo, Node, VALIDATOR_PORT_RANGE},
-    cluster_slots::ClusterSlots,
     contact_info::ContactInfo,
     gossip_service::GossipService,
+    packet::{limited_deserialize, PACKET_DATA_SIZE},
     repair_service,
-    repair_service::{RepairService, RepairSlotRange, RepairStats, RepairStrategy},
+    repair_service::{RepairService, RepairSlotRange, RepairStrategy},
     serve_repair::ServeRepair,
     shred_fetch_stage::ShredFetchStage,
     sigverify_stage::{DisabledSigVerifier, SigVerifyStage},
     storage_stage::NUM_STORAGE_SAMPLES,
+    streamer::{receiver, responder, PacketReceiver},
     window_service::WindowService,
 };
 use solana_ledger::{
@@ -26,7 +27,6 @@ use solana_ledger::{
 };
 use solana_net_utils::bind_in_range;
 use solana_perf::packet::Packets;
-use solana_perf::packet::{limited_deserialize, PACKET_DATA_SIZE};
 use solana_perf::recycler::Recycler;
 use solana_sdk::packet::Packet;
 use solana_sdk::{
@@ -45,7 +45,6 @@ use solana_storage_program::{
     storage_contract::StorageContract,
     storage_instruction::{self, StorageAccountType},
 };
-use solana_streamer::streamer::{receiver, responder, PacketReceiver};
 use std::{
     io::{self, ErrorKind},
     net::{IpAddr, Ipv4Addr, SocketAddr, UdpSocket},
@@ -53,7 +52,7 @@ use std::{
     result,
     sync::atomic::{AtomicBool, Ordering},
     sync::mpsc::{channel, Receiver, Sender},
-    sync::Arc,
+    sync::{Arc, RwLock},
     thread::{sleep, spawn, JoinHandle},
     time::Duration,
 };
@@ -185,10 +184,10 @@ impl Archiver {
 
         info!("Archiver: id: {}", keypair.pubkey());
         info!("Creating cluster info....");
-        let cluster_info = ClusterInfo::new(node.info.clone(), keypair.clone());
+        let mut cluster_info = ClusterInfo::new(node.info.clone(), keypair.clone());
         cluster_info.set_entrypoint(cluster_entrypoint.clone());
-        let cluster_info = Arc::new(cluster_info);
-        let cluster_slots = Arc::new(ClusterSlots::default());
+        let cluster_info = Arc::new(RwLock::new(cluster_info));
+
         // Note for now, this ledger will not contain any of the existing entries
         // in the ledger located at ledger_path, and will only append on newly received
         // entries after being passed to window_service
@@ -200,7 +199,7 @@ impl Archiver {
 
         info!("Connecting to the cluster via {:?}", cluster_entrypoint);
         let (nodes, _) =
-            match solana_core::gossip_service::discover_cluster(&cluster_entrypoint.gossip, 2) {
+            match solana_core::gossip_service::discover_cluster(&cluster_entrypoint.gossip, 1) {
                 Ok(nodes_and_archivers) => nodes_and_archivers,
                 Err(e) => {
                     //shutdown services before exiting
@@ -263,7 +262,6 @@ impl Archiver {
                     repair_socket,
                     shred_fetch_receiver,
                     slot_sender,
-                    cluster_slots,
                 ) {
                     Ok(window_service) => window_service,
                     Err(e) => {
@@ -308,7 +306,7 @@ impl Archiver {
     fn run(
         meta: &mut ArchiverMeta,
         blockstore: &Arc<Blockstore>,
-        cluster_info: Arc<ClusterInfo>,
+        cluster_info: Arc<RwLock<ClusterInfo>>,
         archiver_keypair: &Arc<Keypair>,
         storage_keypair: &Arc<Keypair>,
         exit: &Arc<AtomicBool>,
@@ -365,12 +363,12 @@ impl Archiver {
     }
 
     fn redeem_rewards(
-        cluster_info: &ClusterInfo,
+        cluster_info: &Arc<RwLock<ClusterInfo>>,
         archiver_keypair: &Arc<Keypair>,
         storage_keypair: &Arc<Keypair>,
         client_commitment: CommitmentConfig,
     ) {
-        let nodes = cluster_info.tvu_peers();
+        let nodes = cluster_info.read().unwrap().tvu_peers();
         let client = solana_core::gossip_service::get_client(&nodes);
 
         if let Ok(Some(account)) =
@@ -402,10 +400,9 @@ impl Archiver {
     }
 
     // Find a segment to replicate and download it.
-    #[allow(clippy::too_many_arguments)]
     fn setup(
         meta: &mut ArchiverMeta,
-        cluster_info: Arc<ClusterInfo>,
+        cluster_info: Arc<RwLock<ClusterInfo>>,
         blockstore: &Arc<Blockstore>,
         exit: &Arc<AtomicBool>,
         node_info: &ContactInfo,
@@ -413,7 +410,6 @@ impl Archiver {
         repair_socket: Arc<UdpSocket>,
         shred_fetch_receiver: PacketReceiver,
         slot_sender: Sender<u64>,
-        cluster_slots: Arc<ClusterSlots>,
     ) -> Result<WindowService> {
         let slots_per_segment =
             match Self::get_segment_config(&cluster_info, meta.client_commitment) {
@@ -471,7 +467,6 @@ impl Archiver {
             RepairStrategy::RepairRange(repair_slot_range),
             &Arc::new(LeaderScheduleCache::default()),
             |_, _, _, _| true,
-            cluster_slots,
         );
         info!("waiting for ledger download");
         Self::wait_for_segment_download(
@@ -491,7 +486,7 @@ impl Archiver {
         blockstore: &Arc<Blockstore>,
         exit: &Arc<AtomicBool>,
         node_info: &ContactInfo,
-        cluster_info: Arc<ClusterInfo>,
+        cluster_info: Arc<RwLock<ClusterInfo>>,
     ) {
         info!(
             "window created, waiting for ledger download starting at slot {:?}",
@@ -519,8 +514,11 @@ impl Archiver {
         contact_info.tvu = "0.0.0.0:0".parse().unwrap();
         contact_info.wallclock = timestamp();
         // copy over the adopted shred_version from the entrypoint
-        contact_info.shred_version = cluster_info.my_shred_version();
-        cluster_info.update_contact_info(|current| *current = contact_info);
+        contact_info.shred_version = cluster_info.read().unwrap().my_data().shred_version;
+        {
+            let mut cluster_info_w = cluster_info.write().unwrap();
+            cluster_info_w.insert_self(contact_info);
+        }
     }
 
     fn encrypt_ledger(meta: &mut ArchiverMeta, blockstore: &Arc<Blockstore>) -> Result<()> {
@@ -623,12 +621,12 @@ impl Archiver {
 
     fn submit_mining_proof(
         meta: &ArchiverMeta,
-        cluster_info: &ClusterInfo,
+        cluster_info: &Arc<RwLock<ClusterInfo>>,
         archiver_keypair: &Arc<Keypair>,
         storage_keypair: &Arc<Keypair>,
     ) {
         // No point if we've got no storage account...
-        let nodes = cluster_info.tvu_peers();
+        let nodes = cluster_info.read().unwrap().tvu_peers();
         let client = solana_core::gossip_service::get_client(&nodes);
         let storage_balance = client
             .poll_get_balance_with_commitment(&storage_keypair.pubkey(), meta.client_commitment);
@@ -686,10 +684,13 @@ impl Archiver {
     }
 
     fn get_segment_config(
-        cluster_info: &ClusterInfo,
+        cluster_info: &Arc<RwLock<ClusterInfo>>,
         client_commitment: CommitmentConfig,
     ) -> Result<u64> {
-        let rpc_peers = cluster_info.all_rpc_peers();
+        let rpc_peers = {
+            let cluster_info = cluster_info.read().unwrap();
+            cluster_info.all_rpc_peers()
+        };
         debug!("rpc peers: {:?}", rpc_peers);
         if !rpc_peers.is_empty() {
             let rpc_client = {
@@ -715,7 +716,7 @@ impl Archiver {
 
     /// Waits until the first segment is ready, and returns the current segment
     fn poll_for_segment(
-        cluster_info: &ClusterInfo,
+        cluster_info: &Arc<RwLock<ClusterInfo>>,
         slots_per_segment: u64,
         previous_blockhash: &Hash,
         exit: &Arc<AtomicBool>,
@@ -735,14 +736,17 @@ impl Archiver {
 
     /// Poll for a different blockhash and associated max_slot than `previous_blockhash`
     fn poll_for_blockhash_and_slot(
-        cluster_info: &ClusterInfo,
+        cluster_info: &Arc<RwLock<ClusterInfo>>,
         slots_per_segment: u64,
         previous_blockhash: &Hash,
         exit: &Arc<AtomicBool>,
     ) -> Result<(Hash, u64)> {
         info!("waiting for the next turn...");
         loop {
-            let rpc_peers = cluster_info.all_rpc_peers();
+            let rpc_peers = {
+                let cluster_info = cluster_info.read().unwrap();
+                cluster_info.all_rpc_peers()
+            };
             debug!("rpc peers: {:?}", rpc_peers);
             if !rpc_peers.is_empty() {
                 let rpc_client = {
@@ -835,14 +839,13 @@ impl Archiver {
                 repair_service::MAX_REPAIR_LENGTH,
                 &repair_slot_range,
             );
-            let mut repair_stats = RepairStats::default();
             //iter over the repairs and send them
             if let Ok(repairs) = repairs {
                 let reqs: Vec<_> = repairs
                     .into_iter()
                     .filter_map(|repair_request| {
                         serve_repair
-                            .map_repair_request(&repair_request, &mut repair_stats)
+                            .map_repair_request(&repair_request)
                             .map(|result| ((archiver_info.gossip, result), repair_request))
                             .ok()
                     })

archiver-lib/src/result.rs

@@ -1,3 +1,4 @@
+use serde_json;
 use solana_client::client_error;
 use solana_ledger::blockstore;
 use solana_sdk::transport;

archiver-utils/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "solana-archiver-utils"
-version = "1.1.8"
+version = "1.0.17"
 description = "Solana Archiver Utils"
 authors = ["Solana Maintainers <maintainers@solana.com>"]
 repository = "https://github.com/solana-labs/solana"
@@ -10,19 +10,16 @@ edition = "2018"
 
 [dependencies]
 log = "0.4.8"
-rand = "0.7.0"
-solana-chacha = { path = "../chacha", version = "1.1.8" }
-solana-chacha-sys = { path = "../chacha-sys", version = "1.1.8" }
-solana-ledger = { path = "../ledger", version = "1.1.8" }
-solana-logger = { path = "../logger", version = "1.1.8" }
-solana-perf = { path = "../perf", version = "1.1.8" }
-solana-sdk = { path = "../sdk", version = "1.1.8" }
+rand = "0.6.5"
+solana-chacha = { path = "../chacha", version = "1.0.17" }
+solana-chacha-sys = { path = "../chacha-sys", version = "1.0.17" }
+solana-ledger = { path = "../ledger", version = "1.0.17" }
+solana-logger = { path = "../logger", version = "1.0.17" }
+solana-perf = { path = "../perf", version = "1.0.17" }
+solana-sdk = { path = "../sdk", version = "1.0.17" }
 
 [dev-dependencies]
-hex = "0.4.2"
+hex = "0.4.0"
 
 [lib]
 name = "solana_archiver_utils"
-
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]

archiver/Cargo.toml

@@ -2,22 +2,19 @@
 authors = ["Solana Maintainers <maintainers@solana.com>"]
 edition = "2018"
 name = "solana-archiver"
-version = "1.1.8"
+version = "1.0.17"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
 
 [dependencies]
 clap = "2.33.0"
-console = "0.10.0"
-solana-clap-utils = { path = "../clap-utils", version = "1.1.8" }
-solana-core = { path = "../core", version = "1.1.8" }
-solana-logger = { path = "../logger", version = "1.1.8" }
-solana-metrics = { path = "../metrics", version = "1.1.8" }
-solana-archiver-lib = { path = "../archiver-lib", version = "1.1.8" }
-solana-net-utils = { path = "../net-utils", version = "1.1.8" }
-solana-sdk = { path = "../sdk", version = "1.1.8" }
+console = "0.9.2"
+solana-clap-utils = { path = "../clap-utils", version = "1.0.17" }
+solana-core = { path = "../core", version = "1.0.17" }
+solana-logger = { path = "../logger", version = "1.0.17" }
+solana-metrics = { path = "../metrics", version = "1.0.17" }
+solana-archiver-lib = { path = "../archiver-lib", version = "1.0.17" }
+solana-net-utils = { path = "../net-utils", version = "1.0.17" }
+solana-sdk = { path = "../sdk", version = "1.0.17" }
 
-
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]

banking-bench/Cargo.toml

@@ -2,24 +2,19 @@
 authors = ["Solana Maintainers <maintainers@solana.com>"]
 edition = "2018"
 name = "solana-banking-bench"
-version = "1.1.8"
+version = "1.0.17"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
 
 [dependencies]
 log = "0.4.6"
-rayon = "1.3.0"
-solana-core = { path = "../core", version = "1.1.8" }
-solana-streamer = { path = "../streamer", version = "1.1.8" }
-solana-perf = { path = "../perf", version = "1.1.8" }
-solana-ledger = { path = "../ledger", version = "1.1.8" }
-solana-logger = { path = "../logger", version = "1.1.8" }
-solana-runtime = { path = "../runtime", version = "1.1.8" }
-solana-measure = { path = "../measure", version = "1.1.8" }
-solana-sdk = { path = "../sdk", version = "1.1.8" }
-rand = "0.7.0"
-crossbeam-channel = "0.4"
-
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]
+rayon = "1.2.0"
+solana-core = { path = "../core", version = "1.0.17" }
+solana-ledger = { path = "../ledger", version = "1.0.17" }
+solana-logger = { path = "../logger", version = "1.0.17" }
+solana-runtime = { path = "../runtime", version = "1.0.17" }
+solana-measure = { path = "../measure", version = "1.0.17" }
+solana-sdk = { path = "../sdk", version = "1.0.17" }
+rand = "0.6.5"
+crossbeam-channel = "0.3"

banking-bench/src/main.rs

@@ -2,36 +2,29 @@ use crossbeam_channel::unbounded;
 use log::*;
 use rand::{thread_rng, Rng};
 use rayon::prelude::*;
-use solana_core::{
-    banking_stage::{create_test_recorder, BankingStage},
-    cluster_info::ClusterInfo,
-    cluster_info::Node,
-    poh_recorder::PohRecorder,
-    poh_recorder::WorkingBankEntry,
-};
-use solana_ledger::{
-    bank_forks::BankForks,
-    blockstore::Blockstore,
-    genesis_utils::{create_genesis_config, GenesisConfigInfo},
-    get_tmp_ledger_path,
-};
+use solana_core::banking_stage::{create_test_recorder, BankingStage};
+use solana_core::cluster_info::ClusterInfo;
+use solana_core::cluster_info::Node;
+use solana_core::genesis_utils::{create_genesis_config, GenesisConfigInfo};
+use solana_core::packet::to_packets_chunked;
+use solana_core::poh_recorder::PohRecorder;
+use solana_core::poh_recorder::WorkingBankEntry;
+use solana_ledger::bank_forks::BankForks;
+use solana_ledger::{blockstore::Blockstore, get_tmp_ledger_path};
 use solana_measure::measure::Measure;
-use solana_perf::packet::to_packets_chunked;
 use solana_runtime::bank::Bank;
-use solana_sdk::{
-    hash::Hash,
-    pubkey::Pubkey,
-    signature::Keypair,
-    signature::Signature,
-    system_transaction,
-    timing::{duration_as_us, timestamp},
-    transaction::Transaction,
-};
-use std::{
-    sync::{atomic::Ordering, mpsc::Receiver, Arc, Mutex},
-    thread::sleep,
-    time::{Duration, Instant},
-};
+use solana_sdk::hash::Hash;
+use solana_sdk::pubkey::Pubkey;
+use solana_sdk::signature::Keypair;
+use solana_sdk::signature::Signature;
+use solana_sdk::system_transaction;
+use solana_sdk::timing::{duration_as_us, timestamp};
+use solana_sdk::transaction::Transaction;
+use std::sync::atomic::Ordering;
+use std::sync::mpsc::Receiver;
+use std::sync::{Arc, Mutex, RwLock};
+use std::thread::sleep;
+use std::time::{Duration, Instant};
 
 fn check_txs(
     receiver: &Arc<Receiver<WorkingBankEntry>>,
@@ -152,7 +145,7 @@ fn main() {
         let (exit, poh_recorder, poh_service, signal_receiver) =
             create_test_recorder(&bank, &blockstore, None);
         let cluster_info = ClusterInfo::new_with_invalid_keypair(Node::new_localhost().info);
-        let cluster_info = Arc::new(cluster_info);
+        let cluster_info = Arc::new(RwLock::new(cluster_info));
         let banking_stage = BankingStage::new(
             &cluster_info,
             &poh_recorder,
@@ -253,7 +246,7 @@ fn main() {
                 poh_recorder.lock().unwrap().set_bank(&bank);
                 assert!(poh_recorder.lock().unwrap().bank().is_some());
                 if bank.slot() > 32 {
-                    bank_forks.set_root(root, &None, None);
+                    bank_forks.set_root(root, &None);
                     root += 1;
                 }
                 debug!(

bench-exchange/Cargo.toml

@@ -2,7 +2,7 @@
 authors = ["Solana Maintainers <maintainers@solana.com>"]
 edition = "2018"
 name = "solana-bench-exchange"
-version = "1.1.8"
+version = "1.0.17"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
@@ -10,28 +10,25 @@ publish = false
 
 [dependencies]
 clap = "2.32.0"
-itertools = "0.9.0"
+itertools = "0.8.2"
 log = "0.4.8"
 num-derive = "0.3"
 num-traits = "0.2"
-rand = "0.7.0"
-rayon = "1.3.0"
-serde_json = "1.0.48"
+rand = "0.6.5"
+rayon = "1.2.0"
+serde_json = "1.0.46"
 serde_yaml = "0.8.11"
-solana-clap-utils = { path = "../clap-utils", version = "1.1.8" }
-solana-core = { path = "../core", version = "1.1.8" }
-solana-genesis = { path = "../genesis", version = "1.1.8" }
-solana-client = { path = "../client", version = "1.1.8" }
-solana-faucet = { path = "../faucet", version = "1.1.8" }
-solana-exchange-program = { path = "../programs/exchange", version = "1.1.8" }
-solana-logger = { path = "../logger", version = "1.1.8" }
-solana-metrics = { path = "../metrics", version = "1.1.8" }
-solana-net-utils = { path = "../net-utils", version = "1.1.8" }
-solana-runtime = { path = "../runtime", version = "1.1.8" }
-solana-sdk = { path = "../sdk", version = "1.1.8" }
+solana-clap-utils = { path = "../clap-utils", version = "1.0.17" }
+solana-core = { path = "../core", version = "1.0.17" }
+solana-genesis = { path = "../genesis", version = "1.0.17" }
+solana-client = { path = "../client", version = "1.0.17" }
+solana-faucet = { path = "../faucet", version = "1.0.17" }
+solana-exchange-program = { path = "../programs/exchange", version = "1.0.17" }
+solana-logger = { path = "../logger", version = "1.0.17" }
+solana-metrics = { path = "../metrics", version = "1.0.17" }
+solana-net-utils = { path = "../net-utils", version = "1.0.17" }
+solana-runtime = { path = "../runtime", version = "1.0.17" }
+solana-sdk = { path = "../sdk", version = "1.0.17" }
 
 [dev-dependencies]
-solana-local-cluster = { path = "../local-cluster", version = "1.1.8" }
-
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]
+solana-local-cluster = { path = "../local-cluster", version = "1.0.17" }

bench-exchange/tests/bench_exchange.rs

@@ -86,7 +86,7 @@ fn test_exchange_bank_client() {
     solana_logger::setup();
     let (genesis_config, identity) = create_genesis_config(100_000_000_000_000);
     let mut bank = Bank::new(&genesis_config);
-    bank.add_static_program("exchange_program", id(), process_instruction);
+    bank.add_instruction_processor(id(), process_instruction);
     let clients = vec![BankClient::new(bank)];
 
     let mut config = Config::default();

bench-streamer/Cargo.toml

@@ -2,17 +2,14 @@
 authors = ["Solana Maintainers <maintainers@solana.com>"]
 edition = "2018"
 name = "solana-bench-streamer"
-version = "1.1.8"
+version = "1.0.17"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
 
 [dependencies]
 clap = "2.33.0"
-solana-clap-utils = { path = "../clap-utils", version = "1.1.8" }
-solana-streamer = { path = "../streamer", version = "1.1.8" }
-solana-logger = { path = "../logger", version = "1.1.8" }
-solana-net-utils = { path = "../net-utils", version = "1.1.8" }
-
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]
+solana-clap-utils = { path = "../clap-utils", version = "1.0.17" }
+solana-core = { path = "../core", version = "1.0.17" }
+solana-logger = { path = "../logger", version = "1.0.17" }
+solana-net-utils = { path = "../net-utils", version = "1.0.17" }

bench-streamer/src/main.rs

@@ -1,6 +1,6 @@
 use clap::{crate_description, crate_name, App, Arg};
-use solana_streamer::packet::{Packet, Packets, PacketsRecycler, PACKET_DATA_SIZE};
-use solana_streamer::streamer::{receiver, PacketReceiver};
+use solana_core::packet::{Packet, Packets, PacketsRecycler, PACKET_DATA_SIZE};
+use solana_core::streamer::{receiver, PacketReceiver};
 use std::cmp::max;
 use std::net::{IpAddr, Ipv4Addr, SocketAddr, UdpSocket};
 use std::sync::atomic::{AtomicBool, AtomicUsize, Ordering};

bench-tps/Cargo.toml

@@ -2,7 +2,7 @@
 authors = ["Solana Maintainers <maintainers@solana.com>"]
 edition = "2018"
 name = "solana-bench-tps"
-version = "1.1.8"
+version = "1.0.17"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
@@ -11,30 +11,27 @@ homepage = "https://solana.com/"
 bincode = "1.2.1"
 clap = "2.33.0"
 log = "0.4.8"
-rayon = "1.3.0"
-serde_json = "1.0.48"
+rayon = "1.2.0"
+serde_json = "1.0.46"
 serde_yaml = "0.8.11"
-solana-clap-utils = { path = "../clap-utils", version = "1.1.8" }
-solana-core = { path = "../core", version = "1.1.8" }
-solana-genesis = { path = "../genesis", version = "1.1.8" }
-solana-client = { path = "../client", version = "1.1.8" }
-solana-faucet = { path = "../faucet", version = "1.1.8" }
-#solana-librapay = { path = "../programs/librapay", version = "1.1.8", optional = true }
-solana-logger = { path = "../logger", version = "1.1.8" }
-solana-metrics = { path = "../metrics", version = "1.1.8" }
-solana-measure = { path = "../measure", version = "1.1.8" }
-solana-net-utils = { path = "../net-utils", version = "1.1.8" }
-solana-runtime = { path = "../runtime", version = "1.1.8" }
-solana-sdk = { path = "../sdk", version = "1.1.8" }
-#solana-move-loader-program = { path = "../programs/move_loader", version = "1.1.8", optional = true }
+solana-clap-utils = { path = "../clap-utils", version = "1.0.17" }
+solana-core = { path = "../core", version = "1.0.17" }
+solana-genesis = { path = "../genesis", version = "1.0.17" }
+solana-client = { path = "../client", version = "1.0.17" }
+solana-faucet = { path = "../faucet", version = "1.0.17" }
+solana-librapay = { path = "../programs/librapay", version = "1.0.17", optional = true }
+solana-logger = { path = "../logger", version = "1.0.17" }
+solana-metrics = { path = "../metrics", version = "1.0.17" }
+solana-measure = { path = "../measure", version = "1.0.17" }
+solana-net-utils = { path = "../net-utils", version = "1.0.17" }
+solana-runtime = { path = "../runtime", version = "1.0.17" }
+solana-sdk = { path = "../sdk", version = "1.0.17" }
+solana-move-loader-program = { path = "../programs/move_loader", version = "1.0.17", optional = true }
 
 [dev-dependencies]
-serial_test = "0.4.0"
+serial_test = "0.3.2"
 serial_test_derive = "0.4.0"
-solana-local-cluster = { path = "../local-cluster", version = "1.1.8" }
+solana-local-cluster = { path = "../local-cluster", version = "1.0.17" }
 
-#[features]
-#move = ["solana-librapay", "solana-move-loader-program"]
-
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]
+[features]
+move = ["solana-librapay", "solana-move-loader-program"]

chacha-cuda/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "solana-chacha-cuda"
-version = "1.1.8"
+version = "1.0.17"
 description = "Solana Chacha Cuda APIs"
 authors = ["Solana Maintainers <maintainers@solana.com>"]
 repository = "https://github.com/solana-labs/solana"
@@ -10,18 +10,15 @@ edition = "2018"
 
 [dependencies]
 log = "0.4.8"
-solana-archiver-utils = { path = "../archiver-utils", version = "1.1.8" }
-solana-chacha = { path = "../chacha", version = "1.1.8" }
-solana-ledger = { path = "../ledger", version = "1.1.8" }
-solana-logger = { path = "../logger", version = "1.1.8" }
-solana-perf = { path = "../perf", version = "1.1.8" }
-solana-sdk = { path = "../sdk", version = "1.1.8" }
+solana-archiver-utils = { path = "../archiver-utils", version = "1.0.17" }
+solana-chacha = { path = "../chacha", version = "1.0.17" }
+solana-ledger = { path = "../ledger", version = "1.0.17" }
+solana-logger = { path = "../logger", version = "1.0.17" }
+solana-perf = { path = "../perf", version = "1.0.17" }
+solana-sdk = { path = "../sdk", version = "1.0.17" }
 
 [dev-dependencies]
 hex-literal = "0.2.1"
 
 [lib]
 name = "solana_chacha_cuda"
-
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]

chacha-sys/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "solana-chacha-sys"
-version = "1.1.8"
+version = "1.0.17"
 description = "Solana chacha-sys"
 authors = ["Solana Maintainers <maintainers@solana.com>"]
 repository = "https://github.com/solana-labs/solana"
@@ -10,6 +10,3 @@ edition = "2018"
 
 [build-dependencies]
 cc = "1.0.49"
-
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]

chacha/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "solana-chacha"
-version = "1.1.8"
+version = "1.0.17"
 description = "Solana Chacha APIs"
 authors = ["Solana Maintainers <maintainers@solana.com>"]
 repository = "https://github.com/solana-labs/solana"
@@ -10,19 +10,16 @@ edition = "2018"
 
 [dependencies]
 log = "0.4.8"
-rand = "0.7.0"
-rand_chacha = "0.2.2"
-solana-chacha-sys = { path = "../chacha-sys", version = "1.1.8" }
-solana-ledger = { path = "../ledger", version = "1.1.8" }
-solana-logger = { path = "../logger", version = "1.1.8" }
-solana-perf = { path = "../perf", version = "1.1.8" }
-solana-sdk = { path = "../sdk", version = "1.1.8" }
+rand = "0.6.5"
+rand_chacha = "0.1.1"
+solana-chacha-sys = { path = "../chacha-sys", version = "1.0.17" }
+solana-ledger = { path = "../ledger", version = "1.0.17" }
+solana-logger = { path = "../logger", version = "1.0.17" }
+solana-perf = { path = "../perf", version = "1.0.17" }
+solana-sdk = { path = "../sdk", version = "1.0.17" }
 
 [dev-dependencies]
 hex-literal = "0.2.1"
 
 [lib]
 name = "solana_chacha"
-
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]

ci/buildkite-secondary.yml

@@ -2,16 +2,6 @@
 # Build steps that run after the primary pipeline on pushes and tags.
 # Pull requests to not run these steps.
 steps:
-  - command: "ci/publish-tarball.sh"
-    timeout_in_minutes: 60
-    name: "publish tarball"
-  - command: "ci/publish-docs.sh"
-    timeout_in_minutes: 15
-    name: "publish docs"
-  - command: "ci/publish-bpf-sdk.sh"
-    timeout_in_minutes: 5
-    name: "publish bpf sdk"
-  - wait
   - command: "sdk/docker-solana/build.sh"
     timeout_in_minutes: 60
     name: "publish docker"
@@ -19,6 +9,15 @@ steps:
     timeout_in_minutes: 240
     name: "publish crate"
     branches: "!master"
-    #  - command: ". ci/rust-version.sh; ci/docker-run.sh $$rust_stable_docker_image ci/test-move.sh"
-    #    name: "move"
-    #    timeout_in_minutes: 20
+  - command: "ci/publish-bpf-sdk.sh"
+    timeout_in_minutes: 5
+    name: "publish bpf sdk"
+  - command: "ci/publish-tarball.sh"
+    timeout_in_minutes: 60
+    name: "publish tarball"
+  - command: "ci/publish-docs.sh"
+    timeout_in_minutes: 15
+    name: "publish docs"
+  - command: ". ci/rust-version.sh; ci/docker-run.sh $$rust_stable_docker_image ci/test-move.sh"
+    name: "move"
+    timeout_in_minutes: 20

ci/buildkite-tests.yml

@@ -2,6 +2,10 @@
 # other than those in docs/ are modified
 
 steps:
+  - command: "ci/shellcheck.sh"
+    name: "shellcheck"
+    timeout_in_minutes: 5
+  - wait
   - command: ". ci/rust-version.sh; ci/docker-run.sh $$rust_nightly_docker_image ci/test-coverage.sh"
     name: "coverage"
     timeout_in_minutes: 30

ci/buildkite.yml

@@ -8,9 +8,6 @@ steps:
   - command: ". ci/rust-version.sh; ci/docker-run.sh $$rust_nightly_docker_image ci/test-checks.sh"
     name: "checks"
     timeout_in_minutes: 20
-  - command: "ci/shellcheck.sh"
-    name: "shellcheck"
-    timeout_in_minutes: 5
 
   - wait
 

ci/docker-run.sh

@@ -49,7 +49,7 @@ else
   # ~/.cargo
   ARGS+=(--volume "$PWD:/home")
 fi
-ARGS+=(--env "HOME=/home" --env "CARGO_HOME=/home/.cargo")
+ARGS+=(--env "CARGO_HOME=/home/.cargo")
 
 # kcov tries to set the personality of the binary which docker
 # doesn't allow by default.

ci/docker-rust-nightly/Dockerfile

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

ci/docker-rust/Dockerfile

@@ -1,6 +1,6 @@
 # Note: when the rust version is changed also modify
 # ci/rust-version.sh to pick up the new image tag
-FROM rust:1.43.0
+FROM rust:1.42.0
 
 # Add Google Protocol Buffers for Libra's metrics library.
 ENV PROTOC_VERSION 3.8.0
@@ -32,7 +32,6 @@ RUN set -x \
  && cargo install cargo-audit \
  && cargo install svgbob_cli \
  && cargo install mdbook \
- && cargo install mdbook-linkcheck \
  && rustc --version \
  && cargo --version \
  && curl -OL https://github.com/google/protobuf/releases/download/v$PROTOC_VERSION/$PROTOC_ZIP \

ci/publish-tarball.sh

@@ -71,7 +71,7 @@ echo --- Creating release tarball
   export CHANNEL
 
   source ci/rust-version.sh stable
-  scripts/cargo-install-all.sh +"$rust_stable" solana-release
+  scripts/cargo-install-all.sh +"$rust_stable" --use-move solana-release
 
   tar cvf solana-release-$TARGET.tar solana-release
   bzip2 solana-release-$TARGET.tar
@@ -95,8 +95,9 @@ fi
 source ci/upload-ci-artifact.sh
 
 for file in solana-release-$TARGET.tar.bz2 solana-release-$TARGET.yml solana-install-init-"$TARGET"* $MAYBE_TARBALLS; do
+  upload-ci-artifact "$file"
+
   if [[ -n $DO_NOT_PUBLISH_TAR ]]; then
-    upload-ci-artifact "$file"
     echo "Skipped $file due to DO_NOT_PUBLISH_TAR"
     continue
   fi

ci/rust-version.sh

@@ -1,30 +1,28 @@
 #
 # This file maintains the rust versions for use by CI.
 #
+# Build with stable rust, updating the stable toolchain if necessary:
+#   $ source ci/rust-version.sh stable
+#   $ cargo +"$rust_stable" build
+#
+# Build with nightly rust, updating the nightly toolchain if necessary:
+#   $ source ci/rust-version.sh nightly
+#   $ cargo +"$rust_nightly" build
+#
 # Obtain the environment variables without any automatic toolchain updating:
 #   $ source ci/rust-version.sh
 #
-# Obtain the environment variables updating both stable and nightly, only stable, or
-# only nightly:
-#   $ source ci/rust-version.sh all
-#   $ source ci/rust-version.sh stable
-#   $ source ci/rust-version.sh nightly
-
-# Then to build with either stable or nightly:
-#   $ cargo +"$rust_stable" build
-#   $ cargo +"$rust_nightly" build
-#
 
 if [[ -n $RUST_STABLE_VERSION ]]; then
   stable_version="$RUST_STABLE_VERSION"
 else
-  stable_version=1.43.0
+  stable_version=1.42.0
 fi
 
 if [[ -n $RUST_NIGHTLY_VERSION ]]; then
   nightly_version="$RUST_NIGHTLY_VERSION"
 else
-  nightly_version=2020-04-23
+  nightly_version=2020-03-12
 fi
 
 
@@ -53,10 +51,6 @@ export rust_nightly_docker_image=solanalabs/rust-nightly:"$nightly_version"
   nightly)
      rustup_install "$rust_nightly"
     ;;
-  all)
-     rustup_install "$rust_stable"
-     rustup_install "$rust_nightly"
-    ;;
   *)
     echo "Note: ignoring unknown argument: $1"
     ;;

ci/test-bench.sh

@@ -25,7 +25,7 @@ source ci/_
 source ci/upload-ci-artifact.sh
 
 eval "$(ci/channel-info.sh)"
-source ci/rust-version.sh all
+source ci/rust-version.sh nightly
 
 set -o pipefail
 export RUST_BACKTRACE=1
@@ -67,9 +67,8 @@ _ cargo +$rust_nightly bench --manifest-path core/Cargo.toml ${V:+--verbose} \
 _ cargo +$rust_nightly bench --manifest-path programs/bpf/Cargo.toml ${V:+--verbose} --features=bpf_c \
   -- -Z unstable-options --format=json --nocapture | tee -a "$BENCH_FILE"
 
-# Run banking/accounts bench. Doesn't require nightly, but use since it is already built.
+# Run banking bench. Doesn't require nightly, but use since it is already built.
 _ cargo +$rust_nightly run --release --manifest-path banking-bench/Cargo.toml ${V:+--verbose} | tee -a "$BENCH_FILE"
-_ cargo +$rust_nightly run --release --manifest-path accounts-bench/Cargo.toml ${V:+--verbose} -- --num_accounts 10000 --num_slots 4 | tee -a "$BENCH_FILE"
 
 # `solana-upload-perf` disabled as it can take over 30 minutes to complete for some
 # reason

ci/test-stable.sh

@@ -38,16 +38,11 @@ test -d target/release/bpf && find target/release/bpf -name '*.d' -delete
 # Clear the BPF sysroot files, they are not automatically rebuilt
 rm -rf target/xargo # Issue #3105
 
-# Limit compiler jobs to reduce memory usage
-# on machines with 1gb/thread of memory
-NPROC=$(nproc)
-NPROC=$((NPROC>16 ? 16 : NPROC))
-
 echo "Executing $testName"
 case $testName in
 test-stable)
-  _ cargo +"$rust_stable" test --jobs "$NPROC" --all --exclude solana-local-cluster ${V:+--verbose} -- --nocapture
-  #_ cargo +"$rust_stable" test --manifest-path bench-tps/Cargo.toml --features=move ${V:+--verbose} test_bench_tps_local_cluster_move -- --nocapture
+  _ cargo +"$rust_stable" test --all --exclude solana-local-cluster ${V:+--verbose} -- --nocapture
+  _ cargo +"$rust_stable" test --manifest-path bench-tps/Cargo.toml --features=move ${V:+--verbose} test_bench_tps_local_cluster_move -- --nocapture
   ;;
 test-stable-perf)
   ci/affects-files.sh \

clap-utils/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "solana-clap-utils"
-version = "1.1.8"
+version = "1.0.17"
 description = "Solana utilities for the clap"
 authors = ["Solana Maintainers <maintainers@solana.com>"]
 repository = "https://github.com/solana-labs/solana"
@@ -11,8 +11,8 @@ edition = "2018"
 [dependencies]
 clap = "2.33.0"
 rpassword = "4.0"
-solana-remote-wallet = { path = "../remote-wallet", version = "1.1.8" }
-solana-sdk = { path = "../sdk", version = "1.1.8" }
+solana-remote-wallet = { path = "../remote-wallet", version = "1.0.17" }
+solana-sdk = { path = "../sdk", version = "1.0.17" }
 thiserror = "1.0.11"
 tiny-bip39 = "0.7.0"
 url = "2.1.0"
@@ -20,6 +20,3 @@ chrono = "0.4"
 
 [lib]
 name = "solana_clap_utils"
-
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]

clap-utils/src/commitment.rs

@@ -1,17 +0,0 @@
-use crate::ArgConstant;
-use clap::Arg;
-
-pub const COMMITMENT_ARG: ArgConstant<'static> = ArgConstant {
-    name: "commitment",
-    long: "commitment",
-    help: "Return information at the selected commitment level",
-};
-
-pub fn commitment_arg<'a, 'b>() -> Arg<'a, 'b> {
-    Arg::with_name(COMMITMENT_ARG.name)
-        .long(COMMITMENT_ARG.long)
-        .takes_value(true)
-        .possible_values(&["default", "max", "recent", "root"])
-        .value_name("COMMITMENT_LEVEL")
-        .help(COMMITMENT_ARG.help)
-}

clap-utils/src/input_parsers.rs

@@ -7,7 +7,6 @@ use clap::ArgMatches;
 use solana_remote_wallet::remote_wallet::RemoteWalletManager;
 use solana_sdk::{
     clock::UnixTimestamp,
-    commitment_config::CommitmentConfig,
     native_token::sol_to_lamports,
     pubkey::Pubkey,
     signature::{read_keypair_file, Keypair, Signature, Signer},
@@ -63,21 +62,6 @@ pub fn keypair_of(matches: &ArgMatches<'_>, name: &str) -> Option<Keypair> {
     }
 }
 
-pub fn keypairs_of(matches: &ArgMatches<'_>, name: &str) -> Option<Vec<Keypair>> {
-    matches.values_of(name).map(|values| {
-        values
-            .filter_map(|value| {
-                if value == ASK_KEYWORD {
-                    let skip_validation = matches.is_present(SKIP_SEED_PHRASE_VALIDATION_ARG.name);
-                    keypair_from_seed_phrase(name, skip_validation, true).ok()
-                } else {
-                    read_keypair_file(value).ok()
-                }
-            })
-            .collect()
-    })
-}
-
 // Return a pubkey for an argument that can itself be parsed into a pubkey,
 // or is a filename that can be read as a keypair
 pub fn pubkey_of(matches: &ArgMatches<'_>, name: &str) -> Option<Pubkey> {
@@ -117,7 +101,7 @@ pub fn pubkeys_sigs_of(matches: &ArgMatches<'_>, name: &str) -> Option<Vec<(Pubk
 pub fn signer_of(
     matches: &ArgMatches<'_>,
     name: &str,
-    wallet_manager: &mut Option<Arc<RemoteWalletManager>>,
+    wallet_manager: Option<&Arc<RemoteWalletManager>>,
 ) -> Result<(Option<Box<dyn Signer>>, Option<Pubkey>), Box<dyn std::error::Error>> {
     if let Some(location) = matches.value_of(name) {
         let signer = signer_from_path(matches, location, name, wallet_manager)?;
@@ -131,7 +115,7 @@ pub fn signer_of(
 pub fn pubkey_of_signer(
     matches: &ArgMatches<'_>,
     name: &str,
-    wallet_manager: &mut Option<Arc<RemoteWalletManager>>,
+    wallet_manager: Option<&Arc<RemoteWalletManager>>,
 ) -> Result<Option<Pubkey>, Box<dyn std::error::Error>> {
     if let Some(location) = matches.value_of(name) {
         Ok(Some(pubkey_from_path(
@@ -148,7 +132,7 @@ pub fn pubkey_of_signer(
 pub fn pubkeys_of_multiple_signers(
     matches: &ArgMatches<'_>,
     name: &str,
-    wallet_manager: &mut Option<Arc<RemoteWalletManager>>,
+    wallet_manager: Option<&Arc<RemoteWalletManager>>,
 ) -> Result<Option<Vec<Pubkey>>, Box<dyn std::error::Error>> {
     if let Some(pubkey_matches) = matches.values_of(name) {
         let mut pubkeys: Vec<Pubkey> = vec![];
@@ -164,7 +148,7 @@ pub fn pubkeys_of_multiple_signers(
 pub fn resolve_signer(
     matches: &ArgMatches<'_>,
     name: &str,
-    wallet_manager: &mut Option<Arc<RemoteWalletManager>>,
+    wallet_manager: Option<&Arc<RemoteWalletManager>>,
 ) -> Result<Option<String>, Box<dyn std::error::Error>> {
     Ok(resolve_signer_from_path(
         matches,
@@ -178,15 +162,6 @@ pub fn lamports_of_sol(matches: &ArgMatches<'_>, name: &str) -> Option<u64> {
     value_of(matches, name).map(sol_to_lamports)
 }
 
-pub fn commitment_of(matches: &ArgMatches<'_>, name: &str) -> Option<CommitmentConfig> {
-    matches.value_of(name).map(|value| match value {
-        "max" => CommitmentConfig::max(),
-        "recent" => CommitmentConfig::recent(),
-        "root" => CommitmentConfig::root(),
-        _ => CommitmentConfig::default(),
-    })
-}
-
 #[cfg(test)]
 mod tests {
     use super::*;

clap-utils/src/keypair.rs

@@ -8,7 +8,7 @@ use clap::ArgMatches;
 use rpassword::prompt_password_stderr;
 use solana_remote_wallet::{
     remote_keypair::generate_remote_keypair,
-    remote_wallet::{maybe_wallet_manager, RemoteWalletError, RemoteWalletManager},
+    remote_wallet::{RemoteWalletError, RemoteWalletManager},
 };
 use solana_sdk::{
     pubkey::Pubkey,
@@ -64,7 +64,7 @@ pub fn signer_from_path(
     matches: &ArgMatches,
     path: &str,
     keypair_name: &str,
-    wallet_manager: &mut Option<Arc<RemoteWalletManager>>,
+    wallet_manager: Option<&Arc<RemoteWalletManager>>,
 ) -> Result<Box<dyn Signer>, Box<dyn error::Error>> {
     match parse_keypair_path(path) {
         KeypairUrl::Ask => {
@@ -88,9 +88,6 @@ pub fn signer_from_path(
             Ok(Box::new(read_keypair(&mut stdin)?))
         }
         KeypairUrl::Usb(path) => {
-            if wallet_manager.is_none() {
-                *wallet_manager = maybe_wallet_manager()?;
-            }
             if let Some(wallet_manager) = wallet_manager {
                 Ok(Box::new(generate_remote_keypair(
                     path,
@@ -125,7 +122,7 @@ pub fn pubkey_from_path(
     matches: &ArgMatches,
     path: &str,
     keypair_name: &str,
-    wallet_manager: &mut Option<Arc<RemoteWalletManager>>,
+    wallet_manager: Option<&Arc<RemoteWalletManager>>,
 ) -> Result<Pubkey, Box<dyn error::Error>> {
     match parse_keypair_path(path) {
         KeypairUrl::Pubkey(pubkey) => Ok(pubkey),
@@ -137,7 +134,7 @@ pub fn resolve_signer_from_path(
     matches: &ArgMatches,
     path: &str,
     keypair_name: &str,
-    wallet_manager: &mut Option<Arc<RemoteWalletManager>>,
+    wallet_manager: Option<&Arc<RemoteWalletManager>>,
 ) -> Result<Option<String>, Box<dyn error::Error>> {
     match parse_keypair_path(path) {
         KeypairUrl::Ask => {
@@ -161,9 +158,6 @@ pub fn resolve_signer_from_path(
             read_keypair(&mut stdin).map(|_| None)
         }
         KeypairUrl::Usb(path) => {
-            if wallet_manager.is_none() {
-                *wallet_manager = maybe_wallet_manager()?;
-            }
             if let Some(wallet_manager) = wallet_manager {
                 let path = generate_remote_keypair(
                     path,

clap-utils/src/lib.rs

@@ -42,7 +42,6 @@ impl std::fmt::Debug for DisplayError {
     }
 }
 
-pub mod commitment;
 pub mod input_parsers;
 pub mod input_validators;
 pub mod keypair;

cli-config/Cargo.toml

@@ -3,7 +3,7 @@ authors = ["Solana Maintainers <maintainers@solana.com>"]
 edition = "2018"
 name = "solana-cli-config"
 description = "Blockchain, Rebuilt for Scale"
-version = "1.1.8"
+version = "1.0.17"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
@@ -11,10 +11,7 @@ homepage = "https://solana.com/"
 [dependencies]
 dirs = "2.0.2"
 lazy_static = "1.4.0"
-serde = "1.0.105"
+serde = "1.0.104"
 serde_derive = "1.0.103"
 serde_yaml = "0.8.11"
 url = "2.1.1"
-
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]

cli-config/src/config.rs

@@ -26,7 +26,7 @@ impl Default for Config {
             keypair_path.extend(&[".config", "solana", "id.json"]);
             keypair_path.to_str().unwrap().to_string()
         };
-        let json_rpc_url = "https://api.mainnet-beta.solana.com".to_string();
+        let json_rpc_url = "http://127.0.0.1:8899".to_string();
 
         // Empty websocket_url string indicates the client should
         // `Config::compute_websocket_url(&json_rpc_url)`

cli/Cargo.toml

@@ -3,7 +3,7 @@ authors = ["Solana Maintainers <maintainers@solana.com>"]
 edition = "2018"
 name = "solana-cli"
 description = "Blockchain, Rebuilt for Scale"
-version = "1.1.8"
+version = "1.0.17"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
@@ -11,49 +11,45 @@ homepage = "https://solana.com/"
 [dependencies]
 bincode = "1.2.1"
 bs58 = "0.3.0"
-chrono = { version = "0.4.11", features = ["serde"] }
+chrono = { version = "0.4.10", features = ["serde"] }
 clap = "2.33.0"
 criterion-stats = "0.3.0"
 ctrlc = { version = "3.1.4", features = ["termination"] }
-console = "0.10.0"
+console = "0.9.2"
 dirs = "2.0.2"
 log = "0.4.8"
-Inflector = "0.11.4"
 indicatif = "0.14.0"
 humantime = "2.0.0"
 num-traits = "0.2"
 pretty-hex = "0.1.1"
-reqwest = { version = "0.10.4", default-features = false, features = ["blocking", "rustls-tls", "json"] }
-serde = "1.0.105"
+reqwest = { version = "0.10.1", default-features = false, features = ["blocking", "rustls-tls"] }
+serde = "1.0.104"
 serde_derive = "1.0.103"
-serde_json = "1.0.48"
-solana-budget-program = { path = "../programs/budget", version = "1.1.8" }
-solana-clap-utils = { path = "../clap-utils", version = "1.1.8" }
-solana-cli-config = { path = "../cli-config", version = "1.1.8" }
-solana-client = { path = "../client", version = "1.1.8" }
-solana-config-program = { path = "../programs/config", version = "1.1.8" }
-solana-faucet = { path = "../faucet", version = "1.1.8" }
-solana-logger = { path = "../logger", version = "1.1.8" }
-solana-net-utils = { path = "../net-utils", version = "1.1.8" }
-solana-remote-wallet = { path = "../remote-wallet", version = "1.1.8" }
-solana-runtime = { path = "../runtime", version = "1.1.8" }
-solana-sdk = { path = "../sdk", version = "1.1.8" }
-solana-stake-program = { path = "../programs/stake", version = "1.1.8" }
-solana-storage-program = { path = "../programs/storage", version = "1.1.8" }
-solana-transaction-status = { path = "../transaction-status", version = "1.1.8" }
-solana-vote-program = { path = "../programs/vote", version = "1.1.8" }
-solana-vote-signer = { path = "../vote-signer", version = "1.1.8" }
-thiserror = "1.0.13"
+serde_json = "1.0.46"
+solana-budget-program = { path = "../programs/budget", version = "1.0.17" }
+solana-clap-utils = { path = "../clap-utils", version = "1.0.17" }
+solana-cli-config = { path = "../cli-config", version = "1.0.17" }
+solana-client = { path = "../client", version = "1.0.17" }
+solana-config-program = { path = "../programs/config", version = "1.0.17" }
+solana-faucet = { path = "../faucet", version = "1.0.17" }
+solana-logger = { path = "../logger", version = "1.0.17" }
+solana-net-utils = { path = "../net-utils", version = "1.0.17" }
+solana-remote-wallet = { path = "../remote-wallet", version = "1.0.17" }
+solana-runtime = { path = "../runtime", version = "1.0.17" }
+solana-sdk = { path = "../sdk", version = "1.0.17" }
+solana-stake-program = { path = "../programs/stake", version = "1.0.17" }
+solana-storage-program = { path = "../programs/storage", version = "1.0.17" }
+solana-vote-program = { path = "../programs/vote", version = "1.0.17" }
+solana-vote-signer = { path = "../vote-signer", version = "1.0.17" }
+titlecase = "1.1.0"
+thiserror = "1.0.11"
 url = "2.1.1"
 
 [dev-dependencies]
-solana-core = { path = "../core", version = "1.1.8" }
-solana-budget-program = { path = "../programs/budget", version = "1.1.8" }
+solana-core = { path = "../core", version = "1.0.17" }
+solana-budget-program = { path = "../programs/budget", version = "1.0.17" }
 tempfile = "3.1.0"
 
 [[bin]]
 name = "solana"
 path = "src/main.rs"
-
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]

cli/src/cli.rs

@@ -1,5 +1,4 @@
 use crate::{
-    cli_output::{CliAccount, OutputFormat},
     cluster_query::*,
     display::{println_name_value, println_signers},
     nonce::{self, *},
@@ -22,7 +21,6 @@ use solana_clap_utils::{
 use solana_client::{
     client_error::{ClientErrorKind, Result as ClientResult},
     rpc_client::RpcClient,
-    rpc_response::{RpcAccount, RpcKeyedAccount},
 };
 #[cfg(not(test))]
 use solana_faucet::faucet::request_airdrop_transaction;
@@ -40,9 +38,9 @@ use solana_sdk::{
     message::Message,
     native_token::lamports_to_sol,
     program_utils::DecodeError,
-    pubkey::{Pubkey, MAX_SEED_LEN},
+    pubkey::Pubkey,
     signature::{Keypair, Signature, Signer, SignerError},
-    system_instruction::{self, SystemError},
+    system_instruction::{self, create_address_with_seed, SystemError, MAX_ADDRESS_SEED_LEN},
     system_program,
     transaction::{Transaction, TransactionError},
 };
@@ -51,7 +49,6 @@ use solana_stake_program::{
     stake_state::{Lockup, StakeAuthorize},
 };
 use solana_storage_program::storage_instruction::StorageAccountType;
-use solana_transaction_status::{EncodedTransaction, TransactionEncoding};
 use solana_vote_program::vote_state::VoteAuthorize;
 use std::{
     error,
@@ -87,7 +84,7 @@ pub(crate) fn generate_unique_signers(
     bulk_signers: Vec<Option<Box<dyn Signer>>>,
     matches: &ArgMatches<'_>,
     default_signer_path: &str,
-    wallet_manager: &mut Option<Arc<RemoteWalletManager>>,
+    wallet_manager: Option<&Arc<RemoteWalletManager>>,
 ) -> Result<CliSignerInfo, Box<dyn error::Error>> {
     let mut unique_signers = vec![];
 
@@ -176,8 +173,6 @@ pub enum CliCommand {
     Catchup {
         node_pubkey: Pubkey,
         node_json_rpc_url: Option<String>,
-        commitment_config: CommitmentConfig,
-        follow: bool,
     },
     ClusterVersion,
     CreateAddressWithSeed {
@@ -199,9 +194,6 @@ pub enum CliCommand {
     GetSlot {
         commitment_config: CommitmentConfig,
     },
-    TotalSupply {
-        commitment_config: CommitmentConfig,
-    },
     GetTransactionCount {
         commitment_config: CommitmentConfig,
     },
@@ -227,11 +219,6 @@ pub enum CliCommand {
         use_lamports_unit: bool,
         commitment_config: CommitmentConfig,
     },
-    TransactionHistory {
-        address: Pubkey,
-        end_slot: Option<Slot>, // None == latest slot
-        slot_limit: u64,
-    },
     // Nonce commands
     AuthorizeNonceAccount {
         nonce_account: Pubkey,
@@ -339,7 +326,6 @@ pub enum CliCommand {
         destination_account_pubkey: Pubkey,
         lamports: u64,
         withdraw_authority: SignerIndex,
-        custodian: Option<SignerIndex>,
         sign_only: bool,
         blockhash_query: BlockhashQuery,
         nonce_account: Option<Pubkey>,
@@ -406,7 +392,6 @@ pub enum CliCommand {
     },
     Cancel(Pubkey),
     Confirm(Signature),
-    DecodeTransaction(Transaction),
     Pay(PayCommand),
     ResolveSigner(Option<String>),
     ShowAccount {
@@ -482,7 +467,6 @@ pub struct CliConfig<'a> {
     pub keypair_path: String,
     pub rpc_client: Option<RpcClient>,
     pub verbose: bool,
-    pub output_format: OutputFormat,
 }
 
 impl CliConfig<'_> {
@@ -554,7 +538,7 @@ impl CliConfig<'_> {
         if !self.signers.is_empty() {
             self.signers[0].try_pubkey()
         } else {
-            Err(SignerError::Custom(
+            Err(SignerError::CustomError(
                 "Default keypair must be set if pubkey arg not provided".to_string(),
             ))
         }
@@ -574,7 +558,6 @@ impl Default for CliConfig<'_> {
             keypair_path: Self::default_keypair_path(),
             rpc_client: None,
             verbose: false,
-            output_format: OutputFormat::Display,
         }
     }
 }
@@ -582,7 +565,7 @@ impl Default for CliConfig<'_> {
 pub fn parse_command(
     matches: &ArgMatches<'_>,
     default_signer_path: &str,
-    wallet_manager: &mut Option<Arc<RemoteWalletManager>>,
+    wallet_manager: Option<&Arc<RemoteWalletManager>>,
 ) -> Result<CliCommandInfo, Box<dyn error::Error>> {
     let response = match matches.subcommand() {
         // Cluster Query Commands
@@ -606,7 +589,6 @@ pub fn parse_command(
         }),
         ("epoch", Some(matches)) => parse_get_epoch(matches),
         ("slot", Some(matches)) => parse_get_slot(matches),
-        ("total-supply", Some(matches)) => parse_total_supply(matches),
         ("transaction-count", Some(matches)) => parse_get_transaction_count(matches),
         ("leader-schedule", Some(_matches)) => Ok(CliCommandInfo {
             command: CliCommand::LeaderSchedule,
@@ -624,9 +606,6 @@ pub fn parse_command(
         }),
         ("stakes", Some(matches)) => parse_show_stakes(matches, wallet_manager),
         ("validators", Some(matches)) => parse_show_validators(matches),
-        ("transaction-history", Some(matches)) => {
-            parse_transaction_history(matches, wallet_manager)
-        }
         // Nonce Commands
         ("authorize-nonce-account", Some(matches)) => {
             parse_authorize_nonce_account(matches, default_signer_path, wallet_manager)
@@ -809,23 +788,11 @@ pub fn parse_command(
                 command: CliCommand::Confirm(signature),
                 signers: vec![],
             }),
-            _ => Err(CliError::BadParameter("Invalid signature".to_string())),
-        },
-        ("decode-transaction", Some(matches)) => {
-            let encoded_transaction = EncodedTransaction::Binary(
-                matches.value_of("base85_transaction").unwrap().to_string(),
-            );
-            if let Some(transaction) = encoded_transaction.decode() {
-                Ok(CliCommandInfo {
-                    command: CliCommand::DecodeTransaction(transaction),
-                    signers: vec![],
-                })
-            } else {
-                Err(CliError::BadParameter(
-                    "Unable to decode transaction".to_string(),
-                ))
+            _ => {
+                eprintln!("{}", matches.usage());
+                Err(CliError::BadParameter("Invalid signature".to_string()))
             }
-        }
+        },
         ("pay", Some(matches)) => {
             let lamports = lamports_of_sol(matches, "amount").unwrap();
             let to = pubkey_of_signer(matches, "to", wallet_manager)?.unwrap();
@@ -1077,7 +1044,7 @@ pub fn return_signers(tx: &Transaction) -> ProcessResult {
 pub fn parse_create_address_with_seed(
     matches: &ArgMatches<'_>,
     default_signer_path: &str,
-    wallet_manager: &mut Option<Arc<RemoteWalletManager>>,
+    wallet_manager: Option<&Arc<RemoteWalletManager>>,
 ) -> Result<CliCommandInfo, CliError> {
     let from_pubkey = pubkey_of_signer(matches, "from", wallet_manager)?;
     let signers = if from_pubkey.is_some() {
@@ -1101,7 +1068,7 @@ pub fn parse_create_address_with_seed(
 
     let seed = matches.value_of("seed").unwrap().to_string();
 
-    if seed.len() > MAX_SEED_LEN {
+    if seed.len() > MAX_ADDRESS_SEED_LEN {
         return Err(CliError::BadParameter(
             "Address seed must not be longer than 32 bytes".to_string(),
         ));
@@ -1128,7 +1095,7 @@ fn process_create_address_with_seed(
     } else {
         config.pubkey()?
     };
-    let address = Pubkey::create_with_seed(&from_pubkey, seed, program_id)?;
+    let address = create_address_with_seed(&from_pubkey, seed, program_id)?;
     Ok(address.to_string())
 }
 
@@ -1188,47 +1155,13 @@ fn process_balance(
     }
 }
 
-fn process_confirm(
-    rpc_client: &RpcClient,
-    config: &CliConfig,
-    signature: &Signature,
-) -> ProcessResult {
-    match rpc_client.get_signature_status_with_commitment_and_history(
-        &signature,
-        CommitmentConfig::max(),
-        true,
-    ) {
+fn process_confirm(rpc_client: &RpcClient, signature: &Signature) -> ProcessResult {
+    match rpc_client.get_signature_status(&signature) {
         Ok(status) => {
-            if let Some(transaction_status) = status {
-                if config.verbose {
-                    match rpc_client
-                        .get_confirmed_transaction(signature, TransactionEncoding::Binary)
-                    {
-                        Ok(confirmed_transaction) => {
-                            println!(
-                                "\nTransaction executed in slot {}:",
-                                confirmed_transaction.slot
-                            );
-                            crate::display::println_transaction(
-                                &confirmed_transaction
-                                    .transaction
-                                    .transaction
-                                    .decode()
-                                    .expect("Successful decode"),
-                                &confirmed_transaction.transaction.meta,
-                                "  ",
-                            );
-                        }
-                        Err(err) => {
-                            println!("Unable to get confirmed transaction details: {}", err)
-                        }
-                    }
-                    println!();
-                }
-
-                match transaction_status {
+            if let Some(result) = status {
+                match result {
                     Ok(_) => Ok("Confirmed".to_string()),
-                    Err(err) => Ok(format!("Transaction failed: {}", err)),
+                    Err(err) => Ok(format!("Transaction failed with error: {}", err)),
                 }
             } else {
                 Ok("Not found".to_string())
@@ -1238,40 +1171,33 @@ fn process_confirm(
     }
 }
 
-fn process_decode_transaction(transaction: &Transaction) -> ProcessResult {
-    crate::display::println_transaction(transaction, &None, "");
-    Ok("".to_string())
-}
-
 fn process_show_account(
     rpc_client: &RpcClient,
-    config: &CliConfig,
+    _config: &CliConfig,
     account_pubkey: &Pubkey,
     output_file: &Option<String>,
     use_lamports_unit: bool,
 ) -> ProcessResult {
     let account = rpc_client.get_account(account_pubkey)?;
-    let data = account.data.clone();
-    let cli_account = CliAccount {
-        keyed_account: RpcKeyedAccount {
-            pubkey: account_pubkey.to_string(),
-            account: RpcAccount::encode(account),
-        },
-        use_lamports_unit,
-    };
 
-    config.output_format.formatted_print(&cli_account);
+    println!();
+    println_name_value("Public Key:", &account_pubkey.to_string());
+    println_name_value(
+        "Balance:",
+        &build_balance_message(account.lamports, use_lamports_unit, true),
+    );
+    println_name_value("Owner:", &account.owner.to_string());
+    println_name_value("Executable:", &account.executable.to_string());
+    println_name_value("Rent Epoch:", &account.rent_epoch.to_string());
 
-    if config.output_format == OutputFormat::Display {
-        if let Some(output_file) = output_file {
-            let mut f = File::create(output_file)?;
-            f.write_all(&data)?;
-            println!();
-            println!("Wrote account data to {}", output_file);
-        } else if !data.is_empty() {
-            use pretty_hex::*;
-            println!("{:?}", data.hex_dump());
-        }
+    if let Some(output_file) = output_file {
+        let mut f = File::create(output_file)?;
+        f.write_all(&account.data)?;
+        println!();
+        println!("Wrote account data to {}", output_file);
+    } else if !account.data.is_empty() {
+        use pretty_hex::*;
+        println!("{:?}", account.data.hex_dump());
     }
 
     Ok("".to_string())
@@ -1349,8 +1275,8 @@ fn process_deploy(
     trace!("Finalizing program account");
     rpc_client
         .send_and_confirm_transaction_with_spinner(&mut finalize_tx, &signers)
-        .map_err(|e| {
-            CliError::DynamicProgramError(format!("Program finalize transaction failed: {}", e))
+        .map_err(|_| {
+            CliError::DynamicProgramError("Program finalize transaction failed".to_string())
         })?;
 
     Ok(json!({
@@ -1645,7 +1571,7 @@ fn process_witness(
 }
 
 pub fn process_command(config: &CliConfig) -> ProcessResult {
-    if config.verbose && config.output_format == OutputFormat::Display {
+    if config.verbose {
         println_name_value("RPC URL:", &config.json_rpc_url);
         println_name_value("Default Signer Path:", &config.keypair_path);
         if config.keypair_path.starts_with("usb://") {
@@ -1671,15 +1597,7 @@ pub fn process_command(config: &CliConfig) -> ProcessResult {
         CliCommand::Catchup {
             node_pubkey,
             node_json_rpc_url,
-            commitment_config,
-            follow,
-        } => process_catchup(
-            &rpc_client,
-            node_pubkey,
-            node_json_rpc_url,
-            *commitment_config,
-            *follow,
-        ),
+        } => process_catchup(&rpc_client, node_pubkey, node_json_rpc_url),
         CliCommand::ClusterVersion => process_cluster_version(&rpc_client),
         CliCommand::CreateAddressWithSeed {
             from_pubkey,
@@ -1690,7 +1608,7 @@ pub fn process_command(config: &CliConfig) -> ProcessResult {
         CliCommand::GetBlockTime { slot } => process_get_block_time(&rpc_client, *slot),
         CliCommand::GetGenesisHash => process_get_genesis_hash(&rpc_client),
         CliCommand::GetEpochInfo { commitment_config } => {
-            process_get_epoch_info(&rpc_client, config, *commitment_config)
+            process_get_epoch_info(&rpc_client, *commitment_config)
         }
         CliCommand::GetEpoch { commitment_config } => {
             process_get_epoch(&rpc_client, *commitment_config)
@@ -1698,9 +1616,6 @@ pub fn process_command(config: &CliConfig) -> ProcessResult {
         CliCommand::GetSlot { commitment_config } => {
             process_get_slot(&rpc_client, *commitment_config)
         }
-        CliCommand::TotalSupply { commitment_config } => {
-            process_total_supply(&rpc_client, *commitment_config)
-        }
         CliCommand::GetTransactionCount { commitment_config } => {
             process_get_transaction_count(&rpc_client, *commitment_config)
         }
@@ -1730,19 +1645,13 @@ pub fn process_command(config: &CliConfig) -> ProcessResult {
             vote_account_pubkeys,
         } => process_show_stakes(
             &rpc_client,
-            config,
             *use_lamports_unit,
             vote_account_pubkeys.as_deref(),
         ),
         CliCommand::ShowValidators {
             use_lamports_unit,
             commitment_config,
-        } => process_show_validators(&rpc_client, config, *use_lamports_unit, *commitment_config),
-        CliCommand::TransactionHistory {
-            address,
-            end_slot,
-            slot_limit,
-        } => process_transaction_history(&rpc_client, address, *end_slot, *slot_limit),
+        } => process_show_validators(&rpc_client, *use_lamports_unit, *commitment_config),
 
         // Nonce Commands
 
@@ -1785,12 +1694,7 @@ pub fn process_command(config: &CliConfig) -> ProcessResult {
         CliCommand::ShowNonceAccount {
             nonce_account_pubkey,
             use_lamports_unit,
-        } => process_show_nonce_account(
-            &rpc_client,
-            config,
-            &nonce_account_pubkey,
-            *use_lamports_unit,
-        ),
+        } => process_show_nonce_account(&rpc_client, &nonce_account_pubkey, *use_lamports_unit),
         // Withdraw lamports from a nonce account
         CliCommand::WithdrawFromNonceAccount {
             nonce_account,
@@ -1969,7 +1873,6 @@ pub fn process_command(config: &CliConfig) -> ProcessResult {
             destination_account_pubkey,
             lamports,
             withdraw_authority,
-            custodian,
             sign_only,
             blockhash_query,
             ref nonce_account,
@@ -1982,7 +1885,6 @@ pub fn process_command(config: &CliConfig) -> ProcessResult {
             &destination_account_pubkey,
             *lamports,
             *withdraw_authority,
-            *custodian,
             *sign_only,
             blockhash_query,
             nonce_account.as_ref(),
@@ -2021,7 +1923,7 @@ pub fn process_command(config: &CliConfig) -> ProcessResult {
 
         // Return all or single validator info
         CliCommand::GetValidatorInfo(info_pubkey) => {
-            process_get_validator_info(&rpc_client, config, *info_pubkey)
+            process_get_validator_info(&rpc_client, *info_pubkey)
         }
         // Publish validator info
         CliCommand::SetValidatorInfo {
@@ -2132,8 +2034,7 @@ pub fn process_command(config: &CliConfig) -> ProcessResult {
         // Cancel a contract by contract Pubkey
         CliCommand::Cancel(pubkey) => process_cancel(&rpc_client, config, &pubkey),
         // Confirm the last client transaction by signature
-        CliCommand::Confirm(signature) => process_confirm(&rpc_client, config, signature),
-        CliCommand::DecodeTransaction(transaction) => process_decode_transaction(transaction),
+        CliCommand::Confirm(signature) => process_confirm(&rpc_client, signature),
         // If client has positive balance, pay lamports to another address
         CliCommand::Pay(PayCommand {
             lamports,
@@ -2282,7 +2183,7 @@ where
         Err(err) => {
             if let ClientErrorKind::TransactionError(TransactionError::InstructionError(
                 _,
-                InstructionError::Custom(code),
+                InstructionError::CustomError(code),
             )) = err.kind()
             {
                 if let Some(specific_error) = E::decode_custom_error_to_enum(*code) {
@@ -2415,18 +2316,6 @@ pub fn app<'ab, 'v>(name: &str, about: &'ab str, version: &'v str) -> App<'ab, '
                         .help("The transaction signature to confirm"),
                 ),
         )
-        .subcommand(
-            SubCommand::with_name("decode-transaction")
-                .about("Decode a base-85 binary transaction")
-                .arg(
-                    Arg::with_name("base85_transaction")
-                        .index(1)
-                        .value_name("BASE58_TRANSACTION")
-                        .takes_value(true)
-                        .required(true)
-                        .help("The transaction to decode"),
-                ),
-        )
         .subcommand(
             SubCommand::with_name("create-address-with-seed")
                 .about("Generate a derived account address with a seed")
@@ -2644,7 +2533,7 @@ pub fn app<'ab, 'v>(name: &str, about: &'ab str, version: &'v str) -> App<'ab, '
                 )
                 .arg(
                     Arg::with_name("output_file")
-                        .long("output-file")
+                        .long("output")
                         .short("o")
                         .value_name("FILEPATH")
                         .takes_value(true)
@@ -2698,11 +2587,11 @@ mod tests {
         write_keypair_file(&default_keypair, &default_keypair_file).unwrap();
 
         let signer_info =
-            generate_unique_signers(vec![], &matches, &default_keypair_file, &mut None).unwrap();
+            generate_unique_signers(vec![], &matches, &default_keypair_file, None).unwrap();
         assert_eq!(signer_info.signers.len(), 0);
 
         let signer_info =
-            generate_unique_signers(vec![None, None], &matches, &default_keypair_file, &mut None)
+            generate_unique_signers(vec![None, None], &matches, &default_keypair_file, None)
                 .unwrap();
         assert_eq!(signer_info.signers.len(), 1);
         assert_eq!(signer_info.index_of(None), Some(0));
@@ -2714,7 +2603,7 @@ mod tests {
         let keypair0_clone_pubkey = keypair0.pubkey();
         let signers = vec![None, Some(keypair0.into()), Some(keypair0_clone.into())];
         let signer_info =
-            generate_unique_signers(signers, &matches, &default_keypair_file, &mut None).unwrap();
+            generate_unique_signers(signers, &matches, &default_keypair_file, None).unwrap();
         assert_eq!(signer_info.signers.len(), 2);
         assert_eq!(signer_info.index_of(None), Some(0));
         assert_eq!(signer_info.index_of(Some(keypair0_pubkey)), Some(1));
@@ -2725,7 +2614,7 @@ mod tests {
         let keypair0_clone = keypair_from_seed(&[1u8; 32]).unwrap();
         let signers = vec![Some(keypair0.into()), Some(keypair0_clone.into())];
         let signer_info =
-            generate_unique_signers(signers, &matches, &default_keypair_file, &mut None).unwrap();
+            generate_unique_signers(signers, &matches, &default_keypair_file, None).unwrap();
         assert_eq!(signer_info.signers.len(), 1);
         assert_eq!(signer_info.index_of(Some(keypair0_pubkey)), Some(0));
 
@@ -2746,7 +2635,7 @@ mod tests {
             Some(keypair1.into()),
         ];
         let signer_info =
-            generate_unique_signers(signers, &matches, &default_keypair_file, &mut None).unwrap();
+            generate_unique_signers(signers, &matches, &default_keypair_file, None).unwrap();
         assert_eq!(signer_info.signers.len(), 2);
         assert_eq!(signer_info.index_of(Some(keypair0_pubkey)), Some(0));
         assert_eq!(signer_info.index_of(Some(keypair1_pubkey)), Some(1));
@@ -2772,7 +2661,7 @@ mod tests {
                 .clone()
                 .get_matches_from(vec!["test", "airdrop", "50", &pubkey_string]);
         assert_eq!(
-            parse_command(&test_airdrop, "", &mut None).unwrap(),
+            parse_command(&test_airdrop, "", None).unwrap(),
             CliCommandInfo {
                 command: CliCommand::Airdrop {
                     faucet_host: None,
@@ -2795,7 +2684,7 @@ mod tests {
             &keypair.pubkey().to_string(),
         ]);
         assert_eq!(
-            parse_command(&test_balance, "", &mut None).unwrap(),
+            parse_command(&test_balance, "", None).unwrap(),
             CliCommandInfo {
                 command: CliCommand::Balance {
                     pubkey: Some(keypair.pubkey()),
@@ -2811,7 +2700,7 @@ mod tests {
             "--lamports",
         ]);
         assert_eq!(
-            parse_command(&test_balance, "", &mut None).unwrap(),
+            parse_command(&test_balance, "", None).unwrap(),
             CliCommandInfo {
                 command: CliCommand::Balance {
                     pubkey: Some(keypair.pubkey()),
@@ -2825,7 +2714,7 @@ mod tests {
                 .clone()
                 .get_matches_from(vec!["test", "balance", "--lamports"]);
         assert_eq!(
-            parse_command(&test_balance, &keypair_file, &mut None).unwrap(),
+            parse_command(&test_balance, &keypair_file, None).unwrap(),
             CliCommandInfo {
                 command: CliCommand::Balance {
                     pubkey: None,
@@ -2841,7 +2730,7 @@ mod tests {
                 .clone()
                 .get_matches_from(vec!["test", "cancel", &pubkey_string]);
         assert_eq!(
-            parse_command(&test_cancel, &keypair_file, &mut None).unwrap(),
+            parse_command(&test_cancel, &keypair_file, None).unwrap(),
             CliCommandInfo {
                 command: CliCommand::Cancel(pubkey),
                 signers: vec![read_keypair_file(&keypair_file).unwrap().into()],
@@ -2856,7 +2745,7 @@ mod tests {
                 .clone()
                 .get_matches_from(vec!["test", "confirm", &signature_string]);
         assert_eq!(
-            parse_command(&test_confirm, "", &mut None).unwrap(),
+            parse_command(&test_confirm, "", None).unwrap(),
             CliCommandInfo {
                 command: CliCommand::Confirm(signature),
                 signers: vec![],
@@ -2865,7 +2754,7 @@ mod tests {
         let test_bad_signature = test_commands
             .clone()
             .get_matches_from(vec!["test", "confirm", "deadbeef"]);
-        assert!(parse_command(&test_bad_signature, "", &mut None).is_err());
+        assert!(parse_command(&test_bad_signature, "", None).is_err());
 
         // Test CreateAddressWithSeed
         let from_pubkey = Some(Pubkey::new_rand());
@@ -2885,7 +2774,7 @@ mod tests {
                 &from_str,
             ]);
             assert_eq!(
-                parse_command(&test_create_address_with_seed, "", &mut None).unwrap(),
+                parse_command(&test_create_address_with_seed, "", None).unwrap(),
                 CliCommandInfo {
                     command: CliCommand::CreateAddressWithSeed {
                         from_pubkey,
@@ -2903,7 +2792,7 @@ mod tests {
             "STAKE",
         ]);
         assert_eq!(
-            parse_command(&test_create_address_with_seed, &keypair_file, &mut None).unwrap(),
+            parse_command(&test_create_address_with_seed, &keypair_file, None).unwrap(),
             CliCommandInfo {
                 command: CliCommand::CreateAddressWithSeed {
                     from_pubkey: None,
@@ -2920,7 +2809,7 @@ mod tests {
                 .clone()
                 .get_matches_from(vec!["test", "deploy", "/Users/test/program.o"]);
         assert_eq!(
-            parse_command(&test_deploy, &keypair_file, &mut None).unwrap(),
+            parse_command(&test_deploy, &keypair_file, None).unwrap(),
             CliCommandInfo {
                 command: CliCommand::Deploy("/Users/test/program.o".to_string()),
                 signers: vec![read_keypair_file(&keypair_file).unwrap().into()],
@@ -2933,7 +2822,7 @@ mod tests {
                 .clone()
                 .get_matches_from(vec!["test", "resolve-signer", &keypair_file]);
         assert_eq!(
-            parse_command(&test_resolve_signer, "", &mut None).unwrap(),
+            parse_command(&test_resolve_signer, "", None).unwrap(),
             CliCommandInfo {
                 command: CliCommand::ResolveSigner(Some(keypair_file.clone())),
                 signers: vec![],
@@ -2945,7 +2834,7 @@ mod tests {
                 .clone()
                 .get_matches_from(vec!["test", "resolve-signer", &pubkey_string]);
         assert_eq!(
-            parse_command(&test_resolve_signer, "", &mut None).unwrap(),
+            parse_command(&test_resolve_signer, "", None).unwrap(),
             CliCommandInfo {
                 command: CliCommand::ResolveSigner(Some(pubkey.to_string())),
                 signers: vec![],
@@ -2958,7 +2847,7 @@ mod tests {
                 .clone()
                 .get_matches_from(vec!["test", "pay", &pubkey_string, "50"]);
         assert_eq!(
-            parse_command(&test_pay, &keypair_file, &mut None).unwrap(),
+            parse_command(&test_pay, &keypair_file, None).unwrap(),
             CliCommandInfo {
                 command: CliCommand::Pay(PayCommand {
                     lamports: 50_000_000_000,
@@ -2981,7 +2870,7 @@ mod tests {
             &witness1_string,
         ]);
         assert_eq!(
-            parse_command(&test_pay_multiple_witnesses, &keypair_file, &mut None).unwrap(),
+            parse_command(&test_pay_multiple_witnesses, &keypair_file, None).unwrap(),
             CliCommandInfo {
                 command: CliCommand::Pay(PayCommand {
                     lamports: 50_000_000_000,
@@ -3001,7 +2890,7 @@ mod tests {
             &witness0_string,
         ]);
         assert_eq!(
-            parse_command(&test_pay_single_witness, &keypair_file, &mut None).unwrap(),
+            parse_command(&test_pay_single_witness, &keypair_file, None).unwrap(),
             CliCommandInfo {
                 command: CliCommand::Pay(PayCommand {
                     lamports: 50_000_000_000,
@@ -3025,7 +2914,7 @@ mod tests {
             &witness0_string,
         ]);
         assert_eq!(
-            parse_command(&test_pay_timestamp, &keypair_file, &mut None).unwrap(),
+            parse_command(&test_pay_timestamp, &keypair_file, None).unwrap(),
             CliCommandInfo {
                 command: CliCommand::Pay(PayCommand {
                     lamports: 50_000_000_000,
@@ -3051,7 +2940,7 @@ mod tests {
             "--sign-only",
         ]);
         assert_eq!(
-            parse_command(&test_pay, &keypair_file, &mut None).unwrap(),
+            parse_command(&test_pay, &keypair_file, None).unwrap(),
             CliCommandInfo {
                 command: CliCommand::Pay(PayCommand {
                     lamports: 50_000_000_000,
@@ -3074,7 +2963,7 @@ mod tests {
             &blockhash_string,
         ]);
         assert_eq!(
-            parse_command(&test_pay, &keypair_file, &mut None).unwrap(),
+            parse_command(&test_pay, &keypair_file, None).unwrap(),
             CliCommandInfo {
                 command: CliCommand::Pay(PayCommand {
                     lamports: 50_000_000_000,
@@ -3103,7 +2992,7 @@ mod tests {
             &pubkey_string,
         ]);
         assert_eq!(
-            parse_command(&test_pay, &keypair_file, &mut None).unwrap(),
+            parse_command(&test_pay, &keypair_file, None).unwrap(),
             CliCommandInfo {
                 command: CliCommand::Pay(PayCommand {
                     lamports: 50_000_000_000,
@@ -3136,7 +3025,7 @@ mod tests {
             &keypair_file,
         ]);
         assert_eq!(
-            parse_command(&test_pay, &keypair_file, &mut None).unwrap(),
+            parse_command(&test_pay, &keypair_file, None).unwrap(),
             CliCommandInfo {
                 command: CliCommand::Pay(PayCommand {
                     lamports: 50_000_000_000,
@@ -3174,7 +3063,7 @@ mod tests {
             &signer_arg,
         ]);
         assert_eq!(
-            parse_command(&test_pay, &keypair_file, &mut None).unwrap(),
+            parse_command(&test_pay, &keypair_file, None).unwrap(),
             CliCommandInfo {
                 command: CliCommand::Pay(PayCommand {
                     lamports: 50_000_000_000,
@@ -3212,7 +3101,7 @@ mod tests {
             "--signer",
             &signer_arg,
         ]);
-        assert!(parse_command(&test_pay, &keypair_file, &mut None).is_err());
+        assert!(parse_command(&test_pay, &keypair_file, None).is_err());
 
         // Test Send-Signature Subcommand
         let test_send_signature = test_commands.clone().get_matches_from(vec![
@@ -3222,7 +3111,7 @@ mod tests {
             &pubkey_string,
         ]);
         assert_eq!(
-            parse_command(&test_send_signature, &keypair_file, &mut None).unwrap(),
+            parse_command(&test_send_signature, &keypair_file, None).unwrap(),
             CliCommandInfo {
                 command: CliCommand::Witness(pubkey, pubkey),
                 signers: vec![read_keypair_file(&keypair_file).unwrap().into()],
@@ -3243,7 +3132,7 @@ mod tests {
             &witness1_string,
         ]);
         assert_eq!(
-            parse_command(&test_pay_multiple_witnesses, &keypair_file, &mut None).unwrap(),
+            parse_command(&test_pay_multiple_witnesses, &keypair_file, None).unwrap(),
             CliCommandInfo {
                 command: CliCommand::Pay(PayCommand {
                     lamports: 50_000_000_000,
@@ -3267,7 +3156,7 @@ mod tests {
             "2018-09-19T17:30:59",
         ]);
         assert_eq!(
-            parse_command(&test_send_timestamp, &keypair_file, &mut None).unwrap(),
+            parse_command(&test_send_timestamp, &keypair_file, None).unwrap(),
             CliCommandInfo {
                 command: CliCommand::TimeElapsed(pubkey, pubkey, dt),
                 signers: vec![read_keypair_file(&keypair_file).unwrap().into()],
@@ -3281,7 +3170,7 @@ mod tests {
             "--date",
             "20180919T17:30:59",
         ]);
-        assert!(parse_command(&test_bad_timestamp, &keypair_file, &mut None).is_err());
+        assert!(parse_command(&test_bad_timestamp, &keypair_file, None).is_err());
     }
 
     #[test]
@@ -3310,7 +3199,7 @@ mod tests {
 
         let process_id = Pubkey::new_rand();
         config.command = CliCommand::Cancel(process_id);
-        assert!(process_command(&config).is_ok());
+        assert_eq!(process_command(&config).unwrap(), SIGNATURE);
 
         let good_signature = Signature::new(&bs58::decode(SIGNATURE).into_vec().unwrap());
         config.command = CliCommand::Confirm(good_signature);
@@ -3327,8 +3216,8 @@ mod tests {
             commission: 0,
         };
         config.signers = vec![&keypair, &bob_keypair, &identity_keypair];
-        let result = process_command(&config);
-        assert!(result.is_ok());
+        let signature = process_command(&config);
+        assert_eq!(signature.unwrap(), SIGNATURE.to_string());
 
         let new_authorized_pubkey = Pubkey::new_rand();
         config.signers = vec![&bob_keypair];
@@ -3337,8 +3226,8 @@ mod tests {
             new_authorized_pubkey,
             vote_authorize: VoteAuthorize::Voter,
         };
-        let result = process_command(&config);
-        assert!(result.is_ok());
+        let signature = process_command(&config);
+        assert_eq!(signature.unwrap(), SIGNATURE.to_string());
 
         let new_identity_keypair = Keypair::new();
         config.signers = vec![&keypair, &bob_keypair, &new_identity_keypair];
@@ -3346,8 +3235,8 @@ mod tests {
             vote_account_pubkey: bob_pubkey,
             new_identity_account: 2,
         };
-        let result = process_command(&config);
-        assert!(result.is_ok());
+        let signature = process_command(&config);
+        assert_eq!(signature.unwrap(), SIGNATURE.to_string());
 
         let bob_keypair = Keypair::new();
         let bob_pubkey = bob_keypair.pubkey();
@@ -3371,8 +3260,8 @@ mod tests {
             from: 0,
         };
         config.signers = vec![&keypair, &bob_keypair];
-        let result = process_command(&config);
-        assert!(result.is_ok());
+        let signature = process_command(&config);
+        assert_eq!(signature.unwrap(), SIGNATURE.to_string());
 
         let stake_pubkey = Pubkey::new_rand();
         let to_pubkey = Pubkey::new_rand();
@@ -3381,7 +3270,6 @@ mod tests {
             destination_account_pubkey: to_pubkey,
             lamports: 100,
             withdraw_authority: 0,
-            custodian: None,
             sign_only: false,
             blockhash_query: BlockhashQuery::All(blockhash_query::Source::Cluster),
             nonce_account: None,
@@ -3389,8 +3277,8 @@ mod tests {
             fee_payer: 0,
         };
         config.signers = vec![&keypair];
-        let result = process_command(&config);
-        assert!(result.is_ok());
+        let signature = process_command(&config);
+        assert_eq!(signature.unwrap(), SIGNATURE.to_string());
 
         let stake_pubkey = Pubkey::new_rand();
         config.command = CliCommand::DeactivateStake {
@@ -3402,8 +3290,8 @@ mod tests {
             nonce_authority: 0,
             fee_payer: 0,
         };
-        let result = process_command(&config);
-        assert!(result.is_ok());
+        let signature = process_command(&config);
+        assert_eq!(signature.unwrap(), SIGNATURE.to_string());
 
         let stake_pubkey = Pubkey::new_rand();
         let split_stake_account = Keypair::new();
@@ -3420,8 +3308,8 @@ mod tests {
             fee_payer: 0,
         };
         config.signers = vec![&keypair, &split_stake_account];
-        let result = process_command(&config);
-        assert!(result.is_ok());
+        let signature = process_command(&config);
+        assert_eq!(signature.unwrap(), SIGNATURE.to_string());
 
         config.command = CliCommand::GetSlot {
             commitment_config: CommitmentConfig::default(),
@@ -3439,8 +3327,8 @@ mod tests {
             to: bob_pubkey,
             ..PayCommand::default()
         });
-        let result = process_command(&config);
-        assert!(result.is_ok());
+        let signature = process_command(&config);
+        assert_eq!(signature.unwrap(), SIGNATURE.to_string());
 
         let date_string = "\"2018-09-19T17:30:59Z\"";
         let dt: DateTime<Utc> = serde_json::from_str(&date_string).unwrap();
@@ -3452,7 +3340,16 @@ mod tests {
             ..PayCommand::default()
         });
         let result = process_command(&config);
-        assert!(result.is_ok());
+        let json: Value = serde_json::from_str(&result.unwrap()).unwrap();
+        assert_eq!(
+            json.as_object()
+                .unwrap()
+                .get("signature")
+                .unwrap()
+                .as_str()
+                .unwrap(),
+            SIGNATURE.to_string()
+        );
 
         let witness = Pubkey::new_rand();
         config.command = CliCommand::Pay(PayCommand {
@@ -3463,18 +3360,27 @@ mod tests {
             ..PayCommand::default()
         });
         let result = process_command(&config);
-        assert!(result.is_ok());
+        let json: Value = serde_json::from_str(&result.unwrap()).unwrap();
+        assert_eq!(
+            json.as_object()
+                .unwrap()
+                .get("signature")
+                .unwrap()
+                .as_str()
+                .unwrap(),
+            SIGNATURE.to_string()
+        );
 
         let process_id = Pubkey::new_rand();
         config.command = CliCommand::TimeElapsed(bob_pubkey, process_id, dt);
         config.signers = vec![&keypair];
-        let result = process_command(&config);
-        assert!(result.is_ok());
+        let signature = process_command(&config);
+        assert_eq!(signature.unwrap(), SIGNATURE.to_string());
 
         let witness = Pubkey::new_rand();
         config.command = CliCommand::Witness(bob_pubkey, witness);
-        let result = process_command(&config);
-        assert!(result.is_ok());
+        let signature = process_command(&config);
+        assert_eq!(signature.unwrap(), SIGNATURE.to_string());
 
         // CreateAddressWithSeed
         let from_pubkey = Pubkey::new_rand();
@@ -3486,7 +3392,7 @@ mod tests {
         };
         let address = process_command(&config);
         let expected_address =
-            Pubkey::create_with_seed(&from_pubkey, "seed", &solana_stake_program::id()).unwrap();
+            create_address_with_seed(&from_pubkey, "seed", &solana_stake_program::id()).unwrap();
         assert_eq!(address.unwrap(), expected_address.to_string());
 
         // Need airdrop cases
@@ -3501,13 +3407,13 @@ mod tests {
         assert!(process_command(&config).is_ok());
 
         config.command = CliCommand::TimeElapsed(bob_pubkey, process_id, dt);
-        let result = process_command(&config);
-        assert!(result.is_ok());
+        let signature = process_command(&config);
+        assert_eq!(signature.unwrap(), SIGNATURE.to_string());
 
         let witness = Pubkey::new_rand();
         config.command = CliCommand::Witness(bob_pubkey, witness);
-        let result = process_command(&config);
-        assert!(result.is_ok());
+        let signature = process_command(&config);
+        assert_eq!(signature.unwrap(), SIGNATURE.to_string());
 
         // sig_not_found case
         config.rpc_client = Some(RpcClient::new_mock("sig_not_found".to_string()));
@@ -3521,7 +3427,10 @@ mod tests {
         config.command = CliCommand::Confirm(any_signature);
         assert_eq!(
             process_command(&config).unwrap(),
-            format!("Transaction failed: {}", TransactionError::AccountInUse)
+            format!(
+                "Transaction failed with error: {}",
+                TransactionError::AccountInUse
+            )
         );
 
         // Failure cases
@@ -3657,7 +3566,7 @@ mod tests {
             .clone()
             .get_matches_from(vec!["test", "transfer", &to_string, "42"]);
         assert_eq!(
-            parse_command(&test_transfer, &default_keypair_file, &mut None).unwrap(),
+            parse_command(&test_transfer, &default_keypair_file, None).unwrap(),
             CliCommandInfo {
                 command: CliCommand::Transfer {
                     lamports: 42_000_000_000,
@@ -3683,7 +3592,7 @@ mod tests {
             "42",
         ]);
         assert_eq!(
-            parse_command(&test_transfer, &default_keypair_file, &mut None).unwrap(),
+            parse_command(&test_transfer, &default_keypair_file, None).unwrap(),
             CliCommandInfo {
                 command: CliCommand::Transfer {
                     lamports: 42_000_000_000,
@@ -3713,7 +3622,7 @@ mod tests {
             "--sign-only",
         ]);
         assert_eq!(
-            parse_command(&test_transfer, &default_keypair_file, &mut None).unwrap(),
+            parse_command(&test_transfer, &default_keypair_file, None).unwrap(),
             CliCommandInfo {
                 command: CliCommand::Transfer {
                     lamports: 42_000_000_000,
@@ -3748,7 +3657,7 @@ mod tests {
             &blockhash_string,
         ]);
         assert_eq!(
-            parse_command(&test_transfer, &default_keypair_file, &mut None).unwrap(),
+            parse_command(&test_transfer, &default_keypair_file, None).unwrap(),
             CliCommandInfo {
                 command: CliCommand::Transfer {
                     lamports: 42_000_000_000,
@@ -3787,7 +3696,7 @@ mod tests {
             &nonce_authority_file,
         ]);
         assert_eq!(
-            parse_command(&test_transfer, &default_keypair_file, &mut None).unwrap(),
+            parse_command(&test_transfer, &default_keypair_file, None).unwrap(),
             CliCommandInfo {
                 command: CliCommand::Transfer {
                     lamports: 42_000_000_000,

cli/src/cli_output.rs

@@ -1,841 +0,0 @@
-use crate::{cli::build_balance_message, display::writeln_name_value};
-use chrono::{DateTime, NaiveDateTime, SecondsFormat, Utc};
-use console::{style, Emoji};
-use inflector::cases::titlecase::to_title_case;
-use serde::Serialize;
-use serde_json::{Map, Value};
-use solana_client::rpc_response::{RpcEpochInfo, RpcKeyedAccount, RpcVoteAccountInfo};
-use solana_sdk::{
-    clock::{self, Epoch, Slot, UnixTimestamp},
-    stake_history::StakeHistoryEntry,
-};
-use solana_stake_program::stake_state::{Authorized, Lockup};
-use solana_vote_program::{
-    authorized_voters::AuthorizedVoters,
-    vote_state::{BlockTimestamp, Lockout},
-};
-use std::{collections::BTreeMap, fmt, time::Duration};
-
-static WARNING: Emoji = Emoji("⚠️", "!");
-
-#[derive(PartialEq)]
-pub enum OutputFormat {
-    Display,
-    Json,
-    JsonCompact,
-}
-
-impl OutputFormat {
-    pub fn formatted_print<T>(&self, item: &T)
-    where
-        T: Serialize + fmt::Display,
-    {
-        match self {
-            OutputFormat::Display => {
-                println!("{}", item);
-            }
-            OutputFormat::Json => {
-                println!("{}", serde_json::to_string_pretty(item).unwrap());
-            }
-            OutputFormat::JsonCompact => {
-                println!("{}", serde_json::to_value(item).unwrap());
-            }
-        }
-    }
-}
-
-#[derive(Serialize, Deserialize)]
-pub struct CliAccount {
-    #[serde(flatten)]
-    pub keyed_account: RpcKeyedAccount,
-    #[serde(skip_serializing)]
-    pub use_lamports_unit: bool,
-}
-
-impl fmt::Display for CliAccount {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        writeln!(f)?;
-        writeln_name_value(f, "Public Key:", &self.keyed_account.pubkey)?;
-        writeln_name_value(
-            f,
-            "Balance:",
-            &build_balance_message(
-                self.keyed_account.account.lamports,
-                self.use_lamports_unit,
-                true,
-            ),
-        )?;
-        writeln_name_value(f, "Owner:", &self.keyed_account.account.owner)?;
-        writeln_name_value(
-            f,
-            "Executable:",
-            &self.keyed_account.account.executable.to_string(),
-        )?;
-        writeln_name_value(
-            f,
-            "Rent Epoch:",
-            &self.keyed_account.account.rent_epoch.to_string(),
-        )?;
-        Ok(())
-    }
-}
-
-#[derive(Default, Serialize, Deserialize)]
-pub struct CliBlockProduction {
-    pub epoch: Epoch,
-    pub start_slot: Slot,
-    pub end_slot: Slot,
-    pub total_slots: usize,
-    pub total_blocks_produced: usize,
-    pub total_slots_skipped: usize,
-    pub leaders: Vec<CliBlockProductionEntry>,
-    pub individual_slot_status: Vec<CliSlotStatus>,
-    #[serde(skip_serializing)]
-    pub verbose: bool,
-}
-
-impl fmt::Display for CliBlockProduction {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        writeln!(f)?;
-        writeln!(
-            f,
-            "{}",
-            style(format!(
-                "  {:<44}  {:>15}  {:>15}  {:>15}  {:>23}",
-                "Identity Pubkey",
-                "Leader Slots",
-                "Blocks Produced",
-                "Skipped Slots",
-                "Skipped Slot Percentage",
-            ))
-            .bold()
-        )?;
-        for leader in &self.leaders {
-            writeln!(
-                f,
-                "  {:<44}  {:>15}  {:>15}  {:>15}  {:>22.2}%",
-                leader.identity_pubkey,
-                leader.leader_slots,
-                leader.blocks_produced,
-                leader.skipped_slots,
-                leader.skipped_slots as f64 / leader.leader_slots as f64 * 100.
-            )?;
-        }
-        writeln!(f)?;
-        writeln!(
-            f,
-            "  {:<44}  {:>15}  {:>15}  {:>15}  {:>22.2}%",
-            format!("Epoch {} total:", self.epoch),
-            self.total_slots,
-            self.total_blocks_produced,
-            self.total_slots_skipped,
-            self.total_slots_skipped as f64 / self.total_slots as f64 * 100.
-        )?;
-        writeln!(
-            f,
-            "  (using data from {} slots: {} to {})",
-            self.total_slots, self.start_slot, self.end_slot
-        )?;
-        if self.verbose {
-            writeln!(f)?;
-            writeln!(f)?;
-            writeln!(
-                f,
-                "{}",
-                style(format!("  {:<15} {:<44}", "Slot", "Identity Pubkey")).bold(),
-            )?;
-            for status in &self.individual_slot_status {
-                if status.skipped {
-                    writeln!(
-                        f,
-                        "{}",
-                        style(format!(
-                            "  {:<15} {:<44} SKIPPED",
-                            status.slot, status.leader
-                        ))
-                        .red()
-                    )?;
-                } else {
-                    writeln!(
-                        f,
-                        "{}",
-                        style(format!("  {:<15} {:<44}", status.slot, status.leader))
-                    )?;
-                }
-            }
-        }
-        Ok(())
-    }
-}
-
-#[derive(Default, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct CliBlockProductionEntry {
-    pub identity_pubkey: String,
-    pub leader_slots: u64,
-    pub blocks_produced: u64,
-    pub skipped_slots: u64,
-}
-
-#[derive(Default, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct CliSlotStatus {
-    pub slot: Slot,
-    pub leader: String,
-    pub skipped: bool,
-}
-
-#[derive(Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct CliEpochInfo {
-    #[serde(flatten)]
-    pub epoch_info: RpcEpochInfo,
-}
-
-impl From<RpcEpochInfo> for CliEpochInfo {
-    fn from(epoch_info: RpcEpochInfo) -> Self {
-        Self { epoch_info }
-    }
-}
-
-impl fmt::Display for CliEpochInfo {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        writeln!(f)?;
-        writeln_name_value(f, "Slot:", &self.epoch_info.absolute_slot.to_string())?;
-        writeln_name_value(f, "Epoch:", &self.epoch_info.epoch.to_string())?;
-        let start_slot = self.epoch_info.absolute_slot - self.epoch_info.slot_index;
-        let end_slot = start_slot + self.epoch_info.slots_in_epoch;
-        writeln_name_value(
-            f,
-            "Epoch Slot Range:",
-            &format!("[{}..{})", start_slot, end_slot),
-        )?;
-        writeln_name_value(
-            f,
-            "Epoch Completed Percent:",
-            &format!(
-                "{:>3.3}%",
-                self.epoch_info.slot_index as f64 / self.epoch_info.slots_in_epoch as f64 * 100_f64
-            ),
-        )?;
-        let remaining_slots_in_epoch = self.epoch_info.slots_in_epoch - self.epoch_info.slot_index;
-        writeln_name_value(
-            f,
-            "Epoch Completed Slots:",
-            &format!(
-                "{}/{} ({} remaining)",
-                self.epoch_info.slot_index,
-                self.epoch_info.slots_in_epoch,
-                remaining_slots_in_epoch
-            ),
-        )?;
-        writeln_name_value(
-            f,
-            "Epoch Completed Time:",
-            &format!(
-                "{}/{} ({} remaining)",
-                slot_to_human_time(self.epoch_info.slot_index),
-                slot_to_human_time(self.epoch_info.slots_in_epoch),
-                slot_to_human_time(remaining_slots_in_epoch)
-            ),
-        )
-    }
-}
-
-fn slot_to_human_time(slot: Slot) -> String {
-    humantime::format_duration(Duration::from_secs(
-        slot * clock::DEFAULT_TICKS_PER_SLOT / clock::DEFAULT_TICKS_PER_SECOND,
-    ))
-    .to_string()
-}
-
-#[derive(Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct CliValidators {
-    pub total_active_stake: u64,
-    pub total_current_stake: u64,
-    pub total_deliquent_stake: u64,
-    pub current_validators: Vec<CliValidator>,
-    pub delinquent_validators: Vec<CliValidator>,
-    #[serde(skip_serializing)]
-    pub use_lamports_unit: bool,
-}
-
-impl fmt::Display for CliValidators {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        fn write_vote_account(
-            f: &mut fmt::Formatter,
-            validator: &CliValidator,
-            total_active_stake: u64,
-            use_lamports_unit: bool,
-            delinquent: bool,
-        ) -> fmt::Result {
-            fn non_zero_or_dash(v: u64) -> String {
-                if v == 0 {
-                    "-".into()
-                } else {
-                    format!("{}", v)
-                }
-            }
-
-            writeln!(
-                f,
-                "{} {:<44}  {:<44}  {:>9}%   {:>8}  {:>10}  {:>7}  {}",
-                if delinquent {
-                    WARNING.to_string()
-                } else {
-                    " ".to_string()
-                },
-                validator.identity_pubkey,
-                validator.vote_account_pubkey,
-                validator.commission,
-                non_zero_or_dash(validator.last_vote),
-                non_zero_or_dash(validator.root_slot),
-                validator.credits,
-                if validator.activated_stake > 0 {
-                    format!(
-                        "{} ({:.2}%)",
-                        build_balance_message(validator.activated_stake, use_lamports_unit, true),
-                        100. * validator.activated_stake as f64 / total_active_stake as f64
-                    )
-                } else {
-                    "-".into()
-                },
-            )
-        }
-        writeln_name_value(
-            f,
-            "Active Stake:",
-            &build_balance_message(self.total_active_stake, self.use_lamports_unit, true),
-        )?;
-        if self.total_deliquent_stake > 0 {
-            writeln_name_value(
-                f,
-                "Current Stake:",
-                &format!(
-                    "{} ({:0.2}%)",
-                    &build_balance_message(self.total_current_stake, self.use_lamports_unit, true),
-                    100. * self.total_current_stake as f64 / self.total_active_stake as f64
-                ),
-            )?;
-            writeln_name_value(
-                f,
-                "Delinquent Stake:",
-                &format!(
-                    "{} ({:0.2}%)",
-                    &build_balance_message(
-                        self.total_deliquent_stake,
-                        self.use_lamports_unit,
-                        true
-                    ),
-                    100. * self.total_deliquent_stake as f64 / self.total_active_stake as f64
-                ),
-            )?;
-        }
-        writeln!(f)?;
-        writeln!(
-            f,
-            "{}",
-            style(format!(
-                "  {:<44}  {:<44}  {}  {}  {}  {:>7}  {}",
-                "Identity Pubkey",
-                "Vote Account Pubkey",
-                "Commission",
-                "Last Vote",
-                "Root Block",
-                "Credits",
-                "Active Stake",
-            ))
-            .bold()
-        )?;
-        for validator in &self.current_validators {
-            write_vote_account(
-                f,
-                validator,
-                self.total_active_stake,
-                self.use_lamports_unit,
-                false,
-            )?;
-        }
-        for validator in &self.delinquent_validators {
-            write_vote_account(
-                f,
-                validator,
-                self.total_active_stake,
-                self.use_lamports_unit,
-                true,
-            )?;
-        }
-        Ok(())
-    }
-}
-
-#[derive(Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct CliValidator {
-    pub identity_pubkey: String,
-    pub vote_account_pubkey: String,
-    pub commission: u8,
-    pub last_vote: u64,
-    pub root_slot: u64,
-    pub credits: u64,
-    pub activated_stake: u64,
-}
-
-impl CliValidator {
-    pub fn new(vote_account: &RpcVoteAccountInfo, current_epoch: Epoch) -> Self {
-        Self {
-            identity_pubkey: vote_account.node_pubkey.to_string(),
-            vote_account_pubkey: vote_account.vote_pubkey.to_string(),
-            commission: vote_account.commission,
-            last_vote: vote_account.last_vote,
-            root_slot: vote_account.root_slot,
-            credits: vote_account
-                .epoch_credits
-                .iter()
-                .find_map(|(epoch, credits, _)| {
-                    if *epoch == current_epoch {
-                        Some(*credits)
-                    } else {
-                        None
-                    }
-                })
-                .unwrap_or(0),
-            activated_stake: vote_account.activated_stake,
-        }
-    }
-}
-
-#[derive(Default, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct CliNonceAccount {
-    pub balance: u64,
-    pub minimum_balance_for_rent_exemption: u64,
-    pub nonce: Option<String>,
-    pub lamports_per_signature: Option<u64>,
-    pub authority: Option<String>,
-    #[serde(skip_serializing)]
-    pub use_lamports_unit: bool,
-}
-
-impl fmt::Display for CliNonceAccount {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        writeln!(
-            f,
-            "Balance: {}",
-            build_balance_message(self.balance, self.use_lamports_unit, true)
-        )?;
-        writeln!(
-            f,
-            "Minimum Balance Required: {}",
-            build_balance_message(
-                self.minimum_balance_for_rent_exemption,
-                self.use_lamports_unit,
-                true
-            )
-        )?;
-        let nonce = self.nonce.as_deref().unwrap_or("uninitialized");
-        writeln!(f, "Nonce: {}", nonce)?;
-        if let Some(fees) = self.lamports_per_signature {
-            writeln!(f, "Fee: {} lamports per signature", fees)?;
-        } else {
-            writeln!(f, "Fees: uninitialized")?;
-        }
-        let authority = self.authority.as_deref().unwrap_or("uninitialized");
-        writeln!(f, "Authority: {}", authority)
-    }
-}
-
-#[derive(Serialize, Deserialize)]
-pub struct CliStakeVec(Vec<CliKeyedStakeState>);
-
-impl CliStakeVec {
-    pub fn new(list: Vec<CliKeyedStakeState>) -> Self {
-        Self(list)
-    }
-}
-
-impl fmt::Display for CliStakeVec {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        for state in &self.0 {
-            writeln!(f)?;
-            write!(f, "{}", state)?;
-        }
-        Ok(())
-    }
-}
-
-#[derive(Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct CliKeyedStakeState {
-    pub stake_pubkey: String,
-    #[serde(flatten)]
-    pub stake_state: CliStakeState,
-}
-
-impl fmt::Display for CliKeyedStakeState {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        writeln!(f, "Stake Pubkey: {}", self.stake_pubkey)?;
-        write!(f, "{}", self.stake_state)
-    }
-}
-
-#[derive(Default, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct CliStakeState {
-    pub stake_type: CliStakeType,
-    pub total_stake: u64,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub delegated_stake: Option<u64>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub delegated_vote_account_address: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub activation_epoch: Option<Epoch>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub deactivation_epoch: Option<Epoch>,
-    #[serde(flatten, skip_serializing_if = "Option::is_none")]
-    pub authorized: Option<CliAuthorized>,
-    #[serde(flatten, skip_serializing_if = "Option::is_none")]
-    pub lockup: Option<CliLockup>,
-    #[serde(skip_serializing)]
-    pub use_lamports_unit: bool,
-}
-
-impl fmt::Display for CliStakeState {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        fn show_authorized(f: &mut fmt::Formatter, authorized: &CliAuthorized) -> fmt::Result {
-            writeln!(f, "Stake Authority: {}", authorized.staker)?;
-            writeln!(f, "Withdraw Authority: {}", authorized.withdrawer)?;
-            Ok(())
-        }
-        fn show_lockup(f: &mut fmt::Formatter, lockup: &CliLockup) -> fmt::Result {
-            writeln!(
-                f,
-                "Lockup Timestamp: {} (UnixTimestamp: {})",
-                DateTime::<Utc>::from_utc(
-                    NaiveDateTime::from_timestamp(lockup.unix_timestamp, 0),
-                    Utc
-                )
-                .to_rfc3339_opts(SecondsFormat::Secs, true),
-                lockup.unix_timestamp
-            )?;
-            writeln!(f, "Lockup Epoch: {}", lockup.epoch)?;
-            writeln!(f, "Lockup Custodian: {}", lockup.custodian)?;
-            Ok(())
-        }
-
-        match self.stake_type {
-            CliStakeType::RewardsPool => writeln!(f, "Stake account is a rewards pool")?,
-            CliStakeType::Uninitialized => writeln!(f, "Stake account is uninitialized")?,
-            CliStakeType::Initialized => {
-                writeln!(
-                    f,
-                    "Total Stake: {}",
-                    build_balance_message(self.total_stake, self.use_lamports_unit, true)
-                )?;
-                writeln!(f, "Stake account is undelegated")?;
-                show_authorized(f, self.authorized.as_ref().unwrap())?;
-                show_lockup(f, self.lockup.as_ref().unwrap())?;
-            }
-            CliStakeType::Stake => {
-                writeln!(
-                    f,
-                    "Total Stake: {}",
-                    build_balance_message(self.total_stake, self.use_lamports_unit, true)
-                )?;
-                writeln!(
-                    f,
-                    "Delegated Stake: {}",
-                    build_balance_message(
-                        self.delegated_stake.unwrap(),
-                        self.use_lamports_unit,
-                        true
-                    )
-                )?;
-                if let Some(delegated_vote_account_address) = &self.delegated_vote_account_address {
-                    writeln!(
-                        f,
-                        "Delegated Vote Account Address: {}",
-                        delegated_vote_account_address
-                    )?;
-                }
-                writeln!(
-                    f,
-                    "Stake activates starting from epoch: {}",
-                    self.activation_epoch.unwrap()
-                )?;
-                if let Some(deactivation_epoch) = self.deactivation_epoch {
-                    writeln!(
-                        f,
-                        "Stake deactivates starting from epoch: {}",
-                        deactivation_epoch
-                    )?;
-                }
-                show_authorized(f, self.authorized.as_ref().unwrap())?;
-                show_lockup(f, self.lockup.as_ref().unwrap())?;
-            }
-        }
-        Ok(())
-    }
-}
-
-#[derive(Serialize, Deserialize)]
-pub enum CliStakeType {
-    Stake,
-    RewardsPool,
-    Uninitialized,
-    Initialized,
-}
-
-impl Default for CliStakeType {
-    fn default() -> Self {
-        Self::Uninitialized
-    }
-}
-
-#[derive(Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct CliStakeHistory {
-    pub entries: Vec<CliStakeHistoryEntry>,
-    #[serde(skip_serializing)]
-    pub use_lamports_unit: bool,
-}
-
-impl fmt::Display for CliStakeHistory {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        writeln!(f)?;
-        writeln!(
-            f,
-            "{}",
-            style(format!(
-                "  {:<5}  {:>20}  {:>20}  {:>20}",
-                "Epoch", "Effective Stake", "Activating Stake", "Deactivating Stake",
-            ))
-            .bold()
-        )?;
-        for entry in &self.entries {
-            writeln!(
-                f,
-                "  {:>5}  {:>20}  {:>20}  {:>20} {}",
-                entry.epoch,
-                build_balance_message(entry.effective_stake, self.use_lamports_unit, false),
-                build_balance_message(entry.activating_stake, self.use_lamports_unit, false),
-                build_balance_message(entry.deactivating_stake, self.use_lamports_unit, false),
-                if self.use_lamports_unit {
-                    "lamports"
-                } else {
-                    "SOL"
-                }
-            )?;
-        }
-        Ok(())
-    }
-}
-
-impl From<&(Epoch, StakeHistoryEntry)> for CliStakeHistoryEntry {
-    fn from((epoch, entry): &(Epoch, StakeHistoryEntry)) -> Self {
-        Self {
-            epoch: *epoch,
-            effective_stake: entry.effective,
-            activating_stake: entry.activating,
-            deactivating_stake: entry.deactivating,
-        }
-    }
-}
-
-#[derive(Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct CliStakeHistoryEntry {
-    pub epoch: Epoch,
-    pub effective_stake: u64,
-    pub activating_stake: u64,
-    pub deactivating_stake: u64,
-}
-
-#[derive(Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct CliAuthorized {
-    pub staker: String,
-    pub withdrawer: String,
-}
-
-impl From<&Authorized> for CliAuthorized {
-    fn from(authorized: &Authorized) -> Self {
-        Self {
-            staker: authorized.staker.to_string(),
-            withdrawer: authorized.withdrawer.to_string(),
-        }
-    }
-}
-
-#[derive(Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct CliLockup {
-    pub unix_timestamp: UnixTimestamp,
-    pub epoch: Epoch,
-    pub custodian: String,
-}
-
-impl From<&Lockup> for CliLockup {
-    fn from(lockup: &Lockup) -> Self {
-        Self {
-            unix_timestamp: lockup.unix_timestamp,
-            epoch: lockup.epoch,
-            custodian: lockup.custodian.to_string(),
-        }
-    }
-}
-
-#[derive(Serialize, Deserialize)]
-pub struct CliValidatorInfoVec(Vec<CliValidatorInfo>);
-
-impl CliValidatorInfoVec {
-    pub fn new(list: Vec<CliValidatorInfo>) -> Self {
-        Self(list)
-    }
-}
-
-impl fmt::Display for CliValidatorInfoVec {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        if self.0.is_empty() {
-            writeln!(f, "No validator info accounts found")?;
-        }
-        for validator_info in &self.0 {
-            writeln!(f)?;
-            write!(f, "{}", validator_info)?;
-        }
-        Ok(())
-    }
-}
-
-#[derive(Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct CliValidatorInfo {
-    pub identity_pubkey: String,
-    pub info_pubkey: String,
-    pub info: Map<String, Value>,
-}
-
-impl fmt::Display for CliValidatorInfo {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        writeln_name_value(f, "Validator Identity Pubkey:", &self.identity_pubkey)?;
-        writeln_name_value(f, "  Info Pubkey:", &self.info_pubkey)?;
-        for (key, value) in self.info.iter() {
-            writeln_name_value(
-                f,
-                &format!("  {}:", to_title_case(key)),
-                &value.as_str().unwrap_or("?"),
-            )?;
-        }
-        Ok(())
-    }
-}
-
-#[derive(Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct CliVoteAccount {
-    pub account_balance: u64,
-    pub validator_identity: String,
-    #[serde(flatten)]
-    pub authorized_voters: CliAuthorizedVoters,
-    pub authorized_withdrawer: String,
-    pub credits: u64,
-    pub commission: u8,
-    pub root_slot: Option<Slot>,
-    pub recent_timestamp: BlockTimestamp,
-    pub votes: Vec<CliLockout>,
-    pub epoch_voting_history: Vec<CliEpochVotingHistory>,
-    #[serde(skip_serializing)]
-    pub use_lamports_unit: bool,
-}
-
-impl fmt::Display for CliVoteAccount {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        writeln!(
-            f,
-            "Account Balance: {}",
-            build_balance_message(self.account_balance, self.use_lamports_unit, true)
-        )?;
-        writeln!(f, "Validator Identity: {}", self.validator_identity)?;
-        writeln!(f, "Authorized Voters: {}", self.authorized_voters)?;
-        writeln!(f, "Authorized Withdrawer: {}", self.authorized_withdrawer)?;
-        writeln!(f, "Credits: {}", self.credits)?;
-        writeln!(f, "Commission: {}%", self.commission)?;
-        writeln!(
-            f,
-            "Root Slot: {}",
-            match self.root_slot {
-                Some(slot) => slot.to_string(),
-                None => "~".to_string(),
-            }
-        )?;
-        writeln!(f, "Recent Timestamp: {:?}", self.recent_timestamp)?;
-        if !self.votes.is_empty() {
-            writeln!(f, "Recent Votes:")?;
-            for vote in &self.votes {
-                writeln!(
-                    f,
-                    "- slot: {}\n  confirmation count: {}",
-                    vote.slot, vote.confirmation_count
-                )?;
-            }
-            writeln!(f, "Epoch Voting History:")?;
-            for epoch_info in &self.epoch_voting_history {
-                writeln!(
-                    f,
-                    "- epoch: {}\n  slots in epoch: {}\n  credits earned: {}",
-                    epoch_info.epoch, epoch_info.slots_in_epoch, epoch_info.credits_earned,
-                )?;
-            }
-        }
-        Ok(())
-    }
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct CliAuthorizedVoters {
-    authorized_voters: BTreeMap<Epoch, String>,
-}
-
-impl fmt::Display for CliAuthorizedVoters {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f, "{:?}", self.authorized_voters)
-    }
-}
-
-impl From<&AuthorizedVoters> for CliAuthorizedVoters {
-    fn from(authorized_voters: &AuthorizedVoters) -> Self {
-        let mut voter_map: BTreeMap<Epoch, String> = BTreeMap::new();
-        for (epoch, voter) in authorized_voters.iter() {
-            voter_map.insert(*epoch, voter.to_string());
-        }
-        Self {
-            authorized_voters: voter_map,
-        }
-    }
-}
-
-#[derive(Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct CliEpochVotingHistory {
-    pub epoch: Epoch,
-    pub slots_in_epoch: u64,
-    pub credits_earned: u64,
-}
-
-#[derive(Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct CliLockout {
-    pub slot: Slot,
-    pub confirmation_count: u32,
-}
-
-impl From<&Lockout> for CliLockout {
-    fn from(lockout: &Lockout) -> Self {
-        Self {
-            slot: lockout.slot,
-            confirmation_count: lockout.confirmation_count,
-        }
-    }
-}

cli/src/cluster_query.rs

@@ -1,25 +1,18 @@
 use crate::{
-    cli::{check_account_for_fee, CliCommand, CliCommandInfo, CliConfig, CliError, ProcessResult},
-    cli_output::{
-        CliBlockProduction, CliBlockProductionEntry, CliEpochInfo, CliKeyedStakeState,
-        CliSlotStatus, CliStakeVec, CliValidator, CliValidators,
+    cli::{
+        build_balance_message, check_account_for_fee, CliCommand, CliCommandInfo, CliConfig,
+        CliError, ProcessResult,
     },
     display::println_name_value,
 };
-use chrono::{DateTime, NaiveDateTime, SecondsFormat, Utc};
 use clap::{value_t, value_t_or_exit, App, Arg, ArgMatches, SubCommand};
 use console::{style, Emoji};
 use indicatif::{ProgressBar, ProgressStyle};
-use solana_clap_utils::{
-    commitment::{commitment_arg, COMMITMENT_ARG},
-    input_parsers::*,
-    input_validators::*,
-    keypair::signer_from_path,
-};
+use solana_clap_utils::{input_parsers::*, input_validators::*, keypair::signer_from_path};
 use solana_client::{
     pubsub_client::{PubsubClient, SlotInfoMessage},
     rpc_client::RpcClient,
-    rpc_request::MAX_GET_CONFIRMED_SIGNATURES_FOR_ADDRESS_SLOT_RANGE,
+    rpc_response::RpcVoteAccountInfo,
 };
 use solana_remote_wallet::remote_wallet::RemoteWalletManager;
 use solana_sdk::{
@@ -29,7 +22,6 @@ use solana_sdk::{
     epoch_schedule::Epoch,
     hash::Hash,
     message::Message,
-    native_token::lamports_to_sol,
     pubkey::Pubkey,
     signature::{Keypair, Signer},
     system_instruction,
@@ -48,6 +40,7 @@ use std::{
 
 static CHECK_MARK: Emoji = Emoji("✅ ", "");
 static CROSS_MARK: Emoji = Emoji("❌ ", "");
+static WARNING: Emoji = Emoji("⚠️", "!");
 
 pub trait ClusterQuerySubCommands {
     fn cluster_query_subcommands(self) -> Self;
@@ -74,14 +67,7 @@ impl ClusterQuerySubCommands for App<'_, '_> {
                         .takes_value(true)
                         .validator(is_url)
                         .help("JSON RPC URL for validator, which is useful for validators with a private RPC service")
-                )
-                .arg(
-                    Arg::with_name("follow")
-                        .long("follow")
-                        .takes_value(false)
-                        .help("Continue reporting progress even after the validator has caught up"),
-                )
-                .arg(commitment_arg()),
+                ),
         )
         .subcommand(
             SubCommand::with_name("cluster-version")
@@ -105,7 +91,14 @@ impl ClusterQuerySubCommands for App<'_, '_> {
             SubCommand::with_name("epoch-info")
             .about("Get information about the current epoch")
             .alias("get-epoch-info")
-            .arg(commitment_arg()),
+            .arg(
+                Arg::with_name("confirmed")
+                    .long("confirmed")
+                    .takes_value(false)
+                    .help(
+                        "Return information at maximum-lockout commitment level",
+                    ),
+            ),
         )
         .subcommand(
             SubCommand::with_name("genesis-hash")
@@ -115,20 +108,37 @@ impl ClusterQuerySubCommands for App<'_, '_> {
         .subcommand(
             SubCommand::with_name("slot").about("Get current slot")
             .alias("get-slot")
-            .arg(commitment_arg()),
+            .arg(
+                Arg::with_name("confirmed")
+                    .long("confirmed")
+                    .takes_value(false)
+                    .help(
+                        "Return slot at maximum-lockout commitment level",
+                    ),
+            ),
         )
         .subcommand(
             SubCommand::with_name("epoch").about("Get current epoch")
-            .arg(commitment_arg()),
-        )
-        .subcommand(
-            SubCommand::with_name("total-supply").about("Get total number of SOL")
-            .arg(commitment_arg()),
+            .arg(
+                Arg::with_name("confirmed")
+                    .long("confirmed")
+                    .takes_value(false)
+                    .help(
+                        "Return epoch at maximum-lockout commitment level",
+                    ),
+            ),
         )
         .subcommand(
             SubCommand::with_name("transaction-count").about("Get current transaction count")
             .alias("get-transaction-count")
-            .arg(commitment_arg()),
+            .arg(
+                Arg::with_name("confirmed")
+                    .long("confirmed")
+                    .takes_value(false)
+                    .help(
+                        "Return count at maximum-lockout commitment level",
+                    ),
+            ),
         )
         .subcommand(
             SubCommand::with_name("ping")
@@ -169,12 +179,12 @@ impl ClusterQuerySubCommands for App<'_, '_> {
                         .help("Wait up to timeout seconds for transaction confirmation"),
                 )
                 .arg(
-                    Arg::with_name(COMMITMENT_ARG.name)
-                        .long(COMMITMENT_ARG.long)
-                        .takes_value(true)
-                        .possible_values(&["default", "max", "recent", "root"])
-                        .value_name("COMMITMENT_LEVEL")
-                        .help("Wait until the transaction is confirmed at selected commitment level"),
+                    Arg::with_name("confirmed")
+                        .long("confirmed")
+                        .takes_value(false)
+                        .help(
+                            "Wait until the transaction is confirmed at maximum-lockout commitment level",
+                        ),
                 ),
         )
         .subcommand(
@@ -226,46 +236,19 @@ impl ClusterQuerySubCommands for App<'_, '_> {
             SubCommand::with_name("validators")
                 .about("Show summary information about the current validators")
                 .alias("show-validators")
+                .arg(
+                    Arg::with_name("confirmed")
+                        .long("confirmed")
+                        .takes_value(false)
+                        .help(
+                            "Return information at maximum-lockout commitment level",
+                        ),
+                )
                 .arg(
                     Arg::with_name("lamports")
                         .long("lamports")
                         .takes_value(false)
                         .help("Display balance in lamports instead of SOL"),
-                )
-                .arg(commitment_arg()),
-        )
-        .subcommand(
-            SubCommand::with_name("transaction-history")
-                .about("Show historical transactions affecting the given address, \
-                       ordered based on the slot in which they were confirmed in \
-                       from lowest to highest slot")
-                .arg(
-                    Arg::with_name("address")
-                        .index(1)
-                        .value_name("ADDRESS")
-                        .required(true)
-                        .validator(is_valid_pubkey)
-                        .help("Account address"),
-                )
-                .arg(
-                    Arg::with_name("end_slot")
-                        .takes_value(false)
-                        .value_name("SLOT")
-                        .index(2)
-                        .validator(is_slot)
-                        .help(
-                            "Slot to start from [default: latest slot at maximum commitment]"
-                        ),
-                )
-                .arg(
-                    Arg::with_name("limit")
-                        .long("limit")
-                        .takes_value(true)
-                        .value_name("NUMBER OF SLOTS")
-                        .validator(is_slot)
-                        .help(
-                            "Limit the search to this many slots"
-                        ),
                 ),
         )
     }
@@ -273,19 +256,14 @@ impl ClusterQuerySubCommands for App<'_, '_> {
 
 pub fn parse_catchup(
     matches: &ArgMatches<'_>,
-    wallet_manager: &mut Option<Arc<RemoteWalletManager>>,
+    wallet_manager: Option<&Arc<RemoteWalletManager>>,
 ) -> Result<CliCommandInfo, CliError> {
     let node_pubkey = pubkey_of_signer(matches, "node_pubkey", wallet_manager)?.unwrap();
     let node_json_rpc_url = value_t!(matches, "node_json_rpc_url", String).ok();
-    let commitment_config =
-        commitment_of(matches, COMMITMENT_ARG.long).unwrap_or_else(CommitmentConfig::recent);
-    let follow = matches.is_present("follow");
     Ok(CliCommandInfo {
         command: CliCommand::Catchup {
             node_pubkey,
             node_json_rpc_url,
-            commitment_config,
-            follow,
         },
         signers: vec![],
     })
@@ -294,7 +272,7 @@ pub fn parse_catchup(
 pub fn parse_cluster_ping(
     matches: &ArgMatches<'_>,
     default_signer_path: &str,
-    wallet_manager: &mut Option<Arc<RemoteWalletManager>>,
+    wallet_manager: Option<&Arc<RemoteWalletManager>>,
 ) -> Result<CliCommandInfo, CliError> {
     let lamports = value_t_or_exit!(matches, "lamports", u64);
     let interval = Duration::from_secs(value_t_or_exit!(matches, "interval", u64));
@@ -304,8 +282,11 @@ pub fn parse_cluster_ping(
         None
     };
     let timeout = Duration::from_secs(value_t_or_exit!(matches, "timeout", u64));
-    let commitment_config =
-        commitment_of(matches, COMMITMENT_ARG.long).unwrap_or_else(CommitmentConfig::recent);
+    let commitment_config = if matches.is_present("confirmed") {
+        CommitmentConfig::default()
+    } else {
+        CommitmentConfig::recent()
+    };
     Ok(CliCommandInfo {
         command: CliCommand::Ping {
             lamports,
@@ -332,8 +313,11 @@ pub fn parse_get_block_time(matches: &ArgMatches<'_>) -> Result<CliCommandInfo,
 }
 
 pub fn parse_get_epoch_info(matches: &ArgMatches<'_>) -> Result<CliCommandInfo, CliError> {
-    let commitment_config =
-        commitment_of(matches, COMMITMENT_ARG.long).unwrap_or_else(CommitmentConfig::recent);
+    let commitment_config = if matches.is_present("confirmed") {
+        CommitmentConfig::default()
+    } else {
+        CommitmentConfig::recent()
+    };
     Ok(CliCommandInfo {
         command: CliCommand::GetEpochInfo { commitment_config },
         signers: vec![],
@@ -341,8 +325,11 @@ pub fn parse_get_epoch_info(matches: &ArgMatches<'_>) -> Result<CliCommandInfo,
 }
 
 pub fn parse_get_slot(matches: &ArgMatches<'_>) -> Result<CliCommandInfo, CliError> {
-    let commitment_config =
-        commitment_of(matches, COMMITMENT_ARG.long).unwrap_or_else(CommitmentConfig::recent);
+    let commitment_config = if matches.is_present("confirmed") {
+        CommitmentConfig::default()
+    } else {
+        CommitmentConfig::recent()
+    };
     Ok(CliCommandInfo {
         command: CliCommand::GetSlot { commitment_config },
         signers: vec![],
@@ -350,26 +337,23 @@ pub fn parse_get_slot(matches: &ArgMatches<'_>) -> Result<CliCommandInfo, CliErr
 }
 
 pub fn parse_get_epoch(matches: &ArgMatches<'_>) -> Result<CliCommandInfo, CliError> {
-    let commitment_config =
-        commitment_of(matches, COMMITMENT_ARG.long).unwrap_or_else(CommitmentConfig::recent);
+    let commitment_config = if matches.is_present("confirmed") {
+        CommitmentConfig::default()
+    } else {
+        CommitmentConfig::recent()
+    };
     Ok(CliCommandInfo {
         command: CliCommand::GetEpoch { commitment_config },
         signers: vec![],
     })
 }
 
-pub fn parse_total_supply(matches: &ArgMatches<'_>) -> Result<CliCommandInfo, CliError> {
-    let commitment_config =
-        commitment_of(matches, COMMITMENT_ARG.long).unwrap_or_else(CommitmentConfig::recent);
-    Ok(CliCommandInfo {
-        command: CliCommand::TotalSupply { commitment_config },
-        signers: vec![],
-    })
-}
-
 pub fn parse_get_transaction_count(matches: &ArgMatches<'_>) -> Result<CliCommandInfo, CliError> {
-    let commitment_config =
-        commitment_of(matches, COMMITMENT_ARG.long).unwrap_or_else(CommitmentConfig::recent);
+    let commitment_config = if matches.is_present("confirmed") {
+        CommitmentConfig::default()
+    } else {
+        CommitmentConfig::recent()
+    };
     Ok(CliCommandInfo {
         command: CliCommand::GetTransactionCount { commitment_config },
         signers: vec![],
@@ -378,7 +362,7 @@ pub fn parse_get_transaction_count(matches: &ArgMatches<'_>) -> Result<CliComman
 
 pub fn parse_show_stakes(
     matches: &ArgMatches<'_>,
-    wallet_manager: &mut Option<Arc<RemoteWalletManager>>,
+    wallet_manager: Option<&Arc<RemoteWalletManager>>,
 ) -> Result<CliCommandInfo, CliError> {
     let use_lamports_unit = matches.is_present("lamports");
     let vote_account_pubkeys =
@@ -395,8 +379,11 @@ pub fn parse_show_stakes(
 
 pub fn parse_show_validators(matches: &ArgMatches<'_>) -> Result<CliCommandInfo, CliError> {
     let use_lamports_unit = matches.is_present("lamports");
-    let commitment_config =
-        commitment_of(matches, COMMITMENT_ARG.long).unwrap_or_else(CommitmentConfig::recent);
+    let commitment_config = if matches.is_present("confirmed") {
+        CommitmentConfig::default()
+    } else {
+        CommitmentConfig::recent()
+    };
 
     Ok(CliCommandInfo {
         command: CliCommand::ShowValidators {
@@ -407,25 +394,6 @@ pub fn parse_show_validators(matches: &ArgMatches<'_>) -> Result<CliCommandInfo,
     })
 }
 
-pub fn parse_transaction_history(
-    matches: &ArgMatches<'_>,
-    wallet_manager: &mut Option<Arc<RemoteWalletManager>>,
-) -> Result<CliCommandInfo, CliError> {
-    let address = pubkey_of_signer(matches, "address", wallet_manager)?.unwrap();
-    let end_slot = value_t!(matches, "end_slot", Slot).ok();
-    let slot_limit = value_t!(matches, "limit", u64)
-        .unwrap_or(MAX_GET_CONFIRMED_SIGNATURES_FOR_ADDRESS_SLOT_RANGE);
-
-    Ok(CliCommandInfo {
-        command: CliCommand::TransactionHistory {
-            address,
-            end_slot,
-            slot_limit,
-        },
-        signers: vec![],
-    })
-}
-
 /// Creates a new process bar for processing that will take an unknown amount of time
 fn new_spinner_progress_bar() -> ProgressBar {
     let progress_bar = ProgressBar::new(42);
@@ -439,37 +407,20 @@ pub fn process_catchup(
     rpc_client: &RpcClient,
     node_pubkey: &Pubkey,
     node_json_rpc_url: &Option<String>,
-    commitment_config: CommitmentConfig,
-    follow: bool,
 ) -> ProcessResult {
-    let sleep_interval = 5;
-
-    let progress_bar = new_spinner_progress_bar();
-    progress_bar.set_message("Connecting...");
+    let cluster_nodes = rpc_client.get_cluster_nodes()?;
 
     let node_client = if let Some(node_json_rpc_url) = node_json_rpc_url {
         RpcClient::new(node_json_rpc_url.to_string())
     } else {
-        let rpc_addr = loop {
-            let cluster_nodes = rpc_client.get_cluster_nodes()?;
-            if let Some(contact_info) = cluster_nodes
+        RpcClient::new_socket(
+            cluster_nodes
                 .iter()
                 .find(|contact_info| contact_info.pubkey == node_pubkey.to_string())
-            {
-                if let Some(rpc_addr) = contact_info.rpc {
-                    break rpc_addr;
-                }
-                progress_bar.set_message(&format!("RPC service not found for {}", node_pubkey));
-            } else {
-                progress_bar.set_message(&format!(
-                    "Contact information not found for {}",
-                    node_pubkey
-                ));
-            }
-            sleep(Duration::from_secs(sleep_interval as u64));
-        };
-
-        RpcClient::new_socket(rpc_addr)
+                .ok_or_else(|| format!("Contact information not found for {}", node_pubkey))?
+                .rpc
+                .ok_or_else(|| format!("RPC service not found for {}", node_pubkey))?,
+        )
     };
 
     let reported_node_pubkey = node_client.get_identity()?;
@@ -485,12 +436,16 @@ pub fn process_catchup(
         return Err("Both RPC URLs reference the same node, unable to monitor for catchup.  Try a different --url".into());
     }
 
+    let progress_bar = new_spinner_progress_bar();
+    progress_bar.set_message("Connecting...");
+
     let mut previous_rpc_slot = std::u64::MAX;
     let mut previous_slot_distance = 0;
+    let sleep_interval = 5;
     loop {
-        let rpc_slot = rpc_client.get_slot_with_commitment(commitment_config)?;
-        let node_slot = node_client.get_slot_with_commitment(commitment_config)?;
-        if !follow && node_slot > std::cmp::min(previous_rpc_slot, rpc_slot) {
+        let rpc_slot = rpc_client.get_slot_with_commitment(CommitmentConfig::recent())?;
+        let node_slot = node_client.get_slot_with_commitment(CommitmentConfig::recent())?;
+        if node_slot > std::cmp::min(previous_rpc_slot, rpc_slot) {
             progress_bar.finish_and_clear();
             return Ok(format!(
                 "{} has caught up (us:{} them:{})",
@@ -499,36 +454,25 @@ pub fn process_catchup(
         }
 
         let slot_distance = rpc_slot as i64 - node_slot as i64;
-        let slots_per_second =
-            (previous_slot_distance - slot_distance) as f64 / f64::from(sleep_interval);
-        let time_remaining = if slots_per_second <= 0.0 {
-            "".to_string()
-        } else {
-            format!(
-                ". Time remaining: {}",
-                humantime::format_duration(Duration::from_secs_f64(
-                    (slot_distance as f64 / slots_per_second).round()
-                ))
-            )
-        };
-
         progress_bar.set_message(&format!(
-            "{} slots behind (us:{} them:{}){}",
+            "Validator is {} slots away (us:{} them:{}){}",
             slot_distance,
             node_slot,
             rpc_slot,
-            if slot_distance == 0 || previous_rpc_slot == std::u64::MAX {
+            if previous_rpc_slot == std::u64::MAX {
                 "".to_string()
             } else {
+                let slots_per_second =
+                    (previous_slot_distance - slot_distance) as f64 / f64::from(sleep_interval);
+
                 format!(
-                    ", {} at {:.1} slots/second{}",
+                    " and {} at {:.1} slots/second",
                     if slots_per_second < 0.0 {
                         "falling behind"
                     } else {
                         "gaining"
                     },
                     slots_per_second,
-                    time_remaining
                 )
             }
         ));
@@ -590,24 +534,54 @@ pub fn process_leader_schedule(rpc_client: &RpcClient) -> ProcessResult {
 
 pub fn process_get_block_time(rpc_client: &RpcClient, slot: Slot) -> ProcessResult {
     let timestamp = rpc_client.get_block_time(slot)?;
-    let result = format!(
-        "{} (UnixTimestamp: {})",
-        DateTime::<Utc>::from_utc(NaiveDateTime::from_timestamp(timestamp, 0), Utc)
-            .to_rfc3339_opts(SecondsFormat::Secs, true),
-        timestamp
-    );
-    Ok(result)
+    Ok(timestamp.to_string())
+}
+
+fn slot_to_human_time(slot: Slot) -> String {
+    humantime::format_duration(Duration::from_secs(
+        slot * clock::DEFAULT_TICKS_PER_SLOT / clock::DEFAULT_TICKS_PER_SECOND,
+    ))
+    .to_string()
 }
 
 pub fn process_get_epoch_info(
     rpc_client: &RpcClient,
-    config: &CliConfig,
     commitment_config: CommitmentConfig,
 ) -> ProcessResult {
-    let epoch_info: CliEpochInfo = rpc_client
-        .get_epoch_info_with_commitment(commitment_config.clone())?
-        .into();
-    config.output_format.formatted_print(&epoch_info);
+    let epoch_info = rpc_client.get_epoch_info_with_commitment(commitment_config.clone())?;
+    println!();
+    println_name_value("Slot:", &epoch_info.absolute_slot.to_string());
+    println_name_value("Epoch:", &epoch_info.epoch.to_string());
+    let start_slot = epoch_info.absolute_slot - epoch_info.slot_index;
+    let end_slot = start_slot + epoch_info.slots_in_epoch;
+    println_name_value(
+        "Epoch Slot Range:",
+        &format!("[{}..{})", start_slot, end_slot),
+    );
+    println_name_value(
+        "Epoch Completed Percent:",
+        &format!(
+            "{:>3.3}%",
+            epoch_info.slot_index as f64 / epoch_info.slots_in_epoch as f64 * 100_f64
+        ),
+    );
+    let remaining_slots_in_epoch = epoch_info.slots_in_epoch - epoch_info.slot_index;
+    println_name_value(
+        "Epoch Completed Slots:",
+        &format!(
+            "{}/{} ({} remaining)",
+            epoch_info.slot_index, epoch_info.slots_in_epoch, remaining_slots_in_epoch
+        ),
+    );
+    println_name_value(
+        "Epoch Completed Time:",
+        &format!(
+            "{}/{} ({} remaining)",
+            slot_to_human_time(epoch_info.slot_index),
+            slot_to_human_time(epoch_info.slots_in_epoch),
+            slot_to_human_time(remaining_slots_in_epoch)
+        ),
+    );
     Ok("".to_string())
 }
 
@@ -700,9 +674,9 @@ pub fn process_show_block_production(
     let start_slot_index = (start_slot - first_slot_in_epoch) as usize;
     let end_slot_index = (end_slot - first_slot_in_epoch) as usize;
     let total_slots = end_slot_index - start_slot_index + 1;
-    let total_blocks_produced = confirmed_blocks.len();
-    assert!(total_blocks_produced <= total_slots);
-    let total_slots_skipped = total_slots - total_blocks_produced;
+    let total_blocks = confirmed_blocks.len();
+    assert!(total_blocks <= total_slots);
+    let total_slots_skipped = total_slots - total_blocks;
     let mut leader_slot_count = HashMap::new();
     let mut leader_skipped_slots = HashMap::new();
 
@@ -726,7 +700,7 @@ pub fn process_show_block_production(
 
     progress_bar.set_message(&format!(
         "Processing {} slots containing {} blocks and {} empty slots...",
-        total_slots, total_blocks_produced, total_slots_skipped
+        total_slots, total_blocks, total_slots_skipped
     ));
 
     let mut confirmed_blocks_index = 0;
@@ -745,61 +719,72 @@ pub fn process_show_block_production(
                     continue;
                 }
                 if slot_of_next_confirmed_block == slot {
-                    individual_slot_status.push(CliSlotStatus {
-                        slot,
-                        leader: (*leader).to_string(),
-                        skipped: false,
-                    });
+                    individual_slot_status
+                        .push(style(format!("  {:<15} {:<44}", slot, leader)).to_string());
                     break;
                 }
             }
             *skipped_slots += 1;
-            individual_slot_status.push(CliSlotStatus {
-                slot,
-                leader: (*leader).to_string(),
-                skipped: true,
-            });
+            individual_slot_status.push(
+                style(format!("  {:<15} {:<44} SKIPPED", slot, leader))
+                    .red()
+                    .to_string(),
+            );
             break;
         }
     }
 
     progress_bar.finish_and_clear();
+    println!(
+        "\n{}",
+        style(format!(
+            "  {:<44}  {:>15}  {:>15}  {:>15}  {:>23}",
+            "Identity Pubkey",
+            "Leader Slots",
+            "Blocks Produced",
+            "Skipped Slots",
+            "Skipped Slot Percentage",
+        ))
+        .bold()
+    );
 
-    let mut leaders: Vec<CliBlockProductionEntry> = leader_slot_count
-        .iter()
-        .map(|(leader, leader_slots)| {
-            let skipped_slots = leader_skipped_slots.get(leader).unwrap();
-            let blocks_produced = leader_slots - skipped_slots;
-            CliBlockProductionEntry {
-                identity_pubkey: (**leader).to_string(),
-                leader_slots: *leader_slots,
-                blocks_produced,
-                skipped_slots: *skipped_slots,
-            }
-        })
-        .collect();
-    leaders.sort_by(|a, b| a.identity_pubkey.partial_cmp(&b.identity_pubkey).unwrap());
-    let block_production = CliBlockProduction {
-        epoch,
-        start_slot,
-        end_slot,
+    let mut table = vec![];
+    for (leader, leader_slots) in leader_slot_count.iter() {
+        let skipped_slots = leader_skipped_slots.get(leader).unwrap();
+        let blocks_produced = leader_slots - skipped_slots;
+        table.push(format!(
+            "  {:<44}  {:>15}  {:>15}  {:>15}  {:>22.2}%",
+            leader,
+            leader_slots,
+            blocks_produced,
+            skipped_slots,
+            *skipped_slots as f64 / *leader_slots as f64 * 100.
+        ));
+    }
+    table.sort();
+
+    println!(
+        "{}\n\n  {:<44}  {:>15}  {:>15}  {:>15}  {:>22.2}%",
+        table.join("\n"),
+        format!("Epoch {} total:", epoch),
         total_slots,
-        total_blocks_produced,
+        total_blocks,
         total_slots_skipped,
-        leaders,
-        individual_slot_status,
-        verbose: config.verbose,
-    };
-    config.output_format.formatted_print(&block_production);
-    Ok("".to_string())
-}
+        total_slots_skipped as f64 / total_slots as f64 * 100.
+    );
+    println!(
+        "  (using data from {} slots: {} to {})",
+        total_slots, start_slot, end_slot
+    );
 
-pub fn process_total_supply(
-    rpc_client: &RpcClient,
-    commitment_config: CommitmentConfig,
-) -> ProcessResult {
-    let total_supply = rpc_client.total_supply_with_commitment(commitment_config.clone())?;
-    Ok(format!("{} SOL", lamports_to_sol(total_supply)))
+    if config.verbose {
+        println!(
+            "\n\n{}\n{}",
+            style(format!("  {:<15} {:<44}", "Slot", "Identity Pubkey")).bold(),
+            individual_slot_status.join("\n")
+        );
+    }
+    Ok("".to_string())
 }
 
 pub fn process_get_transaction_count(
@@ -1072,11 +1057,10 @@ pub fn process_show_gossip(rpc_client: &RpcClient) -> ProcessResult {
 
 pub fn process_show_stakes(
     rpc_client: &RpcClient,
-    config: &CliConfig,
     use_lamports_unit: bool,
     vote_account_pubkeys: Option<&[Pubkey]>,
 ) -> ProcessResult {
-    use crate::stake::build_stake_state;
+    use crate::stake::print_stake_state;
     use solana_stake_program::stake_state::StakeState;
 
     let progress_bar = new_spinner_progress_bar();
@@ -1084,20 +1068,13 @@ pub fn process_show_stakes(
     let all_stake_accounts = rpc_client.get_program_accounts(&solana_stake_program::id())?;
     progress_bar.finish_and_clear();
 
-    let mut stake_accounts: Vec<CliKeyedStakeState> = vec![];
     for (stake_pubkey, stake_account) in all_stake_accounts {
         if let Ok(stake_state) = stake_account.state() {
             match stake_state {
                 StakeState::Initialized(_) => {
                     if vote_account_pubkeys.is_none() {
-                        stake_accounts.push(CliKeyedStakeState {
-                            stake_pubkey: stake_pubkey.to_string(),
-                            stake_state: build_stake_state(
-                                stake_account.lamports,
-                                &stake_state,
-                                use_lamports_unit,
-                            ),
-                        });
+                        println!("\nstake pubkey: {}", stake_pubkey);
+                        print_stake_state(stake_account.lamports, &stake_state, use_lamports_unit);
                     }
                 }
                 StakeState::Stake(_, stake) => {
@@ -1106,29 +1083,19 @@ pub fn process_show_stakes(
                             .unwrap()
                             .contains(&stake.delegation.voter_pubkey)
                     {
-                        stake_accounts.push(CliKeyedStakeState {
-                            stake_pubkey: stake_pubkey.to_string(),
-                            stake_state: build_stake_state(
-                                stake_account.lamports,
-                                &stake_state,
-                                use_lamports_unit,
-                            ),
-                        });
+                        println!("\nstake pubkey: {}", stake_pubkey);
+                        print_stake_state(stake_account.lamports, &stake_state, use_lamports_unit);
                     }
                 }
                 _ => {}
             }
         }
     }
-    config
-        .output_format
-        .formatted_print(&CliStakeVec::new(stake_accounts));
     Ok("".to_string())
 }
 
 pub fn process_show_validators(
     rpc_client: &RpcClient,
-    config: &CliConfig,
     use_lamports_unit: bool,
     commitment_config: CommitmentConfig,
 ) -> ProcessResult {
@@ -1138,64 +1105,123 @@ pub fn process_show_validators(
         .current
         .iter()
         .chain(vote_accounts.delinquent.iter())
-        .fold(0, |acc, vote_account| acc + vote_account.activated_stake);
+        .fold(0, |acc, vote_account| acc + vote_account.activated_stake)
+        as f64;
 
     let total_deliquent_stake = vote_accounts
         .delinquent
         .iter()
-        .fold(0, |acc, vote_account| acc + vote_account.activated_stake);
+        .fold(0, |acc, vote_account| acc + vote_account.activated_stake)
+        as f64;
     let total_current_stake = total_active_stake - total_deliquent_stake;
 
-    let mut current = vote_accounts.current;
-    current.sort_by(|a, b| b.activated_stake.cmp(&a.activated_stake));
-    let current_validators: Vec<CliValidator> = current
-        .iter()
-        .map(|vote_account| CliValidator::new(vote_account, epoch_info.epoch))
-        .collect();
-    let mut delinquent = vote_accounts.delinquent;
-    delinquent.sort_by(|a, b| b.activated_stake.cmp(&a.activated_stake));
-    let delinquent_validators: Vec<CliValidator> = delinquent
-        .iter()
-        .map(|vote_account| CliValidator::new(vote_account, epoch_info.epoch))
-        .collect();
-
-    let cli_validators = CliValidators {
-        total_active_stake,
-        total_current_stake,
-        total_deliquent_stake,
-        current_validators,
-        delinquent_validators,
-        use_lamports_unit,
-    };
-    config.output_format.formatted_print(&cli_validators);
-    Ok("".to_string())
-}
-
-pub fn process_transaction_history(
-    rpc_client: &RpcClient,
-    address: &Pubkey,
-    end_slot: Option<Slot>, // None == use latest slot
-    slot_limit: u64,
-) -> ProcessResult {
-    let end_slot = {
-        if let Some(end_slot) = end_slot {
-            end_slot
-        } else {
-            rpc_client.get_slot_with_commitment(CommitmentConfig::max())?
-        }
-    };
-    let start_slot = end_slot.saturating_sub(slot_limit);
+    println_name_value(
+        "Active Stake:",
+        &build_balance_message(total_active_stake as u64, use_lamports_unit, true),
+    );
+    if total_deliquent_stake > 0. {
+        println_name_value(
+            "Current Stake:",
+            &format!(
+                "{} ({:0.2}%)",
+                &build_balance_message(total_current_stake as u64, use_lamports_unit, true),
+                100. * total_current_stake / total_active_stake
+            ),
+        );
+        println_name_value(
+            "Delinquent Stake:",
+            &format!(
+                "{} ({:0.2}%)",
+                &build_balance_message(total_deliquent_stake as u64, use_lamports_unit, true),
+                100. * total_deliquent_stake / total_active_stake
+            ),
+        );
+    }
+    println!();
 
     println!(
-        "Transactions affecting {} within slots [{},{}]",
-        address, start_slot, end_slot
+        "{}",
+        style(format!(
+            "  {:<44}  {:<44}  {}  {}  {}  {:>7}  {}",
+            "Identity Pubkey",
+            "Vote Account Pubkey",
+            "Commission",
+            "Last Vote",
+            "Root Block",
+            "Credits",
+            "Active Stake",
+        ))
+        .bold()
     );
-    let signatures =
-        rpc_client.get_confirmed_signatures_for_address(address, start_slot, end_slot)?;
-    for signature in &signatures {
-        println!("{}", signature);
+
+    fn print_vote_account(
+        vote_account: RpcVoteAccountInfo,
+        current_epoch: Epoch,
+        total_active_stake: f64,
+        use_lamports_unit: bool,
+        delinquent: bool,
+    ) {
+        fn non_zero_or_dash(v: u64) -> String {
+            if v == 0 {
+                "-".into()
+            } else {
+                format!("{}", v)
+            }
+        }
+
+        println!(
+            "{} {:<44}  {:<44}  {:>9}%   {:>8}  {:>10}  {:>7}  {}",
+            if delinquent {
+                WARNING.to_string()
+            } else {
+                " ".to_string()
+            },
+            vote_account.node_pubkey,
+            vote_account.vote_pubkey,
+            vote_account.commission,
+            non_zero_or_dash(vote_account.last_vote),
+            non_zero_or_dash(vote_account.root_slot),
+            vote_account
+                .epoch_credits
+                .iter()
+                .find_map(|(epoch, credits, _)| if *epoch == current_epoch {
+                    Some(*credits)
+                } else {
+                    None
+                })
+                .unwrap_or(0),
+            if vote_account.activated_stake > 0 {
+                format!(
+                    "{} ({:.2}%)",
+                    build_balance_message(vote_account.activated_stake, use_lamports_unit, true),
+                    100. * vote_account.activated_stake as f64 / total_active_stake
+                )
+            } else {
+                "-".into()
+            },
+        );
     }
-    Ok(format!("{} transactions found", signatures.len(),))
+
+    for vote_account in vote_accounts.current.into_iter() {
+        print_vote_account(
+            vote_account,
+            epoch_info.epoch,
+            total_active_stake,
+            use_lamports_unit,
+            false,
+        );
+    }
+    for vote_account in vote_accounts.delinquent.into_iter() {
+        print_vote_account(
+            vote_account,
+            epoch_info.epoch,
+            total_active_stake,
+            use_lamports_unit,
+            true,
+        );
+    }
+
+    Ok("".to_string())
 }
 
 #[cfg(test)]
@@ -1221,7 +1247,7 @@ mod tests {
             .clone()
             .get_matches_from(vec!["test", "cluster-version"]);
         assert_eq!(
-            parse_command(&test_cluster_version, &default_keypair_file, &mut None).unwrap(),
+            parse_command(&test_cluster_version, &default_keypair_file, None).unwrap(),
             CliCommandInfo {
                 command: CliCommand::ClusterVersion,
                 signers: vec![],
@@ -1230,7 +1256,7 @@ mod tests {
 
         let test_fees = test_commands.clone().get_matches_from(vec!["test", "fees"]);
         assert_eq!(
-            parse_command(&test_fees, &default_keypair_file, &mut None).unwrap(),
+            parse_command(&test_fees, &default_keypair_file, None).unwrap(),
             CliCommandInfo {
                 command: CliCommand::Fees,
                 signers: vec![],
@@ -1243,7 +1269,7 @@ mod tests {
                 .clone()
                 .get_matches_from(vec!["test", "block-time", &slot.to_string()]);
         assert_eq!(
-            parse_command(&test_get_block_time, &default_keypair_file, &mut None).unwrap(),
+            parse_command(&test_get_block_time, &default_keypair_file, None).unwrap(),
             CliCommandInfo {
                 command: CliCommand::GetBlockTime { slot },
                 signers: vec![],
@@ -1254,7 +1280,7 @@ mod tests {
             .clone()
             .get_matches_from(vec!["test", "epoch-info"]);
         assert_eq!(
-            parse_command(&test_get_epoch_info, &default_keypair_file, &mut None).unwrap(),
+            parse_command(&test_get_epoch_info, &default_keypair_file, None).unwrap(),
             CliCommandInfo {
                 command: CliCommand::GetEpochInfo {
                     commitment_config: CommitmentConfig::recent(),
@@ -1267,7 +1293,7 @@ mod tests {
             .clone()
             .get_matches_from(vec!["test", "genesis-hash"]);
         assert_eq!(
-            parse_command(&test_get_genesis_hash, &default_keypair_file, &mut None).unwrap(),
+            parse_command(&test_get_genesis_hash, &default_keypair_file, None).unwrap(),
             CliCommandInfo {
                 command: CliCommand::GetGenesisHash,
                 signers: vec![],
@@ -1276,7 +1302,7 @@ mod tests {
 
         let test_get_slot = test_commands.clone().get_matches_from(vec!["test", "slot"]);
         assert_eq!(
-            parse_command(&test_get_slot, &default_keypair_file, &mut None).unwrap(),
+            parse_command(&test_get_slot, &default_keypair_file, None).unwrap(),
             CliCommandInfo {
                 command: CliCommand::GetSlot {
                     commitment_config: CommitmentConfig::recent(),
@@ -1289,7 +1315,7 @@ mod tests {
             .clone()
             .get_matches_from(vec!["test", "epoch"]);
         assert_eq!(
-            parse_command(&test_get_epoch, &default_keypair_file, &mut None).unwrap(),
+            parse_command(&test_get_epoch, &default_keypair_file, None).unwrap(),
             CliCommandInfo {
                 command: CliCommand::GetEpoch {
                     commitment_config: CommitmentConfig::recent(),
@@ -1298,24 +1324,11 @@ mod tests {
             }
         );
 
-        let test_total_supply = test_commands
-            .clone()
-            .get_matches_from(vec!["test", "total-supply"]);
-        assert_eq!(
-            parse_command(&test_total_supply, &default_keypair_file, &mut None).unwrap(),
-            CliCommandInfo {
-                command: CliCommand::TotalSupply {
-                    commitment_config: CommitmentConfig::recent(),
-                },
-                signers: vec![],
-            }
-        );
-
         let test_transaction_count = test_commands
             .clone()
             .get_matches_from(vec!["test", "transaction-count"]);
         assert_eq!(
-            parse_command(&test_transaction_count, &default_keypair_file, &mut None).unwrap(),
+            parse_command(&test_transaction_count, &default_keypair_file, None).unwrap(),
             CliCommandInfo {
                 command: CliCommand::GetTransactionCount {
                     commitment_config: CommitmentConfig::recent(),
@@ -1333,18 +1346,17 @@ mod tests {
             "2",
             "-t",
             "3",
-            "--commitment",
-            "max",
+            "--confirmed",
         ]);
         assert_eq!(
-            parse_command(&test_ping, &default_keypair_file, &mut None).unwrap(),
+            parse_command(&test_ping, &default_keypair_file, None).unwrap(),
             CliCommandInfo {
                 command: CliCommand::Ping {
                     lamports: 1,
                     interval: Duration::from_secs(1),
                     count: Some(2),
                     timeout: Duration::from_secs(3),
-                    commitment_config: CommitmentConfig::max(),
+                    commitment_config: CommitmentConfig::default(),
                 },
                 signers: vec![default_keypair.into()],
             }

cli/src/display.rs

@@ -1,11 +1,6 @@
 use crate::cli::SettingType;
 use console::style;
-use solana_sdk::{
-    hash::Hash, native_token::lamports_to_sol, program_utils::limited_deserialize,
-    transaction::Transaction,
-};
-use solana_transaction_status::RpcTransactionStatusMeta;
-use std::{fmt, io};
+use solana_sdk::hash::Hash;
 
 // Pretty print a "name value"
 pub fn println_name_value(name: &str, value: &str) {
@@ -17,15 +12,6 @@ pub fn println_name_value(name: &str, value: &str) {
     println!("{} {}", style(name).bold(), styled_value);
 }
 
-pub fn writeln_name_value(f: &mut fmt::Formatter, name: &str, value: &str) -> fmt::Result {
-    let styled_value = if value == "" {
-        style("(not set)").italic()
-    } else {
-        style(value)
-    };
-    writeln!(f, "{} {}", style(name).bold(), styled_value)
-}
-
 pub fn println_name_value_or(name: &str, value: &str, setting_type: SettingType) {
     let description = match setting_type {
         SettingType::Explicit => "",
@@ -63,135 +49,3 @@ pub fn println_signers(
     }
     println!();
 }
-
-pub fn write_transaction<W: io::Write>(
-    w: &mut W,
-    transaction: &Transaction,
-    transaction_status: &Option<RpcTransactionStatusMeta>,
-    prefix: &str,
-) -> io::Result<()> {
-    let message = &transaction.message;
-    writeln!(
-        w,
-        "{}Recent Blockhash: {:?}",
-        prefix, message.recent_blockhash
-    )?;
-    for (signature_index, signature) in transaction.signatures.iter().enumerate() {
-        writeln!(
-            w,
-            "{}Signature {}: {:?}",
-            prefix, signature_index, signature
-        )?;
-    }
-    writeln!(w, "{}{:?}", prefix, message.header)?;
-    for (account_index, account) in message.account_keys.iter().enumerate() {
-        writeln!(w, "{}Account {}: {:?}", prefix, account_index, account)?;
-    }
-    for (instruction_index, instruction) in message.instructions.iter().enumerate() {
-        let program_pubkey = message.account_keys[instruction.program_id_index as usize];
-        writeln!(w, "{}Instruction {}", prefix, instruction_index)?;
-        writeln!(
-            w,
-            "{}  Program: {} ({})",
-            prefix, program_pubkey, instruction.program_id_index
-        )?;
-        for (account_index, account) in instruction.accounts.iter().enumerate() {
-            let account_pubkey = message.account_keys[*account as usize];
-            writeln!(
-                w,
-                "{}  Account {}: {} ({})",
-                prefix, account_index, account_pubkey, account
-            )?;
-        }
-
-        let mut raw = true;
-        if program_pubkey == solana_vote_program::id() {
-            if let Ok(vote_instruction) = limited_deserialize::<
-                solana_vote_program::vote_instruction::VoteInstruction,
-            >(&instruction.data)
-            {
-                writeln!(w, "{}  {:?}", prefix, vote_instruction)?;
-                raw = false;
-            }
-        } else if program_pubkey == solana_stake_program::id() {
-            if let Ok(stake_instruction) = limited_deserialize::<
-                solana_stake_program::stake_instruction::StakeInstruction,
-            >(&instruction.data)
-            {
-                writeln!(w, "{}  {:?}", prefix, stake_instruction)?;
-                raw = false;
-            }
-        } else if program_pubkey == solana_sdk::system_program::id() {
-            if let Ok(system_instruction) = limited_deserialize::<
-                solana_sdk::system_instruction::SystemInstruction,
-            >(&instruction.data)
-            {
-                writeln!(w, "{}  {:?}", prefix, system_instruction)?;
-                raw = false;
-            }
-        }
-
-        if raw {
-            writeln!(w, "{}  Data: {:?}", prefix, instruction.data)?;
-        }
-    }
-
-    if let Some(transaction_status) = transaction_status {
-        writeln!(
-            w,
-            "{}Status: {}",
-            prefix,
-            match &transaction_status.status {
-                Ok(_) => "Ok".into(),
-                Err(err) => err.to_string(),
-            }
-        )?;
-        writeln!(w, "{}  Fee: {}", prefix, transaction_status.fee)?;
-        assert_eq!(
-            transaction_status.pre_balances.len(),
-            transaction_status.post_balances.len()
-        );
-        for (i, (pre, post)) in transaction_status
-            .pre_balances
-            .iter()
-            .zip(transaction_status.post_balances.iter())
-            .enumerate()
-        {
-            if pre == post {
-                writeln!(
-                    w,
-                    "{}  Account {} balance: {} SOL",
-                    prefix,
-                    i,
-                    lamports_to_sol(*pre)
-                )?;
-            } else {
-                writeln!(
-                    w,
-                    "{}  Account {} balance: {} SOL -> {} SOL",
-                    prefix,
-                    i,
-                    lamports_to_sol(*pre),
-                    lamports_to_sol(*post)
-                )?;
-            }
-        }
-    } else {
-        writeln!(w, "{}Status: Unavailable", prefix)?;
-    }
-
-    Ok(())
-}
-
-pub fn println_transaction(
-    transaction: &Transaction,
-    transaction_status: &Option<RpcTransactionStatusMeta>,
-    prefix: &str,
-) {
-    let mut w = Vec::new();
-    if write_transaction(&mut w, transaction, transaction_status, prefix).is_ok() {
-        if let Ok(s) = String::from_utf8(w) {
-            print!("{}", s);
-        }
-    }
-}

cli/src/lib.rs

@@ -1,8 +1,4 @@
-#[macro_use]
-extern crate serde_derive;
-
 pub mod cli;
-pub mod cli_output;
 pub mod cluster_query;
 pub mod display;
 pub mod nonce;

cli/src/main.rs

@@ -7,11 +7,10 @@ use solana_clap_utils::{
 };
 use solana_cli::{
     cli::{app, parse_command, process_command, CliCommandInfo, CliConfig, CliSigners},
-    cli_output::OutputFormat,
     display::{println_name_value, println_name_value_or},
 };
 use solana_cli_config::{Config, CONFIG_FILE};
-use solana_remote_wallet::remote_wallet::RemoteWalletManager;
+use solana_remote_wallet::remote_wallet::{maybe_wallet_manager, RemoteWalletManager};
 use std::{error, sync::Arc};
 
 fn parse_settings(matches: &ArgMatches<'_>) -> Result<bool, Box<dyn error::Error>> {
@@ -103,7 +102,7 @@ fn parse_settings(matches: &ArgMatches<'_>) -> Result<bool, Box<dyn error::Error
 
 pub fn parse_args<'a>(
     matches: &ArgMatches<'_>,
-    mut wallet_manager: &mut Option<Arc<RemoteWalletManager>>,
+    wallet_manager: Option<Arc<RemoteWalletManager>>,
 ) -> Result<(CliConfig<'a>, CliSigners), Box<dyn error::Error>> {
     let config = if let Some(config_file) = matches.value_of("config_file") {
         Config::load(config_file).unwrap_or_default()
@@ -126,16 +125,7 @@ pub fn parse_args<'a>(
     );
 
     let CliCommandInfo { command, signers } =
-        parse_command(&matches, &default_signer_path, &mut wallet_manager)?;
-
-    let output_format = matches
-        .value_of("output_format")
-        .map(|value| match value {
-            "json" => OutputFormat::Json,
-            "json-compact" => OutputFormat::JsonCompact,
-            _ => unreachable!(),
-        })
-        .unwrap_or(OutputFormat::Display);
+        parse_command(&matches, &default_signer_path, wallet_manager.as_ref())?;
 
     Ok((
         CliConfig {
@@ -146,7 +136,6 @@ pub fn parse_args<'a>(
             keypair_path: default_signer_path,
             rpc_client: None,
             verbose: matches.is_present("verbose"),
-            output_format,
         },
         signers,
     ))
@@ -208,14 +197,6 @@ fn main() -> Result<(), Box<dyn error::Error>> {
             .global(true)
             .help("Show additional information"),
     )
-    .arg(
-        Arg::with_name("output_format")
-            .long("output")
-            .global(true)
-            .takes_value(true)
-            .possible_values(&["json", "json-compact"])
-            .help("Return information in specified output format. Supports: json, json-compact"),
-    )
     .arg(
         Arg::with_name(SKIP_SEED_PHRASE_VALIDATION_ARG.name)
             .long(SKIP_SEED_PHRASE_VALIDATION_ARG.long)
@@ -257,9 +238,9 @@ fn main() -> Result<(), Box<dyn error::Error>> {
 
 fn do_main(matches: &ArgMatches<'_>) -> Result<(), Box<dyn error::Error>> {
     if parse_settings(&matches)? {
-        let mut wallet_manager = None;
+        let wallet_manager = maybe_wallet_manager()?;
 
-        let (mut config, signers) = parse_args(&matches, &mut wallet_manager)?;
+        let (mut config, signers) = parse_args(&matches, wallet_manager)?;
         config.signers = signers.iter().map(|s| s.as_ref()).collect();
         let result = process_command(&config)?;
         let (_, submatches) = matches.subcommand();

cli/src/nonce.rs

@@ -1,10 +1,7 @@
-use crate::{
-    cli::{
-        check_account_for_fee, check_unique_pubkeys, generate_unique_signers,
-        log_instruction_custom_error, CliCommand, CliCommandInfo, CliConfig, CliError,
-        ProcessResult, SignerIndex,
-    },
-    cli_output::CliNonceAccount,
+use crate::cli::{
+    build_balance_message, check_account_for_fee, check_unique_pubkeys, generate_unique_signers,
+    log_instruction_custom_error, CliCommand, CliCommandInfo, CliConfig, CliError, ProcessResult,
+    SignerIndex,
 };
 use clap::{App, Arg, ArgMatches, SubCommand};
 use solana_clap_utils::{
@@ -24,8 +21,9 @@ use solana_sdk::{
     },
     pubkey::Pubkey,
     system_instruction::{
-        advance_nonce_account, authorize_nonce_account, create_nonce_account,
-        create_nonce_account_with_seed, withdraw_nonce_account, NonceError, SystemError,
+        advance_nonce_account, authorize_nonce_account, create_address_with_seed,
+        create_nonce_account, create_nonce_account_with_seed, withdraw_nonce_account, NonceError,
+        SystemError,
     },
     system_program,
     transaction::Transaction,
@@ -279,7 +277,7 @@ pub fn data_from_state(state: &State) -> Result<&Data, CliNonceError> {
 pub fn parse_authorize_nonce_account(
     matches: &ArgMatches<'_>,
     default_signer_path: &str,
-    wallet_manager: &mut Option<Arc<RemoteWalletManager>>,
+    wallet_manager: Option<&Arc<RemoteWalletManager>>,
 ) -> Result<CliCommandInfo, CliError> {
     let nonce_account = pubkey_of_signer(matches, "nonce_account_pubkey", wallet_manager)?.unwrap();
     let new_authority = pubkey_of_signer(matches, "new_authority", wallet_manager)?.unwrap();
@@ -307,7 +305,7 @@ pub fn parse_authorize_nonce_account(
 pub fn parse_nonce_create_account(
     matches: &ArgMatches<'_>,
     default_signer_path: &str,
-    wallet_manager: &mut Option<Arc<RemoteWalletManager>>,
+    wallet_manager: Option<&Arc<RemoteWalletManager>>,
 ) -> Result<CliCommandInfo, CliError> {
     let (nonce_account, nonce_account_pubkey) =
         signer_of(matches, "nonce_account_keypair", wallet_manager)?;
@@ -336,7 +334,7 @@ pub fn parse_nonce_create_account(
 
 pub fn parse_get_nonce(
     matches: &ArgMatches<'_>,
-    wallet_manager: &mut Option<Arc<RemoteWalletManager>>,
+    wallet_manager: Option<&Arc<RemoteWalletManager>>,
 ) -> Result<CliCommandInfo, CliError> {
     let nonce_account_pubkey =
         pubkey_of_signer(matches, "nonce_account_pubkey", wallet_manager)?.unwrap();
@@ -350,7 +348,7 @@ pub fn parse_get_nonce(
 pub fn parse_new_nonce(
     matches: &ArgMatches<'_>,
     default_signer_path: &str,
-    wallet_manager: &mut Option<Arc<RemoteWalletManager>>,
+    wallet_manager: Option<&Arc<RemoteWalletManager>>,
 ) -> Result<CliCommandInfo, CliError> {
     let nonce_account = pubkey_of_signer(matches, "nonce_account_pubkey", wallet_manager)?.unwrap();
     let (nonce_authority, nonce_authority_pubkey) =
@@ -375,7 +373,7 @@ pub fn parse_new_nonce(
 
 pub fn parse_show_nonce_account(
     matches: &ArgMatches<'_>,
-    wallet_manager: &mut Option<Arc<RemoteWalletManager>>,
+    wallet_manager: Option<&Arc<RemoteWalletManager>>,
 ) -> Result<CliCommandInfo, CliError> {
     let nonce_account_pubkey =
         pubkey_of_signer(matches, "nonce_account_pubkey", wallet_manager)?.unwrap();
@@ -393,7 +391,7 @@ pub fn parse_show_nonce_account(
 pub fn parse_withdraw_from_nonce_account(
     matches: &ArgMatches<'_>,
     default_signer_path: &str,
-    wallet_manager: &mut Option<Arc<RemoteWalletManager>>,
+    wallet_manager: Option<&Arc<RemoteWalletManager>>,
 ) -> Result<CliCommandInfo, CliError> {
     let nonce_account = pubkey_of_signer(matches, "nonce_account_pubkey", wallet_manager)?.unwrap();
     let destination_account_pubkey =
@@ -476,7 +474,7 @@ pub fn process_create_nonce_account(
 ) -> ProcessResult {
     let nonce_account_pubkey = config.signers[nonce_account].pubkey();
     let nonce_account_address = if let Some(seed) = seed.clone() {
-        Pubkey::create_with_seed(&nonce_account_pubkey, &seed, &system_program::id())?
+        create_address_with_seed(&nonce_account_pubkey, &seed, &system_program::id())?
     } else {
         nonce_account_pubkey
     };
@@ -587,26 +585,38 @@ pub fn process_new_nonce(
 
 pub fn process_show_nonce_account(
     rpc_client: &RpcClient,
-    config: &CliConfig,
     nonce_account_pubkey: &Pubkey,
     use_lamports_unit: bool,
 ) -> ProcessResult {
     let nonce_account = get_account(rpc_client, nonce_account_pubkey)?;
     let print_account = |data: Option<&nonce::state::Data>| {
-        let mut nonce_account = CliNonceAccount {
-            balance: nonce_account.lamports,
-            minimum_balance_for_rent_exemption: rpc_client
-                .get_minimum_balance_for_rent_exemption(State::size())?,
-            use_lamports_unit,
-            ..CliNonceAccount::default()
-        };
-        if let Some(ref data) = data {
-            nonce_account.nonce = Some(data.blockhash.to_string());
-            nonce_account.lamports_per_signature = Some(data.fee_calculator.lamports_per_signature);
-            nonce_account.authority = Some(data.authority.to_string());
+        println!(
+            "Balance: {}",
+            build_balance_message(nonce_account.lamports, use_lamports_unit, true)
+        );
+        println!(
+            "Minimum Balance Required: {}",
+            build_balance_message(
+                rpc_client.get_minimum_balance_for_rent_exemption(State::size())?,
+                use_lamports_unit,
+                true
+            )
+        );
+        match data {
+            Some(ref data) => {
+                println!("Nonce: {}", data.blockhash);
+                println!(
+                    "Fee: {} lamports per signature",
+                    data.fee_calculator.lamports_per_signature
+                );
+                println!("Authority: {}", data.authority);
+            }
+            None => {
+                println!("Nonce: uninitialized");
+                println!("Fees: uninitialized");
+                println!("Authority: uninitialized");
+            }
         }
-
-        config.output_format.formatted_print(&nonce_account);
         Ok("".to_string())
     };
     match state_from_account(&nonce_account)? {
@@ -688,12 +698,7 @@ mod tests {
             &Pubkey::default().to_string(),
         ]);
         assert_eq!(
-            parse_command(
-                &test_authorize_nonce_account,
-                &default_keypair_file,
-                &mut None
-            )
-            .unwrap(),
+            parse_command(&test_authorize_nonce_account, &default_keypair_file, None).unwrap(),
             CliCommandInfo {
                 command: CliCommand::AuthorizeNonceAccount {
                     nonce_account: nonce_account_pubkey,
@@ -714,12 +719,7 @@ mod tests {
             &authority_keypair_file,
         ]);
         assert_eq!(
-            parse_command(
-                &test_authorize_nonce_account,
-                &default_keypair_file,
-                &mut None
-            )
-            .unwrap(),
+            parse_command(&test_authorize_nonce_account, &default_keypair_file, None).unwrap(),
             CliCommandInfo {
                 command: CliCommand::AuthorizeNonceAccount {
                     nonce_account: read_keypair_file(&keypair_file).unwrap().pubkey(),
@@ -741,7 +741,7 @@ mod tests {
             "50",
         ]);
         assert_eq!(
-            parse_command(&test_create_nonce_account, &default_keypair_file, &mut None).unwrap(),
+            parse_command(&test_create_nonce_account, &default_keypair_file, None).unwrap(),
             CliCommandInfo {
                 command: CliCommand::CreateNonceAccount {
                     nonce_account: 1,
@@ -766,7 +766,7 @@ mod tests {
             &authority_keypair_file,
         ]);
         assert_eq!(
-            parse_command(&test_create_nonce_account, &default_keypair_file, &mut None).unwrap(),
+            parse_command(&test_create_nonce_account, &default_keypair_file, None).unwrap(),
             CliCommandInfo {
                 command: CliCommand::CreateNonceAccount {
                     nonce_account: 1,
@@ -788,7 +788,7 @@ mod tests {
             &nonce_account_string,
         ]);
         assert_eq!(
-            parse_command(&test_get_nonce, &default_keypair_file, &mut None).unwrap(),
+            parse_command(&test_get_nonce, &default_keypair_file, None).unwrap(),
             CliCommandInfo {
                 command: CliCommand::GetNonce(nonce_account_keypair.pubkey()),
                 signers: vec![],
@@ -802,7 +802,7 @@ mod tests {
                 .get_matches_from(vec!["test", "new-nonce", &keypair_file]);
         let nonce_account = read_keypair_file(&keypair_file).unwrap();
         assert_eq!(
-            parse_command(&test_new_nonce, &default_keypair_file, &mut None).unwrap(),
+            parse_command(&test_new_nonce, &default_keypair_file, None).unwrap(),
             CliCommandInfo {
                 command: CliCommand::NewNonce {
                     nonce_account: nonce_account.pubkey(),
@@ -822,7 +822,7 @@ mod tests {
         ]);
         let nonce_account = read_keypair_file(&keypair_file).unwrap();
         assert_eq!(
-            parse_command(&test_new_nonce, &default_keypair_file, &mut None).unwrap(),
+            parse_command(&test_new_nonce, &default_keypair_file, None).unwrap(),
             CliCommandInfo {
                 command: CliCommand::NewNonce {
                     nonce_account: nonce_account.pubkey(),
@@ -842,7 +842,7 @@ mod tests {
             &nonce_account_string,
         ]);
         assert_eq!(
-            parse_command(&test_show_nonce_account, &default_keypair_file, &mut None).unwrap(),
+            parse_command(&test_show_nonce_account, &default_keypair_file, None).unwrap(),
             CliCommandInfo {
                 command: CliCommand::ShowNonceAccount {
                     nonce_account_pubkey: nonce_account_keypair.pubkey(),
@@ -864,7 +864,7 @@ mod tests {
             parse_command(
                 &test_withdraw_from_nonce_account,
                 &default_keypair_file,
-                &mut None
+                None
             )
             .unwrap(),
             CliCommandInfo {
@@ -892,7 +892,7 @@ mod tests {
             parse_command(
                 &test_withdraw_from_nonce_account,
                 &default_keypair_file,
-                &mut None
+                None
             )
             .unwrap(),
             CliCommandInfo {

cli/src/stake.rs

@@ -1,14 +1,15 @@
 use crate::{
     cli::{
-        check_account_for_fee, check_unique_pubkeys, fee_payer_arg, generate_unique_signers,
-        log_instruction_custom_error, nonce_authority_arg, return_signers, CliCommand,
-        CliCommandInfo, CliConfig, CliError, ProcessResult, SignerIndex, FEE_PAYER_ARG,
+        build_balance_message, check_account_for_fee, check_unique_pubkeys, fee_payer_arg,
+        generate_unique_signers, log_instruction_custom_error, nonce_authority_arg, return_signers,
+        CliCommand, CliCommandInfo, CliConfig, CliError, ProcessResult, SignerIndex, FEE_PAYER_ARG,
     },
-    cli_output::{CliStakeHistory, CliStakeHistoryEntry, CliStakeState, CliStakeType},
     nonce::{check_nonce_account, nonce_arg, NONCE_ARG, NONCE_AUTHORITY_ARG},
     offline::{blockhash_query::BlockhashQuery, *},
 };
+use chrono::{DateTime, NaiveDateTime, SecondsFormat, Utc};
 use clap::{App, Arg, ArgGroup, ArgMatches, SubCommand};
+use console::style;
 use solana_clap_utils::{input_parsers::*, input_validators::*, offline::*, ArgConstant};
 use solana_client::rpc_client::RpcClient;
 use solana_remote_wallet::remote_wallet::RemoteWalletManager;
@@ -16,7 +17,7 @@ use solana_sdk::{
     account_utils::StateMut,
     message::Message,
     pubkey::Pubkey,
-    system_instruction::SystemError,
+    system_instruction::{create_address_with_seed, SystemError},
     sysvar::{
         stake_history::{self, StakeHistory},
         Sysvar,
@@ -85,7 +86,7 @@ impl StakeSubCommands for App<'_, '_> {
                         .takes_value(true)
                         .validator(is_amount)
                         .required(true)
-                        .help("The amount to send to the stake account, in SOL")
+                        .help("The amount of send to the vote account, in SOL")
                 )
                 .arg(
                     Arg::with_name("custodian")
@@ -313,14 +314,6 @@ impl StakeSubCommands for App<'_, '_> {
                 .arg(nonce_arg())
                 .arg(nonce_authority_arg())
                 .arg(fee_payer_arg())
-                .arg(
-                    Arg::with_name("custodian")
-                        .long("custodian")
-                        .takes_value(true)
-                        .value_name("KEYPAIR")
-                        .validator(is_valid_signer)
-                        .help("Authority to override account lockup")
-                )
         )
         .subcommand(
             SubCommand::with_name("stake-set-lockup")
@@ -410,7 +403,7 @@ impl StakeSubCommands for App<'_, '_> {
 pub fn parse_stake_create_account(
     matches: &ArgMatches<'_>,
     default_signer_path: &str,
-    wallet_manager: &mut Option<Arc<RemoteWalletManager>>,
+    wallet_manager: Option<&Arc<RemoteWalletManager>>,
 ) -> Result<CliCommandInfo, CliError> {
     let seed = matches.value_of("seed").map(|s| s.to_string());
     let epoch = value_of(matches, "lockup_epoch").unwrap_or(0);
@@ -462,7 +455,7 @@ pub fn parse_stake_create_account(
 pub fn parse_stake_delegate_stake(
     matches: &ArgMatches<'_>,
     default_signer_path: &str,
-    wallet_manager: &mut Option<Arc<RemoteWalletManager>>,
+    wallet_manager: Option<&Arc<RemoteWalletManager>>,
 ) -> Result<CliCommandInfo, CliError> {
     let stake_account_pubkey =
         pubkey_of_signer(matches, "stake_account_pubkey", wallet_manager)?.unwrap();
@@ -504,7 +497,7 @@ pub fn parse_stake_delegate_stake(
 pub fn parse_stake_authorize(
     matches: &ArgMatches<'_>,
     default_signer_path: &str,
-    wallet_manager: &mut Option<Arc<RemoteWalletManager>>,
+    wallet_manager: Option<&Arc<RemoteWalletManager>>,
 ) -> Result<CliCommandInfo, CliError> {
     let stake_account_pubkey =
         pubkey_of_signer(matches, "stake_account_pubkey", wallet_manager)?.unwrap();
@@ -587,7 +580,7 @@ pub fn parse_stake_authorize(
 pub fn parse_split_stake(
     matches: &ArgMatches<'_>,
     default_signer_path: &str,
-    wallet_manager: &mut Option<Arc<RemoteWalletManager>>,
+    wallet_manager: Option<&Arc<RemoteWalletManager>>,
 ) -> Result<CliCommandInfo, CliError> {
     let stake_account_pubkey =
         pubkey_of_signer(matches, "stake_account_pubkey", wallet_manager)?.unwrap();
@@ -632,7 +625,7 @@ pub fn parse_split_stake(
 pub fn parse_stake_deactivate_stake(
     matches: &ArgMatches<'_>,
     default_signer_path: &str,
-    wallet_manager: &mut Option<Arc<RemoteWalletManager>>,
+    wallet_manager: Option<&Arc<RemoteWalletManager>>,
 ) -> Result<CliCommandInfo, CliError> {
     let stake_account_pubkey =
         pubkey_of_signer(matches, "stake_account_pubkey", wallet_manager)?.unwrap();
@@ -669,7 +662,7 @@ pub fn parse_stake_deactivate_stake(
 pub fn parse_stake_withdraw_stake(
     matches: &ArgMatches<'_>,
     default_signer_path: &str,
-    wallet_manager: &mut Option<Arc<RemoteWalletManager>>,
+    wallet_manager: Option<&Arc<RemoteWalletManager>>,
 ) -> Result<CliCommandInfo, CliError> {
     let stake_account_pubkey =
         pubkey_of_signer(matches, "stake_account_pubkey", wallet_manager)?.unwrap();
@@ -684,15 +677,11 @@ pub fn parse_stake_withdraw_stake(
     let (nonce_authority, nonce_authority_pubkey) =
         signer_of(matches, NONCE_AUTHORITY_ARG.name, wallet_manager)?;
     let (fee_payer, fee_payer_pubkey) = signer_of(matches, FEE_PAYER_ARG.name, wallet_manager)?;
-    let (custodian, custodian_pubkey) = signer_of(matches, "custodian", wallet_manager)?;
 
     let mut bulk_signers = vec![withdraw_authority, fee_payer];
     if nonce_account.is_some() {
         bulk_signers.push(nonce_authority);
     }
-    if custodian.is_some() {
-        bulk_signers.push(custodian);
-    }
     let signer_info =
         generate_unique_signers(bulk_signers, matches, default_signer_path, wallet_manager)?;
 
@@ -707,7 +696,6 @@ pub fn parse_stake_withdraw_stake(
             nonce_account,
             nonce_authority: signer_info.index_of(nonce_authority_pubkey).unwrap(),
             fee_payer: signer_info.index_of(fee_payer_pubkey).unwrap(),
-            custodian: custodian_pubkey.and_then(|_| signer_info.index_of(custodian_pubkey)),
         },
         signers: signer_info.signers,
     })
@@ -716,7 +704,7 @@ pub fn parse_stake_withdraw_stake(
 pub fn parse_stake_set_lockup(
     matches: &ArgMatches<'_>,
     default_signer_path: &str,
-    wallet_manager: &mut Option<Arc<RemoteWalletManager>>,
+    wallet_manager: Option<&Arc<RemoteWalletManager>>,
 ) -> Result<CliCommandInfo, CliError> {
     let stake_account_pubkey =
         pubkey_of_signer(matches, "stake_account_pubkey", wallet_manager)?.unwrap();
@@ -761,7 +749,7 @@ pub fn parse_stake_set_lockup(
 
 pub fn parse_show_stake_account(
     matches: &ArgMatches<'_>,
-    wallet_manager: &mut Option<Arc<RemoteWalletManager>>,
+    wallet_manager: Option<&Arc<RemoteWalletManager>>,
 ) -> Result<CliCommandInfo, CliError> {
     let stake_account_pubkey =
         pubkey_of_signer(matches, "stake_account_pubkey", wallet_manager)?.unwrap();
@@ -802,7 +790,7 @@ pub fn process_create_stake_account(
 ) -> ProcessResult {
     let stake_account = config.signers[stake_account];
     let stake_account_address = if let Some(seed) = seed {
-        Pubkey::create_with_seed(&stake_account.pubkey(), &seed, &solana_stake_program::id())?
+        create_address_with_seed(&stake_account.pubkey(), &seed, &solana_stake_program::id())?
     } else {
         stake_account.pubkey()
     };
@@ -1026,7 +1014,6 @@ pub fn process_withdraw_stake(
     destination_account_pubkey: &Pubkey,
     lamports: u64,
     withdraw_authority: SignerIndex,
-    custodian: Option<SignerIndex>,
     sign_only: bool,
     blockhash_query: &BlockhashQuery,
     nonce_account: Option<&Pubkey>,
@@ -1036,14 +1023,12 @@ pub fn process_withdraw_stake(
     let (recent_blockhash, fee_calculator) =
         blockhash_query.get_blockhash_and_fee_calculator(rpc_client)?;
     let withdraw_authority = config.signers[withdraw_authority];
-    let custodian = custodian.map(|index| config.signers[index]);
 
     let ixs = vec![stake_instruction::withdraw(
         stake_account_pubkey,
         &withdraw_authority.pubkey(),
         destination_account_pubkey,
         lamports,
-        custodian.map(|signer| signer.pubkey()).as_ref(),
     )];
 
     let fee_payer = config.signers[fee_payer];
@@ -1123,7 +1108,7 @@ pub fn process_split_stake(
     let stake_authority = config.signers[stake_authority];
 
     let split_stake_account_address = if let Some(seed) = split_stake_account_seed {
-        Pubkey::create_with_seed(
+        create_address_with_seed(
             &split_stake_account.pubkey(),
             &seed,
             &solana_stake_program::id(),
@@ -1272,61 +1257,79 @@ pub fn process_stake_set_lockup(
     }
 }
 
-pub fn build_stake_state(
-    stake_lamports: u64,
-    stake_state: &StakeState,
-    use_lamports_unit: bool,
-) -> CliStakeState {
+pub fn print_stake_state(stake_lamports: u64, stake_state: &StakeState, use_lamports_unit: bool) {
+    fn show_authorized(authorized: &Authorized) {
+        println!("Stake Authority: {}", authorized.staker);
+        println!("Withdraw Authority: {}", authorized.withdrawer);
+    }
+    fn show_lockup(lockup: &Lockup) {
+        println!(
+            "Lockup Timestamp: {} (UnixTimestamp: {})",
+            DateTime::<Utc>::from_utc(NaiveDateTime::from_timestamp(lockup.unix_timestamp, 0), Utc)
+                .to_rfc3339_opts(SecondsFormat::Secs, true),
+            lockup.unix_timestamp
+        );
+        println!("Lockup Epoch: {}", lockup.epoch);
+        println!("Lockup Custodian: {}", lockup.custodian);
+    }
     match stake_state {
         StakeState::Stake(
             Meta {
                 authorized, lockup, ..
             },
             stake,
-        ) => CliStakeState {
-            stake_type: CliStakeType::Stake,
-            total_stake: stake_lamports,
-            delegated_stake: Some(stake.delegation.stake),
-            delegated_vote_account_address: if stake.delegation.voter_pubkey != Pubkey::default() {
-                Some(stake.delegation.voter_pubkey.to_string())
-            } else {
-                None
-            },
-            activation_epoch: Some(if stake.delegation.activation_epoch < std::u64::MAX {
-                stake.delegation.activation_epoch
-            } else {
-                0
-            }),
-            deactivation_epoch: if stake.delegation.deactivation_epoch < std::u64::MAX {
-                Some(stake.delegation.deactivation_epoch)
-            } else {
-                None
-            },
-            authorized: Some(authorized.into()),
-            lockup: Some(lockup.into()),
-            use_lamports_unit,
-        },
-        StakeState::RewardsPool => CliStakeState {
-            stake_type: CliStakeType::RewardsPool,
-            ..CliStakeState::default()
-        },
-        StakeState::Uninitialized => CliStakeState::default(),
+        ) => {
+            println!(
+                "Total Stake: {}",
+                build_balance_message(stake_lamports, use_lamports_unit, true)
+            );
+            println!("Credits Observed: {}", stake.credits_observed);
+            println!(
+                "Delegated Stake: {}",
+                build_balance_message(stake.delegation.stake, use_lamports_unit, true)
+            );
+            if stake.delegation.voter_pubkey != Pubkey::default() {
+                println!(
+                    "Delegated Vote Account Address: {}",
+                    stake.delegation.voter_pubkey
+                );
+            }
+            println!(
+                "Stake activates starting from epoch: {}",
+                if stake.delegation.activation_epoch < std::u64::MAX {
+                    stake.delegation.activation_epoch
+                } else {
+                    0
+                }
+            );
+            if stake.delegation.deactivation_epoch < std::u64::MAX {
+                println!(
+                    "Stake deactivates starting from epoch: {}",
+                    stake.delegation.deactivation_epoch
+                );
+            }
+            show_authorized(&authorized);
+            show_lockup(&lockup);
+        }
+        StakeState::RewardsPool => println!("Stake account is a rewards pool"),
+        StakeState::Uninitialized => println!("Stake account is uninitialized"),
         StakeState::Initialized(Meta {
             authorized, lockup, ..
-        }) => CliStakeState {
-            stake_type: CliStakeType::Initialized,
-            total_stake: stake_lamports,
-            authorized: Some(authorized.into()),
-            lockup: Some(lockup.into()),
-            use_lamports_unit,
-            ..CliStakeState::default()
-        },
+        }) => {
+            println!(
+                "Total Stake: {}",
+                build_balance_message(stake_lamports, use_lamports_unit, true)
+            );
+            println!("Stake account is undelegated");
+            show_authorized(&authorized);
+            show_lockup(&lockup);
+        }
     }
 }
 
 pub fn process_show_stake_account(
     rpc_client: &RpcClient,
-    config: &CliConfig,
+    _config: &CliConfig,
     stake_account_pubkey: &Pubkey,
     use_lamports_unit: bool,
 ) -> ProcessResult {
@@ -1340,8 +1343,7 @@ pub fn process_show_stake_account(
     }
     match stake_account.state() {
         Ok(stake_state) => {
-            let state = build_stake_state(stake_account.lamports, &stake_state, use_lamports_unit);
-            config.output_format.formatted_print(&state);
+            print_stake_state(stake_account.lamports, &stake_state, use_lamports_unit);
             Ok("".to_string())
         }
         Err(err) => Err(CliError::RpcRequestError(format!(
@@ -1354,7 +1356,7 @@ pub fn process_show_stake_account(
 
 pub fn process_show_stake_history(
     rpc_client: &RpcClient,
-    config: &CliConfig,
+    _config: &CliConfig,
     use_lamports_unit: bool,
 ) -> ProcessResult {
     let stake_history_account = rpc_client.get_account(&stake_history::id())?;
@@ -1362,15 +1364,26 @@ pub fn process_show_stake_history(
         CliError::RpcRequestError("Failed to deserialize stake history".to_string())
     })?;
 
-    let mut entries: Vec<CliStakeHistoryEntry> = vec![];
-    for entry in stake_history.deref() {
-        entries.push(entry.into());
+    println!();
+    println!(
+        "{}",
+        style(format!(
+            "  {:<5}  {:>20}  {:>20}  {:>20}",
+            "Epoch", "Effective Stake", "Activating Stake", "Deactivating Stake",
+        ))
+        .bold()
+    );
+
+    for (epoch, entry) in stake_history.deref() {
+        println!(
+            "  {:>5}  {:>20}  {:>20}  {:>20} {}",
+            epoch,
+            build_balance_message(entry.effective, use_lamports_unit, false),
+            build_balance_message(entry.activating, use_lamports_unit, false),
+            build_balance_message(entry.deactivating, use_lamports_unit, false),
+            if use_lamports_unit { "lamports" } else { "SOL" }
+        );
     }
-    let stake_history_output = CliStakeHistory {
-        entries,
-        use_lamports_unit,
-    };
-    config.output_format.formatted_print(&stake_history_output);
     Ok("".to_string())
 }
 
@@ -1512,9 +1525,6 @@ mod tests {
         let (stake_authority_keypair_file, mut tmp_file) = make_tmp_file();
         let stake_authority_keypair = Keypair::new();
         write_keypair(&stake_authority_keypair, tmp_file.as_file_mut()).unwrap();
-        let (custodian_keypair_file, mut tmp_file) = make_tmp_file();
-        let custodian_keypair = Keypair::new();
-        write_keypair(&custodian_keypair, tmp_file.as_file_mut()).unwrap();
 
         // stake-authorize subcommand
         let stake_account_string = stake_account_pubkey.to_string();
@@ -1532,7 +1542,7 @@ mod tests {
             &new_withdraw_string,
         ]);
         assert_eq!(
-            parse_command(&test_stake_authorize, &default_keypair_file, &mut None).unwrap(),
+            parse_command(&test_stake_authorize, &default_keypair_file, None).unwrap(),
             CliCommandInfo {
                 command: CliCommand::StakeAuthorize {
                     stake_account_pubkey,
@@ -1566,7 +1576,7 @@ mod tests {
             &withdraw_authority_keypair_file,
         ]);
         assert_eq!(
-            parse_command(&test_stake_authorize, &default_keypair_file, &mut None).unwrap(),
+            parse_command(&test_stake_authorize, &default_keypair_file, None).unwrap(),
             CliCommandInfo {
                 command: CliCommand::StakeAuthorize {
                     stake_account_pubkey,
@@ -1604,7 +1614,7 @@ mod tests {
             &withdraw_authority_keypair_file,
         ]);
         assert_eq!(
-            parse_command(&test_stake_authorize, &default_keypair_file, &mut None).unwrap(),
+            parse_command(&test_stake_authorize, &default_keypair_file, None).unwrap(),
             CliCommandInfo {
                 command: CliCommand::StakeAuthorize {
                     stake_account_pubkey,
@@ -1634,7 +1644,7 @@ mod tests {
             &new_stake_string,
         ]);
         assert_eq!(
-            parse_command(&test_stake_authorize, &default_keypair_file, &mut None).unwrap(),
+            parse_command(&test_stake_authorize, &default_keypair_file, None).unwrap(),
             CliCommandInfo {
                 command: CliCommand::StakeAuthorize {
                     stake_account_pubkey,
@@ -1658,7 +1668,7 @@ mod tests {
             &stake_authority_keypair_file,
         ]);
         assert_eq!(
-            parse_command(&test_stake_authorize, &default_keypair_file, &mut None).unwrap(),
+            parse_command(&test_stake_authorize, &default_keypair_file, None).unwrap(),
             CliCommandInfo {
                 command: CliCommand::StakeAuthorize {
                     stake_account_pubkey,
@@ -1688,7 +1698,7 @@ mod tests {
             &withdraw_authority_keypair_file,
         ]);
         assert_eq!(
-            parse_command(&test_stake_authorize, &default_keypair_file, &mut None).unwrap(),
+            parse_command(&test_stake_authorize, &default_keypair_file, None).unwrap(),
             CliCommandInfo {
                 command: CliCommand::StakeAuthorize {
                     stake_account_pubkey,
@@ -1715,7 +1725,7 @@ mod tests {
             &new_withdraw_string,
         ]);
         assert_eq!(
-            parse_command(&test_stake_authorize, &default_keypair_file, &mut None).unwrap(),
+            parse_command(&test_stake_authorize, &default_keypair_file, None).unwrap(),
             CliCommandInfo {
                 command: CliCommand::StakeAuthorize {
                     stake_account_pubkey,
@@ -1743,7 +1753,7 @@ mod tests {
             &withdraw_authority_keypair_file,
         ]);
         assert_eq!(
-            parse_command(&test_stake_authorize, &default_keypair_file, &mut None).unwrap(),
+            parse_command(&test_stake_authorize, &default_keypair_file, None).unwrap(),
             CliCommandInfo {
                 command: CliCommand::StakeAuthorize {
                     stake_account_pubkey,
@@ -1781,7 +1791,7 @@ mod tests {
             "--sign-only",
         ]);
         assert_eq!(
-            parse_command(&test_authorize, &default_keypair_file, &mut None).unwrap(),
+            parse_command(&test_authorize, &default_keypair_file, None).unwrap(),
             CliCommandInfo {
                 command: CliCommand::StakeAuthorize {
                     stake_account_pubkey,
@@ -1814,7 +1824,7 @@ mod tests {
             &pubkey.to_string(),
         ]);
         assert_eq!(
-            parse_command(&test_authorize, &default_keypair_file, &mut None).unwrap(),
+            parse_command(&test_authorize, &default_keypair_file, None).unwrap(),
             CliCommandInfo {
                 command: CliCommand::StakeAuthorize {
                     stake_account_pubkey,
@@ -1860,7 +1870,7 @@ mod tests {
             &pubkey2.to_string(),
         ]);
         assert_eq!(
-            parse_command(&test_authorize, &default_keypair_file, &mut None).unwrap(),
+            parse_command(&test_authorize, &default_keypair_file, None).unwrap(),
             CliCommandInfo {
                 command: CliCommand::StakeAuthorize {
                     stake_account_pubkey,
@@ -1892,7 +1902,7 @@ mod tests {
             &blockhash_string,
         ]);
         assert_eq!(
-            parse_command(&test_authorize, &default_keypair_file, &mut None).unwrap(),
+            parse_command(&test_authorize, &default_keypair_file, None).unwrap(),
             CliCommandInfo {
                 command: CliCommand::StakeAuthorize {
                     stake_account_pubkey,
@@ -1929,7 +1939,7 @@ mod tests {
             &nonce_keypair_file,
         ]);
         assert_eq!(
-            parse_command(&test_authorize, &default_keypair_file, &mut None).unwrap(),
+            parse_command(&test_authorize, &default_keypair_file, None).unwrap(),
             CliCommandInfo {
                 command: CliCommand::StakeAuthorize {
                     stake_account_pubkey,
@@ -1965,7 +1975,7 @@ mod tests {
             &fee_payer_keypair_file,
         ]);
         assert_eq!(
-            parse_command(&test_authorize, &default_keypair_file, &mut None).unwrap(),
+            parse_command(&test_authorize, &default_keypair_file, None).unwrap(),
             CliCommandInfo {
                 command: CliCommand::StakeAuthorize {
                     stake_account_pubkey,
@@ -1999,7 +2009,7 @@ mod tests {
             &signer,
         ]);
         assert_eq!(
-            parse_command(&test_authorize, &default_keypair_file, &mut None).unwrap(),
+            parse_command(&test_authorize, &default_keypair_file, None).unwrap(),
             CliCommandInfo {
                 command: CliCommand::StakeAuthorize {
                     stake_account_pubkey,
@@ -2040,7 +2050,7 @@ mod tests {
             "43",
         ]);
         assert_eq!(
-            parse_command(&test_create_stake_account, &default_keypair_file, &mut None).unwrap(),
+            parse_command(&test_create_stake_account, &default_keypair_file, None).unwrap(),
             CliCommandInfo {
                 command: CliCommand::CreateStakeAccount {
                     stake_account: 1,
@@ -2081,12 +2091,7 @@ mod tests {
         ]);
 
         assert_eq!(
-            parse_command(
-                &test_create_stake_account2,
-                &default_keypair_file,
-                &mut None
-            )
-            .unwrap(),
+            parse_command(&test_create_stake_account2, &default_keypair_file, None).unwrap(),
             CliCommandInfo {
                 command: CliCommand::CreateStakeAccount {
                     stake_account: 1,
@@ -2139,12 +2144,7 @@ mod tests {
         ]);
 
         assert_eq!(
-            parse_command(
-                &test_create_stake_account2,
-                &default_keypair_file,
-                &mut None
-            )
-            .unwrap(),
+            parse_command(&test_create_stake_account2, &default_keypair_file, None).unwrap(),
             CliCommandInfo {
                 command: CliCommand::CreateStakeAccount {
                     stake_account: 1,
@@ -2180,7 +2180,7 @@ mod tests {
             &vote_account_string,
         ]);
         assert_eq!(
-            parse_command(&test_delegate_stake, &default_keypair_file, &mut None).unwrap(),
+            parse_command(&test_delegate_stake, &default_keypair_file, None).unwrap(),
             CliCommandInfo {
                 command: CliCommand::DelegateStake {
                     stake_account_pubkey,
@@ -2209,7 +2209,7 @@ mod tests {
             &stake_authority_keypair_file,
         ]);
         assert_eq!(
-            parse_command(&test_delegate_stake, &default_keypair_file, &mut None).unwrap(),
+            parse_command(&test_delegate_stake, &default_keypair_file, None).unwrap(),
             CliCommandInfo {
                 command: CliCommand::DelegateStake {
                     stake_account_pubkey,
@@ -2240,7 +2240,7 @@ mod tests {
             &vote_account_string,
         ]);
         assert_eq!(
-            parse_command(&test_delegate_stake, &default_keypair_file, &mut None).unwrap(),
+            parse_command(&test_delegate_stake, &default_keypair_file, None).unwrap(),
             CliCommandInfo {
                 command: CliCommand::DelegateStake {
                     stake_account_pubkey,
@@ -2269,7 +2269,7 @@ mod tests {
             &blockhash_string,
         ]);
         assert_eq!(
-            parse_command(&test_delegate_stake, &default_keypair_file, &mut None).unwrap(),
+            parse_command(&test_delegate_stake, &default_keypair_file, None).unwrap(),
             CliCommandInfo {
                 command: CliCommand::DelegateStake {
                     stake_account_pubkey,
@@ -2299,7 +2299,7 @@ mod tests {
             "--sign-only",
         ]);
         assert_eq!(
-            parse_command(&test_delegate_stake, &default_keypair_file, &mut None).unwrap(),
+            parse_command(&test_delegate_stake, &default_keypair_file, None).unwrap(),
             CliCommandInfo {
                 command: CliCommand::DelegateStake {
                     stake_account_pubkey,
@@ -2333,7 +2333,7 @@ mod tests {
             &key1.to_string(),
         ]);
         assert_eq!(
-            parse_command(&test_delegate_stake, &default_keypair_file, &mut None).unwrap(),
+            parse_command(&test_delegate_stake, &default_keypair_file, None).unwrap(),
             CliCommandInfo {
                 command: CliCommand::DelegateStake {
                     stake_account_pubkey,
@@ -2379,7 +2379,7 @@ mod tests {
             &key2.to_string(),
         ]);
         assert_eq!(
-            parse_command(&test_delegate_stake, &default_keypair_file, &mut None).unwrap(),
+            parse_command(&test_delegate_stake, &default_keypair_file, None).unwrap(),
             CliCommandInfo {
                 command: CliCommand::DelegateStake {
                     stake_account_pubkey,
@@ -2416,7 +2416,7 @@ mod tests {
             &fee_payer_keypair_file,
         ]);
         assert_eq!(
-            parse_command(&test_delegate_stake, &default_keypair_file, &mut None).unwrap(),
+            parse_command(&test_delegate_stake, &default_keypair_file, None).unwrap(),
             CliCommandInfo {
                 command: CliCommand::DelegateStake {
                     stake_account_pubkey,
@@ -2446,14 +2446,13 @@ mod tests {
         ]);
 
         assert_eq!(
-            parse_command(&test_withdraw_stake, &default_keypair_file, &mut None).unwrap(),
+            parse_command(&test_withdraw_stake, &default_keypair_file, None).unwrap(),
             CliCommandInfo {
                 command: CliCommand::WithdrawStake {
                     stake_account_pubkey,
                     destination_account_pubkey: stake_account_pubkey,
                     lamports: 42_000_000_000,
                     withdraw_authority: 0,
-                    custodian: None,
                     sign_only: false,
                     blockhash_query: BlockhashQuery::All(blockhash_query::Source::Cluster),
                     nonce_account: None,
@@ -2476,14 +2475,13 @@ mod tests {
         ]);
 
         assert_eq!(
-            parse_command(&test_withdraw_stake, &default_keypair_file, &mut None).unwrap(),
+            parse_command(&test_withdraw_stake, &default_keypair_file, None).unwrap(),
             CliCommandInfo {
                 command: CliCommand::WithdrawStake {
                     stake_account_pubkey,
                     destination_account_pubkey: stake_account_pubkey,
                     lamports: 42_000_000_000,
                     withdraw_authority: 1,
-                    custodian: None,
                     sign_only: false,
                     blockhash_query: BlockhashQuery::All(blockhash_query::Source::Cluster),
                     nonce_account: None,
@@ -2499,39 +2497,6 @@ mod tests {
             }
         );
 
-        // Test WithdrawStake Subcommand w/ custodian
-        let test_withdraw_stake = test_commands.clone().get_matches_from(vec![
-            "test",
-            "withdraw-stake",
-            &stake_account_string,
-            &stake_account_string,
-            "42",
-            "--custodian",
-            &custodian_keypair_file,
-        ]);
-
-        assert_eq!(
-            parse_command(&test_withdraw_stake, &default_keypair_file, &mut None).unwrap(),
-            CliCommandInfo {
-                command: CliCommand::WithdrawStake {
-                    stake_account_pubkey,
-                    destination_account_pubkey: stake_account_pubkey,
-                    lamports: 42_000_000_000,
-                    withdraw_authority: 0,
-                    custodian: Some(1),
-                    sign_only: false,
-                    blockhash_query: BlockhashQuery::All(blockhash_query::Source::Cluster),
-                    nonce_account: None,
-                    nonce_authority: 0,
-                    fee_payer: 0,
-                },
-                signers: vec![
-                    read_keypair_file(&default_keypair_file).unwrap().into(),
-                    read_keypair_file(&custodian_keypair_file).unwrap().into()
-                ],
-            }
-        );
-
         // Test WithdrawStake Subcommand w/ authority and offline nonce
         let test_withdraw_stake = test_commands.clone().get_matches_from(vec![
             "test",
@@ -2554,14 +2519,13 @@ mod tests {
         ]);
 
         assert_eq!(
-            parse_command(&test_withdraw_stake, &default_keypair_file, &mut None).unwrap(),
+            parse_command(&test_withdraw_stake, &default_keypair_file, None).unwrap(),
             CliCommandInfo {
                 command: CliCommand::WithdrawStake {
                     stake_account_pubkey,
                     destination_account_pubkey: stake_account_pubkey,
                     lamports: 42_000_000_000,
                     withdraw_authority: 0,
-                    custodian: None,
                     sign_only: false,
                     blockhash_query: BlockhashQuery::FeeCalculator(
                         blockhash_query::Source::NonceAccount(nonce_account),
@@ -2587,7 +2551,7 @@ mod tests {
             &stake_account_string,
         ]);
         assert_eq!(
-            parse_command(&test_deactivate_stake, &default_keypair_file, &mut None).unwrap(),
+            parse_command(&test_deactivate_stake, &default_keypair_file, None).unwrap(),
             CliCommandInfo {
                 command: CliCommand::DeactivateStake {
                     stake_account_pubkey,
@@ -2611,7 +2575,7 @@ mod tests {
             &stake_authority_keypair_file,
         ]);
         assert_eq!(
-            parse_command(&test_deactivate_stake, &default_keypair_file, &mut None).unwrap(),
+            parse_command(&test_deactivate_stake, &default_keypair_file, None).unwrap(),
             CliCommandInfo {
                 command: CliCommand::DeactivateStake {
                     stake_account_pubkey,
@@ -2642,7 +2606,7 @@ mod tests {
             &blockhash_string,
         ]);
         assert_eq!(
-            parse_command(&test_deactivate_stake, &default_keypair_file, &mut None).unwrap(),
+            parse_command(&test_deactivate_stake, &default_keypair_file, None).unwrap(),
             CliCommandInfo {
                 command: CliCommand::DeactivateStake {
                     stake_account_pubkey,
@@ -2669,7 +2633,7 @@ mod tests {
             "--sign-only",
         ]);
         assert_eq!(
-            parse_command(&test_deactivate_stake, &default_keypair_file, &mut None).unwrap(),
+            parse_command(&test_deactivate_stake, &default_keypair_file, None).unwrap(),
             CliCommandInfo {
                 command: CliCommand::DeactivateStake {
                     stake_account_pubkey,
@@ -2700,7 +2664,7 @@ mod tests {
             &key1.to_string(),
         ]);
         assert_eq!(
-            parse_command(&test_deactivate_stake, &default_keypair_file, &mut None).unwrap(),
+            parse_command(&test_deactivate_stake, &default_keypair_file, None).unwrap(),
             CliCommandInfo {
                 command: CliCommand::DeactivateStake {
                     stake_account_pubkey,
@@ -2743,7 +2707,7 @@ mod tests {
             &key2.to_string(),
         ]);
         assert_eq!(
-            parse_command(&test_deactivate_stake, &default_keypair_file, &mut None).unwrap(),
+            parse_command(&test_deactivate_stake, &default_keypair_file, None).unwrap(),
             CliCommandInfo {
                 command: CliCommand::DeactivateStake {
                     stake_account_pubkey,
@@ -2774,7 +2738,7 @@ mod tests {
             &fee_payer_keypair_file,
         ]);
         assert_eq!(
-            parse_command(&test_deactivate_stake, &default_keypair_file, &mut None).unwrap(),
+            parse_command(&test_deactivate_stake, &default_keypair_file, None).unwrap(),
             CliCommandInfo {
                 command: CliCommand::DeactivateStake {
                     stake_account_pubkey,
@@ -2808,7 +2772,7 @@ mod tests {
             "50",
         ]);
         assert_eq!(
-            parse_command(&test_split_stake_account, &default_keypair_file, &mut None).unwrap(),
+            parse_command(&test_split_stake_account, &default_keypair_file, None).unwrap(),
             CliCommandInfo {
                 command: CliCommand::SplitStake {
                     stake_account_pubkey: stake_account_keypair.pubkey(),
@@ -2869,7 +2833,7 @@ mod tests {
             &stake_signer,
         ]);
         assert_eq!(
-            parse_command(&test_split_stake_account, &default_keypair_file, &mut None).unwrap(),
+            parse_command(&test_split_stake_account, &default_keypair_file, None).unwrap(),
             CliCommandInfo {
                 command: CliCommand::SplitStake {
                     stake_account_pubkey: stake_account_keypair.pubkey(),

cli/src/storage.rs

@@ -102,7 +102,7 @@ impl StorageSubCommands for App<'_, '_> {
 pub fn parse_storage_create_archiver_account(
     matches: &ArgMatches<'_>,
     default_signer_path: &str,
-    wallet_manager: &mut Option<Arc<RemoteWalletManager>>,
+    wallet_manager: Option<&Arc<RemoteWalletManager>>,
 ) -> Result<CliCommandInfo, CliError> {
     let account_owner =
         pubkey_of_signer(matches, "storage_account_owner", wallet_manager)?.unwrap();
@@ -130,7 +130,7 @@ pub fn parse_storage_create_archiver_account(
 pub fn parse_storage_create_validator_account(
     matches: &ArgMatches<'_>,
     default_signer_path: &str,
-    wallet_manager: &mut Option<Arc<RemoteWalletManager>>,
+    wallet_manager: Option<&Arc<RemoteWalletManager>>,
 ) -> Result<CliCommandInfo, CliError> {
     let account_owner =
         pubkey_of_signer(matches, "storage_account_owner", wallet_manager)?.unwrap();
@@ -158,7 +158,7 @@ pub fn parse_storage_create_validator_account(
 pub fn parse_storage_claim_reward(
     matches: &ArgMatches<'_>,
     default_signer_path: &str,
-    wallet_manager: &mut Option<Arc<RemoteWalletManager>>,
+    wallet_manager: Option<&Arc<RemoteWalletManager>>,
 ) -> Result<CliCommandInfo, CliError> {
     let node_account_pubkey =
         pubkey_of_signer(matches, "node_account_pubkey", wallet_manager)?.unwrap();
@@ -180,7 +180,7 @@ pub fn parse_storage_claim_reward(
 
 pub fn parse_storage_get_account_command(
     matches: &ArgMatches<'_>,
-    wallet_manager: &mut Option<Arc<RemoteWalletManager>>,
+    wallet_manager: Option<&Arc<RemoteWalletManager>>,
 ) -> Result<CliCommandInfo, CliError> {
     let storage_account_pubkey =
         pubkey_of_signer(matches, "storage_account_pubkey", wallet_manager)?.unwrap();
@@ -330,7 +330,7 @@ mod tests {
             parse_command(
                 &test_create_archiver_storage_account,
                 &default_keypair_file,
-                &mut None
+                None
             )
             .unwrap(),
             CliCommandInfo {
@@ -362,7 +362,7 @@ mod tests {
             parse_command(
                 &test_create_validator_storage_account,
                 &default_keypair_file,
-                &mut None
+                None
             )
             .unwrap(),
             CliCommandInfo {
@@ -385,7 +385,7 @@ mod tests {
             &storage_account_string,
         ]);
         assert_eq!(
-            parse_command(&test_claim_storage_reward, &default_keypair_file, &mut None).unwrap(),
+            parse_command(&test_claim_storage_reward, &default_keypair_file, None).unwrap(),
             CliCommandInfo {
                 command: CliCommand::ClaimStorageReward {
                     node_account_pubkey: pubkey,

cli/src/validator_info.rs

@@ -1,6 +1,6 @@
 use crate::{
     cli::{check_account_for_fee, CliCommand, CliCommandInfo, CliConfig, CliError, ProcessResult},
-    cli_output::{CliValidatorInfo, CliValidatorInfoVec},
+    display::println_name_value,
 };
 use bincode::deserialize;
 use clap::{App, AppSettings, Arg, ArgMatches, SubCommand};
@@ -25,6 +25,7 @@ use solana_sdk::{
     transaction::Transaction,
 };
 use std::{error, sync::Arc};
+use titlecase::titlecase;
 
 pub const MAX_SHORT_FIELD_LENGTH: usize = 70;
 pub const MAX_LONG_FIELD_LENGTH: usize = 300;
@@ -228,7 +229,7 @@ impl ValidatorInfoSubCommands for App<'_, '_> {
 pub fn parse_validator_info_command(
     matches: &ArgMatches<'_>,
     default_signer_path: &str,
-    wallet_manager: &mut Option<Arc<RemoteWalletManager>>,
+    wallet_manager: Option<&Arc<RemoteWalletManager>>,
 ) -> Result<CliCommandInfo, CliError> {
     let info_pubkey = pubkey_of(matches, "info_pubkey");
     // Prepare validator info
@@ -374,11 +375,7 @@ pub fn process_set_validator_info(
     Ok("".to_string())
 }
 
-pub fn process_get_validator_info(
-    rpc_client: &RpcClient,
-    config: &CliConfig,
-    pubkey: Option<Pubkey>,
-) -> ProcessResult {
+pub fn process_get_validator_info(rpc_client: &RpcClient, pubkey: Option<Pubkey>) -> ProcessResult {
     let validator_info: Vec<(Pubkey, Account)> = if let Some(validator_info_pubkey) = pubkey {
         vec![(
             validator_info_pubkey,
@@ -397,22 +394,23 @@ pub fn process_get_validator_info(
             .collect()
     };
 
-    let mut validator_info_list: Vec<CliValidatorInfo> = vec![];
     if validator_info.is_empty() {
         println!("No validator info accounts found");
     }
     for (validator_info_pubkey, validator_info_account) in validator_info.iter() {
         let (validator_pubkey, validator_info) =
             parse_validator_info(&validator_info_pubkey, &validator_info_account)?;
-        validator_info_list.push(CliValidatorInfo {
-            identity_pubkey: validator_pubkey.to_string(),
-            info_pubkey: validator_info_pubkey.to_string(),
-            info: validator_info,
-        });
+        println!();
+        println_name_value("Validator Identity Pubkey:", &validator_pubkey.to_string());
+        println_name_value("  Info Pubkey:", &validator_info_pubkey.to_string());
+        for (key, value) in validator_info.iter() {
+            println_name_value(
+                &format!("  {}:", titlecase(key)),
+                &value.as_str().unwrap_or("?"),
+            );
+        }
     }
-    config
-        .output_format
-        .formatted_print(&CliValidatorInfoVec::new(validator_info_list));
+
     Ok("".to_string())
 }
 

cli/src/vote.rs

@@ -1,22 +1,19 @@
-use crate::{
-    cli::{
-        check_account_for_fee, check_unique_pubkeys, generate_unique_signers,
-        log_instruction_custom_error, CliCommand, CliCommandInfo, CliConfig, CliError,
-        ProcessResult, SignerIndex,
-    },
-    cli_output::{CliEpochVotingHistory, CliLockout, CliVoteAccount},
+use crate::cli::{
+    build_balance_message, check_account_for_fee, check_unique_pubkeys, generate_unique_signers,
+    log_instruction_custom_error, CliCommand, CliCommandInfo, CliConfig, CliError, CliSignerInfo,
+    ProcessResult, SignerIndex,
 };
 use clap::{value_t_or_exit, App, Arg, ArgMatches, SubCommand};
-use solana_clap_utils::{
-    commitment::{commitment_arg, COMMITMENT_ARG},
-    input_parsers::*,
-    input_validators::*,
-};
+use solana_clap_utils::{input_parsers::*, input_validators::*};
 use solana_client::rpc_client::RpcClient;
 use solana_remote_wallet::remote_wallet::RemoteWalletManager;
 use solana_sdk::{
-    account::Account, commitment_config::CommitmentConfig, message::Message, pubkey::Pubkey,
-    system_instruction::SystemError, transaction::Transaction,
+    account::Account,
+    commitment_config::CommitmentConfig,
+    message::Message,
+    pubkey::Pubkey,
+    system_instruction::{create_address_with_seed, SystemError},
+    transaction::Transaction,
 };
 use solana_vote_program::{
     vote_instruction::{self, withdraw, VoteError},
@@ -95,17 +92,9 @@ impl VoteSubCommands for App<'_, '_> {
                         .validator(is_valid_pubkey)
                         .help("Vote account in which to set the authorized voter"),
                 )
-                .arg(
-                    Arg::with_name("authorized")
-                        .index(2)
-                        .value_name("AUTHORIZED_KEYPAIR")
-                        .required(true)
-                        .validator(is_valid_signer)
-                        .help("Current authorized vote signer"),
-                )
                 .arg(
                     Arg::with_name("new_authorized_pubkey")
-                        .index(3)
+                        .index(2)
                         .value_name("AUTHORIZED_PUBKEY")
                         .takes_value(true)
                         .required(true)
@@ -125,17 +114,9 @@ impl VoteSubCommands for App<'_, '_> {
                         .validator(is_valid_pubkey)
                         .help("Vote account in which to set the authorized withdrawer"),
                 )
-                .arg(
-                    Arg::with_name("authorized")
-                        .index(2)
-                        .value_name("AUTHORIZED_KEYPAIR")
-                        .required(true)
-                        .validator(is_valid_signer)
-                        .help("Current authorized withdrawer"),
-                )
                 .arg(
                     Arg::with_name("new_authorized_pubkey")
-                        .index(3)
+                        .index(2)
                         .value_name("AUTHORIZED_PUBKEY")
                         .takes_value(true)
                         .required(true)
@@ -178,6 +159,14 @@ impl VoteSubCommands for App<'_, '_> {
             SubCommand::with_name("vote-account")
                 .about("Show the contents of a vote account")
                 .alias("show-vote-account")
+                .arg(
+                    Arg::with_name("confirmed")
+                        .long("confirmed")
+                        .takes_value(false)
+                        .help(
+                            "Return information at maximum-lockout commitment level",
+                        ),
+                )
                 .arg(
                     Arg::with_name("vote_account_pubkey")
                         .index(1)
@@ -192,8 +181,7 @@ impl VoteSubCommands for App<'_, '_> {
                         .long("lamports")
                         .takes_value(false)
                         .help("Display balance in lamports instead of SOL"),
-                )
-                .arg(commitment_arg()),
+                ),
         )
         .subcommand(
             SubCommand::with_name("withdraw-from-vote-account")
@@ -240,7 +228,7 @@ impl VoteSubCommands for App<'_, '_> {
 pub fn parse_create_vote_account(
     matches: &ArgMatches<'_>,
     default_signer_path: &str,
-    wallet_manager: &mut Option<Arc<RemoteWalletManager>>,
+    wallet_manager: Option<&Arc<RemoteWalletManager>>,
 ) -> Result<CliCommandInfo, CliError> {
     let (vote_account, _) = signer_of(matches, "vote_account", wallet_manager)?;
     let seed = matches.value_of("seed").map(|s| s.to_string());
@@ -273,18 +261,17 @@ pub fn parse_create_vote_account(
 pub fn parse_vote_authorize(
     matches: &ArgMatches<'_>,
     default_signer_path: &str,
-    wallet_manager: &mut Option<Arc<RemoteWalletManager>>,
+    wallet_manager: Option<&Arc<RemoteWalletManager>>,
     vote_authorize: VoteAuthorize,
 ) -> Result<CliCommandInfo, CliError> {
     let vote_account_pubkey =
         pubkey_of_signer(matches, "vote_account_pubkey", wallet_manager)?.unwrap();
     let new_authorized_pubkey =
         pubkey_of_signer(matches, "new_authorized_pubkey", wallet_manager)?.unwrap();
-    let (authorized, _) = signer_of(matches, "authorized", wallet_manager)?;
 
-    let payer_provided = None;
-    let signer_info = generate_unique_signers(
-        vec![payer_provided, authorized],
+    let authorized_voter_provided = None;
+    let CliSignerInfo { signers } = generate_unique_signers(
+        vec![authorized_voter_provided],
         matches,
         default_signer_path,
         wallet_manager,
@@ -296,14 +283,14 @@ pub fn parse_vote_authorize(
             new_authorized_pubkey,
             vote_authorize,
         },
-        signers: signer_info.signers,
+        signers,
     })
 }
 
 pub fn parse_vote_update_validator(
     matches: &ArgMatches<'_>,
     default_signer_path: &str,
-    wallet_manager: &mut Option<Arc<RemoteWalletManager>>,
+    wallet_manager: Option<&Arc<RemoteWalletManager>>,
 ) -> Result<CliCommandInfo, CliError> {
     let vote_account_pubkey =
         pubkey_of_signer(matches, "vote_account_pubkey", wallet_manager)?.unwrap();
@@ -330,13 +317,16 @@ pub fn parse_vote_update_validator(
 
 pub fn parse_vote_get_account_command(
     matches: &ArgMatches<'_>,
-    wallet_manager: &mut Option<Arc<RemoteWalletManager>>,
+    wallet_manager: Option<&Arc<RemoteWalletManager>>,
 ) -> Result<CliCommandInfo, CliError> {
     let vote_account_pubkey =
         pubkey_of_signer(matches, "vote_account_pubkey", wallet_manager)?.unwrap();
     let use_lamports_unit = matches.is_present("lamports");
-    let commitment_config =
-        commitment_of(matches, COMMITMENT_ARG.long).unwrap_or_else(CommitmentConfig::recent);
+    let commitment_config = if matches.is_present("confirmed") {
+        CommitmentConfig::default()
+    } else {
+        CommitmentConfig::recent()
+    };
     Ok(CliCommandInfo {
         command: CliCommand::ShowVoteAccount {
             pubkey: vote_account_pubkey,
@@ -350,7 +340,7 @@ pub fn parse_vote_get_account_command(
 pub fn parse_withdraw_from_vote_account(
     matches: &ArgMatches<'_>,
     default_signer_path: &str,
-    wallet_manager: &mut Option<Arc<RemoteWalletManager>>,
+    wallet_manager: Option<&Arc<RemoteWalletManager>>,
 ) -> Result<CliCommandInfo, CliError> {
     let vote_account_pubkey =
         pubkey_of_signer(matches, "vote_account_pubkey", wallet_manager)?.unwrap();
@@ -391,7 +381,7 @@ pub fn process_create_vote_account(
     let vote_account = config.signers[1];
     let vote_account_pubkey = vote_account.pubkey();
     let vote_account_address = if let Some(seed) = seed {
-        Pubkey::create_with_seed(&vote_account_pubkey, &seed, &solana_vote_program::id())?
+        create_address_with_seed(&vote_account_pubkey, &seed, &solana_vote_program::id())?
     } else {
         vote_account_pubkey
     };
@@ -469,24 +459,16 @@ pub fn process_vote_authorize(
     new_authorized_pubkey: &Pubkey,
     vote_authorize: VoteAuthorize,
 ) -> ProcessResult {
-    // If the `authorized_account` is also the fee payer, `config.signers` will only have one
-    // keypair in it
-    let authorized = if config.signers.len() == 2 {
-        config.signers[1]
-    } else {
-        config.signers[0]
-    };
-
     check_unique_pubkeys(
-        (&authorized.pubkey(), "authorized_account".to_string()),
+        (vote_account_pubkey, "vote_account_pubkey".to_string()),
         (new_authorized_pubkey, "new_authorized_pubkey".to_string()),
     )?;
     let (recent_blockhash, fee_calculator) = rpc_client.get_recent_blockhash()?;
     let ixs = vec![vote_instruction::authorize(
-        vote_account_pubkey,   // vote account to update
-        &authorized.pubkey(),  // current authorized
-        new_authorized_pubkey, // new vote signer/withdrawer
-        vote_authorize,        // vote or withdraw
+        vote_account_pubkey,         // vote account to update
+        &config.signers[0].pubkey(), // current authorized voter
+        new_authorized_pubkey,       // new vote signer/withdrawer
+        vote_authorize,              // vote or withdraw
     )];
 
     let message = Message::new_with_payer(&ixs, Some(&config.signers[0].pubkey()));
@@ -517,7 +499,7 @@ pub fn process_vote_update_validator(
         (&new_identity_pubkey, "new_identity_account".to_string()),
     )?;
     let (recent_blockhash, fee_calculator) = rpc_client.get_recent_blockhash()?;
-    let ixs = vec![vote_instruction::update_validator_identity(
+    let ixs = vec![vote_instruction::update_node(
         vote_account_pubkey,
         &authorized_withdrawer.pubkey(),
         &new_identity_pubkey,
@@ -566,7 +548,7 @@ fn get_vote_account(
 
 pub fn process_show_vote_account(
     rpc_client: &RpcClient,
-    config: &CliConfig,
+    _config: &CliConfig,
     vote_account_pubkey: &Pubkey,
     use_lamports_unit: bool,
     commitment_config: CommitmentConfig,
@@ -576,38 +558,45 @@ pub fn process_show_vote_account(
 
     let epoch_schedule = rpc_client.get_epoch_schedule()?;
 
-    let mut votes: Vec<CliLockout> = vec![];
-    let mut epoch_voting_history: Vec<CliEpochVotingHistory> = vec![];
-    if !vote_state.votes.is_empty() {
-        for vote in &vote_state.votes {
-            votes.push(vote.into());
+    println!(
+        "Account Balance: {}",
+        build_balance_message(vote_account.lamports, use_lamports_unit, true)
+    );
+    println!("Validator Identity: {}", vote_state.node_pubkey);
+    println!("Authorized Voter: {:?}", vote_state.authorized_voters());
+    println!(
+        "Authorized Withdrawer: {}",
+        vote_state.authorized_withdrawer
+    );
+    println!("Credits: {}", vote_state.credits());
+    println!("Commission: {}%", vote_state.commission);
+    println!(
+        "Root Slot: {}",
+        match vote_state.root_slot {
+            Some(slot) => slot.to_string(),
+            None => "~".to_string(),
         }
+    );
+    println!("Recent Timestamp: {:?}", vote_state.last_timestamp);
+    if !vote_state.votes.is_empty() {
+        println!("recent votes:");
+        for vote in &vote_state.votes {
+            println!(
+                "- slot: {}\n  confirmation count: {}",
+                vote.slot, vote.confirmation_count
+            );
+        }
+
+        println!("Epoch Voting History:");
         for (epoch, credits, prev_credits) in vote_state.epoch_credits() {
             let credits_earned = credits - prev_credits;
             let slots_in_epoch = epoch_schedule.get_slots_in_epoch(*epoch);
-            epoch_voting_history.push(CliEpochVotingHistory {
-                epoch: *epoch,
-                slots_in_epoch,
-                credits_earned,
-            });
+            println!(
+                "- epoch: {}\n  slots in epoch: {}\n  credits earned: {}",
+                epoch, slots_in_epoch, credits_earned,
+            );
         }
     }
-
-    let vote_account_data = CliVoteAccount {
-        account_balance: vote_account.lamports,
-        validator_identity: vote_state.node_pubkey.to_string(),
-        authorized_voters: vote_state.authorized_voters().into(),
-        authorized_withdrawer: vote_state.authorized_withdrawer.to_string(),
-        credits: vote_state.credits(),
-        commission: vote_state.commission,
-        root_slot: vote_state.root_slot,
-        recent_timestamp: vote_state.last_timestamp.clone(),
-        votes,
-        epoch_voting_history,
-        use_lamports_unit,
-    };
-
-    config.output_format.formatted_print(&vote_account_data);
     Ok("".to_string())
 }
 
@@ -673,11 +662,10 @@ mod tests {
             "test",
             "vote-authorize-voter",
             &pubkey_string,
-            &default_keypair_file,
             &pubkey2_string,
         ]);
         assert_eq!(
-            parse_command(&test_authorize_voter, &default_keypair_file, &mut None).unwrap(),
+            parse_command(&test_authorize_voter, &default_keypair_file, None).unwrap(),
             CliCommandInfo {
                 command: CliCommand::VoteAuthorize {
                     vote_account_pubkey: pubkey,
@@ -688,32 +676,6 @@ mod tests {
             }
         );
 
-        let authorized_keypair = Keypair::new();
-        let (authorized_keypair_file, mut tmp_file) = make_tmp_file();
-        write_keypair(&authorized_keypair, tmp_file.as_file_mut()).unwrap();
-
-        let test_authorize_voter = test_commands.clone().get_matches_from(vec![
-            "test",
-            "vote-authorize-voter",
-            &pubkey_string,
-            &authorized_keypair_file,
-            &pubkey2_string,
-        ]);
-        assert_eq!(
-            parse_command(&test_authorize_voter, &default_keypair_file, &mut None).unwrap(),
-            CliCommandInfo {
-                command: CliCommand::VoteAuthorize {
-                    vote_account_pubkey: pubkey,
-                    new_authorized_pubkey: pubkey2,
-                    vote_authorize: VoteAuthorize::Voter
-                },
-                signers: vec![
-                    read_keypair_file(&default_keypair_file).unwrap().into(),
-                    read_keypair_file(&authorized_keypair_file).unwrap().into(),
-                ],
-            }
-        );
-
         let (keypair_file, mut tmp_file) = make_tmp_file();
         let keypair = Keypair::new();
         write_keypair(&keypair, tmp_file.as_file_mut()).unwrap();
@@ -730,7 +692,7 @@ mod tests {
             "10",
         ]);
         assert_eq!(
-            parse_command(&test_create_vote_account, &default_keypair_file, &mut None).unwrap(),
+            parse_command(&test_create_vote_account, &default_keypair_file, None).unwrap(),
             CliCommandInfo {
                 command: CliCommand::CreateVoteAccount {
                     seed: None,
@@ -758,7 +720,7 @@ mod tests {
             &identity_keypair_file,
         ]);
         assert_eq!(
-            parse_command(&test_create_vote_account2, &default_keypair_file, &mut None).unwrap(),
+            parse_command(&test_create_vote_account2, &default_keypair_file, None).unwrap(),
             CliCommandInfo {
                 command: CliCommand::CreateVoteAccount {
                     seed: None,
@@ -790,7 +752,7 @@ mod tests {
             &authed.to_string(),
         ]);
         assert_eq!(
-            parse_command(&test_create_vote_account3, &default_keypair_file, &mut None).unwrap(),
+            parse_command(&test_create_vote_account3, &default_keypair_file, None).unwrap(),
             CliCommandInfo {
                 command: CliCommand::CreateVoteAccount {
                     seed: None,
@@ -820,7 +782,7 @@ mod tests {
             &authed.to_string(),
         ]);
         assert_eq!(
-            parse_command(&test_create_vote_account4, &default_keypair_file, &mut None).unwrap(),
+            parse_command(&test_create_vote_account4, &default_keypair_file, None).unwrap(),
             CliCommandInfo {
                 command: CliCommand::CreateVoteAccount {
                     seed: None,
@@ -845,7 +807,7 @@ mod tests {
             &keypair_file,
         ]);
         assert_eq!(
-            parse_command(&test_update_validator, &default_keypair_file, &mut None).unwrap(),
+            parse_command(&test_update_validator, &default_keypair_file, None).unwrap(),
             CliCommandInfo {
                 command: CliCommand::VoteUpdateValidator {
                     vote_account_pubkey: pubkey,
@@ -871,7 +833,7 @@ mod tests {
             parse_command(
                 &test_withdraw_from_vote_account,
                 &default_keypair_file,
-                &mut None
+                None
             )
             .unwrap(),
             CliCommandInfo {
@@ -902,7 +864,7 @@ mod tests {
             parse_command(
                 &test_withdraw_from_vote_account,
                 &default_keypair_file,
-                &mut None
+                None
             )
             .unwrap(),
             CliCommandInfo {

cli/tests/nonce.rs

@@ -13,6 +13,7 @@ use solana_sdk::{
     hash::Hash,
     pubkey::Pubkey,
     signature::{keypair_from_seed, Keypair, Signer},
+    system_instruction::create_address_with_seed,
     system_program,
 };
 use std::{fs::remove_dir_all, sync::mpsc::channel, thread::sleep, time::Duration};
@@ -129,7 +130,7 @@ fn full_battery_tests(
     config_nonce.signers = vec![&nonce_keypair];
 
     let nonce_account = if let Some(seed) = seed.as_ref() {
-        Pubkey::create_with_seed(
+        create_address_with_seed(
             &config_nonce.signers[0].pubkey(),
             seed,
             &system_program::id(),
@@ -265,7 +266,6 @@ fn test_create_account_with_seed() {
     } = TestValidator::run_with_options(TestValidatorOptions {
         fees: 1,
         bootstrap_validator_lamports: 42_000,
-        ..TestValidatorOptions::default()
     });
 
     let (sender, receiver) = channel();
@@ -301,7 +301,7 @@ fn test_create_account_with_seed() {
     let authority_pubkey = offline_nonce_authority_signer.pubkey();
     let seed = authority_pubkey.to_string()[0..32].to_string();
     let nonce_address =
-        Pubkey::create_with_seed(&creator_pubkey, &seed, &system_program::id()).unwrap();
+        create_address_with_seed(&creator_pubkey, &seed, &system_program::id()).unwrap();
     check_balance(0, &rpc_client, &nonce_address);
 
     let mut creator_config = CliConfig::default();

cli/tests/stake.rs

@@ -14,6 +14,7 @@ use solana_sdk::{
     nonce::State as NonceState,
     pubkey::Pubkey,
     signature::{keypair_from_seed, Keypair, Signer},
+    system_instruction::create_address_with_seed,
 };
 use solana_stake_program::{
     stake_instruction::LockupArgs,
@@ -159,7 +160,7 @@ fn test_seed_stake_delegation_and_deactivation() {
     .unwrap();
     check_balance(100_000, &rpc_client, &config_validator.signers[0].pubkey());
 
-    let stake_address = Pubkey::create_with_seed(
+    let stake_address = create_address_with_seed(
         &config_validator.signers[0].pubkey(),
         "hi there",
         &solana_stake_program::id(),
@@ -811,7 +812,6 @@ fn test_stake_authorize_with_fee_payer() {
     } = 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);
@@ -939,7 +939,6 @@ fn test_stake_split() {
     } = TestValidator::run_with_options(TestValidatorOptions {
         fees: 1,
         bootstrap_validator_lamports: 42_000,
-        ..TestValidatorOptions::default()
     });
     let (sender, receiver) = channel();
     run_local_faucet(alice, sender, None);
@@ -1087,7 +1086,6 @@ fn test_stake_set_lockup() {
     } = TestValidator::run_with_options(TestValidatorOptions {
         fees: 1,
         bootstrap_validator_lamports: 42_000,
-        ..TestValidatorOptions::default()
     });
     let (sender, receiver) = channel();
     run_local_faucet(alice, sender, None);
@@ -1451,7 +1449,6 @@ fn test_offline_nonced_create_stake_account_and_withdraw() {
         destination_account_pubkey: recipient_pubkey,
         lamports: 42,
         withdraw_authority: 0,
-        custodian: None,
         sign_only: true,
         blockhash_query: BlockhashQuery::None(nonce_hash),
         nonce_account: Some(nonce_pubkey),
@@ -1467,7 +1464,6 @@ fn test_offline_nonced_create_stake_account_and_withdraw() {
         destination_account_pubkey: recipient_pubkey,
         lamports: 42,
         withdraw_authority: 0,
-        custodian: None,
         sign_only: false,
         blockhash_query: BlockhashQuery::FeeCalculator(
             blockhash_query::Source::NonceAccount(nonce_pubkey),
@@ -1527,7 +1523,7 @@ fn test_offline_nonced_create_stake_account_and_withdraw() {
     };
     process_command(&config).unwrap();
     let seed_address =
-        Pubkey::create_with_seed(&stake_pubkey, seed, &solana_stake_program::id()).unwrap();
+        create_address_with_seed(&stake_pubkey, seed, &solana_stake_program::id()).unwrap();
     check_balance(50_000, &rpc_client, &seed_address);
 
     server.close().unwrap();

cli/tests/transfer.rs

@@ -40,7 +40,6 @@ fn test_transfer() {
     } = TestValidator::run_with_options(TestValidatorOptions {
         fees: 1,
         bootstrap_validator_lamports: 42_000,
-        ..TestValidatorOptions::default()
     });
 
     let (sender, receiver) = channel();
@@ -236,7 +235,6 @@ fn test_transfer_multisession_signing() {
     } = TestValidator::run_with_options(TestValidatorOptions {
         fees: 1,
         bootstrap_validator_lamports: 42_000,
-        ..TestValidatorOptions::default()
     });
 
     let (sender, receiver) = channel();

client/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "solana-client"
-version = "1.1.8"
+version = "1.0.17"
 description = "Solana Client"
 authors = ["Solana Maintainers <maintainers@solana.com>"]
 repository = "https://github.com/solana-labs/solana"
@@ -14,15 +14,15 @@ bs58 = "0.3.0"
 indicatif = "0.14.0"
 jsonrpc-core = "14.0.5"
 log = "0.4.8"
-rayon = "1.3.0"
-reqwest = { version = "0.10.4", default-features = false, features = ["blocking", "rustls-tls", "json"] }
-serde = "1.0.105"
+rayon = "1.2.0"
+reqwest = { version = "0.10.1", default-features = false, features = ["blocking", "rustls-tls"] }
+serde = "1.0.104"
 serde_derive = "1.0.103"
-serde_json = "1.0.48"
-solana-transaction-status = { path = "../transaction-status", version = "1.1.8" }
-solana-net-utils = { path = "../net-utils", version = "1.1.8" }
-solana-sdk = { path = "../sdk", version = "1.1.8" }
-solana-vote-program = { path = "../programs/vote", version = "1.1.8" }
+serde_json = "1.0.46"
+solana-net-utils = { path = "../net-utils", version = "1.0.17" }
+solana-sdk = { path = "../sdk", version = "1.0.17" }
+solana-transaction-status = { path = "../transaction-status", version = "1.0.17" }
+solana-vote-program = { path = "../programs/vote", version = "1.0.17" }
 thiserror = "1.0"
 tungstenite = "0.10.1"
 url = "2.1.1"
@@ -31,7 +31,4 @@ url = "2.1.1"
 assert_matches = "1.3.0"
 jsonrpc-core = "14.0.5"
 jsonrpc-http-server = "14.0.6"
-solana-logger = { path = "../logger", version = "1.1.8" }
-
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]
+solana-logger = { path = "../logger", version = "1.0.17" }

client/src/client_error.rs

@@ -52,6 +52,7 @@ impl Into<TransportError> for ClientErrorKind {
 pub struct ClientError {
     command: Option<&'static str>,
     #[source]
+    #[error(transparent)]
     kind: ClientErrorKind,
 }
 

client/src/mock_rpc_client_request.rs

@@ -8,8 +8,7 @@ use serde_json::{Number, Value};
 use solana_sdk::{
     fee_calculator::{FeeCalculator, FeeRateGovernor},
     instruction::InstructionError,
-    signature::Signature,
-    transaction::{self, Transaction, TransactionError},
+    transaction::{self, TransactionError},
 };
 use solana_transaction_status::TransactionStatus;
 use std::{collections::HashMap, sync::RwLock};
@@ -41,7 +40,7 @@ impl GenericRpcClientRequest for MockRpcClientRequest {
     fn send(
         &self,
         request: &RpcRequest,
-        params: serde_json::Value,
+        _params: serde_json::Value,
         _retries: usize,
     ) -> Result<serde_json::Value> {
         if let Some(value) = self.mocks.write().unwrap().remove(request) {
@@ -106,17 +105,7 @@ impl GenericRpcClientRequest for MockRpcClientRequest {
             }
             RpcRequest::GetTransactionCount => Value::Number(Number::from(1234)),
             RpcRequest::GetSlot => Value::Number(Number::from(0)),
-            RpcRequest::SendTransaction => {
-                let signature = if self.url == "malicious" {
-                    Signature::new(&[8; 64]).to_string()
-                } else {
-                    let tx_str = params.as_array().unwrap()[0].as_str().unwrap().to_string();
-                    let data = bs58::decode(tx_str).into_vec().unwrap();
-                    let tx: Transaction = bincode::deserialize(&data).unwrap();
-                    tx.signatures[0].to_string()
-                };
-                Value::String(signature)
-            }
+            RpcRequest::SendTransaction => Value::String(SIGNATURE.to_string()),
             RpcRequest::GetMinimumBalanceForRentExemption => Value::Number(Number::from(1234)),
             _ => Value::Null,
         };

client/src/rpc_client.rs

@@ -4,7 +4,11 @@ use crate::{
     mock_rpc_client_request::{MockRpcClientRequest, Mocks},
     rpc_client_request::RpcClientRequest,
     rpc_request::{RpcError, RpcRequest},
-    rpc_response::*,
+    rpc_response::{
+        Response, RpcAccount, RpcBlockhashFeeCalculator, RpcContactInfo, RpcEpochInfo,
+        RpcFeeCalculator, RpcFeeRateGovernor, RpcIdentity, RpcKeyedAccount, RpcLeaderSchedule,
+        RpcResult, RpcVersionInfo, RpcVoteAccountStatus,
+    },
 };
 use bincode::serialize;
 use indicatif::{ProgressBar, ProgressStyle};
@@ -12,10 +16,7 @@ use log::*;
 use serde_json::{json, Value};
 use solana_sdk::{
     account::Account,
-    clock::{
-        Slot, UnixTimestamp, DEFAULT_TICKS_PER_SECOND, DEFAULT_TICKS_PER_SLOT,
-        MAX_HASH_AGE_IN_SECONDS,
-    },
+    clock::{Slot, UnixTimestamp, DEFAULT_TICKS_PER_SECOND, DEFAULT_TICKS_PER_SLOT},
     commitment_config::CommitmentConfig,
     epoch_schedule::EpochSchedule,
     fee_calculator::{FeeCalculator, FeeRateGovernor},
@@ -26,9 +27,7 @@ use solana_sdk::{
     signers::Signers,
     transaction::{self, Transaction, TransactionError},
 };
-use solana_transaction_status::{
-    ConfirmedBlock, ConfirmedTransaction, TransactionEncoding, TransactionStatus,
-};
+use solana_transaction_status::{ConfirmedBlock, TransactionEncoding, TransactionStatus};
 use solana_vote_program::vote_state::MAX_LOCKOUT_HISTORY;
 use std::{
     error,
@@ -104,24 +103,9 @@ impl RpcClient {
             None => {
                 Err(RpcError::ForUser("Received result of an unexpected type".to_string()).into())
             }
-            Some(signature_base58_str) => {
-                let signature = signature_base58_str.parse::<Signature>().map_err(|err| {
-                    Into::<ClientError>::into(RpcError::ParseError(err.to_string()))
-                })?;
-                // A mismatching RPC response signature indicates an issue with the RPC node, and
-                // should not be passed along to confirmation methods. The transaction may or may
-                // not have been submitted to the cluster, so callers should verify the success of
-                // the correct transaction signature independently.
-                if signature != transaction.signatures[0] {
-                    Err(RpcError::RpcRequestError(format!(
-                        "RPC node returned mismatched signature {:?}, expected {:?}",
-                        signature, transaction.signatures[0]
-                    ))
-                    .into())
-                } else {
-                    Ok(transaction.signatures[0])
-                }
-            }
+            Some(signature_base58_str) => signature_base58_str
+                .parse::<Signature>()
+                .map_err(|err| RpcError::ParseError(err.to_string()).into()),
         }
     }
 
@@ -163,28 +147,6 @@ impl RpcClient {
             .map(|status_meta| status_meta.status))
     }
 
-    pub fn get_signature_status_with_commitment_and_history(
-        &self,
-        signature: &Signature,
-        commitment_config: CommitmentConfig,
-        search_transaction_history: bool,
-    ) -> ClientResult<Option<transaction::Result<()>>> {
-        let signature_status = self.client.send(
-            &RpcRequest::GetSignatureStatuses,
-            json!([[signature.to_string()], {
-                "searchTransactionHistory": search_transaction_history
-            }]),
-            5,
-        )?;
-        let result: Response<Vec<Option<TransactionStatus>>> =
-            serde_json::from_value(signature_status)
-                .map_err(|err| ClientError::new_with_command(err.into(), "GetSignatureStatuses"))?;
-        Ok(result.value[0]
-            .clone()
-            .filter(|result| result.satisfies_commitment(commitment_config))
-            .map(|status_meta| status_meta.status))
-    }
-
     pub fn get_slot(&self) -> ClientResult<Slot> {
         self.get_slot_with_commitment(CommitmentConfig::default())
     }
@@ -202,23 +164,6 @@ impl RpcClient {
             .map_err(|err| ClientError::new_with_command(err.into(), "GetSlot"))
     }
 
-    pub fn total_supply(&self) -> ClientResult<u64> {
-        self.total_supply_with_commitment(CommitmentConfig::default())
-    }
-
-    pub fn total_supply_with_commitment(
-        &self,
-        commitment_config: CommitmentConfig,
-    ) -> ClientResult<u64> {
-        let response = self
-            .client
-            .send(&RpcRequest::GetTotalSupply, json!([commitment_config]), 0)
-            .map_err(|err| err.into_with_command("GetTotalSupply"))?;
-
-        serde_json::from_value(response)
-            .map_err(|err| ClientError::new_with_command(err.into(), "GetTotalSupply"))
-    }
-
     pub fn get_vote_accounts(&self) -> ClientResult<RpcVoteAccountStatus> {
         self.get_vote_accounts_with_commitment(CommitmentConfig::default())
     }
@@ -282,55 +227,6 @@ impl RpcClient {
             .map_err(|err| ClientError::new_with_command(err.into(), "GetConfirmedBlocks"))
     }
 
-    pub fn get_confirmed_signatures_for_address(
-        &self,
-        address: &Pubkey,
-        start_slot: Slot,
-        end_slot: Slot,
-    ) -> ClientResult<Vec<Signature>> {
-        let response = self
-            .client
-            .send(
-                &RpcRequest::GetConfirmedSignaturesForAddress,
-                json!([address.to_string(), start_slot, end_slot]),
-                0,
-            )
-            .map_err(|err| err.into_with_command("GetConfirmedSignaturesForAddress"))?;
-
-        let signatures_base58_str: Vec<String> =
-            serde_json::from_value(response).map_err(|err| {
-                ClientError::new_with_command(err.into(), "GetConfirmedSignaturesForAddress")
-            })?;
-
-        let mut signatures = vec![];
-        for signature_base58_str in signatures_base58_str {
-            signatures.push(
-                signature_base58_str.parse::<Signature>().map_err(|err| {
-                    Into::<ClientError>::into(RpcError::ParseError(err.to_string()))
-                })?,
-            );
-        }
-        Ok(signatures)
-    }
-
-    pub fn get_confirmed_transaction(
-        &self,
-        signature: &Signature,
-        encoding: TransactionEncoding,
-    ) -> ClientResult<ConfirmedTransaction> {
-        let response = self
-            .client
-            .send(
-                &RpcRequest::GetConfirmedTransaction,
-                json!([signature.to_string(), encoding]),
-                0,
-            )
-            .map_err(|err| err.into_with_command("GetConfirmedTransaction"))?;
-
-        serde_json::from_value(response)
-            .map_err(|err| ClientError::new_with_command(err.into(), "GetConfirmedTransaction"))
-    }
-
     pub fn get_block_time(&self, slot: Slot) -> ClientResult<UnixTimestamp> {
         let response = self
             .client
@@ -1047,7 +943,7 @@ impl RpcClient {
             .send(
                 &RpcRequest::GetSignatureStatuses,
                 json!([[signature.to_string()]]),
-                5,
+                1,
             )
             .map_err(|err| err.into_with_command("GetSignatureStatuses"))?;
         let result: Response<Vec<Option<TransactionStatus>>> = serde_json::from_value(response)
@@ -1074,15 +970,14 @@ impl RpcClient {
         let mut confirmations = 0;
 
         let progress_bar = new_spinner_progress_bar();
+        progress_bar.set_message(&format!(
+            "[{}/{}] Waiting for confirmations",
+            confirmations,
+            MAX_LOCKOUT_HISTORY + 1,
+        ));
 
         let mut send_retries = 20;
         let signature = loop {
-            progress_bar.set_message(&format!(
-                "[{}/{}] Finalizing transaction {}",
-                confirmations,
-                MAX_LOCKOUT_HISTORY + 1,
-                transaction.signatures[0],
-            ));
             let mut status_retries = 15;
             let (signature, status) = loop {
                 let signature = self.send_transaction(transaction)?;
@@ -1134,7 +1029,6 @@ impl RpcClient {
                 }
             }
         };
-        let now = Instant::now();
         loop {
             // Return when default (max) commitment is reached
             // Failed transactions have already been eliminated, `is_some` check is sufficient
@@ -1144,20 +1038,12 @@ impl RpcClient {
                 return Ok(signature);
             }
             progress_bar.set_message(&format!(
-                "[{}/{}] Finalizing transaction {}",
+                "[{}/{}] Waiting for confirmations",
                 confirmations + 1,
                 MAX_LOCKOUT_HISTORY + 1,
-                signature,
             ));
             sleep(Duration::from_millis(500));
-            confirmations = self
-                .get_num_blocks_since_signature_confirmation(&signature)
-                .unwrap_or(confirmations);
-            if now.elapsed().as_secs() >= MAX_HASH_AGE_IN_SECONDS as u64 {
-                return Err(
-                    RpcError::ForUser("transaction not finalized. This can happen when a transaction lands in an abandoned fork. Please retry.".to_string()).into(),
-                );
-            }
+            confirmations = self.get_num_blocks_since_signature_confirmation(&signature)?;
         }
     }
 
@@ -1195,7 +1081,10 @@ pub fn get_rpc_request_str(rpc_addr: SocketAddr, tls: bool) -> String {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::{client_error::ClientErrorKind, mock_rpc_client_request::PUBKEY};
+    use crate::{
+        client_error::ClientErrorKind,
+        mock_rpc_client_request::{PUBKEY, SIGNATURE},
+    };
     use assert_matches::assert_matches;
     use jsonrpc_core::{Error, IoHandler, Params};
     use jsonrpc_http_server::{AccessControlAllowOrigin, DomainsValidation, ServerBuilder};
@@ -1308,17 +1197,12 @@ mod tests {
         let tx = system_transaction::transfer(&key, &to, 50, blockhash);
 
         let signature = rpc_client.send_transaction(&tx);
-        assert_eq!(signature.unwrap(), tx.signatures[0]);
+        assert_eq!(signature.unwrap(), SIGNATURE.parse().unwrap());
 
         let rpc_client = RpcClient::new_mock("fails".to_string());
 
         let signature = rpc_client.send_transaction(&tx);
         assert!(signature.is_err());
-
-        // Test bad signature returned from rpc node
-        let rpc_client = RpcClient::new_mock("malicious".to_string());
-        let signature = rpc_client.send_transaction(&tx);
-        assert!(signature.is_err());
     }
     #[test]
     fn test_get_recent_blockhash() {

client/src/rpc_request.rs

@@ -11,8 +11,6 @@ pub enum RpcRequest {
     GetClusterNodes,
     GetConfirmedBlock,
     GetConfirmedBlocks,
-    GetConfirmedSignaturesForAddress,
-    GetConfirmedTransaction,
     GetEpochInfo,
     GetEpochSchedule,
     GetGenesisHash,
@@ -30,7 +28,6 @@ pub enum RpcRequest {
     GetStorageTurnRate,
     GetSlotsPerSegment,
     GetStoragePubkeysForSlot,
-    GetTotalSupply,
     GetTransactionCount,
     GetVersion,
     GetVoteAccounts,
@@ -42,9 +39,6 @@ pub enum RpcRequest {
     MinimumLedgerSlot,
 }
 
-pub const MAX_GET_SIGNATURE_STATUSES_QUERY_ITEMS: usize = 256;
-pub const MAX_GET_CONFIRMED_SIGNATURES_FOR_ADDRESS_SLOT_RANGE: u64 = 10_000;
-
 impl RpcRequest {
     pub(crate) fn build_request_json(&self, id: u64, params: Value) -> Value {
         let jsonrpc = "2.0";
@@ -57,8 +51,6 @@ impl RpcRequest {
             RpcRequest::GetClusterNodes => "getClusterNodes",
             RpcRequest::GetConfirmedBlock => "getConfirmedBlock",
             RpcRequest::GetConfirmedBlocks => "getConfirmedBlocks",
-            RpcRequest::GetConfirmedSignaturesForAddress => "getConfirmedSignaturesForAddress",
-            RpcRequest::GetConfirmedTransaction => "getConfirmedTransaction",
             RpcRequest::GetEpochInfo => "getEpochInfo",
             RpcRequest::GetEpochSchedule => "getEpochSchedule",
             RpcRequest::GetGenesisHash => "getGenesisHash",
@@ -76,7 +68,6 @@ impl RpcRequest {
             RpcRequest::GetStorageTurnRate => "getStorageTurnRate",
             RpcRequest::GetSlotsPerSegment => "getSlotsPerSegment",
             RpcRequest::GetStoragePubkeysForSlot => "getStoragePubkeysForSlot",
-            RpcRequest::GetTotalSupply => "getTotalSupply",
             RpcRequest::GetTransactionCount => "getTransactionCount",
             RpcRequest::GetVersion => "getVersion",
             RpcRequest::GetVoteAccounts => "getVoteAccounts",

core/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "solana-core"
 description = "Blockchain, Rebuilt for Scale"
-version = "1.1.8"
+version = "1.0.17"
 documentation = "https://docs.rs/solana"
 homepage = "https://solana.com/"
 readme = "../README.md"
@@ -17,66 +17,66 @@ codecov = { repository = "solana-labs/solana", branch = "master", service = "git
 bincode = "1.2.1"
 bv = { version = "0.11.1", features = ["serde"] }
 bs58 = "0.3.0"
-byteorder = "1.3.4"
-chrono = { version = "0.4.11", features = ["serde"] }
+byteorder = "1.3.2"
+chrono = { version = "0.4.10", features = ["serde"] }
+compression = "0.1.5"
 core_affinity = "0.5.10"
-crossbeam-channel = "0.4"
+crossbeam-channel = "0.3"
 fs_extra = "1.1.0"
-flate2 = "1.0"
 indexmap = "1.3"
-itertools = "0.9.0"
+itertools = "0.8.2"
 jsonrpc-core = "14.0.5"
 jsonrpc-core-client = { version = "14.0.5", features = ["ws"] }
 jsonrpc-derive = "14.0.5"
 jsonrpc-http-server = "14.0.6"
 jsonrpc-pubsub = "14.0.6"
 jsonrpc-ws-server = "14.0.6"
+libc = "0.2.66"
 log = "0.4.8"
+nix = "0.17.0"
 num_cpus = "1.0.0"
 num-traits = "0.2"
-rand = "0.7.0"
-rand_chacha = "0.2.2"
-rayon = "1.3.0"
-regex = "1.3.6"
-serde = "1.0.105"
+rand = "0.6.5"
+rand_chacha = "0.1.1"
+rayon = "1.2.0"
+regex = "1.3.4"
+serde = "1.0.104"
 serde_derive = "1.0.103"
-serde_json = "1.0.48"
-solana-bpf-loader-program = { path = "../programs/bpf_loader", version = "1.1.8" }
-solana-budget-program = { path = "../programs/budget", version = "1.1.8" }
-solana-clap-utils = { path = "../clap-utils", version = "1.1.8" }
-solana-client = { path = "../client", version = "1.1.8" }
-solana-transaction-status = { path = "../transaction-status", version = "1.1.8" }
-solana-faucet = { path = "../faucet", version = "1.1.8" }
-ed25519-dalek = "=1.0.0-pre.3"
-solana-ledger = { path = "../ledger", version = "1.1.8" }
-solana-logger = { path = "../logger", version = "1.1.8" }
-solana-merkle-tree = { path = "../merkle-tree", version = "1.1.8" }
-solana-metrics = { path = "../metrics", version = "1.1.8" }
-solana-measure = { path = "../measure", version = "1.1.8" }
-solana-net-utils = { path = "../net-utils", version = "1.1.8" }
-solana-chacha-cuda = { path = "../chacha-cuda", version = "1.1.8" }
-solana-perf = { path = "../perf", version = "1.1.8" }
-solana-runtime = { path = "../runtime", version = "1.1.8" }
-solana-sdk = { path = "../sdk", version = "1.1.8" }
-solana-stake-program = { path = "../programs/stake", version = "1.1.8" }
-solana-storage-program = { path = "../programs/storage", version = "1.1.8" }
-solana-streamer = { path = "../streamer", version = "1.1.8" }
-solana-vote-program = { path = "../programs/vote", version = "1.1.8" }
-solana-vote-signer = { path = "../vote-signer", version = "1.1.8" }
-solana-sys-tuner = { path = "../sys-tuner", version = "1.1.8" }
+serde_json = "1.0.46"
+solana-budget-program = { path = "../programs/budget", version = "1.0.17" }
+solana-clap-utils = { path = "../clap-utils", version = "1.0.17" }
+solana-client = { path = "../client", version = "1.0.17" }
+solana-transaction-status = { path = "../transaction-status", version = "1.0.17" }
+solana-faucet = { path = "../faucet", version = "1.0.17" }
+ed25519-dalek = "=1.0.0-pre.1"
+solana-ledger = { path = "../ledger", version = "1.0.17" }
+solana-logger = { path = "../logger", version = "1.0.17" }
+solana-merkle-tree = { path = "../merkle-tree", version = "1.0.17" }
+solana-metrics = { path = "../metrics", version = "1.0.17" }
+solana-measure = { path = "../measure", version = "1.0.17" }
+solana-net-utils = { path = "../net-utils", version = "1.0.17" }
+solana-chacha-cuda = { path = "../chacha-cuda", version = "1.0.17" }
+solana-perf = { path = "../perf", version = "1.0.17" }
+solana-runtime = { path = "../runtime", version = "1.0.17" }
+solana-sdk = { path = "../sdk", version = "1.0.17" }
+solana-stake-program = { path = "../programs/stake", version = "1.0.17" }
+solana-storage-program = { path = "../programs/storage", version = "1.0.17" }
+solana-vote-program = { path = "../programs/vote", version = "1.0.17" }
+solana-vote-signer = { path = "../vote-signer", version = "1.0.17" }
+solana-sys-tuner = { path = "../sys-tuner", version = "1.0.17" }
 tempfile = "3.1.0"
 thiserror = "1.0"
 tokio = "0.1"
 tokio-codec = "0.1"
 tokio-fs = "0.1"
 tokio-io = "0.1"
-solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "1.1.8" }
+solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "1.0.17" }
 trees = "0.2.1"
 
 [dev-dependencies]
 matches = "0.1.6"
-reqwest = { version = "0.10.4", default-features = false, features = ["blocking", "rustls-tls", "json"] }
-serial_test = "0.4.0"
+reqwest = { version = "0.10.1", default-features = false, features = ["blocking", "rustls-tls"] }
+serial_test = "0.3.2"
 serial_test_derive = "0.4.0"
 systemstat = "0.1.5"
 
@@ -104,6 +104,3 @@ name = "cluster_info"
 [[bench]]
 name = "chacha"
 required-features = ["chacha"]
-
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]

core/benches/banking_stage.rs

@@ -9,12 +9,12 @@ use rayon::prelude::*;
 use solana_core::banking_stage::{create_test_recorder, BankingStage};
 use solana_core::cluster_info::ClusterInfo;
 use solana_core::cluster_info::Node;
+use solana_core::genesis_utils::{create_genesis_config, GenesisConfigInfo};
+use solana_core::packet::to_packets_chunked;
 use solana_core::poh_recorder::WorkingBankEntry;
 use solana_ledger::blockstore_processor::process_entries;
 use solana_ledger::entry::{next_hash, Entry};
-use solana_ledger::genesis_utils::{create_genesis_config, GenesisConfigInfo};
 use solana_ledger::{blockstore::Blockstore, get_tmp_ledger_path};
-use solana_perf::packet::to_packets_chunked;
 use solana_perf::test_tx::test_tx;
 use solana_runtime::bank::Bank;
 use solana_sdk::genesis_config::GenesisConfig;
@@ -190,7 +190,7 @@ fn bench_banking(bencher: &mut Bencher, tx_type: TransactionType) {
         let (exit, poh_recorder, poh_service, signal_receiver) =
             create_test_recorder(&bank, &blockstore, None);
         let cluster_info = ClusterInfo::new_with_invalid_keypair(Node::new_localhost().info);
-        let cluster_info = Arc::new(cluster_info);
+        let cluster_info = Arc::new(RwLock::new(cluster_info));
         let _banking_stage = BankingStage::new(
             &cluster_info,
             &poh_recorder,

core/benches/cluster_info.rs

@@ -3,18 +3,13 @@
 extern crate test;
 
 use rand::{thread_rng, Rng};
-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::sync::RwLock;
-use std::{
-    collections::HashMap,
-    net::UdpSocket,
-    sync::{atomic::AtomicU64, Arc},
-};
+use std::collections::HashMap;
+use std::net::UdpSocket;
+use std::sync::Arc;
 use test::Bencher;
 
 #[bench]
@@ -25,8 +20,10 @@ fn broadcast_shreds_bench(bencher: &mut Bencher) {
     let mut cluster_info = ClusterInfo::new_with_invalid_keypair(leader_info.info.clone());
     let socket = UdpSocket::bind("0.0.0.0:0").unwrap();
 
+    const SHRED_SIZE: usize = 1024;
     const NUM_SHREDS: usize = 32;
-    let shreds = vec![Shred::new_empty_data_shred(); NUM_SHREDS];
+    let shreds = vec![vec![0; SHRED_SIZE]; NUM_SHREDS];
+    let seeds = vec![[0u8; 32]; NUM_SHREDS];
     let mut stakes = HashMap::new();
     const NUM_PEERS: usize = 200;
     for _ in 0..NUM_PEERS {
@@ -36,20 +33,10 @@ fn broadcast_shreds_bench(bencher: &mut Bencher) {
         stakes.insert(id, thread_rng().gen_range(1, NUM_PEERS) as u64);
     }
     let stakes = Arc::new(stakes);
-    let cluster_info = Arc::new(cluster_info);
-    let (peers, peers_and_stakes) = get_broadcast_peers(&cluster_info, Some(stakes.clone()));
-    let shreds = Arc::new(shreds);
-    let last_datapoint = Arc::new(AtomicU64::new(0));
     bencher.iter(move || {
         let shreds = shreds.clone();
-        broadcast_shreds(
-            &socket,
-            &shreds,
-            &peers_and_stakes,
-            &peers,
-            &last_datapoint,
-            &mut 0,
-        )
-        .unwrap();
+        cluster_info
+            .broadcast_shreds(&socket, shreds, &seeds, Some(stakes.clone()))
+            .unwrap();
     });
 }

core/benches/retransmit_stage.rs

@@ -6,12 +6,12 @@ extern crate test;
 use log::*;
 use solana_core::cluster_info::{ClusterInfo, Node};
 use solana_core::contact_info::ContactInfo;
+use solana_core::genesis_utils::{create_genesis_config, GenesisConfigInfo};
+use solana_core::packet::to_packets_chunked;
 use solana_core::retransmit_stage::retransmitter;
 use solana_ledger::bank_forks::BankForks;
-use solana_ledger::genesis_utils::{create_genesis_config, GenesisConfigInfo};
 use solana_ledger::leader_schedule_cache::LeaderScheduleCache;
 use solana_measure::measure::Measure;
-use solana_perf::packet::to_packets_chunked;
 use solana_perf::test_tx::test_tx;
 use solana_runtime::bank::Bank;
 use solana_sdk::pubkey::Pubkey;
@@ -45,7 +45,7 @@ fn bench_retransmitter(bencher: &mut Bencher) {
         peer_sockets.push(socket);
     }
     let peer_sockets = Arc::new(peer_sockets);
-    let cluster_info = Arc::new(cluster_info);
+    let cluster_info = Arc::new(RwLock::new(cluster_info));
 
     let GenesisConfigInfo { genesis_config, .. } = create_genesis_config(100_000);
     let bank0 = Bank::new(&genesis_config);

core/benches/sigverify_stage.rs

@@ -6,9 +6,9 @@ extern crate test;
 use crossbeam_channel::unbounded;
 use log::*;
 use rand::{thread_rng, Rng};
+use solana_core::packet::to_packets_chunked;
 use solana_core::sigverify::TransactionSigVerifier;
 use solana_core::sigverify_stage::SigVerifyStage;
-use solana_perf::packet::to_packets_chunked;
 use solana_perf::test_tx::test_tx;
 use solana_sdk::hash::Hash;
 use solana_sdk::signature::{Keypair, Signer};

core/src/accounts_background_service.rs

@@ -1,45 +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 solana_ledger::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;
-
-impl AccountsBackgroundService {
-    pub fn new(bank_forks: Arc<RwLock<BankForks>>, exit: &Arc<AtomicBool>) -> Self {
-        info!("AccountsBackgroundService active");
-        let exit = exit.clone();
-        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().working_bank();
-
-                bank.process_dead_slots();
-
-                // Currently, given INTERVAL_MS, we process 1 slot/100 ms
-                bank.process_stale_slot();
-
-                sleep(Duration::from_millis(INTERVAL_MS));
-            })
-            .unwrap();
-        Self { t_background }
-    }
-
-    pub fn join(self) -> thread::Result<()> {
-        self.t_background.join()
-    }
-}

core/src/accounts_hash_verifier.rs

@@ -15,7 +15,7 @@ use std::{
     sync::{
         atomic::{AtomicBool, Ordering},
         mpsc::RecvTimeoutError,
-        Arc,
+        Arc, RwLock,
     },
     thread::{self, Builder, JoinHandle},
     time::Duration,
@@ -30,7 +30,7 @@ impl AccountsHashVerifier {
         snapshot_package_receiver: SnapshotPackageReceiver,
         snapshot_package_sender: Option<SnapshotPackageSender>,
         exit: &Arc<AtomicBool>,
-        cluster_info: &Arc<ClusterInfo>,
+        cluster_info: &Arc<RwLock<ClusterInfo>>,
         trusted_validators: Option<HashSet<Pubkey>>,
         halt_on_trusted_validators_accounts_hash_mismatch: bool,
         fault_injection_rate_slots: u64,
@@ -72,7 +72,7 @@ impl AccountsHashVerifier {
 
     fn process_snapshot(
         snapshot_package: SnapshotPackage,
-        cluster_info: &ClusterInfo,
+        cluster_info: &Arc<RwLock<ClusterInfo>>,
         trusted_validators: &Option<HashSet<Pubkey>>,
         halt_on_trusted_validator_accounts_hash_mismatch: bool,
         snapshot_package_sender: &Option<SnapshotPackageSender>,
@@ -111,11 +111,14 @@ impl AccountsHashVerifier {
             if sender.send(snapshot_package).is_err() {}
         }
 
-        cluster_info.push_accounts_hashes(hashes.clone());
+        cluster_info
+            .write()
+            .unwrap()
+            .push_accounts_hashes(hashes.clone());
     }
 
     fn should_halt(
-        cluster_info: &ClusterInfo,
+        cluster_info: &Arc<RwLock<ClusterInfo>>,
         trusted_validators: &Option<HashSet<Pubkey>>,
         slot_to_hash: &mut HashMap<Slot, Hash>,
     ) -> bool {
@@ -123,9 +126,11 @@ impl AccountsHashVerifier {
         let mut highest_slot = 0;
         if let Some(trusted_validators) = trusted_validators.as_ref() {
             for trusted_validator in trusted_validators {
-                let is_conflicting = cluster_info.get_accounts_hash_for_node(trusted_validator, |accounts_hashes|
+                let cluster_info_r = cluster_info.read().unwrap();
+                if let Some(accounts_hashes) =
+                    cluster_info_r.get_accounts_hash_for_node(trusted_validator)
                 {
-                    accounts_hashes.iter().any(|(slot, hash)| {
+                    for (slot, hash) in accounts_hashes {
                         if let Some(reference_hash) = slot_to_hash.get(slot) {
                             if *hash != *reference_hash {
                                 error!("Trusted validator {} produced conflicting hashes for slot: {} ({} != {})",
@@ -134,21 +139,16 @@ impl AccountsHashVerifier {
                                     hash,
                                     reference_hash,
                                 );
-                                true
+
+                                return true;
                             } else {
                                 verified_count += 1;
-                                false
                             }
                         } else {
                             highest_slot = std::cmp::max(*slot, highest_slot);
                             slot_to_hash.insert(*slot, *hash);
-                            false
                         }
-                    })
-                }).unwrap_or(false);
-
-                if is_conflicting {
-                    return true;
+                    }
                 }
             }
         }
@@ -181,7 +181,7 @@ mod tests {
 
         let contact_info = ContactInfo::new_localhost(&keypair.pubkey(), 0);
         let cluster_info = ClusterInfo::new_with_invalid_keypair(contact_info);
-        let cluster_info = Arc::new(cluster_info);
+        let cluster_info = Arc::new(RwLock::new(cluster_info));
 
         let mut trusted_validators = HashSet::new();
         let mut slot_to_hash = HashMap::new();
@@ -196,7 +196,8 @@ mod tests {
         let hash2 = hash(&[2]);
         {
             let message = make_accounts_hashes_message(&validator1, vec![(0, hash1)]).unwrap();
-            cluster_info.push_message(message);
+            let mut cluster_info_w = cluster_info.write().unwrap();
+            cluster_info_w.push_message(message);
         }
         slot_to_hash.insert(0, hash2);
         trusted_validators.insert(validator1.pubkey());
@@ -216,7 +217,7 @@ mod tests {
 
         let contact_info = ContactInfo::new_localhost(&keypair.pubkey(), 0);
         let cluster_info = ClusterInfo::new_with_invalid_keypair(contact_info);
-        let cluster_info = Arc::new(cluster_info);
+        let cluster_info = Arc::new(RwLock::new(cluster_info));
 
         let trusted_validators = HashSet::new();
         let exit = Arc::new(AtomicBool::new(false));
@@ -243,8 +244,9 @@ mod tests {
                 0,
             );
         }
-        let cluster_hashes = cluster_info
-            .get_accounts_hash_for_node(&keypair.pubkey(), |c| c.clone())
+        let cluster_info_r = cluster_info.read().unwrap();
+        let cluster_hashes = cluster_info_r
+            .get_accounts_hash_for_node(&keypair.pubkey())
             .unwrap();
         info!("{:?}", cluster_hashes);
         assert_eq!(hashes.len(), MAX_SNAPSHOT_HASHES);

core/src/banking_stage.rs

@@ -3,6 +3,7 @@
 //! can do its processing in parallel with signature verification on the GPU.
 use crate::{
     cluster_info::ClusterInfo,
+    packet::{limited_deserialize, Packet, Packets, PACKETS_PER_BATCH},
     poh_recorder::{PohRecorder, PohRecorderError, WorkingBankEntry},
     poh_service::PohService,
 };
@@ -16,11 +17,7 @@ use solana_ledger::{
 };
 use solana_measure::{measure::Measure, thread_mem_usage};
 use solana_metrics::{inc_new_counter_debug, inc_new_counter_info, inc_new_counter_warn};
-use solana_perf::{
-    cuda_runtime::PinnedVec,
-    packet::{limited_deserialize, Packet, Packets, PACKETS_PER_BATCH},
-    perf_libs,
-};
+use solana_perf::{cuda_runtime::PinnedVec, perf_libs};
 use solana_runtime::{
     accounts_db::ErrorCounters,
     bank::{Bank, TransactionBalancesSet, TransactionProcessResult},
@@ -41,7 +38,7 @@ use std::{
     net::UdpSocket,
     sync::atomic::AtomicBool,
     sync::mpsc::Receiver,
-    sync::{Arc, Mutex},
+    sync::{Arc, Mutex, RwLock},
     thread::{self, Builder, JoinHandle},
     time::Duration,
     time::Instant,
@@ -76,7 +73,7 @@ impl BankingStage {
     /// Create the stage using `bank`. Exit when `verified_receiver` is dropped.
     #[allow(clippy::new_ret_no_self)]
     pub fn new(
-        cluster_info: &Arc<ClusterInfo>,
+        cluster_info: &Arc<RwLock<ClusterInfo>>,
         poh_recorder: &Arc<Mutex<PohRecorder>>,
         verified_receiver: CrossbeamReceiver<Vec<Packets>>,
         verified_vote_receiver: CrossbeamReceiver<Vec<Packets>>,
@@ -93,7 +90,7 @@ impl BankingStage {
     }
 
     fn new_num_threads(
-        cluster_info: &Arc<ClusterInfo>,
+        cluster_info: &Arc<RwLock<ClusterInfo>>,
         poh_recorder: &Arc<Mutex<PohRecorder>>,
         verified_receiver: CrossbeamReceiver<Vec<Packets>>,
         verified_vote_receiver: CrossbeamReceiver<Vec<Packets>>,
@@ -104,7 +101,7 @@ impl BankingStage {
         // Single thread to generate entries from many banks.
         // This thread talks to poh_service and broadcasts the entries once they have been recorded.
         // Once an entry has been recorded, its blockhash is registered with the bank.
-        let my_pubkey = cluster_info.id();
+        let my_pubkey = cluster_info.read().unwrap().id();
         // Many banks that process transactions in parallel.
         let bank_thread_hdls: Vec<JoinHandle<()>> = (0..num_threads)
             .map(|i| {
@@ -287,7 +284,7 @@ impl BankingStage {
         my_pubkey: &Pubkey,
         socket: &std::net::UdpSocket,
         poh_recorder: &Arc<Mutex<PohRecorder>>,
-        cluster_info: &ClusterInfo,
+        cluster_info: &Arc<RwLock<ClusterInfo>>,
         buffered_packets: &mut Vec<PacketsAndOffsets>,
         enable_forwarding: bool,
         batch_limit: usize,
@@ -331,7 +328,10 @@ impl BankingStage {
                     next_leader.map_or((), |leader_pubkey| {
                         let leader_addr = {
                             cluster_info
-                                .lookup_contact_info(&leader_pubkey, |leader| leader.tpu_forwards)
+                                .read()
+                                .unwrap()
+                                .lookup(&leader_pubkey)
+                                .map(|leader| leader.tpu_forwards)
                         };
 
                         leader_addr.map_or((), |leader_addr| {
@@ -355,7 +355,7 @@ impl BankingStage {
         my_pubkey: Pubkey,
         verified_receiver: &CrossbeamReceiver<Vec<Packets>>,
         poh_recorder: &Arc<Mutex<PohRecorder>>,
-        cluster_info: &ClusterInfo,
+        cluster_info: &Arc<RwLock<ClusterInfo>>,
         recv_start: &mut Instant,
         enable_forwarding: bool,
         id: u32,
@@ -1009,7 +1009,10 @@ pub fn create_test_recorder(
 mod tests {
     use super::*;
     use crate::{
-        cluster_info::Node, poh_recorder::WorkingBank,
+        cluster_info::Node,
+        genesis_utils::{create_genesis_config, GenesisConfigInfo},
+        packet::to_packets,
+        poh_recorder::WorkingBank,
         transaction_status_service::TransactionStatusService,
     };
     use crossbeam_channel::unbounded;
@@ -1017,10 +1020,8 @@ mod tests {
     use solana_ledger::{
         blockstore::entries_to_test_shreds,
         entry::{next_entry, Entry, EntrySlice},
-        genesis_utils::{create_genesis_config, GenesisConfigInfo},
         get_tmp_ledger_path,
     };
-    use solana_perf::packet::to_packets;
     use solana_runtime::bank::HashAgeKind;
     use solana_sdk::{
         instruction::InstructionError,
@@ -1046,7 +1047,7 @@ mod tests {
             let (exit, poh_recorder, poh_service, _entry_receiever) =
                 create_test_recorder(&bank, &blockstore, None);
             let cluster_info = ClusterInfo::new_with_invalid_keypair(Node::new_localhost().info);
-            let cluster_info = Arc::new(cluster_info);
+            let cluster_info = Arc::new(RwLock::new(cluster_info));
             let banking_stage = BankingStage::new(
                 &cluster_info,
                 &poh_recorder,
@@ -1086,7 +1087,7 @@ mod tests {
             let (exit, poh_recorder, poh_service, entry_receiver) =
                 create_test_recorder(&bank, &blockstore, Some(poh_config));
             let cluster_info = ClusterInfo::new_with_invalid_keypair(Node::new_localhost().info);
-            let cluster_info = Arc::new(cluster_info);
+            let cluster_info = Arc::new(RwLock::new(cluster_info));
             let banking_stage = BankingStage::new(
                 &cluster_info,
                 &poh_recorder,
@@ -1149,7 +1150,7 @@ mod tests {
             let (exit, poh_recorder, poh_service, entry_receiver) =
                 create_test_recorder(&bank, &blockstore, Some(poh_config));
             let cluster_info = ClusterInfo::new_with_invalid_keypair(Node::new_localhost().info);
-            let cluster_info = Arc::new(cluster_info);
+            let cluster_info = Arc::new(RwLock::new(cluster_info));
             let banking_stage = BankingStage::new(
                 &cluster_info,
                 &poh_recorder,
@@ -1290,7 +1291,7 @@ mod tests {
                     create_test_recorder(&bank, &blockstore, Some(poh_config));
                 let cluster_info =
                     ClusterInfo::new_with_invalid_keypair(Node::new_localhost().info);
-                let cluster_info = Arc::new(cluster_info);
+                let cluster_info = Arc::new(RwLock::new(cluster_info));
                 let _banking_stage = BankingStage::new_num_threads(
                     &cluster_info,
                     &poh_recorder,
@@ -1988,14 +1989,14 @@ mod tests {
                             meta.err,
                             Some(TransactionError::InstructionError(
                                 0,
-                                InstructionError::Custom(1)
+                                InstructionError::CustomError(1)
                             ))
                         );
                         assert_eq!(
                             meta.status,
                             Err(TransactionError::InstructionError(
                                 0,
-                                InstructionError::Custom(1)
+                                InstructionError::CustomError(1)
                             ))
                         );
                     } else {

core/src/blockstream.rs

@@ -0,0 +1,283 @@
+//! The `blockstream` module provides a method for streaming entries out via a
+//! local unix socket, to provide client services such as a block explorer with
+//! real-time access to entries.
+
+use bincode::serialize;
+use chrono::{SecondsFormat, Utc};
+use serde_json::json;
+use solana_ledger::entry::Entry;
+use solana_sdk::{clock::Slot, hash::Hash, pubkey::Pubkey};
+use std::cell::RefCell;
+use std::io::Result;
+use std::path::{Path, PathBuf};
+
+pub trait EntryWriter: std::fmt::Debug {
+    fn write(&self, payload: String) -> Result<()>;
+}
+
+#[derive(Debug, Default)]
+pub struct EntryVec {
+    values: RefCell<Vec<String>>,
+}
+
+impl EntryWriter for EntryVec {
+    fn write(&self, payload: String) -> Result<()> {
+        self.values.borrow_mut().push(payload);
+        Ok(())
+    }
+}
+
+impl EntryVec {
+    pub fn new() -> Self {
+        EntryVec {
+            values: RefCell::new(Vec::new()),
+        }
+    }
+
+    pub fn entries(&self) -> Vec<String> {
+        self.values.borrow().clone()
+    }
+}
+
+#[derive(Debug)]
+pub struct EntrySocket {
+    unix_socket: PathBuf,
+}
+
+impl EntryWriter for EntrySocket {
+    #[cfg(not(windows))]
+    fn write(&self, payload: String) -> Result<()> {
+        use std::io::prelude::*;
+        use std::net::Shutdown;
+        use std::os::unix::net::UnixStream;
+
+        const MESSAGE_TERMINATOR: &str = "\n";
+
+        let mut socket = UnixStream::connect(&self.unix_socket)?;
+        socket.write_all(payload.as_bytes())?;
+        socket.write_all(MESSAGE_TERMINATOR.as_bytes())?;
+        socket.shutdown(Shutdown::Write)?;
+        Ok(())
+    }
+    #[cfg(windows)]
+    fn write(&self, _payload: String) -> Result<()> {
+        Err(std::io::Error::new(
+            std::io::ErrorKind::Other,
+            "EntryWriter::write() not implemented for windows",
+        ))
+    }
+}
+
+pub trait BlockstreamEvents {
+    fn emit_entry_event(
+        &self,
+        slot: Slot,
+        tick_height: u64,
+        leader_pubkey: &Pubkey,
+        entries: &Entry,
+    ) -> Result<()>;
+    fn emit_block_event(
+        &self,
+        slot: Slot,
+        tick_height: u64,
+        leader_pubkey: &Pubkey,
+        blockhash: Hash,
+    ) -> Result<()>;
+}
+
+#[derive(Debug)]
+pub struct Blockstream<T: EntryWriter> {
+    pub output: T,
+}
+
+impl<T> BlockstreamEvents for Blockstream<T>
+where
+    T: EntryWriter,
+{
+    fn emit_entry_event(
+        &self,
+        slot: Slot,
+        tick_height: u64,
+        leader_pubkey: &Pubkey,
+        entry: &Entry,
+    ) -> Result<()> {
+        let transactions: Vec<Vec<u8>> = serialize_transactions(entry);
+        let stream_entry = json!({
+            "num_hashes": entry.num_hashes,
+            "hash": entry.hash,
+            "transactions": transactions
+        });
+        let json_entry = serde_json::to_string(&stream_entry)?;
+        let payload = format!(
+            r#"{{"dt":"{}","t":"entry","s":{},"h":{},"l":"{:?}","entry":{}}}"#,
+            Utc::now().to_rfc3339_opts(SecondsFormat::Nanos, true),
+            slot,
+            tick_height,
+            leader_pubkey,
+            json_entry,
+        );
+        self.output.write(payload)?;
+        Ok(())
+    }
+
+    fn emit_block_event(
+        &self,
+        slot: Slot,
+        tick_height: u64,
+        leader_pubkey: &Pubkey,
+        blockhash: Hash,
+    ) -> Result<()> {
+        let payload = format!(
+            r#"{{"dt":"{}","t":"block","s":{},"h":{},"l":"{:?}","hash":"{:?}"}}"#,
+            Utc::now().to_rfc3339_opts(SecondsFormat::Nanos, true),
+            slot,
+            tick_height,
+            leader_pubkey,
+            blockhash,
+        );
+        self.output.write(payload)?;
+        Ok(())
+    }
+}
+
+pub type SocketBlockstream = Blockstream<EntrySocket>;
+
+impl SocketBlockstream {
+    pub fn new(unix_socket: &Path) -> Self {
+        Blockstream {
+            output: EntrySocket {
+                unix_socket: unix_socket.to_path_buf(),
+            },
+        }
+    }
+}
+
+pub type MockBlockstream = Blockstream<EntryVec>;
+
+impl MockBlockstream {
+    pub fn new(_: &Path) -> Self {
+        Blockstream {
+            output: EntryVec::new(),
+        }
+    }
+
+    pub fn entries(&self) -> Vec<String> {
+        self.output.entries()
+    }
+}
+
+fn serialize_transactions(entry: &Entry) -> Vec<Vec<u8>> {
+    entry
+        .transactions
+        .iter()
+        .map(|tx| serialize(&tx).unwrap())
+        .collect()
+}
+
+#[cfg(test)]
+mod test {
+    use super::*;
+    use chrono::{DateTime, FixedOffset};
+    use serde_json::Value;
+    use solana_sdk::hash::Hash;
+    use solana_sdk::signature::{Keypair, Signer};
+    use solana_sdk::system_transaction;
+    use std::collections::HashSet;
+    use std::path::PathBuf;
+
+    #[test]
+    fn test_serialize_transactions() {
+        let entry = Entry::new(&Hash::default(), 1, vec![]);
+        let empty_vec: Vec<Vec<u8>> = vec![];
+        assert_eq!(serialize_transactions(&entry), empty_vec);
+
+        let keypair0 = Keypair::new();
+        let keypair1 = Keypair::new();
+        let tx0 = system_transaction::transfer(&keypair0, &keypair1.pubkey(), 1, Hash::default());
+        let tx1 = system_transaction::transfer(&keypair1, &keypair0.pubkey(), 2, Hash::default());
+        let serialized_tx0 = serialize(&tx0).unwrap();
+        let serialized_tx1 = serialize(&tx1).unwrap();
+        let entry = Entry::new(&Hash::default(), 1, vec![tx0, tx1]);
+        assert_eq!(
+            serialize_transactions(&entry),
+            vec![serialized_tx0, serialized_tx1]
+        );
+    }
+
+    #[test]
+    fn test_blockstream() -> () {
+        let blockstream = MockBlockstream::new(&PathBuf::from("test_stream"));
+        let ticks_per_slot = 5;
+
+        let mut blockhash = Hash::default();
+        let mut entries = Vec::new();
+        let mut expected_entries = Vec::new();
+
+        let tick_height_initial = 1;
+        let tick_height_final = tick_height_initial + ticks_per_slot + 2;
+        let mut curr_slot = 0;
+        let leader_pubkey = Pubkey::new_rand();
+
+        for tick_height in tick_height_initial..=tick_height_final {
+            if tick_height == 5 {
+                blockstream
+                    .emit_block_event(curr_slot, tick_height, &leader_pubkey, blockhash)
+                    .unwrap();
+                curr_slot += 1;
+            }
+            let entry = Entry::new(&mut blockhash, 1, vec![]); // just ticks
+            blockhash = entry.hash;
+            blockstream
+                .emit_entry_event(curr_slot, tick_height, &leader_pubkey, &entry)
+                .unwrap();
+            expected_entries.push(entry.clone());
+            entries.push(entry);
+        }
+
+        assert_eq!(
+            blockstream.entries().len() as u64,
+            // one entry per tick (1..=N+2) is +3, plus one block
+            ticks_per_slot + 3 + 1
+        );
+
+        let mut j = 0;
+        let mut matched_entries = 0;
+        let mut matched_slots = HashSet::new();
+        let mut matched_blocks = HashSet::new();
+
+        for item in blockstream.entries() {
+            let json: Value = serde_json::from_str(&item).unwrap();
+            let dt_str = json["dt"].as_str().unwrap();
+
+            // Ensure `ts` field parses as valid DateTime
+            let _dt: DateTime<FixedOffset> = DateTime::parse_from_rfc3339(dt_str).unwrap();
+
+            let item_type = json["t"].as_str().unwrap();
+            match item_type {
+                "block" => {
+                    let hash = json["hash"].to_string();
+                    matched_blocks.insert(hash);
+                }
+
+                "entry" => {
+                    let slot = json["s"].as_u64().unwrap();
+                    matched_slots.insert(slot);
+                    let entry_obj = json["entry"].clone();
+                    let entry: Entry = serde_json::from_value(entry_obj).unwrap();
+
+                    assert_eq!(entry, expected_entries[j]);
+                    matched_entries += 1;
+                    j += 1;
+                }
+
+                _ => {
+                    assert!(false, "unknown item type {}", item);
+                }
+            }
+        }
+
+        assert_eq!(matched_entries, expected_entries.len());
+        assert_eq!(matched_slots.len(), 2);
+        assert_eq!(matched_blocks.len(), 1);
+    }
+}

core/src/blockstream_service.rs

@@ -0,0 +1,228 @@
+//! The `blockstream_service` implements optional streaming of entries and block metadata
+//! using the `blockstream` module, providing client services such as a block explorer with
+//! real-time access to entries.
+
+use crate::blockstream::BlockstreamEvents;
+#[cfg(test)]
+use crate::blockstream::MockBlockstream as Blockstream;
+#[cfg(not(test))]
+use crate::blockstream::SocketBlockstream as Blockstream;
+use crate::result::{Error, Result};
+use solana_ledger::blockstore::Blockstore;
+use solana_sdk::pubkey::Pubkey;
+use std::path::Path;
+use std::sync::atomic::{AtomicBool, Ordering};
+use std::sync::mpsc::{Receiver, RecvTimeoutError};
+use std::sync::Arc;
+use std::thread::{self, Builder, JoinHandle};
+use std::time::Duration;
+
+pub struct BlockstreamService {
+    t_blockstream: JoinHandle<()>,
+}
+
+impl BlockstreamService {
+    #[allow(clippy::new_ret_no_self)]
+    pub fn new(
+        slot_full_receiver: Receiver<(u64, Pubkey)>,
+        blockstore: Arc<Blockstore>,
+        unix_socket: &Path,
+        exit: &Arc<AtomicBool>,
+    ) -> Self {
+        let mut blockstream = Blockstream::new(unix_socket);
+        let exit = exit.clone();
+        let t_blockstream = Builder::new()
+            .name("solana-blockstream".to_string())
+            .spawn(move || loop {
+                if exit.load(Ordering::Relaxed) {
+                    break;
+                }
+                if let Err(e) =
+                    Self::process_entries(&slot_full_receiver, &blockstore, &mut blockstream)
+                {
+                    match e {
+                        Error::RecvTimeoutError(RecvTimeoutError::Disconnected) => break,
+                        Error::RecvTimeoutError(RecvTimeoutError::Timeout) => (),
+                        _ => info!("Error from process_entries: {:?}", e),
+                    }
+                }
+            })
+            .unwrap();
+        Self { t_blockstream }
+    }
+    fn process_entries(
+        slot_full_receiver: &Receiver<(u64, Pubkey)>,
+        blockstore: &Arc<Blockstore>,
+        blockstream: &mut Blockstream,
+    ) -> Result<()> {
+        let timeout = Duration::new(1, 0);
+        let (slot, slot_leader) = slot_full_receiver.recv_timeout(timeout)?;
+
+        // Slot might not exist due to LedgerCleanupService, check first
+        let blockstore_meta = blockstore.meta(slot).unwrap();
+        if let Some(blockstore_meta) = blockstore_meta {
+            // Return error to main loop. Thread won't exit, will just log the error
+            let entries = blockstore.get_slot_entries(slot, 0, None)?;
+            let _parent_slot = if slot == 0 {
+                None
+            } else {
+                Some(blockstore_meta.parent_slot)
+            };
+            let ticks_per_slot = entries.iter().filter(|entry| entry.is_tick()).count() as u64;
+            let mut tick_height = ticks_per_slot * slot;
+
+            for (i, entry) in entries.iter().enumerate() {
+                if entry.is_tick() {
+                    tick_height += 1;
+                }
+                blockstream
+                    .emit_entry_event(slot, tick_height, &slot_leader, &entry)
+                    .unwrap_or_else(|e| {
+                        debug!("Blockstream error: {:?}, {:?}", e, blockstream.output);
+                    });
+                if i == entries.len() - 1 {
+                    blockstream
+                        .emit_block_event(slot, tick_height, &slot_leader, entry.hash)
+                        .unwrap_or_else(|e| {
+                            debug!("Blockstream error: {:?}, {:?}", e, blockstream.output);
+                        });
+                }
+            }
+        }
+        Ok(())
+    }
+
+    pub fn join(self) -> thread::Result<()> {
+        self.t_blockstream.join()
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use super::*;
+    use crate::genesis_utils::{create_genesis_config, GenesisConfigInfo};
+    use bincode::{deserialize, serialize};
+    use chrono::{DateTime, FixedOffset};
+    use serde_json::Value;
+    use solana_ledger::create_new_tmp_ledger;
+    use solana_ledger::entry::{create_ticks, Entry};
+    use solana_sdk::hash::Hash;
+    use solana_sdk::signature::{Keypair, Signer};
+    use solana_sdk::system_transaction;
+    use std::path::PathBuf;
+    use std::sync::mpsc::channel;
+
+    #[test]
+    fn test_blockstream_service_process_entries() {
+        let ticks_per_slot = 5;
+        let leader_pubkey = Pubkey::new_rand();
+
+        // Set up genesis config and blockstore
+        let GenesisConfigInfo {
+            mut genesis_config, ..
+        } = create_genesis_config(1000);
+        genesis_config.ticks_per_slot = ticks_per_slot;
+
+        let (ledger_path, _blockhash) = create_new_tmp_ledger!(&genesis_config);
+        let blockstore = Blockstore::open(&ledger_path).unwrap();
+
+        // Set up blockstream
+        let mut blockstream = Blockstream::new(&PathBuf::from("test_stream"));
+
+        // Set up dummy channel to receive a full-slot notification
+        let (slot_full_sender, slot_full_receiver) = channel();
+
+        // Create entries - 4 ticks + 1 populated entry + 1 tick
+        let mut entries = create_ticks(4, 0, Hash::default());
+
+        let keypair = Keypair::new();
+        let mut blockhash = entries[3].hash;
+        let tx = system_transaction::transfer(&keypair, &keypair.pubkey(), 1, Hash::default());
+        let entry = Entry::new(&mut blockhash, 1, vec![tx]);
+        blockhash = entry.hash;
+        entries.push(entry);
+        let final_tick = create_ticks(1, 0, blockhash);
+        entries.extend_from_slice(&final_tick);
+
+        let expected_entries = entries.clone();
+        let expected_tick_heights = [6, 7, 8, 9, 9, 10];
+
+        blockstore
+            .write_entries(
+                1,
+                0,
+                0,
+                ticks_per_slot,
+                None,
+                true,
+                &Arc::new(Keypair::new()),
+                entries,
+                0,
+            )
+            .unwrap();
+
+        slot_full_sender.send((1, leader_pubkey)).unwrap();
+        BlockstreamService::process_entries(
+            &slot_full_receiver,
+            &Arc::new(blockstore),
+            &mut blockstream,
+        )
+        .unwrap();
+        assert_eq!(blockstream.entries().len(), 7);
+
+        let (entry_events, block_events): (Vec<Value>, Vec<Value>) = blockstream
+            .entries()
+            .iter()
+            .map(|item| {
+                let json: Value = serde_json::from_str(&item).unwrap();
+                let dt_str = json["dt"].as_str().unwrap();
+                // Ensure `ts` field parses as valid DateTime
+                let _dt: DateTime<FixedOffset> = DateTime::parse_from_rfc3339(dt_str).unwrap();
+                json
+            })
+            .partition(|json| {
+                let item_type = json["t"].as_str().unwrap();
+                item_type == "entry"
+            });
+        for (i, json) in entry_events.iter().enumerate() {
+            let height = json["h"].as_u64().unwrap();
+            assert_eq!(height, expected_tick_heights[i]);
+            let entry_obj = json["entry"].clone();
+            let tx = entry_obj["transactions"].as_array().unwrap();
+            let entry: Entry;
+            if tx.len() == 0 {
+                entry = serde_json::from_value(entry_obj).unwrap();
+            } else {
+                let entry_json = entry_obj.as_object().unwrap();
+                entry = Entry {
+                    num_hashes: entry_json.get("num_hashes").unwrap().as_u64().unwrap(),
+                    hash: serde_json::from_value(entry_json.get("hash").unwrap().clone()).unwrap(),
+                    transactions: entry_json
+                        .get("transactions")
+                        .unwrap()
+                        .as_array()
+                        .unwrap()
+                        .into_iter()
+                        .enumerate()
+                        .map(|(j, tx)| {
+                            let tx_vec: Vec<u8> = serde_json::from_value(tx.clone()).unwrap();
+                            // Check explicitly that transaction matches bincode-serialized format
+                            assert_eq!(
+                                tx_vec,
+                                serialize(&expected_entries[i].transactions[j]).unwrap()
+                            );
+                            deserialize(&tx_vec).unwrap()
+                        })
+                        .collect(),
+                };
+            }
+            assert_eq!(entry, expected_entries[i]);
+        }
+        for json in block_events {
+            let slot = json["s"].as_u64().unwrap();
+            assert_eq!(1, slot);
+            let height = json["h"].as_u64().unwrap();
+            assert_eq!(2 * ticks_per_slot, height);
+        }
+    }
+}

core/src/broadcast_stage.rs

@@ -1,51 +1,30 @@
 //! A stage to broadcast data from a leader node to validators
-use self::{
-    broadcast_fake_shreds_run::BroadcastFakeShredsRun, broadcast_metrics::*,
-    fail_entry_verification_broadcast_run::FailEntryVerificationBroadcastRun,
-    standard_broadcast_run::StandardBroadcastRun,
-};
-use crate::contact_info::ContactInfo;
-use crate::crds_gossip_pull::CRDS_GOSSIP_PULL_CRDS_TIMEOUT_MS;
-use crate::weighted_shuffle::weighted_best;
-use crate::{
-    cluster_info::{ClusterInfo, ClusterInfoError},
-    poh_recorder::WorkingBankEntry,
-    result::{Error, Result},
-};
-use crossbeam_channel::{
-    Receiver as CrossbeamReceiver, RecvTimeoutError as CrossbeamRecvTimeoutError,
-    Sender as CrossbeamSender,
-};
-use solana_ledger::{blockstore::Blockstore, shred::Shred, staking_utils};
-use solana_measure::measure::Measure;
+use self::broadcast_fake_shreds_run::BroadcastFakeShredsRun;
+use self::fail_entry_verification_broadcast_run::FailEntryVerificationBroadcastRun;
+use self::standard_broadcast_run::StandardBroadcastRun;
+use crate::cluster_info::{ClusterInfo, ClusterInfoError};
+use crate::poh_recorder::WorkingBankEntry;
+use crate::result::{Error, Result};
+use solana_ledger::blockstore::Blockstore;
+use solana_ledger::shred::Shred;
+use solana_ledger::staking_utils;
 use solana_metrics::{inc_new_counter_error, inc_new_counter_info};
-use solana_runtime::bank::Bank;
-use solana_sdk::timing::timestamp;
-use solana_sdk::{clock::Slot, pubkey::Pubkey};
-use solana_streamer::sendmmsg::send_mmsg;
-use std::sync::atomic::AtomicU64;
-use std::{
-    collections::HashMap,
-    net::UdpSocket,
-    sync::atomic::{AtomicBool, Ordering},
-    sync::mpsc::{channel, Receiver, RecvError, RecvTimeoutError, Sender},
-    sync::{Arc, Mutex},
-    thread::{self, Builder, JoinHandle},
-    time::{Duration, Instant},
-};
+use solana_sdk::pubkey::Pubkey;
+use std::collections::HashMap;
+use std::net::UdpSocket;
+use std::sync::atomic::{AtomicBool, Ordering};
+use std::sync::mpsc::{channel, Receiver, RecvError, RecvTimeoutError, Sender};
+use std::sync::{Arc, Mutex, RwLock};
+use std::thread::{self, Builder, JoinHandle};
+use std::time::Instant;
+
+pub const NUM_INSERT_THREADS: usize = 2;
 
 mod broadcast_fake_shreds_run;
-pub(crate) mod broadcast_metrics;
 pub(crate) mod broadcast_utils;
 mod fail_entry_verification_broadcast_run;
 mod standard_broadcast_run;
 
-pub(crate) const NUM_INSERT_THREADS: usize = 2;
-pub(crate) type RetransmitSlotsSender = CrossbeamSender<HashMap<Slot, Arc<Bank>>>;
-pub(crate) type RetransmitSlotsReceiver = CrossbeamReceiver<HashMap<Slot, Arc<Bank>>>;
-pub(crate) type RecordReceiver = Receiver<(Arc<Vec<Shred>>, Option<BroadcastShredBatchInfo>)>;
-pub(crate) type TransmitReceiver = Receiver<(TransmitShreds, Option<BroadcastShredBatchInfo>)>;
-
 #[derive(Debug, PartialEq, Eq, Clone)]
 pub enum BroadcastStageReturnType {
     ChannelDisconnected,
@@ -62,20 +41,18 @@ impl BroadcastStageType {
     pub fn new_broadcast_stage(
         &self,
         sock: Vec<UdpSocket>,
-        cluster_info: Arc<ClusterInfo>,
+        cluster_info: Arc<RwLock<ClusterInfo>>,
         receiver: Receiver<WorkingBankEntry>,
-        retransmit_slots_receiver: RetransmitSlotsReceiver,
         exit_sender: &Arc<AtomicBool>,
         blockstore: &Arc<Blockstore>,
         shred_version: u16,
     ) -> BroadcastStage {
-        let keypair = cluster_info.keypair.clone();
+        let keypair = cluster_info.read().unwrap().keypair.clone();
         match self {
             BroadcastStageType::Standard => BroadcastStage::new(
                 sock,
                 cluster_info,
                 receiver,
-                retransmit_slots_receiver,
                 exit_sender,
                 blockstore,
                 StandardBroadcastRun::new(keypair, shred_version),
@@ -85,7 +62,6 @@ impl BroadcastStageType {
                 sock,
                 cluster_info,
                 receiver,
-                retransmit_slots_receiver,
                 exit_sender,
                 blockstore,
                 FailEntryVerificationBroadcastRun::new(keypair, shred_version),
@@ -95,7 +71,6 @@ impl BroadcastStageType {
                 sock,
                 cluster_info,
                 receiver,
-                retransmit_slots_receiver,
                 exit_sender,
                 blockstore,
                 BroadcastFakeShredsRun::new(keypair, 0, shred_version),
@@ -104,24 +79,24 @@ impl BroadcastStageType {
     }
 }
 
-pub type TransmitShreds = (Option<Arc<HashMap<Pubkey, u64>>>, Arc<Vec<Shred>>);
+type TransmitShreds = (Option<Arc<HashMap<Pubkey, u64>>>, Arc<Vec<Shred>>);
 trait BroadcastRun {
     fn run(
         &mut self,
         blockstore: &Arc<Blockstore>,
         receiver: &Receiver<WorkingBankEntry>,
-        socket_sender: &Sender<(TransmitShreds, Option<BroadcastShredBatchInfo>)>,
-        blockstore_sender: &Sender<(Arc<Vec<Shred>>, Option<BroadcastShredBatchInfo>)>,
+        socket_sender: &Sender<TransmitShreds>,
+        blockstore_sender: &Sender<Arc<Vec<Shred>>>,
     ) -> Result<()>;
     fn transmit(
-        &mut self,
-        receiver: &Arc<Mutex<TransmitReceiver>>,
-        cluster_info: &ClusterInfo,
+        &self,
+        receiver: &Arc<Mutex<Receiver<TransmitShreds>>>,
+        cluster_info: &Arc<RwLock<ClusterInfo>>,
         sock: &UdpSocket,
     ) -> Result<()>;
     fn record(
-        &mut self,
-        receiver: &Arc<Mutex<RecordReceiver>>,
+        &self,
+        receiver: &Arc<Mutex<Receiver<Arc<Vec<Shred>>>>>,
         blockstore: &Arc<Blockstore>,
     ) -> Result<()>;
 }
@@ -153,34 +128,32 @@ impl BroadcastStage {
     fn run(
         blockstore: &Arc<Blockstore>,
         receiver: &Receiver<WorkingBankEntry>,
-        socket_sender: &Sender<(TransmitShreds, Option<BroadcastShredBatchInfo>)>,
-        blockstore_sender: &Sender<(Arc<Vec<Shred>>, Option<BroadcastShredBatchInfo>)>,
+        socket_sender: &Sender<TransmitShreds>,
+        blockstore_sender: &Sender<Arc<Vec<Shred>>>,
         mut broadcast_stage_run: impl BroadcastRun,
     ) -> BroadcastStageReturnType {
         loop {
             let res =
                 broadcast_stage_run.run(blockstore, receiver, socket_sender, blockstore_sender);
-            let res = Self::handle_error(res, "run");
+            let res = Self::handle_error(res);
             if let Some(res) = res {
                 return res;
             }
         }
     }
-    fn handle_error(r: Result<()>, name: &str) -> Option<BroadcastStageReturnType> {
+    fn handle_error(r: Result<()>) -> Option<BroadcastStageReturnType> {
         if let Err(e) = r {
             match e {
                 Error::RecvTimeoutError(RecvTimeoutError::Disconnected)
                 | Error::SendError
-                | Error::RecvError(RecvError)
-                | Error::CrossbeamRecvTimeoutError(CrossbeamRecvTimeoutError::Disconnected) => {
+                | Error::RecvError(RecvError) => {
                     return Some(BroadcastStageReturnType::ChannelDisconnected);
                 }
-                Error::RecvTimeoutError(RecvTimeoutError::Timeout)
-                | Error::CrossbeamRecvTimeoutError(CrossbeamRecvTimeoutError::Timeout) => (),
+                Error::RecvTimeoutError(RecvTimeoutError::Timeout) => (),
                 Error::ClusterInfoError(ClusterInfoError::NoPeers) => (), // TODO: Why are the unit-tests throwing hundreds of these?
                 _ => {
                     inc_new_counter_error!("streamer-broadcaster-error", 1, 1);
-                    error!("{} broadcaster error: {:?}", name, e);
+                    error!("broadcaster error: {:?}", e);
                 }
             }
         }
@@ -205,9 +178,8 @@ impl BroadcastStage {
     #[allow(clippy::too_many_arguments)]
     fn new(
         socks: Vec<UdpSocket>,
-        cluster_info: Arc<ClusterInfo>,
+        cluster_info: Arc<RwLock<ClusterInfo>>,
         receiver: Receiver<WorkingBankEntry>,
-        retransmit_slots_receiver: RetransmitSlotsReceiver,
         exit_sender: &Arc<AtomicBool>,
         blockstore: &Arc<Blockstore>,
         broadcast_stage_run: impl BroadcastRun + Send + 'static + Clone,
@@ -217,8 +189,6 @@ impl BroadcastStage {
         let (socket_sender, socket_receiver) = channel();
         let (blockstore_sender, blockstore_receiver) = channel();
         let bs_run = broadcast_stage_run.clone();
-
-        let socket_sender_ = socket_sender.clone();
         let thread_hdl = Builder::new()
             .name("solana-broadcaster".to_string())
             .spawn(move || {
@@ -226,7 +196,7 @@ impl BroadcastStage {
                 Self::run(
                     &btree,
                     &receiver,
-                    &socket_sender_,
+                    &socket_sender,
                     &blockstore_sender,
                     bs_run,
                 )
@@ -236,13 +206,13 @@ impl BroadcastStage {
         let socket_receiver = Arc::new(Mutex::new(socket_receiver));
         for sock in socks.into_iter() {
             let socket_receiver = socket_receiver.clone();
-            let mut bs_transmit = broadcast_stage_run.clone();
+            let bs_transmit = broadcast_stage_run.clone();
             let cluster_info = cluster_info.clone();
             let t = Builder::new()
                 .name("solana-broadcaster-transmit".to_string())
                 .spawn(move || loop {
                     let res = bs_transmit.transmit(&socket_receiver, &cluster_info, &sock);
-                    let res = Self::handle_error(res, "solana-broadcaster-transmit");
+                    let res = Self::handle_error(res);
                     if let Some(res) = res {
                         return res;
                     }
@@ -253,13 +223,13 @@ impl BroadcastStage {
         let blockstore_receiver = Arc::new(Mutex::new(blockstore_receiver));
         for _ in 0..NUM_INSERT_THREADS {
             let blockstore_receiver = blockstore_receiver.clone();
-            let mut bs_record = broadcast_stage_run.clone();
+            let bs_record = broadcast_stage_run.clone();
             let btree = blockstore.clone();
             let t = Builder::new()
                 .name("solana-broadcaster-record".to_string())
                 .spawn(move || loop {
                     let res = bs_record.record(&blockstore_receiver, &btree);
-                    let res = Self::handle_error(res, "solana-broadcaster-record");
+                    let res = Self::handle_error(res);
                     if let Some(res) = res {
                         return res;
                     }
@@ -268,68 +238,9 @@ impl BroadcastStage {
             thread_hdls.push(t);
         }
 
-        let blockstore = blockstore.clone();
-        let retransmit_thread = Builder::new()
-            .name("solana-broadcaster-retransmit".to_string())
-            .spawn(move || loop {
-                if let Some(res) = Self::handle_error(
-                    Self::check_retransmit_signals(
-                        &blockstore,
-                        &retransmit_slots_receiver,
-                        &socket_sender,
-                    ),
-                    "solana-broadcaster-retransmit-check_retransmit_signals",
-                ) {
-                    return res;
-                }
-            })
-            .unwrap();
-
-        thread_hdls.push(retransmit_thread);
         Self { thread_hdls }
     }
 
-    fn check_retransmit_signals(
-        blockstore: &Blockstore,
-        retransmit_slots_receiver: &RetransmitSlotsReceiver,
-        socket_sender: &Sender<(TransmitShreds, Option<BroadcastShredBatchInfo>)>,
-    ) -> Result<()> {
-        let timer = Duration::from_millis(100);
-
-        // Check for a retransmit signal
-        let mut retransmit_slots = retransmit_slots_receiver.recv_timeout(timer)?;
-        while let Ok(new_retransmit_slots) = retransmit_slots_receiver.try_recv() {
-            retransmit_slots.extend(new_retransmit_slots);
-        }
-
-        for (_, bank) in retransmit_slots.iter() {
-            let bank_epoch = bank.get_leader_schedule_epoch(bank.slot());
-            let stakes = staking_utils::staked_nodes_at_epoch(&bank, bank_epoch);
-            let stakes = stakes.map(Arc::new);
-            let data_shreds = Arc::new(
-                blockstore
-                    .get_data_shreds_for_slot(bank.slot(), 0)
-                    .expect("My own shreds must be reconstructable"),
-            );
-
-            if !data_shreds.is_empty() {
-                socket_sender.send(((stakes.clone(), data_shreds), None))?;
-            }
-
-            let coding_shreds = Arc::new(
-                blockstore
-                    .get_coding_shreds_for_slot(bank.slot(), 0)
-                    .expect("My own shreds must be reconstructable"),
-            );
-
-            if !coding_shreds.is_empty() {
-                socket_sender.send(((stakes.clone(), coding_shreds), None))?;
-            }
-        }
-
-        Ok(())
-    }
-
     pub fn join(self) -> thread::Result<BroadcastStageReturnType> {
         for thread_hdl in self.thread_hdls.into_iter() {
             let _ = thread_hdl.join();
@@ -338,238 +249,23 @@ impl BroadcastStage {
     }
 }
 
-fn update_peer_stats(
-    num_live_peers: i64,
-    broadcast_len: i64,
-    last_datapoint_submit: &Arc<AtomicU64>,
-) {
-    let now = timestamp();
-    let last = last_datapoint_submit.load(Ordering::Relaxed);
-    if now - last > 1000
-        && last_datapoint_submit.compare_and_swap(last, now, Ordering::Relaxed) == last
-    {
-        datapoint_info!(
-            "cluster_info-num_nodes",
-            ("live_count", num_live_peers, i64),
-            ("broadcast_count", broadcast_len, i64)
-        );
-    }
-}
-
-pub fn get_broadcast_peers<S: std::hash::BuildHasher>(
-    cluster_info: &ClusterInfo,
-    stakes: Option<Arc<HashMap<Pubkey, u64, S>>>,
-) -> (Vec<ContactInfo>, Vec<(u64, usize)>) {
-    use crate::cluster_info;
-    let mut peers = cluster_info.tvu_peers();
-    let peers_and_stakes = cluster_info::stake_weight_peers(&mut peers, stakes);
-    (peers, peers_and_stakes)
-}
-
-/// broadcast messages from the leader to layer 1 nodes
-/// # Remarks
-pub fn broadcast_shreds(
-    s: &UdpSocket,
-    shreds: &Arc<Vec<Shred>>,
-    peers_and_stakes: &[(u64, usize)],
-    peers: &[ContactInfo],
-    last_datapoint_submit: &Arc<AtomicU64>,
-    send_mmsg_total: &mut u64,
-) -> Result<()> {
-    let broadcast_len = peers_and_stakes.len();
-    if broadcast_len == 0 {
-        update_peer_stats(1, 1, last_datapoint_submit);
-        return Ok(());
-    }
-    let packets: Vec<_> = shreds
-        .iter()
-        .map(|shred| {
-            let broadcast_index = weighted_best(&peers_and_stakes, shred.seed());
-
-            (&shred.payload, &peers[broadcast_index].tvu)
-        })
-        .collect();
-
-    let mut sent = 0;
-    let mut send_mmsg_time = Measure::start("send_mmsg");
-    while sent < packets.len() {
-        match send_mmsg(s, &packets[sent..]) {
-            Ok(n) => sent += n,
-            Err(e) => {
-                return Err(Error::IO(e));
-            }
-        }
-    }
-    send_mmsg_time.stop();
-    *send_mmsg_total += send_mmsg_time.as_us();
-
-    let num_live_peers = num_live_peers(&peers);
-    update_peer_stats(
-        num_live_peers,
-        broadcast_len as i64 + 1,
-        last_datapoint_submit,
-    );
-    Ok(())
-}
-
-fn distance(a: u64, b: u64) -> u64 {
-    if a > b {
-        a - b
-    } else {
-        b - a
-    }
-}
-
-fn num_live_peers(peers: &[ContactInfo]) -> i64 {
-    let mut num_live_peers = 1i64;
-    peers.iter().for_each(|p| {
-        // A peer is considered live if they generated their contact info recently
-        if distance(timestamp(), p.wallclock) <= CRDS_GOSSIP_PULL_CRDS_TIMEOUT_MS {
-            num_live_peers += 1;
-        }
-    });
-    num_live_peers
-}
-
 #[cfg(test)]
-pub mod test {
+mod test {
     use super::*;
     use crate::cluster_info::{ClusterInfo, Node};
-    use crossbeam_channel::unbounded;
-    use solana_ledger::{
-        blockstore::{make_slot_entries, Blockstore},
-        entry::create_ticks,
-        genesis_utils::{create_genesis_config, GenesisConfigInfo},
-        get_tmp_ledger_path,
-        shred::{max_ticks_per_n_shreds, Shredder, RECOMMENDED_FEC_RATE},
-    };
+    use crate::genesis_utils::{create_genesis_config, GenesisConfigInfo};
+    use solana_ledger::entry::create_ticks;
+    use solana_ledger::{blockstore::Blockstore, get_tmp_ledger_path};
     use solana_runtime::bank::Bank;
-    use solana_sdk::{
-        hash::Hash,
-        pubkey::Pubkey,
-        signature::{Keypair, Signer},
-    };
-    use std::{
-        path::Path, sync::atomic::AtomicBool, sync::mpsc::channel, sync::Arc, thread::sleep,
-    };
-
-    pub fn make_transmit_shreds(
-        slot: Slot,
-        num: u64,
-        stakes: Option<Arc<HashMap<Pubkey, u64>>>,
-    ) -> (
-        Vec<Shred>,
-        Vec<Shred>,
-        Vec<TransmitShreds>,
-        Vec<TransmitShreds>,
-    ) {
-        let num_entries = max_ticks_per_n_shreds(num);
-        let (data_shreds, _) = make_slot_entries(slot, 0, num_entries);
-        let keypair = Arc::new(Keypair::new());
-        let shredder = Shredder::new(slot, 0, RECOMMENDED_FEC_RATE, keypair, 0, 0)
-            .expect("Expected to create a new shredder");
-
-        let coding_shreds = shredder.data_shreds_to_coding_shreds(&data_shreds[0..]);
-        (
-            data_shreds.clone(),
-            coding_shreds.clone(),
-            data_shreds
-                .into_iter()
-                .map(|s| (stakes.clone(), Arc::new(vec![s])))
-                .collect(),
-            coding_shreds
-                .into_iter()
-                .map(|s| (stakes.clone(), Arc::new(vec![s])))
-                .collect(),
-        )
-    }
-
-    fn check_all_shreds_received(
-        transmit_receiver: &TransmitReceiver,
-        mut data_index: u64,
-        mut coding_index: u64,
-        num_expected_data_shreds: u64,
-        num_expected_coding_shreds: u64,
-    ) {
-        while let Ok((new_retransmit_slots, _)) = transmit_receiver.try_recv() {
-            if new_retransmit_slots.1[0].is_data() {
-                for data_shred in new_retransmit_slots.1.iter() {
-                    assert_eq!(data_shred.index() as u64, data_index);
-                    data_index += 1;
-                }
-            } else {
-                assert_eq!(new_retransmit_slots.1[0].index() as u64, coding_index);
-                for coding_shred in new_retransmit_slots.1.iter() {
-                    assert_eq!(coding_shred.index() as u64, coding_index);
-                    coding_index += 1;
-                }
-            }
-        }
-
-        assert_eq!(num_expected_data_shreds, data_index);
-        assert_eq!(num_expected_coding_shreds, coding_index);
-    }
-
-    #[test]
-    fn test_num_live_peers() {
-        let mut ci = ContactInfo::default();
-        ci.wallclock = std::u64::MAX;
-        assert_eq!(num_live_peers(&[ci.clone()]), 1);
-        ci.wallclock = timestamp() - 1;
-        assert_eq!(num_live_peers(&[ci.clone()]), 2);
-        ci.wallclock = timestamp() - CRDS_GOSSIP_PULL_CRDS_TIMEOUT_MS - 1;
-        assert_eq!(num_live_peers(&[ci]), 1);
-    }
-
-    #[test]
-    fn test_duplicate_retransmit_signal() {
-        // Setup
-        let ledger_path = get_tmp_ledger_path!();
-        let blockstore = Arc::new(Blockstore::open(&ledger_path).unwrap());
-        let (transmit_sender, transmit_receiver) = channel();
-        let (retransmit_slots_sender, retransmit_slots_receiver) = unbounded();
-        let GenesisConfigInfo { genesis_config, .. } = create_genesis_config(100_000);
-        let bank0 = Arc::new(Bank::new(&genesis_config));
-
-        // Make some shreds
-        let updated_slot = 0;
-        let (all_data_shreds, all_coding_shreds, _, _all_coding_transmit_shreds) =
-            make_transmit_shreds(updated_slot, 10, None);
-        let num_data_shreds = all_data_shreds.len();
-        let num_coding_shreds = all_coding_shreds.len();
-        assert!(num_data_shreds >= 10);
-
-        // Insert all the shreds
-        blockstore
-            .insert_shreds(all_data_shreds, None, true)
-            .unwrap();
-        blockstore
-            .insert_shreds(all_coding_shreds, None, true)
-            .unwrap();
-
-        // Insert duplicate retransmit signal, blocks should
-        // only be retransmitted once
-        retransmit_slots_sender
-            .send(vec![(updated_slot, bank0.clone())].into_iter().collect())
-            .unwrap();
-        retransmit_slots_sender
-            .send(vec![(updated_slot, bank0.clone())].into_iter().collect())
-            .unwrap();
-        BroadcastStage::check_retransmit_signals(
-            &blockstore,
-            &retransmit_slots_receiver,
-            &transmit_sender,
-        )
-        .unwrap();
-        // Check all the data shreds were received only once
-        check_all_shreds_received(
-            &transmit_receiver,
-            0,
-            0,
-            num_data_shreds as u64,
-            num_coding_shreds as u64,
-        );
-    }
+    use solana_sdk::hash::Hash;
+    use solana_sdk::pubkey::Pubkey;
+    use solana_sdk::signature::{Keypair, Signer};
+    use std::path::Path;
+    use std::sync::atomic::AtomicBool;
+    use std::sync::mpsc::channel;
+    use std::sync::{Arc, RwLock};
+    use std::thread::sleep;
+    use std::time::Duration;
 
     struct MockBroadcastStage {
         blockstore: Arc<Blockstore>,
@@ -581,7 +277,6 @@ pub mod test {
         leader_pubkey: &Pubkey,
         ledger_path: &Path,
         entry_receiver: Receiver<WorkingBankEntry>,
-        retransmit_slots_receiver: RetransmitSlotsReceiver,
     ) -> MockBroadcastStage {
         // Make the database ledger
         let blockstore = Arc::new(Blockstore::open(ledger_path).unwrap());
@@ -594,22 +289,21 @@ pub mod test {
         let broadcast_buddy = Node::new_localhost_with_pubkey(&buddy_keypair.pubkey());
 
         // Fill the cluster_info with the buddy's info
-        let cluster_info = ClusterInfo::new_with_invalid_keypair(leader_info.info.clone());
+        let mut cluster_info = ClusterInfo::new_with_invalid_keypair(leader_info.info.clone());
         cluster_info.insert_info(broadcast_buddy.info);
-        let cluster_info = Arc::new(cluster_info);
+        let cluster_info = Arc::new(RwLock::new(cluster_info));
 
         let exit_sender = Arc::new(AtomicBool::new(false));
 
         let GenesisConfigInfo { genesis_config, .. } = create_genesis_config(10_000);
         let bank = Arc::new(Bank::new(&genesis_config));
 
-        let leader_keypair = cluster_info.keypair.clone();
+        let leader_keypair = cluster_info.read().unwrap().keypair.clone();
         // Start up the broadcast stage
         let broadcast_service = BroadcastStage::new(
             leader_info.sockets.broadcast,
             cluster_info,
             entry_receiver,
-            retransmit_slots_receiver,
             &exit_sender,
             &blockstore,
             StandardBroadcastRun::new(leader_keypair, 0),
@@ -632,12 +326,10 @@ pub mod test {
             let leader_keypair = Keypair::new();
 
             let (entry_sender, entry_receiver) = channel();
-            let (retransmit_slots_sender, retransmit_slots_receiver) = unbounded();
             let broadcast_service = setup_dummy_broadcast_service(
                 &leader_keypair.pubkey(),
                 &ledger_path,
                 entry_receiver,
-                retransmit_slots_receiver,
             );
             let start_tick_height;
             let max_tick_height;
@@ -656,7 +348,6 @@ pub mod test {
                         .expect("Expect successful send to broadcast service");
                 }
             }
-
             sleep(Duration::from_millis(2000));
 
             trace!(
@@ -673,7 +364,6 @@ pub mod test {
             assert_eq!(entries.len(), max_tick_height as usize);
 
             drop(entry_sender);
-            drop(retransmit_slots_sender);
             broadcast_service
                 .broadcast_service
                 .join()

core/src/broadcast_stage/broadcast_fake_shreds_run.rs

@@ -28,8 +28,8 @@ impl BroadcastRun for BroadcastFakeShredsRun {
         &mut self,
         blockstore: &Arc<Blockstore>,
         receiver: &Receiver<WorkingBankEntry>,
-        socket_sender: &Sender<(TransmitShreds, Option<BroadcastShredBatchInfo>)>,
-        blockstore_sender: &Sender<(Arc<Vec<Shred>>, Option<BroadcastShredBatchInfo>)>,
+        socket_sender: &Sender<TransmitShreds>,
+        blockstore_sender: &Sender<Arc<Vec<Shred>>>,
     ) -> Result<()> {
         // 1) Pull entries from banking stage
         let receive_results = broadcast_utils::recv_slot_entries(receiver)?;
@@ -83,32 +83,26 @@ impl BroadcastRun for BroadcastFakeShredsRun {
         }
 
         let data_shreds = Arc::new(data_shreds);
-        blockstore_sender.send((data_shreds.clone(), None))?;
+        blockstore_sender.send(data_shreds.clone())?;
 
         // 3) Start broadcast step
         //some indicates fake shreds
-        socket_sender.send((
-            (Some(Arc::new(HashMap::new())), Arc::new(fake_data_shreds)),
-            None,
-        ))?;
-        socket_sender.send((
-            (Some(Arc::new(HashMap::new())), Arc::new(fake_coding_shreds)),
-            None,
-        ))?;
+        socket_sender.send((Some(Arc::new(HashMap::new())), Arc::new(fake_data_shreds)))?;
+        socket_sender.send((Some(Arc::new(HashMap::new())), Arc::new(fake_coding_shreds)))?;
         //none indicates real shreds
-        socket_sender.send(((None, data_shreds), None))?;
-        socket_sender.send(((None, Arc::new(coding_shreds)), None))?;
+        socket_sender.send((None, data_shreds))?;
+        socket_sender.send((None, Arc::new(coding_shreds)))?;
 
         Ok(())
     }
     fn transmit(
-        &mut self,
-        receiver: &Arc<Mutex<TransmitReceiver>>,
-        cluster_info: &ClusterInfo,
+        &self,
+        receiver: &Arc<Mutex<Receiver<TransmitShreds>>>,
+        cluster_info: &Arc<RwLock<ClusterInfo>>,
         sock: &UdpSocket,
     ) -> Result<()> {
-        for ((stakes, data_shreds), _) in receiver.lock().unwrap().iter() {
-            let peers = cluster_info.tvu_peers();
+        for (stakes, data_shreds) in receiver.lock().unwrap().iter() {
+            let peers = cluster_info.read().unwrap().tvu_peers();
             peers.iter().enumerate().for_each(|(i, peer)| {
                 if i <= self.partition && stakes.is_some() {
                     // Send fake shreds to the first N peers
@@ -125,11 +119,11 @@ impl BroadcastRun for BroadcastFakeShredsRun {
         Ok(())
     }
     fn record(
-        &mut self,
-        receiver: &Arc<Mutex<RecordReceiver>>,
+        &self,
+        receiver: &Arc<Mutex<Receiver<Arc<Vec<Shred>>>>>,
         blockstore: &Arc<Blockstore>,
     ) -> Result<()> {
-        for (data_shreds, _) in receiver.lock().unwrap().iter() {
+        for data_shreds in receiver.lock().unwrap().iter() {
             blockstore.insert_shreds(data_shreds.to_vec(), None, true)?;
         }
         Ok(())
@@ -145,7 +139,7 @@ mod tests {
 
     #[test]
     fn test_tvu_peers_ordering() {
-        let cluster = ClusterInfo::new_with_invalid_keypair(ContactInfo::new_localhost(
+        let mut cluster = ClusterInfo::new_with_invalid_keypair(ContactInfo::new_localhost(
             &Pubkey::new_rand(),
             0,
         ));

core/src/broadcast_stage/broadcast_metrics.rs

@@ -1,288 +0,0 @@
-use super::*;
-
-pub(crate) trait BroadcastStats {
-    fn update(&mut self, new_stats: &Self);
-    fn report_stats(&mut self, slot: Slot, slot_start: Instant);
-}
-
-#[derive(Clone)]
-pub(crate) struct BroadcastShredBatchInfo {
-    pub(crate) slot: Slot,
-    pub(crate) num_expected_batches: Option<usize>,
-    pub(crate) slot_start_ts: Instant,
-}
-
-#[derive(Default, Clone)]
-pub(crate) struct ProcessShredsStats {
-    // Per-slot elapsed time
-    pub(crate) shredding_elapsed: u64,
-    pub(crate) receive_elapsed: u64,
-}
-impl ProcessShredsStats {
-    pub(crate) fn update(&mut self, new_stats: &ProcessShredsStats) {
-        self.shredding_elapsed += new_stats.shredding_elapsed;
-        self.receive_elapsed += new_stats.receive_elapsed;
-    }
-    pub(crate) fn reset(&mut self) {
-        *self = Self::default();
-    }
-}
-
-#[derive(Default, Clone)]
-pub(crate) struct TransmitShredsStats {
-    pub(crate) transmit_elapsed: u64,
-    pub(crate) send_mmsg_elapsed: u64,
-    pub(crate) get_peers_elapsed: u64,
-    pub(crate) num_shreds: usize,
-}
-
-impl BroadcastStats for TransmitShredsStats {
-    fn update(&mut self, new_stats: &TransmitShredsStats) {
-        self.transmit_elapsed += new_stats.transmit_elapsed;
-        self.send_mmsg_elapsed += new_stats.send_mmsg_elapsed;
-        self.get_peers_elapsed += new_stats.get_peers_elapsed;
-        self.num_shreds += new_stats.num_shreds;
-    }
-    fn report_stats(&mut self, slot: Slot, slot_start: Instant) {
-        datapoint_info!(
-            "broadcast-transmit-shreds-stats",
-            ("slot", slot as i64, i64),
-            (
-                "end_to_end_elapsed",
-                // `slot_start` signals when the first batch of shreds was
-                // received, used to measure duration of broadcast
-                slot_start.elapsed().as_micros() as i64,
-                i64
-            ),
-            ("transmit_elapsed", self.transmit_elapsed as i64, i64),
-            ("send_mmsg_elapsed", self.send_mmsg_elapsed as i64, i64),
-            ("get_peers_elapsed", self.get_peers_elapsed as i64, i64),
-            ("num_shreds", self.num_shreds as i64, i64),
-        );
-    }
-}
-
-#[derive(Default, Clone)]
-pub(crate) struct InsertShredsStats {
-    pub(crate) insert_shreds_elapsed: u64,
-    pub(crate) num_shreds: usize,
-}
-impl BroadcastStats for InsertShredsStats {
-    fn update(&mut self, new_stats: &InsertShredsStats) {
-        self.insert_shreds_elapsed += new_stats.insert_shreds_elapsed;
-        self.num_shreds += new_stats.num_shreds;
-    }
-    fn report_stats(&mut self, slot: Slot, slot_start: Instant) {
-        datapoint_info!(
-            "broadcast-insert-shreds-stats",
-            ("slot", slot as i64, i64),
-            (
-                "end_to_end_elapsed",
-                // `slot_start` signals when the first batch of shreds was
-                // received, used to measure duration of broadcast
-                slot_start.elapsed().as_micros() as i64,
-                i64
-            ),
-            (
-                "insert_shreds_elapsed",
-                self.insert_shreds_elapsed as i64,
-                i64
-            ),
-            ("num_shreds", self.num_shreds as i64, i64),
-        );
-    }
-}
-
-// Tracks metrics of type `T` acrosss multiple threads
-#[derive(Default)]
-pub(crate) struct BatchCounter<T: BroadcastStats + Default> {
-    // The number of batches processed across all threads so far
-    num_batches: usize,
-    // Filled in when the last batch of shreds is received,
-    // signals how many batches of shreds to expect
-    num_expected_batches: Option<usize>,
-    broadcast_shred_stats: T,
-}
-
-impl<T: BroadcastStats + Default> BatchCounter<T> {
-    #[cfg(test)]
-    pub(crate) fn num_batches(&self) -> usize {
-        self.num_batches
-    }
-}
-
-#[derive(Default)]
-pub(crate) struct SlotBroadcastStats<T: BroadcastStats + Default>(HashMap<Slot, BatchCounter<T>>);
-
-impl<T: BroadcastStats + Default> SlotBroadcastStats<T> {
-    #[cfg(test)]
-    pub(crate) fn get(&self, slot: Slot) -> Option<&BatchCounter<T>> {
-        self.0.get(&slot)
-    }
-    pub(crate) fn update(&mut self, new_stats: &T, batch_info: &Option<BroadcastShredBatchInfo>) {
-        if let Some(batch_info) = batch_info {
-            let mut should_delete = false;
-            {
-                let slot_batch_counter = self.0.entry(batch_info.slot).or_default();
-                slot_batch_counter.broadcast_shred_stats.update(new_stats);
-                // Only count the ones where `broadcast_shred_batch_info`.is_some(), because
-                // there could potentially be other `retransmit` slots inserted into the
-                // transmit pipeline (signaled by ReplayStage) that are not created by the
-                // main shredding/broadcast pipeline
-                slot_batch_counter.num_batches += 1;
-                if let Some(num_expected_batches) = batch_info.num_expected_batches {
-                    slot_batch_counter.num_expected_batches = Some(num_expected_batches);
-                }
-                if let Some(num_expected_batches) = slot_batch_counter.num_expected_batches {
-                    if slot_batch_counter.num_batches == num_expected_batches {
-                        slot_batch_counter
-                            .broadcast_shred_stats
-                            .report_stats(batch_info.slot, batch_info.slot_start_ts);
-                        should_delete = true;
-                    }
-                }
-            }
-            if should_delete {
-                self.0
-                    .remove(&batch_info.slot)
-                    .expect("delete should be successful");
-            }
-        }
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use super::*;
-
-    #[derive(Default)]
-    struct TestStats {
-        sender: Option<Sender<(usize, Slot, Instant)>>,
-        count: usize,
-    }
-
-    impl BroadcastStats for TestStats {
-        fn update(&mut self, new_stats: &TestStats) {
-            self.count += new_stats.count;
-            self.sender = new_stats.sender.clone();
-        }
-        fn report_stats(&mut self, slot: Slot, slot_start: Instant) {
-            self.sender
-                .as_ref()
-                .unwrap()
-                .send((self.count, slot, slot_start))
-                .unwrap()
-        }
-    }
-
-    #[test]
-    fn test_update() {
-        let start = Instant::now();
-        let mut slot_broadcast_stats = SlotBroadcastStats::default();
-        slot_broadcast_stats.update(
-            &TransmitShredsStats {
-                transmit_elapsed: 1,
-                get_peers_elapsed: 1,
-                send_mmsg_elapsed: 1,
-                num_shreds: 1,
-            },
-            &Some(BroadcastShredBatchInfo {
-                slot: 0,
-                num_expected_batches: Some(2),
-                slot_start_ts: start.clone(),
-            }),
-        );
-
-        // Singular update
-        let slot_0_stats = slot_broadcast_stats.0.get(&0).unwrap();
-        assert_eq!(slot_0_stats.num_batches, 1);
-        assert_eq!(slot_0_stats.num_expected_batches.unwrap(), 2);
-        assert_eq!(slot_0_stats.broadcast_shred_stats.transmit_elapsed, 1);
-        assert_eq!(slot_0_stats.broadcast_shred_stats.get_peers_elapsed, 1);
-        assert_eq!(slot_0_stats.broadcast_shred_stats.send_mmsg_elapsed, 1);
-        assert_eq!(slot_0_stats.broadcast_shred_stats.num_shreds, 1);
-
-        slot_broadcast_stats.update(
-            &TransmitShredsStats {
-                transmit_elapsed: 1,
-                get_peers_elapsed: 1,
-                send_mmsg_elapsed: 1,
-                num_shreds: 1,
-            },
-            &None,
-        );
-
-        // If BroadcastShredBatchInfo == None, then update should be ignored
-        let slot_0_stats = slot_broadcast_stats.0.get(&0).unwrap();
-        assert_eq!(slot_0_stats.num_batches, 1);
-        assert_eq!(slot_0_stats.num_expected_batches.unwrap(), 2);
-        assert_eq!(slot_0_stats.broadcast_shred_stats.transmit_elapsed, 1);
-        assert_eq!(slot_0_stats.broadcast_shred_stats.get_peers_elapsed, 1);
-        assert_eq!(slot_0_stats.broadcast_shred_stats.send_mmsg_elapsed, 1);
-        assert_eq!(slot_0_stats.broadcast_shred_stats.num_shreds, 1);
-
-        // If another batch is given, then total number of batches == num_expected_batches == 2,
-        // so the batch should be purged from the HashMap
-        slot_broadcast_stats.update(
-            &TransmitShredsStats {
-                transmit_elapsed: 1,
-                get_peers_elapsed: 1,
-                send_mmsg_elapsed: 1,
-                num_shreds: 1,
-            },
-            &Some(BroadcastShredBatchInfo {
-                slot: 0,
-                num_expected_batches: None,
-                slot_start_ts: start.clone(),
-            }),
-        );
-
-        assert!(slot_broadcast_stats.0.get(&0).is_none());
-    }
-
-    #[test]
-    fn test_update_multi_threaded() {
-        for round in 0..50 {
-            let start = Instant::now();
-            let slot_broadcast_stats = Arc::new(Mutex::new(SlotBroadcastStats::default()));
-            let num_threads = 5;
-            let slot = 0;
-            let (sender, receiver) = channel();
-            let thread_handles: Vec<_> = (0..num_threads)
-                .into_iter()
-                .map(|i| {
-                    let slot_broadcast_stats = slot_broadcast_stats.clone();
-                    let sender = Some(sender.clone());
-                    let test_stats = TestStats { sender, count: 1 };
-                    let mut broadcast_batch_info = BroadcastShredBatchInfo {
-                        slot,
-                        num_expected_batches: None,
-                        slot_start_ts: start.clone(),
-                    };
-                    if i == round % num_threads {
-                        broadcast_batch_info.num_expected_batches = Some(num_threads);
-                    }
-                    Builder::new()
-                        .name("test_update_multi_threaded".to_string())
-                        .spawn(move || {
-                            slot_broadcast_stats
-                                .lock()
-                                .unwrap()
-                                .update(&test_stats, &Some(broadcast_batch_info))
-                        })
-                        .unwrap()
-                })
-                .collect();
-
-            for t in thread_handles {
-                t.join().unwrap();
-            }
-
-            assert!(slot_broadcast_stats.lock().unwrap().0.get(&slot).is_none());
-            let (returned_count, returned_slot, returned_instant) = receiver.recv().unwrap();
-            assert_eq!(returned_count, num_threads);
-            assert_eq!(returned_slot, slot);
-            assert_eq!(returned_instant, returned_instant);
-        }
-    }
-}

core/src/broadcast_stage/broadcast_utils.rs

@@ -76,7 +76,7 @@ pub(super) fn recv_slot_entries(receiver: &Receiver<WorkingBankEntry>) -> Result
 #[cfg(test)]
 mod tests {
     use super::*;
-    use solana_ledger::genesis_utils::{create_genesis_config, GenesisConfigInfo};
+    use crate::genesis_utils::{create_genesis_config, GenesisConfigInfo};
     use solana_sdk::genesis_config::GenesisConfig;
     use solana_sdk::pubkey::Pubkey;
     use solana_sdk::system_transaction;

core/src/broadcast_stage/fail_entry_verification_broadcast_run.rs

@@ -23,8 +23,8 @@ impl BroadcastRun for FailEntryVerificationBroadcastRun {
         &mut self,
         blockstore: &Arc<Blockstore>,
         receiver: &Receiver<WorkingBankEntry>,
-        socket_sender: &Sender<(TransmitShreds, Option<BroadcastShredBatchInfo>)>,
-        blockstore_sender: &Sender<(Arc<Vec<Shred>>, Option<BroadcastShredBatchInfo>)>,
+        socket_sender: &Sender<TransmitShreds>,
+        blockstore_sender: &Sender<Arc<Vec<Shred>>>,
     ) -> Result<()> {
         // 1) Pull entries from banking stage
         let mut receive_results = broadcast_utils::recv_slot_entries(receiver)?;
@@ -61,44 +61,38 @@ impl BroadcastRun for FailEntryVerificationBroadcastRun {
         );
 
         let data_shreds = Arc::new(data_shreds);
-        blockstore_sender.send((data_shreds.clone(), None))?;
+        blockstore_sender.send(data_shreds.clone())?;
         // 3) Start broadcast step
         let bank_epoch = bank.get_leader_schedule_epoch(bank.slot());
         let stakes = staking_utils::staked_nodes_at_epoch(&bank, bank_epoch);
 
         let stakes = stakes.map(Arc::new);
-        socket_sender.send(((stakes.clone(), data_shreds), None))?;
-        socket_sender.send(((stakes, Arc::new(coding_shreds)), None))?;
+        socket_sender.send((stakes.clone(), data_shreds))?;
+        socket_sender.send((stakes, Arc::new(coding_shreds)))?;
         Ok(())
     }
     fn transmit(
-        &mut self,
-        receiver: &Arc<Mutex<TransmitReceiver>>,
-        cluster_info: &ClusterInfo,
+        &self,
+        receiver: &Arc<Mutex<Receiver<TransmitShreds>>>,
+        cluster_info: &Arc<RwLock<ClusterInfo>>,
         sock: &UdpSocket,
     ) -> Result<()> {
-        let ((stakes, shreds), _) = receiver.lock().unwrap().recv()?;
+        let (stakes, shreds) = receiver.lock().unwrap().recv()?;
+        let all_seeds: Vec<[u8; 32]> = shreds.iter().map(|s| s.seed()).collect();
         // Broadcast data
-        let (peers, peers_and_stakes) = get_broadcast_peers(cluster_info, stakes);
-
-        let mut send_mmsg_total = 0;
-        broadcast_shreds(
-            sock,
-            &shreds,
-            &peers_and_stakes,
-            &peers,
-            &Arc::new(AtomicU64::new(0)),
-            &mut send_mmsg_total,
-        )?;
-
+        let all_shred_bufs: Vec<Vec<u8>> = shreds.to_vec().into_iter().map(|s| s.payload).collect();
+        cluster_info
+            .write()
+            .unwrap()
+            .broadcast_shreds(sock, all_shred_bufs, &all_seeds, stakes)?;
         Ok(())
     }
     fn record(
-        &mut self,
-        receiver: &Arc<Mutex<RecordReceiver>>,
+        &self,
+        receiver: &Arc<Mutex<Receiver<Arc<Vec<Shred>>>>>,
         blockstore: &Arc<Blockstore>,
     ) -> Result<()> {
-        let (all_shreds, _) = receiver.lock().unwrap().recv()?;
+        let all_shreds = receiver.lock().unwrap().recv()?;
         blockstore
             .insert_shreds(all_shreds.to_vec(), None, true)
             .expect("Failed to insert shreds in blockstore");

core/src/broadcast_stage/standard_broadcast_run.rs

@@ -1,43 +1,53 @@
-use super::{
-    broadcast_utils::{self, ReceiveResults},
-    *,
-};
+use super::broadcast_utils::{self, ReceiveResults};
+use super::*;
 use crate::broadcast_stage::broadcast_utils::UnfinishedSlotInfo;
-use solana_ledger::{
-    entry::Entry,
-    shred::{Shred, Shredder, RECOMMENDED_FEC_RATE, SHRED_TICK_REFERENCE_MASK},
-};
-use solana_sdk::{pubkey::Pubkey, signature::Keypair, timing::duration_as_us};
+use solana_ledger::entry::Entry;
+use solana_ledger::shred::{Shred, Shredder, RECOMMENDED_FEC_RATE, SHRED_TICK_REFERENCE_MASK};
+use solana_sdk::pubkey::Pubkey;
+use solana_sdk::signature::Keypair;
+use solana_sdk::timing::duration_as_us;
 use std::collections::HashMap;
 use std::time::Duration;
 
+#[derive(Default)]
+struct BroadcastStats {
+    // Per-slot elapsed time
+    shredding_elapsed: u64,
+    insert_shreds_elapsed: u64,
+    broadcast_elapsed: u64,
+    receive_elapsed: u64,
+    seed_elapsed: u64,
+}
+
+impl BroadcastStats {
+    fn reset(&mut self) {
+        self.insert_shreds_elapsed = 0;
+        self.shredding_elapsed = 0;
+        self.broadcast_elapsed = 0;
+        self.receive_elapsed = 0;
+        self.seed_elapsed = 0;
+    }
+}
+
 #[derive(Clone)]
-pub struct StandardBroadcastRun {
-    process_shreds_stats: ProcessShredsStats,
-    transmit_shreds_stats: Arc<Mutex<SlotBroadcastStats<TransmitShredsStats>>>,
-    insert_shreds_stats: Arc<Mutex<SlotBroadcastStats<InsertShredsStats>>>,
+pub(super) struct StandardBroadcastRun {
+    stats: Arc<RwLock<BroadcastStats>>,
     unfinished_slot: Option<UnfinishedSlotInfo>,
     current_slot_and_parent: Option<(u64, u64)>,
     slot_broadcast_start: Option<Instant>,
     keypair: Arc<Keypair>,
     shred_version: u16,
-    last_datapoint_submit: Arc<AtomicU64>,
-    num_batches: usize,
 }
 
 impl StandardBroadcastRun {
     pub(super) fn new(keypair: Arc<Keypair>, shred_version: u16) -> Self {
         Self {
-            process_shreds_stats: ProcessShredsStats::default(),
-            transmit_shreds_stats: Arc::new(Mutex::new(SlotBroadcastStats::default())),
-            insert_shreds_stats: Arc::new(Mutex::new(SlotBroadcastStats::default())),
+            stats: Arc::new(RwLock::new(BroadcastStats::default())),
             unfinished_slot: None,
             current_slot_and_parent: None,
             slot_broadcast_start: None,
             keypair,
             shred_version,
-            last_datapoint_submit: Arc::new(AtomicU64::new(0)),
-            num_batches: 0,
         }
     }
 
@@ -120,7 +130,7 @@ impl StandardBroadcastRun {
     #[cfg(test)]
     fn test_process_receive_results(
         &mut self,
-        cluster_info: &ClusterInfo,
+        cluster_info: &Arc<RwLock<ClusterInfo>>,
         sock: &UdpSocket,
         blockstore: &Arc<Blockstore>,
         receive_results: ReceiveResults,
@@ -132,7 +142,6 @@ impl StandardBroadcastRun {
         let brecv = Arc::new(Mutex::new(brecv));
         //data
         let _ = self.transmit(&srecv, cluster_info, sock);
-        let _ = self.record(&brecv, blockstore);
         //coding
         let _ = self.transmit(&srecv, cluster_info, sock);
         let _ = self.record(&brecv, blockstore);
@@ -142,8 +151,8 @@ impl StandardBroadcastRun {
     fn process_receive_results(
         &mut self,
         blockstore: &Arc<Blockstore>,
-        socket_sender: &Sender<(TransmitShreds, Option<BroadcastShredBatchInfo>)>,
-        blockstore_sender: &Sender<(Arc<Vec<Shred>>, Option<BroadcastShredBatchInfo>)>,
+        socket_sender: &Sender<TransmitShreds>,
+        blockstore_sender: &Sender<Arc<Vec<Shred>>>,
         receive_results: ReceiveResults,
     ) -> Result<()> {
         let mut receive_elapsed = receive_results.time_elapsed;
@@ -151,13 +160,11 @@ impl StandardBroadcastRun {
         let bank = receive_results.bank.clone();
         let last_tick_height = receive_results.last_tick_height;
         inc_new_counter_info!("broadcast_service-entries_received", num_entries);
-        let old_broadcast_start = self.slot_broadcast_start;
-        let old_num_batches = self.num_batches;
+
         if self.current_slot_and_parent.is_none()
             || bank.slot() != self.current_slot_and_parent.unwrap().0
         {
             self.slot_broadcast_start = Some(Instant::now());
-            self.num_batches = 0;
             let slot = bank.slot();
             let parent_slot = bank.parent_slot();
 
@@ -172,19 +179,19 @@ impl StandardBroadcastRun {
             self.check_for_interrupted_slot(bank.ticks_per_slot() as u8);
 
         // 2) Convert entries to shreds and coding shreds
+
         let (shredder, next_shred_index) = self.init_shredder(
             blockstore,
             (bank.tick_height() % bank.ticks_per_slot()) as u8,
         );
-        let is_last_in_slot = last_tick_height == bank.max_tick_height();
-        let data_shreds = self.entries_to_data_shreds(
+        let mut data_shreds = self.entries_to_data_shreds(
             &shredder,
             next_shred_index,
             &receive_results.entries,
-            is_last_in_slot,
+            last_tick_height == bank.max_tick_height(),
         );
-        // Insert the first shred so blockstore stores that the leader started this block
-        // This must be done before the blocks are sent out over the wire.
+        //Insert the first shred so blockstore stores that the leader started this block
+        //This must be done before the blocks are sent out over the wire.
         if !data_shreds.is_empty() && data_shreds[0].index() == 0 {
             let first = vec![data_shreds[0].clone()];
             blockstore
@@ -192,56 +199,26 @@ impl StandardBroadcastRun {
                 .expect("Failed to insert shreds in blockstore");
         }
         let last_data_shred = data_shreds.len();
+        if let Some(last_shred) = last_unfinished_slot_shred {
+            data_shreds.push(last_shred);
+        }
         let to_shreds_elapsed = to_shreds_start.elapsed();
 
         let bank_epoch = bank.get_leader_schedule_epoch(bank.slot());
         let stakes = staking_utils::staked_nodes_at_epoch(&bank, bank_epoch);
         let stakes = stakes.map(Arc::new);
-
-        // Broadcast the last shred of the interrupted slot if necessary
-        if let Some(last_shred) = last_unfinished_slot_shred {
-            let batch_info = Some(BroadcastShredBatchInfo {
-                slot: last_shred.slot(),
-                num_expected_batches: Some(old_num_batches + 1),
-                slot_start_ts: old_broadcast_start.expect(
-                    "Old broadcast start time for previous slot must exist if the previous slot
-                 was interrupted",
-                ),
-            });
-            let last_shred = Arc::new(vec![last_shred]);
-            socket_sender.send(((stakes.clone(), last_shred.clone()), batch_info.clone()))?;
-            blockstore_sender.send((last_shred, batch_info))?;
-        }
-
-        // Increment by two batches, one for the data batch, one for the coding batch.
-        self.num_batches += 2;
-        let num_expected_batches = {
-            if is_last_in_slot {
-                Some(self.num_batches)
-            } else {
-                None
-            }
-        };
-        let batch_info = Some(BroadcastShredBatchInfo {
-            slot: bank.slot(),
-            num_expected_batches,
-            slot_start_ts: self
-                .slot_broadcast_start
-                .clone()
-                .expect("Start timestamp must exist for a slot if we're broadcasting the slot"),
-        });
-
         let data_shreds = Arc::new(data_shreds);
-        socket_sender.send(((stakes.clone(), data_shreds.clone()), batch_info.clone()))?;
-        blockstore_sender.send((data_shreds.clone(), batch_info.clone()))?;
+        socket_sender.send((stakes.clone(), data_shreds.clone()))?;
+        blockstore_sender.send(data_shreds.clone())?;
         let coding_shreds = shredder.data_shreds_to_coding_shreds(&data_shreds[0..last_data_shred]);
         let coding_shreds = Arc::new(coding_shreds);
-        socket_sender.send(((stakes, coding_shreds.clone()), batch_info.clone()))?;
-        blockstore_sender.send((coding_shreds, batch_info))?;
-        self.process_shreds_stats.update(&ProcessShredsStats {
+        socket_sender.send((stakes, coding_shreds))?;
+        self.update_broadcast_stats(BroadcastStats {
             shredding_elapsed: duration_as_us(&to_shreds_elapsed),
             receive_elapsed: duration_as_us(&receive_elapsed),
+            ..BroadcastStats::default()
         });
+
         if last_tick_height == bank.max_tick_height() {
             self.report_and_reset_stats();
             self.unfinished_slot = None;
@@ -250,15 +227,10 @@ impl StandardBroadcastRun {
         Ok(())
     }
 
-    fn insert(
-        &mut self,
-        blockstore: &Arc<Blockstore>,
-        shreds: Arc<Vec<Shred>>,
-        broadcast_shred_batch_info: Option<BroadcastShredBatchInfo>,
-    ) -> Result<()> {
+    fn insert(&self, blockstore: &Arc<Blockstore>, shreds: Arc<Vec<Shred>>) -> Result<()> {
         // Insert shreds into blockstore
         let insert_shreds_start = Instant::now();
-        // The first shred is inserted synchronously
+        //The first shred is inserted synchronously
         let data_shreds = if !shreds.is_empty() && shreds[0].index() == 0 {
             shreds[1..].to_vec()
         } else {
@@ -268,80 +240,66 @@ impl StandardBroadcastRun {
             .insert_shreds(data_shreds, None, true)
             .expect("Failed to insert shreds in blockstore");
         let insert_shreds_elapsed = insert_shreds_start.elapsed();
-        let new_insert_shreds_stats = InsertShredsStats {
+        self.update_broadcast_stats(BroadcastStats {
             insert_shreds_elapsed: duration_as_us(&insert_shreds_elapsed),
-            num_shreds: shreds.len(),
-        };
-        self.update_insertion_metrics(&new_insert_shreds_stats, &broadcast_shred_batch_info);
+            ..BroadcastStats::default()
+        });
         Ok(())
     }
 
-    fn update_insertion_metrics(
-        &mut self,
-        new_insertion_shreds_stats: &InsertShredsStats,
-        broadcast_shred_batch_info: &Option<BroadcastShredBatchInfo>,
-    ) {
-        let mut insert_shreds_stats = self.insert_shreds_stats.lock().unwrap();
-        insert_shreds_stats.update(new_insertion_shreds_stats, broadcast_shred_batch_info);
-    }
-
     fn broadcast(
-        &mut self,
+        &self,
         sock: &UdpSocket,
-        cluster_info: &ClusterInfo,
+        cluster_info: &Arc<RwLock<ClusterInfo>>,
         stakes: Option<Arc<HashMap<Pubkey, u64>>>,
         shreds: Arc<Vec<Shred>>,
-        broadcast_shred_batch_info: Option<BroadcastShredBatchInfo>,
     ) -> Result<()> {
-        trace!("Broadcasting {:?} shreds", shreds.len());
-        // Get the list of peers to broadcast to
-        let get_peers_start = Instant::now();
-        let (peers, peers_and_stakes) = get_broadcast_peers(cluster_info, stakes);
-        let get_peers_elapsed = get_peers_start.elapsed();
+        let seed_start = Instant::now();
+        let seeds: Vec<[u8; 32]> = shreds.iter().map(|s| s.seed()).collect();
+        let seed_elapsed = seed_start.elapsed();
 
         // Broadcast the shreds
-        let transmit_start = Instant::now();
-        let mut send_mmsg_total = 0;
-        broadcast_shreds(
-            sock,
-            &shreds,
-            &peers_and_stakes,
-            &peers,
-            &self.last_datapoint_submit,
-            &mut send_mmsg_total,
-        )?;
-        let transmit_elapsed = transmit_start.elapsed();
-        let new_transmit_shreds_stats = TransmitShredsStats {
-            transmit_elapsed: duration_as_us(&transmit_elapsed),
-            get_peers_elapsed: duration_as_us(&get_peers_elapsed),
-            send_mmsg_elapsed: send_mmsg_total,
-            num_shreds: shreds.len(),
-        };
+        let broadcast_start = Instant::now();
+        let shred_bufs: Vec<Vec<u8>> = shreds.to_vec().into_iter().map(|s| s.payload).collect();
+        trace!("Broadcasting {:?} shreds", shred_bufs.len());
 
-        // Process metrics
-        self.update_transmit_metrics(&new_transmit_shreds_stats, &broadcast_shred_batch_info);
+        cluster_info
+            .write()
+            .unwrap()
+            .broadcast_shreds(sock, shred_bufs, &seeds, stakes)?;
+
+        let broadcast_elapsed = broadcast_start.elapsed();
+
+        self.update_broadcast_stats(BroadcastStats {
+            broadcast_elapsed: duration_as_us(&broadcast_elapsed),
+            seed_elapsed: duration_as_us(&seed_elapsed),
+            ..BroadcastStats::default()
+        });
         Ok(())
     }
 
-    fn update_transmit_metrics(
-        &mut self,
-        new_transmit_shreds_stats: &TransmitShredsStats,
-        broadcast_shred_batch_info: &Option<BroadcastShredBatchInfo>,
-    ) {
-        let mut transmit_shreds_stats = self.transmit_shreds_stats.lock().unwrap();
-        transmit_shreds_stats.update(new_transmit_shreds_stats, broadcast_shred_batch_info);
+    fn update_broadcast_stats(&self, stats: BroadcastStats) {
+        let mut wstats = self.stats.write().unwrap();
+        wstats.receive_elapsed += stats.receive_elapsed;
+        wstats.shredding_elapsed += stats.shredding_elapsed;
+        wstats.insert_shreds_elapsed += stats.insert_shreds_elapsed;
+        wstats.broadcast_elapsed += stats.broadcast_elapsed;
+        wstats.seed_elapsed += stats.seed_elapsed;
     }
 
     fn report_and_reset_stats(&mut self) {
-        let stats = &self.process_shreds_stats;
+        let stats = self.stats.read().unwrap();
         assert!(self.unfinished_slot.is_some());
         datapoint_info!(
-            "broadcast-process-shreds-stats",
+            "broadcast-bank-stats",
             ("slot", self.unfinished_slot.unwrap().slot as i64, i64),
             ("shredding_time", stats.shredding_elapsed as i64, i64),
+            ("insertion_time", stats.insert_shreds_elapsed as i64, i64),
+            ("broadcast_time", stats.broadcast_elapsed as i64, i64),
             ("receive_time", stats.receive_elapsed as i64, i64),
+            ("seed", stats.seed_elapsed as i64, i64),
             (
-                "num_data_shreds",
+                "num_shreds",
                 i64::from(self.unfinished_slot.unwrap().next_shred_index),
                 i64
             ),
@@ -351,7 +309,8 @@ impl StandardBroadcastRun {
                 i64
             ),
         );
-        self.process_shreds_stats.reset();
+        drop(stats);
+        self.stats.write().unwrap().reset();
     }
 }
 
@@ -360,8 +319,8 @@ impl BroadcastRun for StandardBroadcastRun {
         &mut self,
         blockstore: &Arc<Blockstore>,
         receiver: &Receiver<WorkingBankEntry>,
-        socket_sender: &Sender<(TransmitShreds, Option<BroadcastShredBatchInfo>)>,
-        blockstore_sender: &Sender<(Arc<Vec<Shred>>, Option<BroadcastShredBatchInfo>)>,
+        socket_sender: &Sender<TransmitShreds>,
+        blockstore_sender: &Sender<Arc<Vec<Shred>>>,
     ) -> Result<()> {
         let receive_results = broadcast_utils::recv_slot_entries(receiver)?;
         self.process_receive_results(
@@ -372,21 +331,21 @@ impl BroadcastRun for StandardBroadcastRun {
         )
     }
     fn transmit(
-        &mut self,
-        receiver: &Arc<Mutex<TransmitReceiver>>,
-        cluster_info: &ClusterInfo,
+        &self,
+        receiver: &Arc<Mutex<Receiver<TransmitShreds>>>,
+        cluster_info: &Arc<RwLock<ClusterInfo>>,
         sock: &UdpSocket,
     ) -> Result<()> {
-        let ((stakes, shreds), slot_start_ts) = receiver.lock().unwrap().recv()?;
-        self.broadcast(sock, cluster_info, stakes, shreds, slot_start_ts)
+        let (stakes, shreds) = receiver.lock().unwrap().recv()?;
+        self.broadcast(sock, cluster_info, stakes, shreds)
     }
     fn record(
-        &mut self,
-        receiver: &Arc<Mutex<RecordReceiver>>,
+        &self,
+        receiver: &Arc<Mutex<Receiver<Arc<Vec<Shred>>>>>,
         blockstore: &Arc<Blockstore>,
     ) -> Result<()> {
-        let (shreds, slot_start_ts) = receiver.lock().unwrap().recv()?;
-        self.insert(blockstore, shreds, slot_start_ts)
+        let shreds = receiver.lock().unwrap().recv()?;
+        self.insert(blockstore, shreds)
     }
 }
 
@@ -394,17 +353,18 @@ impl BroadcastRun for StandardBroadcastRun {
 mod test {
     use super::*;
     use crate::cluster_info::{ClusterInfo, Node};
-    use solana_ledger::genesis_utils::create_genesis_config;
+    use crate::genesis_utils::create_genesis_config;
     use solana_ledger::{
         blockstore::Blockstore, entry::create_ticks, get_tmp_ledger_path,
         shred::max_ticks_per_n_shreds,
     };
     use solana_runtime::bank::Bank;
     use solana_sdk::{
+        clock::Slot,
         genesis_config::GenesisConfig,
         signature::{Keypair, Signer},
     };
-    use std::sync::Arc;
+    use std::sync::{Arc, RwLock};
     use std::time::Duration;
 
     fn setup(
@@ -412,7 +372,7 @@ mod test {
     ) -> (
         Arc<Blockstore>,
         GenesisConfig,
-        Arc<ClusterInfo>,
+        Arc<RwLock<ClusterInfo>>,
         Arc<Bank>,
         Arc<Keypair>,
         UdpSocket,
@@ -425,9 +385,9 @@ mod test {
         let leader_keypair = Arc::new(Keypair::new());
         let leader_pubkey = leader_keypair.pubkey();
         let leader_info = Node::new_localhost_with_pubkey(&leader_pubkey);
-        let cluster_info = Arc::new(ClusterInfo::new_with_invalid_keypair(
+        let cluster_info = Arc::new(RwLock::new(ClusterInfo::new_with_invalid_keypair(
             leader_info.info.clone(),
-        ));
+        )));
         let socket = UdpSocket::bind("0.0.0.0:0").unwrap();
         let mut genesis_config = create_genesis_config(10_000).genesis_config;
         genesis_config.ticks_per_slot = max_ticks_per_n_shreds(num_shreds_per_slot) + 1;
@@ -502,40 +462,25 @@ mod test {
         // Make sure the slot is not complete
         assert!(!blockstore.is_full(0));
         // Modify the stats, should reset later
-        standard_broadcast_run.process_shreds_stats.receive_elapsed = 10;
-        // Broadcast stats should exist, and 2 batches should have been sent,
-        // one for data, one for coding
-        assert_eq!(
-            standard_broadcast_run
-                .transmit_shreds_stats
-                .lock()
-                .unwrap()
-                .get(unfinished_slot.slot)
-                .unwrap()
-                .num_batches(),
-            2
-        );
-        assert_eq!(
-            standard_broadcast_run
-                .insert_shreds_stats
-                .lock()
-                .unwrap()
-                .get(unfinished_slot.slot)
-                .unwrap()
-                .num_batches(),
-            2
-        );
+        standard_broadcast_run
+            .stats
+            .write()
+            .unwrap()
+            .receive_elapsed = 10;
+
         // Try to fetch ticks from blockstore, nothing should break
-        assert_eq!(blockstore.get_slot_entries(0, 0).unwrap(), ticks0);
+        assert_eq!(blockstore.get_slot_entries(0, 0, None).unwrap(), ticks0);
         assert_eq!(
-            blockstore.get_slot_entries(0, num_shreds_per_slot).unwrap(),
+            blockstore
+                .get_slot_entries(0, num_shreds_per_slot, None)
+                .unwrap(),
             vec![],
         );
 
         // Step 2: Make a transmission for another bank that interrupts the transmission for
         // slot 0
         let bank2 = Arc::new(Bank::new_from_parent(&bank0, &leader_keypair.pubkey(), 2));
-        let interrupted_slot = unfinished_slot.slot;
+
         // Interrupting the slot should cause the unfinished_slot and stats to reset
         let num_shreds = 1;
         assert!(num_shreds < num_shreds_per_slot);
@@ -559,28 +504,16 @@ mod test {
 
         // Check that the stats were reset as well
         assert_eq!(
-            standard_broadcast_run.process_shreds_stats.receive_elapsed,
+            standard_broadcast_run.stats.read().unwrap().receive_elapsed,
             0
         );
 
-        // Broadcast stats for interrupted slot should be cleared
-        assert!(standard_broadcast_run
-            .transmit_shreds_stats
-            .lock()
-            .unwrap()
-            .get(interrupted_slot)
-            .is_none());
-        assert!(standard_broadcast_run
-            .insert_shreds_stats
-            .lock()
-            .unwrap()
-            .get(interrupted_slot)
-            .is_none());
-
         // Try to fetch the incomplete ticks from blockstore, should succeed
-        assert_eq!(blockstore.get_slot_entries(0, 0).unwrap(), ticks0);
+        assert_eq!(blockstore.get_slot_entries(0, 0, None).unwrap(), ticks0);
         assert_eq!(
-            blockstore.get_slot_entries(0, num_shreds_per_slot).unwrap(),
+            blockstore
+                .get_slot_entries(0, num_shreds_per_slot, None)
+                .unwrap(),
             vec![],
         );
     }

core/src/cluster_slots.rs

@@ -1,343 +0,0 @@
-use crate::{
-    cluster_info::ClusterInfo, contact_info::ContactInfo, epoch_slots::EpochSlots,
-    serve_repair::RepairType,
-};
-use solana_ledger::bank_forks::BankForks;
-use solana_runtime::epoch_stakes::NodeIdToVoteAccounts;
-use solana_sdk::{clock::Slot, pubkey::Pubkey};
-use std::{
-    collections::{HashMap, HashSet},
-    sync::{Arc, RwLock},
-};
-
-pub type SlotPubkeys = HashMap<Arc<Pubkey>, u64>;
-pub type ClusterSlotsMap = RwLock<HashMap<Slot, Arc<RwLock<SlotPubkeys>>>>;
-
-#[derive(Default)]
-pub struct ClusterSlots {
-    cluster_slots: ClusterSlotsMap,
-    keys: RwLock<HashSet<Arc<Pubkey>>>,
-    since: RwLock<Option<u64>>,
-    validator_stakes: RwLock<Arc<NodeIdToVoteAccounts>>,
-    epoch: RwLock<Option<u64>>,
-    self_id: RwLock<Pubkey>,
-}
-
-impl ClusterSlots {
-    pub fn lookup(&self, slot: Slot) -> Option<Arc<RwLock<SlotPubkeys>>> {
-        self.cluster_slots.read().unwrap().get(&slot).cloned()
-    }
-    pub fn update(&self, root: Slot, cluster_info: &ClusterInfo, bank_forks: &RwLock<BankForks>) {
-        self.update_peers(cluster_info, bank_forks);
-        let since = *self.since.read().unwrap();
-        let epoch_slots = cluster_info.get_epoch_slots_since(since);
-        self.update_internal(root, epoch_slots);
-    }
-    fn update_internal(&self, root: Slot, epoch_slots: (Vec<EpochSlots>, Option<u64>)) {
-        let (epoch_slots_list, since) = epoch_slots;
-        for epoch_slots in epoch_slots_list {
-            let slots = epoch_slots.to_slots(root);
-            for slot in &slots {
-                if *slot <= root {
-                    continue;
-                }
-                let pubkey = Arc::new(epoch_slots.from);
-                let exists = self.keys.read().unwrap().get(&pubkey).is_some();
-                if !exists {
-                    self.keys.write().unwrap().insert(pubkey.clone());
-                }
-                let from = self.keys.read().unwrap().get(&pubkey).unwrap().clone();
-                let balance = self
-                    .validator_stakes
-                    .read()
-                    .unwrap()
-                    .get(&from)
-                    .map(|v| v.total_stake)
-                    .unwrap_or(0);
-
-                let mut slot_pubkeys = self.cluster_slots.read().unwrap().get(slot).cloned();
-                if slot_pubkeys.is_none() {
-                    let new_slot_pubkeys = Arc::new(RwLock::new(HashMap::default()));
-                    self.cluster_slots
-                        .write()
-                        .unwrap()
-                        .insert(*slot, new_slot_pubkeys.clone());
-                    slot_pubkeys = Some(new_slot_pubkeys);
-                }
-
-                slot_pubkeys
-                    .unwrap()
-                    .write()
-                    .unwrap()
-                    .insert(from.clone(), balance);
-            }
-        }
-        self.cluster_slots.write().unwrap().retain(|x, _| *x > root);
-        self.keys
-            .write()
-            .unwrap()
-            .retain(|x| Arc::strong_count(x) > 1);
-        *self.since.write().unwrap() = since;
-    }
-    pub fn collect(&self, id: &Pubkey) -> HashSet<Slot> {
-        self.cluster_slots
-            .read()
-            .unwrap()
-            .iter()
-            .filter(|(_, keys)| keys.read().unwrap().get(id).is_some())
-            .map(|(slot, _)| slot)
-            .cloned()
-            .collect()
-    }
-
-    fn update_peers(&self, cluster_info: &ClusterInfo, bank_forks: &RwLock<BankForks>) {
-        let root_bank = bank_forks.read().unwrap().root_bank().clone();
-        let root_epoch = root_bank.epoch();
-        let my_epoch = *self.epoch.read().unwrap();
-
-        if Some(root_epoch) != my_epoch {
-            let validator_stakes = root_bank
-                .epoch_stakes(root_epoch)
-                .expect(
-                    "Bank must have epoch stakes
-                for its own epoch",
-                )
-                .node_id_to_vote_accounts()
-                .clone();
-
-            *self.validator_stakes.write().unwrap() = validator_stakes;
-            let id = cluster_info.id();
-            *self.self_id.write().unwrap() = id;
-            *self.epoch.write().unwrap() = Some(root_epoch);
-        }
-    }
-
-    pub fn compute_weights(&self, slot: Slot, repair_peers: &[ContactInfo]) -> Vec<(u64, usize)> {
-        let slot_peers = self.lookup(slot);
-        repair_peers
-            .iter()
-            .enumerate()
-            .map(|(i, x)| {
-                let peer_stake = slot_peers
-                    .as_ref()
-                    .and_then(|v| v.read().unwrap().get(&x.id).cloned())
-                    .unwrap_or(0);
-                (
-                    1 + peer_stake
-                        + self
-                            .validator_stakes
-                            .read()
-                            .unwrap()
-                            .get(&x.id)
-                            .map(|v| v.total_stake)
-                            .unwrap_or(0),
-                    i,
-                )
-            })
-            .collect()
-    }
-
-    pub fn generate_repairs_for_missing_slots(
-        &self,
-        self_id: &Pubkey,
-        root: Slot,
-    ) -> Vec<RepairType> {
-        let my_slots = self.collect(self_id);
-        self.cluster_slots
-            .read()
-            .unwrap()
-            .keys()
-            .filter(|x| **x > root)
-            .filter(|x| !my_slots.contains(*x))
-            .map(|x| RepairType::HighestShred(*x, 0))
-            .collect()
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use solana_runtime::epoch_stakes::NodeVoteAccounts;
-
-    #[test]
-    fn test_default() {
-        let cs = ClusterSlots::default();
-        assert!(cs.cluster_slots.read().unwrap().is_empty());
-        assert!(cs.since.read().unwrap().is_none());
-    }
-
-    #[test]
-    fn test_update_noop() {
-        let cs = ClusterSlots::default();
-        cs.update_internal(0, (vec![], None));
-        assert!(cs.cluster_slots.read().unwrap().is_empty());
-        assert!(cs.since.read().unwrap().is_none());
-    }
-
-    #[test]
-    fn test_update_empty() {
-        let cs = ClusterSlots::default();
-        let epoch_slot = EpochSlots::default();
-        cs.update_internal(0, (vec![epoch_slot], Some(0)));
-        assert_eq!(*cs.since.read().unwrap(), Some(0));
-        assert!(cs.lookup(0).is_none());
-    }
-
-    #[test]
-    fn test_update_rooted() {
-        //root is 0, so it should clear out the slot
-        let cs = ClusterSlots::default();
-        let mut epoch_slot = EpochSlots::default();
-        epoch_slot.fill(&[0], 0);
-        cs.update_internal(0, (vec![epoch_slot], Some(0)));
-        assert_eq!(*cs.since.read().unwrap(), Some(0));
-        assert!(cs.lookup(0).is_none());
-    }
-
-    #[test]
-    fn test_update_new_slot() {
-        let cs = ClusterSlots::default();
-        let mut epoch_slot = EpochSlots::default();
-        epoch_slot.fill(&[1], 0);
-        cs.update_internal(0, (vec![epoch_slot], Some(0)));
-        assert_eq!(*cs.since.read().unwrap(), Some(0));
-        assert!(cs.lookup(0).is_none());
-        assert!(cs.lookup(1).is_some());
-        assert_eq!(
-            cs.lookup(1)
-                .unwrap()
-                .read()
-                .unwrap()
-                .get(&Pubkey::default()),
-            Some(&0)
-        );
-    }
-
-    #[test]
-    fn test_compute_weights() {
-        let cs = ClusterSlots::default();
-        let ci = ContactInfo::default();
-        assert_eq!(cs.compute_weights(0, &[ci]), vec![(1, 0)]);
-    }
-
-    #[test]
-    fn test_best_peer_2() {
-        let cs = ClusterSlots::default();
-        let mut c1 = ContactInfo::default();
-        let mut c2 = ContactInfo::default();
-        let mut map = HashMap::new();
-        let k1 = Pubkey::new_rand();
-        let k2 = Pubkey::new_rand();
-        map.insert(Arc::new(k1.clone()), std::u64::MAX / 2);
-        map.insert(Arc::new(k2.clone()), 0);
-        cs.cluster_slots
-            .write()
-            .unwrap()
-            .insert(0, Arc::new(RwLock::new(map)));
-        c1.id = k1;
-        c2.id = k2;
-        assert_eq!(
-            cs.compute_weights(0, &[c1, c2]),
-            vec![(std::u64::MAX / 2 + 1, 0), (1, 1)]
-        );
-    }
-
-    #[test]
-    fn test_best_peer_3() {
-        let cs = ClusterSlots::default();
-        let mut c1 = ContactInfo::default();
-        let mut c2 = ContactInfo::default();
-        let mut map = HashMap::new();
-        let k1 = Pubkey::new_rand();
-        let k2 = Pubkey::new_rand();
-        map.insert(Arc::new(k2.clone()), 0);
-        cs.cluster_slots
-            .write()
-            .unwrap()
-            .insert(0, Arc::new(RwLock::new(map)));
-        //make sure default weights are used as well
-        let validator_stakes: HashMap<_, _> = vec![(
-            *Arc::new(k1.clone()),
-            NodeVoteAccounts {
-                total_stake: std::u64::MAX / 2,
-                vote_accounts: vec![Pubkey::default()],
-            },
-        )]
-        .into_iter()
-        .collect();
-        *cs.validator_stakes.write().unwrap() = Arc::new(validator_stakes);
-        c1.id = k1;
-        c2.id = k2;
-        assert_eq!(
-            cs.compute_weights(0, &[c1, c2]),
-            vec![(std::u64::MAX / 2 + 1, 0), (1, 1)]
-        );
-    }
-
-    #[test]
-    fn test_update_new_staked_slot() {
-        let cs = ClusterSlots::default();
-        let mut epoch_slot = EpochSlots::default();
-        epoch_slot.fill(&[1], 0);
-
-        let map = Arc::new(
-            vec![(
-                Pubkey::default(),
-                NodeVoteAccounts {
-                    total_stake: 1,
-                    vote_accounts: vec![Pubkey::default()],
-                },
-            )]
-            .into_iter()
-            .collect(),
-        );
-
-        *cs.validator_stakes.write().unwrap() = map;
-        cs.update_internal(0, (vec![epoch_slot], None));
-        assert!(cs.lookup(1).is_some());
-        assert_eq!(
-            cs.lookup(1)
-                .unwrap()
-                .read()
-                .unwrap()
-                .get(&Pubkey::default()),
-            Some(&1)
-        );
-    }
-
-    #[test]
-    fn test_generate_repairs() {
-        let cs = ClusterSlots::default();
-        let mut epoch_slot = EpochSlots::default();
-        epoch_slot.fill(&[1], 0);
-        cs.update_internal(0, (vec![epoch_slot], None));
-        let self_id = Pubkey::new_rand();
-        assert_eq!(
-            cs.generate_repairs_for_missing_slots(&self_id, 0),
-            vec![RepairType::HighestShred(1, 0)]
-        )
-    }
-
-    #[test]
-    fn test_collect_my_slots() {
-        let cs = ClusterSlots::default();
-        let mut epoch_slot = EpochSlots::default();
-        epoch_slot.fill(&[1], 0);
-        let self_id = epoch_slot.from;
-        cs.update_internal(0, (vec![epoch_slot], None));
-        let slots: Vec<Slot> = cs.collect(&self_id).into_iter().collect();
-        assert_eq!(slots, vec![1]);
-    }
-
-    #[test]
-    fn test_generate_repairs_existing() {
-        let cs = ClusterSlots::default();
-        let mut epoch_slot = EpochSlots::default();
-        epoch_slot.fill(&[1], 0);
-        let self_id = epoch_slot.from;
-        cs.update_internal(0, (vec![epoch_slot], None));
-        assert!(cs
-            .generate_repairs_for_missing_slots(&self_id, 0)
-            .is_empty());
-    }
-}

core/src/commitment.rs

@@ -1,5 +1,4 @@
 use crate::consensus::VOTE_THRESHOLD_SIZE;
-use solana_ledger::blockstore::Blockstore;
 use solana_measure::measure::Measure;
 use solana_metrics::inc_new_counter_info;
 use solana_runtime::bank::Bank;
@@ -14,11 +13,9 @@ use std::{
     time::Duration,
 };
 
-pub type BlockCommitmentArray = [u64; MAX_LOCKOUT_HISTORY + 1];
-
 #[derive(Clone, Debug, Default, Eq, PartialEq, Serialize, Deserialize)]
 pub struct BlockCommitment {
-    pub commitment: BlockCommitmentArray,
+    pub commitment: [u64; MAX_LOCKOUT_HISTORY],
 }
 
 impl BlockCommitment {
@@ -31,27 +28,17 @@ impl BlockCommitment {
         assert!(confirmation_count > 0 && confirmation_count <= MAX_LOCKOUT_HISTORY);
         self.commitment[confirmation_count - 1]
     }
-
-    pub fn increase_rooted_stake(&mut self, stake: u64) {
-        self.commitment[MAX_LOCKOUT_HISTORY] += stake;
-    }
-
-    pub fn get_rooted_stake(&self) -> u64 {
-        self.commitment[MAX_LOCKOUT_HISTORY]
-    }
-
     #[cfg(test)]
-    pub(crate) fn new(commitment: BlockCommitmentArray) -> Self {
+    pub(crate) fn new(commitment: [u64; MAX_LOCKOUT_HISTORY]) -> Self {
         Self { commitment }
     }
 }
 
+#[derive(Default)]
 pub struct BlockCommitmentCache {
     block_commitment: HashMap<Slot, BlockCommitment>,
-    largest_confirmed_root: Slot,
     total_stake: u64,
     bank: Arc<Bank>,
-    blockstore: Arc<Blockstore>,
     root: Slot,
 }
 
@@ -72,41 +59,22 @@ impl std::fmt::Debug for BlockCommitmentCache {
 impl BlockCommitmentCache {
     pub fn new(
         block_commitment: HashMap<Slot, BlockCommitment>,
-        largest_confirmed_root: Slot,
         total_stake: u64,
         bank: Arc<Bank>,
-        blockstore: Arc<Blockstore>,
         root: Slot,
     ) -> Self {
         Self {
             block_commitment,
-            largest_confirmed_root,
             total_stake,
             bank,
-            blockstore,
             root,
         }
     }
 
-    pub fn default_with_blockstore(blockstore: Arc<Blockstore>) -> Self {
-        Self {
-            block_commitment: HashMap::default(),
-            largest_confirmed_root: Slot::default(),
-            total_stake: u64::default(),
-            bank: Arc::new(Bank::default()),
-            blockstore,
-            root: Slot::default(),
-        }
-    }
-
     pub fn get_block_commitment(&self, slot: Slot) -> Option<&BlockCommitment> {
         self.block_commitment.get(&slot)
     }
 
-    pub fn largest_confirmed_root(&self) -> Slot {
-        self.largest_confirmed_root
-    }
-
     pub fn total_stake(&self) -> u64 {
         self.total_stake
     }
@@ -142,30 +110,16 @@ impl BlockCommitmentCache {
             0
         })
     }
-
-    pub fn is_confirmed_rooted(&self, slot: Slot) -> bool {
-        slot <= self.largest_confirmed_root()
-            && (self.blockstore.is_root(slot) || self.bank.status_cache_ancestors().contains(&slot))
-    }
-
     #[cfg(test)]
-    pub fn new_for_tests_with_blockstore(blockstore: Arc<Blockstore>) -> Self {
+    pub fn new_for_tests() -> Self {
         let mut block_commitment: HashMap<Slot, BlockCommitment> = HashMap::new();
         block_commitment.insert(0, BlockCommitment::default());
         Self {
             block_commitment,
-            blockstore,
             total_stake: 42,
-            largest_confirmed_root: Slot::default(),
-            bank: Arc::new(Bank::default()),
-            root: Slot::default(),
+            ..Self::default()
         }
     }
-
-    #[cfg(test)]
-    pub(crate) fn set_get_largest_confirmed_root(&mut self, root: Slot) {
-        self.largest_confirmed_root = root;
-    }
 }
 
 pub struct CommitmentAggregationData {
@@ -184,18 +138,6 @@ impl CommitmentAggregationData {
     }
 }
 
-fn get_largest_confirmed_root(mut rooted_stake: Vec<(Slot, u64)>, total_stake: u64) -> Slot {
-    rooted_stake.sort_by(|a, b| a.0.cmp(&b.0).reverse());
-    let mut stake_sum = 0;
-    for (root, stake) in rooted_stake {
-        stake_sum += stake;
-        if (stake_sum as f64 / total_stake as f64) > VOTE_THRESHOLD_SIZE {
-            return root;
-        }
-    }
-    0
-}
-
 pub struct AggregateCommitmentService {
     t_commitment: JoinHandle<()>,
 }
@@ -253,18 +195,12 @@ impl AggregateCommitmentService {
             }
 
             let mut aggregate_commitment_time = Measure::start("aggregate-commitment-ms");
-            let (block_commitment, rooted_stake) =
-                Self::aggregate_commitment(&ancestors, &aggregation_data.bank);
-
-            let largest_confirmed_root =
-                get_largest_confirmed_root(rooted_stake, aggregation_data.total_staked);
+            let block_commitment = Self::aggregate_commitment(&ancestors, &aggregation_data.bank);
 
             let mut new_block_commitment = BlockCommitmentCache::new(
                 block_commitment,
-                largest_confirmed_root,
                 aggregation_data.total_staked,
                 aggregation_data.bank,
-                block_commitment_cache.read().unwrap().blockstore.clone(),
                 aggregation_data.root,
             );
 
@@ -279,10 +215,7 @@ impl AggregateCommitmentService {
         }
     }
 
-    pub fn aggregate_commitment(
-        ancestors: &[Slot],
-        bank: &Bank,
-    ) -> (HashMap<Slot, BlockCommitment>, Vec<(Slot, u64)>) {
+    pub fn aggregate_commitment(ancestors: &[Slot], bank: &Bank) -> HashMap<Slot, BlockCommitment> {
         assert!(!ancestors.is_empty());
 
         // Check ancestors is sorted
@@ -291,7 +224,6 @@ impl AggregateCommitmentService {
         }
 
         let mut commitment = HashMap::new();
-        let mut rooted_stake: Vec<(Slot, u64)> = Vec::new();
         for (_, (lamports, account)) in bank.vote_accounts().into_iter() {
             if lamports == 0 {
                 continue;
@@ -304,19 +236,17 @@ impl AggregateCommitmentService {
             let vote_state = vote_state.unwrap();
             Self::aggregate_commitment_for_vote_account(
                 &mut commitment,
-                &mut rooted_stake,
                 &vote_state,
                 ancestors,
                 lamports,
             );
         }
 
-        (commitment, rooted_stake)
+        commitment
     }
 
     fn aggregate_commitment_for_vote_account(
         commitment: &mut HashMap<Slot, BlockCommitment>,
-        rooted_stake: &mut Vec<(Slot, u64)>,
         vote_state: &VoteState,
         ancestors: &[Slot],
         lamports: u64,
@@ -329,13 +259,12 @@ impl AggregateCommitmentService {
                     commitment
                         .entry(*a)
                         .or_insert_with(BlockCommitment::default)
-                        .increase_rooted_stake(lamports);
+                        .increase_confirmation_stake(MAX_LOCKOUT_HISTORY, lamports);
                 } else {
                     ancestors_index = i;
                     break;
                 }
             }
-            rooted_stake.push((root, lamports));
         }
 
         for vote in &vote_state.votes {
@@ -361,10 +290,7 @@ impl AggregateCommitmentService {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use solana_ledger::{
-        genesis_utils::{create_genesis_config, GenesisConfigInfo},
-        get_tmp_ledger_path,
-    };
+    use crate::genesis_utils::{create_genesis_config, GenesisConfigInfo};
     use solana_sdk::pubkey::Pubkey;
     use solana_stake_program::stake_state;
     use solana_vote_program::vote_state::{self, VoteStateVersions};
@@ -382,8 +308,6 @@ mod tests {
     #[test]
     fn test_get_confirmations() {
         let bank = Arc::new(Bank::default());
-        let ledger_path = get_tmp_ledger_path!();
-        let blockstore = Arc::new(Blockstore::open(&ledger_path).unwrap());
         // Build BlockCommitmentCache with votes at depths 0 and 1 for 2 slots
         let mut cache0 = BlockCommitment::default();
         cache0.increase_confirmation_stake(1, 5);
@@ -401,8 +325,7 @@ mod tests {
         block_commitment.entry(0).or_insert(cache0.clone());
         block_commitment.entry(1).or_insert(cache1.clone());
         block_commitment.entry(2).or_insert(cache2.clone());
-        let block_commitment_cache =
-            BlockCommitmentCache::new(block_commitment, 0, 50, bank, blockstore, 0);
+        let block_commitment_cache = BlockCommitmentCache::new(block_commitment, 50, bank, 0);
 
         assert_eq!(block_commitment_cache.get_confirmation_count(0), Some(2));
         assert_eq!(block_commitment_cache.get_confirmation_count(1), Some(1));
@@ -410,68 +333,17 @@ mod tests {
         assert_eq!(block_commitment_cache.get_confirmation_count(3), None,);
     }
 
-    #[test]
-    fn test_is_confirmed_rooted() {
-        let bank = Arc::new(Bank::default());
-        let ledger_path = get_tmp_ledger_path!();
-        let blockstore = Arc::new(Blockstore::open(&ledger_path).unwrap());
-        blockstore.set_roots(&[0, 1]).unwrap();
-        // Build BlockCommitmentCache with rooted slots
-        let mut cache0 = BlockCommitment::default();
-        cache0.increase_rooted_stake(50);
-        let mut cache1 = BlockCommitment::default();
-        cache1.increase_rooted_stake(40);
-        let mut cache2 = BlockCommitment::default();
-        cache2.increase_rooted_stake(20);
-
-        let mut block_commitment = HashMap::new();
-        block_commitment.entry(1).or_insert(cache0.clone());
-        block_commitment.entry(2).or_insert(cache1.clone());
-        block_commitment.entry(3).or_insert(cache2.clone());
-        let largest_confirmed_root = 1;
-        let block_commitment_cache = BlockCommitmentCache::new(
-            block_commitment,
-            largest_confirmed_root,
-            50,
-            bank,
-            blockstore,
-            0,
-        );
-
-        assert!(block_commitment_cache.is_confirmed_rooted(0));
-        assert!(block_commitment_cache.is_confirmed_rooted(1));
-        assert!(!block_commitment_cache.is_confirmed_rooted(2));
-        assert!(!block_commitment_cache.is_confirmed_rooted(3));
-    }
-
-    #[test]
-    fn test_get_largest_confirmed_root() {
-        assert_eq!(get_largest_confirmed_root(vec![], 10), 0);
-        let mut rooted_stake = vec![];
-        rooted_stake.push((0, 5));
-        rooted_stake.push((1, 5));
-        assert_eq!(get_largest_confirmed_root(rooted_stake, 10), 0);
-        let mut rooted_stake = vec![];
-        rooted_stake.push((1, 5));
-        rooted_stake.push((0, 10));
-        rooted_stake.push((2, 5));
-        rooted_stake.push((1, 4));
-        assert_eq!(get_largest_confirmed_root(rooted_stake, 10), 1);
-    }
-
     #[test]
     fn test_aggregate_commitment_for_vote_account_1() {
         let ancestors = vec![3, 4, 5, 7, 9, 11];
         let mut commitment = HashMap::new();
-        let mut rooted_stake = vec![];
         let lamports = 5;
         let mut vote_state = VoteState::default();
 
-        let root = ancestors.last().unwrap().clone();
-        vote_state.root_slot = Some(root);
+        let root = ancestors.last().unwrap();
+        vote_state.root_slot = Some(*root);
         AggregateCommitmentService::aggregate_commitment_for_vote_account(
             &mut commitment,
-            &mut rooted_stake,
             &vote_state,
             &ancestors,
             lamports,
@@ -479,17 +351,15 @@ mod tests {
 
         for a in ancestors {
             let mut expected = BlockCommitment::default();
-            expected.increase_rooted_stake(lamports);
+            expected.increase_confirmation_stake(MAX_LOCKOUT_HISTORY, lamports);
             assert_eq!(*commitment.get(&a).unwrap(), expected);
         }
-        assert_eq!(rooted_stake[0], (root, lamports));
     }
 
     #[test]
     fn test_aggregate_commitment_for_vote_account_2() {
         let ancestors = vec![3, 4, 5, 7, 9, 11];
         let mut commitment = HashMap::new();
-        let mut rooted_stake = vec![];
         let lamports = 5;
         let mut vote_state = VoteState::default();
 
@@ -498,7 +368,6 @@ mod tests {
         vote_state.process_slot_vote_unchecked(*ancestors.last().unwrap());
         AggregateCommitmentService::aggregate_commitment_for_vote_account(
             &mut commitment,
-            &mut rooted_stake,
             &vote_state,
             &ancestors,
             lamports,
@@ -507,7 +376,7 @@ mod tests {
         for a in ancestors {
             if a <= root {
                 let mut expected = BlockCommitment::default();
-                expected.increase_rooted_stake(lamports);
+                expected.increase_confirmation_stake(MAX_LOCKOUT_HISTORY, lamports);
                 assert_eq!(*commitment.get(&a).unwrap(), expected);
             } else {
                 let mut expected = BlockCommitment::default();
@@ -515,14 +384,12 @@ mod tests {
                 assert_eq!(*commitment.get(&a).unwrap(), expected);
             }
         }
-        assert_eq!(rooted_stake[0], (root, lamports));
     }
 
     #[test]
     fn test_aggregate_commitment_for_vote_account_3() {
         let ancestors = vec![3, 4, 5, 7, 9, 10, 11];
         let mut commitment = HashMap::new();
-        let mut rooted_stake = vec![];
         let lamports = 5;
         let mut vote_state = VoteState::default();
 
@@ -533,7 +400,6 @@ mod tests {
         vote_state.process_slot_vote_unchecked(ancestors[6]);
         AggregateCommitmentService::aggregate_commitment_for_vote_account(
             &mut commitment,
-            &mut rooted_stake,
             &vote_state,
             &ancestors,
             lamports,
@@ -542,7 +408,7 @@ mod tests {
         for (i, a) in ancestors.iter().enumerate() {
             if *a <= root {
                 let mut expected = BlockCommitment::default();
-                expected.increase_rooted_stake(lamports);
+                expected.increase_confirmation_stake(MAX_LOCKOUT_HISTORY, lamports);
                 assert_eq!(*commitment.get(&a).unwrap(), expected);
             } else if i <= 4 {
                 let mut expected = BlockCommitment::default();
@@ -554,7 +420,6 @@ mod tests {
                 assert_eq!(*commitment.get(&a).unwrap(), expected);
             }
         }
-        assert_eq!(rooted_stake[0], (root, lamports));
     }
 
     #[test]
@@ -564,8 +429,6 @@ mod tests {
             mut genesis_config, ..
         } = create_genesis_config(10_000);
 
-        let rooted_stake_amount = 40;
-
         let sk1 = Pubkey::new_rand();
         let pk1 = Pubkey::new_rand();
         let mut vote_account1 = vote_state::create_account(&pk1, &Pubkey::new_rand(), 0, 100);
@@ -576,36 +439,12 @@ mod tests {
         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 = 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,
-            &vote_account3,
-            &genesis_config.rent,
-            rooted_stake_amount,
-        );
-        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,
-            &vote_account4,
-            &genesis_config.rent,
-            rooted_stake_amount,
-        );
 
         genesis_config.accounts.extend(vec![
             (pk1, vote_account1.clone()),
             (sk1, stake_account1),
             (pk2, vote_account2.clone()),
             (sk2, stake_account2),
-            (pk3, vote_account3.clone()),
-            (sk3, stake_account3),
-            (pk4, vote_account4.clone()),
-            (sk4, stake_account4),
         ]);
 
         // Create bank
@@ -625,20 +464,7 @@ mod tests {
         VoteState::to(&versioned, &mut vote_account2).unwrap();
         bank.store_account(&pk2, &vote_account2);
 
-        let mut vote_state3 = VoteState::from(&vote_account3).unwrap();
-        vote_state3.root_slot = Some(1);
-        let versioned = VoteStateVersions::Current(Box::new(vote_state3));
-        VoteState::to(&versioned, &mut vote_account3).unwrap();
-        bank.store_account(&pk3, &vote_account3);
-
-        let mut vote_state4 = VoteState::from(&vote_account4).unwrap();
-        vote_state4.root_slot = Some(2);
-        let versioned = VoteStateVersions::Current(Box::new(vote_state4));
-        VoteState::to(&versioned, &mut vote_account4).unwrap();
-        bank.store_account(&pk4, &vote_account4);
-
-        let (commitment, rooted_stake) =
-            AggregateCommitmentService::aggregate_commitment(&ancestors, &bank);
+        let commitment = AggregateCommitmentService::aggregate_commitment(&ancestors, &bank);
 
         for a in ancestors {
             if a <= 3 {
@@ -662,7 +488,5 @@ mod tests {
                 assert!(commitment.get(&a).is_none());
             }
         }
-        assert_eq!(rooted_stake.len(), 2);
-        assert_eq!(get_largest_confirmed_root(rooted_stake, 100), 1)
     }
 }

core/src/consensus.rs

@@ -1,4 +1,3 @@
-use crate::progress_map::ProgressMap;
 use chrono::prelude::*;
 use solana_ledger::bank_forks::BankForks;
 use solana_runtime::bank::Bank;
@@ -321,7 +320,7 @@ impl Tower {
     }
     pub fn check_vote_stake_threshold(
         &self,
-        slot: Slot,
+        slot: u64,
         stake_lockouts: &HashMap<u64, StakeLockout>,
         total_staked: u64,
     ) -> bool {
@@ -332,8 +331,11 @@ impl Tower {
             if let Some(fork_stake) = stake_lockouts.get(&vote.slot) {
                 let lockout = fork_stake.stake as f64 / total_staked as f64;
                 trace!(
-                    "fork_stake slot: {}, vote slot: {}, lockout: {} fork_stake: {} total_stake: {}",
-                    slot, vote.slot, lockout, fork_stake.stake, total_staked
+                    "fork_stake slot: {} lockout: {} fork_stake: {} total_stake: {}",
+                    slot,
+                    lockout,
+                    fork_stake.stake,
+                    total_staked
                 );
                 if vote.confirmation_count as usize > self.threshold_depth {
                     for old_vote in &self.lockouts.votes {
@@ -353,18 +355,6 @@ impl Tower {
         }
     }
 
-    pub(crate) fn check_switch_threshold(
-        &self,
-        _slot: Slot,
-        _ancestors: &HashMap<Slot, HashSet<u64>>,
-        _descendants: &HashMap<Slot, HashSet<u64>>,
-        _progress: &ProgressMap,
-        _total_epoch_stake: u64,
-        _epoch_vote_accounts: &HashMap<Pubkey, (u64, Account)>,
-    ) -> bool {
-        true
-    }
-
     /// Update lockouts for all the ancestors
     fn update_ancestor_lockouts(
         stake_lockouts: &mut HashMap<Slot, StakeLockout>,
@@ -478,12 +468,7 @@ impl Tower {
 #[cfg(test)]
 pub mod test {
     use super::*;
-    use crate::{
-        cluster_info_vote_listener::VoteTracker,
-        cluster_slots::ClusterSlots,
-        progress_map::ForkProgress,
-        replay_stage::{HeaviestForkFailures, ReplayStage},
-    };
+    use crate::replay_stage::{ForkProgress, ReplayStage};
     use solana_ledger::bank_forks::BankForks;
     use solana_runtime::{
         bank::Bank,
@@ -496,96 +481,107 @@ pub mod test {
         hash::Hash,
         pubkey::Pubkey,
         signature::{Keypair, Signer},
+        transaction::Transaction,
     };
     use solana_vote_program::{
+        vote_instruction,
         vote_state::{Vote, VoteStateVersions},
-        vote_transaction,
     };
-    use std::collections::HashMap;
+    use std::collections::{HashMap, VecDeque};
     use std::sync::RwLock;
     use std::{thread::sleep, time::Duration};
-    use trees::{tr, Tree, TreeWalk};
+    use trees::{tr, Node, Tree};
 
-    pub(crate) struct VoteSimulator {
-        pub validator_keypairs: HashMap<Pubkey, ValidatorVoteKeypairs>,
-        pub node_pubkeys: Vec<Pubkey>,
-        pub vote_pubkeys: Vec<Pubkey>,
-        pub bank_forks: RwLock<BankForks>,
-        pub progress: ProgressMap,
+    pub(crate) struct VoteSimulator<'a> {
+        searchable_nodes: HashMap<u64, &'a Node<u64>>,
     }
 
-    impl VoteSimulator {
-        pub(crate) fn new(num_keypairs: usize) -> Self {
-            let (validator_keypairs, node_pubkeys, vote_pubkeys, bank_forks, progress) =
-                Self::init_state(num_keypairs);
-            Self {
-                validator_keypairs,
-                node_pubkeys,
-                vote_pubkeys,
-                bank_forks: RwLock::new(bank_forks),
-                progress,
-            }
-        }
-        pub(crate) fn fill_bank_forks(
-            &mut self,
-            forks: Tree<u64>,
-            cluster_votes: &HashMap<Pubkey, Vec<u64>>,
-        ) {
-            let root = forks.root().data;
-            assert!(self.bank_forks.read().unwrap().get(root).is_some());
-
-            let mut walk = TreeWalk::from(forks);
-            loop {
-                if let Some(visit) = walk.get() {
-                    let slot = visit.node().data;
-                    self.progress
-                        .entry(slot)
-                        .or_insert_with(|| ForkProgress::new(Hash::default(), None, None, 0, 0));
-                    if self.bank_forks.read().unwrap().get(slot).is_some() {
-                        walk.forward();
-                        continue;
-                    }
-                    let parent = walk.get_parent().unwrap().data;
-                    let parent_bank = self.bank_forks.read().unwrap().get(parent).unwrap().clone();
-                    let new_bank = Bank::new_from_parent(&parent_bank, &Pubkey::default(), slot);
-                    for (pubkey, vote) in cluster_votes.iter() {
-                        if vote.contains(&parent) {
-                            let keypairs = self.validator_keypairs.get(pubkey).unwrap();
-                            let last_blockhash = parent_bank.last_blockhash();
-                            let vote_tx = vote_transaction::new_vote_transaction(
-                                // Must vote > root to be processed
-                                vec![parent],
-                                parent_bank.hash(),
-                                last_blockhash,
-                                &keypairs.node_keypair,
-                                &keypairs.vote_keypair,
-                                &keypairs.vote_keypair,
-                            );
-                            info!("voting {} {}", parent_bank.slot(), parent_bank.hash());
-                            new_bank.process_transaction(&vote_tx).unwrap();
-                        }
-                    }
-                    new_bank.freeze();
-                    self.bank_forks.write().unwrap().insert(new_bank);
-                    walk.forward();
-                } else {
-                    break;
-                }
-            }
+    impl<'a> VoteSimulator<'a> {
+        pub(crate) fn new(forks: &'a Tree<u64>) -> Self {
+            let mut searchable_nodes = HashMap::new();
+            let root = forks.root();
+            searchable_nodes.insert(root.data, root);
+            Self { searchable_nodes }
         }
 
         pub(crate) fn simulate_vote(
             &mut self,
             vote_slot: Slot,
-            my_pubkey: &Pubkey,
+            bank_forks: &RwLock<BankForks>,
+            cluster_votes: &mut HashMap<Pubkey, Vec<u64>>,
+            validator_keypairs: &HashMap<Pubkey, ValidatorVoteKeypairs>,
+            my_keypairs: &ValidatorVoteKeypairs,
+            progress: &mut HashMap<u64, ForkProgress>,
             tower: &mut Tower,
-        ) -> Vec<HeaviestForkFailures> {
-            // Try to simulate the vote
-            let my_keypairs = self.validator_keypairs.get(&my_pubkey).unwrap();
+        ) -> Vec<VoteFailures> {
+            let node = self
+                .find_node_and_update_simulation(vote_slot)
+                .expect("Vote to simulate must be for a slot in the tree");
+
+            let mut missing_nodes = VecDeque::new();
+            let mut current = node;
+            loop {
+                let current_slot = current.data;
+                if bank_forks.read().unwrap().get(current_slot).is_some()
+                    || tower.root().map(|r| current_slot < r).unwrap_or(false)
+                {
+                    break;
+                } else {
+                    missing_nodes.push_front(current);
+                }
+
+                if let Some(parent) = current.parent() {
+                    current = parent;
+                } else {
+                    break;
+                }
+            }
+
+            // Create any missing banks along the path
+            for missing_node in missing_nodes {
+                let missing_slot = missing_node.data;
+                let parent = missing_node.parent().unwrap().data;
+                let parent_bank = bank_forks
+                    .read()
+                    .unwrap()
+                    .get(parent)
+                    .expect("parent bank must exist")
+                    .clone();
+                info!("parent of {} is {}", missing_slot, parent_bank.slot(),);
+                progress
+                    .entry(missing_slot)
+                    .or_insert_with(|| ForkProgress::new(parent_bank.last_blockhash()));
+
+                // Create the missing bank
+                let new_bank =
+                    Bank::new_from_parent(&parent_bank, &Pubkey::default(), missing_slot);
+
+                // Simulate ingesting the cluster's votes for the parent into this bank
+                for (pubkey, vote) in cluster_votes.iter() {
+                    if vote.contains(&parent_bank.slot()) {
+                        let keypairs = validator_keypairs.get(pubkey).unwrap();
+                        let node_pubkey = keypairs.node_keypair.pubkey();
+                        let vote_pubkey = keypairs.vote_keypair.pubkey();
+                        let last_blockhash = parent_bank.last_blockhash();
+                        let votes = Vote::new(vec![parent_bank.slot()], parent_bank.hash());
+                        info!("voting {} {}", parent_bank.slot(), parent_bank.hash());
+                        let vote_ix = vote_instruction::vote(&vote_pubkey, &vote_pubkey, votes);
+                        let mut vote_tx =
+                            Transaction::new_with_payer(vec![vote_ix], Some(&node_pubkey));
+                        vote_tx.partial_sign(&[&keypairs.node_keypair], last_blockhash);
+                        vote_tx.partial_sign(&[&keypairs.vote_keypair], last_blockhash);
+                        new_bank.process_transaction(&vote_tx).unwrap();
+                    }
+                }
+                new_bank.freeze();
+                bank_forks.write().unwrap().insert(new_bank);
+            }
+
+            // Now try to simulate the vote
+            let my_pubkey = my_keypairs.node_keypair.pubkey();
             let my_vote_pubkey = my_keypairs.vote_keypair.pubkey();
-            let ancestors = self.bank_forks.read().unwrap().ancestors();
-            let mut frozen_banks: Vec<_> = self
-                .bank_forks
+            let ancestors = bank_forks.read().unwrap().ancestors();
+            let mut frozen_banks: Vec<_> = bank_forks
                 .read()
                 .unwrap()
                 .frozen_banks()
@@ -598,133 +594,99 @@ pub mod test {
                 &ancestors,
                 &mut frozen_banks,
                 tower,
-                &mut self.progress,
-                &VoteTracker::default(),
-                &ClusterSlots::default(),
-                &self.bank_forks,
-                &mut HashSet::new(),
+                progress,
             );
 
-            let vote_bank = self
-                .bank_forks
+            let bank = bank_forks
                 .read()
                 .unwrap()
                 .get(vote_slot)
                 .expect("Bank must have been created before vote simulation")
                 .clone();
-
-            // Try to vote on the given slot
-            let descendants = self.bank_forks.read().unwrap().descendants();
-            let (_, _, failure_reasons) = ReplayStage::select_vote_and_reset_forks(
-                &Some(vote_bank.clone()),
-                &None,
-                &ancestors,
-                &descendants,
-                &self.progress,
-                &tower,
-            );
-
             // Make sure this slot isn't locked out or failing threshold
-            info!("Checking vote: {}", vote_bank.slot());
-            if !failure_reasons.is_empty() {
-                return failure_reasons;
+            let fork_progress = progress
+                .get(&vote_slot)
+                .expect("Slot for vote must exist in progress map");
+            info!("Checking vote: {}", vote_slot);
+            info!("lockouts: {:?}", fork_progress.fork_stats.stake_lockouts);
+            let mut failures = vec![];
+            if fork_progress.fork_stats.is_locked_out {
+                failures.push(VoteFailures::LockedOut(vote_slot));
             }
-            let vote = tower.new_vote_from_bank(&vote_bank, &my_vote_pubkey).0;
+            if !fork_progress.fork_stats.vote_threshold {
+                failures.push(VoteFailures::FailedThreshold(vote_slot));
+            }
+            if !failures.is_empty() {
+                return failures;
+            }
+            let vote = tower.new_vote_from_bank(&bank, &my_vote_pubkey).0;
             if let Some(new_root) = tower.record_bank_vote(vote) {
-                ReplayStage::handle_new_root(
-                    new_root,
-                    &self.bank_forks,
-                    &mut self.progress,
-                    &None,
-                    &mut HashSet::new(),
-                    None,
-                );
+                ReplayStage::handle_new_root(new_root, bank_forks, progress, &None);
             }
 
+            // Mark the vote for this bank under this node's pubkey so it will be
+            // integrated into any future child banks
+            cluster_votes.entry(my_pubkey).or_default().push(vote_slot);
             vec![]
         }
 
-        fn can_progress_on_fork(
-            &mut self,
-            my_pubkey: &Pubkey,
-            tower: &mut Tower,
-            start_slot: u64,
-            num_slots: u64,
-            cluster_votes: &mut HashMap<Pubkey, Vec<u64>>,
-        ) -> bool {
-            // Check that within some reasonable time, validator can make a new
-            // root on this fork
-            let old_root = tower.root();
-
-            for i in 1..num_slots {
-                // The parent of the tip of the fork
-                let mut fork_tip_parent = tr(start_slot + i - 1);
-                // The tip of the fork
-                fork_tip_parent.push_front(tr(start_slot + i));
-                self.fill_bank_forks(fork_tip_parent, cluster_votes);
-                if self
-                    .simulate_vote(i + start_slot, &my_pubkey, tower)
-                    .is_empty()
-                {
-                    cluster_votes
-                        .entry(*my_pubkey)
-                        .or_default()
-                        .push(start_slot + i);
-                }
-                if old_root != tower.root() {
-                    return true;
+        // Find a node representing the given slot
+        fn find_node_and_update_simulation(&mut self, slot: u64) -> Option<&'a Node<u64>> {
+            let mut successful_search_node: Option<&'a Node<u64>> = None;
+            let mut found_node = None;
+            for search_node in self.searchable_nodes.values() {
+                if let Some((target, new_searchable_nodes)) = Self::find_node(search_node, slot) {
+                    successful_search_node = Some(search_node);
+                    found_node = Some(target);
+                    for node in new_searchable_nodes {
+                        self.searchable_nodes.insert(node.data, node);
+                    }
+                    break;
                 }
             }
-
-            false
+            successful_search_node.map(|node| {
+                self.searchable_nodes.remove(&node.data);
+            });
+            found_node
         }
 
-        fn init_state(
-            num_keypairs: usize,
-        ) -> (
-            HashMap<Pubkey, ValidatorVoteKeypairs>,
-            Vec<Pubkey>,
-            Vec<Pubkey>,
-            BankForks,
-            ProgressMap,
-        ) {
-            let keypairs: HashMap<_, _> = std::iter::repeat_with(|| {
-                let node_keypair = Keypair::new();
-                let vote_keypair = Keypair::new();
-                let stake_keypair = Keypair::new();
-                let node_pubkey = node_keypair.pubkey();
-                (
-                    node_pubkey,
-                    ValidatorVoteKeypairs::new(node_keypair, vote_keypair, stake_keypair),
-                )
-            })
-            .take(num_keypairs)
-            .collect();
-            let node_pubkeys: Vec<_> = keypairs
-                .values()
-                .map(|keys| keys.node_keypair.pubkey())
-                .collect();
-            let vote_pubkeys: Vec<_> = keypairs
-                .values()
-                .map(|keys| keys.vote_keypair.pubkey())
-                .collect();
+        fn find_node(
+            node: &'a Node<u64>,
+            slot: u64,
+        ) -> Option<(&'a Node<u64>, Vec<&'a Node<u64>>)> {
+            if node.data == slot {
+                Some((node, node.iter().collect()))
+            } else {
+                let mut search_result: Option<(&'a Node<u64>, Vec<&'a Node<u64>>)> = None;
+                for child in node.iter() {
+                    if let Some((_, ref mut new_searchable_nodes)) = search_result {
+                        new_searchable_nodes.push(child);
+                        continue;
+                    }
+                    search_result = Self::find_node(child, slot);
+                }
 
-            let (bank_forks, progress) = initialize_state(&keypairs, 10_000);
-            (keypairs, node_pubkeys, vote_pubkeys, bank_forks, progress)
+                search_result
+            }
         }
     }
 
+    #[derive(PartialEq, Debug)]
+    pub(crate) enum VoteFailures {
+        LockedOut(u64),
+        FailedThreshold(u64),
+    }
+
     // Setup BankForks with bank 0 and all the validator accounts
     pub(crate) fn initialize_state(
         validator_keypairs_map: &HashMap<Pubkey, ValidatorVoteKeypairs>,
-        stake: u64,
-    ) -> (BankForks, ProgressMap) {
+    ) -> (BankForks, HashMap<u64, ForkProgress>) {
         let validator_keypairs: Vec<_> = validator_keypairs_map.values().collect();
         let GenesisConfigInfo {
             genesis_config,
             mint_keypair,
             voting_keypair: _,
-        } = create_genesis_config_with_vote_accounts(1_000_000_000, &validator_keypairs, stake);
+        } = create_genesis_config_with_vote_accounts(1_000_000_000, &validator_keypairs);
 
         let bank0 = Bank::new(&genesis_config);
 
@@ -733,11 +695,8 @@ pub mod test {
         }
 
         bank0.freeze();
-        let mut progress = ProgressMap::default();
-        progress.insert(
-            0,
-            ForkProgress::new(bank0.last_blockhash(), None, None, 0, 0),
-        );
+        let mut progress = HashMap::new();
+        progress.insert(0, ForkProgress::new(bank0.last_blockhash()));
         (BankForks::new(0, bank0), progress)
     }
 
@@ -761,26 +720,84 @@ pub mod test {
         stakes
     }
 
+    fn can_progress_on_fork(
+        my_pubkey: &Pubkey,
+        tower: &mut Tower,
+        start_slot: u64,
+        num_slots: u64,
+        bank_forks: &RwLock<BankForks>,
+        cluster_votes: &mut HashMap<Pubkey, Vec<u64>>,
+        keypairs: &HashMap<Pubkey, ValidatorVoteKeypairs>,
+        progress: &mut HashMap<u64, ForkProgress>,
+    ) -> bool {
+        // Check that within some reasonable time, validator can make a new
+        // root on this fork
+        let old_root = tower.root();
+        let mut main_fork = tr(start_slot);
+        let mut tip = main_fork.root_mut();
+
+        for i in 1..num_slots {
+            tip.push_front(tr(start_slot + i));
+            tip = tip.first_mut().unwrap();
+        }
+        let mut voting_simulator = VoteSimulator::new(&main_fork);
+        for i in 1..num_slots {
+            voting_simulator.simulate_vote(
+                i + start_slot,
+                &bank_forks,
+                cluster_votes,
+                &keypairs,
+                keypairs.get(&my_pubkey).unwrap(),
+                progress,
+                tower,
+            );
+            if old_root != tower.root() {
+                return true;
+            }
+        }
+
+        false
+    }
+
     #[test]
     fn test_simple_votes() {
-        // Init state
-        let mut vote_simulator = VoteSimulator::new(1);
-        let node_pubkey = vote_simulator.node_pubkeys[0];
-        let mut tower = Tower::new_with_key(&node_pubkey);
+        let node_keypair = Keypair::new();
+        let vote_keypair = Keypair::new();
+        let stake_keypair = Keypair::new();
+        let node_pubkey = node_keypair.pubkey();
+
+        let mut keypairs = HashMap::new();
+        keypairs.insert(
+            node_pubkey,
+            ValidatorVoteKeypairs::new(node_keypair, vote_keypair, stake_keypair),
+        );
+
+        // Initialize BankForks
+        let (bank_forks, mut progress) = initialize_state(&keypairs);
+        let bank_forks = RwLock::new(bank_forks);
 
         // Create the tree of banks
         let forks = tr(0) / (tr(1) / (tr(2) / (tr(3) / (tr(4) / tr(5)))));
 
         // Set the voting behavior
-        let mut cluster_votes = HashMap::new();
+        let mut voting_simulator = VoteSimulator::new(&forks);
         let votes = vec![0, 1, 2, 3, 4, 5];
-        cluster_votes.insert(node_pubkey, votes.clone());
-        vote_simulator.fill_bank_forks(forks, &cluster_votes);
 
         // Simulate the votes
+        let mut tower = Tower::new_with_key(&node_pubkey);
+
+        let mut cluster_votes = HashMap::new();
         for vote in votes {
-            assert!(vote_simulator
-                .simulate_vote(vote, &node_pubkey, &mut tower,)
+            assert!(voting_simulator
+                .simulate_vote(
+                    vote,
+                    &bank_forks,
+                    &mut cluster_votes,
+                    &keypairs,
+                    keypairs.get(&node_pubkey).unwrap(),
+                    &mut progress,
+                    &mut tower,
+                )
                 .is_empty());
         }
 
@@ -792,14 +809,21 @@ pub mod test {
 
     #[test]
     fn test_double_partition() {
-        // Init state
-        let mut vote_simulator = VoteSimulator::new(2);
-        let node_pubkey = vote_simulator.node_pubkeys[0];
-        let vote_pubkey = vote_simulator.vote_pubkeys[0];
-        let mut tower = Tower::new_with_key(&node_pubkey);
+        solana_logger::setup();
+        let node_keypair = Keypair::new();
+        let vote_keypair = Keypair::new();
+        let stake_keypair = Keypair::new();
+        let node_pubkey = node_keypair.pubkey();
+        let vote_pubkey = vote_keypair.pubkey();
 
-        let num_slots_to_try = 200;
-        // Create the tree of banks
+        let mut keypairs = HashMap::new();
+        info!("my_pubkey: {}", node_pubkey);
+        keypairs.insert(
+            node_pubkey,
+            ValidatorVoteKeypairs::new(node_keypair, vote_keypair, stake_keypair),
+        );
+
+        // Create the tree of banks in a BankForks object
         let forks = tr(0)
             / (tr(1)
                 / (tr(2)
@@ -816,37 +840,56 @@ pub mod test {
                                                     / (tr(44)
                                                         // Minor fork 2
                                                         / (tr(45) / (tr(46) / (tr(47) / (tr(48) / (tr(49) / (tr(50)))))))
-                                                        / (tr(110) / (tr(110 + 2 * num_slots_to_try))))))))))))));
+                                                        / (tr(110)))))))))))));
 
-        // Set the successful voting behavior
-        let mut cluster_votes = HashMap::new();
-        let mut my_votes: Vec<Slot> = vec![];
-        let next_unlocked_slot = 110;
+        // Set the voting behavior
+        let mut voting_simulator = VoteSimulator::new(&forks);
+        let mut votes: Vec<Slot> = vec![];
         // Vote on the first minor fork
-        my_votes.extend((0..=14).into_iter());
+        votes.extend((0..=14).into_iter());
         // Come back to the main fork
-        my_votes.extend((43..=44).into_iter());
+        votes.extend((43..=44).into_iter());
         // Vote on the second minor fork
-        my_votes.extend((45..=50).into_iter());
-        // Vote to come back to main fork
-        my_votes.push(next_unlocked_slot);
-        cluster_votes.insert(node_pubkey, my_votes.clone());
-        // Make the other validator vote fork to pass the threshold checks
-        let other_votes = my_votes.clone();
-        cluster_votes.insert(vote_simulator.node_pubkeys[1], other_votes);
-        vote_simulator.fill_bank_forks(forks, &cluster_votes);
+        votes.extend((45..=50).into_iter());
 
-        // Simulate the votes.
-        for vote in &my_votes {
+        let mut cluster_votes: HashMap<Pubkey, Vec<Slot>> = HashMap::new();
+        let (bank_forks, mut progress) = initialize_state(&keypairs);
+        let bank_forks = RwLock::new(bank_forks);
+
+        // Simulate the votes. Should fail on trying to come back to the main fork
+        // at 106 exclusively due to threshold failure
+        let mut tower = Tower::new_with_key(&node_pubkey);
+        for vote in &votes {
             // All these votes should be ok
-            assert!(vote_simulator
-                .simulate_vote(*vote, &node_pubkey, &mut tower,)
+            assert!(voting_simulator
+                .simulate_vote(
+                    *vote,
+                    &bank_forks,
+                    &mut cluster_votes,
+                    &keypairs,
+                    keypairs.get(&node_pubkey).unwrap(),
+                    &mut progress,
+                    &mut tower,
+                )
                 .is_empty());
         }
 
+        // Try to come back to main fork
+        let next_unlocked_slot = 110;
+        assert!(voting_simulator
+            .simulate_vote(
+                next_unlocked_slot,
+                &bank_forks,
+                &mut cluster_votes,
+                &keypairs,
+                keypairs.get(&node_pubkey).unwrap(),
+                &mut progress,
+                &mut tower,
+            )
+            .is_empty());
+
         info!("local tower: {:#?}", tower.lockouts.votes);
-        let vote_accounts = vote_simulator
-            .bank_forks
+        let vote_accounts = bank_forks
             .read()
             .unwrap()
             .get(next_unlocked_slot)
@@ -856,17 +899,15 @@ pub mod test {
         let state = VoteState::from(&observed.1).unwrap();
         info!("observed tower: {:#?}", state.votes);
 
-        let num_slots_to_try = 200;
-        cluster_votes
-            .get_mut(&vote_simulator.node_pubkeys[1])
-            .unwrap()
-            .extend(next_unlocked_slot + 1..next_unlocked_slot + num_slots_to_try);
-        assert!(vote_simulator.can_progress_on_fork(
+        assert!(can_progress_on_fork(
             &node_pubkey,
             &mut tower,
             next_unlocked_slot,
-            num_slots_to_try,
+            200,
+            &bank_forks,
             &mut cluster_votes,
+            &keypairs,
+            &mut progress
         ));
     }
 

core/src/contact_info.rs

@@ -1,8 +1,6 @@
-use crate::crds_value::MAX_WALLCLOCK;
 use solana_sdk::pubkey::Pubkey;
 #[cfg(test)]
 use solana_sdk::rpc_port;
-use solana_sdk::sanitize::{Sanitize, SanitizeError};
 #[cfg(test)]
 use solana_sdk::signature::{Keypair, Signer};
 use solana_sdk::timing::timestamp;
@@ -39,15 +37,6 @@ pub struct ContactInfo {
     pub shred_version: u16,
 }
 
-impl Sanitize for ContactInfo {
-    fn sanitize(&self) -> std::result::Result<(), SanitizeError> {
-        if self.wallclock >= MAX_WALLCLOCK {
-            return Err(SanitizeError::ValueOutOfBounds);
-        }
-        Ok(())
-    }
-}
-
 impl Ord for ContactInfo {
     fn cmp(&self, other: &Self) -> Ordering {
         self.id.cmp(&other.id)
@@ -325,12 +314,4 @@ mod tests {
         ci.rpc = socketaddr!("127.0.0.1:234");
         assert!(ci.valid_client_facing_addr().is_some());
     }
-
-    #[test]
-    fn test_sanitize() {
-        let mut ci = ContactInfo::default();
-        assert_eq!(ci.sanitize(), Ok(()));
-        ci.wallclock = MAX_WALLCLOCK;
-        assert_eq!(ci.sanitize(), Err(SanitizeError::ValueOutOfBounds));
-    }
 }

core/src/crds_gossip_pull.rs

@@ -14,6 +14,7 @@ use crate::crds::Crds;
 use crate::crds_gossip::{get_stake, get_weight, CRDS_GOSSIP_DEFAULT_BLOOM_ITEMS};
 use crate::crds_gossip_error::CrdsGossipError;
 use crate::crds_value::{CrdsValue, CrdsValueLabel};
+use rand;
 use rand::distributions::{Distribution, WeightedIndex};
 use rand::Rng;
 use solana_runtime::bloom::Bloom;
@@ -36,13 +37,6 @@ pub struct CrdsFilter {
     mask_bits: u32,
 }
 
-impl solana_sdk::sanitize::Sanitize for CrdsFilter {
-    fn sanitize(&self) -> std::result::Result<(), solana_sdk::sanitize::SanitizeError> {
-        self.filter.sanitize()?;
-        Ok(())
-    }
-}
-
 impl CrdsFilter {
     pub fn new_rand(num_items: usize, max_bytes: usize) -> Self {
         let max_bits = (max_bytes * 8) as f64;
@@ -284,7 +278,7 @@ impl CrdsGossipPull {
         failed
     }
     // build a set of filters of the current crds table
-    // num_filters - used to increase the likelyhood of a value in crds being added to some filter
+    // num_filters - used to increase the likely hood of a value in crds being added to some filter
     pub fn build_crds_filters(&self, crds: &Crds, bloom_size: usize) -> Vec<CrdsFilter> {
         let num = cmp::max(
             CRDS_GOSSIP_DEFAULT_BLOOM_ITEMS,

core/src/crds_value.rs

@@ -1,8 +1,5 @@
 use crate::contact_info::ContactInfo;
-use crate::deprecated;
-use crate::epoch_slots::EpochSlots;
 use bincode::{serialize, serialized_size};
-use solana_sdk::sanitize::{Sanitize, SanitizeError};
 use solana_sdk::timing::timestamp;
 use solana_sdk::{
     clock::Slot,
@@ -17,14 +14,10 @@ use std::{
     fmt,
 };
 
-pub const MAX_WALLCLOCK: u64 = 1_000_000_000_000_000;
-pub const MAX_SLOT: u64 = 1_000_000_000_000_000;
-
 pub type VoteIndex = u8;
 pub const MAX_VOTES: VoteIndex = 32;
 
-pub type EpochSlotsIndex = u8;
-pub const MAX_EPOCH_SLOTS: EpochSlotsIndex = 255;
+pub type EpochSlotIndex = u8;
 
 /// CrdsValue that is replicated across the cluster
 #[derive(Serialize, Deserialize, Clone, Debug, PartialEq)]
@@ -33,13 +26,6 @@ pub struct CrdsValue {
     pub data: CrdsData,
 }
 
-impl Sanitize for CrdsValue {
-    fn sanitize(&self) -> Result<(), SanitizeError> {
-        self.signature.sanitize()?;
-        self.data.sanitize()
-    }
-}
-
 impl Signable for CrdsValue {
     fn pubkey(&self) -> Pubkey {
         self.pubkey()
@@ -58,53 +44,49 @@ impl Signable for CrdsValue {
     }
 
     fn verify(&self) -> bool {
-        self.get_signature()
-            .verify(&self.pubkey().as_ref(), self.signable_data().borrow())
+        let sig_check = self
+            .get_signature()
+            .verify(&self.pubkey().as_ref(), self.signable_data().borrow());
+        let data_check = match &self.data {
+            CrdsData::Vote(ix, _) => *ix < MAX_VOTES,
+            _ => true,
+        };
+        sig_check && data_check
     }
 }
 
 /// CrdsData that defines the different types of items CrdsValues can hold
 /// * Merge Strategy - Latest wallclock is picked
-/// * LowestSlot index is deprecated
 #[allow(clippy::large_enum_variant)]
 #[derive(Serialize, Deserialize, Clone, Debug, PartialEq)]
 pub enum CrdsData {
     ContactInfo(ContactInfo),
     Vote(VoteIndex, Vote),
-    LowestSlot(u8, LowestSlot),
+    EpochSlots(EpochSlotIndex, EpochSlots),
     SnapshotHashes(SnapshotHash),
     AccountsHashes(SnapshotHash),
-    EpochSlots(EpochSlotsIndex, EpochSlots),
 }
 
-impl Sanitize for CrdsData {
-    fn sanitize(&self) -> Result<(), SanitizeError> {
-        match self {
-            CrdsData::ContactInfo(val) => val.sanitize(),
-            CrdsData::Vote(ix, val) => {
-                if *ix >= MAX_VOTES {
-                    return Err(SanitizeError::ValueOutOfBounds);
-                }
-                val.sanitize()
-            }
-            CrdsData::LowestSlot(ix, val) => {
-                if *ix as usize >= 1 {
-                    return Err(SanitizeError::ValueOutOfBounds);
-                }
-                val.sanitize()
-            }
-            CrdsData::SnapshotHashes(val) => val.sanitize(),
-            CrdsData::AccountsHashes(val) => val.sanitize(),
-            CrdsData::EpochSlots(ix, val) => {
-                if *ix as usize >= MAX_EPOCH_SLOTS as usize {
-                    return Err(SanitizeError::ValueOutOfBounds);
-                }
-                val.sanitize()
-            }
-        }
+#[derive(Serialize, Deserialize, Clone, Debug, PartialEq)]
+pub enum CompressionType {
+    Uncompressed,
+    GZip,
+    BZip2,
+}
+
+impl Default for CompressionType {
+    fn default() -> Self {
+        Self::Uncompressed
     }
 }
 
+#[derive(Serialize, Deserialize, Clone, Debug, Default, PartialEq)]
+pub struct EpochIncompleteSlots {
+    pub first: Slot,
+    pub compression: CompressionType,
+    pub compressed_list: Vec<u8>,
+}
+
 #[derive(Serialize, Deserialize, Clone, Debug, PartialEq)]
 pub struct SnapshotHash {
     pub from: Pubkey,
@@ -112,20 +94,6 @@ pub struct SnapshotHash {
     pub wallclock: u64,
 }
 
-impl Sanitize for SnapshotHash {
-    fn sanitize(&self) -> Result<(), SanitizeError> {
-        if self.wallclock >= MAX_WALLCLOCK {
-            return Err(SanitizeError::ValueOutOfBounds);
-        }
-        for (slot, _) in &self.hashes {
-            if *slot >= MAX_SLOT {
-                return Err(SanitizeError::ValueOutOfBounds);
-            }
-        }
-        self.from.sanitize()
-    }
-}
-
 impl SnapshotHash {
     pub fn new(from: Pubkey, hashes: Vec<(Slot, Hash)>) -> Self {
         Self {
@@ -135,50 +103,37 @@ impl SnapshotHash {
         }
     }
 }
+
 #[derive(Serialize, Deserialize, Clone, Debug, PartialEq)]
-pub struct LowestSlot {
+pub struct EpochSlots {
     pub from: Pubkey,
-    root: Slot, //deprecated
+    pub root: Slot,
     pub lowest: Slot,
-    slots: BTreeSet<Slot>,                        //deprecated
-    stash: Vec<deprecated::EpochIncompleteSlots>, //deprecated
+    pub slots: BTreeSet<Slot>,
+    pub stash: Vec<EpochIncompleteSlots>,
     pub wallclock: u64,
 }
 
-impl LowestSlot {
-    pub fn new(from: Pubkey, lowest: Slot, wallclock: u64) -> Self {
+impl EpochSlots {
+    pub fn new(
+        from: Pubkey,
+        root: Slot,
+        lowest: Slot,
+        slots: BTreeSet<Slot>,
+        stash: Vec<EpochIncompleteSlots>,
+        wallclock: u64,
+    ) -> Self {
         Self {
             from,
-            root: 0,
+            root,
             lowest,
-            slots: BTreeSet::new(),
-            stash: vec![],
+            slots,
+            stash,
             wallclock,
         }
     }
 }
 
-impl Sanitize for LowestSlot {
-    fn sanitize(&self) -> Result<(), SanitizeError> {
-        if self.wallclock >= MAX_WALLCLOCK {
-            return Err(SanitizeError::ValueOutOfBounds);
-        }
-        if self.lowest >= MAX_SLOT {
-            return Err(SanitizeError::ValueOutOfBounds);
-        }
-        if self.root != 0 {
-            return Err(SanitizeError::InvalidValue);
-        }
-        if !self.slots.is_empty() {
-            return Err(SanitizeError::InvalidValue);
-        }
-        if !self.stash.is_empty() {
-            return Err(SanitizeError::InvalidValue);
-        }
-        self.from.sanitize()
-    }
-}
-
 #[derive(Serialize, Deserialize, Clone, Debug, PartialEq)]
 pub struct Vote {
     pub from: Pubkey,
@@ -186,16 +141,6 @@ pub struct Vote {
     pub wallclock: u64,
 }
 
-impl Sanitize for Vote {
-    fn sanitize(&self) -> Result<(), SanitizeError> {
-        if self.wallclock >= MAX_WALLCLOCK {
-            return Err(SanitizeError::ValueOutOfBounds);
-        }
-        self.from.sanitize()?;
-        self.transaction.sanitize()
-    }
-}
-
 impl Vote {
     pub fn new(from: &Pubkey, transaction: Transaction, wallclock: u64) -> Self {
         Self {
@@ -212,9 +157,8 @@ impl Vote {
 pub enum CrdsValueLabel {
     ContactInfo(Pubkey),
     Vote(VoteIndex, Pubkey),
-    LowestSlot(Pubkey),
+    EpochSlots(Pubkey),
     SnapshotHashes(Pubkey),
-    EpochSlots(EpochSlotsIndex, Pubkey),
     AccountsHashes(Pubkey),
 }
 
@@ -223,9 +167,8 @@ impl fmt::Display for CrdsValueLabel {
         match self {
             CrdsValueLabel::ContactInfo(_) => write!(f, "ContactInfo({})", self.pubkey()),
             CrdsValueLabel::Vote(ix, _) => write!(f, "Vote({}, {})", ix, self.pubkey()),
-            CrdsValueLabel::LowestSlot(_) => write!(f, "LowestSlot({})", self.pubkey()),
-            CrdsValueLabel::SnapshotHashes(_) => write!(f, "SnapshotHash({})", self.pubkey()),
-            CrdsValueLabel::EpochSlots(ix, _) => write!(f, "EpochSlots({}, {})", ix, self.pubkey()),
+            CrdsValueLabel::EpochSlots(_) => write!(f, "EpochSlots({})", self.pubkey()),
+            CrdsValueLabel::SnapshotHashes(_) => write!(f, "SnapshotHashes({})", self.pubkey()),
             CrdsValueLabel::AccountsHashes(_) => write!(f, "AccountsHashes({})", self.pubkey()),
         }
     }
@@ -236,9 +179,8 @@ impl CrdsValueLabel {
         match self {
             CrdsValueLabel::ContactInfo(p) => *p,
             CrdsValueLabel::Vote(_, p) => *p,
-            CrdsValueLabel::LowestSlot(p) => *p,
+            CrdsValueLabel::EpochSlots(p) => *p,
             CrdsValueLabel::SnapshotHashes(p) => *p,
-            CrdsValueLabel::EpochSlots(_, p) => *p,
             CrdsValueLabel::AccountsHashes(p) => *p,
         }
     }
@@ -264,30 +206,27 @@ impl CrdsValue {
         match &self.data {
             CrdsData::ContactInfo(contact_info) => contact_info.wallclock,
             CrdsData::Vote(_, vote) => vote.wallclock,
-            CrdsData::LowestSlot(_, obj) => obj.wallclock,
+            CrdsData::EpochSlots(_, vote) => vote.wallclock,
             CrdsData::SnapshotHashes(hash) => hash.wallclock,
             CrdsData::AccountsHashes(hash) => hash.wallclock,
-            CrdsData::EpochSlots(_, p) => p.wallclock,
         }
     }
     pub fn pubkey(&self) -> Pubkey {
         match &self.data {
             CrdsData::ContactInfo(contact_info) => contact_info.id,
             CrdsData::Vote(_, vote) => vote.from,
-            CrdsData::LowestSlot(_, slots) => slots.from,
+            CrdsData::EpochSlots(_, slots) => slots.from,
             CrdsData::SnapshotHashes(hash) => hash.from,
             CrdsData::AccountsHashes(hash) => hash.from,
-            CrdsData::EpochSlots(_, p) => p.from,
         }
     }
     pub fn label(&self) -> CrdsValueLabel {
         match &self.data {
             CrdsData::ContactInfo(_) => CrdsValueLabel::ContactInfo(self.pubkey()),
             CrdsData::Vote(ix, _) => CrdsValueLabel::Vote(*ix, self.pubkey()),
-            CrdsData::LowestSlot(_, _) => CrdsValueLabel::LowestSlot(self.pubkey()),
+            CrdsData::EpochSlots(_, _) => CrdsValueLabel::EpochSlots(self.pubkey()),
             CrdsData::SnapshotHashes(_) => CrdsValueLabel::SnapshotHashes(self.pubkey()),
             CrdsData::AccountsHashes(_) => CrdsValueLabel::AccountsHashes(self.pubkey()),
-            CrdsData::EpochSlots(ix, _) => CrdsValueLabel::EpochSlots(*ix, self.pubkey()),
         }
     }
     pub fn contact_info(&self) -> Option<&ContactInfo> {
@@ -310,9 +249,9 @@ impl CrdsValue {
         }
     }
 
-    pub fn lowest_slot(&self) -> Option<&LowestSlot> {
+    pub fn epoch_slots(&self) -> Option<&EpochSlots> {
         match &self.data {
-            CrdsData::LowestSlot(_, slots) => Some(slots),
+            CrdsData::EpochSlots(_, slots) => Some(slots),
             _ => None,
         }
     }
@@ -331,23 +270,15 @@ impl CrdsValue {
         }
     }
 
-    pub fn epoch_slots(&self) -> Option<&EpochSlots> {
-        match &self.data {
-            CrdsData::EpochSlots(_, slots) => Some(slots),
-            _ => None,
-        }
-    }
-
     /// Return all the possible labels for a record identified by Pubkey.
     pub fn record_labels(key: &Pubkey) -> Vec<CrdsValueLabel> {
         let mut labels = vec![
             CrdsValueLabel::ContactInfo(*key),
-            CrdsValueLabel::LowestSlot(*key),
+            CrdsValueLabel::EpochSlots(*key),
             CrdsValueLabel::SnapshotHashes(*key),
             CrdsValueLabel::AccountsHashes(*key),
         ];
         labels.extend((0..MAX_VOTES).map(|ix| CrdsValueLabel::Vote(ix, *key)));
-        labels.extend((0..MAX_EPOCH_SLOTS).map(|ix| CrdsValueLabel::EpochSlots(ix, *key)));
         labels
     }
 
@@ -395,18 +326,15 @@ mod test {
 
     #[test]
     fn test_labels() {
-        let mut hits = [false; 4 + MAX_VOTES as usize + MAX_EPOCH_SLOTS as usize];
+        let mut hits = [false; 4 + MAX_VOTES as usize];
         // this method should cover all the possible labels
         for v in &CrdsValue::record_labels(&Pubkey::default()) {
             match v {
                 CrdsValueLabel::ContactInfo(_) => hits[0] = true,
-                CrdsValueLabel::LowestSlot(_) => hits[1] = true,
+                CrdsValueLabel::EpochSlots(_) => hits[1] = true,
                 CrdsValueLabel::SnapshotHashes(_) => hits[2] = true,
                 CrdsValueLabel::AccountsHashes(_) => hits[3] = true,
                 CrdsValueLabel::Vote(ix, _) => hits[*ix as usize + 4] = true,
-                CrdsValueLabel::EpochSlots(ix, _) => {
-                    hits[*ix as usize + MAX_VOTES as usize + 4] = true
-                }
             }
         }
         assert!(hits.iter().all(|x| *x));
@@ -426,39 +354,13 @@ mod test {
         let key = v.clone().vote().unwrap().from;
         assert_eq!(v.label(), CrdsValueLabel::Vote(0, key));
 
-        let v = CrdsValue::new_unsigned(CrdsData::LowestSlot(
+        let v = CrdsValue::new_unsigned(CrdsData::EpochSlots(
             0,
-            LowestSlot::new(Pubkey::default(), 0, 0),
+            EpochSlots::new(Pubkey::default(), 0, 0, BTreeSet::new(), vec![], 0),
         ));
         assert_eq!(v.wallclock(), 0);
-        let key = v.clone().lowest_slot().unwrap().from;
-        assert_eq!(v.label(), CrdsValueLabel::LowestSlot(key));
-    }
-
-    #[test]
-    fn test_lowest_slot_sanitize() {
-        let ls = LowestSlot::new(Pubkey::default(), 0, 0);
-        let v = CrdsValue::new_unsigned(CrdsData::LowestSlot(0, ls.clone()));
-        assert_eq!(v.sanitize(), Ok(()));
-
-        let mut o = ls.clone();
-        o.root = 1;
-        let v = CrdsValue::new_unsigned(CrdsData::LowestSlot(0, o.clone()));
-        assert_eq!(v.sanitize(), Err(SanitizeError::InvalidValue));
-
-        let o = ls.clone();
-        let v = CrdsValue::new_unsigned(CrdsData::LowestSlot(1, o.clone()));
-        assert_eq!(v.sanitize(), Err(SanitizeError::ValueOutOfBounds));
-
-        let mut o = ls.clone();
-        o.slots.insert(1);
-        let v = CrdsValue::new_unsigned(CrdsData::LowestSlot(0, o.clone()));
-        assert_eq!(v.sanitize(), Err(SanitizeError::InvalidValue));
-
-        let mut o = ls.clone();
-        o.stash.push(deprecated::EpochIncompleteSlots::default());
-        let v = CrdsValue::new_unsigned(CrdsData::LowestSlot(0, o.clone()));
-        assert_eq!(v.sanitize(), Err(SanitizeError::InvalidValue));
+        let key = v.clone().epoch_slots().unwrap().from;
+        assert_eq!(v.label(), CrdsValueLabel::EpochSlots(key));
     }
 
     #[test]
@@ -475,9 +377,10 @@ mod test {
             Vote::new(&keypair.pubkey(), test_tx(), timestamp()),
         ));
         verify_signatures(&mut v, &keypair, &wrong_keypair);
-        v = CrdsValue::new_unsigned(CrdsData::LowestSlot(
+        let btreeset: BTreeSet<Slot> = vec![1, 2, 3, 6, 8].into_iter().collect();
+        v = CrdsValue::new_unsigned(CrdsData::EpochSlots(
             0,
-            LowestSlot::new(keypair.pubkey(), 0, timestamp()),
+            EpochSlots::new(keypair.pubkey(), 0, 0, btreeset, vec![], timestamp()),
         ));
         verify_signatures(&mut v, &keypair, &wrong_keypair);
     }
@@ -492,21 +395,9 @@ mod test {
             ),
             &keypair,
         );
-        assert!(vote.sanitize().is_err());
+        assert!(!vote.verify());
     }
 
-    #[test]
-    fn test_max_epoch_slots_index() {
-        let keypair = Keypair::new();
-        let item = CrdsValue::new_signed(
-            CrdsData::EpochSlots(
-                MAX_EPOCH_SLOTS,
-                EpochSlots::new(keypair.pubkey(), timestamp()),
-            ),
-            &keypair,
-        );
-        assert_eq!(item.sanitize(), Err(SanitizeError::ValueOutOfBounds));
-    }
     #[test]
     fn test_compute_vote_index_empty() {
         for i in 0..MAX_VOTES {

core/src/deprecated.rs

@@ -1,21 +0,0 @@
-use solana_sdk::clock::Slot;
-
-#[derive(Serialize, Deserialize, Clone, Debug, PartialEq)]
-enum CompressionType {
-    Uncompressed,
-    GZip,
-    BZip2,
-}
-
-impl Default for CompressionType {
-    fn default() -> Self {
-        Self::Uncompressed
-    }
-}
-
-#[derive(Serialize, Deserialize, Clone, Debug, Default, PartialEq)]
-pub(crate) struct EpochIncompleteSlots {
-    first: Slot,
-    compression: CompressionType,
-    compressed_list: Vec<u8>,
-}

core/src/epoch_slots.rs

@@ -1,517 +0,0 @@
-use crate::cluster_info::MAX_CRDS_OBJECT_SIZE;
-use crate::crds_value::MAX_SLOT;
-use crate::crds_value::MAX_WALLCLOCK;
-use bincode::serialized_size;
-use bv::BitVec;
-use flate2::{Compress, Compression, Decompress, FlushCompress, FlushDecompress};
-use solana_sdk::clock::Slot;
-use solana_sdk::pubkey::Pubkey;
-use solana_sdk::sanitize::{Sanitize, SanitizeError};
-
-const MAX_SLOTS_PER_ENTRY: usize = 2048 * 8;
-#[derive(Serialize, Deserialize, Clone, Debug, PartialEq)]
-pub struct Uncompressed {
-    pub first_slot: Slot,
-    pub num: usize,
-    pub slots: BitVec<u8>,
-}
-
-impl Sanitize for Uncompressed {
-    fn sanitize(&self) -> std::result::Result<(), SanitizeError> {
-        if self.first_slot >= MAX_SLOT {
-            return Err(SanitizeError::ValueOutOfBounds);
-        }
-        if self.num >= MAX_SLOTS_PER_ENTRY {
-            return Err(SanitizeError::ValueOutOfBounds);
-        }
-        Ok(())
-    }
-}
-
-#[derive(Deserialize, Serialize, Clone, Debug, PartialEq)]
-pub struct Flate2 {
-    pub first_slot: Slot,
-    pub num: usize,
-    pub compressed: Vec<u8>,
-}
-
-impl Sanitize for Flate2 {
-    fn sanitize(&self) -> std::result::Result<(), SanitizeError> {
-        if self.first_slot >= MAX_SLOT {
-            return Err(SanitizeError::ValueOutOfBounds);
-        }
-        if self.num >= MAX_SLOTS_PER_ENTRY {
-            return Err(SanitizeError::ValueOutOfBounds);
-        }
-        Ok(())
-    }
-}
-
-#[derive(Debug, PartialEq)]
-pub enum Error {
-    CompressError,
-    DecompressError,
-}
-
-pub type Result<T> = std::result::Result<T, Error>;
-
-impl std::convert::From<flate2::CompressError> for Error {
-    fn from(_e: flate2::CompressError) -> Error {
-        Error::CompressError
-    }
-}
-impl std::convert::From<flate2::DecompressError> for Error {
-    fn from(_e: flate2::DecompressError) -> Error {
-        Error::DecompressError
-    }
-}
-
-impl Flate2 {
-    fn deflate(mut unc: Uncompressed) -> Result<Self> {
-        let mut compressed = Vec::with_capacity(unc.slots.block_capacity());
-        let mut compressor = Compress::new(Compression::best(), false);
-        let first_slot = unc.first_slot;
-        let num = unc.num;
-        unc.slots.shrink_to_fit();
-        let bits = unc.slots.into_boxed_slice();
-        compressor.compress_vec(&bits, &mut compressed, FlushCompress::Finish)?;
-        let rv = Self {
-            first_slot,
-            num,
-            compressed,
-        };
-        let _ = rv.inflate()?;
-        Ok(rv)
-    }
-    pub fn inflate(&self) -> Result<Uncompressed> {
-        //add some head room for the decompressor which might spill more bits
-        let mut uncompressed = Vec::with_capacity(32 + (self.num + 4) / 8);
-        let mut decompress = Decompress::new(false);
-        decompress.decompress_vec(&self.compressed, &mut uncompressed, FlushDecompress::Finish)?;
-        Ok(Uncompressed {
-            first_slot: self.first_slot,
-            num: self.num,
-            slots: BitVec::from_bits(&uncompressed),
-        })
-    }
-}
-
-impl Uncompressed {
-    pub fn new(max_size: usize) -> Self {
-        Self {
-            num: 0,
-            first_slot: 0,
-            slots: BitVec::new_fill(false, 8 * max_size as u64),
-        }
-    }
-    pub fn to_slots(&self, min_slot: Slot) -> Vec<Slot> {
-        let mut rv = vec![];
-        let start = if min_slot < self.first_slot {
-            0 as usize
-        } else {
-            (min_slot - self.first_slot) as usize
-        };
-        for i in start..self.num {
-            if i >= self.slots.len() as usize {
-                break;
-            }
-            if self.slots.get(i as u64) {
-                rv.push(self.first_slot + i as Slot);
-            }
-        }
-        rv
-    }
-    pub fn add(&mut self, slots: &[Slot]) -> usize {
-        for (i, s) in slots.iter().enumerate() {
-            if self.num == 0 {
-                self.first_slot = *s;
-            }
-            if self.num >= MAX_SLOTS_PER_ENTRY {
-                return i;
-            }
-            if *s < self.first_slot {
-                return i;
-            }
-            if *s - self.first_slot >= self.slots.capacity() {
-                return i;
-            }
-            self.slots.set(*s - self.first_slot, true);
-            self.num = std::cmp::max(self.num, 1 + (*s - self.first_slot) as usize);
-        }
-        slots.len()
-    }
-}
-
-#[derive(Serialize, Deserialize, Clone, Debug, PartialEq)]
-pub enum CompressedSlots {
-    Flate2(Flate2),
-    Uncompressed(Uncompressed),
-}
-
-impl Sanitize for CompressedSlots {
-    fn sanitize(&self) -> std::result::Result<(), SanitizeError> {
-        match self {
-            CompressedSlots::Uncompressed(a) => a.sanitize(),
-            CompressedSlots::Flate2(b) => b.sanitize(),
-        }
-    }
-}
-
-impl Default for CompressedSlots {
-    fn default() -> Self {
-        CompressedSlots::new(0)
-    }
-}
-
-impl CompressedSlots {
-    fn new(max_size: usize) -> Self {
-        CompressedSlots::Uncompressed(Uncompressed::new(max_size))
-    }
-
-    pub fn first_slot(&self) -> Slot {
-        match self {
-            CompressedSlots::Uncompressed(a) => a.first_slot,
-            CompressedSlots::Flate2(b) => b.first_slot,
-        }
-    }
-
-    pub fn num_slots(&self) -> usize {
-        match self {
-            CompressedSlots::Uncompressed(a) => a.num,
-            CompressedSlots::Flate2(b) => b.num,
-        }
-    }
-
-    pub fn add(&mut self, slots: &[Slot]) -> usize {
-        match self {
-            CompressedSlots::Uncompressed(vals) => vals.add(slots),
-            CompressedSlots::Flate2(_) => 0,
-        }
-    }
-    pub fn to_slots(&self, min_slot: Slot) -> Result<Vec<Slot>> {
-        match self {
-            CompressedSlots::Uncompressed(vals) => Ok(vals.to_slots(min_slot)),
-            CompressedSlots::Flate2(vals) => {
-                let unc = vals.inflate()?;
-                Ok(unc.to_slots(min_slot))
-            }
-        }
-    }
-    pub fn deflate(&mut self) -> Result<()> {
-        match self {
-            CompressedSlots::Uncompressed(vals) => {
-                let unc = vals.clone();
-                let compressed = Flate2::deflate(unc)?;
-                let mut new = CompressedSlots::Flate2(compressed);
-                std::mem::swap(self, &mut new);
-                Ok(())
-            }
-            CompressedSlots::Flate2(_) => Ok(()),
-        }
-    }
-}
-
-#[derive(Serialize, Deserialize, Clone, Default, PartialEq)]
-pub struct EpochSlots {
-    pub from: Pubkey,
-    pub slots: Vec<CompressedSlots>,
-    pub wallclock: u64,
-}
-
-impl Sanitize for EpochSlots {
-    fn sanitize(&self) -> std::result::Result<(), SanitizeError> {
-        if self.wallclock >= MAX_WALLCLOCK {
-            return Err(SanitizeError::ValueOutOfBounds);
-        }
-        self.from.sanitize()?;
-        self.slots.sanitize()
-    }
-}
-
-use std::fmt;
-impl fmt::Debug for EpochSlots {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        let num_slots: usize = self.slots.iter().map(|s| s.num_slots()).sum();
-        let lowest_slot = self
-            .slots
-            .iter()
-            .map(|s| s.first_slot())
-            .fold(0, std::cmp::min);
-        write!(
-            f,
-            "EpochSlots {{ from: {} num_slots: {} lowest_slot: {} wallclock: {} }}",
-            self.from, num_slots, lowest_slot, self.wallclock
-        )
-    }
-}
-
-impl EpochSlots {
-    pub fn new(from: Pubkey, now: u64) -> Self {
-        Self {
-            from,
-            wallclock: now,
-            slots: vec![],
-        }
-    }
-    pub fn fill(&mut self, slots: &[Slot], now: u64) -> usize {
-        let mut num = 0;
-        self.wallclock = std::cmp::max(now, self.wallclock + 1);
-        while num < slots.len() {
-            num += self.add(&slots[num..]);
-            if num < slots.len() {
-                if self.deflate().is_err() {
-                    return num;
-                }
-                let space = self.max_compressed_slot_size();
-                if space > 0 {
-                    let cslot = CompressedSlots::new(space as usize);
-                    self.slots.push(cslot);
-                } else {
-                    return num;
-                }
-            }
-        }
-        num
-    }
-    pub fn add(&mut self, slots: &[Slot]) -> usize {
-        let mut num = 0;
-        for s in &mut self.slots {
-            num += s.add(&slots[num..]);
-            if num >= slots.len() {
-                break;
-            }
-        }
-        num
-    }
-    pub fn deflate(&mut self) -> Result<()> {
-        for s in self.slots.iter_mut() {
-            s.deflate()?;
-        }
-        Ok(())
-    }
-    pub fn max_compressed_slot_size(&self) -> isize {
-        let len_header = serialized_size(self).unwrap();
-        let len_slot = serialized_size(&CompressedSlots::default()).unwrap();
-        MAX_CRDS_OBJECT_SIZE as isize - (len_header + len_slot) as isize
-    }
-
-    pub fn first_slot(&self) -> Option<Slot> {
-        self.slots.iter().map(|s| s.first_slot()).min()
-    }
-
-    pub fn to_slots(&self, min_slot: Slot) -> Vec<Slot> {
-        self.slots
-            .iter()
-            .filter(|s| min_slot < s.first_slot() + s.num_slots() as u64)
-            .filter_map(|s| s.to_slots(min_slot).ok())
-            .flatten()
-            .collect()
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    #[test]
-    fn test_epoch_slots_max_size() {
-        let epoch_slots = EpochSlots::default();
-        assert!(epoch_slots.max_compressed_slot_size() > 0);
-    }
-
-    #[test]
-    fn test_epoch_slots_uncompressed_add_1() {
-        let mut slots = Uncompressed::new(1);
-        assert_eq!(slots.slots.capacity(), 8);
-        assert_eq!(slots.add(&[1]), 1);
-        assert_eq!(slots.to_slots(1), vec![1]);
-        assert!(slots.to_slots(2).is_empty());
-    }
-
-    #[test]
-    fn test_epoch_slots_to_slots_overflow() {
-        let mut slots = Uncompressed::new(1);
-        slots.num = 100;
-        assert!(slots.to_slots(0).is_empty());
-    }
-
-    #[test]
-    fn test_epoch_slots_uncompressed_add_2() {
-        let mut slots = Uncompressed::new(1);
-        assert_eq!(slots.add(&[1, 2]), 2);
-        assert_eq!(slots.to_slots(1), vec![1, 2]);
-    }
-    #[test]
-    fn test_epoch_slots_uncompressed_add_3a() {
-        let mut slots = Uncompressed::new(1);
-        assert_eq!(slots.add(&[1, 3, 2]), 3);
-        assert_eq!(slots.to_slots(1), vec![1, 2, 3]);
-    }
-
-    #[test]
-    fn test_epoch_slots_uncompressed_add_3b() {
-        let mut slots = Uncompressed::new(1);
-        assert_eq!(slots.add(&[1, 10, 2]), 1);
-        assert_eq!(slots.to_slots(1), vec![1]);
-    }
-
-    #[test]
-    fn test_epoch_slots_uncompressed_add_3c() {
-        let mut slots = Uncompressed::new(2);
-        assert_eq!(slots.add(&[1, 10, 2]), 3);
-        assert_eq!(slots.to_slots(1), vec![1, 2, 10]);
-        assert_eq!(slots.to_slots(2), vec![2, 10]);
-        assert_eq!(slots.to_slots(3), vec![10]);
-        assert_eq!(slots.to_slots(11).is_empty(), true);
-    }
-    #[test]
-    fn test_epoch_slots_compressed() {
-        let mut slots = Uncompressed::new(100);
-        slots.add(&[1, 701, 2]);
-        assert_eq!(slots.num, 701);
-        let compressed = Flate2::deflate(slots).unwrap();
-        assert_eq!(compressed.first_slot, 1);
-        assert_eq!(compressed.num, 701);
-        assert!(compressed.compressed.len() < 32);
-        let slots = compressed.inflate().unwrap();
-        assert_eq!(slots.first_slot, 1);
-        assert_eq!(slots.num, 701);
-        assert_eq!(slots.to_slots(1), vec![1, 2, 701]);
-    }
-
-    #[test]
-    fn test_epoch_slots_sanitize() {
-        let mut slots = Uncompressed::new(100);
-        slots.add(&[1, 701, 2]);
-        assert_eq!(slots.num, 701);
-        assert!(slots.sanitize().is_ok());
-
-        let mut o = slots.clone();
-        o.first_slot = MAX_SLOT;
-        assert_eq!(o.sanitize(), Err(SanitizeError::ValueOutOfBounds));
-
-        let mut o = slots.clone();
-        o.num = MAX_SLOTS_PER_ENTRY;
-        assert_eq!(o.sanitize(), Err(SanitizeError::ValueOutOfBounds));
-
-        let compressed = Flate2::deflate(slots).unwrap();
-        assert!(compressed.sanitize().is_ok());
-
-        let mut o = compressed.clone();
-        o.first_slot = MAX_SLOT;
-        assert_eq!(o.sanitize(), Err(SanitizeError::ValueOutOfBounds));
-
-        let mut o = compressed.clone();
-        o.num = MAX_SLOTS_PER_ENTRY;
-        assert_eq!(o.sanitize(), Err(SanitizeError::ValueOutOfBounds));
-
-        let mut slots = EpochSlots::default();
-        let range: Vec<Slot> = (0..5000).into_iter().collect();
-        assert_eq!(slots.fill(&range, 1), 5000);
-        assert_eq!(slots.wallclock, 1);
-        assert!(slots.sanitize().is_ok());
-
-        let mut o = slots.clone();
-        o.wallclock = MAX_WALLCLOCK;
-        assert_eq!(o.sanitize(), Err(SanitizeError::ValueOutOfBounds));
-    }
-
-    #[test]
-    fn test_epoch_slots_fill_range() {
-        let range: Vec<Slot> = (0..5000).into_iter().collect();
-        let mut slots = EpochSlots::default();
-        assert_eq!(slots.fill(&range, 1), 5000);
-        assert_eq!(slots.wallclock, 1);
-        assert_eq!(slots.to_slots(0), range);
-        assert_eq!(slots.to_slots(4999), vec![4999]);
-        assert_eq!(slots.to_slots(5000).is_empty(), true);
-    }
-    #[test]
-    fn test_epoch_slots_fill_sparce_range() {
-        let range: Vec<Slot> = (0..5000).into_iter().map(|x| x * 3).collect();
-        let mut slots = EpochSlots::default();
-        assert_eq!(slots.fill(&range, 2), 5000);
-        assert_eq!(slots.wallclock, 2);
-        assert_eq!(slots.slots.len(), 3);
-        assert_eq!(slots.slots[0].first_slot(), 0);
-        assert_ne!(slots.slots[0].num_slots(), 0);
-        let next = slots.slots[0].num_slots() as u64 + slots.slots[0].first_slot();
-        assert!(slots.slots[1].first_slot() >= next);
-        assert_ne!(slots.slots[1].num_slots(), 0);
-        assert_ne!(slots.slots[2].num_slots(), 0);
-        assert_eq!(slots.to_slots(0), range);
-        assert_eq!(slots.to_slots(4999 * 3), vec![4999 * 3]);
-    }
-
-    #[test]
-    fn test_epoch_slots_fill_large_sparce_range() {
-        let range: Vec<Slot> = (0..5000).into_iter().map(|x| x * 7).collect();
-        let mut slots = EpochSlots::default();
-        assert_eq!(slots.fill(&range, 2), 5000);
-        assert_eq!(slots.to_slots(0), range);
-    }
-
-    #[test]
-    fn test_epoch_slots_fill_uncompressed_random_range() {
-        use rand::Rng;
-        for _ in 0..10 {
-            let mut range: Vec<Slot> = vec![];
-            for _ in 0..5000 {
-                let last = *range.last().unwrap_or(&0);
-                range.push(last + rand::thread_rng().gen_range(1, 5));
-            }
-            let sz = EpochSlots::default().max_compressed_slot_size();
-            let mut slots = Uncompressed::new(sz as usize);
-            let sz = slots.add(&range);
-            let slots = slots.to_slots(0);
-            assert_eq!(slots.len(), sz);
-            assert_eq!(slots[..], range[..sz]);
-        }
-    }
-
-    #[test]
-    fn test_epoch_slots_fill_compressed_random_range() {
-        use rand::Rng;
-        for _ in 0..10 {
-            let mut range: Vec<Slot> = vec![];
-            for _ in 0..5000 {
-                let last = *range.last().unwrap_or(&0);
-                range.push(last + rand::thread_rng().gen_range(1, 5));
-            }
-            let sz = EpochSlots::default().max_compressed_slot_size();
-            let mut slots = Uncompressed::new(sz as usize);
-            let sz = slots.add(&range);
-            let mut slots = CompressedSlots::Uncompressed(slots);
-            slots.deflate().unwrap();
-            let slots = slots.to_slots(0).unwrap();
-            assert_eq!(slots.len(), sz);
-            assert_eq!(slots[..], range[..sz]);
-        }
-    }
-
-    #[test]
-    fn test_epoch_slots_fill_random_range() {
-        use rand::Rng;
-        for _ in 0..10 {
-            let mut range: Vec<Slot> = vec![];
-            for _ in 0..5000 {
-                let last = *range.last().unwrap_or(&0);
-                range.push(last + rand::thread_rng().gen_range(1, 5));
-            }
-            let mut slots = EpochSlots::default();
-            let sz = slots.fill(&range, 1);
-            let last = range[sz - 1];
-            assert_eq!(
-                last,
-                slots.slots.last().unwrap().first_slot()
-                    + slots.slots.last().unwrap().num_slots() as u64
-                    - 1
-            );
-            for s in &slots.slots {
-                assert!(s.to_slots(0).is_ok());
-            }
-            let slots = slots.to_slots(0);
-            assert_eq!(slots[..], range[..slots.len()]);
-            assert_eq!(sz, slots.len())
-        }
-    }
-}

core/src/fetch_stage.rs

@@ -1,14 +1,14 @@
 //! The `fetch_stage` batches input from a UDP socket and sends it to a channel.
 
 use crate::banking_stage::FORWARD_TRANSACTIONS_TO_LEADER_AT_SLOT_OFFSET;
+use crate::packet::PacketsRecycler;
 use crate::poh_recorder::PohRecorder;
 use crate::result::{Error, Result};
+use crate::streamer::{self, PacketReceiver, PacketSender};
 use solana_measure::thread_mem_usage;
 use solana_metrics::{inc_new_counter_debug, inc_new_counter_info};
-use solana_perf::packet::PacketsRecycler;
 use solana_perf::recycler::Recycler;
 use solana_sdk::clock::DEFAULT_TICKS_PER_SLOT;
-use solana_streamer::streamer::{self, PacketReceiver, PacketSender};
 use std::net::UdpSocket;
 use std::sync::atomic::AtomicBool;
 use std::sync::mpsc::{channel, RecvTimeoutError};

core/src/genesis_utils.rs

@@ -0,0 +1 @@
+pub use solana_ledger::genesis_utils::*;

core/src/gossip_service.rs

@@ -2,13 +2,13 @@
 
 use crate::cluster_info::{ClusterInfo, VALIDATOR_PORT_RANGE};
 use crate::contact_info::ContactInfo;
+use crate::streamer;
 use rand::{thread_rng, Rng};
 use solana_client::thin_client::{create_client, ThinClient};
 use solana_ledger::bank_forks::BankForks;
 use solana_perf::recycler::Recycler;
 use solana_sdk::pubkey::Pubkey;
 use solana_sdk::signature::{Keypair, Signer};
-use solana_streamer::streamer;
 use std::net::{IpAddr, Ipv4Addr, SocketAddr, TcpListener, UdpSocket};
 use std::sync::atomic::{AtomicBool, Ordering};
 use std::sync::mpsc::channel;
@@ -22,7 +22,7 @@ pub struct GossipService {
 
 impl GossipService {
     pub fn new(
-        cluster_info: &Arc<ClusterInfo>,
+        cluster_info: &Arc<RwLock<ClusterInfo>>,
         bank_forks: Option<Arc<RwLock<BankForks>>>,
         gossip_socket: UdpSocket,
         exit: &Arc<AtomicBool>,
@@ -31,7 +31,7 @@ impl GossipService {
         let gossip_socket = Arc::new(gossip_socket);
         trace!(
             "GossipService: id: {}, listening on: {:?}",
-            &cluster_info.id(),
+            &cluster_info.read().unwrap().my_data().id,
             gossip_socket.local_addr().unwrap()
         );
         let t_receiver = streamer::receiver(
@@ -89,7 +89,7 @@ pub fn discover(
     let exit = Arc::new(AtomicBool::new(false));
     let (gossip_service, ip_echo, spy_ref) = make_gossip_node(entrypoint, &exit, my_gossip_addr);
 
-    let id = spy_ref.id();
+    let id = spy_ref.read().unwrap().keypair.pubkey();
     info!("Entrypoint: {:?}", entrypoint);
     info!("Node Id: {:?}", id);
     if let Some(my_gossip_addr) = my_gossip_addr {
@@ -113,7 +113,7 @@ pub fn discover(
         info!(
             "discover success in {}s...\n{}",
             secs,
-            spy_ref.contact_info_trace()
+            spy_ref.read().unwrap().contact_info_trace()
         );
         return Ok((tvu_peers, storage_peers));
     }
@@ -121,12 +121,15 @@ pub fn discover(
     if !tvu_peers.is_empty() {
         info!(
             "discover failed to match criteria by timeout...\n{}",
-            spy_ref.contact_info_trace()
+            spy_ref.read().unwrap().contact_info_trace()
         );
         return Ok((tvu_peers, storage_peers));
     }
 
-    info!("discover failed...\n{}", spy_ref.contact_info_trace());
+    info!(
+        "discover failed...\n{}",
+        spy_ref.read().unwrap().contact_info_trace()
+    );
     Err(std::io::Error::new(
         std::io::ErrorKind::Other,
         "Discover failed",
@@ -173,7 +176,7 @@ pub fn get_multi_client(nodes: &[ContactInfo]) -> (ThinClient, usize) {
 }
 
 fn spy(
-    spy_ref: Arc<ClusterInfo>,
+    spy_ref: Arc<RwLock<ClusterInfo>>,
     num_nodes: Option<usize>,
     timeout: Option<u64>,
     find_node_by_pubkey: Option<Pubkey>,
@@ -191,8 +194,13 @@ fn spy(
             }
         }
 
-        tvu_peers = spy_ref.all_tvu_peers().into_iter().collect::<Vec<_>>();
-        storage_peers = spy_ref.all_storage_peers();
+        tvu_peers = spy_ref
+            .read()
+            .unwrap()
+            .all_tvu_peers()
+            .into_iter()
+            .collect::<Vec<_>>();
+        storage_peers = spy_ref.read().unwrap().all_storage_peers();
 
         let mut nodes: Vec<_> = tvu_peers.iter().chain(storage_peers.iter()).collect();
         nodes.sort();
@@ -224,7 +232,10 @@ fn spy(
             met_criteria = true;
         }
         if i % 20 == 0 {
-            info!("discovering...\n{}", spy_ref.contact_info_trace());
+            info!(
+                "discovering...\n{}",
+                spy_ref.read().unwrap().contact_info_trace()
+            );
         }
         sleep(Duration::from_millis(
             crate::cluster_info::GOSSIP_SLEEP_MILLIS,
@@ -245,18 +256,18 @@ fn make_gossip_node(
     entrypoint: Option<&SocketAddr>,
     exit: &Arc<AtomicBool>,
     gossip_addr: Option<&SocketAddr>,
-) -> (GossipService, Option<TcpListener>, Arc<ClusterInfo>) {
+) -> (GossipService, Option<TcpListener>, Arc<RwLock<ClusterInfo>>) {
     let keypair = Arc::new(Keypair::new());
     let (node, gossip_socket, ip_echo) = if let Some(gossip_addr) = gossip_addr {
         ClusterInfo::gossip_node(&keypair.pubkey(), gossip_addr)
     } else {
         ClusterInfo::spy_node(&keypair.pubkey())
     };
-    let cluster_info = ClusterInfo::new(node, keypair);
+    let mut cluster_info = ClusterInfo::new(node, keypair);
     if let Some(entrypoint) = entrypoint {
         cluster_info.set_entrypoint(ContactInfo::new_gossip_entry_point(entrypoint));
     }
-    let cluster_info = Arc::new(cluster_info);
+    let cluster_info = Arc::new(RwLock::new(cluster_info));
     let gossip_service = GossipService::new(&cluster_info.clone(), None, gossip_socket, &exit);
     (gossip_service, ip_echo, cluster_info)
 }
@@ -266,7 +277,7 @@ mod tests {
     use super::*;
     use crate::cluster_info::{ClusterInfo, Node};
     use std::sync::atomic::AtomicBool;
-    use std::sync::Arc;
+    use std::sync::{Arc, RwLock};
 
     #[test]
     #[ignore]
@@ -275,7 +286,7 @@ mod tests {
         let exit = Arc::new(AtomicBool::new(false));
         let tn = Node::new_localhost();
         let cluster_info = ClusterInfo::new_with_invalid_keypair(tn.info.clone());
-        let c = Arc::new(cluster_info);
+        let c = Arc::new(RwLock::new(cluster_info));
         let d = GossipService::new(&c, None, tn.sockets.gossip, &exit);
         exit.store(true, Ordering::Relaxed);
         d.join().unwrap();
@@ -289,16 +300,16 @@ mod tests {
         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);
-        let cluster_info = ClusterInfo::new(contact_info.clone(), Arc::new(keypair));
+        let mut cluster_info = ClusterInfo::new(contact_info.clone(), Arc::new(keypair));
         cluster_info.insert_info(peer0_info.clone());
         cluster_info.insert_info(peer1_info);
 
-        let spy_ref = Arc::new(cluster_info);
+        let spy_ref = Arc::new(RwLock::new(cluster_info));
 
         let (met_criteria, secs, tvu_peers, _) = spy(spy_ref.clone(), None, Some(1), None, None);
         assert_eq!(met_criteria, false);
         assert_eq!(secs, 1);
-        assert_eq!(tvu_peers, spy_ref.tvu_peers());
+        assert_eq!(tvu_peers, spy_ref.read().unwrap().tvu_peers());
 
         // Find num_nodes
         let (met_criteria, _, _, _) = spy(spy_ref.clone(), Some(1), None, None, None);

core/src/lib.rs

@@ -5,18 +5,17 @@
 //! 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 broadcast_stage;
 pub mod cluster_info_vote_listener;
 pub mod commitment;
-mod deprecated;
 pub mod shred_fetch_stage;
 #[macro_use]
 pub mod contact_info;
+pub mod blockstream;
+pub mod blockstream_service;
 pub mod cluster_info;
-pub mod cluster_slots;
 pub mod consensus;
 pub mod crds;
 pub mod crds_gossip;
@@ -24,15 +23,16 @@ pub mod crds_gossip_error;
 pub mod crds_gossip_pull;
 pub mod crds_gossip_push;
 pub mod crds_value;
-pub mod epoch_slots;
 pub mod fetch_stage;
 pub mod gen_keys;
+pub mod genesis_utils;
 pub mod gossip_service;
 pub mod ledger_cleanup_service;
 pub mod local_vote_signer_service;
+pub mod packet;
 pub mod poh_recorder;
 pub mod poh_service;
-pub mod progress_map;
+pub mod recvmmsg;
 pub mod repair_service;
 pub mod replay_stage;
 mod result;
@@ -43,6 +43,7 @@ pub mod rpc_pubsub;
 pub mod rpc_pubsub_service;
 pub mod rpc_service;
 pub mod rpc_subscriptions;
+pub mod sendmmsg;
 pub mod serve_repair;
 pub mod serve_repair_service;
 pub mod sigverify;
@@ -50,17 +51,14 @@ pub mod sigverify_shreds;
 pub mod sigverify_stage;
 pub mod snapshot_packager_service;
 pub mod storage_stage;
+pub mod streamer;
 pub mod tpu;
 pub mod transaction_status_service;
 pub mod tvu;
 pub mod validator;
-pub mod verified_vote_packets;
 pub mod weighted_shuffle;
 pub mod window_service;
 
-#[macro_use]
-extern crate solana_bpf_loader_program;
-
 #[macro_use]
 extern crate solana_budget_program;
 

core/src/packet.rs

@@ -72,7 +72,7 @@ mod tests {
     #[test]
     fn test_packets_set_addr() {
         // test that the address is actually being updated
-        let send_addr: SocketAddr = "127.0.0.1:123".parse().unwrap();
+        let send_addr = socketaddr!([127, 0, 0, 1], 123);
         let packets = vec![Packet::default()];
         let mut msgs = Packets::new(packets);
         msgs.set_addr(&send_addr);

core/src/poh_recorder.rs

@@ -511,8 +511,8 @@ impl PohRecorder {
 #[cfg(test)]
 mod tests {
     use super::*;
+    use crate::genesis_utils::{create_genesis_config, GenesisConfigInfo};
     use bincode::serialize;
-    use solana_ledger::genesis_utils::{create_genesis_config, GenesisConfigInfo};
     use solana_ledger::{blockstore::Blockstore, blockstore_meta::SlotMeta, get_tmp_ledger_path};
     use solana_perf::test_tx::test_tx;
     use solana_sdk::clock::DEFAULT_TICKS_PER_SLOT;

core/src/poh_service.rs

@@ -1,8 +1,10 @@
 //! The `poh_service` module implements a service that records the passing of
 //! "ticks", a measure of time in the PoH stream
 use crate::poh_recorder::PohRecorder;
+use core_affinity;
 use solana_sdk::clock::DEFAULT_TICKS_PER_SLOT;
 use solana_sdk::poh_config::PohConfig;
+use solana_sys_tuner;
 use std::sync::atomic::{AtomicBool, Ordering};
 use std::sync::{Arc, Mutex};
 use std::thread::{self, sleep, Builder, JoinHandle};
@@ -118,8 +120,8 @@ impl PohService {
 #[cfg(test)]
 mod tests {
     use super::*;
+    use crate::genesis_utils::{create_genesis_config, GenesisConfigInfo};
     use crate::poh_recorder::WorkingBank;
-    use solana_ledger::genesis_utils::{create_genesis_config, GenesisConfigInfo};
     use solana_ledger::leader_schedule_cache::LeaderScheduleCache;
     use solana_ledger::{blockstore::Blockstore, get_tmp_ledger_path};
     use solana_perf::test_tx::test_tx;

core/src/progress_map.rs

@@ -1,622 +0,0 @@
-use crate::{
-    cluster_info_vote_listener::SlotVoteTracker, cluster_slots::SlotPubkeys,
-    consensus::StakeLockout, replay_stage::SUPERMINORITY_THRESHOLD,
-};
-use solana_ledger::{
-    bank_forks::BankForks,
-    blockstore_processor::{ConfirmationProgress, ConfirmationTiming},
-};
-use solana_runtime::bank::Bank;
-use solana_sdk::{account::Account, clock::Slot, hash::Hash, pubkey::Pubkey};
-use std::{
-    collections::{HashMap, HashSet},
-    rc::Rc,
-    sync::{Arc, RwLock},
-};
-
-#[derive(Default)]
-pub(crate) struct ReplaySlotStats(ConfirmationTiming);
-impl std::ops::Deref for ReplaySlotStats {
-    type Target = ConfirmationTiming;
-    fn deref(&self) -> &Self::Target {
-        &self.0
-    }
-}
-impl std::ops::DerefMut for ReplaySlotStats {
-    fn deref_mut(&mut self) -> &mut Self::Target {
-        &mut self.0
-    }
-}
-
-impl ReplaySlotStats {
-    pub fn report_stats(&self, slot: Slot, num_entries: usize, num_shreds: u64) {
-        datapoint_info!(
-            "replay-slot-stats",
-            ("slot", slot as i64, i64),
-            ("fetch_entries_time", self.fetch_elapsed as i64, i64),
-            (
-                "fetch_entries_fail_time",
-                self.fetch_fail_elapsed as i64,
-                i64
-            ),
-            ("entry_verification_time", self.verify_elapsed as i64, i64),
-            ("replay_time", self.replay_elapsed as i64, i64),
-            (
-                "replay_total_elapsed",
-                self.started.elapsed().as_micros() as i64,
-                i64
-            ),
-            ("total_entries", num_entries as i64, i64),
-            ("total_shreds", num_shreds as i64, i64),
-        );
-    }
-}
-
-#[derive(Debug)]
-pub(crate) struct ValidatorStakeInfo {
-    pub validator_vote_pubkey: Pubkey,
-    pub stake: u64,
-    pub total_epoch_stake: u64,
-}
-
-impl Default for ValidatorStakeInfo {
-    fn default() -> Self {
-        Self {
-            stake: 0,
-            validator_vote_pubkey: Pubkey::default(),
-            total_epoch_stake: 1,
-        }
-    }
-}
-
-impl ValidatorStakeInfo {
-    pub fn new(validator_vote_pubkey: Pubkey, stake: u64, total_epoch_stake: u64) -> Self {
-        Self {
-            validator_vote_pubkey,
-            stake,
-            total_epoch_stake,
-        }
-    }
-}
-
-pub(crate) struct ForkProgress {
-    pub(crate) is_dead: bool,
-    pub(crate) fork_stats: ForkStats,
-    pub(crate) propagated_stats: PropagatedStats,
-    pub(crate) replay_stats: ReplaySlotStats,
-    pub(crate) replay_progress: ConfirmationProgress,
-    // Note `num_blocks_on_fork` and `num_dropped_blocks_on_fork` only
-    // count new blocks replayed since last restart, which won't include
-    // blocks already existing in the ledger/before snapshot at start,
-    // so these stats do not span all of time
-    pub(crate) num_blocks_on_fork: u64,
-    pub(crate) num_dropped_blocks_on_fork: u64,
-}
-
-impl ForkProgress {
-    pub fn new(
-        last_entry: Hash,
-        prev_leader_slot: Option<Slot>,
-        validator_stake_info: Option<ValidatorStakeInfo>,
-        num_blocks_on_fork: u64,
-        num_dropped_blocks_on_fork: u64,
-    ) -> Self {
-        let (
-            is_leader_slot,
-            propagated_validators_stake,
-            propagated_validators,
-            is_propagated,
-            total_epoch_stake,
-        ) = validator_stake_info
-            .map(|info| {
-                (
-                    true,
-                    info.stake,
-                    vec![Rc::new(info.validator_vote_pubkey)]
-                        .into_iter()
-                        .collect(),
-                    {
-                        if info.total_epoch_stake == 0 {
-                            true
-                        } else {
-                            info.stake as f64 / info.total_epoch_stake as f64
-                                > SUPERMINORITY_THRESHOLD
-                        }
-                    },
-                    info.total_epoch_stake,
-                )
-            })
-            .unwrap_or((false, 0, HashSet::new(), false, 0));
-        Self {
-            is_dead: false,
-            fork_stats: ForkStats::default(),
-            replay_stats: ReplaySlotStats::default(),
-            replay_progress: ConfirmationProgress::new(last_entry),
-            num_blocks_on_fork,
-            num_dropped_blocks_on_fork,
-            propagated_stats: PropagatedStats {
-                prev_leader_slot,
-                is_leader_slot,
-                propagated_validators_stake,
-                propagated_validators,
-                is_propagated,
-                total_epoch_stake,
-                ..PropagatedStats::default()
-            },
-        }
-    }
-
-    pub fn new_from_bank(
-        bank: &Bank,
-        my_pubkey: &Pubkey,
-        voting_pubkey: &Pubkey,
-        prev_leader_slot: Option<Slot>,
-        num_blocks_on_fork: u64,
-        num_dropped_blocks_on_fork: u64,
-    ) -> Self {
-        let validator_fork_info = {
-            if bank.collector_id() == my_pubkey {
-                let stake = bank.epoch_vote_account_stake(voting_pubkey);
-                Some(ValidatorStakeInfo::new(
-                    *voting_pubkey,
-                    stake,
-                    bank.total_epoch_stake(),
-                ))
-            } else {
-                None
-            }
-        };
-
-        Self::new(
-            bank.last_blockhash(),
-            prev_leader_slot,
-            validator_fork_info,
-            num_blocks_on_fork,
-            num_dropped_blocks_on_fork,
-        )
-    }
-}
-
-#[derive(Debug, Clone, Default)]
-pub(crate) struct ForkStats {
-    pub(crate) weight: u128,
-    pub(crate) fork_weight: u128,
-    pub(crate) total_staked: u64,
-    pub(crate) block_height: u64,
-    pub(crate) has_voted: bool,
-    pub(crate) is_recent: bool,
-    pub(crate) is_empty: bool,
-    pub(crate) vote_threshold: bool,
-    pub(crate) is_locked_out: bool,
-    pub(crate) stake_lockouts: HashMap<u64, StakeLockout>,
-    pub(crate) confirmation_reported: bool,
-    pub(crate) computed: bool,
-}
-
-#[derive(Clone, Default)]
-pub(crate) struct PropagatedStats {
-    pub(crate) propagated_validators: HashSet<Rc<Pubkey>>,
-    pub(crate) propagated_node_ids: HashSet<Rc<Pubkey>>,
-    pub(crate) propagated_validators_stake: u64,
-    pub(crate) is_propagated: bool,
-    pub(crate) is_leader_slot: bool,
-    pub(crate) prev_leader_slot: Option<Slot>,
-    pub(crate) slot_vote_tracker: Option<Arc<RwLock<SlotVoteTracker>>>,
-    pub(crate) cluster_slot_pubkeys: Option<Arc<RwLock<SlotPubkeys>>>,
-    pub(crate) total_epoch_stake: u64,
-}
-
-impl PropagatedStats {
-    pub fn add_vote_pubkey(
-        &mut self,
-        vote_pubkey: &Pubkey,
-        all_pubkeys: &mut HashSet<Rc<Pubkey>>,
-        stake: u64,
-    ) {
-        if !self.propagated_validators.contains(vote_pubkey) {
-            let mut cached_pubkey: Option<Rc<Pubkey>> = all_pubkeys.get(vote_pubkey).cloned();
-            if cached_pubkey.is_none() {
-                let new_pubkey = Rc::new(*vote_pubkey);
-                all_pubkeys.insert(new_pubkey.clone());
-                cached_pubkey = Some(new_pubkey);
-            }
-            let vote_pubkey = cached_pubkey.unwrap();
-            self.propagated_validators.insert(vote_pubkey);
-            self.propagated_validators_stake += stake;
-        }
-    }
-
-    pub fn add_node_pubkey(
-        &mut self,
-        node_pubkey: &Pubkey,
-        all_pubkeys: &mut HashSet<Rc<Pubkey>>,
-        bank: &Bank,
-    ) {
-        if !self.propagated_node_ids.contains(node_pubkey) {
-            let node_vote_accounts = bank
-                .epoch_vote_accounts_for_node_id(&node_pubkey)
-                .map(|v| &v.vote_accounts);
-
-            if let Some(node_vote_accounts) = node_vote_accounts {
-                self.add_node_pubkey_internal(
-                    node_pubkey,
-                    all_pubkeys,
-                    node_vote_accounts,
-                    bank.epoch_vote_accounts(bank.epoch())
-                        .expect("Epoch stakes for bank's own epoch must exist"),
-                );
-            }
-        }
-    }
-
-    fn add_node_pubkey_internal(
-        &mut self,
-        node_pubkey: &Pubkey,
-        all_pubkeys: &mut HashSet<Rc<Pubkey>>,
-        vote_account_pubkeys: &[Pubkey],
-        epoch_vote_accounts: &HashMap<Pubkey, (u64, Account)>,
-    ) {
-        let mut cached_pubkey: Option<Rc<Pubkey>> = all_pubkeys.get(node_pubkey).cloned();
-        if cached_pubkey.is_none() {
-            let new_pubkey = Rc::new(*node_pubkey);
-            all_pubkeys.insert(new_pubkey.clone());
-            cached_pubkey = Some(new_pubkey);
-        }
-        let node_pubkey = cached_pubkey.unwrap();
-        self.propagated_node_ids.insert(node_pubkey);
-        for vote_account_pubkey in vote_account_pubkeys.iter() {
-            let stake = epoch_vote_accounts
-                .get(vote_account_pubkey)
-                .map(|(stake, _)| *stake)
-                .unwrap_or(0);
-            self.add_vote_pubkey(vote_account_pubkey, all_pubkeys, stake);
-        }
-    }
-}
-
-#[derive(Default)]
-pub(crate) struct ProgressMap {
-    progress_map: HashMap<Slot, ForkProgress>,
-}
-
-impl std::ops::Deref for ProgressMap {
-    type Target = HashMap<Slot, ForkProgress>;
-    fn deref(&self) -> &Self::Target {
-        &self.progress_map
-    }
-}
-
-impl std::ops::DerefMut for ProgressMap {
-    fn deref_mut(&mut self) -> &mut Self::Target {
-        &mut self.progress_map
-    }
-}
-
-impl ProgressMap {
-    pub fn insert(&mut self, slot: Slot, fork_progress: ForkProgress) {
-        self.progress_map.insert(slot, fork_progress);
-    }
-
-    pub fn get_propagated_stats(&self, slot: Slot) -> Option<&PropagatedStats> {
-        self.progress_map
-            .get(&slot)
-            .map(|fork_progress| &fork_progress.propagated_stats)
-    }
-
-    pub fn get_propagated_stats_mut(&mut self, slot: Slot) -> Option<&mut PropagatedStats> {
-        self.progress_map
-            .get_mut(&slot)
-            .map(|fork_progress| &mut fork_progress.propagated_stats)
-    }
-
-    pub fn get_fork_stats(&self, slot: Slot) -> Option<&ForkStats> {
-        self.progress_map
-            .get(&slot)
-            .map(|fork_progress| &fork_progress.fork_stats)
-    }
-
-    pub fn get_fork_stats_mut(&mut self, slot: Slot) -> Option<&mut ForkStats> {
-        self.progress_map
-            .get_mut(&slot)
-            .map(|fork_progress| &mut fork_progress.fork_stats)
-    }
-
-    pub fn is_propagated(&self, slot: Slot) -> bool {
-        let leader_slot_to_check = self.get_latest_leader_slot(slot);
-
-        // prev_leader_slot doesn't exist because already rooted
-        // or this validator hasn't been scheduled as a leader
-        // yet. In both cases the latest leader is vacuously
-        // confirmed
-        leader_slot_to_check
-            .map(|leader_slot_to_check| {
-                // If the leader's stats are None (isn't in the
-                // progress map), this means that prev_leader slot is
-                // rooted, so return true
-                self.get_propagated_stats(leader_slot_to_check)
-                    .map(|stats| stats.is_propagated)
-                    .unwrap_or(true)
-            })
-            .unwrap_or(true)
-    }
-
-    pub fn get_latest_leader_slot(&self, slot: Slot) -> Option<Slot> {
-        let propagated_stats = self
-            .get_propagated_stats(slot)
-            .expect("All frozen banks must exist in the Progress map");
-
-        if propagated_stats.is_leader_slot {
-            Some(slot)
-        } else {
-            propagated_stats.prev_leader_slot
-        }
-    }
-
-    pub fn get_bank_prev_leader_slot(&self, bank: &Bank) -> Option<Slot> {
-        let parent_slot = bank.parent_slot();
-        self.get_propagated_stats(parent_slot)
-            .map(|stats| {
-                if stats.is_leader_slot {
-                    Some(parent_slot)
-                } else {
-                    stats.prev_leader_slot
-                }
-            })
-            .unwrap_or(None)
-    }
-
-    pub fn handle_new_root(&mut self, bank_forks: &BankForks) {
-        self.progress_map
-            .retain(|k, _| bank_forks.get(*k).is_some());
-    }
-
-    pub fn log_propagated_stats(&self, slot: Slot, bank_forks: &RwLock<BankForks>) {
-        if let Some(stats) = self.get_propagated_stats(slot) {
-            info!(
-                "Propagated stats:
-                total staked: {},
-                observed staked: {},
-                vote pubkeys: {:?},
-                node_pubkeys: {:?},
-                slot: {},
-                epoch: {:?}",
-                stats.total_epoch_stake,
-                stats.propagated_validators_stake,
-                stats.propagated_validators,
-                stats.propagated_node_ids,
-                slot,
-                bank_forks.read().unwrap().get(slot).map(|x| x.epoch()),
-            );
-        }
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use super::*;
-
-    #[test]
-    fn test_add_vote_pubkey() {
-        let mut stats = PropagatedStats::default();
-        let mut all_pubkeys = HashSet::new();
-        let mut vote_pubkey = Pubkey::new_rand();
-        all_pubkeys.insert(Rc::new(vote_pubkey.clone()));
-
-        // Add a vote pubkey, the number of references in all_pubkeys
-        // should be 2
-        stats.add_vote_pubkey(&vote_pubkey, &mut all_pubkeys, 1);
-        assert!(stats.propagated_validators.contains(&vote_pubkey));
-        assert_eq!(stats.propagated_validators_stake, 1);
-        assert_eq!(Rc::strong_count(all_pubkeys.get(&vote_pubkey).unwrap()), 2);
-
-        // Adding it again should change no state since the key already existed
-        stats.add_vote_pubkey(&vote_pubkey, &mut all_pubkeys, 1);
-        assert!(stats.propagated_validators.contains(&vote_pubkey));
-        assert_eq!(stats.propagated_validators_stake, 1);
-
-        // Addding another pubkey should succeed
-        vote_pubkey = Pubkey::new_rand();
-        stats.add_vote_pubkey(&vote_pubkey, &mut all_pubkeys, 2);
-        assert!(stats.propagated_validators.contains(&vote_pubkey));
-        assert_eq!(stats.propagated_validators_stake, 3);
-        assert_eq!(Rc::strong_count(all_pubkeys.get(&vote_pubkey).unwrap()), 2);
-    }
-
-    #[test]
-    fn test_add_node_pubkey_internal() {
-        let num_vote_accounts = 10;
-        let staked_vote_accounts = 5;
-        let vote_account_pubkeys: Vec<_> = std::iter::repeat_with(|| Pubkey::new_rand())
-            .take(num_vote_accounts)
-            .collect();
-        let epoch_vote_accounts: HashMap<_, _> = vote_account_pubkeys
-            .iter()
-            .skip(num_vote_accounts - staked_vote_accounts)
-            .map(|pubkey| (*pubkey, (1, Account::default())))
-            .collect();
-
-        let mut stats = PropagatedStats::default();
-        let mut all_pubkeys = HashSet::new();
-        let mut node_pubkey = Pubkey::new_rand();
-        all_pubkeys.insert(Rc::new(node_pubkey.clone()));
-
-        // Add a vote pubkey, the number of references in all_pubkeys
-        // should be 2
-        stats.add_node_pubkey_internal(
-            &node_pubkey,
-            &mut all_pubkeys,
-            &vote_account_pubkeys,
-            &epoch_vote_accounts,
-        );
-        assert!(stats.propagated_node_ids.contains(&node_pubkey));
-        assert_eq!(
-            stats.propagated_validators_stake,
-            staked_vote_accounts as u64
-        );
-        assert_eq!(Rc::strong_count(all_pubkeys.get(&node_pubkey).unwrap()), 2);
-
-        // Adding it again should not change any state
-        stats.add_node_pubkey_internal(
-            &node_pubkey,
-            &mut all_pubkeys,
-            &vote_account_pubkeys,
-            &epoch_vote_accounts,
-        );
-        assert!(stats.propagated_node_ids.contains(&node_pubkey));
-        assert_eq!(
-            stats.propagated_validators_stake,
-            staked_vote_accounts as u64
-        );
-
-        // Addding another pubkey with same vote accounts should succeed, but stake
-        // shouldn't increase
-        node_pubkey = Pubkey::new_rand();
-        stats.add_node_pubkey_internal(
-            &node_pubkey,
-            &mut all_pubkeys,
-            &vote_account_pubkeys,
-            &epoch_vote_accounts,
-        );
-        assert!(stats.propagated_node_ids.contains(&node_pubkey));
-        assert_eq!(
-            stats.propagated_validators_stake,
-            staked_vote_accounts as u64
-        );
-        assert_eq!(Rc::strong_count(all_pubkeys.get(&node_pubkey).unwrap()), 2);
-
-        // Addding another pubkey with different vote accounts should succeed
-        // and increase stake
-        node_pubkey = Pubkey::new_rand();
-        let vote_account_pubkeys: Vec<_> = std::iter::repeat_with(|| Pubkey::new_rand())
-            .take(num_vote_accounts)
-            .collect();
-        let epoch_vote_accounts: HashMap<_, _> = vote_account_pubkeys
-            .iter()
-            .skip(num_vote_accounts - staked_vote_accounts)
-            .map(|pubkey| (*pubkey, (1, Account::default())))
-            .collect();
-        stats.add_node_pubkey_internal(
-            &node_pubkey,
-            &mut all_pubkeys,
-            &vote_account_pubkeys,
-            &epoch_vote_accounts,
-        );
-        assert!(stats.propagated_node_ids.contains(&node_pubkey));
-        assert_eq!(
-            stats.propagated_validators_stake,
-            2 * staked_vote_accounts as u64
-        );
-        assert_eq!(Rc::strong_count(all_pubkeys.get(&node_pubkey).unwrap()), 2);
-    }
-
-    #[test]
-    fn test_is_propagated_status_on_construction() {
-        // If the given ValidatorStakeInfo == None, then this is not
-        // a leader slot and is_propagated == false
-        let progress = ForkProgress::new(Hash::default(), Some(9), None, 0, 0);
-        assert!(!progress.propagated_stats.is_propagated);
-
-        // If the stake is zero, then threshold is always achieved
-        let progress = ForkProgress::new(
-            Hash::default(),
-            Some(9),
-            Some(ValidatorStakeInfo {
-                total_epoch_stake: 0,
-                ..ValidatorStakeInfo::default()
-            }),
-            0,
-            0,
-        );
-        assert!(progress.propagated_stats.is_propagated);
-
-        // If the stake is non zero, then threshold is not achieved unless
-        // validator has enough stake by itself to pass threshold
-        let progress = ForkProgress::new(
-            Hash::default(),
-            Some(9),
-            Some(ValidatorStakeInfo {
-                total_epoch_stake: 2,
-                ..ValidatorStakeInfo::default()
-            }),
-            0,
-            0,
-        );
-        assert!(!progress.propagated_stats.is_propagated);
-
-        // Give the validator enough stake by itself to pass threshold
-        let progress = ForkProgress::new(
-            Hash::default(),
-            Some(9),
-            Some(ValidatorStakeInfo {
-                stake: 1,
-                total_epoch_stake: 2,
-                ..ValidatorStakeInfo::default()
-            }),
-            0,
-            0,
-        );
-        assert!(progress.propagated_stats.is_propagated);
-
-        // Check that the default ValidatorStakeInfo::default() constructs a ForkProgress
-        // with is_propagated == false, otherwise propagation tests will fail to run
-        // the proper checks (most will auto-pass without checking anything)
-        let progress = ForkProgress::new(
-            Hash::default(),
-            Some(9),
-            Some(ValidatorStakeInfo::default()),
-            0,
-            0,
-        );
-        assert!(!progress.propagated_stats.is_propagated);
-    }
-
-    #[test]
-    fn test_is_propagated() {
-        let mut progress_map = ProgressMap::default();
-
-        // Insert new ForkProgress for slot 10 (not a leader slot) and its
-        // previous leader slot 9 (leader slot)
-        progress_map.insert(10, ForkProgress::new(Hash::default(), Some(9), None, 0, 0));
-        progress_map.insert(
-            9,
-            ForkProgress::new(
-                Hash::default(),
-                None,
-                Some(ValidatorStakeInfo::default()),
-                0,
-                0,
-            ),
-        );
-
-        // None of these slot have parents which are confirmed
-        assert!(!progress_map.is_propagated(9));
-        assert!(!progress_map.is_propagated(10));
-
-        // Insert new ForkProgress for slot 8 with no previous leader.
-        // The previous leader before 8, slot 7, does not exist in
-        // progress map, so is_propagated(8) should return true as
-        // this implies the parent is rooted
-        progress_map.insert(8, ForkProgress::new(Hash::default(), Some(7), None, 0, 0));
-        assert!(progress_map.is_propagated(8));
-
-        // If we set the is_propagated = true, is_propagated should return true
-        progress_map
-            .get_propagated_stats_mut(9)
-            .unwrap()
-            .is_propagated = true;
-        assert!(progress_map.is_propagated(9));
-        assert!(progress_map.get(&9).unwrap().propagated_stats.is_propagated);
-
-        // Because slot 9 is now confirmed, then slot 10 is also confirmed b/c 9
-        // is the last leader slot before 10
-        assert!(progress_map.is_propagated(10));
-
-        // If we make slot 10 a leader slot though, even though its previous
-        // leader slot 9 has been confirmed, slot 10 itself is not confirmed
-        progress_map
-            .get_propagated_stats_mut(10)
-            .unwrap()
-            .is_leader_slot = true;
-        assert!(!progress_map.is_propagated(10));
-    }
-}

core/src/recvmmsg.rs

@@ -213,4 +213,49 @@ mod tests {
             assert_eq!(packets[i].meta.addr(), saddr2);
         }
     }
+
+    #[cfg(target_os = "linux")]
+    #[test]
+    pub fn test_recv_mmsg_batch_size() {
+        let reader = UdpSocket::bind("127.0.0.1:0").expect("bind");
+        let addr = reader.local_addr().unwrap();
+        let sender = UdpSocket::bind("127.0.0.1:0").expect("bind");
+
+        const TEST_BATCH_SIZE: usize = 64;
+        let sent = TEST_BATCH_SIZE;
+
+        let mut elapsed_in_max_batch = 0;
+        (0..1000).for_each(|_| {
+            for _ in 0..sent {
+                let data = [0; PACKET_DATA_SIZE];
+                sender.send_to(&data[..], &addr).unwrap();
+            }
+            let mut packets = vec![Packet::default(); TEST_BATCH_SIZE];
+            let now = Instant::now();
+            let recv = recv_mmsg(&reader, &mut packets[..]).unwrap().1;
+            elapsed_in_max_batch += now.elapsed().as_nanos();
+            assert_eq!(TEST_BATCH_SIZE, recv);
+        });
+
+        let mut elapsed_in_small_batch = 0;
+        (0..1000).for_each(|_| {
+            for _ in 0..sent {
+                let data = [0; PACKET_DATA_SIZE];
+                sender.send_to(&data[..], &addr).unwrap();
+            }
+            let mut packets = vec![Packet::default(); 4];
+            let mut recv = 0;
+            let now = Instant::now();
+            while let Ok(num) = recv_mmsg(&reader, &mut packets[..]) {
+                recv += num.1;
+                if recv >= TEST_BATCH_SIZE {
+                    break;
+                }
+            }
+            elapsed_in_small_batch += now.elapsed().as_nanos();
+            assert_eq!(TEST_BATCH_SIZE, recv);
+        });
+
+        assert!(elapsed_in_max_batch <= elapsed_in_small_batch);
+    }
 }

core/src/repair_service.rs

@@ -2,7 +2,6 @@
 //! regularly finds missing shreds in the ledger and sends repair requests for those shreds
 use crate::{
     cluster_info::ClusterInfo,
-    cluster_slots::ClusterSlots,
     result::Result,
     serve_repair::{RepairType, ServeRepair},
 };
@@ -10,45 +9,27 @@ use solana_ledger::{
     bank_forks::BankForks,
     blockstore::{Blockstore, CompletedSlotsReceiver, SlotMeta},
 };
+use solana_sdk::clock::DEFAULT_SLOTS_PER_EPOCH;
 use solana_sdk::{clock::Slot, epoch_schedule::EpochSchedule, pubkey::Pubkey};
 use std::{
-    collections::HashMap,
+    collections::{BTreeSet, HashSet},
     iter::Iterator,
-    net::SocketAddr,
     net::UdpSocket,
+    ops::Bound::{Included, Unbounded},
     sync::atomic::{AtomicBool, Ordering},
     sync::{Arc, RwLock},
     thread::sleep,
     thread::{self, Builder, JoinHandle},
-    time::{Duration, Instant},
+    time::Duration,
 };
 
-#[derive(Default)]
-pub struct RepairStatsGroup {
-    pub count: u64,
-    pub min: u64,
-    pub max: u64,
-}
-
-impl RepairStatsGroup {
-    pub fn update(&mut self, slot: u64) {
-        self.count += 1;
-        self.min = std::cmp::min(self.min, slot);
-        self.max = std::cmp::max(self.max, slot);
-    }
-}
-
-#[derive(Default)]
-pub struct RepairStats {
-    pub shred: RepairStatsGroup,
-    pub highest_shred: RepairStatsGroup,
-    pub orphan: RepairStatsGroup,
-}
-
 pub const MAX_REPAIR_LENGTH: usize = 512;
 pub const REPAIR_MS: u64 = 100;
 pub const MAX_ORPHANS: usize = 5;
 
+const MAX_COMPLETED_SLOT_CACHE_LEN: usize = 256;
+const COMPLETED_SLOT_CACHE_FLUSH_TRIGGER: usize = 512;
+
 pub enum RepairStrategy {
     RepairRange(RepairSlotRange),
     RepairAll {
@@ -81,9 +62,8 @@ impl RepairService {
         blockstore: Arc<Blockstore>,
         exit: Arc<AtomicBool>,
         repair_socket: Arc<UdpSocket>,
-        cluster_info: Arc<ClusterInfo>,
+        cluster_info: Arc<RwLock<ClusterInfo>>,
         repair_strategy: RepairStrategy,
-        cluster_slots: Arc<ClusterSlots>,
     ) -> Self {
         let t_repair = Builder::new()
             .name("solana-repair-service".to_string())
@@ -94,7 +74,6 @@ impl RepairService {
                     &repair_socket,
                     &cluster_info,
                     repair_strategy,
-                    &cluster_slots,
                 )
             })
             .unwrap();
@@ -103,26 +82,30 @@ impl RepairService {
     }
 
     fn run(
-        blockstore: &Blockstore,
-        exit: &AtomicBool,
-        repair_socket: &UdpSocket,
-        cluster_info: &Arc<ClusterInfo>,
+        blockstore: &Arc<Blockstore>,
+        exit: &Arc<AtomicBool>,
+        repair_socket: &Arc<UdpSocket>,
+        cluster_info: &Arc<RwLock<ClusterInfo>>,
         repair_strategy: RepairStrategy,
-        cluster_slots: &Arc<ClusterSlots>,
     ) {
         let serve_repair = ServeRepair::new(cluster_info.clone());
-        let id = cluster_info.id();
-        if let RepairStrategy::RepairAll { .. } = repair_strategy {
-            Self::initialize_lowest_slot(id, blockstore, cluster_info);
-        }
-        let mut repair_stats = RepairStats::default();
-        let mut last_stats = Instant::now();
+        let mut epoch_slots: BTreeSet<Slot> = BTreeSet::new();
+        let mut old_incomplete_slots: BTreeSet<Slot> = BTreeSet::new();
+        let id = cluster_info.read().unwrap().id();
         if let RepairStrategy::RepairAll {
-            ref completed_slots_receiver,
-            ..
+            ref epoch_schedule, ..
         } = repair_strategy
         {
-            Self::initialize_epoch_slots(blockstore, cluster_info, completed_slots_receiver);
+            let current_root = blockstore.last_root();
+            Self::initialize_epoch_slots(
+                id,
+                blockstore,
+                &mut epoch_slots,
+                &old_incomplete_slots,
+                current_root,
+                epoch_schedule,
+                cluster_info,
+            );
         }
         loop {
             if exit.load(Ordering::Relaxed) {
@@ -142,31 +125,30 @@ impl RepairService {
 
                     RepairStrategy::RepairAll {
                         ref completed_slots_receiver,
-                        ref bank_forks,
                         ..
                     } => {
                         let new_root = blockstore.last_root();
                         let lowest_slot = blockstore.lowest_slot();
-                        Self::update_lowest_slot(&id, lowest_slot, &cluster_info);
-                        Self::update_completed_slots(completed_slots_receiver, &cluster_info);
-                        cluster_slots.update(new_root, cluster_info, bank_forks);
+                        Self::update_epoch_slots(
+                            id,
+                            new_root,
+                            lowest_slot,
+                            &mut epoch_slots,
+                            &mut old_incomplete_slots,
+                            &cluster_info,
+                            completed_slots_receiver,
+                        );
                         Self::generate_repairs(blockstore, new_root, MAX_REPAIR_LENGTH)
                     }
                 }
             };
 
             if let Ok(repairs) = repairs {
-                let mut cache = HashMap::new();
-                let reqs: Vec<((SocketAddr, Vec<u8>), RepairType)> = repairs
+                let reqs: Vec<_> = repairs
                     .into_iter()
                     .filter_map(|repair_request| {
                         serve_repair
-                            .repair_request(
-                                &cluster_slots,
-                                &repair_request,
-                                &mut cache,
-                                &mut repair_stats,
-                            )
+                            .repair_request(&repair_request)
                             .map(|result| (result, repair_request))
                             .ok()
                     })
@@ -179,24 +161,6 @@ impl RepairService {
                     });
                 }
             }
-            if last_stats.elapsed().as_secs() > 1 {
-                let repair_total = repair_stats.shred.count
-                    + repair_stats.highest_shred.count
-                    + repair_stats.orphan.count;
-                if repair_total > 0 {
-                    datapoint_info!(
-                        "serve_repair-repair",
-                        ("repair-total", repair_total, i64),
-                        ("shred-count", repair_stats.shred.count, i64),
-                        ("highest-shred-count", repair_stats.highest_shred.count, i64),
-                        ("orphan-count", repair_stats.orphan.count, i64),
-                        ("repair-highest-slot", repair_stats.highest_shred.max, i64),
-                        ("repair-orphan", repair_stats.orphan.max, i64),
-                    );
-                }
-                repair_stats = RepairStats::default();
-                last_stats = Instant::now();
-            }
             sleep(Duration::from_millis(REPAIR_MS));
         }
     }
@@ -308,57 +272,150 @@ impl RepairService {
         }
     }
 
-    fn initialize_lowest_slot(id: Pubkey, blockstore: &Blockstore, cluster_info: &ClusterInfo) {
+    fn get_completed_slots_past_root(
+        blockstore: &Blockstore,
+        slots_in_gossip: &mut BTreeSet<Slot>,
+        root: Slot,
+        epoch_schedule: &EpochSchedule,
+    ) {
+        let last_confirmed_epoch = epoch_schedule.get_leader_schedule_epoch(root);
+        let last_epoch_slot = epoch_schedule.get_last_slot_in_epoch(last_confirmed_epoch);
+
+        let meta_iter = blockstore
+            .slot_meta_iterator(root + 1)
+            .expect("Couldn't get db iterator");
+
+        for (current_slot, meta) in meta_iter {
+            if current_slot > last_epoch_slot {
+                break;
+            }
+            if meta.is_full() {
+                slots_in_gossip.insert(current_slot);
+            }
+        }
+    }
+
+    fn initialize_epoch_slots(
+        id: Pubkey,
+        blockstore: &Blockstore,
+        slots_in_gossip: &mut BTreeSet<Slot>,
+        old_incomplete_slots: &BTreeSet<Slot>,
+        root: Slot,
+        epoch_schedule: &EpochSchedule,
+        cluster_info: &RwLock<ClusterInfo>,
+    ) {
+        Self::get_completed_slots_past_root(blockstore, slots_in_gossip, root, epoch_schedule);
+
         // Safe to set into gossip because by this time, the leader schedule cache should
         // also be updated with the latest root (done in blockstore_processor) and thus
         // will provide a schedule to window_service for any incoming shreds up to the
         // last_confirmed_epoch.
-        cluster_info.push_lowest_slot(id, blockstore.lowest_slot());
+        cluster_info.write().unwrap().push_epoch_slots(
+            id,
+            root,
+            blockstore.lowest_slot(),
+            slots_in_gossip.clone(),
+            old_incomplete_slots,
+        );
     }
 
-    fn update_completed_slots(
+    // Update the gossiped structure used for the "Repairmen" repair protocol. See docs
+    // for details.
+    fn update_epoch_slots(
+        id: Pubkey,
+        latest_known_root: Slot,
+        lowest_slot: Slot,
+        completed_slot_cache: &mut BTreeSet<Slot>,
+        incomplete_slot_stash: &mut BTreeSet<Slot>,
+        cluster_info: &RwLock<ClusterInfo>,
         completed_slots_receiver: &CompletedSlotsReceiver,
-        cluster_info: &ClusterInfo,
     ) {
-        let mut slots: Vec<Slot> = vec![];
-        while let Ok(mut more) = completed_slots_receiver.try_recv() {
-            slots.append(&mut more);
+        let mut should_update = false;
+        while let Ok(completed_slots) = completed_slots_receiver.try_recv() {
+            for slot in completed_slots {
+                let last_slot_in_stash = *incomplete_slot_stash.iter().next_back().unwrap_or(&0);
+                let removed_from_stash = incomplete_slot_stash.remove(&slot);
+                // If the newly completed slot was not being tracked in stash, and is > last
+                // slot being tracked in stash, add it to cache. Also, update gossip
+                if !removed_from_stash && slot >= last_slot_in_stash {
+                    should_update |= completed_slot_cache.insert(slot);
+                }
+                // If the slot was removed from stash, update gossip
+                should_update |= removed_from_stash;
+            }
         }
-        slots.sort();
-        if !slots.is_empty() {
-            cluster_info.push_epoch_slots(&slots);
+
+        if should_update {
+            if completed_slot_cache.len() >= COMPLETED_SLOT_CACHE_FLUSH_TRIGGER {
+                Self::stash_old_incomplete_slots(completed_slot_cache, incomplete_slot_stash);
+                let lowest_completed_slot_in_cache =
+                    *completed_slot_cache.iter().next().unwrap_or(&0);
+                Self::prune_incomplete_slot_stash(
+                    incomplete_slot_stash,
+                    lowest_completed_slot_in_cache,
+                );
+            }
+
+            cluster_info.write().unwrap().push_epoch_slots(
+                id,
+                latest_known_root,
+                lowest_slot,
+                completed_slot_cache.clone(),
+                incomplete_slot_stash,
+            );
         }
     }
 
-    fn update_lowest_slot(id: &Pubkey, lowest_slot: Slot, cluster_info: &ClusterInfo) {
-        cluster_info.push_lowest_slot(*id, lowest_slot);
+    fn stash_old_incomplete_slots(cache: &mut BTreeSet<Slot>, stash: &mut BTreeSet<Slot>) {
+        if cache.len() > MAX_COMPLETED_SLOT_CACHE_LEN {
+            let mut prev = *cache.iter().next().expect("Expected to find some slot");
+            cache.remove(&prev);
+            while cache.len() >= MAX_COMPLETED_SLOT_CACHE_LEN {
+                let next = *cache.iter().next().expect("Expected to find some slot");
+                cache.remove(&next);
+                // Prev slot and next slot are not included in incomplete slot list.
+                (prev + 1..next).for_each(|slot| {
+                    stash.insert(slot);
+                });
+                prev = next;
+            }
+        }
     }
 
-    fn initialize_epoch_slots(
-        blockstore: &Blockstore,
-        cluster_info: &ClusterInfo,
-        completed_slots_receiver: &CompletedSlotsReceiver,
+    fn prune_incomplete_slot_stash(
+        stash: &mut BTreeSet<Slot>,
+        lowest_completed_slot_in_cache: Slot,
     ) {
-        let root = blockstore.last_root();
-        let mut slots: Vec<_> = blockstore
+        if let Some(oldest_incomplete_slot) = stash.iter().next() {
+            // Prune old slots
+            // Prune in batches to reduce overhead. Pruning starts when oldest slot is 1.5 epochs
+            // earlier than the new root. But, we prune all the slots that are older than 1 epoch.
+            // So slots in a batch of half epoch are getting pruned
+            if oldest_incomplete_slot + DEFAULT_SLOTS_PER_EPOCH + DEFAULT_SLOTS_PER_EPOCH / 2
+                < lowest_completed_slot_in_cache
+            {
+                let oldest_slot_to_retain =
+                    lowest_completed_slot_in_cache.saturating_sub(DEFAULT_SLOTS_PER_EPOCH);
+                *stash = stash
+                    .range((Included(&oldest_slot_to_retain), Unbounded))
+                    .cloned()
+                    .collect();
+            }
+        }
+    }
+
+    #[allow(dead_code)]
+    fn find_incomplete_slots(blockstore: &Blockstore, root: Slot) -> HashSet<Slot> {
+        blockstore
             .live_slots_iterator(root)
             .filter_map(|(slot, slot_meta)| {
-                if slot_meta.is_full() {
+                if !slot_meta.is_full() {
                     Some(slot)
                 } else {
                     None
                 }
             })
-            .collect();
-
-        while let Ok(mut more) = completed_slots_receiver.try_recv() {
-            slots.append(&mut more);
-        }
-        slots.sort();
-        slots.dedup();
-        if !slots.is_empty() {
-            cluster_info.push_epoch_slots(&slots);
-        }
+            .collect()
     }
 
     pub fn join(self) -> thread::Result<()> {
@@ -370,11 +427,15 @@ impl RepairService {
 mod test {
     use super::*;
     use crate::cluster_info::Node;
+    use itertools::Itertools;
+    use rand::seq::SliceRandom;
+    use rand::{thread_rng, Rng};
     use solana_ledger::blockstore::{
         make_chaining_slot_entries, make_many_slot_entries, make_slot_entries,
     };
     use solana_ledger::shred::max_ticks_per_n_shreds;
     use solana_ledger::{blockstore::Blockstore, get_tmp_ledger_path};
+    use std::thread::Builder;
 
     #[test]
     pub fn test_repair_orphan() {
@@ -590,15 +651,342 @@ mod test {
     }
 
     #[test]
-    pub fn test_update_lowest_slot() {
-        let node_info = Node::new_localhost_with_pubkey(&Pubkey::default());
-        let cluster_info = ClusterInfo::new_with_invalid_keypair(node_info.info.clone());
-        RepairService::update_lowest_slot(&Pubkey::default(), 5, &cluster_info);
-        let lowest = cluster_info
-            .get_lowest_slot_for_node(&Pubkey::default(), None, |lowest_slot, _| {
-                lowest_slot.clone()
-            })
-            .unwrap();
-        assert_eq!(lowest.lowest, 5);
+    pub fn test_get_completed_slots_past_root() {
+        let blockstore_path = get_tmp_ledger_path!();
+        {
+            let blockstore = Blockstore::open(&blockstore_path).unwrap();
+            let num_entries_per_slot = 10;
+            let root = 10;
+
+            let fork1 = vec![5, 7, root, 15, 20, 21];
+            let fork1_shreds: Vec<_> = make_chaining_slot_entries(&fork1, num_entries_per_slot)
+                .into_iter()
+                .flat_map(|(shreds, _)| shreds)
+                .collect();
+            let fork2 = vec![8, 12];
+            let fork2_shreds = make_chaining_slot_entries(&fork2, num_entries_per_slot);
+
+            // Remove the last shred from each slot to make an incomplete slot
+            let fork2_incomplete_shreds: Vec<_> = fork2_shreds
+                .into_iter()
+                .flat_map(|(mut shreds, _)| {
+                    shreds.pop();
+                    shreds
+                })
+                .collect();
+            let mut full_slots = BTreeSet::new();
+
+            blockstore.insert_shreds(fork1_shreds, None, false).unwrap();
+            blockstore
+                .insert_shreds(fork2_incomplete_shreds, None, false)
+                .unwrap();
+
+            // Test that only slots > root from fork1 were included
+            let epoch_schedule = EpochSchedule::custom(32, 32, false);
+
+            RepairService::get_completed_slots_past_root(
+                &blockstore,
+                &mut full_slots,
+                root,
+                &epoch_schedule,
+            );
+
+            let mut expected: BTreeSet<_> = fork1.into_iter().filter(|x| *x > root).collect();
+            assert_eq!(full_slots, expected);
+
+            // Test that slots past the last confirmed epoch boundary don't get included
+            let last_epoch = epoch_schedule.get_leader_schedule_epoch(root);
+            let last_slot = epoch_schedule.get_last_slot_in_epoch(last_epoch);
+            let fork3 = vec![last_slot, last_slot + 1];
+            let fork3_shreds: Vec<_> = make_chaining_slot_entries(&fork3, num_entries_per_slot)
+                .into_iter()
+                .flat_map(|(shreds, _)| shreds)
+                .collect();
+            blockstore.insert_shreds(fork3_shreds, None, false).unwrap();
+            RepairService::get_completed_slots_past_root(
+                &blockstore,
+                &mut full_slots,
+                root,
+                &epoch_schedule,
+            );
+            expected.insert(last_slot);
+            assert_eq!(full_slots, expected);
+        }
+        Blockstore::destroy(&blockstore_path).expect("Expected successful database destruction");
+    }
+
+    #[test]
+    pub fn test_update_epoch_slots() {
+        let blockstore_path = get_tmp_ledger_path!();
+        {
+            // Create blockstore
+            let (blockstore, _, completed_slots_receiver) =
+                Blockstore::open_with_signal(&blockstore_path).unwrap();
+
+            let blockstore = Arc::new(blockstore);
+
+            let mut root = 0;
+            let num_slots = 100;
+            let entries_per_slot = 5;
+            let blockstore_ = blockstore.clone();
+
+            // Spin up thread to write to blockstore
+            let writer = Builder::new()
+                .name("writer".to_string())
+                .spawn(move || {
+                    let slots: Vec<_> = (1..num_slots + 1).collect();
+                    let mut shreds: Vec<_> = make_chaining_slot_entries(&slots, entries_per_slot)
+                        .into_iter()
+                        .flat_map(|(shreds, _)| shreds)
+                        .collect();
+                    shreds.shuffle(&mut thread_rng());
+                    let mut i = 0;
+                    let max_step = entries_per_slot * 4;
+                    let repair_interval_ms = 10;
+                    let mut rng = rand::thread_rng();
+                    let num_shreds = shreds.len();
+                    while i < num_shreds {
+                        let step = rng.gen_range(1, max_step + 1) as usize;
+                        let step = std::cmp::min(step, num_shreds - i);
+                        let shreds_to_insert = shreds.drain(..step).collect_vec();
+                        blockstore_
+                            .insert_shreds(shreds_to_insert, None, false)
+                            .unwrap();
+                        sleep(Duration::from_millis(repair_interval_ms));
+                        i += step;
+                    }
+                })
+                .unwrap();
+
+            let mut completed_slots = BTreeSet::new();
+            let node_info = Node::new_localhost_with_pubkey(&Pubkey::default());
+            let cluster_info = RwLock::new(ClusterInfo::new_with_invalid_keypair(
+                node_info.info.clone(),
+            ));
+
+            let mut old_incomplete_slots: BTreeSet<Slot> = BTreeSet::new();
+            while completed_slots.len() < num_slots as usize {
+                RepairService::update_epoch_slots(
+                    Pubkey::default(),
+                    root,
+                    blockstore.lowest_slot(),
+                    &mut completed_slots,
+                    &mut old_incomplete_slots,
+                    &cluster_info,
+                    &completed_slots_receiver,
+                );
+            }
+
+            let mut expected: BTreeSet<_> = (1..num_slots + 1).collect();
+            assert_eq!(completed_slots, expected);
+
+            // Update with new root, should filter out the slots <= root
+            root = num_slots / 2;
+            let (shreds, _) = make_slot_entries(num_slots + 2, num_slots + 1, entries_per_slot);
+            blockstore.insert_shreds(shreds, None, false).unwrap();
+            RepairService::update_epoch_slots(
+                Pubkey::default(),
+                root,
+                0,
+                &mut completed_slots,
+                &mut old_incomplete_slots,
+                &cluster_info,
+                &completed_slots_receiver,
+            );
+            expected.insert(num_slots + 2);
+            assert_eq!(completed_slots, expected);
+            writer.join().unwrap();
+        }
+        Blockstore::destroy(&blockstore_path).expect("Expected successful database destruction");
+    }
+
+    #[test]
+    fn test_stash_old_incomplete_slots() {
+        let mut cache: BTreeSet<Slot> = BTreeSet::new();
+        let mut stash: BTreeSet<Slot> = BTreeSet::new();
+
+        // When cache is empty.
+        RepairService::stash_old_incomplete_slots(&mut cache, &mut stash);
+        assert_eq!(stash.len(), 0);
+
+        // Insert some slots in cache ( < MAX_COMPLETED_SLOT_CACHE_LEN + 1)
+        cache.insert(101);
+        cache.insert(102);
+        cache.insert(104);
+        cache.insert(105);
+
+        // Not enough slots in cache. So stash should remain empty.
+        RepairService::stash_old_incomplete_slots(&mut cache, &mut stash);
+        assert_eq!(stash.len(), 0);
+        assert_eq!(cache.len(), 4);
+
+        // Insert slots in cache ( = MAX_COMPLETED_SLOT_CACHE_LEN)
+        let mut cache: BTreeSet<Slot> = BTreeSet::new();
+        (0..MAX_COMPLETED_SLOT_CACHE_LEN as u64)
+            .into_iter()
+            .for_each(|slot| {
+                cache.insert(slot);
+            });
+
+        // Not enough slots in cache. So stash should remain empty.
+        RepairService::stash_old_incomplete_slots(&mut cache, &mut stash);
+        assert_eq!(stash.len(), 0);
+        assert_eq!(cache.len(), MAX_COMPLETED_SLOT_CACHE_LEN);
+
+        // Insert 1 more to cross the threshold
+        cache.insert(MAX_COMPLETED_SLOT_CACHE_LEN as u64);
+        RepairService::stash_old_incomplete_slots(&mut cache, &mut stash);
+        // Stash is still empty, as no missing slots
+        assert_eq!(stash.len(), 0);
+        // It removed some entries from cache
+        assert_eq!(cache.len(), MAX_COMPLETED_SLOT_CACHE_LEN - 1);
+
+        // Insert more slots to create a missing slot
+        let mut cache: BTreeSet<Slot> = BTreeSet::new();
+        cache.insert(0);
+        (2..=MAX_COMPLETED_SLOT_CACHE_LEN as u64 + 2)
+            .into_iter()
+            .for_each(|slot| {
+                cache.insert(slot);
+            });
+        RepairService::stash_old_incomplete_slots(&mut cache, &mut stash);
+
+        // Stash is not empty
+        assert!(stash.contains(&1));
+        // It removed some entries from cache
+        assert_eq!(cache.len(), MAX_COMPLETED_SLOT_CACHE_LEN - 1);
+
+        // Test multiple missing slots at dispersed locations
+        let mut cache: BTreeSet<Slot> = BTreeSet::new();
+        (0..MAX_COMPLETED_SLOT_CACHE_LEN as u64 * 2)
+            .into_iter()
+            .for_each(|slot| {
+                cache.insert(slot);
+            });
+
+        cache.remove(&10);
+        cache.remove(&11);
+
+        cache.remove(&28);
+        cache.remove(&29);
+
+        cache.remove(&148);
+        cache.remove(&149);
+        cache.remove(&150);
+        cache.remove(&151);
+
+        RepairService::stash_old_incomplete_slots(&mut cache, &mut stash);
+
+        // Stash is not empty
+        assert!(stash.contains(&10));
+        assert!(stash.contains(&11));
+        assert!(stash.contains(&28));
+        assert!(stash.contains(&29));
+        assert!(stash.contains(&148));
+        assert!(stash.contains(&149));
+        assert!(stash.contains(&150));
+        assert!(stash.contains(&151));
+
+        assert!(!stash.contains(&147));
+        assert!(!stash.contains(&152));
+        // It removed some entries from cache
+        assert_eq!(cache.len(), MAX_COMPLETED_SLOT_CACHE_LEN - 1);
+        (MAX_COMPLETED_SLOT_CACHE_LEN + 1..MAX_COMPLETED_SLOT_CACHE_LEN * 2)
+            .into_iter()
+            .for_each(|slot| {
+                let slot: u64 = slot as u64;
+                assert!(cache.contains(&slot));
+            });
+    }
+
+    #[test]
+    fn test_prune_incomplete_slot_stash() {
+        // Prune empty stash
+        let mut stash: BTreeSet<Slot> = BTreeSet::new();
+        RepairService::prune_incomplete_slot_stash(&mut stash, 0);
+        assert!(stash.is_empty());
+
+        // Prune stash with slots < DEFAULT_SLOTS_PER_EPOCH
+        stash.insert(0);
+        stash.insert(10);
+        stash.insert(11);
+        stash.insert(50);
+        assert_eq!(stash.len(), 4);
+        RepairService::prune_incomplete_slot_stash(&mut stash, 100);
+        assert_eq!(stash.len(), 4);
+
+        // Prune stash with slots > DEFAULT_SLOTS_PER_EPOCH, but < 1.5 * DEFAULT_SLOTS_PER_EPOCH
+        stash.insert(DEFAULT_SLOTS_PER_EPOCH + 50);
+        assert_eq!(stash.len(), 5);
+        RepairService::prune_incomplete_slot_stash(&mut stash, DEFAULT_SLOTS_PER_EPOCH + 100);
+        assert_eq!(stash.len(), 5);
+
+        // Prune stash with slots > 1.5 * DEFAULT_SLOTS_PER_EPOCH
+        stash.insert(DEFAULT_SLOTS_PER_EPOCH + DEFAULT_SLOTS_PER_EPOCH / 2);
+        assert_eq!(stash.len(), 6);
+        RepairService::prune_incomplete_slot_stash(
+            &mut stash,
+            DEFAULT_SLOTS_PER_EPOCH + DEFAULT_SLOTS_PER_EPOCH / 2 + 1,
+        );
+        assert_eq!(stash.len(), 2);
+    }
+
+    #[test]
+    fn test_find_incomplete_slots() {
+        let blockstore_path = get_tmp_ledger_path!();
+        {
+            let blockstore = Blockstore::open(&blockstore_path).unwrap();
+            let num_entries_per_slot = 100;
+            let (mut shreds, _) = make_slot_entries(0, 0, num_entries_per_slot);
+            assert!(shreds.len() > 1);
+            let (shreds4, _) = make_slot_entries(4, 0, num_entries_per_slot);
+            shreds.extend(shreds4);
+            blockstore.insert_shreds(shreds, None, false).unwrap();
+
+            // Nothing is incomplete
+            assert!(RepairService::find_incomplete_slots(&blockstore, 0).is_empty());
+
+            // Insert a slot 5 that chains to an incomplete orphan slot 3
+            let (shreds5, _) = make_slot_entries(5, 3, num_entries_per_slot);
+            blockstore.insert_shreds(shreds5, None, false).unwrap();
+            assert_eq!(
+                RepairService::find_incomplete_slots(&blockstore, 0),
+                vec![3].into_iter().collect()
+            );
+
+            // Insert another incomplete orphan slot 2 that is the parent of slot 3.
+            // Both should be incomplete
+            let (shreds3, _) = make_slot_entries(3, 2, num_entries_per_slot);
+            blockstore
+                .insert_shreds(shreds3[1..].to_vec(), None, false)
+                .unwrap();
+            assert_eq!(
+                RepairService::find_incomplete_slots(&blockstore, 0),
+                vec![2, 3].into_iter().collect()
+            );
+
+            // Insert a incomplete slot 6 that chains to the root 0,
+            // should also be incomplete
+            let (shreds6, _) = make_slot_entries(6, 0, num_entries_per_slot);
+            blockstore
+                .insert_shreds(shreds6[1..].to_vec(), None, false)
+                .unwrap();
+            assert_eq!(
+                RepairService::find_incomplete_slots(&blockstore, 0),
+                vec![2, 3, 6].into_iter().collect()
+            );
+
+            // Complete slot 3, should no longer be marked incomplete
+            blockstore
+                .insert_shreds(shreds3[..].to_vec(), None, false)
+                .unwrap();
+
+            assert_eq!(
+                RepairService::find_incomplete_slots(&blockstore, 0),
+                vec![2, 6].into_iter().collect()
+            );
+        }
+
+        Blockstore::destroy(&blockstore_path).expect("Expected successful database destruction");
     }
 }

core/src/retransmit_stage.rs

@@ -2,9 +2,10 @@
 
 use crate::{
     cluster_info::{compute_retransmit_peers, ClusterInfo, DATA_PLANE_FANOUT},
-    cluster_slots::ClusterSlots,
+    packet::Packets,
     repair_service::RepairStrategy,
     result::{Error, Result},
+    streamer::PacketReceiver,
     window_service::{should_retransmit_and_persist, WindowService},
 };
 use crossbeam_channel::Receiver as CrossbeamReceiver;
@@ -16,9 +17,7 @@ use solana_ledger::{
 };
 use solana_measure::measure::Measure;
 use solana_metrics::inc_new_counter_error;
-use solana_perf::packet::Packets;
 use solana_sdk::epoch_schedule::EpochSchedule;
-use solana_streamer::streamer::PacketReceiver;
 use std::{
     cmp,
     net::UdpSocket,
@@ -38,7 +37,7 @@ const MAX_PACKET_BATCH_SIZE: usize = 100;
 fn retransmit(
     bank_forks: &Arc<RwLock<BankForks>>,
     leader_schedule_cache: &Arc<LeaderScheduleCache>,
-    cluster_info: &ClusterInfo,
+    cluster_info: &Arc<RwLock<ClusterInfo>>,
     r: &Arc<Mutex<PacketReceiver>>,
     sock: &UdpSocket,
     id: u32,
@@ -63,8 +62,11 @@ fn retransmit(
     let mut peers_len = 0;
     let stakes = staking_utils::staked_nodes_at_epoch(&r_bank, bank_epoch);
     let stakes = stakes.map(Arc::new);
-    let (peers, stakes_and_index) = cluster_info.sorted_retransmit_peers_and_stakes(stakes);
-    let my_id = cluster_info.id();
+    let (peers, stakes_and_index) = cluster_info
+        .read()
+        .unwrap()
+        .sorted_retransmit_peers_and_stakes(stakes);
+    let me = cluster_info.read().unwrap().my_data();
     let mut discard_total = 0;
     let mut repair_total = 0;
     let mut retransmit_total = 0;
@@ -85,7 +87,7 @@ fn retransmit(
 
             let mut compute_turbine_peers = Measure::start("turbine_start");
             let (my_index, mut shuffled_stakes_and_index) = ClusterInfo::shuffle_peers_and_index(
-                &my_id,
+                &me.id,
                 &peers,
                 &stakes_and_index,
                 packet.meta.seed,
@@ -151,7 +153,7 @@ pub fn retransmitter(
     sockets: Arc<Vec<UdpSocket>>,
     bank_forks: Arc<RwLock<BankForks>>,
     leader_schedule_cache: &Arc<LeaderScheduleCache>,
-    cluster_info: Arc<ClusterInfo>,
+    cluster_info: Arc<RwLock<ClusterInfo>>,
     r: Arc<Mutex<PacketReceiver>>,
 ) -> Vec<JoinHandle<()>> {
     (0..sockets.len())
@@ -203,7 +205,7 @@ impl RetransmitStage {
         bank_forks: Arc<RwLock<BankForks>>,
         leader_schedule_cache: &Arc<LeaderScheduleCache>,
         blockstore: Arc<Blockstore>,
-        cluster_info: &Arc<ClusterInfo>,
+        cluster_info: &Arc<RwLock<ClusterInfo>>,
         retransmit_sockets: Arc<Vec<UdpSocket>>,
         repair_socket: Arc<UdpSocket>,
         verified_receiver: CrossbeamReceiver<Vec<Packets>>,
@@ -212,7 +214,6 @@ impl RetransmitStage {
         epoch_schedule: EpochSchedule,
         cfg: Option<Arc<AtomicBool>>,
         shred_version: u16,
-        cluster_slots: Arc<ClusterSlots>,
     ) -> Self {
         let (retransmit_sender, retransmit_receiver) = channel();
 
@@ -255,7 +256,6 @@ impl RetransmitStage {
                 );
                 rv && is_connected
             },
-            cluster_slots,
         );
 
         let thread_hdls = t_retransmit;
@@ -278,11 +278,11 @@ impl RetransmitStage {
 mod tests {
     use super::*;
     use crate::contact_info::ContactInfo;
+    use crate::genesis_utils::{create_genesis_config, GenesisConfigInfo};
+    use crate::packet::{self, Meta, Packet, Packets};
     use solana_ledger::blockstore_processor::{process_blockstore, ProcessOptions};
     use solana_ledger::create_new_tmp_ledger;
-    use solana_ledger::genesis_utils::{create_genesis_config, GenesisConfigInfo};
     use solana_net_utils::find_available_port_in_range;
-    use solana_perf::packet::{Meta, Packet, Packets};
     use solana_sdk::pubkey::Pubkey;
     use std::net::{IpAddr, Ipv4Addr};
 
@@ -313,11 +313,11 @@ mod tests {
             .unwrap();
 
         let other = ContactInfo::new_localhost(&Pubkey::new_rand(), 0);
-        let cluster_info = ClusterInfo::new_with_invalid_keypair(other);
+        let mut cluster_info = ClusterInfo::new_with_invalid_keypair(other);
         cluster_info.insert_info(me);
 
         let retransmit_socket = Arc::new(vec![UdpSocket::bind("0.0.0.0:0").unwrap()]);
-        let cluster_info = Arc::new(cluster_info);
+        let cluster_info = Arc::new(RwLock::new(cluster_info));
 
         let (retransmit_sender, retransmit_receiver) = channel();
         let t_retransmit = retransmitter(
@@ -333,7 +333,7 @@ mod tests {
         // it should send this over the sockets.
         retransmit_sender.send(packets).unwrap();
         let mut packets = Packets::new(vec![]);
-        solana_streamer::packet::recv_from(&mut packets, &me_retransmit, 1).unwrap();
+        packet::recv_from(&mut packets, &me_retransmit, 1).unwrap();
         assert_eq!(packets.packets.len(), 1);
         assert_eq!(packets.packets[0].meta.repair, false);
 
@@ -349,7 +349,7 @@ mod tests {
         let packets = Packets::new(vec![repair, Packet::default()]);
         retransmit_sender.send(packets).unwrap();
         let mut packets = Packets::new(vec![]);
-        solana_streamer::packet::recv_from(&mut packets, &me_retransmit, 1).unwrap();
+        packet::recv_from(&mut packets, &me_retransmit, 1).unwrap();
         assert_eq!(packets.packets.len(), 1);
         assert_eq!(packets.packets[0].meta.repair, false);
     }