CLI BIP32 prep: KeypairUrl refactor (backport #16592) (#16605)

* clap-utils: Rename KeypairUrl to SignerSource

(cherry picked from commit 09dcc9ea04)

* clap-utils: Reduce SignerSource's visibility

(cherry picked from commit c5ab3ba6f1)

* clap-utils: Use `uriparse` crate to parse `SignerSource`

(cherry picked from commit 5d1ef5d01d)

* clap-utils: Add explicit schemes for `ask` and `file` `SignerSource`s

(cherry picked from commit 6444f0e57b)

Co-authored-by: Trent Nelson <trent@solana.com>

.buildkite/hooks/pre-command

@@ -36,7 +36,4 @@ export CARGO_TARGET_CACHE=$HOME/cargo-target-cache/"$CHANNEL"-"$BUILDKITE_LABEL"
   # `std:
   #    "found possibly newer version of crate `std` which `xyz` depends on
   rm -rf target/bpfel-unknown-unknown
-  if [[ $BUILDKITE_LABEL = "stable-perf" ]]; then
-    rm -rf target/release
-  fi
 )

.travis.yml

@@ -38,7 +38,6 @@ jobs:
         - readlink -f .
       script:
         - source ci/env.sh
-        - rustup set profile default
         - ci/publish-tarball.sh
       deploy:
         - provider: s3
@@ -61,12 +60,6 @@ jobs:
     - <<: *release-artifacts
       name: "Windows release artifacts"
       os: windows
-      install:
-        - choco install openssl
-        - export OPENSSL_DIR="C:\Program Files\OpenSSL-Win64"
-        - source ci/rust-version.sh
-        - PATH="/usr/local/opt/coreutils/libexec/gnubin:$PATH"
-        - readlink -f .
     #  Linux release artifacts are still built by ci/buildkite-secondary.yml
     #- <<: *release-artifacts
     #  name: "Linux release artifacts"
@@ -80,7 +73,7 @@ jobs:
 
       language: node_js
       node_js:
-        - "lts/*"
+        - "node"
 
       cache:
         directories:

Cargo.toml

@@ -21,7 +21,6 @@ members = [
     "perf",
     "validator",
     "genesis",
-    "genesis-utils",
     "gossip",
     "install",
     "keygen",
@@ -32,6 +31,7 @@ members = [
     "log-analyzer",
     "merkle-root-bench",
     "merkle-tree",
+    "stake-o-matic",
     "storage-bigtable",
     "storage-proto",
     "streamer",
@@ -39,17 +39,21 @@ members = [
     "metrics",
     "net-shaper",
     "notifier",
-    "poh",
     "poh-bench",
     "program-test",
+    "programs/secp256k1",
     "programs/bpf_loader",
+    "programs/budget",
     "programs/config",
     "programs/exchange",
-    "programs/secp256k1",
+    "programs/failure",
+    "programs/noop",
+    "programs/ownable",
     "programs/stake",
+    "programs/vest",
     "programs/vote",
     "remote-wallet",
-    "rpc",
+    "ramp-tps",
     "runtime",
     "runtime/store-tool",
     "sdk",
@@ -57,6 +61,7 @@ members = [
     "sdk/cargo-test-bpf",
     "scripts",
     "stake-accounts",
+    "stake-monitor",
     "sys-tuner",
     "tokens",
     "transaction-status",
@@ -72,11 +77,3 @@ members = [
 exclude = [
     "programs/bpf",
 ]
-
-# TODO: Remove once the "simd-accel" feature from the reed-solomon-erasure
-# dependency is supported on Apple M1. v2 of the feature resolver is needed to
-# specify arch-specific features.
-resolver = "2"
-
-[profile.dev]
-split-debuginfo = "unpacked"

README.md

@@ -1,6 +1,6 @@
 <p align="center">
   <a href="https://solana.com">
-    <img alt="Solana" src="https://i.imgur.com/IKyzQ6T.png" width="250" />
+    <img alt="Solana" src="https://i.imgur.com/OMnvVEz.png" width="250" />
   </a>
 </p>
 
@@ -19,7 +19,7 @@ $ source $HOME/.cargo/env
 $ rustup component add rustfmt
 ```
 
-Please make sure you are always using the latest stable rust version by running:
+Please sure you are always using the latest stable rust version by running:
 
 ```bash
 $ rustup update
@@ -32,12 +32,6 @@ $ sudo apt-get update
 $ sudo apt-get install libssl-dev libudev-dev pkg-config zlib1g-dev llvm clang make
 ```
 
-On Mac M1s, make sure you set up your terminal & homebrew [to use](https://5balloons.info/correct-way-to-install-and-use-homebrew-on-m1-macs/) Rosetta. You can install it with:
-
-```bash
-$ softwareupdate --install-rosetta
-```
-
 ## **2. Download the source code.**
 
 ```bash
@@ -51,6 +45,11 @@ $ cd solana
 $ cargo build
 ```
 
+## **4. Run a minimal local cluster.**
+```bash
+$ ./run.sh
+```
+
 # Testing
 
 **Run the test suite:**

SECURITY.md

@@ -51,27 +51,13 @@ The following components are out of scope for the bounty program
 * Attacks that require social engineering
 
 Eligibility:
-* The participant submitting the bug report shall follow the process outlined within this document
+* The participant submitting the bug bounty shall follow the process outlined within this document
 * Valid exploits can be eligible even if they are not successfully executed on the cluster
 * Multiple submissions for the same class of exploit are still eligible for compensation, though may be compensated at a lower rate, however these will be assessed on a case-by-case basis
 * Participants must complete KYC and sign the participation agreement here when the registrations are open https://solana.com/validator-registration. Security exploits will still be assessed and open for submission at all times. This needs only be done prior to distribution of tokens.
 
-Payment of Bug Bounties:
-* Payments for eligible bug reports are distributed monthly.
-* Bounties for all bug reports submitted in a given month are paid out in the middle of the
-following month.
-* The SOL/USD conversion rate used for payments is the market price at the end of
-  the last day of the month for the month in which the bug was submitted.
-* The reference for this price is the Closing Price given by Coingecko.com on
-  that date given here:
-  https://www.coingecko.com/en/coins/solana/historical_data/usd#panel
-* For example, for all bugs submitted in March 2021, the SOL/USD price for bug
-  payouts is the Close price on 2021-03-31 of $19.49.  This applies to all bugs
-  submitted in March 2021, to be paid in mid-April 2021.
-* Bug bounties are paid out in
-[stake accounts](https://solana.com/staking) with a
-[lockup](https://docs.solana.com/staking/stake-accounts#lockups)
-expiring 12 months from the last day of the month in which the bug was submitted.
+Notes:
+* All locked tokens can be staked during the lockup period
 
 <a name="process"></a>
 ## Incident Response Process

account-decoder/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "solana-account-decoder"
-version = "1.7.18"
+version = "1.6.6"
 description = "Solana account decoder"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -19,10 +19,11 @@ lazy_static = "1.4.0"
 serde = "1.0.122"
 serde_derive = "1.0.103"
 serde_json = "1.0.56"
-solana-config-program = { path = "../programs/config", version = "=1.7.18" }
-solana-sdk = { path = "../sdk", version = "=1.7.18" }
-solana-vote-program = { path = "../programs/vote", version = "=1.7.18" }
-spl-token-v2-0 = { package = "spl-token", version = "=3.2.0", features = ["no-entrypoint"] }
+solana-config-program = { path = "../programs/config", version = "=1.6.6" }
+solana-sdk = { path = "../sdk", version = "=1.6.6" }
+solana-stake-program = { path = "../programs/stake", version = "=1.6.6" }
+solana-vote-program = { path = "../programs/vote", version = "=1.6.6" }
+spl-token-v2-0 = { package = "spl-token", version = "=3.1.0", features = ["no-entrypoint"] }
 thiserror = "1.0"
 zstd = "0.5.1"
 

account-decoder/src/lib.rs

@@ -28,7 +28,6 @@ use {
 
 pub type StringAmount = String;
 pub type StringDecimals = String;
-pub const MAX_BASE58_BYTES: usize = 128;
 
 /// A duplicate representation of an Account for pretty JSON serialization
 #[derive(Serialize, Deserialize, Clone, Debug)]
@@ -49,7 +48,7 @@ pub enum UiAccountData {
     Binary(String, UiAccountEncoding),
 }
 
-#[derive(Serialize, Deserialize, Clone, Copy, Debug, PartialEq, Eq, Hash)]
+#[derive(Serialize, Deserialize, Clone, Debug, PartialEq)]
 #[serde(rename_all = "camelCase")]
 pub enum UiAccountEncoding {
     Binary, // Legacy. Retained for RPC backwards compatibility
@@ -61,53 +60,41 @@ pub enum UiAccountEncoding {
 }
 
 impl UiAccount {
-    fn encode_bs58<T: ReadableAccount>(
-        account: &T,
-        data_slice_config: Option<UiDataSliceConfig>,
-    ) -> String {
-        if account.data().len() <= MAX_BASE58_BYTES {
-            bs58::encode(slice_data(account.data(), data_slice_config)).into_string()
-        } else {
-            "error: data too large for bs58 encoding".to_string()
-        }
-    }
-
     pub fn encode<T: ReadableAccount>(
         pubkey: &Pubkey,
-        account: &T,
+        account: T,
         encoding: UiAccountEncoding,
         additional_data: Option<AccountAdditionalData>,
         data_slice_config: Option<UiDataSliceConfig>,
     ) -> Self {
         let data = match encoding {
-            UiAccountEncoding::Binary => {
-                let data = Self::encode_bs58(account, data_slice_config);
-                UiAccountData::LegacyBinary(data)
-            }
-            UiAccountEncoding::Base58 => {
-                let data = Self::encode_bs58(account, data_slice_config);
-                UiAccountData::Binary(data, encoding)
-            }
+            UiAccountEncoding::Binary => UiAccountData::LegacyBinary(
+                bs58::encode(slice_data(&account.data(), data_slice_config)).into_string(),
+            ),
+            UiAccountEncoding::Base58 => UiAccountData::Binary(
+                bs58::encode(slice_data(&account.data(), data_slice_config)).into_string(),
+                encoding,
+            ),
             UiAccountEncoding::Base64 => UiAccountData::Binary(
-                base64::encode(slice_data(account.data(), data_slice_config)),
+                base64::encode(slice_data(&account.data(), data_slice_config)),
                 encoding,
             ),
             UiAccountEncoding::Base64Zstd => {
                 let mut encoder = zstd::stream::write::Encoder::new(Vec::new(), 0).unwrap();
                 match encoder
-                    .write_all(slice_data(account.data(), data_slice_config))
+                    .write_all(slice_data(&account.data(), data_slice_config))
                     .and_then(|()| encoder.finish())
                 {
                     Ok(zstd_data) => UiAccountData::Binary(base64::encode(zstd_data), encoding),
                     Err(_) => UiAccountData::Binary(
-                        base64::encode(slice_data(account.data(), data_slice_config)),
+                        base64::encode(slice_data(&account.data(), data_slice_config)),
                         UiAccountEncoding::Base64,
                     ),
                 }
             }
             UiAccountEncoding::JsonParsed => {
                 if let Ok(parsed_data) =
-                    parse_account_data(pubkey, account.owner(), account.data(), additional_data)
+                    parse_account_data(pubkey, &account.owner(), &account.data(), additional_data)
                 {
                     UiAccountData::Json(parsed_data)
                 } else {
@@ -179,7 +166,7 @@ impl Default for UiFeeCalculator {
     }
 }
 
-#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
+#[derive(Clone, Copy, Debug, PartialEq, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct UiDataSliceConfig {
     pub offset: usize,
@@ -237,7 +224,7 @@ mod test {
     fn test_base64_zstd() {
         let encoded_account = UiAccount::encode(
             &Pubkey::default(),
-            &AccountSharedData::from(Account {
+            AccountSharedData::from(Account {
                 data: vec![0; 1024],
                 ..Account::default()
             }),

account-decoder/src/parse_account_data.rs

@@ -9,14 +9,14 @@ use crate::{
 };
 use inflector::Inflector;
 use serde_json::Value;
-use solana_sdk::{instruction::InstructionError, pubkey::Pubkey, stake, system_program, sysvar};
+use solana_sdk::{instruction::InstructionError, pubkey::Pubkey, system_program, sysvar};
 use std::collections::HashMap;
 use thiserror::Error;
 
 lazy_static! {
     static ref BPF_UPGRADEABLE_LOADER_PROGRAM_ID: Pubkey = solana_sdk::bpf_loader_upgradeable::id();
     static ref CONFIG_PROGRAM_ID: Pubkey = solana_config_program::id();
-    static ref STAKE_PROGRAM_ID: Pubkey = stake::program::id();
+    static ref STAKE_PROGRAM_ID: Pubkey = solana_stake_program::id();
     static ref SYSTEM_PROGRAM_ID: Pubkey = system_program::id();
     static ref SYSVAR_PROGRAM_ID: Pubkey = sysvar::id();
     static ref TOKEN_PROGRAM_ID: Pubkey = spl_token_id_v2_0();

account-decoder/src/parse_config.rs

@@ -6,10 +6,10 @@ use bincode::deserialize;
 use serde_json::Value;
 use solana_config_program::{get_config_data, ConfigKeys};
 use solana_sdk::pubkey::Pubkey;
-use solana_sdk::stake::config::{self as stake_config, Config as StakeConfig};
+use solana_stake_program::config::Config as StakeConfig;
 
 pub fn parse_config(data: &[u8], pubkey: &Pubkey) -> Result<ConfigAccountType, ParseAccountError> {
-    let parsed_account = if pubkey == &stake_config::id() {
+    let parsed_account = if pubkey == &solana_stake_program::config::id() {
         get_config_data(data)
             .ok()
             .and_then(|data| deserialize::<StakeConfig>(data).ok())
@@ -37,7 +37,7 @@ fn parse_config_data<T>(data: &[u8], keys: Vec<(Pubkey, bool)>) -> Option<UiConf
 where
     T: serde::de::DeserializeOwned,
 {
-    let config_data: T = deserialize(get_config_data(data).ok()?).ok()?;
+    let config_data: T = deserialize(&get_config_data(data).ok()?).ok()?;
     let keys = keys
         .iter()
         .map(|key| UiConfigKey {
@@ -101,7 +101,11 @@ mod test {
         };
         let stake_config_account = create_config_account(vec![], &stake_config, 10);
         assert_eq!(
-            parse_config(stake_config_account.data(), &stake_config::id()).unwrap(),
+            parse_config(
+                &stake_config_account.data(),
+                &solana_stake_program::config::id()
+            )
+            .unwrap(),
             ConfigAccountType::StakeConfig(UiStakeConfig {
                 warmup_cooldown_rate: 0.25,
                 slash_penalty: 50,
@@ -121,7 +125,7 @@ mod test {
             10,
         );
         assert_eq!(
-            parse_config(validator_info_config_account.data(), &info_pubkey).unwrap(),
+            parse_config(&validator_info_config_account.data(), &info_pubkey).unwrap(),
             ConfigAccountType::ValidatorInfo(UiConfig {
                 keys: vec![
                     UiConfigKey {

account-decoder/src/parse_stake.rs

@@ -4,7 +4,7 @@ use crate::{
 };
 use bincode::deserialize;
 use solana_sdk::clock::{Epoch, UnixTimestamp};
-use solana_sdk::stake::state::{Authorized, Delegation, Lockup, Meta, Stake, StakeState};
+use solana_stake_program::stake_state::{Authorized, Delegation, Lockup, Meta, Stake, StakeState};
 
 pub fn parse_stake(data: &[u8]) -> Result<StakeAccountType, ParseAccountError> {
     let stake_state: StakeState = deserialize(data)

account-decoder/src/parse_token.rs

@@ -14,23 +14,23 @@ use std::str::FromStr;
 // A helper function to convert spl_token_v2_0::id() as spl_sdk::pubkey::Pubkey to
 // solana_sdk::pubkey::Pubkey
 pub fn spl_token_id_v2_0() -> Pubkey {
-    Pubkey::new_from_array(spl_token_v2_0::id().to_bytes())
+    Pubkey::from_str(&spl_token_v2_0::id().to_string()).unwrap()
 }
 
 // A helper function to convert spl_token_v2_0::native_mint::id() as spl_sdk::pubkey::Pubkey to
 // solana_sdk::pubkey::Pubkey
 pub fn spl_token_v2_0_native_mint() -> Pubkey {
-    Pubkey::new_from_array(spl_token_v2_0::native_mint::id().to_bytes())
+    Pubkey::from_str(&spl_token_v2_0::native_mint::id().to_string()).unwrap()
 }
 
 // A helper function to convert a solana_sdk::pubkey::Pubkey to spl_sdk::pubkey::Pubkey
 pub fn spl_token_v2_0_pubkey(pubkey: &Pubkey) -> SplTokenPubkey {
-    SplTokenPubkey::new_from_array(pubkey.to_bytes())
+    SplTokenPubkey::from_str(&pubkey.to_string()).unwrap()
 }
 
 // A helper function to convert a spl_sdk::pubkey::Pubkey to solana_sdk::pubkey::Pubkey
 pub fn pubkey_from_spl_token_v2_0(pubkey: &SplTokenPubkey) -> Pubkey {
-    Pubkey::new_from_array(pubkey.to_bytes())
+    Pubkey::from_str(&pubkey.to_string()).unwrap()
 }
 
 pub fn parse_token(

accounts-bench/Cargo.toml

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

accounts-bench/src/main.rs

@@ -6,12 +6,10 @@ use rayon::prelude::*;
 use solana_measure::measure::Measure;
 use solana_runtime::{
     accounts::{create_test_accounts, update_accounts_bench, Accounts},
-    accounts_db::AccountShrinkThreshold,
-    accounts_index::AccountSecondaryIndexes,
-    ancestors::Ancestors,
+    accounts_index::Ancestors,
 };
 use solana_sdk::{genesis_config::ClusterType, pubkey::Pubkey};
-use std::{env, fs, path::PathBuf};
+use std::{collections::HashSet, env, fs, path::PathBuf};
 
 fn main() {
     solana_logger::setup();
@@ -60,13 +58,8 @@ fn main() {
     if fs::remove_dir_all(path.clone()).is_err() {
         println!("Warning: Couldn't remove {:?}", path);
     }
-    let accounts = Accounts::new_with_config(
-        vec![path],
-        &ClusterType::Testnet,
-        AccountSecondaryIndexes::default(),
-        false,
-        AccountShrinkThreshold::default(),
-    );
+    let accounts =
+        Accounts::new_with_config(vec![path], &ClusterType::Testnet, HashSet::new(), false);
     println!("Creating {} accounts", num_accounts);
     let mut create_time = Measure::start("create accounts");
     let pubkeys: Vec<_> = (0..num_slots)
@@ -90,19 +83,17 @@ fn main() {
         num_slots,
         create_time
     );
-    let mut ancestors = Vec::with_capacity(num_slots);
-    ancestors.push(0);
+    let mut ancestors: Ancestors = vec![(0, 0)].into_iter().collect();
     for i in 1..num_slots {
-        ancestors.push(i as u64);
+        ancestors.insert(i as u64, i - 1);
         accounts.add_root(i as u64);
     }
-    let ancestors = Ancestors::from(ancestors);
     let mut elapsed = vec![0; iterations];
     let mut elapsed_store = vec![0; iterations];
     for x in 0..iterations {
         if clean {
             let mut time = Measure::start("clean");
-            accounts.accounts_db.clean_accounts(None, false);
+            accounts.accounts_db.clean_accounts(None);
             time.stop();
             println!("{}", time);
             for slot in 0..num_slots {
@@ -121,8 +112,6 @@ fn main() {
                 solana_sdk::clock::Slot::default(),
                 &ancestors,
                 None,
-                false,
-                None,
             );
             time_store.stop();
             if results != results_store {

accounts-cluster-bench/Cargo.toml

@@ -2,7 +2,7 @@
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 edition = "2018"
 name = "solana-accounts-cluster-bench"
-version = "1.7.18"
+version = "1.6.6"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
@@ -13,24 +13,22 @@ clap = "2.33.1"
 log = "0.4.11"
 rand = "0.7.0"
 rayon = "1.4.1"
-solana-account-decoder = { path = "../account-decoder", version = "=1.7.18" }
-solana-clap-utils = { path = "../clap-utils", version = "=1.7.18" }
-solana-client = { path = "../client", version = "=1.7.18" }
-solana-core = { path = "../core", version = "=1.7.18" }
-solana-faucet = { path = "../faucet", version = "=1.7.18" }
-solana-gossip = { path = "../gossip", version = "=1.7.18" }
-solana-logger = { path = "../logger", version = "=1.7.18" }
-solana-measure = { path = "../measure", version = "=1.7.18" }
-solana-net-utils = { path = "../net-utils", version = "=1.7.18" }
-solana-runtime = { path = "../runtime", version = "=1.7.18" }
-solana-sdk = { path = "../sdk", version = "=1.7.18" }
-solana-streamer = { path = "../streamer", version = "=1.7.18" }
-solana-transaction-status = { path = "../transaction-status", version = "=1.7.18" }
-solana-version = { path = "../version", version = "=1.7.18" }
-spl-token-v2-0 = { package = "spl-token", version = "=3.2.0", features = ["no-entrypoint"] }
+solana-account-decoder = { path = "../account-decoder", version = "=1.6.6" }
+solana-clap-utils = { path = "../clap-utils", version = "=1.6.6" }
+solana-client = { path = "../client", version = "=1.6.6" }
+solana-core = { path = "../core", version = "=1.6.6" }
+solana-measure = { path = "../measure", version = "=1.6.6" }
+solana-logger = { path = "../logger", version = "=1.6.6" }
+solana-net-utils = { path = "../net-utils", version = "=1.6.6" }
+solana-faucet = { path = "../faucet", version = "=1.6.6" }
+solana-runtime = { path = "../runtime", version = "=1.6.6" }
+solana-sdk = { path = "../sdk", version = "=1.6.6" }
+solana-transaction-status = { path = "../transaction-status", version = "=1.6.6" }
+solana-version = { path = "../version", version = "=1.6.6" }
+spl-token-v2-0 = { package = "spl-token", version = "=3.1.0", features = ["no-entrypoint"] }
 
 [dev-dependencies]
-solana-local-cluster = { path = "../local-cluster", version = "=1.7.18" }
+solana-local-cluster = { path = "../local-cluster", version = "=1.6.6" }
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]

accounts-cluster-bench/src/main.rs

@@ -1,13 +1,13 @@
 #![allow(clippy::integer_arithmetic)]
-use clap::{crate_description, crate_name, value_t, values_t_or_exit, App, Arg};
+use clap::{crate_description, crate_name, value_t, value_t_or_exit, App, Arg};
 use log::*;
 use rand::{thread_rng, Rng};
 use rayon::prelude::*;
 use solana_account_decoder::parse_token::spl_token_v2_0_pubkey;
 use solana_clap_utils::input_parsers::pubkey_of;
 use solana_client::rpc_client::RpcClient;
+use solana_core::gossip_service::discover;
 use solana_faucet::faucet::{request_airdrop_transaction, FAUCET_PORT};
-use solana_gossip::gossip_service::discover;
 use solana_measure::measure::Measure;
 use solana_runtime::inline_spl_token_v2_0;
 use solana_sdk::{
@@ -20,7 +20,6 @@ use solana_sdk::{
     timing::timestamp,
     transaction::Transaction,
 };
-use solana_streamer::socket::SocketAddrSpace;
 use solana_transaction_status::parse_token::spl_token_v2_0_instruction;
 use std::{
     net::SocketAddr,
@@ -56,7 +55,7 @@ pub fn airdrop_lamports(
         );
 
         let (blockhash, _fee_calculator) = client.get_recent_blockhash().unwrap();
-        match request_airdrop_transaction(faucet_addr, &id.pubkey(), airdrop_amount, blockhash) {
+        match request_airdrop_transaction(&faucet_addr, &id.pubkey(), airdrop_amount, blockhash) {
             Ok(transaction) => {
                 let mut tries = 0;
                 loop {
@@ -360,11 +359,11 @@ fn make_close_message(
 fn run_accounts_bench(
     entrypoint_addr: SocketAddr,
     faucet_addr: SocketAddr,
-    payer_keypairs: &[&Keypair],
+    keypair: &Keypair,
     iterations: usize,
     maybe_space: Option<u64>,
     batch_size: usize,
-    close_nth_batch: u64,
+    close_nth: u64,
     maybe_lamports: Option<u64>,
     num_instructions: usize,
     mint: Option<Pubkey>,
@@ -373,7 +372,7 @@ fn run_accounts_bench(
     let client =
         RpcClient::new_socket_with_commitment(entrypoint_addr, CommitmentConfig::confirmed());
 
-    info!("Targeting {}", entrypoint_addr);
+    info!("Targetting {}", entrypoint_addr);
 
     let mut last_blockhash = Instant::now();
     let mut last_log = Instant::now();
@@ -382,10 +381,7 @@ fn run_accounts_bench(
     let mut tx_sent_count = 0;
     let mut total_accounts_created = 0;
     let mut total_accounts_closed = 0;
-    let mut balances: Vec<_> = payer_keypairs
-        .iter()
-        .map(|keypair| client.get_balance(&keypair.pubkey()).unwrap_or(0))
-        .collect();
+    let mut balance = client.get_balance(&keypair.pubkey()).unwrap_or(0);
     let mut last_balance = Instant::now();
 
     let default_max_lamports = 1000;
@@ -402,7 +398,7 @@ fn run_accounts_bench(
         max_closed: Arc::new(AtomicU64::default()),
     };
 
-    info!("Starting balance(s): {:?}", balances);
+    info!("Starting balance: {}", balance);
 
     let executor = TransactionExecutor::new(entrypoint_addr);
 
@@ -418,88 +414,69 @@ fn run_accounts_bench(
             .saturating_mul(NUM_SIGNATURES);
         let lamports = min_balance + fee;
 
-        for (i, balance) in balances.iter_mut().enumerate() {
-            if *balance < lamports || last_balance.elapsed().as_millis() > 2000 {
-                if let Ok(b) = client.get_balance(&payer_keypairs[i].pubkey()) {
-                    *balance = b;
-                }
-                last_balance = Instant::now();
-                if *balance < lamports * 2 {
-                    info!(
-                        "Balance {} is less than needed: {}, doing aidrop...",
-                        balance, lamports
-                    );
-                    if !airdrop_lamports(
-                        &client,
-                        &faucet_addr,
-                        payer_keypairs[i],
-                        lamports * 100_000,
-                    ) {
-                        warn!("failed airdrop, exiting");
-                        return;
-                    }
+        if balance < lamports || last_balance.elapsed().as_millis() > 2000 {
+            if let Ok(b) = client.get_balance(&keypair.pubkey()) {
+                balance = b;
+            }
+            last_balance = Instant::now();
+            if balance < lamports {
+                info!(
+                    "Balance {} is less than needed: {}, doing aidrop...",
+                    balance, lamports
+                );
+                if !airdrop_lamports(&client, &faucet_addr, keypair, lamports * 100_000) {
+                    warn!("failed airdrop, exiting");
+                    return;
                 }
             }
         }
 
-        // Create accounts
         let sigs_len = executor.num_outstanding();
         if sigs_len < batch_size {
             let num_to_create = batch_size - sigs_len;
-            if num_to_create >= payer_keypairs.len() {
-                info!("creating {} new", num_to_create);
-                let chunk_size = num_to_create / payer_keypairs.len();
-                if chunk_size > 0 {
-                    for (i, keypair) in payer_keypairs.iter().enumerate() {
-                        let txs: Vec<_> = (0..chunk_size)
-                            .into_par_iter()
-                            .map(|_| {
-                                let message = make_create_message(
-                                    keypair,
-                                    &base_keypair,
-                                    seed_tracker.max_created.clone(),
-                                    num_instructions,
-                                    min_balance,
-                                    maybe_space,
-                                    mint,
-                                );
-                                let signers: Vec<&Keypair> = vec![keypair, &base_keypair];
-                                Transaction::new(&signers, message, recent_blockhash.0)
-                            })
-                            .collect();
-                        balances[i] = balances[i].saturating_sub(lamports * txs.len() as u64);
-                        info!("txs: {}", txs.len());
-                        let new_ids = executor.push_transactions(txs);
-                        info!("ids: {}", new_ids.len());
-                        tx_sent_count += new_ids.len();
-                        total_accounts_created += num_instructions * new_ids.len();
-                    }
-                }
-            }
+            info!("creating {} new", num_to_create);
+            let txs: Vec<_> = (0..num_to_create)
+                .into_par_iter()
+                .map(|_| {
+                    let message = make_create_message(
+                        keypair,
+                        &base_keypair,
+                        seed_tracker.max_created.clone(),
+                        num_instructions,
+                        min_balance,
+                        maybe_space,
+                        mint,
+                    );
+                    let signers: Vec<&Keypair> = vec![keypair, &base_keypair];
+                    Transaction::new(&signers, message, recent_blockhash.0)
+                })
+                .collect();
+            balance = balance.saturating_sub(lamports * txs.len() as u64);
+            info!("txs: {}", txs.len());
+            let new_ids = executor.push_transactions(txs);
+            info!("ids: {}", new_ids.len());
+            tx_sent_count += new_ids.len();
+            total_accounts_created += num_instructions * new_ids.len();
 
-            if close_nth_batch > 0 {
-                let num_batches_to_close =
-                    total_accounts_created as u64 / (close_nth_batch * batch_size as u64);
-                let expected_closed = num_batches_to_close * batch_size as u64;
-                let max_closed_seed = seed_tracker.max_closed.load(Ordering::Relaxed);
-                // Close every account we've created with seed between max_closed_seed..expected_closed
-                if max_closed_seed < expected_closed {
-                    let txs: Vec<_> = (0..expected_closed - max_closed_seed)
+            if close_nth > 0 {
+                let expected_closed = total_accounts_created as u64 / close_nth;
+                if expected_closed > total_accounts_closed {
+                    let txs: Vec<_> = (0..expected_closed - total_accounts_closed)
                         .into_par_iter()
                         .map(|_| {
                             let message = make_close_message(
-                                payer_keypairs[0],
+                                keypair,
                                 &base_keypair,
                                 seed_tracker.max_closed.clone(),
                                 1,
                                 min_balance,
                                 mint.is_some(),
                             );
-                            let signers: Vec<&Keypair> = vec![payer_keypairs[0], &base_keypair];
+                            let signers: Vec<&Keypair> = vec![keypair, &base_keypair];
                             Transaction::new(&signers, message, recent_blockhash.0)
                         })
                         .collect();
-                    balances[0] = balances[0].saturating_sub(fee * txs.len() as u64);
+                    balance = balance.saturating_sub(fee * txs.len() as u64);
                     info!("close txs: {}", txs.len());
                     let new_ids = executor.push_transactions(txs);
                     info!("close ids: {}", new_ids.len());
@@ -514,8 +491,8 @@ fn run_accounts_bench(
         count += 1;
         if last_log.elapsed().as_millis() > 3000 {
             info!(
-                "total_accounts_created: {} total_accounts_closed: {} tx_sent_count: {} loop_count: {} balance(s): {:?}",
-                total_accounts_created, total_accounts_closed, tx_sent_count, count, balances
+                "total_accounts_created: {} total_accounts_closed: {} tx_sent_count: {} loop_count: {} balance: {}",
+                total_accounts_created, total_accounts_closed, tx_sent_count, count, balance
             );
             last_log = Instant::now();
         }
@@ -566,7 +543,6 @@ fn main() {
             Arg::with_name("identity")
                 .long("identity")
                 .takes_value(true)
-                .multiple(true)
                 .value_name("FILE")
                 .help("keypair file"),
         )
@@ -578,14 +554,14 @@ fn main() {
                 .help("Number of transactions to send per batch"),
         )
         .arg(
-            Arg::with_name("close_nth_batch")
+            Arg::with_name("close_nth")
                 .long("close-frequency")
                 .takes_value(true)
                 .value_name("BYTES")
                 .help(
-                    "Every `n` batches, create a batch of close transactions for
-                    the earliest remaining batch of accounts created.
-                    Note: Should be > 1 to avoid situations where the close \
+                    "Send close transactions after this many accounts created. \
+                    Note: a `close-frequency` value near or below `batch-size` \
+                    may result in transaction-simulation errors, as the close \
                     transactions will be submitted before the corresponding \
                     create transactions have been confirmed",
                 ),
@@ -638,7 +614,7 @@ fn main() {
     let space = value_t!(matches, "space", u64).ok();
     let lamports = value_t!(matches, "lamports", u64).ok();
     let batch_size = value_t!(matches, "batch_size", usize).unwrap_or(4);
-    let close_nth_batch = value_t!(matches, "close_nth_batch", u64).unwrap_or(0);
+    let close_nth = value_t!(matches, "close_nth", u64).unwrap_or(0);
     let iterations = value_t!(matches, "iterations", usize).unwrap_or(10);
     let num_instructions = value_t!(matches, "num_instructions", usize).unwrap_or(1);
     if num_instructions == 0 || num_instructions > 500 {
@@ -648,30 +624,20 @@ fn main() {
 
     let mint = pubkey_of(&matches, "mint");
 
-    let payer_keypairs: Vec<_> = values_t_or_exit!(matches, "identity", String)
-        .iter()
-        .map(|keypair_string| {
-            read_keypair_file(keypair_string)
-                .unwrap_or_else(|_| panic!("bad keypair {:?}", keypair_string))
-        })
-        .collect();
-    let mut payer_keypair_refs: Vec<&Keypair> = vec![];
-    for keypair in payer_keypairs.iter() {
-        payer_keypair_refs.push(keypair);
-    }
+    let keypair =
+        read_keypair_file(&value_t_or_exit!(matches, "identity", String)).expect("bad keypair");
 
     let rpc_addr = if !skip_gossip {
         info!("Finding cluster entry: {:?}", entrypoint_addr);
         let (gossip_nodes, _validators) = discover(
-            None, // keypair
+            None,
             Some(&entrypoint_addr),
-            None,                    // num_nodes
-            Duration::from_secs(60), // timeout
-            None,                    // find_node_by_pubkey
-            Some(&entrypoint_addr),  // find_node_by_gossip_addr
-            None,                    // my_gossip_addr
-            0,                       // my_shred_version
-            SocketAddrSpace::Unspecified,
+            None,
+            Some(60),
+            None,
+            Some(&entrypoint_addr),
+            None,
+            0,
         )
         .unwrap_or_else(|err| {
             eprintln!("Failed to discover {} node: {:?}", entrypoint_addr, err);
@@ -688,11 +654,11 @@ fn main() {
     run_accounts_bench(
         rpc_addr,
         faucet_addr,
-        &payer_keypair_refs,
+        &keypair,
         iterations,
         space,
         batch_size,
-        close_nth_batch,
+        close_nth,
         lamports,
         num_instructions,
         mint,
@@ -723,22 +689,22 @@ pub mod test {
         };
 
         let faucet_addr = SocketAddr::from(([127, 0, 0, 1], 9900));
-        let cluster = LocalCluster::new(&mut config, SocketAddrSpace::Unspecified);
+        let cluster = LocalCluster::new(&mut config);
         let iterations = 10;
         let maybe_space = None;
         let batch_size = 100;
-        let close_nth_batch = 100;
+        let close_nth = 100;
         let maybe_lamports = None;
         let num_instructions = 2;
         let mut start = Measure::start("total accounts run");
         run_accounts_bench(
             cluster.entry_point_info.rpc,
             faucet_addr,
-            &[&cluster.funding_keypair],
+            &cluster.funding_keypair,
             iterations,
             maybe_space,
             batch_size,
-            close_nth_batch,
+            close_nth,
             maybe_lamports,
             num_instructions,
             None,

banking-bench/Cargo.toml

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

banking-bench/src/main.rs

@@ -4,8 +4,13 @@ use crossbeam_channel::unbounded;
 use log::*;
 use rand::{thread_rng, Rng};
 use rayon::prelude::*;
-use solana_core::banking_stage::BankingStage;
-use solana_gossip::{cluster_info::ClusterInfo, cluster_info::Node};
+use solana_core::{
+    banking_stage::{create_test_recorder, BankingStage},
+    cluster_info::ClusterInfo,
+    cluster_info::Node,
+    poh_recorder::PohRecorder,
+    poh_recorder::WorkingBankEntry,
+};
 use solana_ledger::{
     blockstore::Blockstore,
     genesis_utils::{create_genesis_config, GenesisConfigInfo},
@@ -13,7 +18,6 @@ use solana_ledger::{
 };
 use solana_measure::measure::Measure;
 use solana_perf::packet::to_packets_chunked;
-use solana_poh::poh_recorder::{create_test_recorder, PohRecorder, WorkingBankEntry};
 use solana_runtime::{
     accounts_background_service::AbsRequestSender, bank::Bank, bank_forks::BankForks,
 };
@@ -25,7 +29,6 @@ use solana_sdk::{
     timing::{duration_as_us, timestamp},
     transaction::Transaction,
 };
-use solana_streamer::socket::SocketAddrSpace;
 use std::{
     sync::{atomic::Ordering, mpsc::Receiver, Arc, Mutex},
     thread::sleep,
@@ -75,7 +78,7 @@ fn make_accounts_txs(
         .into_par_iter()
         .map(|_| {
             let mut new = dummy.clone();
-            let sig: Vec<u8> = (0..64).map(|_| thread_rng().gen::<u8>()).collect();
+            let sig: Vec<u8> = (0..64).map(|_| thread_rng().gen()).collect();
             if !same_payer {
                 new.message.account_keys[0] = solana_sdk::pubkey::new_rand();
             }
@@ -166,7 +169,6 @@ fn main() {
 
     let (verified_sender, verified_receiver) = unbounded();
     let (vote_sender, vote_receiver) = unbounded();
-    let (tpu_vote_sender, tpu_vote_receiver) = unbounded();
     let (replay_vote_sender, _replay_vote_receiver) = unbounded();
     let bank0 = Bank::new(&genesis_config);
     let mut bank_forks = BankForks::new(bank0);
@@ -187,7 +189,7 @@ fn main() {
             genesis_config.hash(),
         );
         // Ignore any pesky duplicate signature errors in the case we are using single-payer
-        let sig: Vec<u8> = (0..64).map(|_| thread_rng().gen::<u8>()).collect();
+        let sig: Vec<u8> = (0..64).map(|_| thread_rng().gen()).collect();
         fund.signatures = vec![Signature::new(&sig[0..64])];
         let x = bank.process_transaction(&fund);
         x.unwrap();
@@ -197,7 +199,7 @@ fn main() {
     if !skip_sanity {
         //sanity check, make sure all the transactions can execute sequentially
         transactions.iter().for_each(|tx| {
-            let res = bank.process_transaction(tx);
+            let res = bank.process_transaction(&tx);
             assert!(res.is_ok(), "sanity test transactions error: {:?}", res);
         });
         bank.clear_signatures();
@@ -217,17 +219,12 @@ fn main() {
         );
         let (exit, poh_recorder, poh_service, signal_receiver) =
             create_test_recorder(&bank, &blockstore, None);
-        let cluster_info = ClusterInfo::new(
-            Node::new_localhost().info,
-            Arc::new(Keypair::new()),
-            SocketAddrSpace::Unspecified,
-        );
+        let cluster_info = ClusterInfo::new_with_invalid_keypair(Node::new_localhost().info);
         let cluster_info = Arc::new(cluster_info);
         let banking_stage = BankingStage::new(
             &cluster_info,
             &poh_recorder,
             verified_receiver,
-            tpu_vote_receiver,
             vote_receiver,
             None,
             replay_vote_sender,
@@ -358,7 +355,7 @@ fn main() {
             if bank.slot() > 0 && bank.slot() % 16 == 0 {
                 for tx in transactions.iter_mut() {
                     tx.message.recent_blockhash = bank.last_blockhash();
-                    let sig: Vec<u8> = (0..64).map(|_| thread_rng().gen::<u8>()).collect();
+                    let sig: Vec<u8> = (0..64).map(|_| thread_rng().gen()).collect();
                     tx.signatures[0] = Signature::new(&sig[0..64]);
                 }
                 verified = to_packets_chunked(&transactions.clone(), packets_per_chunk);
@@ -383,7 +380,6 @@ fn main() {
         );
 
         drop(verified_sender);
-        drop(tpu_vote_sender);
         drop(vote_sender);
         exit.store(true, Ordering::Relaxed);
         banking_stage.join().unwrap();

banks-client/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "solana-banks-client"
-version = "1.7.18"
+version = "1.6.6"
 description = "Solana banks client"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -11,20 +11,20 @@ edition = "2018"
 
 [dependencies]
 bincode = "1.3.1"
-borsh = "0.9.0"
-borsh-derive = "0.9.0"
+borsh = "0.8.1"
+borsh-derive = "0.8.1"
 futures = "0.3"
 mio = "0.7.6"
-solana-banks-interface = { path = "../banks-interface", version = "=1.7.18" }
-solana-program = { path = "../sdk/program", version = "=1.7.18" }
-solana-sdk = { path = "../sdk", version = "=1.7.18" }
+solana-banks-interface = { path = "../banks-interface", version = "=1.6.6" }
+solana-program = { path = "../sdk/program", version = "=1.6.6" }
+solana-sdk = { path = "../sdk", version = "=1.6.6" }
 tarpc = { version = "0.24.1", features = ["full"] }
 tokio = { version = "1", features = ["full"] }
 tokio-serde = { version = "0.8", features = ["bincode"] }
 
 [dev-dependencies]
-solana-runtime = { path = "../runtime", version = "=1.7.18" }
-solana-banks-server = { path = "../banks-server", version = "=1.7.18" }
+solana-runtime = { path = "../runtime", version = "=1.6.6" }
+solana-banks-server = { path = "../banks-server", version = "=1.6.6" }
 
 [lib]
 crate-type = ["lib"]

banks-client/src/lib.rs

@@ -10,14 +10,8 @@ use futures::{future::join_all, Future, FutureExt};
 pub use solana_banks_interface::{BanksClient as TarpcClient, TransactionStatus};
 use solana_banks_interface::{BanksRequest, BanksResponse};
 use solana_program::{
-    clock::Clock,
-    clock::Slot,
-    fee_calculator::FeeCalculator,
-    hash::Hash,
-    program_pack::Pack,
-    pubkey::Pubkey,
-    rent::Rent,
-    sysvar::{self, Sysvar},
+    clock::Slot, fee_calculator::FeeCalculator, hash::Hash, program_pack::Pack, pubkey::Pubkey,
+    rent::Rent, sysvar,
 };
 use solana_sdk::{
     account::{from_account, Account},
@@ -69,7 +63,7 @@ impl BanksClient {
         &mut self,
         ctx: Context,
         commitment: CommitmentLevel,
-    ) -> impl Future<Output = io::Result<(FeeCalculator, Hash, u64)>> + '_ {
+    ) -> impl Future<Output = io::Result<(FeeCalculator, Hash, Slot)>> + '_ {
         self.inner
             .get_fees_with_commitment_and_context(ctx, commitment)
     }
@@ -91,14 +85,6 @@ impl BanksClient {
         self.inner.get_slot_with_context(ctx, commitment)
     }
 
-    pub fn get_block_height_with_context(
-        &mut self,
-        ctx: Context,
-        commitment: CommitmentLevel,
-    ) -> impl Future<Output = io::Result<Slot>> + '_ {
-        self.inner.get_block_height_with_context(ctx, commitment)
-    }
-
     pub fn process_transaction_with_commitment_and_context(
         &mut self,
         ctx: Context,
@@ -129,39 +115,24 @@ impl BanksClient {
         self.send_transaction_with_context(context::current(), transaction)
     }
 
-    /// Return the cluster clock
-    pub fn get_clock(&mut self) -> impl Future<Output = io::Result<Clock>> + '_ {
-        self.get_account(sysvar::clock::id()).map(|result| {
-            let clock_sysvar = result?
-                .ok_or_else(|| io::Error::new(io::ErrorKind::Other, "Clock sysvar not present"))?;
-            from_account::<Clock, _>(&clock_sysvar).ok_or_else(|| {
-                io::Error::new(io::ErrorKind::Other, "Failed to deserialize Clock sysvar")
-            })
-        })
-    }
-
     /// Return the fee parameters associated with a recent, rooted blockhash. The cluster
     /// will use the transaction's blockhash to look up these same fee parameters and
     /// use them to calculate the transaction fee.
     pub fn get_fees(
         &mut self,
-    ) -> impl Future<Output = io::Result<(FeeCalculator, Hash, u64)>> + '_ {
+    ) -> impl Future<Output = io::Result<(FeeCalculator, Hash, Slot)>> + '_ {
         self.get_fees_with_commitment_and_context(context::current(), CommitmentLevel::default())
     }
 
-    /// Return the cluster Sysvar
-    pub fn get_sysvar<T: Sysvar>(&mut self) -> impl Future<Output = io::Result<T>> + '_ {
-        self.get_account(T::id()).map(|result| {
-            let sysvar = result?
-                .ok_or_else(|| io::Error::new(io::ErrorKind::Other, "Sysvar not present"))?;
-            from_account::<T, _>(&sysvar)
-                .ok_or_else(|| io::Error::new(io::ErrorKind::Other, "Failed to deserialize sysvar"))
-        })
-    }
-
     /// Return the cluster rent
     pub fn get_rent(&mut self) -> impl Future<Output = io::Result<Rent>> + '_ {
-        self.get_sysvar::<Rent>()
+        self.get_account(sysvar::rent::id()).map(|result| {
+            let rent_sysvar = result?
+                .ok_or_else(|| io::Error::new(io::ErrorKind::Other, "Rent sysvar not present"))?;
+            from_account::<Rent, _>(&rent_sysvar).ok_or_else(|| {
+                io::Error::new(io::ErrorKind::Other, "Failed to deserialize Rent sysvar")
+            })
+        })
     }
 
     /// Return a recent, rooted blockhash from the server. The cluster will only accept
@@ -221,18 +192,12 @@ impl BanksClient {
         self.process_transactions_with_commitment(transactions, CommitmentLevel::default())
     }
 
-    /// Return the most recent rooted slot. All transactions at or below this slot
-    /// are said to be finalized. The cluster will not fork to a higher slot.
+    /// Return the most recent rooted slot height. All transactions at or below this height
+    /// are said to be finalized. The cluster will not fork to a higher slot height.
     pub fn get_root_slot(&mut self) -> impl Future<Output = io::Result<Slot>> + '_ {
         self.get_slot_with_context(context::current(), CommitmentLevel::default())
     }
 
-    /// Return the most recent rooted block height. All transactions at or below this height
-    /// are said to be finalized. The cluster will not fork to a higher block height.
-    pub fn get_root_block_height(&mut self) -> impl Future<Output = io::Result<Slot>> + '_ {
-        self.get_block_height_with_context(context::current(), CommitmentLevel::default())
-    }
-
     /// Return the account at the given address at the slot corresponding to the given
     /// commitment level. If the account is not found, None is returned.
     pub fn get_account_with_commitment(
@@ -412,13 +377,13 @@ mod tests {
 
         let mint_pubkey = &genesis.mint_keypair.pubkey();
         let bob_pubkey = solana_sdk::pubkey::new_rand();
-        let instruction = system_instruction::transfer(mint_pubkey, &bob_pubkey, 1);
-        let message = Message::new(&[instruction], Some(mint_pubkey));
+        let instruction = system_instruction::transfer(&mint_pubkey, &bob_pubkey, 1);
+        let message = Message::new(&[instruction], Some(&mint_pubkey));
 
         Runtime::new()?.block_on(async {
             let client_transport = start_local_server(bank_forks, block_commitment_cache).await;
             let mut banks_client = start_client(client_transport).await?;
-            let (_, recent_blockhash, last_valid_block_height) = banks_client.get_fees().await?;
+            let (_, recent_blockhash, last_valid_slot) = banks_client.get_fees().await?;
             let transaction = Transaction::new(&[&genesis.mint_keypair], message, recent_blockhash);
             let signature = transaction.signatures[0];
             banks_client.send_transaction(transaction).await?;
@@ -426,8 +391,8 @@ mod tests {
             let mut status = banks_client.get_transaction_status(signature).await?;
 
             while status.is_none() {
-                let root_block_height = banks_client.get_root_block_height().await?;
-                if root_block_height > last_valid_block_height {
+                let root_slot = banks_client.get_root_slot().await?;
+                if root_slot > last_valid_slot {
                     break;
                 }
                 sleep(Duration::from_millis(100)).await;

banks-interface/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "solana-banks-interface"
-version = "1.7.18"
+version = "1.6.6"
 description = "Solana banks RPC interface"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -12,7 +12,7 @@ edition = "2018"
 [dependencies]
 mio = "0.7.6"
 serde = { version = "1.0.122", features = ["derive"] }
-solana-sdk = { path = "../sdk", version = "=1.7.18" }
+solana-sdk = { path = "../sdk", version = "=1.6.6" }
 tarpc = { version = "0.24.1", features = ["full"] }
 
 [dev-dependencies]

banks-interface/src/lib.rs

@@ -34,7 +34,6 @@ pub trait Banks {
     async fn get_transaction_status_with_context(signature: Signature)
         -> Option<TransactionStatus>;
     async fn get_slot_with_context(commitment: CommitmentLevel) -> Slot;
-    async fn get_block_height_with_context(commitment: CommitmentLevel) -> u64;
     async fn process_transaction_with_commitment_and_context(
         transaction: Transaction,
         commitment: CommitmentLevel,

banks-server/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "solana-banks-server"
-version = "1.7.18"
+version = "1.6.6"
 description = "Solana banks server"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -14,10 +14,10 @@ bincode = "1.3.1"
 futures = "0.3"
 log = "0.4.11"
 mio = "0.7.6"
-solana-banks-interface = { path = "../banks-interface", version = "=1.7.18" }
-solana-runtime = { path = "../runtime", version = "=1.7.18" }
-solana-sdk = { path = "../sdk", version = "=1.7.18" }
-solana-metrics = { path = "../metrics", version = "=1.7.18" }
+solana-banks-interface = { path = "../banks-interface", version = "=1.6.6" }
+solana-runtime = { path = "../runtime", version = "=1.6.6" }
+solana-sdk = { path = "../sdk", version = "=1.6.6" }
+solana-metrics = { path = "../metrics", version = "=1.6.6" }
 tarpc = { version = "0.24.1", features = ["full"] }
 tokio = { version = "1", features = ["full"] }
 tokio-serde = { version = "0.8", features = ["bincode"] }

banks-server/src/banks_server.rs

@@ -113,7 +113,7 @@ impl BanksServer {
         self,
         signature: &Signature,
         blockhash: &Hash,
-        last_valid_block_height: u64,
+        last_valid_slot: Slot,
         commitment: CommitmentLevel,
     ) -> Option<transaction::Result<()>> {
         let mut status = self
@@ -122,7 +122,7 @@ impl BanksServer {
         while status.is_none() {
             sleep(Duration::from_millis(200)).await;
             let bank = self.bank(commitment);
-            if bank.block_height() > last_valid_block_height {
+            if bank.slot() > last_valid_slot {
                 break;
             }
             status = bank.get_signature_status_with_blockhash(signature, blockhash);
@@ -131,13 +131,10 @@ impl BanksServer {
     }
 }
 
-fn verify_transaction(
-    transaction: &Transaction,
-    libsecp256k1_0_5_upgrade_enabled: bool,
-) -> transaction::Result<()> {
+fn verify_transaction(transaction: &Transaction) -> transaction::Result<()> {
     if let Err(err) = transaction.verify() {
         Err(err)
-    } else if let Err(err) = transaction.verify_precompiles(libsecp256k1_0_5_upgrade_enabled) {
+    } else if let Err(err) = transaction.verify_precompiles() {
         Err(err)
     } else {
         Ok(())
@@ -148,19 +145,16 @@ fn verify_transaction(
 impl Banks for BanksServer {
     async fn send_transaction_with_context(self, _: Context, transaction: Transaction) {
         let blockhash = &transaction.message.recent_blockhash;
-        let last_valid_block_height = self
+        let last_valid_slot = self
             .bank_forks
             .read()
             .unwrap()
             .root_bank()
-            .get_blockhash_last_valid_block_height(blockhash)
+            .get_blockhash_last_valid_slot(&blockhash)
             .unwrap();
         let signature = transaction.signatures.get(0).cloned().unwrap_or_default();
-        let info = TransactionInfo::new(
-            signature,
-            serialize(&transaction).unwrap(),
-            last_valid_block_height,
-        );
+        let info =
+            TransactionInfo::new(signature, serialize(&transaction).unwrap(), last_valid_slot);
         self.transaction_sender.send(info).unwrap();
     }
 
@@ -168,13 +162,11 @@ impl Banks for BanksServer {
         self,
         _: Context,
         commitment: CommitmentLevel,
-    ) -> (FeeCalculator, Hash, u64) {
+    ) -> (FeeCalculator, Hash, Slot) {
         let bank = self.bank(commitment);
         let (blockhash, fee_calculator) = bank.last_blockhash_with_fee_calculator();
-        let last_valid_block_height = bank
-            .get_blockhash_last_valid_block_height(&blockhash)
-            .unwrap();
-        (fee_calculator, blockhash, last_valid_block_height)
+        let last_valid_slot = bank.get_blockhash_last_valid_slot(&blockhash).unwrap();
+        (fee_calculator, blockhash, last_valid_slot)
     }
 
     async fn get_transaction_status_with_context(
@@ -217,39 +209,29 @@ impl Banks for BanksServer {
         self.slot(commitment)
     }
 
-    async fn get_block_height_with_context(self, _: Context, commitment: CommitmentLevel) -> u64 {
-        self.bank(commitment).block_height()
-    }
-
     async fn process_transaction_with_commitment_and_context(
         self,
         _: Context,
         transaction: Transaction,
         commitment: CommitmentLevel,
     ) -> Option<transaction::Result<()>> {
-        if let Err(err) = verify_transaction(
-            &transaction,
-            self.bank(commitment).libsecp256k1_0_5_upgrade_enabled(),
-        ) {
+        if let Err(err) = verify_transaction(&transaction) {
             return Some(Err(err));
         }
 
         let blockhash = &transaction.message.recent_blockhash;
-        let last_valid_block_height = self
+        let last_valid_slot = self
             .bank_forks
             .read()
             .unwrap()
             .root_bank()
-            .get_blockhash_last_valid_block_height(blockhash)
+            .get_blockhash_last_valid_slot(blockhash)
             .unwrap();
         let signature = transaction.signatures.get(0).cloned().unwrap_or_default();
-        let info = TransactionInfo::new(
-            signature,
-            serialize(&transaction).unwrap(),
-            last_valid_block_height,
-        );
+        let info =
+            TransactionInfo::new(signature, serialize(&transaction).unwrap(), last_valid_slot);
         self.transaction_sender.send(info).unwrap();
-        self.poll_signature_status(&signature, blockhash, last_valid_block_height, commitment)
+        self.poll_signature_status(&signature, blockhash, last_valid_slot, commitment)
             .await
     }
 

banks-server/src/send_transaction_service.rs

@@ -2,7 +2,7 @@
 use log::*;
 use solana_metrics::{datapoint_warn, inc_new_counter_info};
 use solana_runtime::{bank::Bank, bank_forks::BankForks};
-use solana_sdk::signature::Signature;
+use solana_sdk::{clock::Slot, signature::Signature};
 use std::{
     collections::HashMap,
     net::{SocketAddr, UdpSocket},
@@ -24,19 +24,15 @@ pub struct SendTransactionService {
 pub struct TransactionInfo {
     pub signature: Signature,
     pub wire_transaction: Vec<u8>,
-    pub last_valid_block_height: u64,
+    pub last_valid_slot: Slot,
 }
 
 impl TransactionInfo {
-    pub fn new(
-        signature: Signature,
-        wire_transaction: Vec<u8>,
-        last_valid_block_height: u64,
-    ) -> Self {
+    pub fn new(signature: Signature, wire_transaction: Vec<u8>, last_valid_slot: Slot) -> Self {
         Self {
             signature,
             wire_transaction,
-            last_valid_block_height,
+            last_valid_slot,
         }
     }
 }
@@ -128,7 +124,7 @@ impl SendTransactionService {
                 result.rooted += 1;
                 inc_new_counter_info!("send_transaction_service-rooted", 1);
                 false
-            } else if transaction_info.last_valid_block_height < root_bank.block_height() {
+            } else if transaction_info.last_valid_slot < root_bank.slot() {
                 info!("Dropping expired transaction: {}", signature);
                 result.expired += 1;
                 inc_new_counter_info!("send_transaction_service-expired", 1);
@@ -142,8 +138,8 @@ impl SendTransactionService {
                         result.retried += 1;
                         inc_new_counter_info!("send_transaction_service-retry", 1);
                         Self::send_transaction(
-                            send_socket,
-                            tpu_address,
+                            &send_socket,
+                            &tpu_address,
                             &transaction_info.wire_transaction,
                         );
                         true

bench-exchange/Cargo.toml

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

bench-exchange/src/bench.rs

@@ -451,13 +451,13 @@ fn swapper<T>(
             let to_swap_txs: Vec<_> = to_swap
                 .par_iter()
                 .map(|(signer, swap, profit)| {
-                    let s: &Keypair = signer;
+                    let s: &Keypair = &signer;
                     let owner = &signer.pubkey();
                     let instruction = exchange_instruction::swap_request(
                         owner,
                         &swap.0.pubkey,
                         &swap.1.pubkey,
-                        profit,
+                        &profit,
                     );
                     let message = Message::new(&[instruction], Some(&s.pubkey()));
                     Transaction::new(&[s], message, blockhash)
@@ -600,7 +600,7 @@ fn trader<T>(
                             src,
                         ),
                     ];
-                    let message = Message::new(&instructions, Some(owner_pubkey));
+                    let message = Message::new(&instructions, Some(&owner_pubkey));
                     Transaction::new(&[owner.as_ref(), trade], message, blockhash)
                 })
                 .collect();
@@ -739,7 +739,7 @@ pub fn fund_keys<T: Client>(client: &T, source: &Keypair, dests: &[Arc<Keypair>]
             let mut to_fund_txs: Vec<_> = chunk
                 .par_iter()
                 .map(|(k, m)| {
-                    let instructions = system_instruction::transfer_many(&k.pubkey(), m);
+                    let instructions = system_instruction::transfer_many(&k.pubkey(), &m);
                     let message = Message::new(&instructions, Some(&k.pubkey()));
                     (k.clone(), Transaction::new_unsigned(message))
                 })
@@ -777,7 +777,7 @@ pub fn fund_keys<T: Client>(client: &T, source: &Keypair, dests: &[Arc<Keypair>]
                 let mut waits = 0;
                 loop {
                     sleep(Duration::from_millis(200));
-                    to_fund_txs.retain(|(_, tx)| !verify_funding_transfer(client, tx, amount));
+                    to_fund_txs.retain(|(_, tx)| !verify_funding_transfer(client, &tx, amount));
                     if to_fund_txs.is_empty() {
                         break;
                     }
@@ -836,7 +836,7 @@ pub fn create_token_accounts<T: Client>(
                     );
                     let request_ix =
                         exchange_instruction::account_request(owner_pubkey, &new_keypair.pubkey());
-                    let message = Message::new(&[create_ix, request_ix], Some(owner_pubkey));
+                    let message = Message::new(&[create_ix, request_ix], Some(&owner_pubkey));
                     (
                         (from_keypair, new_keypair),
                         Transaction::new_unsigned(message),
@@ -872,7 +872,7 @@ pub fn create_token_accounts<T: Client>(
                 let mut waits = 0;
                 while !to_create_txs.is_empty() {
                     sleep(Duration::from_millis(200));
-                    to_create_txs.retain(|(_, tx)| !verify_transaction(client, tx));
+                    to_create_txs.retain(|(_, tx)| !verify_transaction(client, &tx));
                     if to_create_txs.is_empty() {
                         break;
                     }
@@ -958,7 +958,7 @@ fn compute_and_report_stats(maxes: &Arc<RwLock<Vec<(String, SampleStats)>>>, tot
 
 fn generate_keypairs(num: u64) -> Vec<Keypair> {
     let mut seed = [0_u8; 32];
-    seed.copy_from_slice(Keypair::new().pubkey().as_ref());
+    seed.copy_from_slice(&Keypair::new().pubkey().as_ref());
     let mut rnd = GenKeys::new(seed);
     rnd.gen_n_keypairs(num)
 }
@@ -989,7 +989,7 @@ pub fn airdrop_lamports<T: Client>(
         let (blockhash, _fee_calculator, _last_valid_slot) = client
             .get_recent_blockhash_with_commitment(CommitmentConfig::processed())
             .expect("Failed to get blockhash");
-        match request_airdrop_transaction(faucet_addr, &id.pubkey(), amount_to_drop, blockhash) {
+        match request_airdrop_transaction(&faucet_addr, &id.pubkey(), amount_to_drop, blockhash) {
             Ok(transaction) => {
                 let signature = client.async_send_transaction(transaction).unwrap();
 

bench-exchange/src/main.rs

@@ -5,9 +5,8 @@ pub mod order_book;
 
 use crate::bench::{airdrop_lamports, create_client_accounts_file, do_bench_exchange, Config};
 use log::*;
-use solana_gossip::gossip_service::{discover_cluster, get_multi_client};
+use solana_core::gossip_service::{discover_cluster, get_multi_client};
 use solana_sdk::signature::Signer;
-use solana_streamer::socket::SocketAddrSpace;
 
 fn main() {
     solana_logger::setup();
@@ -56,12 +55,11 @@ fn main() {
         );
     } else {
         info!("Connecting to the cluster");
-        let nodes = discover_cluster(&entrypoint_addr, num_nodes, SocketAddrSpace::Unspecified)
-            .unwrap_or_else(|_| {
-                panic!("Failed to discover nodes");
-            });
+        let nodes = discover_cluster(&entrypoint_addr, num_nodes).unwrap_or_else(|_| {
+            panic!("Failed to discover nodes");
+        });
 
-        let (client, num_clients) = get_multi_client(&nodes, &SocketAddrSpace::Unspecified);
+        let (client, num_clients) = get_multi_client(&nodes);
 
         info!("{} nodes found", num_clients);
         if num_clients < num_nodes {

bench-exchange/tests/bench_exchange.rs

@@ -1,11 +1,13 @@
 use log::*;
 use solana_bench_exchange::bench::{airdrop_lamports, do_bench_exchange, Config};
-use solana_core::validator::ValidatorConfig;
+use solana_core::{
+    gossip_service::{discover_cluster, get_multi_client},
+    validator::ValidatorConfig,
+};
 use solana_exchange_program::{
     exchange_processor::process_instruction, id, solana_exchange_program,
 };
 use solana_faucet::faucet::run_local_faucet_with_port;
-use solana_gossip::gossip_service::{discover_cluster, get_multi_client};
 use solana_local_cluster::{
     local_cluster::{ClusterConfig, LocalCluster},
     validator_configs::make_identical_validator_configs,
@@ -15,7 +17,6 @@ use solana_sdk::{
     genesis_config::create_genesis_config,
     signature::{Keypair, Signer},
 };
-use solana_streamer::socket::SocketAddrSpace;
 use std::{process::exit, sync::mpsc::channel, time::Duration};
 
 #[test]
@@ -44,19 +45,13 @@ fn test_exchange_local_cluster() {
     } = config;
     let accounts_in_groups = batch_size * account_groups;
 
-    let cluster = LocalCluster::new(
-        &mut ClusterConfig {
-            node_stakes: vec![100_000; NUM_NODES],
-            cluster_lamports: 100_000_000_000_000,
-            validator_configs: make_identical_validator_configs(
-                &ValidatorConfig::default(),
-                NUM_NODES,
-            ),
-            native_instruction_processors: [solana_exchange_program!()].to_vec(),
-            ..ClusterConfig::default()
-        },
-        SocketAddrSpace::Unspecified,
-    );
+    let cluster = LocalCluster::new(&mut ClusterConfig {
+        node_stakes: vec![100_000; NUM_NODES],
+        cluster_lamports: 100_000_000_000_000,
+        validator_configs: make_identical_validator_configs(&ValidatorConfig::default(), NUM_NODES),
+        native_instruction_processors: [solana_exchange_program!()].to_vec(),
+        ..ClusterConfig::default()
+    });
 
     let faucet_keypair = Keypair::new();
     cluster.transfer(
@@ -73,17 +68,13 @@ fn test_exchange_local_cluster() {
         .expect("faucet_addr");
 
     info!("Connecting to the cluster");
-    let nodes = discover_cluster(
-        &cluster.entry_point_info.gossip,
-        NUM_NODES,
-        SocketAddrSpace::Unspecified,
-    )
-    .unwrap_or_else(|err| {
-        error!("Failed to discover {} nodes: {:?}", NUM_NODES, err);
-        exit(1);
-    });
+    let nodes =
+        discover_cluster(&cluster.entry_point_info.gossip, NUM_NODES).unwrap_or_else(|err| {
+            error!("Failed to discover {} nodes: {:?}", NUM_NODES, err);
+            exit(1);
+        });
 
-    let (client, num_clients) = get_multi_client(&nodes, &SocketAddrSpace::Unspecified);
+    let (client, num_clients) = get_multi_client(&nodes);
 
     info!("clients: {}", num_clients);
     assert!(num_clients >= NUM_NODES);

bench-streamer/Cargo.toml

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

bench-streamer/src/main.rs

@@ -18,7 +18,7 @@ fn producer(addr: &SocketAddr, exit: Arc<AtomicBool>) -> JoinHandle<()> {
     msgs.packets.resize(10, Packet::default());
     for w in msgs.packets.iter_mut() {
         w.meta.size = PACKET_DATA_SIZE;
-        w.meta.set_addr(addr);
+        w.meta.set_addr(&addr);
     }
     let msgs = Arc::new(msgs);
     spawn(move || loop {
@@ -75,7 +75,7 @@ fn main() -> Result<()> {
 
     let mut read_channels = Vec::new();
     let mut read_threads = Vec::new();
-    let recycler = PacketsRecycler::default();
+    let recycler = PacketsRecycler::new_without_limit("bench-streamer-recycler-shrink-stats");
     for _ in 0..num_sockets {
         let read = solana_net_utils::bind_to(ip_addr, port, false).unwrap();
         read.set_read_timeout(Some(Duration::new(1, 0))).unwrap();
@@ -92,7 +92,6 @@ fn main() -> Result<()> {
             recycler.clone(),
             "bench-streamer-test",
             1,
-            true,
         ));
     }
 

bench-tps/Cargo.toml

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

bench-tps/src/bench.rs

@@ -544,12 +544,12 @@ impl<'a> FundingTransactions<'a> for Vec<(&'a Keypair, Transaction)> {
 
             // re-sign retained to_fund_txes with updated blockhash
             self.sign(blockhash);
-            self.send(client);
+            self.send(&client);
 
             // Sleep a few slots to allow transactions to process
             sleep(Duration::from_secs(1));
 
-            self.verify(client, to_lamports);
+            self.verify(&client, to_lamports);
 
             // retry anything that seems to have dropped through cracks
             //  again since these txs are all or nothing, they're fine to
@@ -564,7 +564,7 @@ impl<'a> FundingTransactions<'a> for Vec<(&'a Keypair, Transaction)> {
         let to_fund_txs: Vec<(&Keypair, Transaction)> = to_fund
             .par_iter()
             .map(|(k, t)| {
-                let instructions = system_instruction::transfer_many(&k.pubkey(), t);
+                let instructions = system_instruction::transfer_many(&k.pubkey(), &t);
                 let message = Message::new(&instructions, Some(&k.pubkey()));
                 (*k, Transaction::new_unsigned(message))
             })
@@ -617,7 +617,7 @@ impl<'a> FundingTransactions<'a> for Vec<(&'a Keypair, Transaction)> {
                         return None;
                     }
 
-                    let verified = if verify_funding_transfer(&client, tx, to_lamports) {
+                    let verified = if verify_funding_transfer(&client, &tx, to_lamports) {
                         verified_txs.fetch_add(1, Ordering::Relaxed);
                         Some(k.pubkey())
                     } else {
@@ -733,7 +733,7 @@ pub fn airdrop_lamports<T: Client>(
         );
 
         let (blockhash, _fee_calculator) = get_recent_blockhash(client);
-        match request_airdrop_transaction(faucet_addr, &id.pubkey(), airdrop_amount, blockhash) {
+        match request_airdrop_transaction(&faucet_addr, &id.pubkey(), airdrop_amount, blockhash) {
             Ok(transaction) => {
                 let mut tries = 0;
                 loop {

bench-tps/src/main.rs

@@ -2,12 +2,11 @@
 use log::*;
 use solana_bench_tps::bench::{do_bench_tps, generate_and_fund_keypairs, generate_keypairs};
 use solana_bench_tps::cli;
+use solana_core::gossip_service::{discover_cluster, get_client, get_multi_client};
 use solana_genesis::Base64Account;
-use solana_gossip::gossip_service::{discover_cluster, get_client, get_multi_client};
 use solana_sdk::fee_calculator::FeeRateGovernor;
 use solana_sdk::signature::{Keypair, Signer};
 use solana_sdk::system_program;
-use solana_streamer::socket::SocketAddrSpace;
 use std::{collections::HashMap, fs::File, io::prelude::*, path::Path, process::exit, sync::Arc};
 
 /// Number of signatures for all transactions in ~1 week at ~100K TPS
@@ -40,7 +39,7 @@ fn main() {
     let keypair_count = *tx_count * keypair_multiplier;
     if *write_to_client_file {
         info!("Generating {} keypairs", keypair_count);
-        let (keypairs, _) = generate_keypairs(id, keypair_count as u64);
+        let (keypairs, _) = generate_keypairs(&id, keypair_count as u64);
         let num_accounts = keypairs.len() as u64;
         let max_fee =
             FeeRateGovernor::new(*target_lamports_per_signature, 0).max_lamports_per_signature;
@@ -69,14 +68,13 @@ fn main() {
     }
 
     info!("Connecting to the cluster");
-    let nodes = discover_cluster(entrypoint_addr, *num_nodes, SocketAddrSpace::Unspecified)
-        .unwrap_or_else(|err| {
-            eprintln!("Failed to discover {} nodes: {:?}", num_nodes, err);
-            exit(1);
-        });
+    let nodes = discover_cluster(&entrypoint_addr, *num_nodes).unwrap_or_else(|err| {
+        eprintln!("Failed to discover {} nodes: {:?}", num_nodes, err);
+        exit(1);
+    });
 
     let client = if *multi_client {
-        let (client, num_clients) = get_multi_client(&nodes, &SocketAddrSpace::Unspecified);
+        let (client, num_clients) = get_multi_client(&nodes);
         if nodes.len() < num_clients {
             eprintln!(
                 "Error: Insufficient nodes discovered.  Expecting {} or more",
@@ -90,7 +88,7 @@ fn main() {
         let mut target_client = None;
         for node in nodes {
             if node.id == *target_node {
-                target_client = Some(Arc::new(get_client(&[node], &SocketAddrSpace::Unspecified)));
+                target_client = Some(Arc::new(get_client(&[node])));
                 break;
             }
         }
@@ -99,7 +97,7 @@ fn main() {
             exit(1);
         })
     } else {
-        Arc::new(get_client(&nodes, &SocketAddrSpace::Unspecified))
+        Arc::new(get_client(&nodes))
     };
 
     let keypairs = if *read_from_client_file {
@@ -137,7 +135,7 @@ fn main() {
         generate_and_fund_keypairs(
             client.clone(),
             Some(*faucet_addr),
-            id,
+            &id,
             keypair_count,
             *num_lamports_per_account,
         )

bench-tps/tests/bench_tps.rs

@@ -5,15 +5,13 @@ use solana_bench_tps::{
     cli::Config,
 };
 use solana_client::thin_client::create_client;
-use solana_core::validator::ValidatorConfig;
+use solana_core::{cluster_info::VALIDATOR_PORT_RANGE, validator::ValidatorConfig};
 use solana_faucet::faucet::run_local_faucet_with_port;
-use solana_gossip::cluster_info::VALIDATOR_PORT_RANGE;
 use solana_local_cluster::{
     local_cluster::{ClusterConfig, LocalCluster},
     validator_configs::make_identical_validator_configs,
 };
 use solana_sdk::signature::{Keypair, Signer};
-use solana_streamer::socket::SocketAddrSpace;
 use std::{
     sync::{mpsc::channel, Arc},
     time::Duration,
@@ -24,19 +22,13 @@ fn test_bench_tps_local_cluster(config: Config) {
 
     solana_logger::setup();
     const NUM_NODES: usize = 1;
-    let cluster = LocalCluster::new(
-        &mut ClusterConfig {
-            node_stakes: vec![999_990; NUM_NODES],
-            cluster_lamports: 200_000_000,
-            validator_configs: make_identical_validator_configs(
-                &ValidatorConfig::default(),
-                NUM_NODES,
-            ),
-            native_instruction_processors,
-            ..ClusterConfig::default()
-        },
-        SocketAddrSpace::Unspecified,
-    );
+    let cluster = LocalCluster::new(&mut ClusterConfig {
+        node_stakes: vec![999_990; NUM_NODES],
+        cluster_lamports: 200_000_000,
+        validator_configs: make_identical_validator_configs(&ValidatorConfig::default(), NUM_NODES),
+        native_instruction_processors,
+        ..ClusterConfig::default()
+    });
 
     let faucet_keypair = Keypair::new();
     cluster.transfer(

ci/buildkite-pipeline.sh

@@ -137,7 +137,7 @@ all_test_steps() {
              ^ci/test-coverage.sh \
              ^scripts/coverage.sh \
       ; then
-    command_step coverage ". ci/rust-version.sh; ci/docker-run.sh \$\$rust_nightly_docker_image ci/test-coverage.sh" 40
+    command_step coverage ". ci/rust-version.sh; ci/docker-run.sh \$\$rust_nightly_docker_image ci/test-coverage.sh" 30
     wait_step
   else
     annotate --style info --context test-coverage \
@@ -148,33 +148,6 @@ all_test_steps() {
   command_step stable ". ci/rust-version.sh; ci/docker-run.sh \$\$rust_stable_docker_image ci/test-stable.sh" 60
   wait_step
 
-  # BPF test suite
-  if affects \
-             .rs$ \
-             Cargo.lock$ \
-             Cargo.toml$ \
-             ^ci/rust-version.sh \
-             ^ci/test-stable-bpf.sh \
-             ^ci/test-stable.sh \
-             ^ci/test-local-cluster.sh \
-             ^core/build.rs \
-             ^fetch-perf-libs.sh \
-             ^programs/ \
-             ^sdk/ \
-      ; then
-    cat >> "$output_file" <<"EOF"
-  - command: "ci/test-stable-bpf.sh"
-    name: "stable-bpf"
-    timeout_in_minutes: 20
-    artifact_paths: "bpf-dumps.tar.bz2"
-    agents:
-      - "queue=default"
-EOF
-  else
-    annotate --style info \
-      "Stable-BPF skipped as no relevant files were modified"
-  fi
-
   # Perf test suite
   if affects \
              .rs$ \
@@ -192,7 +165,7 @@ EOF
     cat >> "$output_file" <<"EOF"
   - command: "ci/test-stable-perf.sh"
     name: "stable-perf"
-    timeout_in_minutes: 20
+    timeout_in_minutes: 40
     artifact_paths: "log-*.txt"
     agents:
       - "queue=cuda"

ci/buildkite-secondary.yml

@@ -3,19 +3,16 @@
 # Pull requests to not run these steps.
 steps:
   - command: "ci/publish-tarball.sh"
-    agents:
-      - "queue=release-build"
     timeout_in_minutes: 60
     name: "publish tarball"
+  - command: "ci/publish-bpf-sdk.sh"
+    timeout_in_minutes: 5
+    name: "publish bpf sdk"
   - wait
   - command: "sdk/docker-solana/build.sh"
-    agents:
-      - "queue=release-build"
     timeout_in_minutes: 60
     name: "publish docker"
   - command: "ci/publish-crate.sh"
-    agents:
-      - "queue=release-build"
     timeout_in_minutes: 240
     name: "publish crate"
     branches: "!master"

ci/do-audit.sh

@@ -28,29 +28,16 @@ cargo_audit_ignores=(
   # Blocked on multiple crates updating `time` to >= 0.2.23
   --ignore RUSTSEC-2020-0071
 
+  # difference is unmaintained
+  #
+  # Blocked on predicates v1.0.6 removing its dependency on `difference`
+  --ignore RUSTSEC-2020-0095
+
   # generic-array: arr! macro erases lifetimes
   #
   # Blocked on libsecp256k1 releasing with upgraded dependencies
   # https://github.com/paritytech/libsecp256k1/issues/66
   --ignore RUSTSEC-2020-0146
 
-  # hyper: Lenient `hyper` header parsing of `Content-Length` could allow request smuggling
-  #
-  # Blocked on jsonrpc removing dependency on unmaintained `websocket`
-  # https://github.com/paritytech/jsonrpc/issues/605
-  --ignore RUSTSEC-2021-0078
-
-  # hyper: Integer overflow in `hyper`'s parsing of the `Transfer-Encoding` header leads to data loss
-  #
-  # Blocked on jsonrpc removing dependency on unmaintained `websocket`
-  # https://github.com/paritytech/jsonrpc/issues/605
-  --ignore RUSTSEC-2021-0079
-
-  # chrono: Potential segfault in `localtime_r` invocations
-  #
-  # Blocked due to no safe upgrade
-  # https://github.com/chronotope/chrono/issues/499
-  --ignore RUSTSEC-2020-0159
-
 )
 scripts/cargo-for-all-lock-files.sh stable audit "${cargo_audit_ignores[@]}"

ci/docker-rust-nightly/Dockerfile

@@ -1,4 +1,4 @@
-FROM solanalabs/rust:1.52.1
+FROM solanalabs/rust:1.50.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.52.1
+FROM rust:1.50.0
 
 # Add Google Protocol Buffers for Libra's metrics library.
 ENV PROTOC_VERSION 3.8.0

ci/env.sh

@@ -74,13 +74,10 @@ else
   export CI_BUILD_ID=
   export CI_COMMIT=
   export CI_JOB_ID=
+  export CI_OS_NAME=
   export CI_PULL_REQUEST=
   export CI_REPO_SLUG=
   export CI_TAG=
-  # Don't override ci/run-local.sh
-  if [[ -z $CI_LOCAL_RUN ]]; then
-    export CI_OS_NAME=
-  fi
 fi
 
 cat <<EOF

ci/localnet-sanity.sh

@@ -127,7 +127,7 @@ startNode() {
 waitForNodeToInit() {
   declare initCompleteFile=$1
   while [[ ! -r $initCompleteFile ]]; do
-    if [[ $SECONDS -ge 300 ]]; then
+    if [[ $SECONDS -ge 240 ]]; then
       echo "^^^ +++"
       echo "Error: $initCompleteFile not found in $SECONDS seconds"
       exit 1

ci/order-crates-for-publishing.py

@@ -12,14 +12,10 @@ import json
 import subprocess
 import sys;
 
-real_file = os.path.realpath(__file__)
-ci_path = os.path.dirname(real_file)
-src_root = os.path.dirname(ci_path)
-
 def load_metadata():
-    cmd = f'{src_root}/cargo metadata --no-deps --format-version=1'
     return json.loads(subprocess.Popen(
-        cmd, shell=True, stdout=subprocess.PIPE).communicate()[0])
+        'cargo metadata --no-deps --format-version=1',
+        shell=True, stdout=subprocess.PIPE).communicate()[0])
 
 def get_packages():
     metadata = load_metadata()

ci/publish-bpf-sdk.sh

@@ -0,0 +1,27 @@
+#!/usr/bin/env bash
+set -e
+
+cd "$(dirname "$0")/.."
+eval "$(ci/channel-info.sh)"
+
+if [[ -n "$CI_TAG" ]]; then
+  CHANNEL_OR_TAG=$CI_TAG
+else
+  CHANNEL_OR_TAG=$CHANNEL
+fi
+
+(
+  set -x
+  sdk/bpf/scripts/package.sh
+  [[ -f bpf-sdk.tar.bz2 ]]
+)
+
+source ci/upload-ci-artifact.sh
+echo --- AWS S3 Store
+if [[ -z $CHANNEL_OR_TAG ]]; then
+  echo Skipped
+else
+  upload-s3-artifact "/solana/bpf-sdk.tar.bz2" "s3://solana-sdk/$CHANNEL_OR_TAG/bpf-sdk.tar.bz2"
+fi
+
+exit 0

ci/run-local.sh

@@ -1,55 +0,0 @@
-#!/usr/bin/env bash
-
-cd "$(dirname "$0")/.."
-
-export CI_LOCAL_RUN=true
-
-set -e
-
-case $(uname -o) in
-  */Linux)
-    export CI_OS_NAME=linux
-    ;;
-  *)
-    echo "local CI runs are only supported on Linux" 1>&2
-    exit 1
-    ;;
-esac
-
-steps=()
-steps+=(test-sanity)
-steps+=(shellcheck)
-steps+=(test-checks)
-steps+=(test-coverage)
-steps+=(test-stable)
-steps+=(test-stable-bpf)
-steps+=(test-stable-perf)
-steps+=(test-downstream-builds)
-steps+=(test-bench)
-steps+=(test-local-cluster)
-
-step_index=0
-if [[ -n "$1" ]]; then
-  start_step="$1"
-  while [[ $step_index -lt ${#steps[@]} ]]; do
-    step="${steps[$step_index]}"
-    if [[ "$step" = "$start_step" ]]; then
-      break
-    fi
-    step_index=$((step_index + 1))
-  done
-  if [[ $step_index -eq ${#steps[@]} ]]; then
-    echo "unexpected start step: \"$start_step\"" 1>&2
-    exit 1
-  else
-    echo "** starting at step: \"$start_step\" **"
-    echo
-  fi
-fi
-
-while [[ $step_index -lt ${#steps[@]} ]]; do
-  step="${steps[$step_index]}"
-  cmd="ci/${step}.sh"
-  $cmd
-  step_index=$((step_index + 1))
-done

ci/run-sanity.sh

@@ -7,7 +7,7 @@ source multinode-demo/common.sh
 
 rm -rf config/run/init-completed config/ledger config/snapshot-ledger
 
-SOLANA_RUN_SH_VALIDATOR_ARGS="--snapshot-interval-slots 200" timeout 120 ./scripts/run.sh &
+timeout 120 ./run.sh &
 pid=$!
 
 attempts=20
@@ -16,8 +16,6 @@ while [[ ! -f config/run/init-completed ]]; do
   if ((--attempts == 0)); then
      echo "Error: validator failed to boot"
      exit 1
-  else
-    echo "Checking init"
   fi
 done
 
@@ -26,7 +24,6 @@ snapshot_slot=1
 # wait a bit longer than snapshot_slot
 while [[ $($solana_cli --url http://localhost:8899 slot --commitment processed) -le $((snapshot_slot + 1)) ]]; do
   sleep 1
-  echo "Checking slot"
 done
 
 $solana_validator --ledger config/ledger exit --force || true

ci/rust-version.sh

@@ -18,13 +18,13 @@
 if [[ -n $RUST_STABLE_VERSION ]]; then
   stable_version="$RUST_STABLE_VERSION"
 else
-  stable_version=1.52.1
+  stable_version=1.50.0
 fi
 
 if [[ -n $RUST_NIGHTLY_VERSION ]]; then
   nightly_version="$RUST_NIGHTLY_VERSION"
 else
-  nightly_version=2021-05-18
+  nightly_version=2021-02-18
 fi
 
 

ci/setup-new-buildkite-agent/setup-buildkite.sh

@@ -76,7 +76,7 @@ RestartForceExitStatus=SIGPIPE
 TimeoutStartSec=10
 TimeoutStopSec=0
 KillMode=process
-LimitNOFILE=1000000
+LimitNOFILE=700000
 
 [Install]
 WantedBy=multi-user.target

ci/setup-new-buildkite-agent/setup-limits.sh

@@ -8,5 +8,5 @@ source "$HERE"/utils.sh
 ensure_env || exit 1
 
 # Allow more files to be opened by a user
-echo "* - nofile 1000000" > /etc/security/limits.d/90-solana-nofiles.conf
+echo "* - nofile 700000" > /etc/security/limits.d/90-solana-nofiles.conf
 

ci/test-bench.sh

@@ -27,7 +27,7 @@ BENCH_ARTIFACT=current_bench_results.log
 _ "$cargo" build --manifest-path=keygen/Cargo.toml
 export PATH="$PWD/target/debug":$PATH
 
-# Clear the C dependency files, if dependency moves these files are not regenerated
+# Clear the C dependency files, if dependeny moves these files are not regenerated
 test -d target/debug/bpf && find target/debug/bpf -name '*.d' -delete
 test -d target/release/bpf && find target/release/bpf -name '*.d' -delete
 
@@ -45,14 +45,6 @@ _ "$cargo" nightly bench --manifest-path sdk/Cargo.toml ${V:+--verbose} \
 _ "$cargo" nightly bench --manifest-path runtime/Cargo.toml ${V:+--verbose} \
   -- -Z unstable-options --format=json | tee -a "$BENCH_FILE"
 
-# Run gossip benches
-_ "$cargo" nightly bench --manifest-path gossip/Cargo.toml ${V:+--verbose} \
-  -- -Z unstable-options --format=json | tee -a "$BENCH_FILE"
-
-# Run poh benches
-_ "$cargo" nightly bench --manifest-path poh/Cargo.toml ${V:+--verbose} \
-  -- -Z unstable-options --format=json | tee -a "$BENCH_FILE"
-
 # Run core benches
 _ "$cargo" nightly bench --manifest-path core/Cargo.toml ${V:+--verbose} \
   -- -Z unstable-options --format=json | tee -a "$BENCH_FILE"

ci/test-checks.sh

@@ -14,7 +14,7 @@ scripts/increment-cargo-version.sh check
 
 # Disallow uncommitted Cargo.lock changes
 (
-  _ scripts/cargo-for-all-lock-files.sh tree >/dev/null
+  _ scripts/cargo-for-all-lock-files.sh tree
   set +e
   if ! _ git diff --exit-code; then
     echo -e "\nError: Uncommitted Cargo.lock changes" 1>&2
@@ -35,10 +35,8 @@ echo --- build environment
   "$cargo" stable clippy --version --verbose
   "$cargo" nightly clippy --version --verbose
 
-  # audit is done only with "$cargo stable"
+  # audit is done only with stable
   "$cargo" stable audit --version
-
-  grcov --version
 )
 
 export RUST_BACKTRACE=1
@@ -67,8 +65,7 @@ _ ci/order-crates-for-publishing.py
 
 # -Z... is needed because of clippy bug: https://github.com/rust-lang/rust-clippy/issues/4612
 # run nightly clippy for `sdk/` as there's a moderate amount of nightly-only code there
-_ "$cargo" nightly clippy -Zunstable-options --workspace --all-targets -- \
-  --deny=warnings --deny=clippy::integer_arithmetic --allow=clippy::inconsistent_struct_constructor
+_ "$cargo" nightly clippy -Zunstable-options --workspace --all-targets -- --deny=warnings --deny=clippy::integer_arithmetic
 
 _ "$cargo" stable fmt --all -- --check
 

ci/test-downstream-builds.sh

@@ -1,9 +0,0 @@
-#!/usr/bin/env bash
-
-cd "$(dirname "$0")/.."
-
-export CI_LOCAL_RUN=true
-
-set -ex
-
-scripts/build-downstream-projects.sh

ci/test-stable-bpf.sh

@@ -1 +0,0 @@
-test-stable.sh

ci/test-stable.sh

@@ -21,6 +21,10 @@ export RUST_BACKTRACE=1
 export RUSTFLAGS="-D warnings"
 source scripts/ulimit-n.sh
 
+# Clear the C dependency files, if dependency moves these files are not regenerated
+test -d target/debug/bpf && find target/debug/bpf -name '*.d' -delete
+test -d target/release/bpf && find target/release/bpf -name '*.d' -delete
+
 # Limit compiler jobs to reduce memory usage
 # on machines with 2gb/thread of memory
 NPROC=$(nproc)
@@ -31,25 +35,17 @@ case $testName in
 test-stable)
   _ "$cargo" stable test --jobs "$NPROC" --all --exclude solana-local-cluster ${V:+--verbose} -- --nocapture
   ;;
-test-stable-bpf)
-  # Clear the C dependency files, if dependency moves these files are not regenerated
-  test -d target/debug/bpf && find target/debug/bpf -name '*.d' -delete
-  test -d target/release/bpf && find target/release/bpf -name '*.d' -delete
-
-  # rustfilt required for dumping BPF assembly listings
-  "$cargo" install rustfilt
-
+test-stable-perf)
   # solana-keygen required when building C programs
   _ "$cargo" build --manifest-path=keygen/Cargo.toml
   export PATH="$PWD/target/debug":$PATH
-  cargo_build_bpf="$(realpath ./cargo-build-bpf)"
 
   # BPF solana-sdk legacy compile test
-  "$cargo_build_bpf" --manifest-path sdk/Cargo.toml
+  ./cargo-build-bpf --manifest-path sdk/Cargo.toml
 
   # BPF Program unit tests
-  "$cargo" test --manifest-path programs/bpf/Cargo.toml
-  "$cargo_build_bpf" --manifest-path programs/bpf/Cargo.toml --bpf-sdk sdk/bpf
+  "$cargo" stable test --manifest-path programs/bpf/Cargo.toml
+  cargo-build-bpf --manifest-path programs/bpf/Cargo.toml --bpf-sdk sdk/bpf
 
   # BPF program system tests
   _ make -C programs/bpf/c tests
@@ -57,32 +53,11 @@ test-stable-bpf)
     --manifest-path programs/bpf/Cargo.toml \
     --no-default-features --features=bpf_c,bpf_rust -- --nocapture
 
-  # Dump BPF program assembly listings
-  for bpf_test in programs/bpf/rust/*; do
-    if pushd "$bpf_test"; then
-      "$cargo_build_bpf" --dump
-      popd
-    fi
-  done
-
-  # BPF program instruction count assertion
-  bpf_target_path=programs/bpf/target
-  _ "$cargo" stable test \
-    --manifest-path programs/bpf/Cargo.toml \
-    --no-default-features --features=bpf_c,bpf_rust assert_instruction_count \
-    -- --nocapture &> "${bpf_target_path}"/deploy/instuction_counts.txt
-
-  bpf_dump_archive="bpf-dumps.tar.bz2"
-  rm -f "$bpf_dump_archive"
-  tar cjvf "$bpf_dump_archive" "${bpf_target_path}"/{deploy/*.txt,bpfel-unknown-unknown/release/*.so}
-  exit 0
-  ;;
-test-stable-perf)
   if [[ $(uname) = Linux ]]; then
     # Enable persistence mode to keep the CUDA kernel driver loaded, avoiding a
     # lengthy and unexpected delay the first time CUDA is involved when the driver
     # is not yet loaded.
-    sudo --non-interactive ./net/scripts/enable-nvidia-persistence-mode.sh || true
+    sudo --non-interactive ./net/scripts/enable-nvidia-persistence-mode.sh
 
     rm -rf target/perf-libs
     ./fetch-perf-libs.sh

clap-utils/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "solana-clap-utils"
-version = "1.7.18"
+version = "1.6.6"
 description = "Solana utilities for the clap"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -12,17 +12,14 @@ edition = "2018"
 [dependencies]
 clap = "2.33.0"
 rpassword = "4.0"
-solana-remote-wallet = { path = "../remote-wallet", version = "=1.7.18" }
-solana-sdk = { path = "../sdk", version = "=1.7.18" }
+solana-remote-wallet = { path = "../remote-wallet", version = "=1.6.6" }
+solana-sdk = { path = "../sdk", version = "=1.6.6" }
 thiserror = "1.0.21"
-tiny-bip39 = "0.8.1"
+tiny-bip39 = "0.8.0"
 uriparse = "0.6.3"
 url = "2.1.0"
 chrono = "0.4"
 
-[dev-dependencies]
-tempfile = "3.1.0"
-
 [lib]
 name = "solana_clap_utils"
 

clap-utils/src/fee_payer.rs

@@ -1,7 +1,5 @@
-use {
-    crate::{input_validators, ArgConstant},
-    clap::Arg,
-};
+use crate::{input_validators, ArgConstant};
+use clap::Arg;
 
 pub const FEE_PAYER_ARG: ArgConstant<'static> = ArgConstant {
     name: "fee_payer",

clap-utils/src/input_parsers.rs

@@ -1,24 +1,19 @@
-use {
-    crate::keypair::{
-        keypair_from_seed_phrase, pubkey_from_path, resolve_signer_from_path, signer_from_path,
-        ASK_KEYWORD, SKIP_SEED_PHRASE_VALIDATION_ARG,
-    },
-    chrono::DateTime,
-    clap::ArgMatches,
-    solana_remote_wallet::remote_wallet::RemoteWalletManager,
-    solana_sdk::{
-        clock::UnixTimestamp,
-        commitment_config::CommitmentConfig,
-        genesis_config::ClusterType,
-        native_token::sol_to_lamports,
-        pubkey::Pubkey,
-        signature::{read_keypair_file, Keypair, Signature, Signer},
-    },
-    std::{str::FromStr, sync::Arc},
+use crate::keypair::{
+    keypair_from_seed_phrase, pubkey_from_path, resolve_signer_from_path, signer_from_path,
+    ASK_KEYWORD, SKIP_SEED_PHRASE_VALIDATION_ARG,
 };
-
-// Sentinel value used to indicate to write to screen instead of file
-pub const STDOUT_OUTFILE_TOKEN: &str = "-";
+use chrono::DateTime;
+use clap::ArgMatches;
+use solana_remote_wallet::remote_wallet::RemoteWalletManager;
+use solana_sdk::{
+    clock::UnixTimestamp,
+    commitment_config::CommitmentConfig,
+    genesis_config::ClusterType,
+    native_token::sol_to_lamports,
+    pubkey::Pubkey,
+    signature::{read_keypair_file, Keypair, Signature, Signer},
+};
+use std::{str::FromStr, sync::Arc};
 
 // Return parsed values from matches at `name`
 pub fn values_of<T>(matches: &ArgMatches<'_>, name: &str) -> Option<Vec<T>>
@@ -60,7 +55,7 @@ pub fn keypair_of(matches: &ArgMatches<'_>, name: &str) -> Option<Keypair> {
     if let Some(value) = matches.value_of(name) {
         if value == ASK_KEYWORD {
             let skip_validation = matches.is_present(SKIP_SEED_PHRASE_VALIDATION_ARG.name);
-            keypair_from_seed_phrase(name, skip_validation, true, None, true).ok()
+            keypair_from_seed_phrase(name, skip_validation, true).ok()
         } else {
             read_keypair_file(value).ok()
         }
@@ -75,7 +70,7 @@ pub fn keypairs_of(matches: &ArgMatches<'_>, name: &str) -> Option<Vec<Keypair>>
             .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, None, true).ok()
+                    keypair_from_seed_phrase(name, skip_validation, true).ok()
                 } else {
                     read_keypair_file(value).ok()
                 }

clap-utils/src/input_validators.rs

@@ -1,15 +1,13 @@
-use {
-    crate::keypair::{parse_signer_source, SignerSourceKind, ASK_KEYWORD},
-    chrono::DateTime,
-    solana_sdk::{
-        clock::{Epoch, Slot},
-        hash::Hash,
-        pubkey::{Pubkey, MAX_SEED_LEN},
-        signature::{read_keypair_file, Signature},
-    },
-    std::fmt::Display,
-    std::str::FromStr,
+use crate::keypair::{parse_signer_source, SignerSource, ASK_KEYWORD};
+use chrono::DateTime;
+use solana_sdk::{
+    clock::{Epoch, Slot},
+    hash::Hash,
+    pubkey::{Pubkey, MAX_SEED_LEN},
+    signature::{read_keypair_file, Signature},
 };
+use std::fmt::Display;
+use std::str::FromStr;
 
 fn is_parsable_generic<U, T>(string: T) -> Result<(), String>
 where
@@ -96,26 +94,6 @@ where
         .map_err(|err| format!("{}", err))
 }
 
-// Return an error if a `SignerSourceKind::Prompt` cannot be parsed
-pub fn is_prompt_signer_source<T>(string: T) -> Result<(), String>
-where
-    T: AsRef<str> + Display,
-{
-    if string.as_ref() == ASK_KEYWORD {
-        return Ok(());
-    }
-    match parse_signer_source(string.as_ref())
-        .map_err(|err| format!("{}", err))?
-        .kind
-    {
-        SignerSourceKind::Prompt => Ok(()),
-        _ => Err(format!(
-            "Unable to parse input as `prompt:` URI scheme or `ASK` keyword: {}",
-            string
-        )),
-    }
-}
-
 // Return an error if string cannot be parsed as pubkey string or keypair file location
 pub fn is_pubkey_or_keypair<T>(string: T) -> Result<(), String>
 where
@@ -130,11 +108,8 @@ pub fn is_valid_pubkey<T>(string: T) -> Result<(), String>
 where
     T: AsRef<str> + Display,
 {
-    match parse_signer_source(string.as_ref())
-        .map_err(|err| format!("{}", err))?
-        .kind
-    {
-        SignerSourceKind::Filepath(path) => is_keypair(path),
+    match parse_signer_source(string.as_ref()) {
+        SignerSource::Filepath(path) => is_keypair(path),
         _ => Ok(()),
     }
 }
@@ -215,8 +190,8 @@ where
 pub fn normalize_to_url_if_moniker<T: AsRef<str>>(url_or_moniker: T) -> String {
     match url_or_moniker.as_ref() {
         "m" | "mainnet-beta" => "https://api.mainnet-beta.solana.com",
-        "t" | "testnet" => "https://api.testnet.solana.com",
-        "d" | "devnet" => "https://api.devnet.solana.com",
+        "t" | "testnet" => "https://testnet.solana.com",
+        "d" | "devnet" => "https://devnet.solana.com",
         "l" | "localhost" => "http://localhost:8899",
         url => url,
     }

clap-utils/src/keypair.rs

@@ -1,39 +1,31 @@
-use {
-    crate::{
-        input_parsers::{pubkeys_sigs_of, STDOUT_OUTFILE_TOKEN},
-        offline::{SIGNER_ARG, SIGN_ONLY_ARG},
-        ArgConstant,
+use crate::{
+    input_parsers::pubkeys_sigs_of,
+    offline::{SIGNER_ARG, SIGN_ONLY_ARG},
+    ArgConstant,
+};
+use bip39::{Language, Mnemonic, Seed};
+use clap::ArgMatches;
+use rpassword::prompt_password_stderr;
+use solana_remote_wallet::{
+    remote_keypair::generate_remote_keypair,
+    remote_wallet::{maybe_wallet_manager, RemoteWalletError, RemoteWalletManager},
+};
+use solana_sdk::{
+    hash::Hash,
+    message::Message,
+    pubkey::Pubkey,
+    signature::{
+        keypair_from_seed, keypair_from_seed_phrase_and_passphrase, read_keypair,
+        read_keypair_file, Keypair, NullSigner, Presigner, Signature, Signer,
     },
-    bip39::{Language, Mnemonic, Seed},
-    clap::ArgMatches,
-    rpassword::prompt_password_stderr,
-    solana_remote_wallet::{
-        locator::{Locator as RemoteWalletLocator, LocatorError as RemoteWalletLocatorError},
-        remote_keypair::generate_remote_keypair,
-        remote_wallet::{maybe_wallet_manager, RemoteWalletError, RemoteWalletManager},
-    },
-    solana_sdk::{
-        derivation_path::{DerivationPath, DerivationPathError},
-        hash::Hash,
-        message::Message,
-        pubkey::Pubkey,
-        signature::{
-            generate_seed_from_seed_phrase_and_passphrase, keypair_from_seed,
-            keypair_from_seed_and_derivation_path, keypair_from_seed_phrase_and_passphrase,
-            read_keypair, read_keypair_file, Keypair, NullSigner, Presigner, Signature, Signer,
-        },
-    },
-    std::{
-        cell::RefCell,
-        convert::TryFrom,
-        error,
-        io::{stdin, stdout, Write},
-        ops::Deref,
-        process::exit,
-        str::FromStr,
-        sync::Arc,
-    },
-    thiserror::Error,
+};
+use std::{
+    convert::TryFrom,
+    error,
+    io::{stdin, stdout, Write},
+    process::exit,
+    str::FromStr,
+    sync::Arc,
 };
 
 pub struct SignOnly {
@@ -92,48 +84,12 @@ impl CliSignerInfo {
     }
 }
 
-#[derive(Debug, Default)]
 pub struct DefaultSigner {
     pub arg_name: String,
     pub path: String,
-    is_path_checked: RefCell<bool>,
 }
 
 impl DefaultSigner {
-    pub fn new<AN: AsRef<str>, P: AsRef<str>>(arg_name: AN, path: P) -> Self {
-        let arg_name = arg_name.as_ref().to_string();
-        let path = path.as_ref().to_string();
-        Self {
-            arg_name,
-            path,
-            ..Self::default()
-        }
-    }
-
-    fn path(&self) -> Result<&str, Box<dyn std::error::Error>> {
-        if !self.is_path_checked.borrow().deref() {
-            parse_signer_source(&self.path)
-                .and_then(|s| {
-                    if let SignerSourceKind::Filepath(path) = &s.kind {
-                        std::fs::metadata(path).map(|_| ()).map_err(|e| e.into())
-                    } else {
-                        Ok(())
-                    }
-                })
-                .map_err(|_| {
-                    std::io::Error::new(
-                        std::io::ErrorKind::Other,
-                        format!(
-                        "No default signer found, run \"solana-keygen new -o {}\" to create a new one",
-                        self.path
-                    ),
-                    )
-                })?;
-            *self.is_path_checked.borrow_mut() = true;
-        }
-        Ok(&self.path)
-    }
-
     pub fn generate_unique_signers(
         &self,
         bulk_signers: Vec<Option<Box<dyn Signer>>>,
@@ -148,9 +104,11 @@ impl DefaultSigner {
             unique_signers.push(default_signer);
         }
 
-        for signer in bulk_signers.into_iter().flatten() {
-            if !unique_signers.iter().any(|s| s == &signer) {
-                unique_signers.push(signer);
+        for signer in bulk_signers.into_iter() {
+            if let Some(signer) = signer {
+                if !unique_signers.iter().any(|s| s == &signer) {
+                    unique_signers.push(signer);
+                }
             }
         }
         Ok(CliSignerInfo {
@@ -163,7 +121,7 @@ impl DefaultSigner {
         matches: &ArgMatches,
         wallet_manager: &mut Option<Arc<RemoteWalletManager>>,
     ) -> Result<Box<dyn Signer>, Box<dyn std::error::Error>> {
-        signer_from_path(matches, self.path()?, &self.arg_name, wallet_manager)
+        signer_from_path(matches, &self.path, &self.arg_name, wallet_manager)
     }
 
     pub fn signer_from_path_with_config(
@@ -172,147 +130,38 @@ impl DefaultSigner {
         wallet_manager: &mut Option<Arc<RemoteWalletManager>>,
         config: &SignerFromPathConfig,
     ) -> Result<Box<dyn Signer>, Box<dyn std::error::Error>> {
-        signer_from_path_with_config(
-            matches,
-            self.path()?,
-            &self.arg_name,
-            wallet_manager,
-            config,
-        )
+        signer_from_path_with_config(matches, &self.path, &self.arg_name, wallet_manager, config)
     }
 }
 
-pub(crate) struct SignerSource {
-    pub kind: SignerSourceKind,
-    pub derivation_path: Option<DerivationPath>,
-    pub legacy: bool,
-}
-
-impl SignerSource {
-    fn new(kind: SignerSourceKind) -> Self {
-        Self {
-            kind,
-            derivation_path: None,
-            legacy: false,
-        }
-    }
-
-    fn new_legacy(kind: SignerSourceKind) -> Self {
-        Self {
-            kind,
-            derivation_path: None,
-            legacy: true,
-        }
-    }
-}
-
-const SIGNER_SOURCE_PROMPT: &str = "prompt";
-const SIGNER_SOURCE_FILEPATH: &str = "file";
-const SIGNER_SOURCE_USB: &str = "usb";
-const SIGNER_SOURCE_STDIN: &str = "stdin";
-const SIGNER_SOURCE_PUBKEY: &str = "pubkey";
-
-pub(crate) enum SignerSourceKind {
-    Prompt,
+pub(crate) enum SignerSource {
+    Ask,
     Filepath(String),
-    Usb(RemoteWalletLocator),
+    Usb(String),
     Stdin,
     Pubkey(Pubkey),
 }
 
-impl AsRef<str> for SignerSourceKind {
-    fn as_ref(&self) -> &str {
-        match self {
-            Self::Prompt => SIGNER_SOURCE_PROMPT,
-            Self::Filepath(_) => SIGNER_SOURCE_FILEPATH,
-            Self::Usb(_) => SIGNER_SOURCE_USB,
-            Self::Stdin => SIGNER_SOURCE_STDIN,
-            Self::Pubkey(_) => SIGNER_SOURCE_PUBKEY,
-        }
-    }
-}
-
-impl std::fmt::Debug for SignerSourceKind {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        let s: &str = self.as_ref();
-        write!(f, "{}", s)
-    }
-}
-
-#[derive(Debug, Error)]
-pub(crate) enum SignerSourceError {
-    #[error("unrecognized signer source")]
-    UnrecognizedSource,
-    #[error(transparent)]
-    RemoteWalletLocatorError(#[from] RemoteWalletLocatorError),
-    #[error(transparent)]
-    DerivationPathError(#[from] DerivationPathError),
-    #[error(transparent)]
-    IoError(#[from] std::io::Error),
-}
-
-pub(crate) fn parse_signer_source<S: AsRef<str>>(
-    source: S,
-) -> Result<SignerSource, SignerSourceError> {
+pub(crate) fn parse_signer_source<S: AsRef<str>>(source: S) -> SignerSource {
     let source = source.as_ref();
-    let source = {
-        #[cfg(target_family = "windows")]
-        {
-            // trim matched single-quotes since cmd.exe won't
-            let mut source = source;
-            while let Some(trimmed) = source.strip_prefix('\'') {
-                source = if let Some(trimmed) = trimmed.strip_suffix('\'') {
-                    trimmed
-                } else {
-                    break;
-                }
-            }
-            source.replace("\\", "/")
-        }
-        #[cfg(not(target_family = "windows"))]
-        {
-            source.to_string()
-        }
-    };
-    match uriparse::URIReference::try_from(source.as_str()) {
-        Err(_) => Err(SignerSourceError::UnrecognizedSource),
+    match uriparse::URIReference::try_from(source) {
+        Err(_) => SignerSource::Filepath(source.to_string()),
         Ok(uri) => {
             if let Some(scheme) = uri.scheme() {
                 let scheme = scheme.as_str().to_ascii_lowercase();
                 match scheme.as_str() {
-                    SIGNER_SOURCE_PROMPT => Ok(SignerSource {
-                        kind: SignerSourceKind::Prompt,
-                        derivation_path: DerivationPath::from_uri_any_query(&uri)?,
-                        legacy: false,
-                    }),
-                    SIGNER_SOURCE_FILEPATH => Ok(SignerSource::new(SignerSourceKind::Filepath(
-                        uri.path().to_string(),
-                    ))),
-                    SIGNER_SOURCE_USB => Ok(SignerSource {
-                        kind: SignerSourceKind::Usb(RemoteWalletLocator::new_from_uri(&uri)?),
-                        derivation_path: DerivationPath::from_uri_key_query(&uri)?,
-                        legacy: false,
-                    }),
-                    SIGNER_SOURCE_STDIN => Ok(SignerSource::new(SignerSourceKind::Stdin)),
-                    _ => {
-                        #[cfg(target_family = "windows")]
-                        // On Windows, an absolute path's drive letter will be parsed as the URI
-                        // scheme. Assume a filepath source in case of a single character shceme.
-                        if scheme.len() == 1 {
-                            return Ok(SignerSource::new(SignerSourceKind::Filepath(source)));
-                        }
-                        Err(SignerSourceError::UnrecognizedSource)
-                    }
+                    "ask" => SignerSource::Ask,
+                    "file" => SignerSource::Filepath(uri.path().to_string()),
+                    "usb" => SignerSource::Usb(source.to_string()),
+                    _ => SignerSource::Filepath(source.to_string()),
                 }
             } else {
-                match source.as_str() {
-                    STDOUT_OUTFILE_TOKEN => Ok(SignerSource::new(SignerSourceKind::Stdin)),
-                    ASK_KEYWORD => Ok(SignerSource::new_legacy(SignerSourceKind::Prompt)),
-                    _ => match Pubkey::from_str(source.as_str()) {
-                        Ok(pubkey) => Ok(SignerSource::new(SignerSourceKind::Pubkey(pubkey))),
-                        Err(_) => std::fs::metadata(source.as_str())
-                            .map(|_| SignerSource::new(SignerSourceKind::Filepath(source)))
-                            .map_err(|err| err.into()),
+                match source {
+                    "-" => SignerSource::Stdin,
+                    ASK_KEYWORD => SignerSource::Ask,
+                    _ => match Pubkey::from_str(source) {
+                        Ok(pubkey) => SignerSource::Pubkey(pubkey),
+                        Err(_) => SignerSource::Filepath(source.to_string()),
                     },
                 }
             }
@@ -363,23 +212,16 @@ pub fn signer_from_path_with_config(
     wallet_manager: &mut Option<Arc<RemoteWalletManager>>,
     config: &SignerFromPathConfig,
 ) -> Result<Box<dyn Signer>, Box<dyn error::Error>> {
-    let SignerSource {
-        kind,
-        derivation_path,
-        legacy,
-    } = parse_signer_source(path)?;
-    match kind {
-        SignerSourceKind::Prompt => {
+    match parse_signer_source(path) {
+        SignerSource::Ask => {
             let skip_validation = matches.is_present(SKIP_SEED_PHRASE_VALIDATION_ARG.name);
             Ok(Box::new(keypair_from_seed_phrase(
                 keypair_name,
                 skip_validation,
                 false,
-                derivation_path,
-                legacy,
             )?))
         }
-        SignerSourceKind::Filepath(path) => match read_keypair_file(&path) {
+        SignerSource::Filepath(path) => match read_keypair_file(&path) {
             Err(e) => Err(std::io::Error::new(
                 std::io::ErrorKind::Other,
                 format!("could not read keypair file \"{}\". Run \"solana-keygen new\" to create a keypair file: {}", path, e),
@@ -387,18 +229,17 @@ pub fn signer_from_path_with_config(
             .into()),
             Ok(file) => Ok(Box::new(file)),
         },
-        SignerSourceKind::Stdin => {
+        SignerSource::Stdin => {
             let mut stdin = std::io::stdin();
             Ok(Box::new(read_keypair(&mut stdin)?))
         }
-        SignerSourceKind::Usb(locator) => {
+        SignerSource::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(
-                    locator,
-                    derivation_path.unwrap_or_default(),
+                    path,
                     wallet_manager,
                     matches.is_present("confirm_key"),
                     keypair_name,
@@ -407,7 +248,7 @@ pub fn signer_from_path_with_config(
                 Err(RemoteWalletError::NoDeviceFound.into())
             }
         }
-        SignerSourceKind::Pubkey(pubkey) => {
+        SignerSource::Pubkey(pubkey) => {
             let presigner = pubkeys_sigs_of(matches, SIGNER_ARG.name)
                 .as_ref()
                 .and_then(|presigners| presigner_from_pubkey_sigs(&pubkey, presigners));
@@ -432,9 +273,8 @@ pub fn pubkey_from_path(
     keypair_name: &str,
     wallet_manager: &mut Option<Arc<RemoteWalletManager>>,
 ) -> Result<Pubkey, Box<dyn error::Error>> {
-    let SignerSource { kind, .. } = parse_signer_source(path)?;
-    match kind {
-        SignerSourceKind::Pubkey(pubkey) => Ok(pubkey),
+    match parse_signer_source(path) {
+        SignerSource::Pubkey(pubkey) => Ok(pubkey),
         _ => Ok(signer_from_path(matches, path, keypair_name, wallet_manager)?.pubkey()),
     }
 }
@@ -445,51 +285,34 @@ pub fn resolve_signer_from_path(
     keypair_name: &str,
     wallet_manager: &mut Option<Arc<RemoteWalletManager>>,
 ) -> Result<Option<String>, Box<dyn error::Error>> {
-    let SignerSource {
-        kind,
-        derivation_path,
-        legacy,
-    } = parse_signer_source(path)?;
-    match kind {
-        SignerSourceKind::Prompt => {
+    match parse_signer_source(path) {
+        SignerSource::Ask => {
             let skip_validation = matches.is_present(SKIP_SEED_PHRASE_VALIDATION_ARG.name);
             // This method validates the seed phrase, but returns `None` because there is no path
             // on disk or to a device
-            keypair_from_seed_phrase(
-                keypair_name,
-                skip_validation,
-                false,
-                derivation_path,
-                legacy,
-            )
-            .map(|_| None)
+            keypair_from_seed_phrase(keypair_name, skip_validation, false).map(|_| None)
         }
-        SignerSourceKind::Filepath(path) => match read_keypair_file(&path) {
+        SignerSource::Filepath(path) => match read_keypair_file(&path) {
             Err(e) => Err(std::io::Error::new(
                 std::io::ErrorKind::Other,
-                format!(
-                    "could not read keypair file \"{}\". \
-                    Run \"solana-keygen new\" to create a keypair file: {}",
-                    path, e
-                ),
+                format!("could not read keypair file \"{}\". Run \"solana-keygen new\" to create a keypair file: {}", path, e),
             )
             .into()),
             Ok(_) => Ok(Some(path.to_string())),
         },
-        SignerSourceKind::Stdin => {
+        SignerSource::Stdin => {
             let mut stdin = std::io::stdin();
             // This method validates the keypair from stdin, but returns `None` because there is no
             // path on disk or to a device
             read_keypair(&mut stdin).map(|_| None)
         }
-        SignerSourceKind::Usb(locator) => {
+        SignerSource::Usb(path) => {
             if wallet_manager.is_none() {
                 *wallet_manager = maybe_wallet_manager()?;
             }
             if let Some(wallet_manager) = wallet_manager {
                 let path = generate_remote_keypair(
-                    locator,
-                    derivation_path.unwrap_or_default(),
+                    path,
                     wallet_manager,
                     matches.is_present("confirm_key"),
                     keypair_name,
@@ -504,7 +327,7 @@ pub fn resolve_signer_from_path(
     }
 }
 
-// Keyword used to indicate that the user should be prompted for a keypair seed phrase
+// Keyword used to indicate that the user should be asked for a keypair seed phrase
 pub const ASK_KEYWORD: &str = "ASK";
 
 pub const SKIP_SEED_PHRASE_VALIDATION_ARG: ArgConstant<'static> = ArgConstant {
@@ -515,7 +338,7 @@ pub const SKIP_SEED_PHRASE_VALIDATION_ARG: ArgConstant<'static> = ArgConstant {
 
 /// Prompts user for a passphrase and then asks for confirmirmation to check for mistakes
 pub fn prompt_passphrase(prompt: &str) -> Result<String, Box<dyn error::Error>> {
-    let passphrase = prompt_password_stderr(prompt)?;
+    let passphrase = prompt_password_stderr(&prompt)?;
     if !passphrase.is_empty() {
         let confirmed = rpassword::prompt_password_stderr("Enter same passphrase again: ")?;
         if confirmed != passphrase {
@@ -525,56 +348,6 @@ pub fn prompt_passphrase(prompt: &str) -> Result<String, Box<dyn error::Error>>
     Ok(passphrase)
 }
 
-/// Parses a path into a SignerSource and returns a Keypair for supporting SignerSourceKinds
-pub fn keypair_from_path(
-    matches: &ArgMatches,
-    path: &str,
-    keypair_name: &str,
-    confirm_pubkey: bool,
-) -> Result<Keypair, Box<dyn error::Error>> {
-    let SignerSource {
-        kind,
-        derivation_path,
-        legacy,
-    } = parse_signer_source(path)?;
-    match kind {
-        SignerSourceKind::Prompt => {
-            let skip_validation = matches.is_present(SKIP_SEED_PHRASE_VALIDATION_ARG.name);
-            Ok(keypair_from_seed_phrase(
-                keypair_name,
-                skip_validation,
-                confirm_pubkey,
-                derivation_path,
-                legacy,
-            )?)
-        }
-        SignerSourceKind::Filepath(path) => match read_keypair_file(&path) {
-            Err(e) => Err(std::io::Error::new(
-                std::io::ErrorKind::Other,
-                format!(
-                    "could not read keypair file \"{}\". \
-                    Run \"solana-keygen new\" to create a keypair file: {}",
-                    path, e
-                ),
-            )
-            .into()),
-            Ok(file) => Ok(file),
-        },
-        SignerSourceKind::Stdin => {
-            let mut stdin = std::io::stdin();
-            Ok(read_keypair(&mut stdin)?)
-        }
-        _ => Err(std::io::Error::new(
-            std::io::ErrorKind::Other,
-            format!(
-                "signer of type `{:?}` does not support Keypair output",
-                kind
-            ),
-        )
-        .into()),
-    }
-}
-
 /// Reads user input from stdin to retrieve a seed phrase and passphrase for keypair derivation
 /// Optionally skips validation of seed phrase
 /// Optionally confirms recovered public key
@@ -582,8 +355,6 @@ pub fn keypair_from_seed_phrase(
     keypair_name: &str,
     skip_validation: bool,
     confirm_pubkey: bool,
-    derivation_path: Option<DerivationPath>,
-    legacy: bool,
 ) -> Result<Keypair, Box<dyn error::Error>> {
     let seed_phrase = prompt_password_stderr(&format!("[{}] seed phrase: ", keypair_name))?;
     let seed_phrase = seed_phrase.trim();
@@ -594,12 +365,7 @@ pub fn keypair_from_seed_phrase(
 
     let keypair = if skip_validation {
         let passphrase = prompt_passphrase(&passphrase_prompt)?;
-        if legacy {
-            keypair_from_seed_phrase_and_passphrase(seed_phrase, &passphrase)?
-        } else {
-            let seed = generate_seed_from_seed_phrase_and_passphrase(seed_phrase, &passphrase);
-            keypair_from_seed_and_derivation_path(&seed, derivation_path)?
-        }
+        keypair_from_seed_phrase_and_passphrase(&seed_phrase, &passphrase)?
     } else {
         let sanitized = sanitize_seed_phrase(seed_phrase);
         let parse_language_fn = || {
@@ -622,11 +388,7 @@ pub fn keypair_from_seed_phrase(
         let mnemonic = parse_language_fn()?;
         let passphrase = prompt_passphrase(&passphrase_prompt)?;
         let seed = Seed::new(&mnemonic, &passphrase);
-        if legacy {
-            keypair_from_seed(seed.as_bytes())?
-        } else {
-            keypair_from_seed_and_derivation_path(seed.as_bytes(), derivation_path)?
-        }
+        keypair_from_seed(seed.as_bytes())?
     };
 
     if confirm_pubkey {
@@ -654,9 +416,7 @@ fn sanitize_seed_phrase(seed_phrase: &str) -> String {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use solana_remote_wallet::locator::Manufacturer;
     use solana_sdk::system_instruction;
-    use tempfile::NamedTempFile;
 
     #[test]
     fn test_sanitize_seed_phrase() {
@@ -700,119 +460,35 @@ mod tests {
 
     #[test]
     fn test_parse_signer_source() {
+        assert!(matches!(parse_signer_source("-"), SignerSource::Stdin));
         assert!(matches!(
-            parse_signer_source(STDOUT_OUTFILE_TOKEN).unwrap(),
-            SignerSource {
-                kind: SignerSourceKind::Stdin,
-                derivation_path: None,
-                legacy: false,
-            }
-        ));
-        let stdin = "stdin:".to_string();
-        assert!(matches!(
-            parse_signer_source(&stdin).unwrap(),
-            SignerSource {
-                kind: SignerSourceKind::Stdin,
-                derivation_path: None,
-                legacy: false,
-            }
-        ));
-        assert!(matches!(
-            parse_signer_source(ASK_KEYWORD).unwrap(),
-            SignerSource {
-                kind: SignerSourceKind::Prompt,
-                derivation_path: None,
-                legacy: true,
-            }
+            parse_signer_source(ASK_KEYWORD),
+            SignerSource::Ask
         ));
         let pubkey = Pubkey::new_unique();
         assert!(
-            matches!(parse_signer_source(&pubkey.to_string()).unwrap(), SignerSource {
-                kind: SignerSourceKind::Pubkey(p),
-                derivation_path: None,
-                legacy: false,
-            }
-            if p == pubkey)
+            matches!(parse_signer_source(&pubkey.to_string()), SignerSource::Pubkey(p) if p == pubkey)
         );
-
-        // Set up absolute and relative path strs
-        let file0 = NamedTempFile::new().unwrap();
-        let path = file0.path();
-        assert!(path.is_absolute());
-        let absolute_path_str = path.to_str().unwrap();
-
-        let file1 = NamedTempFile::new_in(std::env::current_dir().unwrap()).unwrap();
-        let path = file1.path().file_name().unwrap().to_str().unwrap();
-        let path = std::path::Path::new(path);
-        assert!(path.is_relative());
-        let relative_path_str = path.to_str().unwrap();
-
-        assert!(
-            matches!(parse_signer_source(absolute_path_str).unwrap(), SignerSource {
-                kind: SignerSourceKind::Filepath(p),
-                derivation_path: None,
-                legacy: false,
-            } if p == absolute_path_str)
-        );
-        assert!(
-            matches!(parse_signer_source(&relative_path_str).unwrap(), SignerSource {
-                kind: SignerSourceKind::Filepath(p),
-                derivation_path: None,
-                legacy: false,
-            } if p == relative_path_str)
-        );
-
+        let path = "/absolute/path".to_string();
+        assert!(matches!(parse_signer_source(&path), SignerSource::Filepath(p) if p == path));
+        let path = "relative/path".to_string();
+        assert!(matches!(parse_signer_source(&path), SignerSource::Filepath(p) if p == path));
         let usb = "usb://ledger".to_string();
-        let expected_locator = RemoteWalletLocator {
-            manufacturer: Manufacturer::Ledger,
-            pubkey: None,
-        };
-        assert!(matches!(parse_signer_source(&usb).unwrap(), SignerSource {
-                kind: SignerSourceKind::Usb(u),
-                derivation_path: None,
-                legacy: false,
-            } if u == expected_locator));
-        let usb = "usb://ledger?key=0/0".to_string();
-        let expected_locator = RemoteWalletLocator {
-            manufacturer: Manufacturer::Ledger,
-            pubkey: None,
-        };
-        let expected_derivation_path = Some(DerivationPath::new_bip44(Some(0), Some(0)));
-        assert!(matches!(parse_signer_source(&usb).unwrap(), SignerSource {
-                kind: SignerSourceKind::Usb(u),
-                derivation_path: d,
-                legacy: false,
-            } if u == expected_locator && d == expected_derivation_path));
-        // Catchall into SignerSource::Filepath fails
-        let junk = "sometextthatisnotapubkeyorfile".to_string();
+        assert!(matches!(parse_signer_source(&usb), SignerSource::Usb(u) if u == usb));
+        // Catchall into SignerSource::Filepath
+        let junk = "sometextthatisnotapubkey".to_string();
         assert!(Pubkey::from_str(&junk).is_err());
-        assert!(matches!(
-            parse_signer_source(&junk),
-            Err(SignerSourceError::IoError(_))
-        ));
+        assert!(matches!(parse_signer_source(&junk), SignerSource::Filepath(j) if j == junk));
 
-        let prompt = "prompt:".to_string();
-        assert!(matches!(
-            parse_signer_source(&prompt).unwrap(),
-            SignerSource {
-                kind: SignerSourceKind::Prompt,
-                derivation_path: None,
-                legacy: false,
-            }
-        ));
+        let ask = "ask:".to_string();
+        assert!(matches!(parse_signer_source(&ask), SignerSource::Ask));
+        let path = "/absolute/path".to_string();
         assert!(
-            matches!(parse_signer_source(&format!("file:{}", absolute_path_str)).unwrap(), SignerSource {
-                kind: SignerSourceKind::Filepath(p),
-                derivation_path: None,
-                legacy: false,
-            } if p == absolute_path_str)
+            matches!(parse_signer_source(&format!("file:{}", path)), SignerSource::Filepath(p) if p == path)
         );
+        let path = "relative/path".to_string();
         assert!(
-            matches!(parse_signer_source(&format!("file:{}", relative_path_str)).unwrap(), SignerSource {
-                kind: SignerSourceKind::Filepath(p),
-                derivation_path: None,
-                legacy: false,
-            } if p == relative_path_str)
+            matches!(parse_signer_source(&format!("file:{}", path)), SignerSource::Filepath(p) if p == path)
         );
     }
 }

clap-utils/src/memo.rs

@@ -1,4 +1,5 @@
-use {crate::ArgConstant, clap::Arg};
+use crate::ArgConstant;
+use clap::Arg;
 
 pub const MEMO_ARG: ArgConstant<'static> = ArgConstant {
     name: "memo",

clap-utils/src/nonce.rs

@@ -1,7 +1,5 @@
-use {
-    crate::{input_validators::*, offline::BLOCKHASH_ARG, ArgConstant},
-    clap::{App, Arg},
-};
+use crate::{input_validators::*, offline::BLOCKHASH_ARG, ArgConstant};
+use clap::{App, Arg};
 
 pub const NONCE_ARG: ArgConstant<'static> = ArgConstant {
     name: "nonce",

clap-utils/src/offline.rs

@@ -1,7 +1,5 @@
-use {
-    crate::{input_validators::*, ArgConstant},
-    clap::{App, Arg},
-};
+use crate::{input_validators::*, ArgConstant};
+use clap::{App, Arg};
 
 pub const BLOCKHASH_ARG: ArgConstant<'static> = ArgConstant {
     name: "blockhash",

cli-config/Cargo.toml

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

cli-config/src/config.rs

@@ -107,24 +107,24 @@ mod test {
     #[test]
     fn compute_websocket_url() {
         assert_eq!(
-            Config::compute_websocket_url("http://api.devnet.solana.com"),
-            "ws://api.devnet.solana.com/".to_string()
+            Config::compute_websocket_url(&"http://devnet.solana.com"),
+            "ws://devnet.solana.com/".to_string()
         );
 
         assert_eq!(
-            Config::compute_websocket_url("https://api.devnet.solana.com"),
-            "wss://api.devnet.solana.com/".to_string()
+            Config::compute_websocket_url(&"https://devnet.solana.com"),
+            "wss://devnet.solana.com/".to_string()
         );
 
         assert_eq!(
-            Config::compute_websocket_url("http://example.com:8899"),
+            Config::compute_websocket_url(&"http://example.com:8899"),
             "ws://example.com:8900/".to_string()
         );
         assert_eq!(
-            Config::compute_websocket_url("https://example.com:1234"),
+            Config::compute_websocket_url(&"https://example.com:1234"),
             "wss://example.com:1235/".to_string()
         );
 
-        assert_eq!(Config::compute_websocket_url("garbage"), String::new());
+        assert_eq!(Config::compute_websocket_url(&"garbage"), String::new());
     }
 }

cli-output/Cargo.toml

@@ -3,7 +3,7 @@ authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 edition = "2018"
 name = "solana-cli-output"
 description = "Blockchain, Rebuilt for Scale"
-version = "1.7.18"
+version = "1.6.6"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
@@ -12,20 +12,20 @@ documentation = "https://docs.rs/solana-cli-output"
 [dependencies]
 base64 = "0.13.0"
 chrono = { version = "0.4.11", features = ["serde"] }
-clap = "2.33.0"
-console = "0.14.1"
+console = "0.11.3"
 humantime = "2.0.1"
 Inflector = "0.11.4"
 indicatif = "0.15.0"
 serde = "1.0.122"
 serde_derive = "1.0.103"
 serde_json = "1.0.56"
-solana-account-decoder = { path = "../account-decoder", version = "=1.7.18" }
-solana-clap-utils = { path = "../clap-utils", version = "=1.7.18" }
-solana-client = { path = "../client", version = "=1.7.18" }
-solana-sdk = { path = "../sdk", version = "=1.7.18" }
-solana-transaction-status = { path = "../transaction-status", version = "=1.7.18" }
-solana-vote-program = { path = "../programs/vote", version = "=1.7.18" }
+solana-account-decoder = { path = "../account-decoder", version = "=1.6.6" }
+solana-clap-utils = { path = "../clap-utils", version = "=1.6.6" }
+solana-client = { path = "../client", version = "=1.6.6" }
+solana-sdk = { path = "../sdk", version = "=1.6.6" }
+solana-stake-program = { path = "../programs/stake", version = "=1.6.6" }
+solana-transaction-status = { path = "../transaction-status", version = "=1.6.6" }
+solana-vote-program = { path = "../programs/vote", version = "=1.6.6" }
 spl-memo = { version = "=3.0.1", features = ["no-entrypoint"] }
 
 [package.metadata.docs.rs]

cli-output/src/display.rs

@@ -5,7 +5,7 @@ use {
     indicatif::{ProgressBar, ProgressStyle},
     solana_sdk::{
         clock::UnixTimestamp, hash::Hash, message::Message, native_token::lamports_to_sol,
-        program_utils::limited_deserialize, pubkey::Pubkey, stake, transaction::Transaction,
+        program_utils::limited_deserialize, pubkey::Pubkey, transaction::Transaction,
     },
     solana_transaction_status::UiTransactionStatusMeta,
     spl_memo::id as spl_memo_id,
@@ -140,7 +140,7 @@ fn format_account_mode(message: &Message, index: usize) -> String {
         } else {
             "-"
         },
-        if message.is_writable(index, /*demote_program_write_locks=*/ true) {
+        if message.is_writable(index, /*demote_sysvar_write_locks=*/ true) {
             "w" // comment for consistent rust fmt (no joking; lol)
         } else {
             "-"
@@ -244,9 +244,10 @@ pub fn write_transaction<W: io::Write>(
                 writeln!(w, "{}  {:?}", prefix, vote_instruction)?;
                 raw = false;
             }
-        } else if program_pubkey == stake::program::id() {
-            if let Ok(stake_instruction) =
-                limited_deserialize::<stake::instruction::StakeInstruction>(&instruction.data)
+        } 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;
@@ -321,38 +322,7 @@ pub fn write_transaction<W: io::Write>(
             if !log_messages.is_empty() {
                 writeln!(w, "{}Log Messages:", prefix,)?;
                 for log_message in log_messages {
-                    writeln!(w, "{}  {}", prefix, log_message)?;
-                }
-            }
-        }
-
-        if let Some(rewards) = &transaction_status.rewards {
-            if !rewards.is_empty() {
-                writeln!(w, "{}Rewards:", prefix,)?;
-                writeln!(
-                    w,
-                    "{}  {:<44}  {:^15}  {:<15}  {:<20}",
-                    prefix, "Address", "Type", "Amount", "New Balance"
-                )?;
-                for reward in rewards {
-                    let sign = if reward.lamports < 0 { "-" } else { "" };
-                    writeln!(
-                        w,
-                        "{}  {:<44}  {:^15}  {:<15}  {}",
-                        prefix,
-                        reward.pubkey,
-                        if let Some(reward_type) = reward.reward_type {
-                            format!("{}", reward_type)
-                        } else {
-                            "-".to_string()
-                        },
-                        format!(
-                            "{}◎{:<14.9}",
-                            sign,
-                            lamports_to_sol(reward.lamports.abs() as u64)
-                        ),
-                        format!("◎{:<18.9}", lamports_to_sol(reward.post_balance),)
-                    )?;
+                    writeln!(w, "{}  {}", prefix, log_message,)?;
                 }
             }
         }

cli/Cargo.toml

@@ -3,7 +3,7 @@ authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 edition = "2018"
 name = "solana-cli"
 description = "Blockchain, Rebuilt for Scale"
-version = "1.7.18"
+version = "1.6.6"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
@@ -16,8 +16,7 @@ chrono = { version = "0.4.11", features = ["serde"] }
 clap = "2.33.1"
 criterion-stats = "0.3.0"
 ctrlc = { version = "3.1.5", features = ["termination"] }
-console = "0.14.1"
-const_format = "0.2.14"
+console = "0.11.3"
 dirs-next = "2.0.0"
 log = "0.4.11"
 Inflector = "0.11.4"
@@ -26,34 +25,33 @@ humantime = "2.0.1"
 num-traits = "0.2"
 pretty-hex = "0.2.1"
 reqwest = { version = "0.11.2", default-features = false, features = ["blocking", "rustls-tls", "json"] }
-semver = "1.0.4"
 serde = "1.0.122"
 serde_derive = "1.0.103"
 serde_json = "1.0.56"
-solana-account-decoder = { path = "../account-decoder", version = "=1.7.18" }
-solana-bpf-loader-program = { path = "../programs/bpf_loader", version = "=1.7.18" }
-solana-clap-utils = { path = "../clap-utils", version = "=1.7.18" }
-solana-cli-config = { path = "../cli-config", version = "=1.7.18" }
-solana-cli-output = { path = "../cli-output", version = "=1.7.18" }
-solana-client = { path = "../client", version = "=1.7.18" }
-solana-config-program = { path = "../programs/config", version = "=1.7.18" }
-solana-faucet = { path = "../faucet", version = "=1.7.18" }
-solana-logger = { path = "../logger", version = "=1.7.18" }
-solana-net-utils = { path = "../net-utils", version = "=1.7.18" }
-solana_rbpf = "=0.2.11"
-solana-remote-wallet = { path = "../remote-wallet", version = "=1.7.18" }
-solana-sdk = { path = "../sdk", version = "=1.7.18" }
-solana-transaction-status = { path = "../transaction-status", version = "=1.7.18" }
-solana-version = { path = "../version", version = "=1.7.18" }
-solana-vote-program = { path = "../programs/vote", version = "=1.7.18" }
+solana-account-decoder = { path = "../account-decoder", version = "=1.6.6" }
+solana-bpf-loader-program = { path = "../programs/bpf_loader", version = "=1.6.6" }
+solana-clap-utils = { path = "../clap-utils", version = "=1.6.6" }
+solana-cli-config = { path = "../cli-config", version = "=1.6.6" }
+solana-cli-output = { path = "../cli-output", version = "=1.6.6" }
+solana-client = { path = "../client", version = "=1.6.6" }
+solana-config-program = { path = "../programs/config", version = "=1.6.6" }
+solana-faucet = { path = "../faucet", version = "=1.6.6" }
+solana-logger = { path = "../logger", version = "=1.6.6" }
+solana-net-utils = { path = "../net-utils", version = "=1.6.6" }
+solana_rbpf = "=0.2.7"
+solana-remote-wallet = { path = "../remote-wallet", version = "=1.6.6" }
+solana-sdk = { path = "../sdk", version = "=1.6.6" }
+solana-stake-program = { path = "../programs/stake", version = "=1.6.6" }
+solana-transaction-status = { path = "../transaction-status", version = "=1.6.6" }
+solana-version = { path = "../version", version = "=1.6.6" }
+solana-vote-program = { path = "../programs/vote", version = "=1.6.6" }
 spl-memo = { version = "=3.0.1", features = ["no-entrypoint"] }
 thiserror = "1.0.21"
-tiny-bip39 = "0.8.1"
+tiny-bip39 = "0.7.0"
 url = "2.1.1"
 
 [dev-dependencies]
-solana-core = { path = "../core", version = "=1.7.18" }
-solana-streamer = { path = "../streamer", version = "=1.7.18" }
+solana-core = { path = "../core", version = "=1.6.6" }
 tempfile = "3.1.0"
 
 [[bin]]

cli/src/checks.rs

@@ -231,9 +231,18 @@ mod tests {
         mocks.insert(RpcRequest::GetBalance, account_balance_response);
         let rpc_client = RpcClient::new_mock_with_mocks("".to_string(), mocks);
 
-        assert!(check_account_for_balance(&rpc_client, &pubkey, 1).unwrap());
-        assert!(check_account_for_balance(&rpc_client, &pubkey, account_balance).unwrap());
-        assert!(!check_account_for_balance(&rpc_client, &pubkey, account_balance + 1).unwrap());
+        assert_eq!(
+            check_account_for_balance(&rpc_client, &pubkey, 1).unwrap(),
+            true
+        );
+        assert_eq!(
+            check_account_for_balance(&rpc_client, &pubkey, account_balance).unwrap(),
+            true
+        );
+        assert_eq!(
+            check_account_for_balance(&rpc_client, &pubkey, account_balance + 1).unwrap(),
+            false
+        );
     }
 
     #[test]

cli/src/clap_app.rs

@@ -1,202 +0,0 @@
-use crate::{
-    cli::*, cluster_query::*, feature::*, inflation::*, nonce::*, program::*, stake::*,
-    validator_info::*, vote::*, wallet::*,
-};
-use clap::{App, AppSettings, Arg, ArgGroup, SubCommand};
-use solana_clap_utils::{self, input_validators::*, keypair::*};
-use solana_cli_config::CONFIG_FILE;
-
-pub fn get_clap_app<'ab, 'v>(name: &str, about: &'ab str, version: &'v str) -> App<'ab, 'v> {
-    App::new(name)
-        .about(about)
-        .version(version)
-        .setting(AppSettings::SubcommandRequiredElseHelp)
-        .arg({
-            let arg = Arg::with_name("config_file")
-                .short("C")
-                .long("config")
-                .value_name("FILEPATH")
-                .takes_value(true)
-                .global(true)
-                .help("Configuration file to use");
-            if let Some(ref config_file) = *CONFIG_FILE {
-                arg.default_value(config_file)
-            } else {
-                arg
-            }
-        })
-        .arg(
-            Arg::with_name("json_rpc_url")
-                .short("u")
-                .long("url")
-                .value_name("URL_OR_MONIKER")
-                .takes_value(true)
-                .global(true)
-                .validator(is_url_or_moniker)
-                .help(
-                    "URL for Solana's JSON RPC or moniker (or their first letter): \
-                       [mainnet-beta, testnet, devnet, localhost]",
-                ),
-        )
-        .arg(
-            Arg::with_name("websocket_url")
-                .long("ws")
-                .value_name("URL")
-                .takes_value(true)
-                .global(true)
-                .validator(is_url)
-                .help("WebSocket URL for the solana cluster"),
-        )
-        .arg(
-            Arg::with_name("keypair")
-                .short("k")
-                .long("keypair")
-                .value_name("KEYPAIR")
-                .global(true)
-                .takes_value(true)
-                .help("Filepath or URL to a keypair"),
-        )
-        .arg(
-            Arg::with_name("commitment")
-                .long("commitment")
-                .takes_value(true)
-                .possible_values(&[
-                    "processed",
-                    "confirmed",
-                    "finalized",
-                    "recent", // Deprecated as of v1.5.5
-                    "single", // Deprecated as of v1.5.5
-                    "singleGossip", // Deprecated as of v1.5.5
-                    "root", // Deprecated as of v1.5.5
-                    "max", // Deprecated as of v1.5.5
-                ])
-                .value_name("COMMITMENT_LEVEL")
-                .hide_possible_values(true)
-                .global(true)
-                .help("Return information at the selected commitment level [possible values: processed, confirmed, finalized]"),
-        )
-        .arg(
-            Arg::with_name("verbose")
-                .long("verbose")
-                .short("v")
-                .global(true)
-                .help("Show additional information"),
-        )
-        .arg(
-            Arg::with_name("no_address_labels")
-                .long("no-address-labels")
-                .global(true)
-                .help("Do not use address labels in the output"),
-        )
-        .arg(
-            Arg::with_name("output_format")
-                .long("output")
-                .value_name("FORMAT")
-                .global(true)
-                .takes_value(true)
-                .possible_values(&["json", "json-compact"])
-                .help("Return information in specified output format"),
-        )
-        .arg(
-            Arg::with_name(SKIP_SEED_PHRASE_VALIDATION_ARG.name)
-                .long(SKIP_SEED_PHRASE_VALIDATION_ARG.long)
-                .global(true)
-                .help(SKIP_SEED_PHRASE_VALIDATION_ARG.help),
-        )
-        .arg(
-            Arg::with_name("rpc_timeout")
-                .long("rpc-timeout")
-                .value_name("SECONDS")
-                .takes_value(true)
-                .default_value(DEFAULT_RPC_TIMEOUT_SECONDS)
-                .global(true)
-                .hidden(true)
-                .help("Timeout value for RPC requests"),
-        )
-        .arg(
-            Arg::with_name("confirm_transaction_initial_timeout")
-                .long("confirm-timeout")
-                .value_name("SECONDS")
-                .takes_value(true)
-                .default_value(DEFAULT_CONFIRM_TX_TIMEOUT_SECONDS)
-                .global(true)
-                .hidden(true)
-                .help("Timeout value for initial transaction status"),
-        )
-        .cluster_query_subcommands()
-        .feature_subcommands()
-        .inflation_subcommands()
-        .nonce_subcommands()
-        .program_subcommands()
-        .stake_subcommands()
-        .validator_info_subcommands()
-        .vote_subcommands()
-        .wallet_subcommands()
-        .subcommand(
-            SubCommand::with_name("config")
-                .about("Solana command-line tool configuration settings")
-                .aliases(&["get", "set"])
-                .setting(AppSettings::SubcommandRequiredElseHelp)
-                .subcommand(
-                    SubCommand::with_name("get")
-                        .about("Get current config settings")
-                        .arg(
-                            Arg::with_name("specific_setting")
-                                .index(1)
-                                .value_name("CONFIG_FIELD")
-                                .takes_value(true)
-                                .possible_values(&[
-                                    "json_rpc_url",
-                                    "websocket_url",
-                                    "keypair",
-                                    "commitment",
-                                ])
-                                .help("Return a specific config setting"),
-                        ),
-                )
-                .subcommand(
-                    SubCommand::with_name("set")
-                        .about("Set a config setting")
-                        .group(
-                            ArgGroup::with_name("config_settings")
-                                .args(&["json_rpc_url", "websocket_url", "keypair", "commitment"])
-                                .multiple(true)
-                                .required(true),
-                        ),
-                )
-                .subcommand(
-                    SubCommand::with_name("import-address-labels")
-                        .about("Import a list of address labels")
-                        .arg(
-                            Arg::with_name("filename")
-                                .index(1)
-                                .value_name("FILENAME")
-                                .takes_value(true)
-                                .help("YAML file of address labels"),
-                        ),
-                )
-                .subcommand(
-                    SubCommand::with_name("export-address-labels")
-                        .about("Export the current address labels")
-                        .arg(
-                            Arg::with_name("filename")
-                                .index(1)
-                                .value_name("FILENAME")
-                                .takes_value(true)
-                                .help("YAML file to receive the current address labels"),
-                        ),
-                ),
-        )
-        .subcommand(
-            SubCommand::with_name("completion")
-            .about("Generate completion scripts for various shells")
-            .arg(
-                Arg::with_name("shell")
-                .long("shell")
-                .short("s")
-                .takes_value(true)
-                .possible_values(&["bash", "fish", "zsh", "powershell", "elvish"])
-                .default_value("bash")
-            )
-        )
-}

cli/src/cluster_query.rs

@@ -1,6 +1,7 @@
 use crate::{
     cli::{CliCommand, CliCommandInfo, CliConfig, CliError, ProcessResult},
     spend_utils::{resolve_spend_tx_and_check_account_balance, SpendAmount},
+    stake::is_stake_program_v2_enabled,
 };
 use clap::{value_t, value_t_or_exit, App, AppSettings, Arg, ArgMatches, SubCommand};
 use console::{style, Emoji};
@@ -23,12 +24,11 @@ use solana_client::{
     pubsub_client::PubsubClient,
     rpc_client::{GetConfirmedSignaturesForAddress2Config, RpcClient},
     rpc_config::{
-        RpcAccountInfoConfig, RpcBlockConfig, RpcGetVoteAccountsConfig, RpcLargestAccountsConfig,
-        RpcLargestAccountsFilter, RpcProgramAccountsConfig, RpcTransactionConfig,
+        RpcAccountInfoConfig, RpcConfirmedBlockConfig, RpcConfirmedTransactionConfig,
+        RpcLargestAccountsConfig, RpcLargestAccountsFilter, RpcProgramAccountsConfig,
         RpcTransactionLogsConfig, RpcTransactionLogsFilter,
     },
     rpc_filter,
-    rpc_request::DELINQUENT_VALIDATOR_SLOT_DISTANCE,
     rpc_response::SlotInfo,
 };
 use solana_remote_wallet::remote_wallet::RemoteWalletManager;
@@ -46,22 +46,21 @@ use solana_sdk::{
     rent::Rent,
     rpc_port::DEFAULT_RPC_PORT_STR,
     signature::Signature,
-    slot_history,
-    stake::{self, state::StakeState},
     system_instruction, system_program,
     sysvar::{
         self,
-        slot_history::SlotHistory,
         stake_history::{self},
     },
     timing,
     transaction::Transaction,
 };
+use solana_stake_program::stake_state::StakeState;
 use solana_transaction_status::UiTransactionEncoding;
 use solana_vote_program::vote_state::VoteState;
 use std::{
     collections::{BTreeMap, HashMap, VecDeque},
     fmt,
+    net::SocketAddr,
     str::FromStr,
     sync::{
         atomic::{AtomicBool, Ordering},
@@ -122,7 +121,7 @@ impl ClusterQuerySubCommands for App<'_, '_> {
                         .long("our-localhost")
                         .takes_value(false)
                         .value_name("PORT")
-                        .default_value(DEFAULT_RPC_PORT_STR)
+                        .default_value(&DEFAULT_RPC_PORT_STR)
                         .validator(is_port)
                         .help("Guess Identity pubkey and validator rpc node assuming local (possibly private) validator"),
                 )
@@ -176,7 +175,7 @@ impl ClusterQuerySubCommands for App<'_, '_> {
                     .takes_value(true)
                     .value_name("EPOCH")
                     .validator(is_epoch)
-                    .help("Epoch to show leader schedule for. [default: current]")
+                    .help("Epoch to show leader schedule for. (default: current)")
             )
         )
         .subcommand(
@@ -350,57 +349,6 @@ impl ClusterQuerySubCommands for App<'_, '_> {
                         .long("lamports")
                         .takes_value(false)
                         .help("Display balance in lamports instead of SOL"),
-                )
-                .arg(
-                    Arg::with_name("number")
-                        .long("number")
-                        .short("n")
-                        .takes_value(false)
-                        .help("Number the validators"),
-                )
-                .arg(
-                    Arg::with_name("reverse")
-                        .long("reverse")
-                        .short("r")
-                        .takes_value(false)
-                        .help("Reverse order while sorting"),
-                )
-                .arg(
-                    Arg::with_name("sort")
-                        .long("sort")
-                        .takes_value(true)
-                        .possible_values(&[
-                            "delinquent",
-                            "commission",
-                            "credits",
-                            "identity",
-                            "last-vote",
-                            "root",
-                            "skip-rate",
-                            "stake",
-                            "vote-account",
-                        ])
-                        .default_value("stake")
-                        .help("Sort order (does not affect JSON output)"),
-                )
-                .arg(
-                    Arg::with_name("keep_unstaked_delinquents")
-                        .long("keep-unstaked-delinquents")
-                        .takes_value(false)
-                        .help("Don't discard unstaked, delinquent validators")
-                )
-                .arg(
-                    Arg::with_name("delinquent_slot_distance")
-                        .long("delinquent-slot-distance")
-                        .takes_value(true)
-                        .value_name("SLOT_DISTANCE")
-                        .validator(is_slot)
-                        .help(
-                            concatcp!(
-                                "Minimum slot distance from the tip to consider a validator delinquent. [default: ",
-                                DELINQUENT_VALIDATOR_SLOT_DISTANCE,
-                                "]",
-                        ))
                 ),
         )
         .subcommand(
@@ -634,33 +582,9 @@ pub fn parse_show_stakes(
 
 pub fn parse_show_validators(matches: &ArgMatches<'_>) -> Result<CliCommandInfo, CliError> {
     let use_lamports_unit = matches.is_present("lamports");
-    let number_validators = matches.is_present("number");
-    let reverse_sort = matches.is_present("reverse");
-    let keep_unstaked_delinquents = matches.is_present("keep_unstaked_delinquents");
-    let delinquent_slot_distance = value_of(matches, "delinquent_slot_distance");
-
-    let sort_order = match value_t_or_exit!(matches, "sort", String).as_str() {
-        "delinquent" => CliValidatorsSortOrder::Delinquent,
-        "commission" => CliValidatorsSortOrder::Commission,
-        "credits" => CliValidatorsSortOrder::EpochCredits,
-        "identity" => CliValidatorsSortOrder::Identity,
-        "last-vote" => CliValidatorsSortOrder::LastVote,
-        "root" => CliValidatorsSortOrder::Root,
-        "skip-rate" => CliValidatorsSortOrder::SkipRate,
-        "stake" => CliValidatorsSortOrder::Stake,
-        "vote-account" => CliValidatorsSortOrder::VoteAccount,
-        _ => unreachable!(),
-    };
 
     Ok(CliCommandInfo {
-        command: CliCommand::ShowValidators {
-            use_lamports_unit,
-            sort_order,
-            reverse_sort,
-            number_validators,
-            keep_unstaked_delinquents,
-            delinquent_slot_distance,
-        },
+        command: CliCommand::ShowValidators { use_lamports_unit },
         signers: vec![],
     })
 }
@@ -961,19 +885,18 @@ pub fn process_fees(
                 *recent_blockhash,
                 fee_calculator.lamports_per_signature,
                 None,
-                None,
             )
         } else {
             CliFees::none()
         }
     } else {
-        let result = rpc_client.get_fees_with_commitment(config.commitment)?;
+        let result = rpc_client.get_recent_blockhash_with_commitment(config.commitment)?;
+        let (recent_blockhash, fee_calculator, last_valid_slot) = result.value;
         CliFees::some(
             result.context.slot,
-            result.value.blockhash,
-            result.value.fee_calculator.lamports_per_signature,
-            None,
-            Some(result.value.last_valid_block_height),
+            recent_blockhash,
+            fee_calculator.lamports_per_signature,
+            Some(last_valid_slot),
         )
     };
     Ok(config.output_format.formatted_string(&fees))
@@ -1052,12 +975,12 @@ pub fn process_get_block(
     };
 
     let encoded_confirmed_block = rpc_client
-        .get_block_with_config(
+        .get_confirmed_block_with_config(
             slot,
-            RpcBlockConfig {
+            RpcConfirmedBlockConfig {
                 encoding: Some(UiTransactionEncoding::Base64),
                 commitment: Some(CommitmentConfig::confirmed()),
-                ..RpcBlockConfig::default()
+                ..RpcConfirmedBlockConfig::default()
             },
         )?
         .into();
@@ -1100,15 +1023,9 @@ pub fn process_get_epoch_info(rpc_client: &RpcClient, config: &CliConfig) -> Pro
             (secs as u64).saturating_mul(1000).checked_div(slots)
         })
         .unwrap_or(clock::DEFAULT_MS_PER_SLOT);
-    let start_block_time = rpc_client
-        .get_block_time(epoch_info.absolute_slot - epoch_info.slot_index)
-        .ok();
-    let current_block_time = rpc_client.get_block_time(epoch_info.absolute_slot).ok();
     let epoch_info = CliEpochInfo {
         epoch_info,
         average_slot_time_ms,
-        start_block_time,
-        current_block_time,
     };
     Ok(config.output_format.formatted_string(&epoch_info))
 }
@@ -1124,8 +1041,8 @@ pub fn process_get_slot(rpc_client: &RpcClient, _config: &CliConfig) -> ProcessR
 }
 
 pub fn process_get_block_height(rpc_client: &RpcClient, _config: &CliConfig) -> ProcessResult {
-    let block_height = rpc_client.get_block_height()?;
-    Ok(block_height.to_string())
+    let epoch_info = rpc_client.get_epoch_info()?;
+    Ok(epoch_info.block_height.to_string())
 }
 
 pub fn parse_show_block_production(matches: &ArgMatches<'_>) -> Result<CliCommandInfo, CliError> {
@@ -1152,6 +1069,8 @@ pub fn process_show_block_production(
         return Err(format!("Epoch {} is in the future", epoch).into());
     }
 
+    let minimum_ledger_slot = rpc_client.minimum_ledger_slot()?;
+
     let first_slot_in_epoch = epoch_schedule.get_first_slot_in_epoch(epoch);
     let end_slot = std::cmp::min(
         epoch_info.absolute_slot,
@@ -1164,60 +1083,32 @@ pub fn process_show_block_production(
         first_slot_in_epoch
     };
 
+    if minimum_ledger_slot > end_slot {
+        return Err(format!(
+            "Ledger data not available for slots {} to {} (minimum ledger slot is {})",
+            start_slot, end_slot, minimum_ledger_slot
+        )
+        .into());
+    }
+
+    if minimum_ledger_slot > start_slot {
+        println!(
+            "\n{}",
+            style(format!(
+                "Note: Requested start slot was {} but minimum ledger slot is {}",
+                start_slot, minimum_ledger_slot
+            ))
+            .italic(),
+        );
+        start_slot = minimum_ledger_slot;
+    }
+
     let progress_bar = new_spinner_progress_bar();
     progress_bar.set_message(&format!(
         "Fetching confirmed blocks between slots {} and {}...",
         start_slot, end_slot
     ));
-
-    let slot_history_account = rpc_client
-        .get_account_with_commitment(&sysvar::slot_history::id(), CommitmentConfig::finalized())?
-        .value
-        .unwrap();
-
-    let slot_history: SlotHistory = from_account(&slot_history_account).ok_or_else(|| {
-        CliError::RpcRequestError("Failed to deserialize slot history".to_string())
-    })?;
-
-    let (confirmed_blocks, start_slot) =
-        if start_slot >= slot_history.oldest() && end_slot <= slot_history.newest() {
-            // Fast, more reliable path using the SlotHistory sysvar
-
-            let confirmed_blocks: Vec<_> = (start_slot..=end_slot)
-                .filter(|slot| slot_history.check(*slot) == slot_history::Check::Found)
-                .collect();
-            (confirmed_blocks, start_slot)
-        } else {
-            // Slow, less reliable path using `getBlocks`.
-            //
-            // "less reliable" because if the RPC node has holds in its ledger then the block production data will be
-            // incorrect.  This condition currently can't be detected over RPC
-            //
-
-            let minimum_ledger_slot = rpc_client.minimum_ledger_slot()?;
-            if minimum_ledger_slot > end_slot {
-                return Err(format!(
-                    "Ledger data not available for slots {} to {} (minimum ledger slot is {})",
-                    start_slot, end_slot, minimum_ledger_slot
-                )
-                .into());
-            }
-
-            if minimum_ledger_slot > start_slot {
-                progress_bar.println(format!(
-                    "{}",
-                    style(format!(
-                        "Note: Requested start slot was {} but minimum ledger slot is {}",
-                        start_slot, minimum_ledger_slot
-                    ))
-                    .italic(),
-                ));
-                start_slot = minimum_ledger_slot;
-            }
-
-            let confirmed_blocks = rpc_client.get_blocks(start_slot, Some(end_slot))?;
-            (confirmed_blocks, start_slot)
-        };
+    let confirmed_blocks = rpc_client.get_confirmed_blocks(start_slot, Some(end_slot))?;
 
     let start_slot_index = (start_slot - first_slot_in_epoch) as usize;
     let end_slot_index = (end_slot - first_slot_in_epoch) as usize;
@@ -1685,14 +1576,40 @@ pub fn process_live_slots(config: &CliConfig) -> ProcessResult {
 pub fn process_show_gossip(rpc_client: &RpcClient, config: &CliConfig) -> ProcessResult {
     let cluster_nodes = rpc_client.get_cluster_nodes()?;
 
-    let nodes: Vec<_> = cluster_nodes
+    fn format_port(addr: Option<SocketAddr>) -> String {
+        addr.map(|addr| addr.port().to_string())
+            .unwrap_or_else(|| "none".to_string())
+    }
+
+    let s: Vec<_> = cluster_nodes
         .into_iter()
-        .map(|node| CliGossipNode::new(node, &config.address_labels))
+        .map(|node| {
+            format!(
+                "{:15} | {:44} | {:6} | {:5} | {:21} | {}",
+                node.gossip
+                    .map(|addr| addr.ip().to_string())
+                    .unwrap_or_else(|| "none".to_string()),
+                format_labeled_address(&node.pubkey, &config.address_labels),
+                format_port(node.gossip),
+                format_port(node.tpu),
+                node.rpc
+                    .map(|addr| addr.to_string())
+                    .unwrap_or_else(|| "none".to_string()),
+                node.version.unwrap_or_else(|| "unknown".to_string()),
+            )
+        })
         .collect();
 
-    Ok(config
-        .output_format
-        .formatted_string(&CliGossipNodes(nodes)))
+    Ok(format!(
+        "IP Address      | Node identifier                              \
+         | Gossip | TPU   | RPC Address           | Version\n\
+         ----------------+----------------------------------------------+\
+         --------+-------+-----------------------+----------------\n\
+         {}\n\
+         Nodes: {}",
+        s.join("\n"),
+        s.len(),
+    ))
 }
 
 pub fn process_show_stakes(
@@ -1707,11 +1624,11 @@ pub fn process_show_stakes(
     progress_bar.set_message("Fetching stake accounts...");
 
     let mut program_accounts_config = RpcProgramAccountsConfig {
+        filters: None,
         account_config: RpcAccountInfoConfig {
             encoding: Some(solana_account_decoder::UiAccountEncoding::Base64),
             ..RpcAccountInfoConfig::default()
         },
-        ..RpcProgramAccountsConfig::default()
     };
 
     if let Some(vote_account_pubkeys) = vote_account_pubkeys {
@@ -1721,7 +1638,7 @@ pub fn process_show_stakes(
                 // Filter by `StakeState::Stake(_, _)`
                 rpc_filter::RpcFilterType::Memcmp(rpc_filter::Memcmp {
                     offset: 0,
-                    bytes: rpc_filter::MemcmpEncodedBytes::Base58(
+                    bytes: rpc_filter::MemcmpEncodedBytes::Binary(
                         bs58::encode([2, 0, 0, 0]).into_string(),
                     ),
                     encoding: Some(rpc_filter::MemcmpEncoding::Binary),
@@ -1729,7 +1646,7 @@ pub fn process_show_stakes(
                 // Filter by `Delegation::voter_pubkey`, which begins at byte offset 124
                 rpc_filter::RpcFilterType::Memcmp(rpc_filter::Memcmp {
                     offset: 124,
-                    bytes: rpc_filter::MemcmpEncodedBytes::Base58(
+                    bytes: rpc_filter::MemcmpEncodedBytes::Binary(
                         vote_account_pubkeys[0].to_string(),
                     ),
                     encoding: Some(rpc_filter::MemcmpEncoding::Binary),
@@ -1738,7 +1655,7 @@ pub fn process_show_stakes(
         }
     }
     let all_stake_accounts = rpc_client
-        .get_program_accounts_with_config(&stake::program::id(), program_accounts_config)?;
+        .get_program_accounts_with_config(&solana_stake_program::id(), program_accounts_config)?;
     let stake_history_account = rpc_client.get_account(&stake_history::id())?;
     let clock_account = rpc_client.get_account(&sysvar::clock::id())?;
     let clock: Clock = from_account(&clock_account).ok_or_else(|| {
@@ -1749,6 +1666,8 @@ pub fn process_show_stakes(
     let stake_history = from_account(&stake_history_account).ok_or_else(|| {
         CliError::RpcRequestError("Failed to deserialize stake history".to_string())
     })?;
+    // At v1.6, this check can be removed and simply passed as `true`
+    let stake_program_v2_enabled = is_stake_program_v2_enabled(rpc_client)?;
 
     let mut stake_accounts: Vec<CliKeyedStakeState> = vec![];
     for (stake_pubkey, stake_account) in all_stake_accounts {
@@ -1764,6 +1683,7 @@ pub fn process_show_stakes(
                                 use_lamports_unit,
                                 &stake_history,
                                 &clock,
+                                stake_program_v2_enabled,
                             ),
                         });
                     }
@@ -1782,6 +1702,7 @@ pub fn process_show_stakes(
                                 use_lamports_unit,
                                 &stake_history,
                                 &clock,
+                                stake_program_v2_enabled,
                             ),
                         });
                     }
@@ -1809,42 +1730,10 @@ pub fn process_show_validators(
     rpc_client: &RpcClient,
     config: &CliConfig,
     use_lamports_unit: bool,
-    validators_sort_order: CliValidatorsSortOrder,
-    validators_reverse_sort: bool,
-    number_validators: bool,
-    keep_unstaked_delinquents: bool,
-    delinquent_slot_distance: Option<Slot>,
 ) -> ProcessResult {
-    let progress_bar = new_spinner_progress_bar();
-    progress_bar.set_message("Fetching vote accounts...");
     let epoch_info = rpc_client.get_epoch_info()?;
-    let vote_accounts = rpc_client.get_vote_accounts_with_config(RpcGetVoteAccountsConfig {
-        keep_unstaked_delinquents: Some(keep_unstaked_delinquents),
-        delinquent_slot_distance,
-        ..RpcGetVoteAccountsConfig::default()
-    })?;
+    let vote_accounts = rpc_client.get_vote_accounts()?;
 
-    progress_bar.set_message("Fetching block production...");
-    let skip_rate: HashMap<_, _> = rpc_client
-        .get_block_production()
-        .ok()
-        .map(|result| {
-            result
-                .value
-                .by_identity
-                .into_iter()
-                .map(|(identity, (leader_slots, blocks_produced))| {
-                    (
-                        identity,
-                        100. * (leader_slots.saturating_sub(blocks_produced)) as f64
-                            / leader_slots as f64,
-                    )
-                })
-                .collect()
-        })
-        .unwrap_or_default();
-
-    progress_bar.set_message("Fetching version information...");
     let mut node_version = HashMap::new();
     let unknown_version = "unknown".to_string();
     for contact_info in rpc_client.get_cluster_nodes()? {
@@ -1856,8 +1745,6 @@ pub fn process_show_validators(
         );
     }
 
-    progress_bar.finish_and_clear();
-
     let total_active_stake = vote_accounts
         .current
         .iter()
@@ -1872,8 +1759,9 @@ pub fn process_show_validators(
         .sum();
     let total_current_stake = total_active_stake - total_delinquent_stake;
 
-    let current_validators: Vec<CliValidator> = vote_accounts
-        .current
+    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(
@@ -1883,23 +1771,22 @@ pub fn process_show_validators(
                     .get(&vote_account.node_pubkey)
                     .unwrap_or(&unknown_version)
                     .clone(),
-                skip_rate.get(&vote_account.node_pubkey).cloned(),
                 &config.address_labels,
             )
         })
         .collect();
-    let delinquent_validators: Vec<CliValidator> = vote_accounts
-        .delinquent
+    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_delinquent(
+            CliValidator::new(
                 vote_account,
                 epoch_info.epoch,
                 node_version
                     .get(&vote_account.node_pubkey)
                     .unwrap_or(&unknown_version)
                     .clone(),
-                skip_rate.get(&vote_account.node_pubkey).cloned(),
                 &config.address_labels,
             )
         })
@@ -1921,43 +1808,12 @@ pub fn process_show_validators(
         entry.delinquent_active_stake += validator.activated_stake;
     }
 
-    let validators: Vec<_> = current_validators
-        .into_iter()
-        .chain(delinquent_validators.into_iter())
-        .collect();
-
-    let (average_skip_rate, average_stake_weighted_skip_rate) = {
-        let mut skip_rate_len = 0;
-        let mut skip_rate_sum = 0.;
-        let mut skip_rate_weighted_sum = 0.;
-        for validator in validators.iter() {
-            if let Some(skip_rate) = validator.skip_rate {
-                skip_rate_sum += skip_rate;
-                skip_rate_len += 1;
-                skip_rate_weighted_sum += skip_rate * validator.activated_stake as f64;
-            }
-        }
-
-        if skip_rate_len > 0 && total_active_stake > 0 {
-            (
-                skip_rate_sum / skip_rate_len as f64,
-                skip_rate_weighted_sum / total_active_stake as f64,
-            )
-        } else {
-            (100., 100.) // Impossible?
-        }
-    };
-
     let cli_validators = CliValidators {
         total_active_stake,
         total_current_stake,
         total_delinquent_stake,
-        validators,
-        average_skip_rate,
-        average_stake_weighted_skip_rate,
-        validators_sort_order,
-        validators_reverse_sort,
-        number_validators,
+        current_validators,
+        delinquent_validators,
         stake_by_version,
         use_lamports_unit,
     };
@@ -1973,7 +1829,7 @@ pub fn process_transaction_history(
     limit: usize,
     show_transactions: bool,
 ) -> ProcessResult {
-    let results = rpc_client.get_signatures_for_address_with_config(
+    let results = rpc_client.get_confirmed_signatures_for_address2_with_config(
         address,
         GetConfirmedSignaturesForAddress2Config {
             before,
@@ -2012,9 +1868,9 @@ pub fn process_transaction_history(
 
         if show_transactions {
             if let Ok(signature) = result.signature.parse::<Signature>() {
-                match rpc_client.get_transaction_with_config(
+                match rpc_client.get_confirmed_transaction_with_config(
                     &signature,
-                    RpcTransactionConfig {
+                    RpcConfirmedTransactionConfig {
                         encoding: Some(UiTransactionEncoding::Base64),
                         commitment: Some(CommitmentConfig::confirmed()),
                     },
@@ -2141,7 +1997,7 @@ pub fn process_calculate_rent(
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::{clap_app::get_clap_app, cli::parse_command};
+    use crate::cli::{app, parse_command};
     use solana_sdk::signature::{write_keypair, Keypair};
     use std::str::FromStr;
     use tempfile::NamedTempFile;
@@ -2153,11 +2009,14 @@ mod tests {
 
     #[test]
     fn test_parse_command() {
-        let test_commands = get_clap_app("test", "desc", "version");
+        let test_commands = app("test", "desc", "version");
         let default_keypair = Keypair::new();
         let (default_keypair_file, mut tmp_file) = make_tmp_file();
         write_keypair(&default_keypair, tmp_file.as_file_mut()).unwrap();
-        let default_signer = DefaultSigner::new("", &default_keypair_file);
+        let default_signer = DefaultSigner {
+            path: default_keypair_file,
+            arg_name: String::new(),
+        };
 
         let test_cluster_version = test_commands
             .clone()

cli/src/feature.rs

@@ -10,7 +10,6 @@ use solana_cli_output::{QuietDisplay, VerboseDisplay};
 use solana_client::{client_error::ClientError, rpc_client::RpcClient};
 use solana_remote_wallet::remote_wallet::RemoteWalletManager;
 use solana_sdk::{
-    account::Account,
     clock::Slot,
     feature::{self, Feature},
     feature_set::FEATURE_NAMES,
@@ -18,12 +17,7 @@ use solana_sdk::{
     pubkey::Pubkey,
     transaction::Transaction,
 };
-use std::{
-    cmp::Ordering,
-    collections::{HashMap, HashSet},
-    fmt,
-    sync::Arc,
-};
+use std::{collections::HashMap, fmt, sync::Arc};
 
 #[derive(Copy, Clone, Debug, PartialEq)]
 pub enum ForceActivation {
@@ -227,103 +221,44 @@ pub fn process_feature_subcommand(
     }
 }
 
-#[derive(Debug, Default)]
-struct WorkingFeatureSetStatsEntry {
-    stake: u64,
-    rpc_nodes_count: u32,
-    software_versions: HashSet<Option<semver::Version>>,
-}
-type WorkingFeatureSetStats = HashMap<u32, WorkingFeatureSetStatsEntry>;
-
-#[derive(Debug, Default)]
-struct FeatureSetStatsEntry {
-    stake_percent: f64,
-    rpc_nodes_percent: f32,
-    software_versions: Vec<Option<semver::Version>>,
-}
-type FeatureSetStats = HashMap<u32, FeatureSetStatsEntry>;
-
-fn feature_set_stats(rpc_client: &RpcClient) -> Result<FeatureSetStats, ClientError> {
+fn active_stake_by_feature_set(rpc_client: &RpcClient) -> Result<HashMap<u32, f64>, ClientError> {
     // Validator identity -> feature set
-    let feature_sets = rpc_client
+    let feature_set_map = rpc_client
         .get_cluster_nodes()?
         .into_iter()
-        .map(|contact_info| {
-            (
-                contact_info.pubkey,
-                contact_info.feature_set,
-                contact_info.rpc.is_some(),
-                contact_info
-                    .version
-                    .and_then(|v| semver::Version::parse(&v).ok()),
-            )
-        })
-        .collect::<Vec<_>>();
+        .map(|contact_info| (contact_info.pubkey, contact_info.feature_set))
+        .collect::<HashMap<_, _>>();
 
     let vote_accounts = rpc_client.get_vote_accounts()?;
 
-    let mut total_active_stake: u64 = vote_accounts
-        .delinquent
+    let total_active_stake: u64 = vote_accounts
+        .current
         .iter()
+        .chain(vote_accounts.delinquent.iter())
         .map(|vote_account| vote_account.activated_stake)
         .sum();
 
-    let vote_stakes = vote_accounts
-        .current
-        .into_iter()
-        .map(|vote_account| {
-            total_active_stake += vote_account.activated_stake;
-            (vote_account.node_pubkey, vote_account.activated_stake)
-        })
-        .collect::<HashMap<_, _>>();
-
-    let mut feature_set_stats: WorkingFeatureSetStats = HashMap::new();
-    let mut total_rpc_nodes = 0;
-    for (node_id, feature_set, is_rpc, version) in feature_sets {
-        let feature_set = feature_set.unwrap_or(0);
-        let feature_set_entry = feature_set_stats.entry(feature_set).or_default();
-
-        feature_set_entry.software_versions.insert(version);
-
-        if let Some(vote_stake) = vote_stakes.get(&node_id) {
-            feature_set_entry.stake += *vote_stake;
-        }
-
-        if is_rpc {
-            feature_set_entry.rpc_nodes_count += 1;
-            total_rpc_nodes += 1;
+    // Sum all active stake by feature set
+    let mut active_stake_by_feature_set: HashMap<u32, u64> = HashMap::new();
+    for vote_account in vote_accounts.current {
+        if let Some(Some(feature_set)) = feature_set_map.get(&vote_account.node_pubkey) {
+            *active_stake_by_feature_set.entry(*feature_set).or_default() +=
+                vote_account.activated_stake;
+        } else {
+            *active_stake_by_feature_set
+                .entry(0 /* "unknown" */)
+                .or_default() += vote_account.activated_stake;
         }
     }
 
-    Ok(feature_set_stats
+    Ok(active_stake_by_feature_set
         .into_iter()
-        .filter_map(
-            |(
+        .map(|(feature_set, active_stake)| {
+            (
                 feature_set,
-                WorkingFeatureSetStatsEntry {
-                    stake,
-                    rpc_nodes_count,
-                    software_versions,
-                },
-            )| {
-                let stake_percent = (stake as f64 / total_active_stake as f64) * 100.;
-                let rpc_nodes_percent = (rpc_nodes_count as f32 / total_rpc_nodes as f32) * 100.;
-                let mut software_versions = software_versions.into_iter().collect::<Vec<_>>();
-                software_versions.sort();
-                if stake_percent >= 0.001 || rpc_nodes_percent >= 0.001 {
-                    Some((
-                        feature_set,
-                        FeatureSetStatsEntry {
-                            stake_percent,
-                            rpc_nodes_percent,
-                            software_versions,
-                        },
-                    ))
-                } else {
-                    None
-                }
-            },
-        )
+                active_stake as f64 * 100. / total_active_stake as f64,
+            )
+        })
         .collect())
 }
 
@@ -331,189 +266,50 @@ fn feature_set_stats(rpc_client: &RpcClient) -> Result<FeatureSetStats, ClientEr
 fn feature_activation_allowed(rpc_client: &RpcClient, quiet: bool) -> Result<bool, ClientError> {
     let my_feature_set = solana_version::Version::default().feature_set;
 
-    let feature_set_stats = feature_set_stats(rpc_client)?;
+    let active_stake_by_feature_set = active_stake_by_feature_set(rpc_client)?;
 
-    let (stake_allowed, rpc_allowed) = feature_set_stats
+    let feature_activation_allowed = active_stake_by_feature_set
         .get(&my_feature_set)
-        .map(
-            |FeatureSetStatsEntry {
-                 stake_percent,
-                 rpc_nodes_percent,
-                 ..
-             }| (*stake_percent >= 95., *rpc_nodes_percent >= 95.),
-        )
-        .unwrap_or((false, false));
+        .map(|percentage| *percentage >= 95.)
+        .unwrap_or(false);
 
-    if !stake_allowed && !rpc_allowed && !quiet {
-        if feature_set_stats.get(&my_feature_set).is_none() {
+    if !feature_activation_allowed && !quiet {
+        if active_stake_by_feature_set.get(&my_feature_set).is_none() {
             println!(
                 "{}",
                 style("To activate features the tool and cluster feature sets must match, select a tool version that matches the cluster")
                     .bold());
         } else {
-            if !stake_allowed {
-                print!(
-                    "\n{}",
-                    style("To activate features the stake must be >= 95%")
-                        .bold()
-                        .red()
-                );
-            }
-            if !rpc_allowed {
-                print!(
-                    "\n{}",
-                    style("To activate features the RPC nodes must be >= 95%")
-                        .bold()
-                        .red()
-                );
-            }
-        }
-        println!(
-            "\n\n{}",
-            style(format!("Tool Feature Set: {}", my_feature_set)).bold()
-        );
-
-        let mut feature_set_stats = feature_set_stats.into_iter().collect::<Vec<_>>();
-        feature_set_stats.sort_by(|l, r| {
-            match l.1.software_versions[0]
-                .cmp(&r.1.software_versions[0])
-                .reverse()
-            {
-                Ordering::Equal => {
-                    match l
-                        .1
-                        .stake_percent
-                        .partial_cmp(&r.1.stake_percent)
-                        .unwrap()
-                        .reverse()
-                    {
-                        Ordering::Equal => {
-                            l.1.rpc_nodes_percent
-                                .partial_cmp(&r.1.rpc_nodes_percent)
-                                .unwrap()
-                                .reverse()
-                        }
-                        o => o,
-                    }
-                }
-                o => o,
-            }
-        });
-
-        let software_versions_title = "Software Version";
-        let feature_set_title = "Feature Set";
-        let stake_percent_title = "Stake";
-        let rpc_percent_title = "RPC";
-        let mut stats_output = Vec::new();
-        let mut max_software_versions_len = software_versions_title.len();
-        let mut max_feature_set_len = feature_set_title.len();
-        let mut max_stake_percent_len = stake_percent_title.len();
-        let mut max_rpc_percent_len = rpc_percent_title.len();
-        for (
-            feature_set,
-            FeatureSetStatsEntry {
-                stake_percent,
-                rpc_nodes_percent,
-                software_versions,
-            },
-        ) in feature_set_stats.into_iter()
-        {
-            let me = feature_set == my_feature_set;
-            let feature_set = if feature_set == 0 {
-                "unknown".to_string()
-            } else {
-                feature_set.to_string()
-            };
-            let stake_percent = format!("{:.2}%", stake_percent);
-            let rpc_percent = format!("{:.2}%", rpc_nodes_percent);
-
-            let mut has_unknown = false;
-            let mut software_versions = software_versions
-                .iter()
-                .filter_map(|v| {
-                    if v.is_none() {
-                        has_unknown = true;
-                    }
-                    v.as_ref()
-                })
-                .map(ToString::to_string)
-                .collect::<Vec<_>>();
-            if has_unknown {
-                software_versions.push("unknown".to_string());
-            }
-            let software_versions = software_versions.join(", ");
-            max_software_versions_len = max_software_versions_len.max(software_versions.len());
-
-            max_feature_set_len = max_feature_set_len.max(feature_set.len());
-            max_stake_percent_len = max_stake_percent_len.max(stake_percent.len());
-            max_rpc_percent_len = max_rpc_percent_len.max(rpc_percent.len());
-
-            stats_output.push((
-                software_versions,
-                feature_set,
-                stake_percent,
-                rpc_percent,
-                me,
-            ));
+            println!(
+                "{}",
+                style("To activate features the stake must be >= 95%").bold()
+            );
         }
         println!(
             "{}",
-            style(format!(
-                "{1:<0$}  {3:<2$}  {5:<4$}  {7:<6$}",
-                max_software_versions_len,
-                software_versions_title,
-                max_feature_set_len,
-                feature_set_title,
-                max_stake_percent_len,
-                stake_percent_title,
-                max_rpc_percent_len,
-                rpc_percent_title,
-            ))
-            .bold(),
+            style(format!("Tool Feature Set: {}", my_feature_set)).bold()
         );
-        for (software_versions, feature_set, stake_percent, rpc_percent, me) in stats_output {
-            println!(
-                "{1:<0$}  {3:>2$}  {5:>4$} {7:>6$}  {8}",
-                max_software_versions_len,
-                software_versions,
-                max_feature_set_len,
-                feature_set,
-                max_stake_percent_len,
-                stake_percent,
-                max_rpc_percent_len,
-                rpc_percent,
-                if me { "<-- me" } else { "" },
-            );
+        println!("{}", style("Cluster Feature Sets and Stakes:").bold());
+        for (feature_set, percentage) in active_stake_by_feature_set.iter() {
+            if *feature_set == 0 {
+                println!("  unknown    - {:.2}%", percentage);
+            } else {
+                println!(
+                    "  {:<10} - {:.2}% {}",
+                    feature_set,
+                    percentage,
+                    if *feature_set == my_feature_set {
+                        " <-- me"
+                    } else {
+                        ""
+                    }
+                );
+            }
         }
         println!();
     }
 
-    Ok(stake_allowed && rpc_allowed)
-}
-
-fn status_from_account(account: Account) -> Option<CliFeatureStatus> {
-    feature::from_account(&account).map(|feature| match feature.activated_at {
-        None => CliFeatureStatus::Pending,
-        Some(activation_slot) => CliFeatureStatus::Active(activation_slot),
-    })
-}
-
-fn get_feature_status(
-    rpc_client: &RpcClient,
-    feature_id: &Pubkey,
-) -> Result<Option<CliFeatureStatus>, Box<dyn std::error::Error>> {
-    rpc_client
-        .get_account(feature_id)
-        .map(status_from_account)
-        .map_err(|e| e.into())
-}
-
-pub fn get_feature_is_active(
-    rpc_client: &RpcClient,
-    feature_id: &Pubkey,
-) -> Result<bool, Box<dyn std::error::Error>> {
-    get_feature_status(rpc_client, feature_id)
-        .map(|status| matches!(status, Some(CliFeatureStatus::Active(_))))
+    Ok(feature_activation_allowed)
 }
 
 fn process_status(
@@ -531,7 +327,11 @@ fn process_status(
         let feature_id = &feature_ids[i];
         let feature_name = FEATURE_NAMES.get(feature_id).unwrap();
         if let Some(account) = account {
-            if let Some(feature_status) = status_from_account(account) {
+            if let Some(feature) = feature::from_account(&account) {
+                let feature_status = match feature.activated_at {
+                    None => CliFeatureStatus::Pending,
+                    Some(activation_slot) => CliFeatureStatus::Active(activation_slot),
+                };
                 features.push(CliFeature {
                     id: feature_id.to_string(),
                     description: feature_name.to_string(),

cli/src/inflation.rs

@@ -102,7 +102,7 @@ fn process_rewards(
     rewards_epoch: Option<Epoch>,
 ) -> ProcessResult {
     let rewards = rpc_client
-        .get_inflation_reward(addresses, rewards_epoch)
+        .get_inflation_reward(&addresses, rewards_epoch)
         .map_err(|err| {
             if let Some(epoch) = rewards_epoch {
                 format!("Rewards not available for epoch {}", epoch)

cli/src/lib.rs

@@ -10,6 +10,7 @@ macro_rules! ACCOUNT_STRING {
     };
 }
 
+#[macro_use]
 macro_rules! pubkey {
     ($arg:expr, $help:expr) => {
         $arg.takes_value(true)
@@ -18,13 +19,9 @@ macro_rules! pubkey {
     };
 }
 
-#[macro_use]
-extern crate const_format;
-
 extern crate serde_derive;
 
 pub mod checks;
-pub mod clap_app;
 pub mod cli;
 pub mod cluster_query;
 pub mod feature;
@@ -32,9 +29,9 @@ pub mod inflation;
 pub mod memo;
 pub mod nonce;
 pub mod program;
+pub mod send_tpu;
 pub mod spend_utils;
 pub mod stake;
 pub mod test_utils;
 pub mod validator_info;
 pub mod vote;
-pub mod wallet;

cli/src/main.rs

@@ -1,15 +1,18 @@
-use clap::{crate_description, crate_name, value_t_or_exit, ArgMatches};
+use clap::{
+    crate_description, crate_name, value_t_or_exit, AppSettings, Arg, ArgGroup, ArgMatches,
+    SubCommand,
+};
 use console::style;
 use solana_clap_utils::{
-    input_validators::normalize_to_url_if_moniker,
-    keypair::{CliSigners, DefaultSigner},
+    input_validators::{is_url, is_url_or_moniker, normalize_to_url_if_moniker},
+    keypair::{CliSigners, DefaultSigner, SKIP_SEED_PHRASE_VALIDATION_ARG},
     DisplayError,
 };
-use solana_cli::{
-    clap_app::get_clap_app,
-    cli::{parse_command, process_command, CliCommandInfo, CliConfig, SettingType},
+use solana_cli::cli::{
+    app, parse_command, process_command, CliCommandInfo, CliConfig, SettingType,
+    DEFAULT_RPC_TIMEOUT_SECONDS,
 };
-use solana_cli_config::Config;
+use solana_cli_config::{Config, CONFIG_FILE};
 use solana_cli_output::{display::println_name_value, OutputFormat};
 use solana_client::rpc_config::RpcSendTransactionConfig;
 use solana_remote_wallet::remote_wallet::RemoteWalletManager;
@@ -164,11 +167,6 @@ pub fn parse_args<'a>(
     let rpc_timeout = value_t_or_exit!(matches, "rpc_timeout", u64);
     let rpc_timeout = Duration::from_secs(rpc_timeout);
 
-    let confirm_transaction_initial_timeout =
-        value_t_or_exit!(matches, "confirm_transaction_initial_timeout", u64);
-    let confirm_transaction_initial_timeout =
-        Duration::from_secs(confirm_transaction_initial_timeout);
-
     let (_, websocket_url) = CliConfig::compute_websocket_url_setting(
         matches.value_of("websocket_url").unwrap_or(""),
         &config.websocket_url,
@@ -181,12 +179,15 @@ pub fn parse_args<'a>(
         &config.keypair_path,
     );
 
-    let default_signer = DefaultSigner::new(default_signer_arg_name, &default_signer_path);
+    let default_signer = DefaultSigner {
+        arg_name: default_signer_arg_name,
+        path: default_signer_path.clone(),
+    };
 
     let CliCommandInfo {
         command,
         mut signers,
-    } = parse_command(matches, &default_signer, &mut wallet_manager)?;
+    } = parse_command(&matches, &default_signer, &mut wallet_manager)?;
 
     if signers.is_empty() {
         if let Ok(signer_info) =
@@ -197,7 +198,18 @@ pub fn parse_args<'a>(
     }
 
     let verbose = matches.is_present("verbose");
-    let output_format = OutputFormat::from_matches(matches, "output_format", verbose);
+    let output_format = matches
+        .value_of("output_format")
+        .map(|value| match value {
+            "json" => OutputFormat::Json,
+            "json-compact" => OutputFormat::JsonCompact,
+            _ => unreachable!(),
+        })
+        .unwrap_or(if verbose {
+            OutputFormat::DisplayVerbose
+        } else {
+            OutputFormat::Display
+        });
 
     let (_, commitment) = CliConfig::compute_commitment_config(
         matches.value_of("commitment").unwrap_or(""),
@@ -226,7 +238,6 @@ pub fn parse_args<'a>(
                 preflight_commitment: Some(commitment.commitment),
                 ..RpcSendTransactionConfig::default()
             },
-            confirm_transaction_initial_timeout,
             address_labels,
         },
         signers,
@@ -235,21 +246,178 @@ pub fn parse_args<'a>(
 
 fn main() -> Result<(), Box<dyn error::Error>> {
     solana_logger::setup_with_default("off");
-    let matches = get_clap_app(
+    let matches = app(
         crate_name!(),
         crate_description!(),
         solana_version::version!(),
     )
+    .arg({
+        let arg = Arg::with_name("config_file")
+            .short("C")
+            .long("config")
+            .value_name("FILEPATH")
+            .takes_value(true)
+            .global(true)
+            .help("Configuration file to use");
+        if let Some(ref config_file) = *CONFIG_FILE {
+            arg.default_value(&config_file)
+        } else {
+            arg
+        }
+    })
+    .arg(
+        Arg::with_name("json_rpc_url")
+            .short("u")
+            .long("url")
+            .value_name("URL_OR_MONIKER")
+            .takes_value(true)
+            .global(true)
+            .validator(is_url_or_moniker)
+            .help(
+                "URL for Solana's JSON RPC or moniker (or their first letter): \
+                   [mainnet-beta, testnet, devnet, localhost]",
+            ),
+    )
+    .arg(
+        Arg::with_name("websocket_url")
+            .long("ws")
+            .value_name("URL")
+            .takes_value(true)
+            .global(true)
+            .validator(is_url)
+            .help("WebSocket URL for the solana cluster"),
+    )
+    .arg(
+        Arg::with_name("keypair")
+            .short("k")
+            .long("keypair")
+            .value_name("KEYPAIR")
+            .global(true)
+            .takes_value(true)
+            .help("Filepath or URL to a keypair"),
+    )
+    .arg(
+        Arg::with_name("commitment")
+            .long("commitment")
+            .takes_value(true)
+            .possible_values(&[
+                "processed",
+                "confirmed",
+                "finalized",
+                "recent", // Deprecated as of v1.5.5
+                "single", // Deprecated as of v1.5.5
+                "singleGossip", // Deprecated as of v1.5.5
+                "root", // Deprecated as of v1.5.5
+                "max", // Deprecated as of v1.5.5
+            ])
+            .value_name("COMMITMENT_LEVEL")
+            .hide_possible_values(true)
+            .global(true)
+            .help("Return information at the selected commitment level [possible values: processed, confirmed, finalized]"),
+    )
+    .arg(
+        Arg::with_name("verbose")
+            .long("verbose")
+            .short("v")
+            .global(true)
+            .help("Show additional information"),
+    )
+    .arg(
+        Arg::with_name("no_address_labels")
+            .long("no-address-labels")
+            .global(true)
+            .help("Do not use address labels in the output"),
+    )
+    .arg(
+        Arg::with_name("output_format")
+            .long("output")
+            .value_name("FORMAT")
+            .global(true)
+            .takes_value(true)
+            .possible_values(&["json", "json-compact"])
+            .help("Return information in specified output format"),
+    )
+    .arg(
+        Arg::with_name(SKIP_SEED_PHRASE_VALIDATION_ARG.name)
+            .long(SKIP_SEED_PHRASE_VALIDATION_ARG.long)
+            .global(true)
+            .help(SKIP_SEED_PHRASE_VALIDATION_ARG.help),
+    )
+    .arg(
+        Arg::with_name("rpc_timeout")
+            .long("rpc-timeout")
+            .value_name("SECONDS")
+            .takes_value(true)
+            .default_value(DEFAULT_RPC_TIMEOUT_SECONDS)
+            .global(true)
+            .hidden(true)
+            .help("Timeout value for RPC requests"),
+    )
+    .subcommand(
+        SubCommand::with_name("config")
+            .about("Solana command-line tool configuration settings")
+            .aliases(&["get", "set"])
+            .setting(AppSettings::SubcommandRequiredElseHelp)
+            .subcommand(
+                SubCommand::with_name("get")
+                    .about("Get current config settings")
+                    .arg(
+                        Arg::with_name("specific_setting")
+                            .index(1)
+                            .value_name("CONFIG_FIELD")
+                            .takes_value(true)
+                            .possible_values(&[
+                                "json_rpc_url",
+                                "websocket_url",
+                                "keypair",
+                                "commitment",
+                            ])
+                            .help("Return a specific config setting"),
+                    ),
+            )
+            .subcommand(
+                SubCommand::with_name("set")
+                    .about("Set a config setting")
+                    .group(
+                        ArgGroup::with_name("config_settings")
+                            .args(&["json_rpc_url", "websocket_url", "keypair", "commitment"])
+                            .multiple(true)
+                            .required(true),
+                    ),
+            )
+            .subcommand(
+                SubCommand::with_name("import-address-labels")
+                    .about("Import a list of address labels")
+                    .arg(
+                        Arg::with_name("filename")
+                            .index(1)
+                            .value_name("FILENAME")
+                            .takes_value(true)
+                            .help("YAML file of address labels"),
+                    ),
+            )
+            .subcommand(
+                SubCommand::with_name("export-address-labels")
+                    .about("Export the current address labels")
+                    .arg(
+                        Arg::with_name("filename")
+                            .index(1)
+                            .value_name("FILENAME")
+                            .takes_value(true)
+                            .help("YAML file to receive the current address labels"),
+                    ),
+            ),
+    )
     .get_matches();
 
     do_main(&matches).map_err(|err| DisplayError::new_as_boxed(err).into())
 }
 
 fn do_main(matches: &ArgMatches<'_>) -> Result<(), Box<dyn error::Error>> {
-    if parse_settings(matches)? {
+    if parse_settings(&matches)? {
         let mut wallet_manager = None;
 
-        let (mut config, signers) = parse_args(matches, &mut wallet_manager)?;
+        let (mut config, signers) = parse_args(&matches, &mut wallet_manager)?;
         config.signers = signers.iter().map(|s| s.as_ref()).collect();
         let result = process_command(&config)?;
         println!("{}", result);

cli/src/nonce.rs

@@ -1,10 +1,9 @@
 use crate::{
     checks::{check_account_for_fee_with_commitment, check_unique_pubkeys},
     cli::{
-        log_instruction_custom_error, log_instruction_custom_error_ex, CliCommand, CliCommandInfo,
-        CliConfig, CliError, ProcessResult,
+        log_instruction_custom_error, CliCommand, CliCommandInfo, CliConfig, CliError,
+        ProcessResult,
     },
-    feature::get_feature_is_active,
     memo::WithMemo,
     spend_utils::{resolve_spend_tx_and_check_account_balance, SpendAmount},
 };
@@ -13,7 +12,7 @@ use solana_clap_utils::{
     input_parsers::*,
     input_validators::*,
     keypair::{DefaultSigner, SignerIndex},
-    memo::{memo_arg, MEMO_ARG},
+    memo::MEMO_ARG,
     nonce::*,
 };
 use solana_cli_output::CliNonceAccount;
@@ -21,19 +20,16 @@ use solana_client::{nonce_utils::*, rpc_client::RpcClient};
 use solana_remote_wallet::remote_wallet::RemoteWalletManager;
 use solana_sdk::{
     account::Account,
-    feature_set::merge_nonce_error_into_system_error,
     hash::Hash,
-    instruction::InstructionError,
     message::Message,
     nonce::{self, State},
     pubkey::Pubkey,
     system_instruction::{
         advance_nonce_account, authorize_nonce_account, create_nonce_account,
-        create_nonce_account_with_seed, instruction_to_nonce_error, withdraw_nonce_account,
-        NonceError, SystemError,
+        create_nonce_account_with_seed, withdraw_nonce_account, NonceError, SystemError,
     },
     system_program,
-    transaction::{Transaction, TransactionError},
+    transaction::Transaction,
 };
 use std::sync::Arc;
 
@@ -60,8 +56,7 @@ impl NonceSubCommands for App<'_, '_> {
                         .required(true),
                         "Account to be granted authority of the nonce account. "),
                 )
-                .arg(nonce_authority_arg())
-                .arg(memo_arg()),
+                .arg(nonce_authority_arg()),
         )
         .subcommand(
             SubCommand::with_name("create-nonce-account")
@@ -96,8 +91,7 @@ impl NonceSubCommands for App<'_, '_> {
                         .value_name("STRING")
                         .takes_value(true)
                         .help("Seed for address generation; if specified, the resulting account will be at a derived address of the NONCE_ACCOUNT pubkey")
-                )
-                .arg(memo_arg()),
+                ),
         )
         .subcommand(
             SubCommand::with_name("nonce")
@@ -121,8 +115,7 @@ impl NonceSubCommands for App<'_, '_> {
                         .required(true),
                         "Address of the nonce account. "),
                 )
-                .arg(nonce_authority_arg())
-                .arg(memo_arg()),
+                .arg(nonce_authority_arg()),
         )
         .subcommand(
             SubCommand::with_name("nonce-account")
@@ -168,8 +161,7 @@ impl NonceSubCommands for App<'_, '_> {
                         .validator(is_amount)
                         .help("The amount to withdraw from the nonce account, in SOL"),
                 )
-                .arg(nonce_authority_arg())
-                .arg(memo_arg()),
+                .arg(nonce_authority_arg()),
         )
     }
 }
@@ -371,21 +363,8 @@ pub fn process_authorize_nonce_account(
         &tx.message,
         config.commitment,
     )?;
-    let merge_errors =
-        get_feature_is_active(rpc_client, &merge_nonce_error_into_system_error::id())?;
     let result = rpc_client.send_and_confirm_transaction_with_spinner(&tx);
-
-    if merge_errors {
-        log_instruction_custom_error::<SystemError>(result, config)
-    } else {
-        log_instruction_custom_error_ex::<NonceError, _>(result, config, |ix_error| {
-            if let InstructionError::Custom(_) = ix_error {
-                instruction_to_nonce_error(ix_error, merge_errors)
-            } else {
-                None
-            }
-        })
-    }
+    log_instruction_custom_error::<NonceError>(result, &config)
 }
 
 pub fn process_create_nonce_account(
@@ -469,40 +448,8 @@ pub fn process_create_nonce_account(
 
     let mut tx = Transaction::new_unsigned(message);
     tx.try_sign(&config.signers, recent_blockhash)?;
-    let merge_errors =
-        get_feature_is_active(rpc_client, &merge_nonce_error_into_system_error::id())?;
     let result = rpc_client.send_and_confirm_transaction_with_spinner(&tx);
-
-    let err_ix_index = if let Err(err) = &result {
-        err.get_transaction_error().and_then(|tx_err| {
-            if let TransactionError::InstructionError(ix_index, _) = tx_err {
-                Some(ix_index)
-            } else {
-                None
-            }
-        })
-    } else {
-        None
-    };
-
-    match err_ix_index {
-        // SystemInstruction::InitializeNonceAccount failed
-        Some(1) => {
-            if merge_errors {
-                log_instruction_custom_error::<SystemError>(result, config)
-            } else {
-                log_instruction_custom_error_ex::<NonceError, _>(result, config, |ix_error| {
-                    if let InstructionError::Custom(_) = ix_error {
-                        instruction_to_nonce_error(ix_error, merge_errors)
-                    } else {
-                        None
-                    }
-                })
-            }
-        }
-        // SystemInstruction::CreateAccount{,WithSeed} failed
-        _ => log_instruction_custom_error::<SystemError>(result, config),
-    }
+    log_instruction_custom_error::<SystemError>(result, &config)
 }
 
 pub fn process_get_nonce(
@@ -527,10 +474,10 @@ pub fn process_new_nonce(
 ) -> ProcessResult {
     check_unique_pubkeys(
         (&config.signers[0].pubkey(), "cli keypair".to_string()),
-        (nonce_account, "nonce_account_pubkey".to_string()),
+        (&nonce_account, "nonce_account_pubkey".to_string()),
     )?;
 
-    if let Err(err) = rpc_client.get_account(nonce_account) {
+    if let Err(err) = rpc_client.get_account(&nonce_account) {
         return Err(CliError::BadParameter(format!(
             "Unable to advance nonce account {}. error: {}",
             nonce_account, err
@@ -540,7 +487,7 @@ pub fn process_new_nonce(
 
     let nonce_authority = config.signers[nonce_authority];
     let ixs = vec![advance_nonce_account(
-        nonce_account,
+        &nonce_account,
         &nonce_authority.pubkey(),
     )]
     .with_memo(memo);
@@ -555,21 +502,8 @@ pub fn process_new_nonce(
         &tx.message,
         config.commitment,
     )?;
-    let merge_errors =
-        get_feature_is_active(rpc_client, &merge_nonce_error_into_system_error::id())?;
     let result = rpc_client.send_and_confirm_transaction_with_spinner(&tx);
-
-    if merge_errors {
-        log_instruction_custom_error::<SystemError>(result, config)
-    } else {
-        log_instruction_custom_error_ex::<NonceError, _>(result, config, |ix_error| {
-            if let InstructionError::Custom(_) = ix_error {
-                instruction_to_nonce_error(ix_error, merge_errors)
-            } else {
-                None
-            }
-        })
-    }
+    log_instruction_custom_error::<SystemError>(result, &config)
 }
 
 pub fn process_show_nonce_account(
@@ -588,7 +522,7 @@ pub fn process_show_nonce_account(
             use_lamports_unit,
             ..CliNonceAccount::default()
         };
-        if let Some(data) = data {
+        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());
@@ -631,27 +565,14 @@ pub fn process_withdraw_from_nonce_account(
         &tx.message,
         config.commitment,
     )?;
-    let merge_errors =
-        get_feature_is_active(rpc_client, &merge_nonce_error_into_system_error::id())?;
     let result = rpc_client.send_and_confirm_transaction_with_spinner(&tx);
-
-    if merge_errors {
-        log_instruction_custom_error::<SystemError>(result, config)
-    } else {
-        log_instruction_custom_error_ex::<NonceError, _>(result, config, |ix_error| {
-            if let InstructionError::Custom(_) = ix_error {
-                instruction_to_nonce_error(ix_error, merge_errors)
-            } else {
-                None
-            }
-        })
-    }
+    log_instruction_custom_error::<NonceError>(result, &config)
 }
 
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::{clap_app::get_clap_app, cli::parse_command};
+    use crate::cli::{app, parse_command};
     use solana_sdk::{
         account::Account,
         account_utils::StateMut,
@@ -671,11 +592,14 @@ mod tests {
 
     #[test]
     fn test_parse_command() {
-        let test_commands = get_clap_app("test", "desc", "version");
+        let test_commands = app("test", "desc", "version");
         let default_keypair = Keypair::new();
         let (default_keypair_file, mut tmp_file) = make_tmp_file();
         write_keypair(&default_keypair, tmp_file.as_file_mut()).unwrap();
-        let default_signer = DefaultSigner::new("", &default_keypair_file);
+        let default_signer = DefaultSigner {
+            path: default_keypair_file.clone(),
+            arg_name: String::new(),
+        };
         let (keypair_file, mut tmp_file) = make_tmp_file();
         let nonce_account_keypair = Keypair::new();
         write_keypair(&nonce_account_keypair, tmp_file.as_file_mut()).unwrap();

cli/src/send_tpu.rs

@@ -0,0 +1,46 @@
+use log::*;
+use solana_client::rpc_response::{RpcContactInfo, RpcLeaderSchedule};
+use solana_sdk::clock::NUM_CONSECUTIVE_LEADER_SLOTS;
+use std::net::{SocketAddr, UdpSocket};
+
+pub fn get_leader_tpus(
+    slot_index: u64,
+    num_leaders: u64,
+    leader_schedule: Option<&RpcLeaderSchedule>,
+    cluster_nodes: Option<&Vec<RpcContactInfo>>,
+) -> Vec<SocketAddr> {
+    let leaders: Vec<_> = (0..num_leaders)
+        .filter_map(|i| {
+            leader_schedule?
+                .iter()
+                .find(|(_pubkey, slots)| {
+                    slots.iter().any(|slot| {
+                        *slot as u64 == (slot_index + (i * NUM_CONSECUTIVE_LEADER_SLOTS))
+                    })
+                })
+                .and_then(|(pubkey, _)| {
+                    cluster_nodes?
+                        .iter()
+                        .find(|contact_info| contact_info.pubkey == *pubkey)
+                        .and_then(|contact_info| contact_info.tpu)
+                })
+        })
+        .collect();
+    let mut unique_leaders = vec![];
+    for leader in leaders.into_iter() {
+        if !unique_leaders.contains(&leader) {
+            unique_leaders.push(leader);
+        }
+    }
+    unique_leaders
+}
+
+pub fn send_transaction_tpu(
+    send_socket: &UdpSocket,
+    tpu_address: &SocketAddr,
+    wire_transaction: &[u8],
+) {
+    if let Err(err) = send_socket.send_to(wire_transaction, tpu_address) {
+        warn!("Failed to send transaction to {}: {:?}", tpu_address, err);
+    }
+}

cli/src/spend_utils.rs

@@ -92,7 +92,7 @@ where
         Ok((message, spend))
     } else {
         let from_balance = rpc_client
-            .get_balance_with_commitment(from_pubkey, commitment)?
+            .get_balance_with_commitment(&from_pubkey, commitment)?
             .value;
         let (message, SpendAndFee { spend, fee }) = resolve_spend_message(
             amount,

cli/src/validator_info.rs

@@ -119,7 +119,7 @@ fn parse_validator_info(
     let key_list: ConfigKeys = deserialize(&account.data)?;
     if !key_list.keys.is_empty() {
         let (validator_pubkey, _) = key_list.keys[1];
-        let validator_info_string: String = deserialize(get_config_data(&account.data)?)?;
+        let validator_info_string: String = deserialize(&get_config_data(&account.data)?)?;
         let validator_info: Map<_, _> = serde_json::from_str(&validator_info_string)?;
         Ok((validator_pubkey, validator_info))
     } else {
@@ -246,7 +246,7 @@ pub fn process_set_validator_info(
 ) -> ProcessResult {
     // Validate keybase username
     if let Some(string) = validator_info.get("keybaseUsername") {
-        let result = verify_keybase(&config.signers[0].pubkey(), string);
+        let result = verify_keybase(&config.signers[0].pubkey(), &string);
         if result.is_err() {
             if force_keybase {
                 println!("--force supplied, ignoring: {:?}", result);
@@ -272,7 +272,7 @@ pub fn process_set_validator_info(
             },
         )
         .find(|(pubkey, account)| {
-            let (validator_pubkey, _) = parse_validator_info(pubkey, account).unwrap();
+            let (validator_pubkey, _) = parse_validator_info(&pubkey, &account).unwrap();
             validator_pubkey == config.signers[0].pubkey()
         });
 
@@ -393,7 +393,7 @@ pub fn process_get_validator_info(
     }
     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)?;
+            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(),
@@ -408,7 +408,7 @@ pub fn process_get_validator_info(
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::clap_app::get_clap_app;
+    use crate::cli::app;
     use bincode::{serialize, serialized_size};
     use serde_json::json;
 
@@ -432,7 +432,7 @@ mod tests {
 
     #[test]
     fn test_parse_args() {
-        let matches = get_clap_app("test", "desc", "version").get_matches_from(vec![
+        let matches = app("test", "desc", "version").get_matches_from(vec![
             "test",
             "validator-info",
             "publish",
@@ -451,7 +451,7 @@ mod tests {
             "name": "Alice",
             "keybaseUsername": "alice_keybase",
         });
-        assert_eq!(parse_args(matches), expected);
+        assert_eq!(parse_args(&matches), expected);
     }
 
     #[test]

cli/src/vote.rs

@@ -6,7 +6,6 @@ use crate::{
     },
     memo::WithMemo,
     spend_utils::{resolve_spend_tx_and_check_account_balance, SpendAmount},
-    stake::check_current_authority,
 };
 use clap::{value_t_or_exit, App, Arg, ArgMatches, SubCommand};
 use solana_clap_utils::{
@@ -56,15 +55,6 @@ impl VoteSubCommands for App<'_, '_> {
                         .validator(is_valid_signer)
                         .help("Keypair of validator that will vote with this account"),
                 )
-                .arg(
-                    pubkey!(Arg::with_name("authorized_withdrawer")
-                        .index(3)
-                        .value_name("WITHDRAWER_PUBKEY")
-                        .takes_value(true)
-                        .required(true)
-                        .long("authorized-withdrawer"),
-                        "Public key of the authorized withdrawer")
-                )
                 .arg(
                     Arg::with_name("commission")
                         .long("commission")
@@ -80,12 +70,10 @@ impl VoteSubCommands for App<'_, '_> {
                         "Public key of the authorized voter [default: validator identity pubkey]. "),
                 )
                 .arg(
-                    Arg::with_name("allow_unsafe_authorized_withdrawer")
-                        .long("allow-unsafe-authorized-withdrawer")
-                        .takes_value(false)
-                        .help("Allow an authorized withdrawer pubkey to be identical to the validator identity \
-                               account pubkey or vote account pubkey, which is normally an unsafe \
-                               configuration and should be avoided."),
+                    pubkey!(Arg::with_name("authorized_withdrawer")
+                        .long("authorized-withdrawer")
+                        .value_name("WITHDRAWER_PUBKEY"),
+                        "Public key of the authorized withdrawer [default: validator identity pubkey]. "),
                 )
                 .arg(
                     Arg::with_name("seed")
@@ -94,7 +82,7 @@ impl VoteSubCommands for App<'_, '_> {
                         .takes_value(true)
                         .help("Seed for address generation; if specified, the resulting account will be at a derived address of the VOTE ACCOUNT pubkey")
                 )
-                .arg(memo_arg())
+		.arg(memo_arg())
         )
         .subcommand(
             SubCommand::with_name("vote-authorize-voter")
@@ -121,7 +109,7 @@ impl VoteSubCommands for App<'_, '_> {
                         .required(true),
                         "New authorized vote signer. "),
                 )
-                .arg(memo_arg())
+		.arg(memo_arg())
         )
         .subcommand(
             SubCommand::with_name("vote-authorize-withdrawer")
@@ -148,65 +136,7 @@ impl VoteSubCommands for App<'_, '_> {
                         .required(true),
                         "New authorized withdrawer. "),
                 )
-                .arg(memo_arg())
-        )
-        .subcommand(
-            SubCommand::with_name("vote-authorize-voter-checked")
-                .about("Authorize a new vote signing keypair for the given vote account, \
-                    checking the new authority as a signer")
-                .arg(
-                    pubkey!(Arg::with_name("vote_account_pubkey")
-                        .index(1)
-                        .value_name("VOTE_ACCOUNT_ADDRESS")
-                        .required(true),
-                        "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")
-                        .index(3)
-                        .value_name("NEW_AUTHORIZED_KEYPAIR")
-                        .required(true)
-                        .validator(is_valid_signer)
-                        .help("New authorized vote signer."),
-                )
-                .arg(memo_arg())
-        )
-        .subcommand(
-            SubCommand::with_name("vote-authorize-withdrawer-checked")
-                .about("Authorize a new withdraw signing keypair for the given vote account, \
-                    checking the new authority as a signer")
-                .arg(
-                    pubkey!(Arg::with_name("vote_account_pubkey")
-                        .index(1)
-                        .value_name("VOTE_ACCOUNT_ADDRESS")
-                        .required(true),
-                        "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")
-                        .index(3)
-                        .value_name("NEW_AUTHORIZED_KEYPAIR")
-                        .required(true)
-                        .validator(is_valid_signer)
-                        .help("New authorized withdrawer."),
-                )
-                .arg(memo_arg())
+		.arg(memo_arg())
         )
         .subcommand(
             SubCommand::with_name("vote-update-validator")
@@ -236,7 +166,7 @@ impl VoteSubCommands for App<'_, '_> {
                         .validator(is_valid_signer)
                         .help("Authorized withdrawer keypair"),
                 )
-                .arg(memo_arg())
+		.arg(memo_arg())
         )
         .subcommand(
             SubCommand::with_name("vote-update-commission")
@@ -266,7 +196,7 @@ impl VoteSubCommands for App<'_, '_> {
                         .validator(is_valid_signer)
                         .help("Authorized withdrawer keypair"),
                 )
-                .arg(memo_arg())
+		.arg(memo_arg())
         )
         .subcommand(
             SubCommand::with_name("vote-account")
@@ -336,7 +266,7 @@ impl VoteSubCommands for App<'_, '_> {
                         .validator(is_valid_signer)
                         .help("Authorized withdrawer [default: cli config keypair]"),
                 )
-                .arg(memo_arg())
+		.arg(memo_arg())
         )
     }
 }
@@ -352,28 +282,9 @@ pub fn parse_create_vote_account(
         signer_of(matches, "identity_account", wallet_manager)?;
     let commission = value_t_or_exit!(matches, "commission", u8);
     let authorized_voter = pubkey_of_signer(matches, "authorized_voter", wallet_manager)?;
-    let authorized_withdrawer =
-        pubkey_of_signer(matches, "authorized_withdrawer", wallet_manager)?.unwrap();
-    let allow_unsafe = matches.is_present("allow_unsafe_authorized_withdrawer");
+    let authorized_withdrawer = pubkey_of_signer(matches, "authorized_withdrawer", wallet_manager)?;
     let memo = matches.value_of(MEMO_ARG.name).map(String::from);
 
-    if !allow_unsafe {
-        if authorized_withdrawer == vote_account_pubkey.unwrap() {
-            return Err(CliError::BadParameter(
-                "Authorized withdrawer pubkey is identical to vote \
-                                               account pubkey, an unsafe configuration"
-                    .to_owned(),
-            ));
-        }
-        if authorized_withdrawer == identity_pubkey.unwrap() {
-            return Err(CliError::BadParameter(
-                "Authorized withdrawer pubkey is identical to identity \
-                                               account pubkey, an unsafe configuration"
-                    .to_owned(),
-            ));
-        }
-    }
-
     let payer_provided = None;
     let signer_info = default_signer.generate_unique_signers(
         vec![payer_provided, vote_account, identity_account],
@@ -400,25 +311,19 @@ pub fn parse_vote_authorize(
     default_signer: &DefaultSigner,
     wallet_manager: &mut Option<Arc<RemoteWalletManager>>,
     vote_authorize: VoteAuthorize,
-    checked: bool,
 ) -> Result<CliCommandInfo, CliError> {
     let vote_account_pubkey =
         pubkey_of_signer(matches, "vote_account_pubkey", wallet_manager)?.unwrap();
-    let (authorized, authorized_pubkey) = signer_of(matches, "authorized", wallet_manager)?;
+    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 mut signers = vec![payer_provided, authorized];
-
-    let new_authorized_pubkey = if checked {
-        let (new_authorized_signer, new_authorized_pubkey) =
-            signer_of(matches, "new_authorized", wallet_manager)?;
-        signers.push(new_authorized_signer);
-        new_authorized_pubkey.unwrap()
-    } else {
-        pubkey_of_signer(matches, "new_authorized_pubkey", wallet_manager)?.unwrap()
-    };
-
-    let signer_info = default_signer.generate_unique_signers(signers, matches, wallet_manager)?;
+    let signer_info = default_signer.generate_unique_signers(
+        vec![payer_provided, authorized],
+        matches,
+        wallet_manager,
+    )?;
     let memo = matches.value_of(MEMO_ARG.name).map(String::from);
 
     Ok(CliCommandInfo {
@@ -427,12 +332,6 @@ pub fn parse_vote_authorize(
             new_authorized_pubkey,
             vote_authorize,
             memo,
-            authorized: signer_info.index_of(authorized_pubkey).unwrap(),
-            new_authorized: if checked {
-                signer_info.index_of(Some(new_authorized_pubkey))
-            } else {
-                None
-            },
         },
         signers: signer_info.signers,
     })
@@ -562,14 +461,14 @@ pub fn process_create_vote_account(
     seed: &Option<String>,
     identity_account: SignerIndex,
     authorized_voter: &Option<Pubkey>,
-    authorized_withdrawer: Pubkey,
+    authorized_withdrawer: &Option<Pubkey>,
     commission: u8,
     memo: Option<&String>,
 ) -> ProcessResult {
     let vote_account = config.signers[vote_account];
     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())?
+        Pubkey::create_with_seed(&vote_account_pubkey, &seed, &solana_vote_program::id())?
     } else {
         vote_account_pubkey
     };
@@ -594,7 +493,7 @@ pub fn process_create_vote_account(
         let vote_init = VoteInit {
             node_pubkey: identity_pubkey,
             authorized_voter: authorized_voter.unwrap_or(identity_pubkey),
-            authorized_withdrawer,
+            authorized_withdrawer: authorized_withdrawer.unwrap_or(identity_pubkey),
             commission,
         };
 
@@ -650,7 +549,7 @@ pub fn process_create_vote_account(
     let mut tx = Transaction::new_unsigned(message);
     tx.try_sign(&config.signers, recent_blockhash)?;
     let result = rpc_client.send_and_confirm_transaction_with_spinner(&tx);
-    log_instruction_custom_error::<SystemError>(result, config)
+    log_instruction_custom_error::<SystemError>(result, &config)
 }
 
 pub fn process_vote_authorize(
@@ -659,54 +558,28 @@ pub fn process_vote_authorize(
     vote_account_pubkey: &Pubkey,
     new_authorized_pubkey: &Pubkey,
     vote_authorize: VoteAuthorize,
-    authorized: SignerIndex,
-    new_authorized: Option<SignerIndex>,
     memo: Option<&String>,
 ) -> ProcessResult {
-    let authorized = config.signers[authorized];
-    let new_authorized_signer = new_authorized.map(|index| config.signers[index]);
+    // 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()),
         (new_authorized_pubkey, "new_authorized_pubkey".to_string()),
     )?;
-
-    let (_, vote_state) = get_vote_account(rpc_client, vote_account_pubkey, config.commitment)?;
-    match vote_authorize {
-        VoteAuthorize::Voter => {
-            let current_authorized_voter = vote_state
-                .authorized_voters()
-                .last()
-                .ok_or_else(|| {
-                    CliError::RpcRequestError(
-                        "Invalid vote account state; no authorized voters found".to_string(),
-                    )
-                })?
-                .1;
-            check_current_authority(current_authorized_voter, &authorized.pubkey())?
-        }
-        VoteAuthorize::Withdrawer => {
-            check_current_authority(&vote_state.authorized_withdrawer, &authorized.pubkey())?
-        }
-    }
-
     let (recent_blockhash, fee_calculator) = rpc_client.get_recent_blockhash()?;
-    let vote_ix = if new_authorized_signer.is_some() {
-        vote_instruction::authorize_checked(
-            vote_account_pubkey,   // vote account to update
-            &authorized.pubkey(),  // current authorized
-            new_authorized_pubkey, // new vote signer/withdrawer
-            vote_authorize,        // vote or withdraw
-        )
-    } else {
-        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
-        )
-    };
-    let ixs = vec![vote_ix].with_memo(memo);
+    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
+    )]
+    .with_memo(memo);
 
     let message = Message::new(&ixs, Some(&config.signers[0].pubkey()));
     let mut tx = Transaction::new_unsigned(message);
@@ -719,7 +592,7 @@ pub fn process_vote_authorize(
         config.commitment,
     )?;
     let result = rpc_client.send_and_confirm_transaction_with_spinner(&tx);
-    log_instruction_custom_error::<VoteError>(result, config)
+    log_instruction_custom_error::<VoteError>(result, &config)
 }
 
 pub fn process_vote_update_validator(
@@ -756,7 +629,7 @@ pub fn process_vote_update_validator(
         config.commitment,
     )?;
     let result = rpc_client.send_and_confirm_transaction_with_spinner(&tx);
-    log_instruction_custom_error::<VoteError>(result, config)
+    log_instruction_custom_error::<VoteError>(result, &config)
 }
 
 pub fn process_vote_update_commission(
@@ -787,7 +660,7 @@ pub fn process_vote_update_commission(
         config.commitment,
     )?;
     let result = rpc_client.send_and_confirm_transaction_with_spinner(&tx);
-    log_instruction_custom_error::<VoteError>(result, config)
+    log_instruction_custom_error::<VoteError>(result, &config)
 }
 
 fn get_vote_account(
@@ -890,7 +763,7 @@ pub fn process_withdraw_from_vote_account(
     let (recent_blockhash, fee_calculator) = rpc_client.get_recent_blockhash()?;
     let withdraw_authority = config.signers[withdraw_authority];
 
-    let current_balance = rpc_client.get_balance(vote_account_pubkey)?;
+    let current_balance = rpc_client.get_balance(&vote_account_pubkey)?;
     let minimum_balance = rpc_client.get_minimum_balance_for_rent_exemption(VoteState::size_of())?;
 
     let lamports = match withdraw_amount {
@@ -925,13 +798,13 @@ pub fn process_withdraw_from_vote_account(
         config.commitment,
     )?;
     let result = rpc_client.send_and_confirm_transaction_with_spinner(&transaction);
-    log_instruction_custom_error::<VoteError>(result, config)
+    log_instruction_custom_error::<VoteError>(result, &config)
 }
 
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::{clap_app::get_clap_app, cli::parse_command};
+    use crate::cli::{app, parse_command};
     use solana_sdk::signature::{read_keypair_file, write_keypair, Keypair, Signer};
     use tempfile::NamedTempFile;
 
@@ -942,7 +815,7 @@ mod tests {
 
     #[test]
     fn test_parse_command() {
-        let test_commands = get_clap_app("test", "desc", "version");
+        let test_commands = app("test", "desc", "version");
         let keypair = Keypair::new();
         let pubkey = keypair.pubkey();
         let pubkey_string = pubkey.to_string();
@@ -953,7 +826,10 @@ mod tests {
         let default_keypair = Keypair::new();
         let (default_keypair_file, mut tmp_file) = make_tmp_file();
         write_keypair(&default_keypair, tmp_file.as_file_mut()).unwrap();
-        let default_signer = DefaultSigner::new("", &default_keypair_file);
+        let default_signer = DefaultSigner {
+            path: default_keypair_file.clone(),
+            arg_name: String::new(),
+        };
 
         let test_authorize_voter = test_commands.clone().get_matches_from(vec![
             "test",
@@ -970,8 +846,6 @@ mod tests {
                     new_authorized_pubkey: pubkey2,
                     vote_authorize: VoteAuthorize::Voter,
                     memo: None,
-                    authorized: 0,
-                    new_authorized: None,
                 },
                 signers: vec![read_keypair_file(&default_keypair_file).unwrap().into()],
             }
@@ -996,8 +870,6 @@ mod tests {
                     new_authorized_pubkey: pubkey2,
                     vote_authorize: VoteAuthorize::Voter,
                     memo: None,
-                    authorized: 1,
-                    new_authorized: None,
                 },
                 signers: vec![
                     read_keypair_file(&default_keypair_file).unwrap().into(),
@@ -1006,84 +878,18 @@ mod tests {
             }
         );
 
-        let (voter_keypair_file, mut tmp_file) = make_tmp_file();
-        let voter_keypair = Keypair::new();
-        write_keypair(&voter_keypair, tmp_file.as_file_mut()).unwrap();
-
-        let test_authorize_voter = test_commands.clone().get_matches_from(vec![
-            "test",
-            "vote-authorize-voter-checked",
-            &pubkey_string,
-            &default_keypair_file,
-            &voter_keypair_file,
-        ]);
-        assert_eq!(
-            parse_command(&test_authorize_voter, &default_signer, &mut None).unwrap(),
-            CliCommandInfo {
-                command: CliCommand::VoteAuthorize {
-                    vote_account_pubkey: pubkey,
-                    new_authorized_pubkey: voter_keypair.pubkey(),
-                    vote_authorize: VoteAuthorize::Voter,
-                    memo: None,
-                    authorized: 0,
-                    new_authorized: Some(1),
-                },
-                signers: vec![
-                    read_keypair_file(&default_keypair_file).unwrap().into(),
-                    read_keypair_file(&voter_keypair_file).unwrap().into()
-                ],
-            }
-        );
-
-        let test_authorize_voter = test_commands.clone().get_matches_from(vec![
-            "test",
-            "vote-authorize-voter-checked",
-            &pubkey_string,
-            &authorized_keypair_file,
-            &voter_keypair_file,
-        ]);
-        assert_eq!(
-            parse_command(&test_authorize_voter, &default_signer, &mut None).unwrap(),
-            CliCommandInfo {
-                command: CliCommand::VoteAuthorize {
-                    vote_account_pubkey: pubkey,
-                    new_authorized_pubkey: voter_keypair.pubkey(),
-                    vote_authorize: VoteAuthorize::Voter,
-                    memo: None,
-                    authorized: 1,
-                    new_authorized: Some(2),
-                },
-                signers: vec![
-                    read_keypair_file(&default_keypair_file).unwrap().into(),
-                    read_keypair_file(&authorized_keypair_file).unwrap().into(),
-                    read_keypair_file(&voter_keypair_file).unwrap().into(),
-                ],
-            }
-        );
-
-        let test_authorize_voter = test_commands.clone().get_matches_from(vec![
-            "test",
-            "vote-authorize-voter-checked",
-            &pubkey_string,
-            &authorized_keypair_file,
-            &pubkey2_string,
-        ]);
-        assert!(parse_command(&test_authorize_voter, &default_signer, &mut None).is_err());
-
         let (keypair_file, mut tmp_file) = make_tmp_file();
         let keypair = Keypair::new();
         write_keypair(&keypair, tmp_file.as_file_mut()).unwrap();
         // Test CreateVoteAccount SubCommand
         let (identity_keypair_file, mut tmp_file) = make_tmp_file();
         let identity_keypair = Keypair::new();
-        let authorized_withdrawer = Keypair::new().pubkey();
         write_keypair(&identity_keypair, tmp_file.as_file_mut()).unwrap();
         let test_create_vote_account = test_commands.clone().get_matches_from(vec![
             "test",
             "create-vote-account",
             &keypair_file,
             &identity_keypair_file,
-            &authorized_withdrawer.to_string(),
             "--commission",
             "10",
         ]);
@@ -1095,7 +901,7 @@ mod tests {
                     seed: None,
                     identity_account: 2,
                     authorized_voter: None,
-                    authorized_withdrawer,
+                    authorized_withdrawer: None,
                     commission: 10,
                     memo: None,
                 },
@@ -1116,7 +922,6 @@ mod tests {
             "create-vote-account",
             &keypair_file,
             &identity_keypair_file,
-            &authorized_withdrawer.to_string(),
         ]);
         assert_eq!(
             parse_command(&test_create_vote_account2, &default_signer, &mut None).unwrap(),
@@ -1126,7 +931,7 @@ mod tests {
                     seed: None,
                     identity_account: 2,
                     authorized_voter: None,
-                    authorized_withdrawer,
+                    authorized_withdrawer: None,
                     commission: 100,
                     memo: None,
                 },
@@ -1149,7 +954,6 @@ mod tests {
             "create-vote-account",
             &keypair_file,
             &identity_keypair_file,
-            &authorized_withdrawer.to_string(),
             "--authorized-voter",
             &authed.to_string(),
         ]);
@@ -1161,7 +965,7 @@ mod tests {
                     seed: None,
                     identity_account: 2,
                     authorized_voter: Some(authed),
-                    authorized_withdrawer,
+                    authorized_withdrawer: None,
                     commission: 100,
                     memo: None,
                 },
@@ -1176,14 +980,14 @@ mod tests {
         let (keypair_file, mut tmp_file) = make_tmp_file();
         let keypair = Keypair::new();
         write_keypair(&keypair, tmp_file.as_file_mut()).unwrap();
-        // succeed even though withdrawer unsafe (because forcefully allowed)
+        // test init with an authed withdrawer
         let test_create_vote_account4 = test_commands.clone().get_matches_from(vec![
             "test",
             "create-vote-account",
             &keypair_file,
             &identity_keypair_file,
-            &identity_keypair_file,
-            "--allow-unsafe-authorized-withdrawer",
+            "--authorized-withdrawer",
+            &authed.to_string(),
         ]);
         assert_eq!(
             parse_command(&test_create_vote_account4, &default_signer, &mut None).unwrap(),
@@ -1193,7 +997,7 @@ mod tests {
                     seed: None,
                     identity_account: 2,
                     authorized_voter: None,
-                    authorized_withdrawer: identity_keypair.pubkey(),
+                    authorized_withdrawer: Some(authed),
                     commission: 100,
                     memo: None,
                 },

cli/src/wallet.rs

@@ -1,744 +0,0 @@
-use crate::{
-    cli::{
-        log_instruction_custom_error, request_and_confirm_airdrop, CliCommand, CliCommandInfo,
-        CliConfig, CliError, ProcessResult,
-    },
-    memo::WithMemo,
-    nonce::check_nonce_account,
-    spend_utils::{resolve_spend_tx_and_check_account_balances, SpendAmount},
-};
-use clap::{value_t_or_exit, App, Arg, ArgMatches, SubCommand};
-use solana_account_decoder::{UiAccount, UiAccountEncoding};
-use solana_clap_utils::{
-    fee_payer::*,
-    input_parsers::*,
-    input_validators::*,
-    keypair::{DefaultSigner, SignerIndex},
-    memo::*,
-    nonce::*,
-    offline::*,
-};
-use solana_cli_output::{
-    display::build_balance_message, return_signers_with_config, CliAccount,
-    CliSignatureVerificationStatus, CliTransaction, CliTransactionConfirmation, OutputFormat,
-    ReturnSignersConfig,
-};
-use solana_client::{
-    blockhash_query::BlockhashQuery, nonce_utils, rpc_client::RpcClient,
-    rpc_config::RpcTransactionConfig, rpc_response::RpcKeyedAccount,
-};
-use solana_remote_wallet::remote_wallet::RemoteWalletManager;
-use solana_sdk::{
-    commitment_config::CommitmentConfig,
-    message::Message,
-    pubkey::Pubkey,
-    signature::Signature,
-    stake,
-    system_instruction::{self, SystemError},
-    system_program,
-    transaction::Transaction,
-};
-use solana_transaction_status::{EncodedTransaction, UiTransactionEncoding};
-use std::{fmt::Write as FmtWrite, fs::File, io::Write, sync::Arc};
-
-pub trait WalletSubCommands {
-    fn wallet_subcommands(self) -> Self;
-}
-
-impl WalletSubCommands for App<'_, '_> {
-    fn wallet_subcommands(self) -> Self {
-        self.subcommand(
-            SubCommand::with_name("account")
-                .about("Show the contents of an account")
-                .alias("account")
-                .arg(
-                    pubkey!(Arg::with_name("account_pubkey")
-                        .index(1)
-                        .value_name("ACCOUNT_ADDRESS")
-                        .required(true),
-                        "Account key URI. ")
-                )
-                .arg(
-                    Arg::with_name("output_file")
-                        .long("output-file")
-                        .short("o")
-                        .value_name("FILEPATH")
-                        .takes_value(true)
-                        .help("Write the account data to this file"),
-                )
-                .arg(
-                    Arg::with_name("lamports")
-                        .long("lamports")
-                        .takes_value(false)
-                        .help("Display balance in lamports instead of SOL"),
-                ),
-        )
-        .subcommand(
-            SubCommand::with_name("address")
-                .about("Get your public key")
-                .arg(
-                    Arg::with_name("confirm_key")
-                        .long("confirm-key")
-                        .takes_value(false)
-                        .help("Confirm key on device; only relevant if using remote wallet"),
-                ),
-        )
-        .subcommand(
-            SubCommand::with_name("airdrop")
-                .about("Request SOL from a faucet")
-                .arg(
-                    Arg::with_name("amount")
-                        .index(1)
-                        .value_name("AMOUNT")
-                        .takes_value(true)
-                        .validator(is_amount)
-                        .required(true)
-                        .help("The airdrop amount to request, in SOL"),
-                )
-                .arg(
-                    pubkey!(Arg::with_name("to")
-                        .index(2)
-                        .value_name("RECIPIENT_ADDRESS"),
-                        "The account address of airdrop recipient. "),
-                ),
-        )
-        .subcommand(
-            SubCommand::with_name("balance")
-                .about("Get your balance")
-                .arg(
-                    pubkey!(Arg::with_name("pubkey")
-                        .index(1)
-                        .value_name("ACCOUNT_ADDRESS"),
-                        "The account address of the balance to check. ")
-                )
-                .arg(
-                    Arg::with_name("lamports")
-                        .long("lamports")
-                        .takes_value(false)
-                        .help("Display balance in lamports instead of SOL"),
-                ),
-        )
-        .subcommand(
-            SubCommand::with_name("confirm")
-                .about("Confirm transaction by signature")
-                .arg(
-                    Arg::with_name("signature")
-                        .index(1)
-                        .value_name("TRANSACTION_SIGNATURE")
-                        .takes_value(true)
-                        .required(true)
-                        .help("The transaction signature to confirm"),
-                )
-                .after_help(// Formatted specifically for the manually-indented heredoc string
-                   "Note: This will show more detailed information for finalized transactions with verbose mode (-v/--verbose).\
-                  \n\
-                  \nAccount modes:\
-                  \n  |srwx|\
-                  \n    s: signed\
-                  \n    r: readable (always true)\
-                  \n    w: writable\
-                  \n    x: program account (inner instructions excluded)\
-                   "
-                ),
-        )
-        .subcommand(
-            SubCommand::with_name("create-address-with-seed")
-                .about("Generate a derived account address with a seed")
-                .arg(
-                    Arg::with_name("seed")
-                        .index(1)
-                        .value_name("SEED_STRING")
-                        .takes_value(true)
-                        .required(true)
-                        .validator(is_derived_address_seed)
-                        .help("The seed.  Must not take more than 32 bytes to encode as utf-8"),
-                )
-                .arg(
-                    Arg::with_name("program_id")
-                        .index(2)
-                        .value_name("PROGRAM_ID")
-                        .takes_value(true)
-                        .required(true)
-                        .help(
-                            "The program_id that the address will ultimately be used for, \n\
-                             or one of NONCE, STAKE, and VOTE keywords",
-                        ),
-                )
-                .arg(
-                    pubkey!(Arg::with_name("from")
-                        .long("from")
-                        .value_name("FROM_PUBKEY")
-                        .required(false),
-                        "From (base) key, [default: cli config keypair]. "),
-                ),
-        )
-        .subcommand(
-            SubCommand::with_name("decode-transaction")
-                .about("Decode a serialized transaction")
-                .arg(
-                    Arg::with_name("transaction")
-                        .index(1)
-                        .value_name("TRANSACTION")
-                        .takes_value(true)
-                        .required(true)
-                        .help("transaction to decode"),
-                )
-                .arg(
-                    Arg::with_name("encoding")
-                        .index(2)
-                        .value_name("ENCODING")
-                        .possible_values(&["base58", "base64"]) // Subset of `UiTransactionEncoding` enum
-                        .default_value("base58")
-                        .takes_value(true)
-                        .required(true)
-                        .help("transaction encoding"),
-                ),
-        )
-        .subcommand(
-            SubCommand::with_name("resolve-signer")
-                .about("Checks that a signer is valid, and returns its specific path; useful for signers that may be specified generally, eg. usb://ledger")
-                .arg(
-                    Arg::with_name("signer")
-                        .index(1)
-                        .value_name("SIGNER_KEYPAIR")
-                        .takes_value(true)
-                        .required(true)
-                        .validator(is_valid_signer)
-                        .help("The signer path to resolve")
-                )
-        )
-        .subcommand(
-            SubCommand::with_name("transfer")
-                .about("Transfer funds between system accounts")
-                .alias("pay")
-                .arg(
-                    pubkey!(Arg::with_name("to")
-                        .index(1)
-                        .value_name("RECIPIENT_ADDRESS")
-                        .required(true),
-                        "The account address of recipient. "),
-                )
-                .arg(
-                    Arg::with_name("amount")
-                        .index(2)
-                        .value_name("AMOUNT")
-                        .takes_value(true)
-                        .validator(is_amount_or_all)
-                        .required(true)
-                        .help("The amount to send, in SOL; accepts keyword ALL"),
-                )
-                .arg(
-                    pubkey!(Arg::with_name("from")
-                        .long("from")
-                        .value_name("FROM_ADDRESS"),
-                        "Source account of funds (if different from client local account). "),
-                )
-                .arg(
-                    Arg::with_name("no_wait")
-                        .long("no-wait")
-                        .takes_value(false)
-                        .help("Return signature immediately after submitting the transaction, instead of waiting for confirmations"),
-                )
-                .arg(
-                    Arg::with_name("derived_address_seed")
-                        .long("derived-address-seed")
-                        .takes_value(true)
-                        .value_name("SEED_STRING")
-                        .requires("derived_address_program_id")
-                        .validator(is_derived_address_seed)
-                        .hidden(true)
-                )
-                .arg(
-                    Arg::with_name("derived_address_program_id")
-                        .long("derived-address-program-id")
-                        .takes_value(true)
-                        .value_name("PROGRAM_ID")
-                        .requires("derived_address_seed")
-                        .hidden(true)
-                )
-                .arg(
-                    Arg::with_name("allow_unfunded_recipient")
-                        .long("allow-unfunded-recipient")
-                        .takes_value(false)
-                        .help("Complete the transfer even if the recipient address is not funded")
-                )
-                .offline_args()
-                .nonce_args(false)
-                .arg(memo_arg())
-                .arg(fee_payer_arg()),
-        )
-    }
-}
-
-fn resolve_derived_address_program_id(matches: &ArgMatches<'_>, arg_name: &str) -> Option<Pubkey> {
-    matches.value_of(arg_name).and_then(|v| match v {
-        "NONCE" => Some(system_program::id()),
-        "STAKE" => Some(stake::program::id()),
-        "VOTE" => Some(solana_vote_program::id()),
-        _ => pubkey_of(matches, arg_name),
-    })
-}
-
-pub fn parse_account(
-    matches: &ArgMatches<'_>,
-    wallet_manager: &mut Option<Arc<RemoteWalletManager>>,
-) -> Result<CliCommandInfo, CliError> {
-    let account_pubkey = pubkey_of_signer(matches, "account_pubkey", wallet_manager)?.unwrap();
-    let output_file = matches.value_of("output_file");
-    let use_lamports_unit = matches.is_present("lamports");
-    Ok(CliCommandInfo {
-        command: CliCommand::ShowAccount {
-            pubkey: account_pubkey,
-            output_file: output_file.map(ToString::to_string),
-            use_lamports_unit,
-        },
-        signers: vec![],
-    })
-}
-
-pub fn parse_airdrop(
-    matches: &ArgMatches<'_>,
-    default_signer: &DefaultSigner,
-    wallet_manager: &mut Option<Arc<RemoteWalletManager>>,
-) -> Result<CliCommandInfo, CliError> {
-    let pubkey = pubkey_of_signer(matches, "to", wallet_manager)?;
-    let signers = if pubkey.is_some() {
-        vec![]
-    } else {
-        vec![default_signer.signer_from_path(matches, wallet_manager)?]
-    };
-    let lamports = lamports_of_sol(matches, "amount").unwrap();
-    Ok(CliCommandInfo {
-        command: CliCommand::Airdrop { pubkey, lamports },
-        signers,
-    })
-}
-
-pub fn parse_balance(
-    matches: &ArgMatches<'_>,
-    default_signer: &DefaultSigner,
-    wallet_manager: &mut Option<Arc<RemoteWalletManager>>,
-) -> Result<CliCommandInfo, CliError> {
-    let pubkey = pubkey_of_signer(matches, "pubkey", wallet_manager)?;
-    let signers = if pubkey.is_some() {
-        vec![]
-    } else {
-        vec![default_signer.signer_from_path(matches, wallet_manager)?]
-    };
-    Ok(CliCommandInfo {
-        command: CliCommand::Balance {
-            pubkey,
-            use_lamports_unit: matches.is_present("lamports"),
-        },
-        signers,
-    })
-}
-
-pub fn parse_decode_transaction(matches: &ArgMatches<'_>) -> Result<CliCommandInfo, CliError> {
-    let blob = value_t_or_exit!(matches, "transaction", String);
-    let encoding = match matches.value_of("encoding").unwrap() {
-        "base58" => UiTransactionEncoding::Base58,
-        "base64" => UiTransactionEncoding::Base64,
-        _ => unreachable!(),
-    };
-
-    let encoded_transaction = EncodedTransaction::Binary(blob, encoding);
-    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(),
-        ))
-    }
-}
-
-pub fn parse_create_address_with_seed(
-    matches: &ArgMatches<'_>,
-    default_signer: &DefaultSigner,
-    wallet_manager: &mut Option<Arc<RemoteWalletManager>>,
-) -> Result<CliCommandInfo, CliError> {
-    let from_pubkey = pubkey_of_signer(matches, "from", wallet_manager)?;
-    let signers = if from_pubkey.is_some() {
-        vec![]
-    } else {
-        vec![default_signer.signer_from_path(matches, wallet_manager)?]
-    };
-
-    let program_id = resolve_derived_address_program_id(matches, "program_id").unwrap();
-
-    let seed = matches.value_of("seed").unwrap().to_string();
-
-    Ok(CliCommandInfo {
-        command: CliCommand::CreateAddressWithSeed {
-            from_pubkey,
-            seed,
-            program_id,
-        },
-        signers,
-    })
-}
-
-pub fn parse_transfer(
-    matches: &ArgMatches<'_>,
-    default_signer: &DefaultSigner,
-    wallet_manager: &mut Option<Arc<RemoteWalletManager>>,
-) -> Result<CliCommandInfo, CliError> {
-    let amount = SpendAmount::new_from_matches(matches, "amount");
-    let to = pubkey_of_signer(matches, "to", wallet_manager)?.unwrap();
-    let sign_only = matches.is_present(SIGN_ONLY_ARG.name);
-    let dump_transaction_message = matches.is_present(DUMP_TRANSACTION_MESSAGE.name);
-    let no_wait = matches.is_present("no_wait");
-    let blockhash_query = BlockhashQuery::new_from_matches(matches);
-    let nonce_account = pubkey_of_signer(matches, NONCE_ARG.name, wallet_manager)?;
-    let (nonce_authority, nonce_authority_pubkey) =
-        signer_of(matches, NONCE_AUTHORITY_ARG.name, wallet_manager)?;
-    let memo = matches.value_of(MEMO_ARG.name).map(String::from);
-    let (fee_payer, fee_payer_pubkey) = signer_of(matches, FEE_PAYER_ARG.name, wallet_manager)?;
-    let (from, from_pubkey) = signer_of(matches, "from", wallet_manager)?;
-    let allow_unfunded_recipient = matches.is_present("allow_unfunded_recipient");
-
-    let mut bulk_signers = vec![fee_payer, from];
-    if nonce_account.is_some() {
-        bulk_signers.push(nonce_authority);
-    }
-
-    let signer_info =
-        default_signer.generate_unique_signers(bulk_signers, matches, wallet_manager)?;
-
-    let derived_address_seed = matches
-        .value_of("derived_address_seed")
-        .map(|s| s.to_string());
-    let derived_address_program_id =
-        resolve_derived_address_program_id(matches, "derived_address_program_id");
-
-    Ok(CliCommandInfo {
-        command: CliCommand::Transfer {
-            amount,
-            to,
-            sign_only,
-            dump_transaction_message,
-            allow_unfunded_recipient,
-            no_wait,
-            blockhash_query,
-            nonce_account,
-            nonce_authority: signer_info.index_of(nonce_authority_pubkey).unwrap(),
-            memo,
-            fee_payer: signer_info.index_of(fee_payer_pubkey).unwrap(),
-            from: signer_info.index_of(from_pubkey).unwrap(),
-            derived_address_seed,
-            derived_address_program_id,
-        },
-        signers: signer_info.signers,
-    })
-}
-
-pub fn process_show_account(
-    rpc_client: &RpcClient,
-    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: UiAccount::encode(
-                account_pubkey,
-                &account,
-                UiAccountEncoding::Base64,
-                None,
-                None,
-            ),
-        },
-        use_lamports_unit,
-    };
-
-    let mut account_string = config.output_format.formatted_string(&cli_account);
-
-    if config.output_format == OutputFormat::Display
-        || config.output_format == OutputFormat::DisplayVerbose
-    {
-        if let Some(output_file) = output_file {
-            let mut f = File::create(output_file)?;
-            f.write_all(&data)?;
-            writeln!(&mut account_string)?;
-            writeln!(&mut account_string, "Wrote account data to {}", output_file)?;
-        } else if !data.is_empty() {
-            use pretty_hex::*;
-            writeln!(&mut account_string, "{:?}", data.hex_dump())?;
-        }
-    }
-
-    Ok(account_string)
-}
-
-pub fn process_airdrop(
-    rpc_client: &RpcClient,
-    config: &CliConfig,
-    pubkey: &Option<Pubkey>,
-    lamports: u64,
-) -> ProcessResult {
-    let pubkey = if let Some(pubkey) = pubkey {
-        *pubkey
-    } else {
-        config.pubkey()?
-    };
-    println!(
-        "Requesting airdrop of {}",
-        build_balance_message(lamports, false, true),
-    );
-
-    let pre_balance = rpc_client.get_balance(&pubkey)?;
-
-    let result = request_and_confirm_airdrop(rpc_client, config, &pubkey, lamports);
-    if let Ok(signature) = result {
-        let signature_cli_message = log_instruction_custom_error::<SystemError>(result, config)?;
-        println!("{}", signature_cli_message);
-
-        let current_balance = rpc_client.get_balance(&pubkey)?;
-
-        if current_balance < pre_balance.saturating_add(lamports) {
-            println!("Balance unchanged");
-            println!("Run `solana confirm -v {:?}` for more info", signature);
-            Ok("".to_string())
-        } else {
-            Ok(build_balance_message(current_balance, false, true))
-        }
-    } else {
-        log_instruction_custom_error::<SystemError>(result, config)
-    }
-}
-
-pub fn process_balance(
-    rpc_client: &RpcClient,
-    config: &CliConfig,
-    pubkey: &Option<Pubkey>,
-    use_lamports_unit: bool,
-) -> ProcessResult {
-    let pubkey = if let Some(pubkey) = pubkey {
-        *pubkey
-    } else {
-        config.pubkey()?
-    };
-    let balance = rpc_client.get_balance(&pubkey)?;
-    Ok(build_balance_message(balance, use_lamports_unit, true))
-}
-
-pub fn process_confirm(
-    rpc_client: &RpcClient,
-    config: &CliConfig,
-    signature: &Signature,
-) -> ProcessResult {
-    match rpc_client.get_signature_statuses_with_history(&[*signature]) {
-        Ok(status) => {
-            let cli_transaction = if let Some(transaction_status) = &status.value[0] {
-                let mut transaction = None;
-                let mut get_transaction_error = None;
-                if config.verbose {
-                    match rpc_client.get_transaction_with_config(
-                        signature,
-                        RpcTransactionConfig {
-                            encoding: Some(UiTransactionEncoding::Base64),
-                            commitment: Some(CommitmentConfig::confirmed()),
-                        },
-                    ) {
-                        Ok(confirmed_transaction) => {
-                            let decoded_transaction = confirmed_transaction
-                                .transaction
-                                .transaction
-                                .decode()
-                                .expect("Successful decode");
-                            let json_transaction = EncodedTransaction::encode(
-                                decoded_transaction.clone(),
-                                UiTransactionEncoding::Json,
-                            );
-
-                            transaction = Some(CliTransaction {
-                                transaction: json_transaction,
-                                meta: confirmed_transaction.transaction.meta,
-                                block_time: confirmed_transaction.block_time,
-                                slot: Some(confirmed_transaction.slot),
-                                decoded_transaction,
-                                prefix: "  ".to_string(),
-                                sigverify_status: vec![],
-                            });
-                        }
-                        Err(err) => {
-                            get_transaction_error = Some(format!("{:?}", err));
-                        }
-                    }
-                }
-                CliTransactionConfirmation {
-                    confirmation_status: Some(transaction_status.confirmation_status()),
-                    transaction,
-                    get_transaction_error,
-                    err: transaction_status.err.clone(),
-                }
-            } else {
-                CliTransactionConfirmation {
-                    confirmation_status: None,
-                    transaction: None,
-                    get_transaction_error: None,
-                    err: None,
-                }
-            };
-            Ok(config.output_format.formatted_string(&cli_transaction))
-        }
-        Err(err) => Err(CliError::RpcRequestError(format!("Unable to confirm: {}", err)).into()),
-    }
-}
-
-#[allow(clippy::unnecessary_wraps)]
-pub fn process_decode_transaction(config: &CliConfig, transaction: &Transaction) -> ProcessResult {
-    let sigverify_status = CliSignatureVerificationStatus::verify_transaction(transaction);
-    let decode_transaction = CliTransaction {
-        decoded_transaction: transaction.clone(),
-        transaction: EncodedTransaction::encode(transaction.clone(), UiTransactionEncoding::Json),
-        meta: None,
-        block_time: None,
-        slot: None,
-        prefix: "".to_string(),
-        sigverify_status,
-    };
-    Ok(config.output_format.formatted_string(&decode_transaction))
-}
-
-pub fn process_create_address_with_seed(
-    config: &CliConfig,
-    from_pubkey: Option<&Pubkey>,
-    seed: &str,
-    program_id: &Pubkey,
-) -> ProcessResult {
-    let from_pubkey = if let Some(pubkey) = from_pubkey {
-        *pubkey
-    } else {
-        config.pubkey()?
-    };
-    let address = Pubkey::create_with_seed(&from_pubkey, seed, program_id)?;
-    Ok(address.to_string())
-}
-
-#[allow(clippy::too_many_arguments)]
-pub fn process_transfer(
-    rpc_client: &RpcClient,
-    config: &CliConfig,
-    amount: SpendAmount,
-    to: &Pubkey,
-    from: SignerIndex,
-    sign_only: bool,
-    dump_transaction_message: bool,
-    allow_unfunded_recipient: bool,
-    no_wait: bool,
-    blockhash_query: &BlockhashQuery,
-    nonce_account: Option<&Pubkey>,
-    nonce_authority: SignerIndex,
-    memo: Option<&String>,
-    fee_payer: SignerIndex,
-    derived_address_seed: Option<String>,
-    derived_address_program_id: Option<&Pubkey>,
-) -> ProcessResult {
-    let from = config.signers[from];
-    let mut from_pubkey = from.pubkey();
-
-    let (recent_blockhash, fee_calculator) =
-        blockhash_query.get_blockhash_and_fee_calculator(rpc_client, config.commitment)?;
-
-    if !sign_only && !allow_unfunded_recipient {
-        let recipient_balance = rpc_client
-            .get_balance_with_commitment(to, config.commitment)?
-            .value;
-        if recipient_balance == 0 {
-            return Err(format!(
-                "The recipient address ({}) is not funded. \
-                                Add `--allow-unfunded-recipient` to complete the transfer \
-                               ",
-                to
-            )
-            .into());
-        }
-    }
-
-    let nonce_authority = config.signers[nonce_authority];
-    let fee_payer = config.signers[fee_payer];
-
-    let derived_parts = derived_address_seed.zip(derived_address_program_id);
-    let with_seed = if let Some((seed, program_id)) = derived_parts {
-        let base_pubkey = from_pubkey;
-        from_pubkey = Pubkey::create_with_seed(&base_pubkey, &seed, program_id)?;
-        Some((base_pubkey, seed, program_id, from_pubkey))
-    } else {
-        None
-    };
-
-    let build_message = |lamports| {
-        let ixs = if let Some((base_pubkey, seed, program_id, from_pubkey)) = with_seed.as_ref() {
-            vec![system_instruction::transfer_with_seed(
-                from_pubkey,
-                base_pubkey,
-                seed.clone(),
-                program_id,
-                to,
-                lamports,
-            )]
-            .with_memo(memo)
-        } else {
-            vec![system_instruction::transfer(&from_pubkey, to, lamports)].with_memo(memo)
-        };
-
-        if let Some(nonce_account) = &nonce_account {
-            Message::new_with_nonce(
-                ixs,
-                Some(&fee_payer.pubkey()),
-                nonce_account,
-                &nonce_authority.pubkey(),
-            )
-        } else {
-            Message::new(&ixs, Some(&fee_payer.pubkey()))
-        }
-    };
-
-    let (message, _) = resolve_spend_tx_and_check_account_balances(
-        rpc_client,
-        sign_only,
-        amount,
-        &fee_calculator,
-        &from_pubkey,
-        &fee_payer.pubkey(),
-        build_message,
-        config.commitment,
-    )?;
-    let mut tx = Transaction::new_unsigned(message);
-
-    if sign_only {
-        tx.try_partial_sign(&config.signers, recent_blockhash)?;
-        return_signers_with_config(
-            &tx,
-            &config.output_format,
-            &ReturnSignersConfig {
-                dump_transaction_message,
-            },
-        )
-    } else {
-        if let Some(nonce_account) = &nonce_account {
-            let nonce_account = nonce_utils::get_account_with_commitment(
-                rpc_client,
-                nonce_account,
-                config.commitment,
-            )?;
-            check_nonce_account(&nonce_account, &nonce_authority.pubkey(), &recent_blockhash)?;
-        }
-
-        tx.try_sign(&config.signers, recent_blockhash)?;
-        let result = if no_wait {
-            rpc_client.send_transaction(&tx)
-        } else {
-            rpc_client.send_and_confirm_transaction_with_spinner(&tx)
-        };
-        log_instruction_custom_error::<SystemError>(result, config)
-    }
-}

cli/tests/fixtures/build.sh

@@ -5,4 +5,3 @@ cd "$(dirname "$0")"
 
 make -C ../../../programs/bpf/c/
 cp ../../../programs/bpf/c/out/noop.so .
-cat noop.so noop.so noop.so > noop_large.so

cli/tests/nonce.rs

@@ -18,15 +18,13 @@ use solana_sdk::{
     signature::{keypair_from_seed, Keypair, Signer},
     system_program,
 };
-use solana_streamer::socket::SocketAddrSpace;
 
 #[test]
 fn test_nonce() {
     let mint_keypair = Keypair::new();
     let mint_pubkey = mint_keypair.pubkey();
     let faucet_addr = run_local_faucet(mint_keypair, None);
-    let test_validator =
-        TestValidator::with_no_fees(mint_pubkey, Some(faucet_addr), SocketAddrSpace::Unspecified);
+    let test_validator = TestValidator::with_no_fees(mint_pubkey, Some(faucet_addr));
 
     full_battery_tests(test_validator, None, false);
 }
@@ -36,8 +34,7 @@ fn test_nonce_with_seed() {
     let mint_keypair = Keypair::new();
     let mint_pubkey = mint_keypair.pubkey();
     let faucet_addr = run_local_faucet(mint_keypair, None);
-    let test_validator =
-        TestValidator::with_no_fees(mint_pubkey, Some(faucet_addr), SocketAddrSpace::Unspecified);
+    let test_validator = TestValidator::with_no_fees(mint_pubkey, Some(faucet_addr));
 
     full_battery_tests(test_validator, Some(String::from("seed")), false);
 }
@@ -47,8 +44,7 @@ fn test_nonce_with_authority() {
     let mint_keypair = Keypair::new();
     let mint_pubkey = mint_keypair.pubkey();
     let faucet_addr = run_local_faucet(mint_keypair, None);
-    let test_validator =
-        TestValidator::with_no_fees(mint_pubkey, Some(faucet_addr), SocketAddrSpace::Unspecified);
+    let test_validator = TestValidator::with_no_fees(mint_pubkey, Some(faucet_addr));
 
     full_battery_tests(test_validator, None, true);
 }
@@ -220,12 +216,7 @@ fn test_create_account_with_seed() {
     let mint_keypair = Keypair::new();
     let mint_pubkey = mint_keypair.pubkey();
     let faucet_addr = run_local_faucet(mint_keypair, None);
-    let test_validator = TestValidator::with_custom_fees(
-        mint_pubkey,
-        1,
-        Some(faucet_addr),
-        SocketAddrSpace::Unspecified,
-    );
+    let test_validator = TestValidator::with_custom_fees(mint_pubkey, 1, Some(faucet_addr));
 
     let offline_nonce_authority_signer = keypair_from_seed(&[1u8; 32]).unwrap();
     let online_nonce_creator_signer = keypair_from_seed(&[2u8; 32]).unwrap();

cli/tests/program.rs

@@ -15,29 +15,27 @@ use solana_sdk::{
     pubkey::Pubkey,
     signature::{Keypair, Signer},
 };
-use solana_streamer::socket::SocketAddrSpace;
 use std::{env, fs::File, io::Read, path::PathBuf, str::FromStr};
 
 #[test]
 fn test_cli_program_deploy_non_upgradeable() {
     solana_logger::setup();
 
-    let mut noop_path = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
-    noop_path.push("tests");
-    noop_path.push("fixtures");
-    noop_path.push("noop");
-    noop_path.set_extension("so");
+    let mut pathbuf = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
+    pathbuf.push("tests");
+    pathbuf.push("fixtures");
+    pathbuf.push("noop");
+    pathbuf.set_extension("so");
 
     let mint_keypair = Keypair::new();
     let mint_pubkey = mint_keypair.pubkey();
     let faucet_addr = run_local_faucet(mint_keypair, None);
-    let test_validator =
-        TestValidator::with_no_fees(mint_pubkey, Some(faucet_addr), SocketAddrSpace::Unspecified);
+    let test_validator = TestValidator::with_no_fees(mint_pubkey, Some(faucet_addr));
 
     let rpc_client =
         RpcClient::new_with_commitment(test_validator.rpc_url(), CommitmentConfig::processed());
 
-    let mut file = File::open(noop_path.to_str().unwrap()).unwrap();
+    let mut file = File::open(pathbuf.to_str().unwrap()).unwrap();
     let mut program_data = Vec::new();
     file.read_to_end(&mut program_data).unwrap();
     let minimum_balance_for_rent_exemption = rpc_client
@@ -55,7 +53,7 @@ fn test_cli_program_deploy_non_upgradeable() {
     process_command(&config).unwrap();
 
     config.command = CliCommand::Deploy {
-        program_location: noop_path.to_str().unwrap().to_string(),
+        program_location: pathbuf.to_str().unwrap().to_string(),
         address: None,
         use_deprecated_loader: false,
         allow_excessive_balance: false,
@@ -70,12 +68,12 @@ fn test_cli_program_deploy_non_upgradeable() {
         .unwrap()
         .as_str()
         .unwrap();
-    let program_id = Pubkey::from_str(program_id_str).unwrap();
+    let program_id = Pubkey::from_str(&program_id_str).unwrap();
     let account0 = rpc_client.get_account(&program_id).unwrap();
     assert_eq!(account0.lamports, minimum_balance_for_rent_exemption);
     assert_eq!(account0.owner, bpf_loader::id());
-    assert!(account0.executable);
-    let mut file = File::open(noop_path.to_str().unwrap().to_string()).unwrap();
+    assert_eq!(account0.executable, true);
+    let mut file = File::open(pathbuf.to_str().unwrap().to_string()).unwrap();
     let mut elf = Vec::new();
     file.read_to_end(&mut elf).unwrap();
     assert_eq!(account0.data, elf);
@@ -84,7 +82,7 @@ fn test_cli_program_deploy_non_upgradeable() {
     let custom_address_keypair = Keypair::new();
     config.signers = vec![&keypair, &custom_address_keypair];
     config.command = CliCommand::Deploy {
-        program_location: noop_path.to_str().unwrap().to_string(),
+        program_location: pathbuf.to_str().unwrap().to_string(),
         address: Some(1),
         use_deprecated_loader: false,
         allow_excessive_balance: false,
@@ -95,7 +93,7 @@ fn test_cli_program_deploy_non_upgradeable() {
         .unwrap();
     assert_eq!(account1.lamports, minimum_balance_for_rent_exemption);
     assert_eq!(account1.owner, bpf_loader::id());
-    assert!(account1.executable);
+    assert_eq!(account1.executable, true);
     assert_eq!(account1.data, account0.data);
 
     // Attempt to redeploy to the same address
@@ -111,7 +109,7 @@ fn test_cli_program_deploy_non_upgradeable() {
     process_command(&config).unwrap();
     config.signers = vec![&keypair, &custom_address_keypair];
     config.command = CliCommand::Deploy {
-        program_location: noop_path.to_str().unwrap().to_string(),
+        program_location: pathbuf.to_str().unwrap().to_string(),
         address: Some(1),
         use_deprecated_loader: false,
         allow_excessive_balance: false,
@@ -120,7 +118,7 @@ fn test_cli_program_deploy_non_upgradeable() {
 
     // Use forcing parameter to deploy to account with excess balance
     config.command = CliCommand::Deploy {
-        program_location: noop_path.to_str().unwrap().to_string(),
+        program_location: pathbuf.to_str().unwrap().to_string(),
         address: Some(1),
         use_deprecated_loader: false,
         allow_excessive_balance: true,
@@ -131,7 +129,7 @@ fn test_cli_program_deploy_non_upgradeable() {
         .unwrap();
     assert_eq!(account2.lamports, 2 * minimum_balance_for_rent_exemption);
     assert_eq!(account2.owner, bpf_loader::id());
-    assert!(account2.executable);
+    assert_eq!(account2.executable, true);
     assert_eq!(account2.data, account0.data);
 }
 
@@ -139,22 +137,21 @@ fn test_cli_program_deploy_non_upgradeable() {
 fn test_cli_program_deploy_no_authority() {
     solana_logger::setup();
 
-    let mut noop_path = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
-    noop_path.push("tests");
-    noop_path.push("fixtures");
-    noop_path.push("noop");
-    noop_path.set_extension("so");
+    let mut pathbuf = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
+    pathbuf.push("tests");
+    pathbuf.push("fixtures");
+    pathbuf.push("noop");
+    pathbuf.set_extension("so");
 
     let mint_keypair = Keypair::new();
     let mint_pubkey = mint_keypair.pubkey();
     let faucet_addr = run_local_faucet(mint_keypair, None);
-    let test_validator =
-        TestValidator::with_no_fees(mint_pubkey, Some(faucet_addr), SocketAddrSpace::Unspecified);
+    let test_validator = TestValidator::with_no_fees(mint_pubkey, Some(faucet_addr));
 
     let rpc_client =
         RpcClient::new_with_commitment(test_validator.rpc_url(), CommitmentConfig::processed());
 
-    let mut file = File::open(noop_path.to_str().unwrap()).unwrap();
+    let mut file = File::open(pathbuf.to_str().unwrap()).unwrap();
     let mut program_data = Vec::new();
     file.read_to_end(&mut program_data).unwrap();
     let max_len = program_data.len();
@@ -181,7 +178,7 @@ fn test_cli_program_deploy_no_authority() {
     // Deploy a program
     config.signers = vec![&keypair, &upgrade_authority];
     config.command = CliCommand::Program(ProgramCliCommand::Deploy {
-        program_location: Some(noop_path.to_str().unwrap().to_string()),
+        program_location: Some(pathbuf.to_str().unwrap().to_string()),
         program_signer_index: None,
         program_pubkey: None,
         buffer_signer_index: None,
@@ -201,12 +198,12 @@ fn test_cli_program_deploy_no_authority() {
         .unwrap()
         .as_str()
         .unwrap();
-    let program_id = Pubkey::from_str(program_id_str).unwrap();
+    let program_id = Pubkey::from_str(&program_id_str).unwrap();
 
     // Attempt to upgrade the program
     config.signers = vec![&keypair, &upgrade_authority];
     config.command = CliCommand::Program(ProgramCliCommand::Deploy {
-        program_location: Some(noop_path.to_str().unwrap().to_string()),
+        program_location: Some(pathbuf.to_str().unwrap().to_string()),
         program_signer_index: None,
         program_pubkey: Some(program_id),
         buffer_signer_index: None,
@@ -223,22 +220,21 @@ fn test_cli_program_deploy_no_authority() {
 fn test_cli_program_deploy_with_authority() {
     solana_logger::setup();
 
-    let mut noop_path = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
-    noop_path.push("tests");
-    noop_path.push("fixtures");
-    noop_path.push("noop");
-    noop_path.set_extension("so");
+    let mut pathbuf = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
+    pathbuf.push("tests");
+    pathbuf.push("fixtures");
+    pathbuf.push("noop");
+    pathbuf.set_extension("so");
 
     let mint_keypair = Keypair::new();
     let mint_pubkey = mint_keypair.pubkey();
     let faucet_addr = run_local_faucet(mint_keypair, None);
-    let test_validator =
-        TestValidator::with_no_fees(mint_pubkey, Some(faucet_addr), SocketAddrSpace::Unspecified);
+    let test_validator = TestValidator::with_no_fees(mint_pubkey, Some(faucet_addr));
 
     let rpc_client =
         RpcClient::new_with_commitment(test_validator.rpc_url(), CommitmentConfig::processed());
 
-    let mut file = File::open(noop_path.to_str().unwrap()).unwrap();
+    let mut file = File::open(pathbuf.to_str().unwrap()).unwrap();
     let mut program_data = Vec::new();
     file.read_to_end(&mut program_data).unwrap();
     let max_len = program_data.len();
@@ -266,7 +262,7 @@ fn test_cli_program_deploy_with_authority() {
     let program_keypair = Keypair::new();
     config.signers = vec![&keypair, &upgrade_authority, &program_keypair];
     config.command = CliCommand::Program(ProgramCliCommand::Deploy {
-        program_location: Some(noop_path.to_str().unwrap().to_string()),
+        program_location: Some(pathbuf.to_str().unwrap().to_string()),
         program_signer_index: Some(2),
         program_pubkey: Some(program_keypair.pubkey()),
         buffer_signer_index: None,
@@ -288,12 +284,12 @@ fn test_cli_program_deploy_with_authority() {
         .unwrap();
     assert_eq!(
         program_keypair.pubkey(),
-        Pubkey::from_str(program_pubkey_str).unwrap()
+        Pubkey::from_str(&program_pubkey_str).unwrap()
     );
     let program_account = rpc_client.get_account(&program_keypair.pubkey()).unwrap();
     assert_eq!(program_account.lamports, minimum_balance_for_program);
     assert_eq!(program_account.owner, bpf_loader_upgradeable::id());
-    assert!(program_account.executable);
+    assert_eq!(program_account.executable, true);
     let (programdata_pubkey, _) = Pubkey::find_program_address(
         &[program_keypair.pubkey().as_ref()],
         &bpf_loader_upgradeable::id(),
@@ -304,7 +300,7 @@ fn test_cli_program_deploy_with_authority() {
         minimum_balance_for_programdata
     );
     assert_eq!(programdata_account.owner, bpf_loader_upgradeable::id());
-    assert!(!programdata_account.executable);
+    assert_eq!(programdata_account.executable, false);
     assert_eq!(
         programdata_account.data[UpgradeableLoaderState::programdata_data_offset().unwrap()..],
         program_data[..]
@@ -313,7 +309,7 @@ fn test_cli_program_deploy_with_authority() {
     // Deploy the upgradeable program
     config.signers = vec![&keypair, &upgrade_authority];
     config.command = CliCommand::Program(ProgramCliCommand::Deploy {
-        program_location: Some(noop_path.to_str().unwrap().to_string()),
+        program_location: Some(pathbuf.to_str().unwrap().to_string()),
         program_signer_index: None,
         program_pubkey: None,
         buffer_signer_index: None,
@@ -332,11 +328,11 @@ fn test_cli_program_deploy_with_authority() {
         .unwrap()
         .as_str()
         .unwrap();
-    let program_pubkey = Pubkey::from_str(program_pubkey_str).unwrap();
+    let program_pubkey = Pubkey::from_str(&program_pubkey_str).unwrap();
     let program_account = rpc_client.get_account(&program_pubkey).unwrap();
     assert_eq!(program_account.lamports, minimum_balance_for_program);
     assert_eq!(program_account.owner, bpf_loader_upgradeable::id());
-    assert!(program_account.executable);
+    assert_eq!(program_account.executable, true);
     let (programdata_pubkey, _) =
         Pubkey::find_program_address(&[program_pubkey.as_ref()], &bpf_loader_upgradeable::id());
     let programdata_account = rpc_client.get_account(&programdata_pubkey).unwrap();
@@ -345,7 +341,7 @@ fn test_cli_program_deploy_with_authority() {
         minimum_balance_for_programdata
     );
     assert_eq!(programdata_account.owner, bpf_loader_upgradeable::id());
-    assert!(!programdata_account.executable);
+    assert_eq!(programdata_account.executable, false);
     assert_eq!(
         programdata_account.data[UpgradeableLoaderState::programdata_data_offset().unwrap()..],
         program_data[..]
@@ -354,7 +350,7 @@ fn test_cli_program_deploy_with_authority() {
     // Upgrade the program
     config.signers = vec![&keypair, &upgrade_authority];
     config.command = CliCommand::Program(ProgramCliCommand::Deploy {
-        program_location: Some(noop_path.to_str().unwrap().to_string()),
+        program_location: Some(pathbuf.to_str().unwrap().to_string()),
         program_signer_index: None,
         program_pubkey: Some(program_pubkey),
         buffer_signer_index: None,
@@ -368,7 +364,7 @@ fn test_cli_program_deploy_with_authority() {
     let program_account = rpc_client.get_account(&program_pubkey).unwrap();
     assert_eq!(program_account.lamports, minimum_balance_for_program);
     assert_eq!(program_account.owner, bpf_loader_upgradeable::id());
-    assert!(program_account.executable);
+    assert_eq!(program_account.executable, true);
     let (programdata_pubkey, _) =
         Pubkey::find_program_address(&[program_pubkey.as_ref()], &bpf_loader_upgradeable::id());
     let programdata_account = rpc_client.get_account(&programdata_pubkey).unwrap();
@@ -377,7 +373,7 @@ fn test_cli_program_deploy_with_authority() {
         minimum_balance_for_programdata
     );
     assert_eq!(programdata_account.owner, bpf_loader_upgradeable::id());
-    assert!(!programdata_account.executable);
+    assert_eq!(programdata_account.executable, false);
     assert_eq!(
         programdata_account.data[UpgradeableLoaderState::programdata_data_offset().unwrap()..],
         program_data[..]
@@ -401,14 +397,14 @@ fn test_cli_program_deploy_with_authority() {
         .as_str()
         .unwrap();
     assert_eq!(
-        Pubkey::from_str(new_upgrade_authority_str).unwrap(),
+        Pubkey::from_str(&new_upgrade_authority_str).unwrap(),
         new_upgrade_authority.pubkey()
     );
 
     // Upgrade with new authority
     config.signers = vec![&keypair, &new_upgrade_authority];
     config.command = CliCommand::Program(ProgramCliCommand::Deploy {
-        program_location: Some(noop_path.to_str().unwrap().to_string()),
+        program_location: Some(pathbuf.to_str().unwrap().to_string()),
         program_signer_index: None,
         program_pubkey: Some(program_pubkey),
         buffer_signer_index: None,
@@ -422,7 +418,7 @@ fn test_cli_program_deploy_with_authority() {
     let program_account = rpc_client.get_account(&program_pubkey).unwrap();
     assert_eq!(program_account.lamports, minimum_balance_for_program);
     assert_eq!(program_account.owner, bpf_loader_upgradeable::id());
-    assert!(program_account.executable);
+    assert_eq!(program_account.executable, true);
     let (programdata_pubkey, _) =
         Pubkey::find_program_address(&[program_pubkey.as_ref()], &bpf_loader_upgradeable::id());
     let programdata_account = rpc_client.get_account(&programdata_pubkey).unwrap();
@@ -431,7 +427,7 @@ fn test_cli_program_deploy_with_authority() {
         minimum_balance_for_programdata
     );
     assert_eq!(programdata_account.owner, bpf_loader_upgradeable::id());
-    assert!(!programdata_account.executable);
+    assert_eq!(programdata_account.executable, false);
     assert_eq!(
         programdata_account.data[UpgradeableLoaderState::programdata_data_offset().unwrap()..],
         program_data[..]
@@ -442,8 +438,6 @@ fn test_cli_program_deploy_with_authority() {
     config.command = CliCommand::Program(ProgramCliCommand::Show {
         account_pubkey: Some(program_pubkey),
         authority_pubkey: keypair.pubkey(),
-        get_programs: false,
-        get_buffers: false,
         all: false,
         use_lamports_unit: false,
     });
@@ -458,7 +452,7 @@ fn test_cli_program_deploy_with_authority() {
         .unwrap();
     assert_eq!(
         new_upgrade_authority.pubkey(),
-        Pubkey::from_str(authority_pubkey_str).unwrap()
+        Pubkey::from_str(&authority_pubkey_str).unwrap()
     );
 
     // Set no authority
@@ -482,7 +476,7 @@ fn test_cli_program_deploy_with_authority() {
     // Upgrade with no authority
     config.signers = vec![&keypair, &new_upgrade_authority];
     config.command = CliCommand::Program(ProgramCliCommand::Deploy {
-        program_location: Some(noop_path.to_str().unwrap().to_string()),
+        program_location: Some(pathbuf.to_str().unwrap().to_string()),
         program_signer_index: None,
         program_pubkey: Some(program_pubkey),
         buffer_signer_index: None,
@@ -497,7 +491,7 @@ fn test_cli_program_deploy_with_authority() {
     // deploy with finality
     config.signers = vec![&keypair, &new_upgrade_authority];
     config.command = CliCommand::Program(ProgramCliCommand::Deploy {
-        program_location: Some(noop_path.to_str().unwrap().to_string()),
+        program_location: Some(pathbuf.to_str().unwrap().to_string()),
         program_signer_index: None,
         program_pubkey: None,
         buffer_signer_index: None,
@@ -516,7 +510,7 @@ fn test_cli_program_deploy_with_authority() {
         .unwrap()
         .as_str()
         .unwrap();
-    let program_pubkey = Pubkey::from_str(program_pubkey_str).unwrap();
+    let program_pubkey = Pubkey::from_str(&program_pubkey_str).unwrap();
     let (programdata_pubkey, _) =
         Pubkey::find_program_address(&[program_pubkey.as_ref()], &bpf_loader_upgradeable::id());
     let programdata_account = rpc_client.get_account(&programdata_pubkey).unwrap();
@@ -527,7 +521,7 @@ fn test_cli_program_deploy_with_authority() {
     {
         assert_eq!(upgrade_authority_address, None);
     } else {
-        panic!("not a ProgramData account");
+        panic!("not a buffer account");
     }
 
     // Get buffer authority
@@ -535,8 +529,6 @@ fn test_cli_program_deploy_with_authority() {
     config.command = CliCommand::Program(ProgramCliCommand::Show {
         account_pubkey: Some(program_pubkey),
         authority_pubkey: keypair.pubkey(),
-        get_programs: false,
-        get_buffers: false,
         all: false,
         use_lamports_unit: false,
     });
@@ -552,114 +544,25 @@ fn test_cli_program_deploy_with_authority() {
     assert_eq!("none", authority_pubkey_str);
 }
 
-#[test]
-fn test_cli_program_close_program() {
-    solana_logger::setup();
-
-    let mut noop_path = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
-    noop_path.push("tests");
-    noop_path.push("fixtures");
-    noop_path.push("noop");
-    noop_path.set_extension("so");
-
-    let mint_keypair = Keypair::new();
-    let mint_pubkey = mint_keypair.pubkey();
-    let faucet_addr = run_local_faucet(mint_keypair, None);
-    let test_validator =
-        TestValidator::with_no_fees(mint_pubkey, Some(faucet_addr), SocketAddrSpace::Unspecified);
-
-    let rpc_client =
-        RpcClient::new_with_commitment(test_validator.rpc_url(), CommitmentConfig::processed());
-
-    let mut file = File::open(noop_path.to_str().unwrap()).unwrap();
-    let mut program_data = Vec::new();
-    file.read_to_end(&mut program_data).unwrap();
-    let max_len = program_data.len();
-    let minimum_balance_for_programdata = rpc_client
-        .get_minimum_balance_for_rent_exemption(
-            UpgradeableLoaderState::programdata_len(max_len).unwrap(),
-        )
-        .unwrap();
-    let minimum_balance_for_program = rpc_client
-        .get_minimum_balance_for_rent_exemption(UpgradeableLoaderState::program_len().unwrap())
-        .unwrap();
-    let upgrade_authority = Keypair::new();
-
-    let mut config = CliConfig::recent_for_tests();
-    let keypair = Keypair::new();
-    config.json_rpc_url = test_validator.rpc_url();
-    config.signers = vec![&keypair];
-    config.command = CliCommand::Airdrop {
-        pubkey: None,
-        lamports: 100 * minimum_balance_for_programdata + minimum_balance_for_program,
-    };
-    process_command(&config).unwrap();
-
-    // Deploy the upgradeable program
-    let program_keypair = Keypair::new();
-    config.signers = vec![&keypair, &upgrade_authority, &program_keypair];
-    config.command = CliCommand::Program(ProgramCliCommand::Deploy {
-        program_location: Some(noop_path.to_str().unwrap().to_string()),
-        program_signer_index: Some(2),
-        program_pubkey: Some(program_keypair.pubkey()),
-        buffer_signer_index: None,
-        buffer_pubkey: None,
-        allow_excessive_balance: false,
-        upgrade_authority_signer_index: 1,
-        is_final: false,
-        max_len: Some(max_len),
-    });
-    config.output_format = OutputFormat::JsonCompact;
-    process_command(&config).unwrap();
-
-    let (programdata_pubkey, _) = Pubkey::find_program_address(
-        &[program_keypair.pubkey().as_ref()],
-        &bpf_loader_upgradeable::id(),
-    );
-
-    // Close program
-    let close_account = rpc_client.get_account(&programdata_pubkey).unwrap();
-    let programdata_lamports = close_account.lamports;
-    let recipient_pubkey = Pubkey::new_unique();
-    config.signers = vec![&keypair, &upgrade_authority];
-    config.command = CliCommand::Program(ProgramCliCommand::Close {
-        account_pubkey: Some(program_keypair.pubkey()),
-        recipient_pubkey,
-        authority_index: 1,
-        use_lamports_unit: false,
-    });
-    process_command(&config).unwrap();
-    rpc_client.get_account(&programdata_pubkey).unwrap_err();
-    let recipient_account = rpc_client.get_account(&recipient_pubkey).unwrap();
-    assert_eq!(programdata_lamports, recipient_account.lamports);
-}
-
 #[test]
 fn test_cli_program_write_buffer() {
     solana_logger::setup();
 
-    let mut noop_path = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
-    noop_path.push("tests");
-    noop_path.push("fixtures");
-    noop_path.push("noop");
-    noop_path.set_extension("so");
-
-    let mut noop_large_path = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
-    noop_large_path.push("tests");
-    noop_large_path.push("fixtures");
-    noop_large_path.push("noop_large");
-    noop_large_path.set_extension("so");
+    let mut pathbuf = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
+    pathbuf.push("tests");
+    pathbuf.push("fixtures");
+    pathbuf.push("noop");
+    pathbuf.set_extension("so");
 
     let mint_keypair = Keypair::new();
     let mint_pubkey = mint_keypair.pubkey();
     let faucet_addr = run_local_faucet(mint_keypair, None);
-    let test_validator =
-        TestValidator::with_no_fees(mint_pubkey, Some(faucet_addr), SocketAddrSpace::Unspecified);
+    let test_validator = TestValidator::with_no_fees(mint_pubkey, Some(faucet_addr));
 
     let rpc_client =
         RpcClient::new_with_commitment(test_validator.rpc_url(), CommitmentConfig::processed());
 
-    let mut file = File::open(noop_path.to_str().unwrap()).unwrap();
+    let mut file = File::open(pathbuf.to_str().unwrap()).unwrap();
     let mut program_data = Vec::new();
     file.read_to_end(&mut program_data).unwrap();
     let max_len = program_data.len();
@@ -687,7 +590,7 @@ fn test_cli_program_write_buffer() {
     // Write a buffer with default params
     config.signers = vec![&keypair];
     config.command = CliCommand::Program(ProgramCliCommand::WriteBuffer {
-        program_location: noop_path.to_str().unwrap().to_string(),
+        program_location: pathbuf.to_str().unwrap().to_string(),
         buffer_signer_index: None,
         buffer_pubkey: None,
         buffer_authority_signer_index: None,
@@ -703,7 +606,7 @@ fn test_cli_program_write_buffer() {
         .unwrap()
         .as_str()
         .unwrap();
-    let new_buffer_pubkey = Pubkey::from_str(buffer_pubkey_str).unwrap();
+    let new_buffer_pubkey = Pubkey::from_str(&buffer_pubkey_str).unwrap();
     let buffer_account = rpc_client.get_account(&new_buffer_pubkey).unwrap();
     assert_eq!(buffer_account.lamports, minimum_balance_for_buffer_default);
     assert_eq!(buffer_account.owner, bpf_loader_upgradeable::id());
@@ -721,7 +624,7 @@ fn test_cli_program_write_buffer() {
     let buffer_keypair = Keypair::new();
     config.signers = vec![&keypair, &buffer_keypair];
     config.command = CliCommand::Program(ProgramCliCommand::WriteBuffer {
-        program_location: noop_path.to_str().unwrap().to_string(),
+        program_location: pathbuf.to_str().unwrap().to_string(),
         buffer_signer_index: Some(1),
         buffer_pubkey: Some(buffer_keypair.pubkey()),
         buffer_authority_signer_index: None,
@@ -738,7 +641,7 @@ fn test_cli_program_write_buffer() {
         .unwrap();
     assert_eq!(
         buffer_keypair.pubkey(),
-        Pubkey::from_str(buffer_pubkey_str).unwrap()
+        Pubkey::from_str(&buffer_pubkey_str).unwrap()
     );
     let buffer_account = rpc_client.get_account(&buffer_keypair.pubkey()).unwrap();
     assert_eq!(buffer_account.lamports, minimum_balance_for_buffer);
@@ -758,8 +661,6 @@ fn test_cli_program_write_buffer() {
     config.command = CliCommand::Program(ProgramCliCommand::Show {
         account_pubkey: Some(buffer_keypair.pubkey()),
         authority_pubkey: keypair.pubkey(),
-        get_programs: false,
-        get_buffers: false,
         all: false,
         use_lamports_unit: false,
     });
@@ -774,7 +675,7 @@ fn test_cli_program_write_buffer() {
         .unwrap();
     assert_eq!(
         keypair.pubkey(),
-        Pubkey::from_str(authority_pubkey_str).unwrap()
+        Pubkey::from_str(&authority_pubkey_str).unwrap()
     );
 
     // Specify buffer authority
@@ -782,7 +683,7 @@ fn test_cli_program_write_buffer() {
     let authority_keypair = Keypair::new();
     config.signers = vec![&keypair, &buffer_keypair, &authority_keypair];
     config.command = CliCommand::Program(ProgramCliCommand::WriteBuffer {
-        program_location: noop_path.to_str().unwrap().to_string(),
+        program_location: pathbuf.to_str().unwrap().to_string(),
         buffer_signer_index: Some(1),
         buffer_pubkey: Some(buffer_keypair.pubkey()),
         buffer_authority_signer_index: Some(2),
@@ -799,7 +700,7 @@ fn test_cli_program_write_buffer() {
         .unwrap();
     assert_eq!(
         buffer_keypair.pubkey(),
-        Pubkey::from_str(buffer_pubkey_str).unwrap()
+        Pubkey::from_str(&buffer_pubkey_str).unwrap()
     );
     let buffer_account = rpc_client.get_account(&buffer_keypair.pubkey()).unwrap();
     assert_eq!(buffer_account.lamports, minimum_balance_for_buffer_default);
@@ -819,7 +720,7 @@ fn test_cli_program_write_buffer() {
     let authority_keypair = Keypair::new();
     config.signers = vec![&keypair, &buffer_keypair, &authority_keypair];
     config.command = CliCommand::Program(ProgramCliCommand::WriteBuffer {
-        program_location: noop_path.to_str().unwrap().to_string(),
+        program_location: pathbuf.to_str().unwrap().to_string(),
         buffer_signer_index: None,
         buffer_pubkey: None,
         buffer_authority_signer_index: Some(2),
@@ -834,7 +735,7 @@ fn test_cli_program_write_buffer() {
         .unwrap()
         .as_str()
         .unwrap();
-    let buffer_pubkey = Pubkey::from_str(buffer_pubkey_str).unwrap();
+    let buffer_pubkey = Pubkey::from_str(&buffer_pubkey_str).unwrap();
     let buffer_account = rpc_client.get_account(&buffer_pubkey).unwrap();
     assert_eq!(buffer_account.lamports, minimum_balance_for_buffer_default);
     assert_eq!(buffer_account.owner, bpf_loader_upgradeable::id());
@@ -853,8 +754,6 @@ fn test_cli_program_write_buffer() {
     config.command = CliCommand::Program(ProgramCliCommand::Show {
         account_pubkey: Some(buffer_pubkey),
         authority_pubkey: keypair.pubkey(),
-        get_programs: false,
-        get_buffers: false,
         all: false,
         use_lamports_unit: false,
     });
@@ -869,7 +768,7 @@ fn test_cli_program_write_buffer() {
         .unwrap();
     assert_eq!(
         authority_keypair.pubkey(),
-        Pubkey::from_str(authority_pubkey_str).unwrap()
+        Pubkey::from_str(&authority_pubkey_str).unwrap()
     );
 
     // Close buffer
@@ -891,7 +790,7 @@ fn test_cli_program_write_buffer() {
     // Write a buffer with default params
     config.signers = vec![&keypair];
     config.command = CliCommand::Program(ProgramCliCommand::WriteBuffer {
-        program_location: noop_path.to_str().unwrap().to_string(),
+        program_location: pathbuf.to_str().unwrap().to_string(),
         buffer_signer_index: None,
         buffer_pubkey: None,
         buffer_authority_signer_index: None,
@@ -907,7 +806,7 @@ fn test_cli_program_write_buffer() {
         .unwrap()
         .as_str()
         .unwrap();
-    let new_buffer_pubkey = Pubkey::from_str(buffer_pubkey_str).unwrap();
+    let new_buffer_pubkey = Pubkey::from_str(&buffer_pubkey_str).unwrap();
 
     // Close buffers and deposit default keypair
     let pre_lamports = rpc_client.get_account(&keypair.pubkey()).unwrap().lamports;
@@ -925,58 +824,27 @@ fn test_cli_program_write_buffer() {
         pre_lamports + minimum_balance_for_buffer,
         recipient_account.lamports
     );
-
-    // write small buffer then attempt to deploy larger program
-    let buffer_keypair = Keypair::new();
-    config.signers = vec![&keypair, &buffer_keypair];
-    config.command = CliCommand::Program(ProgramCliCommand::WriteBuffer {
-        program_location: noop_path.to_str().unwrap().to_string(),
-        buffer_signer_index: Some(1),
-        buffer_pubkey: Some(buffer_keypair.pubkey()),
-        buffer_authority_signer_index: None,
-        max_len: None, //Some(max_len),
-    });
-    process_command(&config).unwrap();
-    config.signers = vec![&keypair, &buffer_keypair];
-    config.command = CliCommand::Program(ProgramCliCommand::Deploy {
-        program_location: Some(noop_large_path.to_str().unwrap().to_string()),
-        program_signer_index: None,
-        program_pubkey: None,
-        buffer_signer_index: Some(1),
-        buffer_pubkey: Some(buffer_keypair.pubkey()),
-        allow_excessive_balance: false,
-        upgrade_authority_signer_index: 1,
-        is_final: true,
-        max_len: None,
-    });
-    config.output_format = OutputFormat::JsonCompact;
-    let error = process_command(&config).unwrap_err();
-    assert_eq!(
-        error.to_string(),
-        "Buffer account passed is not large enough, may have been for a different deploy?"
-    );
 }
 
 #[test]
 fn test_cli_program_set_buffer_authority() {
     solana_logger::setup();
 
-    let mut noop_path = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
-    noop_path.push("tests");
-    noop_path.push("fixtures");
-    noop_path.push("noop");
-    noop_path.set_extension("so");
+    let mut pathbuf = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
+    pathbuf.push("tests");
+    pathbuf.push("fixtures");
+    pathbuf.push("noop");
+    pathbuf.set_extension("so");
 
     let mint_keypair = Keypair::new();
     let mint_pubkey = mint_keypair.pubkey();
     let faucet_addr = run_local_faucet(mint_keypair, None);
-    let test_validator =
-        TestValidator::with_no_fees(mint_pubkey, Some(faucet_addr), SocketAddrSpace::Unspecified);
+    let test_validator = TestValidator::with_no_fees(mint_pubkey, Some(faucet_addr));
 
     let rpc_client =
         RpcClient::new_with_commitment(test_validator.rpc_url(), CommitmentConfig::processed());
 
-    let mut file = File::open(noop_path.to_str().unwrap()).unwrap();
+    let mut file = File::open(pathbuf.to_str().unwrap()).unwrap();
     let mut program_data = Vec::new();
     file.read_to_end(&mut program_data).unwrap();
     let max_len = program_data.len();
@@ -1000,7 +868,7 @@ fn test_cli_program_set_buffer_authority() {
     let buffer_keypair = Keypair::new();
     config.signers = vec![&keypair, &buffer_keypair];
     config.command = CliCommand::Program(ProgramCliCommand::WriteBuffer {
-        program_location: noop_path.to_str().unwrap().to_string(),
+        program_location: pathbuf.to_str().unwrap().to_string(),
         buffer_signer_index: Some(1),
         buffer_pubkey: Some(buffer_keypair.pubkey()),
         buffer_authority_signer_index: None,
@@ -1033,7 +901,7 @@ fn test_cli_program_set_buffer_authority() {
         .as_str()
         .unwrap();
     assert_eq!(
-        Pubkey::from_str(new_buffer_authority_str).unwrap(),
+        Pubkey::from_str(&new_buffer_authority_str).unwrap(),
         new_buffer_authority.pubkey()
     );
     let buffer_account = rpc_client.get_account(&buffer_keypair.pubkey()).unwrap();
@@ -1060,7 +928,7 @@ fn test_cli_program_set_buffer_authority() {
         .as_str()
         .unwrap();
     assert_eq!(
-        Pubkey::from_str(buffer_authority_str).unwrap(),
+        Pubkey::from_str(&buffer_authority_str).unwrap(),
         buffer_keypair.pubkey()
     );
     let buffer_account = rpc_client.get_account(&buffer_keypair.pubkey()).unwrap();
@@ -1075,22 +943,21 @@ fn test_cli_program_set_buffer_authority() {
 fn test_cli_program_mismatch_buffer_authority() {
     solana_logger::setup();
 
-    let mut noop_path = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
-    noop_path.push("tests");
-    noop_path.push("fixtures");
-    noop_path.push("noop");
-    noop_path.set_extension("so");
+    let mut pathbuf = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
+    pathbuf.push("tests");
+    pathbuf.push("fixtures");
+    pathbuf.push("noop");
+    pathbuf.set_extension("so");
 
     let mint_keypair = Keypair::new();
     let mint_pubkey = mint_keypair.pubkey();
     let faucet_addr = run_local_faucet(mint_keypair, None);
-    let test_validator =
-        TestValidator::with_no_fees(mint_pubkey, Some(faucet_addr), SocketAddrSpace::Unspecified);
+    let test_validator = TestValidator::with_no_fees(mint_pubkey, Some(faucet_addr));
 
     let rpc_client =
         RpcClient::new_with_commitment(test_validator.rpc_url(), CommitmentConfig::processed());
 
-    let mut file = File::open(noop_path.to_str().unwrap()).unwrap();
+    let mut file = File::open(pathbuf.to_str().unwrap()).unwrap();
     let mut program_data = Vec::new();
     file.read_to_end(&mut program_data).unwrap();
     let max_len = program_data.len();
@@ -1115,7 +982,7 @@ fn test_cli_program_mismatch_buffer_authority() {
     let buffer_keypair = Keypair::new();
     config.signers = vec![&keypair, &buffer_keypair, &buffer_authority];
     config.command = CliCommand::Program(ProgramCliCommand::WriteBuffer {
-        program_location: noop_path.to_str().unwrap().to_string(),
+        program_location: pathbuf.to_str().unwrap().to_string(),
         buffer_signer_index: Some(1),
         buffer_pubkey: Some(buffer_keypair.pubkey()),
         buffer_authority_signer_index: Some(2),
@@ -1133,7 +1000,7 @@ fn test_cli_program_mismatch_buffer_authority() {
     let upgrade_authority = Keypair::new();
     config.signers = vec![&keypair, &upgrade_authority];
     config.command = CliCommand::Program(ProgramCliCommand::Deploy {
-        program_location: Some(noop_path.to_str().unwrap().to_string()),
+        program_location: Some(pathbuf.to_str().unwrap().to_string()),
         program_signer_index: None,
         program_pubkey: None,
         buffer_signer_index: None,
@@ -1148,7 +1015,7 @@ fn test_cli_program_mismatch_buffer_authority() {
     // Attempt to deploy matched authority
     config.signers = vec![&keypair, &buffer_authority];
     config.command = CliCommand::Program(ProgramCliCommand::Deploy {
-        program_location: Some(noop_path.to_str().unwrap().to_string()),
+        program_location: Some(pathbuf.to_str().unwrap().to_string()),
         program_signer_index: None,
         program_pubkey: None,
         buffer_signer_index: None,
@@ -1165,22 +1032,21 @@ fn test_cli_program_mismatch_buffer_authority() {
 fn test_cli_program_show() {
     solana_logger::setup();
 
-    let mut noop_path = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
-    noop_path.push("tests");
-    noop_path.push("fixtures");
-    noop_path.push("noop");
-    noop_path.set_extension("so");
+    let mut pathbuf = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
+    pathbuf.push("tests");
+    pathbuf.push("fixtures");
+    pathbuf.push("noop");
+    pathbuf.set_extension("so");
 
     let mint_keypair = Keypair::new();
     let mint_pubkey = mint_keypair.pubkey();
     let faucet_addr = run_local_faucet(mint_keypair, None);
-    let test_validator =
-        TestValidator::with_no_fees(mint_pubkey, Some(faucet_addr), SocketAddrSpace::Unspecified);
+    let test_validator = TestValidator::with_no_fees(mint_pubkey, Some(faucet_addr));
 
     let rpc_client =
         RpcClient::new_with_commitment(test_validator.rpc_url(), CommitmentConfig::processed());
 
-    let mut file = File::open(noop_path.to_str().unwrap()).unwrap();
+    let mut file = File::open(pathbuf.to_str().unwrap()).unwrap();
     let mut program_data = Vec::new();
     file.read_to_end(&mut program_data).unwrap();
     let max_len = program_data.len();
@@ -1208,7 +1074,7 @@ fn test_cli_program_show() {
     let authority_keypair = Keypair::new();
     config.signers = vec![&keypair, &buffer_keypair, &authority_keypair];
     config.command = CliCommand::Program(ProgramCliCommand::WriteBuffer {
-        program_location: noop_path.to_str().unwrap().to_string(),
+        program_location: pathbuf.to_str().unwrap().to_string(),
         buffer_signer_index: Some(1),
         buffer_pubkey: Some(buffer_keypair.pubkey()),
         buffer_authority_signer_index: Some(2),
@@ -1221,8 +1087,6 @@ fn test_cli_program_show() {
     config.command = CliCommand::Program(ProgramCliCommand::Show {
         account_pubkey: Some(buffer_keypair.pubkey()),
         authority_pubkey: keypair.pubkey(),
-        get_programs: false,
-        get_buffers: false,
         all: false,
         use_lamports_unit: false,
     });
@@ -1237,7 +1101,7 @@ fn test_cli_program_show() {
         .unwrap();
     assert_eq!(
         buffer_keypair.pubkey(),
-        Pubkey::from_str(address_str).unwrap()
+        Pubkey::from_str(&address_str).unwrap()
     );
     let authority_str = json
         .as_object()
@@ -1248,7 +1112,7 @@ fn test_cli_program_show() {
         .unwrap();
     assert_eq!(
         authority_keypair.pubkey(),
-        Pubkey::from_str(authority_str).unwrap()
+        Pubkey::from_str(&authority_str).unwrap()
     );
     let data_len = json
         .as_object()
@@ -1263,7 +1127,7 @@ fn test_cli_program_show() {
     let program_keypair = Keypair::new();
     config.signers = vec![&keypair, &authority_keypair, &program_keypair];
     config.command = CliCommand::Program(ProgramCliCommand::Deploy {
-        program_location: Some(noop_path.to_str().unwrap().to_string()),
+        program_location: Some(pathbuf.to_str().unwrap().to_string()),
         program_signer_index: Some(2),
         program_pubkey: Some(program_keypair.pubkey()),
         buffer_signer_index: None,
@@ -1283,8 +1147,6 @@ fn test_cli_program_show() {
     config.command = CliCommand::Program(ProgramCliCommand::Show {
         account_pubkey: Some(program_keypair.pubkey()),
         authority_pubkey: keypair.pubkey(),
-        get_programs: false,
-        get_buffers: false,
         all: false,
         use_lamports_unit: false,
     });
@@ -1299,7 +1161,7 @@ fn test_cli_program_show() {
         .unwrap();
     assert_eq!(
         program_keypair.pubkey(),
-        Pubkey::from_str(address_str).unwrap()
+        Pubkey::from_str(&address_str).unwrap()
     );
     let programdata_address_str = json
         .as_object()
@@ -1314,7 +1176,7 @@ fn test_cli_program_show() {
     );
     assert_eq!(
         programdata_pubkey,
-        Pubkey::from_str(programdata_address_str).unwrap()
+        Pubkey::from_str(&programdata_address_str).unwrap()
     );
     let authority_str = json
         .as_object()
@@ -1325,7 +1187,7 @@ fn test_cli_program_show() {
         .unwrap();
     assert_eq!(
         authority_keypair.pubkey(),
-        Pubkey::from_str(authority_str).unwrap()
+        Pubkey::from_str(&authority_str).unwrap()
     );
     let deployed_slot = json
         .as_object()
@@ -1350,22 +1212,21 @@ fn test_cli_program_show() {
 fn test_cli_program_dump() {
     solana_logger::setup();
 
-    let mut noop_path = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
-    noop_path.push("tests");
-    noop_path.push("fixtures");
-    noop_path.push("noop");
-    noop_path.set_extension("so");
+    let mut pathbuf = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
+    pathbuf.push("tests");
+    pathbuf.push("fixtures");
+    pathbuf.push("noop");
+    pathbuf.set_extension("so");
 
     let mint_keypair = Keypair::new();
     let mint_pubkey = mint_keypair.pubkey();
     let faucet_addr = run_local_faucet(mint_keypair, None);
-    let test_validator =
-        TestValidator::with_no_fees(mint_pubkey, Some(faucet_addr), SocketAddrSpace::Unspecified);
+    let test_validator = TestValidator::with_no_fees(mint_pubkey, Some(faucet_addr));
 
     let rpc_client =
         RpcClient::new_with_commitment(test_validator.rpc_url(), CommitmentConfig::processed());
 
-    let mut file = File::open(noop_path.to_str().unwrap()).unwrap();
+    let mut file = File::open(pathbuf.to_str().unwrap()).unwrap();
     let mut program_data = Vec::new();
     file.read_to_end(&mut program_data).unwrap();
     let max_len = program_data.len();
@@ -1393,7 +1254,7 @@ fn test_cli_program_dump() {
     let authority_keypair = Keypair::new();
     config.signers = vec![&keypair, &buffer_keypair, &authority_keypair];
     config.command = CliCommand::Program(ProgramCliCommand::WriteBuffer {
-        program_location: noop_path.to_str().unwrap().to_string(),
+        program_location: pathbuf.to_str().unwrap().to_string(),
         buffer_signer_index: Some(1),
         buffer_pubkey: Some(buffer_keypair.pubkey()),
         buffer_authority_signer_index: Some(2),

cli/tests/request_airdrop.rs

@@ -6,15 +6,13 @@ use solana_sdk::{
     commitment_config::CommitmentConfig,
     signature::{Keypair, Signer},
 };
-use solana_streamer::socket::SocketAddrSpace;
 
 #[test]
 fn test_cli_request_airdrop() {
     let mint_keypair = Keypair::new();
     let mint_pubkey = mint_keypair.pubkey();
     let faucet_addr = run_local_faucet(mint_keypair, None);
-    let test_validator =
-        TestValidator::with_no_fees(mint_pubkey, Some(faucet_addr), SocketAddrSpace::Unspecified);
+    let test_validator = TestValidator::with_no_fees(mint_pubkey, Some(faucet_addr));
 
     let mut bob_config = CliConfig::recent_for_tests();
     bob_config.json_rpc_url = test_validator.rpc_url();

cli/tests/stake.rs

@@ -1,7 +1,6 @@
 use solana_cli::{
     cli::{process_command, request_and_confirm_airdrop, CliCommand, CliConfig},
     spend_utils::SpendAmount,
-    stake::StakeAuthorizationIndexed,
     test_utils::{check_ready, check_recent_balance},
 };
 use solana_cli_output::{parse_sign_only_reply_string, OutputFormat};
@@ -18,22 +17,18 @@ use solana_sdk::{
     nonce::State as NonceState,
     pubkey::Pubkey,
     signature::{keypair_from_seed, Keypair, Signer},
-    stake::{
-        self,
-        instruction::LockupArgs,
-        state::{Lockup, StakeAuthorize, StakeState},
-    },
 };
-use solana_streamer::socket::SocketAddrSpace;
+use solana_stake_program::{
+    stake_instruction::LockupArgs,
+    stake_state::{Lockup, StakeAuthorize, StakeState},
+};
 
 #[test]
 fn test_stake_delegation_force() {
     let mint_keypair = Keypair::new();
     let mint_pubkey = mint_keypair.pubkey();
-    let authorized_withdrawer = Keypair::new().pubkey();
     let faucet_addr = run_local_faucet(mint_keypair, None);
-    let test_validator =
-        TestValidator::with_no_fees(mint_pubkey, Some(faucet_addr), SocketAddrSpace::Unspecified);
+    let test_validator = TestValidator::with_no_fees(mint_pubkey, Some(faucet_addr));
 
     let rpc_client =
         RpcClient::new_with_commitment(test_validator.rpc_url(), CommitmentConfig::processed());
@@ -54,7 +49,7 @@ fn test_stake_delegation_force() {
         seed: None,
         identity_account: 0,
         authorized_voter: None,
-        authorized_withdrawer,
+        authorized_withdrawer: None,
         commission: 0,
         memo: None,
     };
@@ -68,7 +63,6 @@ fn test_stake_delegation_force() {
         seed: None,
         staker: None,
         withdrawer: None,
-        withdrawer_signer: None,
         lockup: Lockup::default(),
         amount: SpendAmount::Some(50_000),
         sign_only: false,
@@ -123,8 +117,7 @@ fn test_seed_stake_delegation_and_deactivation() {
     let mint_keypair = Keypair::new();
     let mint_pubkey = mint_keypair.pubkey();
     let faucet_addr = run_local_faucet(mint_keypair, None);
-    let test_validator =
-        TestValidator::with_no_fees(mint_pubkey, Some(faucet_addr), SocketAddrSpace::Unspecified);
+    let test_validator = TestValidator::with_no_fees(mint_pubkey, Some(faucet_addr));
 
     let rpc_client =
         RpcClient::new_with_commitment(test_validator.rpc_url(), CommitmentConfig::processed());
@@ -146,7 +139,7 @@ fn test_seed_stake_delegation_and_deactivation() {
     let stake_address = Pubkey::create_with_seed(
         &config_validator.signers[0].pubkey(),
         "hi there",
-        &stake::program::id(),
+        &solana_stake_program::id(),
     )
     .expect("bad seed");
 
@@ -157,7 +150,6 @@ fn test_seed_stake_delegation_and_deactivation() {
         seed: Some("hi there".to_string()),
         staker: None,
         withdrawer: None,
-        withdrawer_signer: None,
         lockup: Lockup::default(),
         amount: SpendAmount::Some(50_000),
         sign_only: false,
@@ -197,7 +189,6 @@ fn test_seed_stake_delegation_and_deactivation() {
         nonce_account: None,
         nonce_authority: 0,
         memo: None,
-        seed: None,
         fee_payer: 0,
     };
     process_command(&config_validator).unwrap();
@@ -210,8 +201,7 @@ fn test_stake_delegation_and_deactivation() {
     let mint_keypair = Keypair::new();
     let mint_pubkey = mint_keypair.pubkey();
     let faucet_addr = run_local_faucet(mint_keypair, None);
-    let test_validator =
-        TestValidator::with_no_fees(mint_pubkey, Some(faucet_addr), SocketAddrSpace::Unspecified);
+    let test_validator = TestValidator::with_no_fees(mint_pubkey, Some(faucet_addr));
 
     let rpc_client =
         RpcClient::new_with_commitment(test_validator.rpc_url(), CommitmentConfig::processed());
@@ -239,7 +229,6 @@ fn test_stake_delegation_and_deactivation() {
         seed: None,
         staker: None,
         withdrawer: None,
-        withdrawer_signer: None,
         lockup: Lockup::default(),
         amount: SpendAmount::Some(50_000),
         sign_only: false,
@@ -280,7 +269,6 @@ fn test_stake_delegation_and_deactivation() {
         nonce_account: None,
         nonce_authority: 0,
         memo: None,
-        seed: None,
         fee_payer: 0,
     };
     process_command(&config_validator).unwrap();
@@ -293,8 +281,7 @@ fn test_offline_stake_delegation_and_deactivation() {
     let mint_keypair = Keypair::new();
     let mint_pubkey = mint_keypair.pubkey();
     let faucet_addr = run_local_faucet(mint_keypair, None);
-    let test_validator =
-        TestValidator::with_no_fees(mint_pubkey, Some(faucet_addr), SocketAddrSpace::Unspecified);
+    let test_validator = TestValidator::with_no_fees(mint_pubkey, Some(faucet_addr));
 
     let rpc_client =
         RpcClient::new_with_commitment(test_validator.rpc_url(), CommitmentConfig::processed());
@@ -342,7 +329,6 @@ fn test_offline_stake_delegation_and_deactivation() {
         seed: None,
         staker: Some(config_offline.signers[0].pubkey()),
         withdrawer: None,
-        withdrawer_signer: None,
         lockup: Lockup::default(),
         amount: SpendAmount::Some(50_000),
         sign_only: false,
@@ -405,7 +391,6 @@ fn test_offline_stake_delegation_and_deactivation() {
         nonce_account: None,
         nonce_authority: 0,
         memo: None,
-        seed: None,
         fee_payer: 0,
     };
     let sig_response = process_command(&config_offline).unwrap();
@@ -424,7 +409,6 @@ fn test_offline_stake_delegation_and_deactivation() {
         nonce_account: None,
         nonce_authority: 0,
         memo: None,
-        seed: None,
         fee_payer: 0,
     };
     process_command(&config_payer).unwrap();
@@ -437,8 +421,7 @@ fn test_nonced_stake_delegation_and_deactivation() {
     let mint_keypair = Keypair::new();
     let mint_pubkey = mint_keypair.pubkey();
     let faucet_addr = run_local_faucet(mint_keypair, None);
-    let test_validator =
-        TestValidator::with_no_fees(mint_pubkey, Some(faucet_addr), SocketAddrSpace::Unspecified);
+    let test_validator = TestValidator::with_no_fees(mint_pubkey, Some(faucet_addr));
 
     let rpc_client =
         RpcClient::new_with_commitment(test_validator.rpc_url(), CommitmentConfig::processed());
@@ -463,7 +446,6 @@ fn test_nonced_stake_delegation_and_deactivation() {
         seed: None,
         staker: None,
         withdrawer: None,
-        withdrawer_signer: None,
         lockup: Lockup::default(),
         amount: SpendAmount::Some(50_000),
         sign_only: false,
@@ -542,7 +524,6 @@ fn test_nonced_stake_delegation_and_deactivation() {
         nonce_account: Some(nonce_account.pubkey()),
         nonce_authority: 0,
         memo: None,
-        seed: None,
         fee_payer: 0,
     };
     process_command(&config).unwrap();
@@ -555,8 +536,7 @@ fn test_stake_authorize() {
     let mint_keypair = Keypair::new();
     let mint_pubkey = mint_keypair.pubkey();
     let faucet_addr = run_local_faucet(mint_keypair, None);
-    let test_validator =
-        TestValidator::with_no_fees(mint_pubkey, Some(faucet_addr), SocketAddrSpace::Unspecified);
+    let test_validator = TestValidator::with_no_fees(mint_pubkey, Some(faucet_addr));
 
     let rpc_client =
         RpcClient::new_with_commitment(test_validator.rpc_url(), CommitmentConfig::processed());
@@ -595,7 +575,6 @@ fn test_stake_authorize() {
         seed: None,
         staker: None,
         withdrawer: None,
-        withdrawer_signer: None,
         lockup: Lockup::default(),
         amount: SpendAmount::Some(50_000),
         sign_only: false,
@@ -615,12 +594,7 @@ fn test_stake_authorize() {
     config.signers.pop();
     config.command = CliCommand::StakeAuthorize {
         stake_account_pubkey,
-        new_authorizations: vec![StakeAuthorizationIndexed {
-            authorization_type: StakeAuthorize::Staker,
-            new_authority_pubkey: online_authority_pubkey,
-            authority: 0,
-            new_authority_signer: None,
-        }],
+        new_authorizations: vec![(StakeAuthorize::Staker, online_authority_pubkey, 0)],
         sign_only: false,
         dump_transaction_message: false,
         blockhash_query: BlockhashQuery::default(),
@@ -629,7 +603,6 @@ fn test_stake_authorize() {
         memo: None,
         fee_payer: 0,
         custodian: None,
-        no_wait: false,
     };
     process_command(&config).unwrap();
     let stake_account = rpc_client.get_account(&stake_account_pubkey).unwrap();
@@ -649,18 +622,8 @@ fn test_stake_authorize() {
     config.command = CliCommand::StakeAuthorize {
         stake_account_pubkey,
         new_authorizations: vec![
-            StakeAuthorizationIndexed {
-                authorization_type: StakeAuthorize::Staker,
-                new_authority_pubkey: online_authority2_pubkey,
-                authority: 1,
-                new_authority_signer: None,
-            },
-            StakeAuthorizationIndexed {
-                authorization_type: StakeAuthorize::Withdrawer,
-                new_authority_pubkey: withdraw_authority_pubkey,
-                authority: 0,
-                new_authority_signer: None,
-            },
+            (StakeAuthorize::Staker, online_authority2_pubkey, 1),
+            (StakeAuthorize::Withdrawer, withdraw_authority_pubkey, 0),
         ],
         sign_only: false,
         dump_transaction_message: false,
@@ -670,7 +633,6 @@ fn test_stake_authorize() {
         memo: None,
         fee_payer: 0,
         custodian: None,
-        no_wait: false,
     };
     process_command(&config).unwrap();
     let stake_account = rpc_client.get_account(&stake_account_pubkey).unwrap();
@@ -687,12 +649,7 @@ fn test_stake_authorize() {
     config.signers.push(&online_authority2);
     config.command = CliCommand::StakeAuthorize {
         stake_account_pubkey,
-        new_authorizations: vec![StakeAuthorizationIndexed {
-            authorization_type: StakeAuthorize::Staker,
-            new_authority_pubkey: offline_authority_pubkey,
-            authority: 1,
-            new_authority_signer: None,
-        }],
+        new_authorizations: vec![(StakeAuthorize::Staker, offline_authority_pubkey, 1)],
         sign_only: false,
         dump_transaction_message: false,
         blockhash_query: BlockhashQuery::default(),
@@ -701,7 +658,6 @@ fn test_stake_authorize() {
         memo: None,
         fee_payer: 0,
         custodian: None,
-        no_wait: false,
     };
     process_command(&config).unwrap();
     let stake_account = rpc_client.get_account(&stake_account_pubkey).unwrap();
@@ -718,12 +674,7 @@ fn test_stake_authorize() {
     let (blockhash, _) = rpc_client.get_recent_blockhash().unwrap();
     config_offline.command = CliCommand::StakeAuthorize {
         stake_account_pubkey,
-        new_authorizations: vec![StakeAuthorizationIndexed {
-            authorization_type: StakeAuthorize::Staker,
-            new_authority_pubkey: nonced_authority_pubkey,
-            authority: 0,
-            new_authority_signer: None,
-        }],
+        new_authorizations: vec![(StakeAuthorize::Staker, nonced_authority_pubkey, 0)],
         sign_only: true,
         dump_transaction_message: false,
         blockhash_query: BlockhashQuery::None(blockhash),
@@ -732,7 +683,6 @@ fn test_stake_authorize() {
         memo: None,
         fee_payer: 0,
         custodian: None,
-        no_wait: false,
     };
     config_offline.output_format = OutputFormat::JsonCompact;
     let sign_reply = process_command(&config_offline).unwrap();
@@ -742,12 +692,7 @@ fn test_stake_authorize() {
     config.signers = vec![&offline_presigner];
     config.command = CliCommand::StakeAuthorize {
         stake_account_pubkey,
-        new_authorizations: vec![StakeAuthorizationIndexed {
-            authorization_type: StakeAuthorize::Staker,
-            new_authority_pubkey: nonced_authority_pubkey,
-            authority: 0,
-            new_authority_signer: None,
-        }],
+        new_authorizations: vec![(StakeAuthorize::Staker, nonced_authority_pubkey, 0)],
         sign_only: false,
         dump_transaction_message: false,
         blockhash_query: BlockhashQuery::FeeCalculator(blockhash_query::Source::Cluster, blockhash),
@@ -756,7 +701,6 @@ fn test_stake_authorize() {
         memo: None,
         fee_payer: 0,
         custodian: None,
-        no_wait: false,
     };
     process_command(&config).unwrap();
     let stake_account = rpc_client.get_account(&stake_account_pubkey).unwrap();
@@ -798,12 +742,7 @@ fn test_stake_authorize() {
     config_offline.signers.push(&nonced_authority);
     config_offline.command = CliCommand::StakeAuthorize {
         stake_account_pubkey,
-        new_authorizations: vec![StakeAuthorizationIndexed {
-            authorization_type: StakeAuthorize::Staker,
-            new_authority_pubkey: online_authority_pubkey,
-            authority: 1,
-            new_authority_signer: None,
-        }],
+        new_authorizations: vec![(StakeAuthorize::Staker, online_authority_pubkey, 1)],
         sign_only: true,
         dump_transaction_message: false,
         blockhash_query: BlockhashQuery::None(nonce_hash),
@@ -812,7 +751,6 @@ fn test_stake_authorize() {
         memo: None,
         fee_payer: 0,
         custodian: None,
-        no_wait: false,
     };
     let sign_reply = process_command(&config_offline).unwrap();
     let sign_only = parse_sign_only_reply_string(&sign_reply);
@@ -823,12 +761,7 @@ fn test_stake_authorize() {
     config.signers = vec![&offline_presigner, &nonced_authority_presigner];
     config.command = CliCommand::StakeAuthorize {
         stake_account_pubkey,
-        new_authorizations: vec![StakeAuthorizationIndexed {
-            authorization_type: StakeAuthorize::Staker,
-            new_authority_pubkey: online_authority_pubkey,
-            authority: 1,
-            new_authority_signer: None,
-        }],
+        new_authorizations: vec![(StakeAuthorize::Staker, online_authority_pubkey, 1)],
         sign_only: false,
         dump_transaction_message: false,
         blockhash_query: BlockhashQuery::FeeCalculator(
@@ -840,7 +773,6 @@ fn test_stake_authorize() {
         memo: None,
         fee_payer: 0,
         custodian: None,
-        no_wait: false,
     };
     process_command(&config).unwrap();
     let stake_account = rpc_client.get_account(&stake_account_pubkey).unwrap();
@@ -870,12 +802,7 @@ fn test_stake_authorize_with_fee_payer() {
     let mint_keypair = Keypair::new();
     let mint_pubkey = mint_keypair.pubkey();
     let faucet_addr = run_local_faucet(mint_keypair, None);
-    let test_validator = TestValidator::with_custom_fees(
-        mint_pubkey,
-        SIG_FEE,
-        Some(faucet_addr),
-        SocketAddrSpace::Unspecified,
-    );
+    let test_validator = TestValidator::with_custom_fees(mint_pubkey, SIG_FEE, Some(faucet_addr));
 
     let rpc_client =
         RpcClient::new_with_commitment(test_validator.rpc_url(), CommitmentConfig::processed());
@@ -921,7 +848,6 @@ fn test_stake_authorize_with_fee_payer() {
         seed: None,
         staker: None,
         withdrawer: None,
-        withdrawer_signer: None,
         lockup: Lockup::default(),
         amount: SpendAmount::Some(50_000),
         sign_only: false,
@@ -941,12 +867,7 @@ fn test_stake_authorize_with_fee_payer() {
     config.signers = vec![&default_signer, &payer_keypair];
     config.command = CliCommand::StakeAuthorize {
         stake_account_pubkey,
-        new_authorizations: vec![StakeAuthorizationIndexed {
-            authorization_type: StakeAuthorize::Staker,
-            new_authority_pubkey: offline_pubkey,
-            authority: 0,
-            new_authority_signer: None,
-        }],
+        new_authorizations: vec![(StakeAuthorize::Staker, offline_pubkey, 0)],
         sign_only: false,
         dump_transaction_message: false,
         blockhash_query: BlockhashQuery::All(blockhash_query::Source::Cluster),
@@ -955,7 +876,6 @@ fn test_stake_authorize_with_fee_payer() {
         memo: None,
         fee_payer: 1,
         custodian: None,
-        no_wait: false,
     };
     process_command(&config).unwrap();
     // `config` balance has not changed, despite submitting the TX
@@ -968,12 +888,7 @@ fn test_stake_authorize_with_fee_payer() {
     let (blockhash, _) = rpc_client.get_recent_blockhash().unwrap();
     config_offline.command = CliCommand::StakeAuthorize {
         stake_account_pubkey,
-        new_authorizations: vec![StakeAuthorizationIndexed {
-            authorization_type: StakeAuthorize::Staker,
-            new_authority_pubkey: payer_pubkey,
-            authority: 0,
-            new_authority_signer: None,
-        }],
+        new_authorizations: vec![(StakeAuthorize::Staker, payer_pubkey, 0)],
         sign_only: true,
         dump_transaction_message: false,
         blockhash_query: BlockhashQuery::None(blockhash),
@@ -982,7 +897,6 @@ fn test_stake_authorize_with_fee_payer() {
         memo: None,
         fee_payer: 0,
         custodian: None,
-        no_wait: false,
     };
     config_offline.output_format = OutputFormat::JsonCompact;
     let sign_reply = process_command(&config_offline).unwrap();
@@ -992,12 +906,7 @@ fn test_stake_authorize_with_fee_payer() {
     config.signers = vec![&offline_presigner];
     config.command = CliCommand::StakeAuthorize {
         stake_account_pubkey,
-        new_authorizations: vec![StakeAuthorizationIndexed {
-            authorization_type: StakeAuthorize::Staker,
-            new_authority_pubkey: payer_pubkey,
-            authority: 0,
-            new_authority_signer: None,
-        }],
+        new_authorizations: vec![(StakeAuthorize::Staker, payer_pubkey, 0)],
         sign_only: false,
         dump_transaction_message: false,
         blockhash_query: BlockhashQuery::FeeCalculator(blockhash_query::Source::Cluster, blockhash),
@@ -1006,7 +915,6 @@ fn test_stake_authorize_with_fee_payer() {
         memo: None,
         fee_payer: 0,
         custodian: None,
-        no_wait: false,
     };
     process_command(&config).unwrap();
     // `config`'s balance again has not changed
@@ -1023,12 +931,7 @@ fn test_stake_split() {
     let mint_keypair = Keypair::new();
     let mint_pubkey = mint_keypair.pubkey();
     let faucet_addr = run_local_faucet(mint_keypair, None);
-    let test_validator = TestValidator::with_custom_fees(
-        mint_pubkey,
-        1,
-        Some(faucet_addr),
-        SocketAddrSpace::Unspecified,
-    );
+    let test_validator = TestValidator::with_custom_fees(mint_pubkey, 1, Some(faucet_addr));
 
     let rpc_client =
         RpcClient::new_with_commitment(test_validator.rpc_url(), CommitmentConfig::processed());
@@ -1066,7 +969,6 @@ fn test_stake_split() {
         seed: None,
         staker: Some(offline_pubkey),
         withdrawer: Some(offline_pubkey),
-        withdrawer_signer: None,
         lockup: Lockup::default(),
         amount: SpendAmount::Some(10 * minimum_stake_balance),
         sign_only: false,
@@ -1172,12 +1074,7 @@ fn test_stake_set_lockup() {
     let mint_keypair = Keypair::new();
     let mint_pubkey = mint_keypair.pubkey();
     let faucet_addr = run_local_faucet(mint_keypair, None);
-    let test_validator = TestValidator::with_custom_fees(
-        mint_pubkey,
-        1,
-        Some(faucet_addr),
-        SocketAddrSpace::Unspecified,
-    );
+    let test_validator = TestValidator::with_custom_fees(mint_pubkey, 1, Some(faucet_addr));
 
     let rpc_client =
         RpcClient::new_with_commitment(test_validator.rpc_url(), CommitmentConfig::processed());
@@ -1221,8 +1118,7 @@ fn test_stake_set_lockup() {
         stake_account: 1,
         seed: None,
         staker: Some(offline_pubkey),
-        withdrawer: Some(config.signers[0].pubkey()),
-        withdrawer_signer: None,
+        withdrawer: Some(offline_pubkey),
         lockup,
         amount: SpendAmount::Some(10 * minimum_stake_balance),
         sign_only: false,
@@ -1251,7 +1147,6 @@ fn test_stake_set_lockup() {
     config.command = CliCommand::StakeSetLockup {
         stake_account_pubkey,
         lockup,
-        new_custodian_signer: None,
         custodian: 0,
         sign_only: false,
         dump_transaction_message: false,
@@ -1287,7 +1182,6 @@ fn test_stake_set_lockup() {
     config.command = CliCommand::StakeSetLockup {
         stake_account_pubkey,
         lockup,
-        new_custodian_signer: None,
         custodian: 0,
         sign_only: false,
         dump_transaction_message: false,
@@ -1308,7 +1202,6 @@ fn test_stake_set_lockup() {
     config.command = CliCommand::StakeSetLockup {
         stake_account_pubkey,
         lockup,
-        new_custodian_signer: None,
         custodian: 1,
         sign_only: false,
         dump_transaction_message: false,
@@ -1341,7 +1234,6 @@ fn test_stake_set_lockup() {
     config.command = CliCommand::StakeSetLockup {
         stake_account_pubkey,
         lockup,
-        new_custodian_signer: None,
         custodian: 1,
         sign_only: false,
         dump_transaction_message: false,
@@ -1389,7 +1281,6 @@ fn test_stake_set_lockup() {
     config_offline.command = CliCommand::StakeSetLockup {
         stake_account_pubkey,
         lockup,
-        new_custodian_signer: None,
         custodian: 0,
         sign_only: true,
         dump_transaction_message: false,
@@ -1408,7 +1299,6 @@ fn test_stake_set_lockup() {
     config.command = CliCommand::StakeSetLockup {
         stake_account_pubkey,
         lockup,
-        new_custodian_signer: None,
         custodian: 0,
         sign_only: false,
         dump_transaction_message: false,
@@ -1443,8 +1333,7 @@ fn test_offline_nonced_create_stake_account_and_withdraw() {
     let mint_keypair = Keypair::new();
     let mint_pubkey = mint_keypair.pubkey();
     let faucet_addr = run_local_faucet(mint_keypair, None);
-    let test_validator =
-        TestValidator::with_no_fees(mint_pubkey, Some(faucet_addr), SocketAddrSpace::Unspecified);
+    let test_validator = TestValidator::with_no_fees(mint_pubkey, Some(faucet_addr));
 
     let rpc_client =
         RpcClient::new_with_commitment(test_validator.rpc_url(), CommitmentConfig::processed());
@@ -1504,7 +1393,6 @@ fn test_offline_nonced_create_stake_account_and_withdraw() {
         seed: None,
         staker: None,
         withdrawer: None,
-        withdrawer_signer: None,
         lockup: Lockup::default(),
         amount: SpendAmount::Some(50_000),
         sign_only: true,
@@ -1528,7 +1416,6 @@ fn test_offline_nonced_create_stake_account_and_withdraw() {
         seed: None,
         staker: Some(offline_pubkey),
         withdrawer: None,
-        withdrawer_signer: None,
         lockup: Lockup::default(),
         amount: SpendAmount::Some(50_000),
         sign_only: false,
@@ -1563,7 +1450,7 @@ fn test_offline_nonced_create_stake_account_and_withdraw() {
     config_offline.command = CliCommand::WithdrawStake {
         stake_account_pubkey: stake_pubkey,
         destination_account_pubkey: recipient_pubkey,
-        amount: SpendAmount::Some(42),
+        lamports: 42,
         withdraw_authority: 0,
         custodian: None,
         sign_only: true,
@@ -1572,7 +1459,6 @@ fn test_offline_nonced_create_stake_account_and_withdraw() {
         nonce_account: Some(nonce_pubkey),
         nonce_authority: 0,
         memo: None,
-        seed: None,
         fee_payer: 0,
     };
     let sig_response = process_command(&config_offline).unwrap();
@@ -1582,7 +1468,7 @@ fn test_offline_nonced_create_stake_account_and_withdraw() {
     config.command = CliCommand::WithdrawStake {
         stake_account_pubkey: stake_pubkey,
         destination_account_pubkey: recipient_pubkey,
-        amount: SpendAmount::Some(42),
+        lamports: 42,
         withdraw_authority: 0,
         custodian: None,
         sign_only: false,
@@ -1594,7 +1480,6 @@ fn test_offline_nonced_create_stake_account_and_withdraw() {
         nonce_account: Some(nonce_pubkey),
         nonce_authority: 0,
         memo: None,
-        seed: None,
         fee_payer: 0,
     };
     process_command(&config).unwrap();
@@ -1618,7 +1503,6 @@ fn test_offline_nonced_create_stake_account_and_withdraw() {
         seed: Some(seed.to_string()),
         staker: None,
         withdrawer: None,
-        withdrawer_signer: None,
         lockup: Lockup::default(),
         amount: SpendAmount::Some(50_000),
         sign_only: true,
@@ -1640,7 +1524,6 @@ fn test_offline_nonced_create_stake_account_and_withdraw() {
         seed: Some(seed.to_string()),
         staker: Some(offline_pubkey),
         withdrawer: Some(offline_pubkey),
-        withdrawer_signer: None,
         lockup: Lockup::default(),
         amount: SpendAmount::Some(50_000),
         sign_only: false,
@@ -1657,232 +1540,6 @@ fn test_offline_nonced_create_stake_account_and_withdraw() {
     };
     process_command(&config).unwrap();
     let seed_address =
-        Pubkey::create_with_seed(&stake_pubkey, seed, &stake::program::id()).unwrap();
+        Pubkey::create_with_seed(&stake_pubkey, seed, &solana_stake_program::id()).unwrap();
     check_recent_balance(50_000, &rpc_client, &seed_address);
 }
-
-#[test]
-fn test_stake_checked_instructions() {
-    solana_logger::setup();
-
-    let mint_keypair = Keypair::new();
-    let mint_pubkey = mint_keypair.pubkey();
-    let faucet_addr = run_local_faucet(mint_keypair, None);
-    let test_validator =
-        TestValidator::with_no_fees(mint_pubkey, Some(faucet_addr), SocketAddrSpace::Unspecified);
-
-    let rpc_client =
-        RpcClient::new_with_commitment(test_validator.rpc_url(), CommitmentConfig::processed());
-    let default_signer = Keypair::new();
-
-    let mut config = CliConfig::recent_for_tests();
-    config.json_rpc_url = test_validator.rpc_url();
-    config.signers = vec![&default_signer];
-
-    request_and_confirm_airdrop(&rpc_client, &config, &config.signers[0].pubkey(), 100_000)
-        .unwrap();
-
-    // Create stake account with withdrawer
-    let stake_keypair = Keypair::new();
-    let stake_account_pubkey = stake_keypair.pubkey();
-    let withdrawer_keypair = Keypair::new();
-    let withdrawer_pubkey = withdrawer_keypair.pubkey();
-    config.signers.push(&stake_keypair);
-    config.command = CliCommand::CreateStakeAccount {
-        stake_account: 1,
-        seed: None,
-        staker: None,
-        withdrawer: Some(withdrawer_pubkey),
-        withdrawer_signer: Some(1),
-        lockup: Lockup::default(),
-        amount: SpendAmount::Some(50_000),
-        sign_only: false,
-        dump_transaction_message: false,
-        blockhash_query: BlockhashQuery::All(blockhash_query::Source::Cluster),
-        nonce_account: None,
-        nonce_authority: 0,
-        memo: None,
-        fee_payer: 0,
-        from: 0,
-    };
-    process_command(&config).unwrap_err(); // unsigned authority should fail
-
-    config.signers = vec![&default_signer, &stake_keypair, &withdrawer_keypair];
-    config.command = CliCommand::CreateStakeAccount {
-        stake_account: 1,
-        seed: None,
-        staker: None,
-        withdrawer: Some(withdrawer_pubkey),
-        withdrawer_signer: Some(1),
-        lockup: Lockup::default(),
-        amount: SpendAmount::Some(50_000),
-        sign_only: false,
-        dump_transaction_message: false,
-        blockhash_query: BlockhashQuery::All(blockhash_query::Source::Cluster),
-        nonce_account: None,
-        nonce_authority: 0,
-        memo: None,
-        fee_payer: 0,
-        from: 0,
-    };
-    process_command(&config).unwrap();
-
-    // Re-authorize account, checking new authority
-    let staker_keypair = Keypair::new();
-    let staker_pubkey = staker_keypair.pubkey();
-    config.signers = vec![&default_signer];
-    config.command = CliCommand::StakeAuthorize {
-        stake_account_pubkey,
-        new_authorizations: vec![StakeAuthorizationIndexed {
-            authorization_type: StakeAuthorize::Staker,
-            new_authority_pubkey: staker_pubkey,
-            authority: 0,
-            new_authority_signer: Some(0),
-        }],
-        sign_only: false,
-        dump_transaction_message: false,
-        blockhash_query: BlockhashQuery::default(),
-        nonce_account: None,
-        nonce_authority: 0,
-        memo: None,
-        fee_payer: 0,
-        custodian: None,
-        no_wait: false,
-    };
-    process_command(&config).unwrap_err(); // unsigned authority should fail
-
-    config.signers = vec![&default_signer, &staker_keypair];
-    config.command = CliCommand::StakeAuthorize {
-        stake_account_pubkey,
-        new_authorizations: vec![StakeAuthorizationIndexed {
-            authorization_type: StakeAuthorize::Staker,
-            new_authority_pubkey: staker_pubkey,
-            authority: 0,
-            new_authority_signer: Some(1),
-        }],
-        sign_only: false,
-        dump_transaction_message: false,
-        blockhash_query: BlockhashQuery::default(),
-        nonce_account: None,
-        nonce_authority: 0,
-        memo: None,
-        fee_payer: 0,
-        custodian: None,
-        no_wait: false,
-    };
-    process_command(&config).unwrap();
-    let stake_account = rpc_client.get_account(&stake_account_pubkey).unwrap();
-    let stake_state: StakeState = stake_account.state().unwrap();
-    let current_authority = match stake_state {
-        StakeState::Initialized(meta) => meta.authorized.staker,
-        _ => panic!("Unexpected stake state!"),
-    };
-    assert_eq!(current_authority, staker_pubkey);
-
-    let new_withdrawer_keypair = Keypair::new();
-    let new_withdrawer_pubkey = new_withdrawer_keypair.pubkey();
-    config.signers = vec![&default_signer, &withdrawer_keypair];
-    config.command = CliCommand::StakeAuthorize {
-        stake_account_pubkey,
-        new_authorizations: vec![StakeAuthorizationIndexed {
-            authorization_type: StakeAuthorize::Withdrawer,
-            new_authority_pubkey: new_withdrawer_pubkey,
-            authority: 1,
-            new_authority_signer: Some(1),
-        }],
-        sign_only: false,
-        dump_transaction_message: false,
-        blockhash_query: BlockhashQuery::default(),
-        nonce_account: None,
-        nonce_authority: 0,
-        memo: None,
-        fee_payer: 0,
-        custodian: None,
-        no_wait: false,
-    };
-    process_command(&config).unwrap_err(); // unsigned authority should fail
-
-    config.signers = vec![
-        &default_signer,
-        &withdrawer_keypair,
-        &new_withdrawer_keypair,
-    ];
-    config.command = CliCommand::StakeAuthorize {
-        stake_account_pubkey,
-        new_authorizations: vec![StakeAuthorizationIndexed {
-            authorization_type: StakeAuthorize::Withdrawer,
-            new_authority_pubkey: new_withdrawer_pubkey,
-            authority: 1,
-            new_authority_signer: Some(2),
-        }],
-        sign_only: false,
-        dump_transaction_message: false,
-        blockhash_query: BlockhashQuery::default(),
-        nonce_account: None,
-        nonce_authority: 0,
-        memo: None,
-        fee_payer: 0,
-        custodian: None,
-        no_wait: false,
-    };
-    process_command(&config).unwrap();
-    let stake_account = rpc_client.get_account(&stake_account_pubkey).unwrap();
-    let stake_state: StakeState = stake_account.state().unwrap();
-    let current_authority = match stake_state {
-        StakeState::Initialized(meta) => meta.authorized.withdrawer,
-        _ => panic!("Unexpected stake state!"),
-    };
-    assert_eq!(current_authority, new_withdrawer_pubkey);
-
-    // Set lockup, checking new custodian
-    let custodian = Keypair::new();
-    let custodian_pubkey = custodian.pubkey();
-    let lockup = LockupArgs {
-        unix_timestamp: Some(1_581_534_570),
-        epoch: Some(200),
-        custodian: Some(custodian_pubkey),
-    };
-    config.signers = vec![&default_signer, &new_withdrawer_keypair];
-    config.command = CliCommand::StakeSetLockup {
-        stake_account_pubkey,
-        lockup,
-        new_custodian_signer: Some(1),
-        custodian: 1,
-        sign_only: false,
-        dump_transaction_message: false,
-        blockhash_query: BlockhashQuery::default(),
-        nonce_account: None,
-        nonce_authority: 0,
-        memo: None,
-        fee_payer: 0,
-    };
-    process_command(&config).unwrap_err(); // unsigned new custodian should fail
-
-    config.signers = vec![&default_signer, &new_withdrawer_keypair, &custodian];
-    config.command = CliCommand::StakeSetLockup {
-        stake_account_pubkey,
-        lockup,
-        new_custodian_signer: Some(2),
-        custodian: 1,
-        sign_only: false,
-        dump_transaction_message: false,
-        blockhash_query: BlockhashQuery::default(),
-        nonce_account: None,
-        nonce_authority: 0,
-        memo: None,
-        fee_payer: 0,
-    };
-    process_command(&config).unwrap();
-    let stake_account = rpc_client.get_account(&stake_account_pubkey).unwrap();
-    let stake_state: StakeState = stake_account.state().unwrap();
-    let current_lockup = match stake_state {
-        StakeState::Initialized(meta) => meta.lockup,
-        _ => panic!("Unexpected stake state!"),
-    };
-    assert_eq!(
-        current_lockup.unix_timestamp,
-        lockup.unix_timestamp.unwrap()
-    );
-    assert_eq!(current_lockup.epoch, lockup.epoch.unwrap());
-    assert_eq!(current_lockup.custodian, custodian_pubkey);
-}

cli/tests/transfer.rs

@@ -16,9 +16,7 @@ use solana_sdk::{
     nonce::State as NonceState,
     pubkey::Pubkey,
     signature::{keypair_from_seed, Keypair, NullSigner, Signer},
-    stake,
 };
-use solana_streamer::socket::SocketAddrSpace;
 
 #[test]
 fn test_transfer() {
@@ -26,12 +24,7 @@ fn test_transfer() {
     let mint_keypair = Keypair::new();
     let mint_pubkey = mint_keypair.pubkey();
     let faucet_addr = run_local_faucet(mint_keypair, None);
-    let test_validator = TestValidator::with_custom_fees(
-        mint_pubkey,
-        1,
-        Some(faucet_addr),
-        SocketAddrSpace::Unspecified,
-    );
+    let test_validator = TestValidator::with_custom_fees(mint_pubkey, 1, Some(faucet_addr));
 
     let rpc_client =
         RpcClient::new_with_commitment(test_validator.rpc_url(), CommitmentConfig::processed());
@@ -283,12 +276,7 @@ fn test_transfer_multisession_signing() {
     let mint_keypair = Keypair::new();
     let mint_pubkey = mint_keypair.pubkey();
     let faucet_addr = run_local_faucet(mint_keypair, None);
-    let test_validator = TestValidator::with_custom_fees(
-        mint_pubkey,
-        1,
-        Some(faucet_addr),
-        SocketAddrSpace::Unspecified,
-    );
+    let test_validator = TestValidator::with_custom_fees(mint_pubkey, 1, Some(faucet_addr));
 
     let to_pubkey = Pubkey::new(&[1u8; 32]);
     let offline_from_signer = keypair_from_seed(&[2u8; 32]).unwrap();
@@ -415,12 +403,7 @@ fn test_transfer_all() {
     let mint_keypair = Keypair::new();
     let mint_pubkey = mint_keypair.pubkey();
     let faucet_addr = run_local_faucet(mint_keypair, None);
-    let test_validator = TestValidator::with_custom_fees(
-        mint_pubkey,
-        1,
-        Some(faucet_addr),
-        SocketAddrSpace::Unspecified,
-    );
+    let test_validator = TestValidator::with_custom_fees(mint_pubkey, 1, Some(faucet_addr));
 
     let rpc_client =
         RpcClient::new_with_commitment(test_validator.rpc_url(), CommitmentConfig::processed());
@@ -468,12 +451,7 @@ fn test_transfer_unfunded_recipient() {
     let mint_keypair = Keypair::new();
     let mint_pubkey = mint_keypair.pubkey();
     let faucet_addr = run_local_faucet(mint_keypair, None);
-    let test_validator = TestValidator::with_custom_fees(
-        mint_pubkey,
-        1,
-        Some(faucet_addr),
-        SocketAddrSpace::Unspecified,
-    );
+    let test_validator = TestValidator::with_custom_fees(mint_pubkey, 1, Some(faucet_addr));
 
     let rpc_client =
         RpcClient::new_with_commitment(test_validator.rpc_url(), CommitmentConfig::processed());
@@ -521,12 +499,7 @@ fn test_transfer_with_seed() {
     let mint_keypair = Keypair::new();
     let mint_pubkey = mint_keypair.pubkey();
     let faucet_addr = run_local_faucet(mint_keypair, None);
-    let test_validator = TestValidator::with_custom_fees(
-        mint_pubkey,
-        1,
-        Some(faucet_addr),
-        SocketAddrSpace::Unspecified,
-    );
+    let test_validator = TestValidator::with_custom_fees(mint_pubkey, 1, Some(faucet_addr));
 
     let rpc_client =
         RpcClient::new_with_commitment(test_validator.rpc_url(), CommitmentConfig::processed());
@@ -540,7 +513,7 @@ fn test_transfer_with_seed() {
     let sender_pubkey = config.signers[0].pubkey();
     let recipient_pubkey = Pubkey::new(&[1u8; 32]);
     let derived_address_seed = "seed".to_string();
-    let derived_address_program_id = stake::program::id();
+    let derived_address_program_id = solana_stake_program::id();
     let derived_address = Pubkey::create_with_seed(
         &sender_pubkey,
         &derived_address_seed,

cli/tests/vote.rs

@@ -14,7 +14,6 @@ use solana_sdk::{
     commitment_config::CommitmentConfig,
     signature::{Keypair, Signer},
 };
-use solana_streamer::socket::SocketAddrSpace;
 use solana_vote_program::vote_state::{VoteAuthorize, VoteState, VoteStateVersions};
 
 #[test]
@@ -22,8 +21,7 @@ fn test_vote_authorize_and_withdraw() {
     let mint_keypair = Keypair::new();
     let mint_pubkey = mint_keypair.pubkey();
     let faucet_addr = run_local_faucet(mint_keypair, None);
-    let test_validator =
-        TestValidator::with_no_fees(mint_pubkey, Some(faucet_addr), SocketAddrSpace::Unspecified);
+    let test_validator = TestValidator::with_no_fees(mint_pubkey, Some(faucet_addr));
 
     let rpc_client =
         RpcClient::new_with_commitment(test_validator.rpc_url(), CommitmentConfig::processed());
@@ -45,7 +43,7 @@ fn test_vote_authorize_and_withdraw() {
         seed: None,
         identity_account: 0,
         authorized_voter: None,
-        authorized_withdrawer: config.signers[0].pubkey(),
+        authorized_withdrawer: Some(config.signers[0].pubkey()),
         commission: 0,
         memo: None,
     };
@@ -85,48 +83,13 @@ fn test_vote_authorize_and_withdraw() {
     check_recent_balance(expected_balance, &rpc_client, &vote_account_pubkey);
 
     // Authorize vote account withdrawal to another signer
-    let first_withdraw_authority = Keypair::new();
+    let withdraw_authority = Keypair::new();
     config.signers = vec![&default_signer];
-    config.command = CliCommand::VoteAuthorize {
-        vote_account_pubkey,
-        new_authorized_pubkey: first_withdraw_authority.pubkey(),
-        vote_authorize: VoteAuthorize::Withdrawer,
-        memo: None,
-        authorized: 0,
-        new_authorized: None,
-    };
-    process_command(&config).unwrap();
-    let vote_account = rpc_client
-        .get_account(&vote_account_keypair.pubkey())
-        .unwrap();
-    let vote_state: VoteStateVersions = vote_account.state().unwrap();
-    let authorized_withdrawer = vote_state.convert_to_current().authorized_withdrawer;
-    assert_eq!(authorized_withdrawer, first_withdraw_authority.pubkey());
-
-    // Authorize vote account withdrawal to another signer with checked instruction
-    let withdraw_authority = Keypair::new();
-    config.signers = vec![&default_signer, &first_withdraw_authority];
     config.command = CliCommand::VoteAuthorize {
         vote_account_pubkey,
         new_authorized_pubkey: withdraw_authority.pubkey(),
         vote_authorize: VoteAuthorize::Withdrawer,
         memo: None,
-        authorized: 1,
-        new_authorized: Some(1),
-    };
-    process_command(&config).unwrap_err(); // unsigned by new authority should fail
-    config.signers = vec![
-        &default_signer,
-        &first_withdraw_authority,
-        &withdraw_authority,
-    ];
-    config.command = CliCommand::VoteAuthorize {
-        vote_account_pubkey,
-        new_authorized_pubkey: withdraw_authority.pubkey(),
-        vote_authorize: VoteAuthorize::Withdrawer,
-        memo: None,
-        authorized: 1,
-        new_authorized: Some(2),
     };
     process_command(&config).unwrap();
     let vote_account = rpc_client

client/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "solana-client"
-version = "1.7.18"
+version = "1.6.6"
 description = "Solana Client"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -15,7 +15,7 @@ bincode = "1.3.1"
 bs58 = "0.3.1"
 clap = "2.33.0"
 indicatif = "0.15.0"
-jsonrpc-core = "18.0.0"
+jsonrpc-core = "17.0.0"
 log = "0.4.11"
 net2 = "0.2.37"
 rayon = "1.5.0"
@@ -24,14 +24,14 @@ semver = "0.11.0"
 serde = "1.0.122"
 serde_derive = "1.0.103"
 serde_json = "1.0.56"
-solana-account-decoder = { path = "../account-decoder", version = "=1.7.18" }
-solana-clap-utils = { path = "../clap-utils", version = "=1.7.18" }
-solana-faucet = { path = "../faucet", version = "=1.7.18" }
-solana-net-utils = { path = "../net-utils", version = "=1.7.18" }
-solana-sdk = { path = "../sdk", version = "=1.7.18" }
-solana-transaction-status = { path = "../transaction-status", version = "=1.7.18" }
-solana-version = { path = "../version", version = "=1.7.18" }
-solana-vote-program = { path = "../programs/vote", version = "=1.7.18" }
+solana-account-decoder = { path = "../account-decoder", version = "=1.6.6" }
+solana-clap-utils = { path = "../clap-utils", version = "=1.6.6" }
+solana-faucet = { path = "../faucet", version = "=1.6.6" }
+solana-net-utils = { path = "../net-utils", version = "=1.6.6" }
+solana-sdk = { path = "../sdk", version = "=1.6.6" }
+solana-transaction-status = { path = "../transaction-status", version = "=1.6.6" }
+solana-version = { path = "../version", version = "=1.6.6" }
+solana-vote-program = { path = "../programs/vote", version = "=1.6.6" }
 thiserror = "1.0"
 tokio = { version = "1", features = ["full"] }
 tungstenite = "0.10.1"
@@ -39,8 +39,8 @@ url = "2.1.1"
 
 [dev-dependencies]
 assert_matches = "1.3.0"
-jsonrpc-http-server = "18.0.0"
-solana-logger = { path = "../logger", version = "=1.7.18" }
+jsonrpc-http-server = "17.0.0"
+solana-logger = { path = "../logger", version = "=1.6.6" }
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]

client/src/blockhash_query.rs

@@ -122,10 +122,10 @@ mod tests {
     use crate::{
         blockhash_query,
         rpc_request::RpcRequest,
-        rpc_response::{Response, RpcFeeCalculator, RpcFees, RpcResponseContext},
+        rpc_response::{Response, RpcFeeCalculator, RpcResponseContext},
     };
     use clap::App;
-    use serde_json::{self, json};
+    use serde_json::{self, json, Value};
     use solana_account_decoder::{UiAccount, UiAccountEncoding};
     use solana_sdk::{account::Account, hash::hash, nonce, system_program};
     use std::collections::HashMap;
@@ -288,12 +288,10 @@ mod tests {
         let rpc_fee_calc = FeeCalculator::new(42);
         let get_recent_blockhash_response = json!(Response {
             context: RpcResponseContext { slot: 1 },
-            value: json!(RpcFees {
-                blockhash: rpc_blockhash.to_string(),
-                fee_calculator: rpc_fee_calc.clone(),
-                last_valid_slot: 42,
-                last_valid_block_height: 42,
-            }),
+            value: json!((
+                Value::String(rpc_blockhash.to_string()),
+                serde_json::to_value(rpc_fee_calc.clone()).unwrap()
+            )),
         });
         let get_fee_calculator_for_blockhash_response = json!(Response {
             context: RpcResponseContext { slot: 1 },
@@ -302,7 +300,10 @@ mod tests {
             }),
         });
         let mut mocks = HashMap::new();
-        mocks.insert(RpcRequest::GetFees, get_recent_blockhash_response.clone());
+        mocks.insert(
+            RpcRequest::GetRecentBlockhash,
+            get_recent_blockhash_response.clone(),
+        );
         let rpc_client = RpcClient::new_mock_with_mocks("".to_string(), mocks);
         assert_eq!(
             BlockhashQuery::default()
@@ -311,7 +312,10 @@ mod tests {
             (rpc_blockhash, rpc_fee_calc.clone()),
         );
         let mut mocks = HashMap::new();
-        mocks.insert(RpcRequest::GetFees, get_recent_blockhash_response.clone());
+        mocks.insert(
+            RpcRequest::GetRecentBlockhash,
+            get_recent_blockhash_response.clone(),
+        );
         mocks.insert(
             RpcRequest::GetFeeCalculatorForBlockhash,
             get_fee_calculator_for_blockhash_response,
@@ -324,7 +328,10 @@ mod tests {
             (test_blockhash, rpc_fee_calc),
         );
         let mut mocks = HashMap::new();
-        mocks.insert(RpcRequest::GetFees, get_recent_blockhash_response);
+        mocks.insert(
+            RpcRequest::GetRecentBlockhash,
+            get_recent_blockhash_response,
+        );
         let rpc_client = RpcClient::new_mock_with_mocks("".to_string(), mocks);
         assert_eq!(
             BlockhashQuery::None(test_blockhash)
@@ -354,7 +361,7 @@ mod tests {
         let nonce_pubkey = Pubkey::new(&[4u8; 32]);
         let rpc_nonce_account = UiAccount::encode(
             &nonce_pubkey,
-            &nonce_account,
+            nonce_account,
             UiAccountEncoding::Base64,
             None,
             None,

client/src/client_error.rs

@@ -1,5 +1,5 @@
 use {
-    crate::{rpc_request, rpc_response},
+    crate::rpc_request,
     solana_faucet::faucet::FaucetError,
     solana_sdk::{
         signature::SignerError, transaction::TransactionError, transport::TransportError,
@@ -30,24 +30,6 @@ pub enum ClientErrorKind {
     Custom(String),
 }
 
-impl ClientErrorKind {
-    pub fn get_transaction_error(&self) -> Option<TransactionError> {
-        match self {
-            Self::RpcError(rpc_request::RpcError::RpcResponseError {
-                data:
-                    rpc_request::RpcResponseErrorData::SendTransactionPreflightFailure(
-                        rpc_response::RpcSimulateTransactionResult {
-                            err: Some(tx_err), ..
-                        },
-                    ),
-                ..
-            }) => Some(tx_err.clone()),
-            Self::TransactionError(tx_err) => Some(tx_err.clone()),
-            _ => None,
-        }
-    }
-}
-
 impl From<TransportError> for ClientErrorKind {
     fn from(err: TransportError) -> Self {
         match err {
@@ -104,10 +86,6 @@ impl ClientError {
     pub fn kind(&self) -> &ClientErrorKind {
         &self.kind
     }
-
-    pub fn get_transaction_error(&self) -> Option<TransactionError> {
-        self.kind.get_transaction_error()
-    }
 }
 
 impl From<ClientErrorKind> for ClientError {

client/src/http_sender.rs

@@ -1,26 +1,20 @@
-//! The standard [`RpcSender`] over HTTP.
-
 use {
     crate::{
         client_error::Result,
         rpc_custom_error,
         rpc_request::{RpcError, RpcRequest, RpcResponseErrorData},
         rpc_response::RpcSimulateTransactionResult,
-        rpc_sender::*,
+        rpc_sender::RpcSender,
     },
     log::*,
-    reqwest::{
-        self,
-        header::{CONTENT_TYPE, RETRY_AFTER},
-        StatusCode,
-    },
+    reqwest::{self, header::CONTENT_TYPE, StatusCode},
     std::{
         sync::{
             atomic::{AtomicU64, Ordering},
-            Arc, RwLock,
+            Arc,
         },
         thread::sleep,
-        time::{Duration, Instant},
+        time::Duration,
     },
 };
 
@@ -28,22 +22,13 @@ pub struct HttpSender {
     client: Arc<reqwest::blocking::Client>,
     url: String,
     request_id: AtomicU64,
-    stats: RwLock<RpcTransportStats>,
 }
 
-/// The standard [`RpcSender`] over HTTP.
 impl HttpSender {
-    /// Create an HTTP RPC sender.
-    ///
-    /// The URL is an HTTP URL, usually for port 8899, as in
-    /// "http://localhost:8899". The sender has a default timeout of 30 seconds.
     pub fn new(url: String) -> Self {
         Self::new_with_timeout(url, Duration::from_secs(30))
     }
 
-    /// Create an HTTP RPC sender.
-    ///
-    /// The URL is an HTTP URL, usually for port 8899.
     pub fn new_with_timeout(url: String, timeout: Duration) -> Self {
         // `reqwest::blocking::Client` panics if run in a tokio async context.  Shuttle the
         // request to a different tokio thread to avoid this
@@ -60,7 +45,6 @@ impl HttpSender {
             client,
             url,
             request_id: AtomicU64::new(0),
-            stats: RwLock::new(RpcTransportStats::default()),
         }
     }
 }
@@ -69,45 +53,11 @@ impl HttpSender {
 struct RpcErrorObject {
     code: i64,
     message: String,
-}
-
-struct StatsUpdater<'a> {
-    stats: &'a RwLock<RpcTransportStats>,
-    request_start_time: Instant,
-    rate_limited_time: Duration,
-}
-
-impl<'a> StatsUpdater<'a> {
-    fn new(stats: &'a RwLock<RpcTransportStats>) -> Self {
-        Self {
-            stats,
-            request_start_time: Instant::now(),
-            rate_limited_time: Duration::default(),
-        }
-    }
-
-    fn add_rate_limited_time(&mut self, duration: Duration) {
-        self.rate_limited_time += duration;
-    }
-}
-
-impl<'a> Drop for StatsUpdater<'a> {
-    fn drop(&mut self) {
-        let mut stats = self.stats.write().unwrap();
-        stats.request_count += 1;
-        stats.elapsed_time += Instant::now().duration_since(self.request_start_time);
-        stats.rate_limited_time += self.rate_limited_time;
-    }
+    data: serde_json::Value,
 }
 
 impl RpcSender for HttpSender {
-    fn get_transport_stats(&self) -> RpcTransportStats {
-        self.stats.read().unwrap().clone()
-    }
-
     fn send(&self, request: RpcRequest, params: serde_json::Value) -> Result<serde_json::Value> {
-        let mut stats_updater = StatsUpdater::new(&self.stats);
-
         let request_id = self.request_id.fetch_add(1, Ordering::Relaxed);
         let request_json = request.build_request_json(request_id, params).to_string();
 
@@ -125,42 +75,35 @@ impl RpcSender for HttpSender {
                         .body(request_json)
                         .send()
                 })
-            }?;
+            };
 
-            if !response.status().is_success() {
-                if response.status() == StatusCode::TOO_MANY_REQUESTS
-                    && too_many_requests_retries > 0
-                {
-                    let mut duration = Duration::from_millis(500);
-                    if let Some(retry_after) = response.headers().get(RETRY_AFTER) {
-                        if let Ok(retry_after) = retry_after.to_str() {
-                            if let Ok(retry_after) = retry_after.parse::<u64>() {
-                                if retry_after < 120 {
-                                    duration = Duration::from_secs(retry_after);
-                                }
-                            }
-                        }
-                    }
-
-                    too_many_requests_retries -= 1;
-                    debug!(
-                                "Too many requests: server responded with {:?}, {} retries left, pausing for {:?}",
-                                response, too_many_requests_retries, duration
+            match response {
+                Ok(response) => {
+                    if !response.status().is_success() {
+                        if response.status() == StatusCode::TOO_MANY_REQUESTS
+                            && too_many_requests_retries > 0
+                        {
+                            too_many_requests_retries -= 1;
+                            debug!(
+                                "Server responded with {:?}, {} retries left",
+                                response, too_many_requests_retries
                             );
 
-                    sleep(duration);
-                    stats_updater.add_rate_limited_time(duration);
-                    continue;
-                }
-                return Err(response.error_for_status().unwrap_err().into());
-            }
+                            // Sleep for 500ms to give the server a break
+                            sleep(Duration::from_millis(500));
+                            continue;
+                        }
+                        return Err(response.error_for_status().unwrap_err().into());
+                    }
 
-            let mut json =
-                tokio::task::block_in_place(move || response.json::<serde_json::Value>())?;
-            if json["error"].is_object() {
-                return match serde_json::from_value::<RpcErrorObject>(json["error"].clone()) {
-                    Ok(rpc_error_object) => {
-                        let data = match rpc_error_object.code {
+                    let response_text = tokio::task::block_in_place(move || response.text())?;
+
+                    let json: serde_json::Value = serde_json::from_str(&response_text)?;
+                    if json["error"].is_object() {
+                        return match serde_json::from_value::<RpcErrorObject>(json["error"].clone())
+                        {
+                            Ok(rpc_error_object) => {
+                                let data = match rpc_error_object.code {
                                     rpc_custom_error::JSON_RPC_SERVER_ERROR_SEND_TRANSACTION_PREFLIGHT_FAILURE => {
                                         match serde_json::from_value::<RpcSimulateTransactionResult>(json["error"]["data"].clone()) {
                                             Ok(data) => RpcResponseErrorData::SendTransactionPreflightFailure(data),
@@ -181,22 +124,27 @@ impl RpcSender for HttpSender {
                                     _ => RpcResponseErrorData::Empty
                                 };
 
-                        Err(RpcError::RpcResponseError {
-                            code: rpc_error_object.code,
-                            message: rpc_error_object.message,
-                            data,
-                        }
-                        .into())
+                                Err(RpcError::RpcResponseError {
+                                    code: rpc_error_object.code,
+                                    message: rpc_error_object.message,
+                                    data,
+                                }
+                                .into())
+                            }
+                            Err(err) => Err(RpcError::RpcRequestError(format!(
+                                "Failed to deserialize RPC error response: {} [{}]",
+                                serde_json::to_string(&json["error"]).unwrap(),
+                                err
+                            ))
+                            .into()),
+                        };
                     }
-                    Err(err) => Err(RpcError::RpcRequestError(format!(
-                        "Failed to deserialize RPC error response: {} [{}]",
-                        serde_json::to_string(&json["error"]).unwrap(),
-                        err
-                    ))
-                    .into()),
-                };
+                    return Ok(json["result"].clone());
+                }
+                Err(err) => {
+                    return Err(err.into());
+                }
             }
-            return Ok(json["result"].take());
         }
     }
 }

client/src/lib.rs

@@ -13,10 +13,8 @@ pub mod rpc_cache;
 pub mod rpc_client;
 pub mod rpc_config;
 pub mod rpc_custom_error;
-pub mod rpc_deprecated_config;
 pub mod rpc_filter;
 pub mod rpc_request;
 pub mod rpc_response;
 pub mod rpc_sender;
 pub mod thin_client;
-pub mod tpu_client;

client/src/mock_sender.rs

@@ -1,42 +1,21 @@
-//! An [`RpcSender`] used for unit testing [`RpcClient`](crate::rpc_client::RpcClient).
-
 use {
     crate::{
         client_error::Result,
-        rpc_config::RpcBlockProductionConfig,
         rpc_request::RpcRequest,
-        rpc_response::{
-            Response, RpcAccountBalance, RpcBlockProduction, RpcBlockProductionRange,
-            RpcConfirmedTransactionStatusWithSignature, RpcContactInfo, RpcFees, RpcIdentity,
-            RpcInflationGovernor, RpcInflationRate, RpcInflationReward, RpcKeyedAccount,
-            RpcPerfSample, RpcResponseContext, RpcSimulateTransactionResult, RpcStakeActivation,
-            RpcSupply, RpcVersionInfo, RpcVoteAccountInfo, RpcVoteAccountStatus,
-            StakeActivationState,
-        },
-        rpc_sender::*,
+        rpc_response::{Response, RpcResponseContext, RpcVersionInfo},
+        rpc_sender::RpcSender,
     },
     serde_json::{json, Number, Value},
-    solana_account_decoder::{UiAccount, UiAccountEncoding},
     solana_sdk::{
-        account::Account,
-        clock::{Slot, UnixTimestamp},
         epoch_info::EpochInfo,
         fee_calculator::{FeeCalculator, FeeRateGovernor},
         instruction::InstructionError,
-        message::MessageHeader,
-        pubkey::Pubkey,
         signature::Signature,
-        sysvar::epoch_schedule::EpochSchedule,
         transaction::{self, Transaction, TransactionError},
     },
-    solana_transaction_status::{
-        EncodedConfirmedBlock, EncodedConfirmedTransaction, EncodedTransaction,
-        EncodedTransactionWithStatusMeta, Rewards, TransactionConfirmationStatus,
-        TransactionStatus, UiCompiledInstruction, UiMessage, UiRawMessage, UiTransaction,
-        UiTransactionEncoding, UiTransactionStatusMeta,
-    },
+    solana_transaction_status::{TransactionConfirmationStatus, TransactionStatus},
     solana_version::Version,
-    std::{collections::HashMap, net::SocketAddr, str::FromStr, sync::RwLock},
+    std::{collections::HashMap, sync::RwLock},
 };
 
 pub const PUBKEY: &str = "7RoSF9fUmdphVCpabEoefH81WwrW7orsWonXWqTXkKV8";
@@ -49,31 +28,6 @@ pub struct MockSender {
     url: String,
 }
 
-/// An [`RpcSender`] used for unit testing [`RpcClient`](crate::rpc_client::RpcClient).
-///
-/// This is primarily for internal use.
-///
-/// Unless directed otherwise, it will generally return a reasonable default
-/// response, at least for [`RpcRequest`] values for which responses have been
-/// implemented.
-///
-/// The behavior can be customized in two ways:
-///
-/// 1) The `url` constructor argument is not actually a URL, but a simple string
-///    directive that changes `MockSender`s behavior in specific scenarios.
-///
-///    If `url` is "fails" then any call to `send` will return `Ok(Value::Null)`.
-///
-///    It is customary to set the `url` to "succeeds" for mocks that should
-///    return sucessfully, though this value is not actually interpreted.
-///
-///    Other possible values of `url` are specific to different `RpcRequest`
-///    values. Read the implementation for specifics.
-///
-/// 2) Custom responses can be configured by providing [`Mocks`] to the
-///    [`MockSender::new_with_mocks`] constructor. This type is a [`HashMap`]
-///    from [`RpcRequest`] to a JSON [`Value`] response, Any entries in this map
-///    override the default behavior for the given request.
 impl MockSender {
     pub fn new(url: String) -> Self {
         Self::new_with_mocks(url, Mocks::default())
@@ -88,10 +42,6 @@ impl MockSender {
 }
 
 impl RpcSender for MockSender {
-    fn get_transport_stats(&self) -> RpcTransportStats {
-        RpcTransportStats::default()
-    }
-
     fn send(&self, request: RpcRequest, params: serde_json::Value) -> Result<serde_json::Value> {
         if let Some(value) = self.mocks.write().unwrap().remove(&request) {
             return Ok(value);
@@ -99,26 +49,23 @@ impl RpcSender for MockSender {
         if self.url == "fails" {
             return Ok(Value::Null);
         }
-
-        let method = &request.build_request_json(42, params.clone())["method"];
-
-        let val = match method.as_str().unwrap() {
-            "getAccountInfo" => serde_json::to_value(Response {
+        let val = match request {
+            RpcRequest::GetAccountInfo => serde_json::to_value(Response {
                 context: RpcResponseContext { slot: 1 },
                 value: Value::Null,
             })?,
-            "getBalance" => serde_json::to_value(Response {
+            RpcRequest::GetBalance => serde_json::to_value(Response {
                 context: RpcResponseContext { slot: 1 },
                 value: Value::Number(Number::from(50)),
             })?,
-            "getRecentBlockhash" => serde_json::to_value(Response {
+            RpcRequest::GetRecentBlockhash => serde_json::to_value(Response {
                 context: RpcResponseContext { slot: 1 },
                 value: (
                     Value::String(PUBKEY.to_string()),
                     serde_json::to_value(FeeCalculator::default()).unwrap(),
                 ),
             })?,
-            "getEpochInfo" => serde_json::to_value(EpochInfo {
+            RpcRequest::GetEpochInfo => serde_json::to_value(EpochInfo {
                 epoch: 1,
                 slot_index: 2,
                 slots_in_epoch: 32,
@@ -126,7 +73,7 @@ impl RpcSender for MockSender {
                 block_height: 34,
                 transaction_count: Some(123),
             })?,
-            "getFeeCalculatorForBlockhash" => {
+            RpcRequest::GetFeeCalculatorForBlockhash => {
                 let value = if self.url == "blockhash_expired" {
                     Value::Null
                 } else {
@@ -137,21 +84,11 @@ impl RpcSender for MockSender {
                     value,
                 })?
             }
-            "getFeeRateGovernor" => serde_json::to_value(Response {
+            RpcRequest::GetFeeRateGovernor => serde_json::to_value(Response {
                 context: RpcResponseContext { slot: 1 },
                 value: serde_json::to_value(FeeRateGovernor::default()).unwrap(),
             })?,
-            "getFees" => serde_json::to_value(Response {
-                context: RpcResponseContext { slot: 1 },
-                value: serde_json::to_value(RpcFees {
-                    blockhash: PUBKEY.to_string(),
-                    fee_calculator: FeeCalculator::default(),
-                    last_valid_slot: 42,
-                    last_valid_block_height: 42,
-                })
-                .unwrap(),
-            })?,
-            "getSignatureStatuses" => {
+            RpcRequest::GetSignatureStatuses => {
                 let status: transaction::Result<()> = if self.url == "account_in_use" {
                     Err(TransactionError::AccountInUse)
                 } else if self.url == "instruction_error" {
@@ -185,133 +122,10 @@ impl RpcSender for MockSender {
                     value: statuses,
                 })?
             }
-            "getTransaction" => serde_json::to_value(EncodedConfirmedTransaction {
-                slot: 2,
-                transaction: EncodedTransactionWithStatusMeta {
-                    transaction: EncodedTransaction::Json(
-                        UiTransaction {
-                            signatures: vec!["3AsdoALgZFuq2oUVWrDYhg2pNeaLJKPLf8hU2mQ6U8qJxeJ6hsrPVpMn9ma39DtfYCrDQSvngWRP8NnTpEhezJpE".to_string()],
-                            message: UiMessage::Raw(
-                                UiRawMessage {
-                                    header: MessageHeader {
-                                        num_required_signatures: 1,
-                                        num_readonly_signed_accounts: 0,
-                                        num_readonly_unsigned_accounts: 1,
-                                    },
-                                    account_keys: vec![
-                                        "C6eBmAXKg6JhJWkajGa5YRGUfG4YKXwbxF5Ufv7PtExZ".to_string(),
-                                        "2Gd5eoR5J4BV89uXbtunpbNhjmw3wa1NbRHxTHzDzZLX".to_string(),
-                                        "11111111111111111111111111111111".to_string(),
-                                    ],
-                                    recent_blockhash: "D37n3BSG71oUWcWjbZ37jZP7UfsxG2QMKeuALJ1PYvM6".to_string(),
-                                    instructions: vec![UiCompiledInstruction {
-                                        program_id_index: 2,
-                                        accounts: vec![0, 1],
-                                        data: "3Bxs49DitAvXtoDR".to_string(),
-                                    }],
-                                })
-                        }),
-                    meta: Some(UiTransactionStatusMeta {
-                            err: None,
-                            status: Ok(()),
-                            fee: 0,
-                            pre_balances: vec![499999999999999950, 50, 1],
-                            post_balances: vec![499999999999999950, 50, 1],
-                            inner_instructions: None,
-                            log_messages: None,
-                            pre_token_balances: None,
-                            post_token_balances: None,
-                            rewards: None,
-                        }),
-                },
-                block_time: Some(1628633791),
-            })?,
-            "getTransactionCount" => json![1234],
-            "getSlot" => json![0],
-            "getMaxShredInsertSlot" => json![0],
-            "requestAirdrop" => Value::String(Signature::new(&[8; 64]).to_string()),
-            "getSnapshotSlot" => Value::Number(Number::from(0)),
-            "getBlockHeight" => Value::Number(Number::from(1234)),
-            "getSlotLeaders" => json!([PUBKEY]),
-            "getBlockProduction" => {
-                if params.is_null() {
-                    json!(Response {
-                        context: RpcResponseContext { slot: 1 },
-                        value: RpcBlockProduction {
-                            by_identity: HashMap::new(),
-                            range: RpcBlockProductionRange {
-                                first_slot: 1,
-                                last_slot: 2,
-                            },
-                        },
-                    })
-                } else {
-                    let config: Vec<RpcBlockProductionConfig> =
-                        serde_json::from_value(params).unwrap();
-                    let config = config[0].clone();
-                    let mut by_identity = HashMap::new();
-                    by_identity.insert(config.identity.unwrap(), (1, 123));
-                    let config_range = config.range.unwrap_or_default();
-
-                    json!(Response {
-                        context: RpcResponseContext { slot: 1 },
-                        value: RpcBlockProduction {
-                            by_identity,
-                            range: RpcBlockProductionRange {
-                                first_slot: config_range.first_slot,
-                                last_slot: {
-                                    if let Some(last_slot) = config_range.last_slot {
-                                        last_slot
-                                    } else {
-                                        2
-                                    }
-                                },
-                            },
-                        },
-                    })
-                }
-            }
-            "getStakeActivation" => json!(RpcStakeActivation {
-                state: StakeActivationState::Activating,
-                active: 123,
-                inactive: 12,
-            }),
-            "getSupply" => json!(Response {
-                context: RpcResponseContext { slot: 1 },
-                value: RpcSupply {
-                    total: 100000000,
-                    circulating: 50000,
-                    non_circulating: 20000,
-                    non_circulating_accounts: vec![PUBKEY.to_string()],
-                },
-            }),
-            "getLargestAccounts" => {
-                let rpc_account_balance = RpcAccountBalance {
-                    address: PUBKEY.to_string(),
-                    lamports: 10000,
-                };
-
-                json!(Response {
-                    context: RpcResponseContext { slot: 1 },
-                    value: vec![rpc_account_balance],
-                })
-            }
-            "getVoteAccounts" => {
-                json!(RpcVoteAccountStatus {
-                    current: vec![],
-                    delinquent: vec![RpcVoteAccountInfo {
-                        vote_pubkey: PUBKEY.to_string(),
-                        node_pubkey: PUBKEY.to_string(),
-                        activated_stake: 0,
-                        commission: 0,
-                        epoch_vote_account: false,
-                        epoch_credits: vec![],
-                        last_vote: 0,
-                        root_slot: Slot::default(),
-                    }],
-                })
-            }
-            "sendTransaction" => {
+            RpcRequest::GetTransactionCount => Value::Number(Number::from(1234)),
+            RpcRequest::GetSlot => Value::Number(Number::from(0)),
+            RpcRequest::RequestAirdrop => Value::String(Signature::new(&[8; 64]).to_string()),
+            RpcRequest::SendTransaction => {
                 let signature = if self.url == "malicious" {
                     Signature::new(&[8; 64]).to_string()
                 } else {
@@ -322,124 +136,14 @@ impl RpcSender for MockSender {
                 };
                 Value::String(signature)
             }
-            "simulateTransaction" => serde_json::to_value(Response {
-                context: RpcResponseContext { slot: 1 },
-                value: RpcSimulateTransactionResult {
-                    err: None,
-                    logs: None,
-                    accounts: None,
-                },
-            })?,
-            "getMinimumBalanceForRentExemption" => json![20],
-            "getVersion" => {
+            RpcRequest::GetMinimumBalanceForRentExemption => Value::Number(Number::from(20)),
+            RpcRequest::GetVersion => {
                 let version = Version::default();
                 json!(RpcVersionInfo {
                     solana_core: version.to_string(),
                     feature_set: Some(version.feature_set),
                 })
             }
-            "getClusterNodes" => serde_json::to_value(vec![RpcContactInfo {
-                pubkey: PUBKEY.to_string(),
-                gossip: Some(SocketAddr::from(([10, 239, 6, 48], 8899))),
-                tpu: Some(SocketAddr::from(([10, 239, 6, 48], 8856))),
-                rpc: Some(SocketAddr::from(([10, 239, 6, 48], 8899))),
-                version: Some("1.0.0 c375ce1f".to_string()),
-                feature_set: None,
-                shred_version: None,
-            }])?,
-            "getBlock" => serde_json::to_value(EncodedConfirmedBlock {
-                previous_blockhash: "mfcyqEXB3DnHXki6KjjmZck6YjmZLvpAByy2fj4nh6B".to_string(),
-                blockhash: "3Eq21vXNB5s86c62bVuUfTeaMif1N2kUqRPBmGRJhyTA".to_string(),
-                parent_slot: 429,
-                transactions: vec![EncodedTransactionWithStatusMeta {
-                    transaction: EncodedTransaction::Binary(
-                        "ju9xZWuDBX4pRxX2oZkTjxU5jB4SSTgEGhX8bQ8PURNzyzqKMPPpNvWihx8zUe\
-                                 FfrbVNoAaEsNKZvGzAnTDy5bhNT9kt6KFCTBixpvrLCzg4M5UdFUQYrn1gdgjX\
-                                 pLHxcaShD81xBNaFDgnA2nkkdHnKtZt4hVSfKAmw3VRZbjrZ7L2fKZBx21CwsG\
-                                 hD6onjM2M3qZW5C8J6d1pj41MxKmZgPBSha3MyKkNLkAGFASK"
-                            .to_string(),
-                        UiTransactionEncoding::Base58,
-                    ),
-                    meta: None,
-                }],
-                rewards: Rewards::new(),
-                block_time: None,
-                block_height: Some(428),
-            })?,
-            "getBlocks" => serde_json::to_value(vec![1, 2, 3])?,
-            "getBlocksWithLimit" => serde_json::to_value(vec![1, 2, 3])?,
-            "getSignaturesForAddress" => {
-                serde_json::to_value(vec![RpcConfirmedTransactionStatusWithSignature {
-                    signature: SIGNATURE.to_string(),
-                    slot: 123,
-                    err: None,
-                    memo: None,
-                    block_time: None,
-                    confirmation_status: Some(TransactionConfirmationStatus::Finalized),
-                }])?
-            }
-            "getBlockTime" => serde_json::to_value(UnixTimestamp::default())?,
-            "getEpochSchedule" => serde_json::to_value(EpochSchedule::default())?,
-            "getRecentPerformanceSamples" => serde_json::to_value(vec![RpcPerfSample {
-                slot: 347873,
-                num_transactions: 125,
-                num_slots: 123,
-                sample_period_secs: 60,
-            }])?,
-            "getIdentity" => serde_json::to_value(RpcIdentity {
-                identity: PUBKEY.to_string(),
-            })?,
-            "getInflationGovernor" => serde_json::to_value(
-                RpcInflationGovernor {
-                    initial: 0.08,
-                    terminal: 0.015,
-                    taper: 0.15,
-                    foundation: 0.05,
-                    foundation_term: 7.0,
-                })?,
-            "getInflationRate" => serde_json::to_value(
-                RpcInflationRate {
-                    total: 0.08,
-                    validator: 0.076,
-                    foundation: 0.004,
-                    epoch: 0,
-                })?,
-            "getInflationReward" => serde_json::to_value(vec![
-                Some(RpcInflationReward {
-                    epoch: 2,
-                    effective_slot: 224,
-                    amount: 2500,
-                    post_balance: 499999442500,
-                    commission: None,
-                })])?,
-            "minimumLedgerSlot" => json![123],
-            "getMaxRetransmitSlot" => json![123],
-            "getMultipleAccounts" => serde_json::to_value(Response {
-                context: RpcResponseContext { slot: 1 },
-                value: vec![Value::Null, Value::Null]
-            })?,
-            "getProgramAccounts" => {
-                let pubkey = Pubkey::from_str(&PUBKEY.to_string()).unwrap();
-                let account = Account {
-                    lamports: 1_000_000,
-                    data: vec![],
-                    owner: pubkey,
-                    executable: false,
-                    rent_epoch: 0,
-                };
-                serde_json::to_value(vec![
-                    RpcKeyedAccount {
-                        pubkey: PUBKEY.to_string(),
-                        account: UiAccount::encode(
-                            &pubkey,
-                            &account,
-                            UiAccountEncoding::Base64,
-                            None,
-                            None,
-                        )
-                    }
-                ])?
-            },
             _ => Value::Null,
         };
         Ok(val)

client/src/pubsub_client.rs

@@ -3,9 +3,7 @@ use {
         rpc_config::{
             RpcSignatureSubscribeConfig, RpcTransactionLogsConfig, RpcTransactionLogsFilter,
         },
-        rpc_response::{
-            Response as RpcResponse, RpcLogsResponse, RpcSignatureResult, SlotInfo, SlotUpdate,
-        },
+        rpc_response::{Response as RpcResponse, RpcLogsResponse, RpcSignatureResult, SlotInfo},
     },
     log::*,
     serde::de::DeserializeOwned,
@@ -22,8 +20,7 @@ use {
             mpsc::{channel, Receiver},
             Arc, RwLock,
         },
-        thread::{sleep, JoinHandle},
-        time::Duration,
+        thread::JoinHandle,
     },
     thiserror::Error,
     tungstenite::{client::AutoStream, connect, Message, WebSocket},
@@ -165,28 +162,6 @@ pub type SignatureSubscription = (
 
 pub struct PubsubClient {}
 
-fn connect_with_retry(url: Url) -> Result<WebSocket<AutoStream>, tungstenite::Error> {
-    let mut connection_retries = 5;
-    loop {
-        let result = connect(url.clone()).map(|(socket, _)| socket);
-        if let Err(tungstenite::Error::Http(status_code)) = &result {
-            if *status_code == reqwest::StatusCode::TOO_MANY_REQUESTS && connection_retries > 0 {
-                let duration = Duration::from_millis(500) * 2u32.pow(5 - connection_retries);
-
-                connection_retries -= 1;
-                debug!(
-                    "Too many requests: server responded with {:?}, {} retries left, pausing for {:?}",
-                    status_code, connection_retries, duration
-                );
-
-                sleep(duration);
-                continue;
-            }
-        }
-        return result;
-    }
-}
-
 impl PubsubClient {
     pub fn logs_subscribe(
         url: &str,
@@ -194,7 +169,7 @@ impl PubsubClient {
         config: RpcTransactionLogsConfig,
     ) -> Result<LogsSubscription, PubsubClientError> {
         let url = Url::parse(url)?;
-        let socket = connect_with_retry(url)?;
+        let (socket, _response) = connect(url)?;
         let (sender, receiver) = channel();
 
         let socket = Arc::new(RwLock::new(socket));
@@ -249,7 +224,7 @@ impl PubsubClient {
 
     pub fn slot_subscribe(url: &str) -> Result<SlotsSubscription, PubsubClientError> {
         let url = Url::parse(url)?;
-        let socket = connect_with_retry(url)?;
+        let (socket, _response) = connect(url)?;
         let (sender, receiver) = channel::<SlotInfo>();
 
         let socket = Arc::new(RwLock::new(socket));
@@ -305,7 +280,7 @@ impl PubsubClient {
         config: Option<RpcSignatureSubscribeConfig>,
     ) -> Result<SignatureSubscription, PubsubClientError> {
         let url = Url::parse(url)?;
-        let socket = connect_with_retry(url)?;
+        let (socket, _response) = connect(url)?;
         let (sender, receiver) = channel();
 
         let socket = Arc::new(RwLock::new(socket));
@@ -365,54 +340,6 @@ impl PubsubClient {
 
         Ok((result, receiver))
     }
-
-    pub fn slot_updates_subscribe(
-        url: &str,
-        handler: impl Fn(SlotUpdate) + Send + 'static,
-    ) -> Result<PubsubClientSubscription<SlotUpdate>, PubsubClientError> {
-        let url = Url::parse(url)?;
-        let socket = connect_with_retry(url)?;
-
-        let socket = Arc::new(RwLock::new(socket));
-        let exit = Arc::new(AtomicBool::new(false));
-        let exit_clone = exit.clone();
-        let subscription_id = PubsubClientSubscription::<SlotUpdate>::send_subscribe(
-            &socket,
-            json!({
-                "jsonrpc":"2.0","id":1,"method":"slotsUpdatesSubscribe","params":[]
-            })
-            .to_string(),
-        )?;
-
-        let t_cleanup = {
-            let socket = socket.clone();
-            std::thread::spawn(move || {
-                loop {
-                    if exit_clone.load(Ordering::Relaxed) {
-                        break;
-                    }
-                    match PubsubClientSubscription::read_message(&socket) {
-                        Ok(message) => handler(message),
-                        Err(err) => {
-                            info!("receive error: {:?}", err);
-                            break;
-                        }
-                    }
-                }
-
-                info!("websocket - exited receive loop");
-            })
-        };
-
-        Ok(PubsubClientSubscription {
-            message_type: PhantomData,
-            operation: "slotsUpdates",
-            socket,
-            subscription_id,
-            t_cleanup: Some(t_cleanup),
-            exit,
-        })
-    }
 }
 
 #[cfg(test)]

client/src/rpc_cache.rs

@@ -31,7 +31,7 @@ impl LargestAccountsCache {
         &self,
         filter: &Option<RpcLargestAccountsFilter>,
     ) -> Option<(u64, Vec<RpcAccountBalance>)> {
-        self.cache.get(filter).and_then(|value| {
+        self.cache.get(&filter).and_then(|value| {
             if let Ok(elapsed) = value.cached_time.elapsed() {
                 if elapsed < Duration::from_secs(self.duration) {
                     return Some((value.slot, value.accounts.clone()));