Bump version to v1.7.18 (#21011)

* Restore getProgramAccounts spl-token secondary-index functionality (#20993)

* Allow get_spl_token_X_filters to match on any encoding, and optimize earlier

* Remove redundant optimize calls

* Compress match statements

* Add method docs, including note to use optimize_filters before spl-token checks

* Add logs

(cherry picked from commit b2f6cfb9ff)

# Conflicts:
#	rpc/src/rpc.rs

* Fix conflict

Co-authored-by: Tyera Eulberg <teulberg@gmail.com>
Co-authored-by: Tyera Eulberg <tyera@solana.com>

.travis.yml

@@ -29,7 +29,6 @@ jobs:
       if: type IN (api, cron) OR tag IS present
       name: "macOS release artifacts"
       os: osx
-      osx_image: xcode12
       language: rust
       rust:
         - stable
@@ -37,9 +36,6 @@ jobs:
         - source ci/rust-version.sh
         - PATH="/usr/local/opt/coreutils/libexec/gnubin:$PATH"
         - readlink -f .
-        - brew install gnu-tar
-        - PATH="/usr/local/opt/gnu-tar/libexec/gnubin:$PATH"
-        - tar --version
       script:
         - source ci/env.sh
         - rustup set profile default
@@ -127,7 +123,7 @@ jobs:
       if: type IN (push, pull_request) OR tag IS present
       language: node_js
       node_js:
-        - "lts/*"
+        - "node"
 
       services:
         - docker

Cargo.toml

@@ -1,8 +1,5 @@
 [workspace]
 members = [
-    "accountsdb-plugin-interface",
-    "accountsdb-plugin-manager",
-    "accountsdb-plugin-postgres",
     "accounts-cluster-bench",
     "bench-exchange",
     "bench-streamer",
@@ -46,10 +43,8 @@ members = [
     "poh-bench",
     "program-test",
     "programs/bpf_loader",
-    "programs/compute-budget",
     "programs/config",
     "programs/exchange",
-    "programs/ed25519",
     "programs/secp256k1",
     "programs/stake",
     "programs/vote",

account-decoder/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "solana-account-decoder"
-version = "1.8.13"
+version = "1.7.18"
 description = "Solana account decoder"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -19,10 +19,10 @@ 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.8.13" }
-solana-sdk = { path = "../sdk", version = "=1.8.13" }
-solana-vote-program = { path = "../programs/vote", version = "=1.8.13" }
-spl-token = { version = "=3.2.0", features = ["no-entrypoint"] }
+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"] }
 thiserror = "1.0"
 zstd = "0.5.1"
 

account-decoder/src/lib.rs

@@ -17,10 +17,8 @@ pub mod validator_info;
 use {
     crate::parse_account_data::{parse_account_data, AccountAdditionalData, ParsedAccount},
     solana_sdk::{
-        account::{ReadableAccount, WritableAccount},
-        clock::Epoch,
-        fee_calculator::FeeCalculator,
-        pubkey::Pubkey,
+        account::ReadableAccount, account::WritableAccount, clock::Epoch,
+        fee_calculator::FeeCalculator, pubkey::Pubkey,
     },
     std::{
         io::{Read, Write},
@@ -204,10 +202,8 @@ fn slice_data(data: &[u8], data_slice_config: Option<UiDataSliceConfig>) -> &[u8
 
 #[cfg(test)]
 mod test {
-    use {
-        super::*,
-        solana_sdk::account::{Account, AccountSharedData},
-    };
+    use super::*;
+    use solana_sdk::account::{Account, AccountSharedData};
 
     #[test]
     fn test_slice_data() {

account-decoder/src/parse_account_data.rs

@@ -1,19 +1,17 @@
-use {
-    crate::{
-        parse_bpf_loader::parse_bpf_upgradeable_loader,
-        parse_config::parse_config,
-        parse_nonce::parse_nonce,
-        parse_stake::parse_stake,
-        parse_sysvar::parse_sysvar,
-        parse_token::{parse_token, spl_token_id},
-        parse_vote::parse_vote,
-    },
-    inflector::Inflector,
-    serde_json::Value,
-    solana_sdk::{instruction::InstructionError, pubkey::Pubkey, stake, system_program, sysvar},
-    std::collections::HashMap,
-    thiserror::Error,
+use crate::{
+    parse_bpf_loader::parse_bpf_upgradeable_loader,
+    parse_config::parse_config,
+    parse_nonce::parse_nonce,
+    parse_stake::parse_stake,
+    parse_sysvar::parse_sysvar,
+    parse_token::{parse_token, spl_token_id_v2_0},
+    parse_vote::parse_vote,
 };
+use inflector::Inflector;
+use serde_json::Value;
+use solana_sdk::{instruction::InstructionError, pubkey::Pubkey, stake, 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();
@@ -21,7 +19,7 @@ lazy_static! {
     static ref STAKE_PROGRAM_ID: Pubkey = 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();
+    static ref TOKEN_PROGRAM_ID: Pubkey = spl_token_id_v2_0();
     static ref VOTE_PROGRAM_ID: Pubkey = solana_vote_program::id();
     pub static ref PARSABLE_PROGRAM_IDS: HashMap<Pubkey, ParsableAccount> = {
         let mut m = HashMap::new();
@@ -114,14 +112,12 @@ pub fn parse_account_data(
 
 #[cfg(test)]
 mod test {
-    use {
-        super::*,
-        solana_sdk::nonce::{
-            state::{Data, Versions},
-            State,
-        },
-        solana_vote_program::vote_state::{VoteState, VoteStateVersions},
+    use super::*;
+    use solana_sdk::nonce::{
+        state::{Data, Versions},
+        State,
     };
+    use solana_vote_program::vote_state::{VoteState, VoteStateVersions};
 
     #[test]
     fn test_parse_account_data() {

account-decoder/src/parse_bpf_loader.rs

@@ -1,11 +1,9 @@
-use {
-    crate::{
-        parse_account_data::{ParsableAccount, ParseAccountError},
-        UiAccountData, UiAccountEncoding,
-    },
-    bincode::{deserialize, serialized_size},
-    solana_sdk::{bpf_loader_upgradeable::UpgradeableLoaderState, pubkey::Pubkey},
+use crate::{
+    parse_account_data::{ParsableAccount, ParseAccountError},
+    UiAccountData, UiAccountEncoding,
 };
+use bincode::{deserialize, serialized_size};
+use solana_sdk::{bpf_loader_upgradeable::UpgradeableLoaderState, pubkey::Pubkey};
 
 pub fn parse_bpf_upgradeable_loader(
     data: &[u8],
@@ -92,7 +90,9 @@ pub struct UiProgramData {
 
 #[cfg(test)]
 mod test {
-    use {super::*, bincode::serialize, solana_sdk::pubkey::Pubkey};
+    use super::*;
+    use bincode::serialize;
+    use solana_sdk::pubkey::Pubkey;
 
     #[test]
     fn test_parse_bpf_upgradeable_loader_accounts() {

account-decoder/src/parse_config.rs

@@ -1,16 +1,12 @@
-use {
-    crate::{
-        parse_account_data::{ParsableAccount, ParseAccountError},
-        validator_info,
-    },
-    bincode::deserialize,
-    serde_json::Value,
-    solana_config_program::{get_config_data, ConfigKeys},
-    solana_sdk::{
-        pubkey::Pubkey,
-        stake::config::{self as stake_config, Config as StakeConfig},
-    },
+use crate::{
+    parse_account_data::{ParsableAccount, ParseAccountError},
+    validator_info,
 };
+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};
 
 pub fn parse_config(data: &[u8], pubkey: &Pubkey) -> Result<ConfigAccountType, ParseAccountError> {
     let parsed_account = if pubkey == &stake_config::id() {
@@ -91,10 +87,11 @@ pub struct UiConfig<T> {
 
 #[cfg(test)]
 mod test {
-    use {
-        super::*, crate::validator_info::ValidatorInfo, serde_json::json,
-        solana_config_program::create_config_account, solana_sdk::account::ReadableAccount,
-    };
+    use super::*;
+    use crate::validator_info::ValidatorInfo;
+    use serde_json::json;
+    use solana_config_program::create_config_account;
+    use solana_sdk::account::ReadableAccount;
 
     #[test]
     fn test_parse_config() {

account-decoder/src/parse_nonce.rs

@@ -1,9 +1,7 @@
-use {
-    crate::{parse_account_data::ParseAccountError, UiFeeCalculator},
-    solana_sdk::{
-        instruction::InstructionError,
-        nonce::{state::Versions, State},
-    },
+use crate::{parse_account_data::ParseAccountError, UiFeeCalculator};
+use solana_sdk::{
+    instruction::InstructionError,
+    nonce::{state::Versions, State},
 };
 
 pub fn parse_nonce(data: &[u8]) -> Result<UiNonceState, ParseAccountError> {
@@ -44,16 +42,14 @@ pub struct UiNonceData {
 
 #[cfg(test)]
 mod test {
-    use {
-        super::*,
-        solana_sdk::{
-            hash::Hash,
-            nonce::{
-                state::{Data, Versions},
-                State,
-            },
-            pubkey::Pubkey,
+    use super::*;
+    use solana_sdk::{
+        hash::Hash,
+        nonce::{
+            state::{Data, Versions},
+            State,
         },
+        pubkey::Pubkey,
     };
 
     #[test]

account-decoder/src/parse_stake.rs

@@ -1,14 +1,10 @@
-use {
-    crate::{
-        parse_account_data::{ParsableAccount, ParseAccountError},
-        StringAmount,
-    },
-    bincode::deserialize,
-    solana_sdk::{
-        clock::{Epoch, UnixTimestamp},
-        stake::state::{Authorized, Delegation, Lockup, Meta, Stake, StakeState},
-    },
+use crate::{
+    parse_account_data::{ParsableAccount, ParseAccountError},
+    StringAmount,
 };
+use bincode::deserialize;
+use solana_sdk::clock::{Epoch, UnixTimestamp};
+use solana_sdk::stake::state::{Authorized, Delegation, Lockup, Meta, Stake, StakeState};
 
 pub fn parse_stake(data: &[u8]) -> Result<StakeAccountType, ParseAccountError> {
     let stake_state: StakeState = deserialize(data)
@@ -136,7 +132,8 @@ impl From<Delegation> for UiDelegation {
 
 #[cfg(test)]
 mod test {
-    use {super::*, bincode::serialize};
+    use super::*;
+    use bincode::serialize;
 
     #[test]
     fn test_parse_stake() {

account-decoder/src/parse_sysvar.rs

@@ -1,20 +1,18 @@
-use {
-    crate::{
-        parse_account_data::{ParsableAccount, ParseAccountError},
-        StringAmount, UiFeeCalculator,
-    },
-    bincode::deserialize,
-    bv::BitVec,
-    solana_sdk::{
-        clock::{Clock, Epoch, Slot, UnixTimestamp},
-        epoch_schedule::EpochSchedule,
-        pubkey::Pubkey,
-        rent::Rent,
-        slot_hashes::SlotHashes,
-        slot_history::{self, SlotHistory},
-        stake_history::{StakeHistory, StakeHistoryEntry},
-        sysvar::{self, fees::Fees, recent_blockhashes::RecentBlockhashes, rewards::Rewards},
-    },
+use crate::{
+    parse_account_data::{ParsableAccount, ParseAccountError},
+    StringAmount, UiFeeCalculator,
+};
+use bincode::deserialize;
+use bv::BitVec;
+use solana_sdk::{
+    clock::{Clock, Epoch, Slot, UnixTimestamp},
+    epoch_schedule::EpochSchedule,
+    pubkey::Pubkey,
+    rent::Rent,
+    slot_hashes::SlotHashes,
+    slot_history::{self, SlotHistory},
+    stake_history::{StakeHistory, StakeHistoryEntry},
+    sysvar::{self, fees::Fees, recent_blockhashes::RecentBlockhashes, rewards::Rewards},
 };
 
 pub fn parse_sysvar(data: &[u8], pubkey: &Pubkey) -> Result<SysvarAccountType, ParseAccountError> {
@@ -214,12 +212,10 @@ pub struct UiStakeHistoryEntry {
 
 #[cfg(test)]
 mod test {
-    use {
-        super::*,
-        solana_sdk::{
-            account::create_account_for_test, fee_calculator::FeeCalculator, hash::Hash,
-            sysvar::recent_blockhashes::IterItem,
-        },
+    use super::*;
+    use solana_sdk::{
+        account::create_account_for_test, fee_calculator::FeeCalculator, hash::Hash,
+        sysvar::recent_blockhashes::IterItem,
     };
 
     #[test]

account-decoder/src/parse_token.rs

@@ -1,37 +1,35 @@
-use {
-    crate::{
-        parse_account_data::{ParsableAccount, ParseAccountError},
-        StringAmount, StringDecimals,
-    },
-    solana_sdk::pubkey::Pubkey,
-    spl_token::{
-        solana_program::{
-            program_option::COption, program_pack::Pack, pubkey::Pubkey as SplTokenPubkey,
-        },
-        state::{Account, AccountState, Mint, Multisig},
-    },
-    std::str::FromStr,
+use crate::{
+    parse_account_data::{ParsableAccount, ParseAccountError},
+    StringAmount, StringDecimals,
 };
+use solana_sdk::pubkey::Pubkey;
+use spl_token_v2_0::{
+    solana_program::{
+        program_option::COption, program_pack::Pack, pubkey::Pubkey as SplTokenPubkey,
+    },
+    state::{Account, AccountState, Mint, Multisig},
+};
+use std::str::FromStr;
 
-// A helper function to convert spl_token::id() as spl_sdk::pubkey::Pubkey to
+// 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() -> Pubkey {
-    Pubkey::new_from_array(spl_token::id().to_bytes())
+pub fn spl_token_id_v2_0() -> Pubkey {
+    Pubkey::new_from_array(spl_token_v2_0::id().to_bytes())
 }
 
-// A helper function to convert spl_token::native_mint::id() as spl_sdk::pubkey::Pubkey to
+// 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_native_mint() -> Pubkey {
-    Pubkey::new_from_array(spl_token::native_mint::id().to_bytes())
+pub fn spl_token_v2_0_native_mint() -> Pubkey {
+    Pubkey::new_from_array(spl_token_v2_0::native_mint::id().to_bytes())
 }
 
 // A helper function to convert a solana_sdk::pubkey::Pubkey to spl_sdk::pubkey::Pubkey
-pub fn spl_token_pubkey(pubkey: &Pubkey) -> SplTokenPubkey {
+pub fn spl_token_v2_0_pubkey(pubkey: &Pubkey) -> SplTokenPubkey {
     SplTokenPubkey::new_from_array(pubkey.to_bytes())
 }
 
 // A helper function to convert a spl_sdk::pubkey::Pubkey to solana_sdk::pubkey::Pubkey
-pub fn pubkey_from_spl_token(pubkey: &SplTokenPubkey) -> Pubkey {
+pub fn pubkey_from_spl_token_v2_0(pubkey: &SplTokenPubkey) -> Pubkey {
     Pubkey::new_from_array(pubkey.to_bytes())
 }
 

account-decoder/src/parse_vote.rs

@@ -1,11 +1,9 @@
-use {
-    crate::{parse_account_data::ParseAccountError, StringAmount},
-    solana_sdk::{
-        clock::{Epoch, Slot},
-        pubkey::Pubkey,
-    },
-    solana_vote_program::vote_state::{BlockTimestamp, Lockout, VoteState},
+use crate::{parse_account_data::ParseAccountError, StringAmount};
+use solana_sdk::{
+    clock::{Epoch, Slot},
+    pubkey::Pubkey,
 };
+use solana_vote_program::vote_state::{BlockTimestamp, Lockout, VoteState};
 
 pub fn parse_vote(data: &[u8]) -> Result<VoteAccountType, ParseAccountError> {
     let mut vote_state = VoteState::deserialize(data).map_err(ParseAccountError::from)?;
@@ -123,7 +121,8 @@ struct UiEpochCredits {
 
 #[cfg(test)]
 mod test {
-    use {super::*, solana_vote_program::vote_state::VoteStateVersions};
+    use super::*;
+    use solana_vote_program::vote_state::VoteStateVersions;
 
     #[test]
     fn test_parse_vote() {

accounts-bench/Cargo.toml

@@ -2,7 +2,7 @@
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 edition = "2018"
 name = "solana-accounts-bench"
-version = "1.8.13"
+version = "1.7.18"
 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.8.13" }
-solana-runtime = { path = "../runtime", version = "=1.8.13" }
-solana-measure = { path = "../measure", version = "=1.8.13" }
-solana-sdk = { path = "../sdk", version = "=1.8.13" }
-solana-version = { path = "../version", version = "=1.8.13" }
+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" }
 rand = "0.7.0"
 clap = "2.33.1"
 crossbeam-channel = "0.4"

accounts-bench/src/main.rs

@@ -1,19 +1,17 @@
 #![allow(clippy::integer_arithmetic)]
 #[macro_use]
 extern crate log;
-use {
-    clap::{crate_description, crate_name, value_t, App, Arg},
-    rayon::prelude::*,
-    solana_measure::measure::Measure,
-    solana_runtime::{
-        accounts::{create_test_accounts, update_accounts_bench, Accounts},
-        accounts_db::AccountShrinkThreshold,
-        accounts_index::AccountSecondaryIndexes,
-        ancestors::Ancestors,
-    },
-    solana_sdk::{genesis_config::ClusterType, pubkey::Pubkey},
-    std::{env, fs, path::PathBuf},
+use clap::{crate_description, crate_name, value_t, App, Arg};
+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,
 };
+use solana_sdk::{genesis_config::ClusterType, pubkey::Pubkey};
+use std::{env, fs, path::PathBuf};
 
 fn main() {
     solana_logger::setup();
@@ -68,7 +66,6 @@ fn main() {
         AccountSecondaryIndexes::default(),
         false,
         AccountShrinkThreshold::default(),
-        None,
     );
     println!("Creating {} accounts", num_accounts);
     let mut create_time = Measure::start("create accounts");

accounts-cluster-bench/Cargo.toml

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

accounts-cluster-bench/src/main.rs

@@ -1,38 +1,36 @@
 #![allow(clippy::integer_arithmetic)]
-use {
-    clap::{crate_description, crate_name, value_t, values_t_or_exit, App, Arg},
-    log::*,
-    rand::{thread_rng, Rng},
-    rayon::prelude::*,
-    solana_account_decoder::parse_token::spl_token_pubkey,
-    solana_clap_utils::input_parsers::pubkey_of,
-    solana_client::rpc_client::RpcClient,
-    solana_faucet::faucet::{request_airdrop_transaction, FAUCET_PORT},
-    solana_gossip::gossip_service::discover,
-    solana_measure::measure::Measure,
-    solana_runtime::inline_spl_token,
-    solana_sdk::{
-        commitment_config::CommitmentConfig,
-        message::Message,
-        pubkey::Pubkey,
-        rpc_port::DEFAULT_RPC_PORT,
-        signature::{read_keypair_file, Keypair, Signature, Signer},
-        system_instruction, system_program,
-        timing::timestamp,
-        transaction::Transaction,
-    },
-    solana_streamer::socket::SocketAddrSpace,
-    solana_transaction_status::parse_token::spl_token_instruction,
-    std::{
-        net::SocketAddr,
-        process::exit,
-        sync::{
-            atomic::{AtomicBool, AtomicU64, Ordering},
-            Arc, RwLock,
-        },
-        thread::{sleep, Builder, JoinHandle},
-        time::{Duration, Instant},
+use clap::{crate_description, crate_name, value_t, values_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_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::{
+    commitment_config::CommitmentConfig,
+    message::Message,
+    pubkey::Pubkey,
+    rpc_port::DEFAULT_RPC_PORT,
+    signature::{read_keypair_file, Keypair, Signature, Signer},
+    system_instruction, system_program,
+    timing::timestamp,
+    transaction::Transaction,
+};
+use solana_streamer::socket::SocketAddrSpace;
+use solana_transaction_status::parse_token::spl_token_v2_0_instruction;
+use std::{
+    net::SocketAddr,
+    process::exit,
+    sync::{
+        atomic::{AtomicBool, AtomicU64, Ordering},
+        Arc, RwLock,
     },
+    thread::{sleep, Builder, JoinHandle},
+    time::{Duration, Instant},
 };
 
 // Create and close messages both require 2 signatures; if transaction construction changes, update
@@ -276,7 +274,7 @@ fn make_create_message(
         .into_iter()
         .map(|_| {
             let program_id = if mint.is_some() {
-                inline_spl_token::id()
+                inline_spl_token_v2_0::id()
             } else {
                 system_program::id()
             };
@@ -293,12 +291,12 @@ fn make_create_message(
                 &program_id,
             )];
             if let Some(mint_address) = mint {
-                instructions.push(spl_token_instruction(
-                    spl_token::instruction::initialize_account(
-                        &spl_token::id(),
-                        &spl_token_pubkey(&to_pubkey),
-                        &spl_token_pubkey(&mint_address),
-                        &spl_token_pubkey(&base_keypair.pubkey()),
+                instructions.push(spl_token_v2_0_instruction(
+                    spl_token_v2_0::instruction::initialize_account(
+                        &spl_token_v2_0::id(),
+                        &spl_token_v2_0_pubkey(&to_pubkey),
+                        &spl_token_v2_0_pubkey(&mint_address),
+                        &spl_token_v2_0_pubkey(&base_keypair.pubkey()),
                     )
                     .unwrap(),
                 ));
@@ -324,7 +322,7 @@ fn make_close_message(
         .into_iter()
         .map(|_| {
             let program_id = if spl_token {
-                inline_spl_token::id()
+                inline_spl_token_v2_0::id()
             } else {
                 system_program::id()
             };
@@ -332,12 +330,12 @@ fn make_close_message(
             let address =
                 Pubkey::create_with_seed(&base_keypair.pubkey(), &seed, &program_id).unwrap();
             if spl_token {
-                spl_token_instruction(
-                    spl_token::instruction::close_account(
-                        &spl_token::id(),
-                        &spl_token_pubkey(&address),
-                        &spl_token_pubkey(&keypair.pubkey()),
-                        &spl_token_pubkey(&base_keypair.pubkey()),
+                spl_token_v2_0_instruction(
+                    spl_token_v2_0::instruction::close_account(
+                        &spl_token_v2_0::id(),
+                        &spl_token_v2_0_pubkey(&address),
+                        &spl_token_v2_0_pubkey(&keypair.pubkey()),
+                        &spl_token_v2_0_pubkey(&base_keypair.pubkey()),
                         &[],
                     )
                     .unwrap(),
@@ -703,15 +701,13 @@ fn main() {
 
 #[cfg(test)]
 pub mod test {
-    use {
-        super::*,
-        solana_core::validator::ValidatorConfig,
-        solana_local_cluster::{
-            local_cluster::{ClusterConfig, LocalCluster},
-            validator_configs::make_identical_validator_configs,
-        },
-        solana_sdk::poh_config::PohConfig,
+    use super::*;
+    use solana_core::validator::ValidatorConfig;
+    use solana_local_cluster::{
+        local_cluster::{ClusterConfig, LocalCluster},
+        validator_configs::make_identical_validator_configs,
     };
+    use solana_sdk::poh_config::PohConfig;
 
     #[test]
     fn test_accounts_cluster_bench() {

accountsdb-plugin-interface/Cargo.toml

@@ -1,17 +0,0 @@
-[package]
-authors = ["Solana Maintainers <maintainers@solana.foundation>"]
-edition = "2018"
-name = "solana-accountsdb-plugin-interface"
-description = "The Solana AccountsDb plugin interface."
-version = "1.8.13"
-repository = "https://github.com/solana-labs/solana"
-license = "Apache-2.0"
-homepage = "https://solana.com/"
-documentation = "https://docs.rs/solana-accountsdb-plugin-interface"
-
-[dependencies]
-log = "0.4.11"
-thiserror = "1.0.29"
-
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]

accountsdb-plugin-interface/README.md

@@ -1,20 +0,0 @@
-<p align="center">
-  <a href="https://solana.com">
-    <img alt="Solana" src="https://i.imgur.com/IKyzQ6T.png" width="250" />
-  </a>
-</p>
-
-# Solana AccountsDb Plugin Interface
-
-This crate enables an AccountsDb plugin to be plugged into the Solana Validator runtime to take actions
-at the time of each account update; for example, saving the account state to an external database. The plugin must implement the `AccountsDbPlugin` trait. Please see the detail of the `accountsdb_plugin_interface.rs` for the interface definition.
-
-The plugin should produce a `cdylib` dynamic library, which must expose a `C` function `_create_plugin()` that
-instantiates the implementation of the interface.
-
-The `solana-accountsdb-plugin-postgres` crate provides an example of how to create a plugin which saves the accounts data into an
-external PostgreSQL databases.
-
-More information about Solana is available in the [Solana documentation](https://docs.solana.com/).
-
-Still have questions?  Ask us on [Discord](https://discordapp.com/invite/pquxPsq)

accountsdb-plugin-interface/src/accountsdb_plugin_interface.rs

@@ -1,143 +0,0 @@
-/// The interface for AccountsDb plugins. A plugin must implement
-/// the AccountsDbPlugin trait to work with the runtime.
-/// In addition, the dynamic library must export a "C" function _create_plugin which
-/// creates the implementation of the plugin.
-use {
-    std::{any::Any, error, io},
-    thiserror::Error,
-};
-
-impl Eq for ReplicaAccountInfo<'_> {}
-
-#[derive(Clone, PartialEq, Debug)]
-/// Information about an account being updated
-pub struct ReplicaAccountInfo<'a> {
-    /// The Pubkey for the account
-    pub pubkey: &'a [u8],
-
-    /// The lamports for the account
-    pub lamports: u64,
-
-    /// The Pubkey of the owner program account
-    pub owner: &'a [u8],
-
-    /// This account's data contains a loaded program (and is now read-only)
-    pub executable: bool,
-
-    /// The epoch at which this account will next owe rent
-    pub rent_epoch: u64,
-
-    /// The data held in this account.
-    pub data: &'a [u8],
-
-    /// A global monotonically increasing atomic number, which can be used
-    /// to tell the order of the account update. For example, when an
-    /// account is updated in the same slot multiple times, the update
-    /// with higher write_version should supersede the one with lower
-    /// write_version.
-    pub write_version: u64,
-}
-
-/// A wrapper to future-proof ReplicaAccountInfo handling.
-/// If there were a change to the structure of ReplicaAccountInfo,
-/// there would be new enum entry for the newer version, forcing
-/// plugin implementations to handle the change.
-pub enum ReplicaAccountInfoVersions<'a> {
-    V0_0_1(&'a ReplicaAccountInfo<'a>),
-}
-
-/// Errors returned by plugin calls
-#[derive(Error, Debug)]
-pub enum AccountsDbPluginError {
-    /// Error opening the configuration file; for example, when the file
-    /// is not found or when the validator process has no permission to read it.
-    #[error("Error opening config file. Error detail: ({0}).")]
-    ConfigFileOpenError(#[from] io::Error),
-
-    /// Error in reading the content of the config file or the content
-    /// is not in the expected format.
-    #[error("Error reading config file. Error message: ({msg})")]
-    ConfigFileReadError { msg: String },
-
-    /// Error when updating the account.
-    #[error("Error updating account. Error message: ({msg})")]
-    AccountsUpdateError { msg: String },
-
-    /// Error when updating the slot status
-    #[error("Error updating slot status. Error message: ({msg})")]
-    SlotStatusUpdateError { msg: String },
-
-    /// Any custom error defined by the plugin.
-    #[error("Plugin-defined custom error. Error message: ({0})")]
-    Custom(Box<dyn error::Error + Send + Sync>),
-}
-
-/// The current status of a slot
-#[derive(Debug, Clone)]
-pub enum SlotStatus {
-    /// The highest slot of the heaviest fork processed by the node. Ledger state at this slot is
-    /// not derived from a confirmed or finalized block, but if multiple forks are present, is from
-    /// the fork the validator believes is most likely to finalize.
-    Processed,
-
-    /// The highest slot having reached max vote lockout.
-    Rooted,
-
-    /// The highest slot that has been voted on by supermajority of the cluster, ie. is confirmed.
-    Confirmed,
-}
-
-impl SlotStatus {
-    pub fn as_str(&self) -> &'static str {
-        match self {
-            SlotStatus::Confirmed => "confirmed",
-            SlotStatus::Processed => "processed",
-            SlotStatus::Rooted => "rooted",
-        }
-    }
-}
-
-pub type Result<T> = std::result::Result<T, AccountsDbPluginError>;
-
-/// Defines an AccountsDb plugin, to stream data from the runtime.
-/// AccountsDb plugins must describe desired behavior for load and unload,
-/// as well as how they will handle streamed data.
-pub trait AccountsDbPlugin: Any + Send + Sync + std::fmt::Debug {
-    fn name(&self) -> &'static str;
-
-    /// The callback called when a plugin is loaded by the system,
-    /// used for doing whatever initialization is required by the plugin.
-    /// The _config_file contains the name of the
-    /// of the config file. The config must be in JSON format and
-    /// include a field "libpath" indicating the full path
-    /// name of the shared library implementing this interface.
-    fn on_load(&mut self, _config_file: &str) -> Result<()> {
-        Ok(())
-    }
-
-    /// The callback called right before a plugin is unloaded by the system
-    /// Used for doing cleanup before unload.
-    fn on_unload(&mut self) {}
-
-    /// Called when an account is updated at a slot.
-    /// When `is_startup` is true, it indicates the account is loaded from
-    /// snapshots when the validator starts up. When `is_startup` is false,
-    /// the account is updated during transaction processing.
-    fn update_account(
-        &mut self,
-        account: ReplicaAccountInfoVersions,
-        slot: u64,
-        is_startup: bool,
-    ) -> Result<()>;
-
-    /// Called when all accounts are notified of during startup.
-    fn notify_end_of_startup(&mut self) -> Result<()>;
-
-    /// Called when a slot status is updated
-    fn update_slot_status(
-        &mut self,
-        slot: u64,
-        parent: Option<u64>,
-        status: SlotStatus,
-    ) -> Result<()>;
-}

accountsdb-plugin-interface/src/lib.rs

@@ -1 +0,0 @@
-pub mod accountsdb_plugin_interface;

accountsdb-plugin-manager/Cargo.toml

@@ -1,30 +0,0 @@
-[package]
-authors = ["Solana Maintainers <maintainers@solana.foundation>"]
-edition = "2018"
-name = "solana-accountsdb-plugin-manager"
-description = "The Solana AccountsDb plugin manager."
-version = "1.8.13"
-repository = "https://github.com/solana-labs/solana"
-license = "Apache-2.0"
-homepage = "https://solana.com/"
-documentation = "https://docs.rs/solana-validator"
-
-[dependencies]
-bs58 = "0.4.0"
-crossbeam-channel = "0.4"
-libloading = "0.7.0"
-log = "0.4.11"
-serde = "1.0.130"
-serde_derive = "1.0.103"
-serde_json = "1.0.67"
-solana-accountsdb-plugin-interface = { path = "../accountsdb-plugin-interface", version = "=1.8.13" }
-solana-logger = { path = "../logger", version = "=1.8.13" }
-solana-measure = { path = "../measure", version = "=1.8.13" }
-solana-metrics = { path = "../metrics", version = "=1.8.13" }
-solana-rpc = { path = "../rpc", version = "=1.8.13" }
-solana-runtime = { path = "../runtime", version = "=1.8.13" }
-solana-sdk = { path = "../sdk", version = "=1.8.13" }
-thiserror = "1.0.21"
-
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]

accountsdb-plugin-manager/src/accounts_update_notifier.rs

@@ -1,227 +0,0 @@
-/// Module responsible for notifying plugins of account updates
-use {
-    crate::accountsdb_plugin_manager::AccountsDbPluginManager,
-    log::*,
-    solana_accountsdb_plugin_interface::accountsdb_plugin_interface::{
-        ReplicaAccountInfo, ReplicaAccountInfoVersions, SlotStatus,
-    },
-    solana_measure::measure::Measure,
-    solana_metrics::*,
-    solana_runtime::{
-        accounts_update_notifier_interface::AccountsUpdateNotifierInterface,
-        append_vec::{StoredAccountMeta, StoredMeta},
-    },
-    solana_sdk::{
-        account::{AccountSharedData, ReadableAccount},
-        clock::Slot,
-    },
-    std::sync::{Arc, RwLock},
-};
-#[derive(Debug)]
-pub(crate) struct AccountsUpdateNotifierImpl {
-    plugin_manager: Arc<RwLock<AccountsDbPluginManager>>,
-}
-
-impl AccountsUpdateNotifierInterface for AccountsUpdateNotifierImpl {
-    fn notify_account_update(&self, slot: Slot, meta: &StoredMeta, account: &AccountSharedData) {
-        if let Some(account_info) = self.accountinfo_from_shared_account_data(meta, account) {
-            self.notify_plugins_of_account_update(account_info, slot, false);
-        }
-    }
-
-    fn notify_account_restore_from_snapshot(&self, slot: Slot, account: &StoredAccountMeta) {
-        let mut measure_all = Measure::start("accountsdb-plugin-notify-account-restore-all");
-        let mut measure_copy = Measure::start("accountsdb-plugin-copy-stored-account-info");
-
-        let account = self.accountinfo_from_stored_account_meta(account);
-        measure_copy.stop();
-
-        inc_new_counter_debug!(
-            "accountsdb-plugin-copy-stored-account-info-us",
-            measure_copy.as_us() as usize,
-            100000,
-            100000
-        );
-
-        if let Some(account_info) = account {
-            self.notify_plugins_of_account_update(account_info, slot, true);
-        }
-        measure_all.stop();
-
-        inc_new_counter_debug!(
-            "accountsdb-plugin-notify-account-restore-all-us",
-            measure_all.as_us() as usize,
-            100000,
-            100000
-        );
-    }
-
-    fn notify_end_of_restore_from_snapshot(&self) {
-        let mut plugin_manager = self.plugin_manager.write().unwrap();
-        if plugin_manager.plugins.is_empty() {
-            return;
-        }
-
-        for plugin in plugin_manager.plugins.iter_mut() {
-            let mut measure = Measure::start("accountsdb-plugin-end-of-restore-from-snapshot");
-            match plugin.notify_end_of_startup() {
-                Err(err) => {
-                    error!(
-                        "Failed to notify the end of restore from snapshot, error: {} to plugin {}",
-                        err,
-                        plugin.name()
-                    )
-                }
-                Ok(_) => {
-                    trace!(
-                        "Successfully notified the end of restore from snapshot to plugin {}",
-                        plugin.name()
-                    );
-                }
-            }
-            measure.stop();
-            inc_new_counter_debug!(
-                "accountsdb-plugin-end-of-restore-from-snapshot",
-                measure.as_us() as usize
-            );
-        }
-    }
-
-    fn notify_slot_confirmed(&self, slot: Slot, parent: Option<Slot>) {
-        self.notify_slot_status(slot, parent, SlotStatus::Confirmed);
-    }
-
-    fn notify_slot_processed(&self, slot: Slot, parent: Option<Slot>) {
-        self.notify_slot_status(slot, parent, SlotStatus::Processed);
-    }
-
-    fn notify_slot_rooted(&self, slot: Slot, parent: Option<Slot>) {
-        self.notify_slot_status(slot, parent, SlotStatus::Rooted);
-    }
-}
-
-impl AccountsUpdateNotifierImpl {
-    pub fn new(plugin_manager: Arc<RwLock<AccountsDbPluginManager>>) -> Self {
-        AccountsUpdateNotifierImpl { plugin_manager }
-    }
-
-    fn accountinfo_from_shared_account_data<'a>(
-        &self,
-        meta: &'a StoredMeta,
-        account: &'a AccountSharedData,
-    ) -> Option<ReplicaAccountInfo<'a>> {
-        Some(ReplicaAccountInfo {
-            pubkey: meta.pubkey.as_ref(),
-            lamports: account.lamports(),
-            owner: account.owner().as_ref(),
-            executable: account.executable(),
-            rent_epoch: account.rent_epoch(),
-            data: account.data(),
-            write_version: meta.write_version,
-        })
-    }
-
-    fn accountinfo_from_stored_account_meta<'a>(
-        &self,
-        stored_account_meta: &'a StoredAccountMeta,
-    ) -> Option<ReplicaAccountInfo<'a>> {
-        Some(ReplicaAccountInfo {
-            pubkey: stored_account_meta.meta.pubkey.as_ref(),
-            lamports: stored_account_meta.account_meta.lamports,
-            owner: stored_account_meta.account_meta.owner.as_ref(),
-            executable: stored_account_meta.account_meta.executable,
-            rent_epoch: stored_account_meta.account_meta.rent_epoch,
-            data: stored_account_meta.data,
-            write_version: stored_account_meta.meta.write_version,
-        })
-    }
-
-    fn notify_plugins_of_account_update(
-        &self,
-        account: ReplicaAccountInfo,
-        slot: Slot,
-        is_startup: bool,
-    ) {
-        let mut measure2 = Measure::start("accountsdb-plugin-notify_plugins_of_account_update");
-        let mut plugin_manager = self.plugin_manager.write().unwrap();
-
-        if plugin_manager.plugins.is_empty() {
-            return;
-        }
-        for plugin in plugin_manager.plugins.iter_mut() {
-            let mut measure = Measure::start("accountsdb-plugin-update-account");
-            match plugin.update_account(
-                ReplicaAccountInfoVersions::V0_0_1(&account),
-                slot,
-                is_startup,
-            ) {
-                Err(err) => {
-                    error!(
-                        "Failed to update account {} at slot {}, error: {} to plugin {}",
-                        bs58::encode(account.pubkey).into_string(),
-                        slot,
-                        err,
-                        plugin.name()
-                    )
-                }
-                Ok(_) => {
-                    trace!(
-                        "Successfully updated account {} at slot {} to plugin {}",
-                        bs58::encode(account.pubkey).into_string(),
-                        slot,
-                        plugin.name()
-                    );
-                }
-            }
-            measure.stop();
-            inc_new_counter_debug!(
-                "accountsdb-plugin-update-account-us",
-                measure.as_us() as usize,
-                100000,
-                100000
-            );
-        }
-        measure2.stop();
-        inc_new_counter_debug!(
-            "accountsdb-plugin-notify_plugins_of_account_update-us",
-            measure2.as_us() as usize,
-            100000,
-            100000
-        );
-    }
-
-    pub fn notify_slot_status(&self, slot: Slot, parent: Option<Slot>, slot_status: SlotStatus) {
-        let mut plugin_manager = self.plugin_manager.write().unwrap();
-        if plugin_manager.plugins.is_empty() {
-            return;
-        }
-
-        for plugin in plugin_manager.plugins.iter_mut() {
-            let mut measure = Measure::start("accountsdb-plugin-update-slot");
-            match plugin.update_slot_status(slot, parent, slot_status.clone()) {
-                Err(err) => {
-                    error!(
-                        "Failed to update slot status at slot {}, error: {} to plugin {}",
-                        slot,
-                        err,
-                        plugin.name()
-                    )
-                }
-                Ok(_) => {
-                    trace!(
-                        "Successfully updated slot status at slot {} to plugin {}",
-                        slot,
-                        plugin.name()
-                    );
-                }
-            }
-            measure.stop();
-            inc_new_counter_debug!(
-                "accountsdb-plugin-update-slot-us",
-                measure.as_us() as usize,
-                1000,
-                1000
-            );
-        }
-    }
-}

accountsdb-plugin-manager/src/accountsdb_plugin_manager.rs

@@ -1,55 +0,0 @@
-/// Managing the AccountsDb plugins
-use {
-    libloading::{Library, Symbol},
-    log::*,
-    solana_accountsdb_plugin_interface::accountsdb_plugin_interface::AccountsDbPlugin,
-    std::error::Error,
-};
-
-#[derive(Default, Debug)]
-pub struct AccountsDbPluginManager {
-    pub plugins: Vec<Box<dyn AccountsDbPlugin>>,
-    libs: Vec<Library>,
-}
-
-impl AccountsDbPluginManager {
-    pub fn new() -> Self {
-        AccountsDbPluginManager {
-            plugins: Vec::default(),
-            libs: Vec::default(),
-        }
-    }
-
-    /// # Safety
-    ///
-    /// This function loads the dynamically linked library specified in the path. The library
-    /// must do necessary initializations.
-    pub unsafe fn load_plugin(
-        &mut self,
-        libpath: &str,
-        config_file: &str,
-    ) -> Result<(), Box<dyn Error>> {
-        type PluginConstructor = unsafe fn() -> *mut dyn AccountsDbPlugin;
-        let lib = Library::new(libpath)?;
-        let constructor: Symbol<PluginConstructor> = lib.get(b"_create_plugin")?;
-        let plugin_raw = constructor();
-        let mut plugin = Box::from_raw(plugin_raw);
-        plugin.on_load(config_file)?;
-        self.plugins.push(plugin);
-        self.libs.push(lib);
-        Ok(())
-    }
-
-    /// Unload all plugins and loaded plugin libraries, making sure to fire
-    /// their `on_plugin_unload()` methods so they can do any necessary cleanup.
-    pub fn unload(&mut self) {
-        for mut plugin in self.plugins.drain(..) {
-            info!("Unloading plugin for {:?}", plugin.name());
-            plugin.on_unload();
-        }
-
-        for lib in self.libs.drain(..) {
-            drop(lib);
-        }
-    }
-}

accountsdb-plugin-manager/src/accountsdb_plugin_service.rs

@@ -1,157 +0,0 @@
-use {
-    crate::{
-        accounts_update_notifier::AccountsUpdateNotifierImpl,
-        accountsdb_plugin_manager::AccountsDbPluginManager,
-        slot_status_observer::SlotStatusObserver,
-    },
-    crossbeam_channel::Receiver,
-    log::*,
-    serde_json,
-    solana_rpc::optimistically_confirmed_bank_tracker::BankNotification,
-    solana_runtime::accounts_update_notifier_interface::AccountsUpdateNotifier,
-    std::{
-        fs::File,
-        io::Read,
-        path::{Path, PathBuf},
-        sync::{Arc, RwLock},
-        thread,
-    },
-    thiserror::Error,
-};
-
-#[derive(Error, Debug)]
-pub enum AccountsdbPluginServiceError {
-    #[error("Cannot open the the plugin config file")]
-    CannotOpenConfigFile(String),
-
-    #[error("Cannot read the the plugin config file")]
-    CannotReadConfigFile(String),
-
-    #[error("The config file is not in a valid Json format")]
-    InvalidConfigFileFormat(String),
-
-    #[error("Plugin library path is not specified in the config file")]
-    LibPathNotSet,
-
-    #[error("Invalid plugin path")]
-    InvalidPluginPath,
-
-    #[error("Cannot load plugin shared library")]
-    PluginLoadError(String),
-}
-
-/// The service managing the AccountsDb plugin workflow.
-pub struct AccountsDbPluginService {
-    slot_status_observer: SlotStatusObserver,
-    plugin_manager: Arc<RwLock<AccountsDbPluginManager>>,
-    accounts_update_notifier: AccountsUpdateNotifier,
-}
-
-impl AccountsDbPluginService {
-    /// Creates and returns the AccountsDbPluginService.
-    /// # Arguments
-    /// * `confirmed_bank_receiver` - The receiver for confirmed bank notification
-    /// * `accountsdb_plugin_config_file` - The config file path for the plugin. The
-    ///    config file controls the plugin responsible
-    ///    for transporting the data to external data stores. It is defined in JSON format.
-    ///    The `libpath` field should be pointed to the full path of the dynamic shared library
-    ///    (.so file) to be loaded. The shared library must implement the `AccountsDbPlugin`
-    ///    trait. And the shared library shall export a `C` function `_create_plugin` which
-    ///    shall create the implementation of `AccountsDbPlugin` and returns to the caller.
-    ///    The rest of the JSON fields' definition is up to to the concrete plugin implementation
-    ///    It is usually used to configure the connection information for the external data store.
-
-    pub fn new(
-        confirmed_bank_receiver: Receiver<BankNotification>,
-        accountsdb_plugin_config_files: &[PathBuf],
-    ) -> Result<Self, AccountsdbPluginServiceError> {
-        info!(
-            "Starting AccountsDbPluginService from config files: {:?}",
-            accountsdb_plugin_config_files
-        );
-        let mut plugin_manager = AccountsDbPluginManager::new();
-
-        for accountsdb_plugin_config_file in accountsdb_plugin_config_files {
-            Self::load_plugin(&mut plugin_manager, accountsdb_plugin_config_file)?;
-        }
-
-        let plugin_manager = Arc::new(RwLock::new(plugin_manager));
-        let accounts_update_notifier = Arc::new(RwLock::new(AccountsUpdateNotifierImpl::new(
-            plugin_manager.clone(),
-        )));
-        let slot_status_observer =
-            SlotStatusObserver::new(confirmed_bank_receiver, accounts_update_notifier.clone());
-
-        info!("Started AccountsDbPluginService");
-        Ok(AccountsDbPluginService {
-            slot_status_observer,
-            plugin_manager,
-            accounts_update_notifier,
-        })
-    }
-
-    fn load_plugin(
-        plugin_manager: &mut AccountsDbPluginManager,
-        accountsdb_plugin_config_file: &Path,
-    ) -> Result<(), AccountsdbPluginServiceError> {
-        let mut file = match File::open(accountsdb_plugin_config_file) {
-            Ok(file) => file,
-            Err(err) => {
-                return Err(AccountsdbPluginServiceError::CannotOpenConfigFile(format!(
-                    "Failed to open the plugin config file {:?}, error: {:?}",
-                    accountsdb_plugin_config_file, err
-                )));
-            }
-        };
-
-        let mut contents = String::new();
-        if let Err(err) = file.read_to_string(&mut contents) {
-            return Err(AccountsdbPluginServiceError::CannotReadConfigFile(format!(
-                "Failed to read the plugin config file {:?}, error: {:?}",
-                accountsdb_plugin_config_file, err
-            )));
-        }
-
-        let result: serde_json::Value = match serde_json::from_str(&contents) {
-            Ok(value) => value,
-            Err(err) => {
-                return Err(AccountsdbPluginServiceError::InvalidConfigFileFormat(
-                    format!(
-                        "The config file {:?} is not in a valid Json format, error: {:?}",
-                        accountsdb_plugin_config_file, err
-                    ),
-                ));
-            }
-        };
-
-        let libpath = result["libpath"]
-            .as_str()
-            .ok_or(AccountsdbPluginServiceError::LibPathNotSet)?;
-        let config_file = accountsdb_plugin_config_file
-            .as_os_str()
-            .to_str()
-            .ok_or(AccountsdbPluginServiceError::InvalidPluginPath)?;
-
-        unsafe {
-            let result = plugin_manager.load_plugin(libpath, config_file);
-            if let Err(err) = result {
-                let msg = format!(
-                    "Failed to load the plugin library: {:?}, error: {:?}",
-                    libpath, err
-                );
-                return Err(AccountsdbPluginServiceError::PluginLoadError(msg));
-            }
-        }
-        Ok(())
-    }
-
-    pub fn get_accounts_update_notifier(&self) -> AccountsUpdateNotifier {
-        self.accounts_update_notifier.clone()
-    }
-
-    pub fn join(mut self) -> thread::Result<()> {
-        self.slot_status_observer.join()?;
-        self.plugin_manager.write().unwrap().unload();
-        Ok(())
-    }
-}

accountsdb-plugin-manager/src/lib.rs

@@ -1,4 +0,0 @@
-pub mod accounts_update_notifier;
-pub mod accountsdb_plugin_manager;
-pub mod accountsdb_plugin_service;
-pub mod slot_status_observer;

accountsdb-plugin-manager/src/slot_status_observer.rs

@@ -1,80 +0,0 @@
-use {
-    crossbeam_channel::Receiver,
-    solana_rpc::optimistically_confirmed_bank_tracker::BankNotification,
-    solana_runtime::accounts_update_notifier_interface::AccountsUpdateNotifier,
-    std::{
-        sync::{
-            atomic::{AtomicBool, Ordering},
-            Arc,
-        },
-        thread::{self, Builder, JoinHandle},
-    },
-};
-
-#[derive(Debug)]
-pub(crate) struct SlotStatusObserver {
-    bank_notification_receiver_service: Option<JoinHandle<()>>,
-    exit_updated_slot_server: Arc<AtomicBool>,
-}
-
-impl SlotStatusObserver {
-    pub fn new(
-        bank_notification_receiver: Receiver<BankNotification>,
-        accounts_update_notifier: AccountsUpdateNotifier,
-    ) -> Self {
-        let exit_updated_slot_server = Arc::new(AtomicBool::new(false));
-
-        Self {
-            bank_notification_receiver_service: Some(Self::run_bank_notification_receiver(
-                bank_notification_receiver,
-                exit_updated_slot_server.clone(),
-                accounts_update_notifier,
-            )),
-            exit_updated_slot_server,
-        }
-    }
-
-    pub fn join(&mut self) -> thread::Result<()> {
-        self.exit_updated_slot_server.store(true, Ordering::Relaxed);
-        self.bank_notification_receiver_service
-            .take()
-            .map(JoinHandle::join)
-            .unwrap()
-    }
-
-    fn run_bank_notification_receiver(
-        bank_notification_receiver: Receiver<BankNotification>,
-        exit: Arc<AtomicBool>,
-        accounts_update_notifier: AccountsUpdateNotifier,
-    ) -> JoinHandle<()> {
-        Builder::new()
-            .name("bank_notification_receiver".to_string())
-            .spawn(move || {
-                while !exit.load(Ordering::Relaxed) {
-                    if let Ok(slot) = bank_notification_receiver.recv() {
-                        match slot {
-                            BankNotification::OptimisticallyConfirmed(slot) => {
-                                accounts_update_notifier
-                                    .read()
-                                    .unwrap()
-                                    .notify_slot_confirmed(slot, None);
-                            }
-                            BankNotification::Frozen(bank) => {
-                                accounts_update_notifier
-                                    .read()
-                                    .unwrap()
-                                    .notify_slot_processed(bank.slot(), Some(bank.parent_slot()));
-                            }
-                            BankNotification::Root(bank) => {
-                                accounts_update_notifier
-                                    .read()
-                                    .unwrap()
-                                    .notify_slot_rooted(bank.slot(), Some(bank.parent_slot()));
-                            }
-                        }
-                    }
-                }
-            })
-            .unwrap()
-    }
-}

accountsdb-plugin-postgres/Cargo.toml

@@ -1,33 +0,0 @@
-[package]
-authors = ["Solana Maintainers <maintainers@solana.foundation>"]
-edition = "2018"
-name = "solana-accountsdb-plugin-postgres"
-description = "The Solana AccountsDb plugin for PostgreSQL database."
-version = "1.8.13"
-repository = "https://github.com/solana-labs/solana"
-license = "Apache-2.0"
-homepage = "https://solana.com/"
-documentation = "https://docs.rs/solana-validator"
-
-[lib]
-crate-type = ["cdylib", "rlib"]
-
-[dependencies]
-bs58 = "0.4.0"
-chrono = { version = "0.4.11", features = ["serde"] }
-crossbeam-channel = "0.5"
-log = "0.4.14"
-postgres = { version = "0.19.1", features = ["with-chrono-0_4"] }
-serde = "1.0.130"
-serde_derive = "1.0.103"
-serde_json = "1.0.67"
-solana-accountsdb-plugin-interface = { path = "../accountsdb-plugin-interface", version = "=1.8.13" }
-solana-logger = { path = "../logger", version = "=1.8.13" }
-solana-measure = { path = "../measure", version = "=1.8.13" }
-solana-metrics = { path = "../metrics", version = "=1.8.13" }
-solana-sdk = { path = "../sdk", version = "=1.8.13" }
-thiserror = "1.0.21"
-tokio-postgres = "0.7.3"
-
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]

accountsdb-plugin-postgres/README.md

@@ -1,5 +0,0 @@
-This is an example implementing the AccountsDb plugin for PostgreSQL database.
-Please see the `src/accountsdb_plugin_postgres.rs` for the format of the plugin's configuration file.
-
-To create the schema objects for the database, please use `scripts/create_schema.sql`.
-`scripts/drop_schema.sql` can be used to tear down the schema objects.

accountsdb-plugin-postgres/scripts/create_schema.sql

@@ -1,54 +0,0 @@
-/**
- * This plugin implementation for PostgreSQL requires the following tables
- */
--- The table storing accounts
-
-
-CREATE TABLE account (
-    pubkey BYTEA PRIMARY KEY,
-    owner BYTEA,
-    lamports BIGINT NOT NULL,
-    slot BIGINT NOT NULL,
-    executable BOOL NOT NULL,
-    rent_epoch BIGINT NOT NULL,
-    data BYTEA,
-    write_version BIGINT NOT NULL,
-    updated_on TIMESTAMP NOT NULL
-);
-
--- The table storing slot information
-CREATE TABLE slot (
-    slot BIGINT PRIMARY KEY,
-    parent BIGINT,
-    status varchar(16) NOT NULL,
-    updated_on TIMESTAMP NOT NULL
-);
-
-/**
- * The following is for keeping historical data for accounts and is not required for plugin to work.
- */
--- The table storing historical data for accounts
-CREATE TABLE account_audit (
-    pubkey BYTEA,
-    owner BYTEA,
-    lamports BIGINT NOT NULL,
-    slot BIGINT NOT NULL,
-    executable BOOL NOT NULL,
-    rent_epoch BIGINT NOT NULL,
-    data BYTEA,
-    write_version BIGINT NOT NULL,
-    updated_on TIMESTAMP NOT NULL
-);
-
-CREATE FUNCTION audit_account_update() RETURNS trigger AS $audit_account_update$
-    BEGIN
-		INSERT INTO account_audit (pubkey, owner, lamports, slot, executable, rent_epoch, data, write_version, updated_on)
-            VALUES (OLD.pubkey, OLD.owner, OLD.lamports, OLD.slot,
-                    OLD.executable, OLD.rent_epoch, OLD.data, OLD.write_version, OLD.updated_on);
-        RETURN NEW;
-    END;
-
-$audit_account_update$ LANGUAGE plpgsql;
-
-CREATE TRIGGER account_update_trigger AFTER UPDATE OR DELETE ON account
-    FOR EACH ROW EXECUTE PROCEDURE audit_account_update();

accountsdb-plugin-postgres/scripts/drop_schema.sql

@@ -1,9 +0,0 @@
-/**
- * Script for cleaning up the schema for PostgreSQL used for the AccountsDb plugin.
- */
-
-DROP TRIGGER account_update_trigger ON account;
-DROP FUNCTION audit_account_update;
-DROP TABLE account_audit;
-DROP TABLE account;
-DROP TABLE slot;

accountsdb-plugin-postgres/scripts/postgresql.conf

@@ -1,802 +0,0 @@
-# This a reference configuration file for the PostgreSQL database version 14.
-
-# -----------------------------
-# PostgreSQL configuration file
-# -----------------------------
-#
-# This file consists of lines of the form:
-#
-#   name = value
-#
-# (The "=" is optional.)  Whitespace may be used.  Comments are introduced with
-# "#" anywhere on a line.  The complete list of parameter names and allowed
-# values can be found in the PostgreSQL documentation.
-#
-# The commented-out settings shown in this file represent the default values.
-# Re-commenting a setting is NOT sufficient to revert it to the default value;
-# you need to reload the server.
-#
-# This file is read on server startup and when the server receives a SIGHUP
-# signal.  If you edit the file on a running system, you have to SIGHUP the
-# server for the changes to take effect, run "pg_ctl reload", or execute
-# "SELECT pg_reload_conf()".  Some parameters, which are marked below,
-# require a server shutdown and restart to take effect.
-#
-# Any parameter can also be given as a command-line option to the server, e.g.,
-# "postgres -c log_connections=on".  Some parameters can be changed at run time
-# with the "SET" SQL command.
-#
-# Memory units:  B  = bytes            Time units:  us  = microseconds
-#                kB = kilobytes                     ms  = milliseconds
-#                MB = megabytes                     s   = seconds
-#                GB = gigabytes                     min = minutes
-#                TB = terabytes                     h   = hours
-#                                                   d   = days
-
-
-#------------------------------------------------------------------------------
-# FILE LOCATIONS
-#------------------------------------------------------------------------------
-
-# The default values of these variables are driven from the -D command-line
-# option or PGDATA environment variable, represented here as ConfigDir.
-
-data_directory = '/var/lib/postgresql/14/main'		# use data in another directory
-					# (change requires restart)
-
-hba_file = '/etc/postgresql/14/main/pg_hba.conf'	# host-based authentication file
-					# (change requires restart)
-ident_file = '/etc/postgresql/14/main/pg_ident.conf'	# ident configuration file
-					# (change requires restart)
-
-# If external_pid_file is not explicitly set, no extra PID file is written.
-external_pid_file = '/var/run/postgresql/14-main.pid'			# write an extra PID file
-					# (change requires restart)
-
-
-#------------------------------------------------------------------------------
-# CONNECTIONS AND AUTHENTICATION
-#------------------------------------------------------------------------------
-
-# - Connection Settings -
-
-#listen_addresses = 'localhost'		# what IP address(es) to listen on;
-					# comma-separated list of addresses;
-					# defaults to 'localhost'; use '*' for all
-					# (change requires restart)
-listen_addresses = '*'
-port = 5433				# (change requires restart)
-max_connections = 200			# (change requires restart)
-#superuser_reserved_connections = 3	# (change requires restart)
-unix_socket_directories = '/var/run/postgresql'	# comma-separated list of directories
-					# (change requires restart)
-#unix_socket_group = ''			# (change requires restart)
-#unix_socket_permissions = 0777		# begin with 0 to use octal notation
-					# (change requires restart)
-#bonjour = off				# advertise server via Bonjour
-					# (change requires restart)
-#bonjour_name = ''			# defaults to the computer name
-					# (change requires restart)
-
-# - TCP settings -
-# see "man tcp" for details
-
-#tcp_keepalives_idle = 0		# TCP_KEEPIDLE, in seconds;
-					# 0 selects the system default
-#tcp_keepalives_interval = 0		# TCP_KEEPINTVL, in seconds;
-					# 0 selects the system default
-#tcp_keepalives_count = 0		# TCP_KEEPCNT;
-					# 0 selects the system default
-#tcp_user_timeout = 0			# TCP_USER_TIMEOUT, in milliseconds;
-					# 0 selects the system default
-
-#client_connection_check_interval = 0	# time between checks for client
-					# disconnection while running queries;
-					# 0 for never
-
-# - Authentication -
-
-#authentication_timeout = 1min		# 1s-600s
-#password_encryption = scram-sha-256	# scram-sha-256 or md5
-#db_user_namespace = off
-
-# GSSAPI using Kerberos
-#krb_server_keyfile = 'FILE:${sysconfdir}/krb5.keytab'
-#krb_caseins_users = off
-
-# - SSL -
-
-ssl = on
-#ssl_ca_file = ''
-ssl_cert_file = '/etc/ssl/certs/ssl-cert-snakeoil.pem'
-#ssl_crl_file = ''
-#ssl_crl_dir = ''
-ssl_key_file = '/etc/ssl/private/ssl-cert-snakeoil.key'
-#ssl_ciphers = 'HIGH:MEDIUM:+3DES:!aNULL' # allowed SSL ciphers
-#ssl_prefer_server_ciphers = on
-#ssl_ecdh_curve = 'prime256v1'
-#ssl_min_protocol_version = 'TLSv1.2'
-#ssl_max_protocol_version = ''
-#ssl_dh_params_file = ''
-#ssl_passphrase_command = ''
-#ssl_passphrase_command_supports_reload = off
-
-
-#------------------------------------------------------------------------------
-# RESOURCE USAGE (except WAL)
-#------------------------------------------------------------------------------
-
-# - Memory -
-
-shared_buffers = 1GB			# min 128kB
-					# (change requires restart)
-#huge_pages = try			# on, off, or try
-					# (change requires restart)
-#huge_page_size = 0			# zero for system default
-					# (change requires restart)
-#temp_buffers = 8MB			# min 800kB
-#max_prepared_transactions = 0		# zero disables the feature
-					# (change requires restart)
-# Caution: it is not advisable to set max_prepared_transactions nonzero unless
-# you actively intend to use prepared transactions.
-#work_mem = 4MB				# min 64kB
-#hash_mem_multiplier = 1.0		# 1-1000.0 multiplier on hash table work_mem
-#maintenance_work_mem = 64MB		# min 1MB
-#autovacuum_work_mem = -1		# min 1MB, or -1 to use maintenance_work_mem
-#logical_decoding_work_mem = 64MB	# min 64kB
-#max_stack_depth = 2MB			# min 100kB
-#shared_memory_type = mmap		# the default is the first option
-					# supported by the operating system:
-					#   mmap
-					#   sysv
-					#   windows
-					# (change requires restart)
-dynamic_shared_memory_type = posix	# the default is the first option
-					# supported by the operating system:
-					#   posix
-					#   sysv
-					#   windows
-					#   mmap
-					# (change requires restart)
-#min_dynamic_shared_memory = 0MB	# (change requires restart)
-
-# - Disk -
-
-#temp_file_limit = -1			# limits per-process temp file space
-					# in kilobytes, or -1 for no limit
-
-# - Kernel Resources -
-
-#max_files_per_process = 1000		# min 64
-					# (change requires restart)
-
-# - Cost-Based Vacuum Delay -
-
-#vacuum_cost_delay = 0			# 0-100 milliseconds (0 disables)
-#vacuum_cost_page_hit = 1		# 0-10000 credits
-#vacuum_cost_page_miss = 2		# 0-10000 credits
-#vacuum_cost_page_dirty = 20		# 0-10000 credits
-#vacuum_cost_limit = 200		# 1-10000 credits
-
-# - Background Writer -
-
-#bgwriter_delay = 200ms			# 10-10000ms between rounds
-#bgwriter_lru_maxpages = 100		# max buffers written/round, 0 disables
-#bgwriter_lru_multiplier = 2.0		# 0-10.0 multiplier on buffers scanned/round
-#bgwriter_flush_after = 512kB		# measured in pages, 0 disables
-
-# - Asynchronous Behavior -
-
-#backend_flush_after = 0		# measured in pages, 0 disables
-effective_io_concurrency = 1000		# 1-1000; 0 disables prefetching
-#maintenance_io_concurrency = 10	# 1-1000; 0 disables prefetching
-#max_worker_processes = 8		# (change requires restart)
-#max_parallel_workers_per_gather = 2	# taken from max_parallel_workers
-#max_parallel_maintenance_workers = 2	# taken from max_parallel_workers
-#max_parallel_workers = 8		# maximum number of max_worker_processes that
-					# can be used in parallel operations
-#parallel_leader_participation = on
-#old_snapshot_threshold = -1		# 1min-60d; -1 disables; 0 is immediate
-					# (change requires restart)
-
-
-#------------------------------------------------------------------------------
-# WRITE-AHEAD LOG
-#------------------------------------------------------------------------------
-
-# - Settings -
-
-wal_level = minimal 			# minimal, replica, or logical
-					# (change requires restart)
-fsync = off				# flush data to disk for crash safety
-					# (turning this off can cause
-					# unrecoverable data corruption)
-synchronous_commit = off		# synchronization level;
-					# off, local, remote_write, remote_apply, or on
-#wal_sync_method = fsync		# the default is the first option
-					# supported by the operating system:
-					#   open_datasync
-					#   fdatasync (default on Linux and FreeBSD)
-					#   fsync
-					#   fsync_writethrough
-					#   open_sync
-full_page_writes = off			# recover from partial page writes
-#wal_log_hints = off			# also do full page writes of non-critical updates
-					# (change requires restart)
-#wal_compression = off			# enable compression of full-page writes
-#wal_init_zero = on			# zero-fill new WAL files
-#wal_recycle = on			# recycle WAL files
-#wal_buffers = -1			# min 32kB, -1 sets based on shared_buffers
-					# (change requires restart)
-#wal_writer_delay = 200ms		# 1-10000 milliseconds
-#wal_writer_flush_after = 1MB		# measured in pages, 0 disables
-#wal_skip_threshold = 2MB
-
-#commit_delay = 0			# range 0-100000, in microseconds
-#commit_siblings = 5			# range 1-1000
-
-# - Checkpoints -
-
-#checkpoint_timeout = 5min		# range 30s-1d
-#checkpoint_completion_target = 0.9	# checkpoint target duration, 0.0 - 1.0
-#checkpoint_flush_after = 256kB		# measured in pages, 0 disables
-#checkpoint_warning = 30s		# 0 disables
-max_wal_size = 1GB
-min_wal_size = 80MB
-
-# - Archiving -
-
-#archive_mode = off		# enables archiving; off, on, or always
-				# (change requires restart)
-#archive_command = ''		# command to use to archive a logfile segment
-				# placeholders: %p = path of file to archive
-				#               %f = file name only
-				# e.g. 'test ! -f /mnt/server/archivedir/%f && cp %p /mnt/server/archivedir/%f'
-#archive_timeout = 0		# force a logfile segment switch after this
-				# number of seconds; 0 disables
-
-# - Archive Recovery -
-
-# These are only used in recovery mode.
-
-#restore_command = ''		# command to use to restore an archived logfile segment
-				# placeholders: %p = path of file to restore
-				#               %f = file name only
-				# e.g. 'cp /mnt/server/archivedir/%f %p'
-#archive_cleanup_command = ''	# command to execute at every restartpoint
-#recovery_end_command = ''	# command to execute at completion of recovery
-
-# - Recovery Target -
-
-# Set these only when performing a targeted recovery.
-
-#recovery_target = ''		# 'immediate' to end recovery as soon as a
-                                # consistent state is reached
-				# (change requires restart)
-#recovery_target_name = ''	# the named restore point to which recovery will proceed
-				# (change requires restart)
-#recovery_target_time = ''	# the time stamp up to which recovery will proceed
-				# (change requires restart)
-#recovery_target_xid = ''	# the transaction ID up to which recovery will proceed
-				# (change requires restart)
-#recovery_target_lsn = ''	# the WAL LSN up to which recovery will proceed
-				# (change requires restart)
-#recovery_target_inclusive = on # Specifies whether to stop:
-				# just after the specified recovery target (on)
-				# just before the recovery target (off)
-				# (change requires restart)
-#recovery_target_timeline = 'latest'	# 'current', 'latest', or timeline ID
-				# (change requires restart)
-#recovery_target_action = 'pause'	# 'pause', 'promote', 'shutdown'
-				# (change requires restart)
-
-
-#------------------------------------------------------------------------------
-# REPLICATION
-#------------------------------------------------------------------------------
-
-# - Sending Servers -
-
-# Set these on the primary and on any standby that will send replication data.
-
-max_wal_senders = 0		# max number of walsender processes
-				# (change requires restart)
-#max_replication_slots = 10	# max number of replication slots
-				# (change requires restart)
-#wal_keep_size = 0		# in megabytes; 0 disables
-#max_slot_wal_keep_size = -1	# in megabytes; -1 disables
-#wal_sender_timeout = 60s	# in milliseconds; 0 disables
-#track_commit_timestamp = off	# collect timestamp of transaction commit
-				# (change requires restart)
-
-# - Primary Server -
-
-# These settings are ignored on a standby server.
-
-#synchronous_standby_names = ''	# standby servers that provide sync rep
-				# method to choose sync standbys, number of sync standbys,
-				# and comma-separated list of application_name
-				# from standby(s); '*' = all
-#vacuum_defer_cleanup_age = 0	# number of xacts by which cleanup is delayed
-
-# - Standby Servers -
-
-# These settings are ignored on a primary server.
-
-#primary_conninfo = ''			# connection string to sending server
-#primary_slot_name = ''			# replication slot on sending server
-#promote_trigger_file = ''		# file name whose presence ends recovery
-#hot_standby = on			# "off" disallows queries during recovery
-					# (change requires restart)
-#max_standby_archive_delay = 30s	# max delay before canceling queries
-					# when reading WAL from archive;
-					# -1 allows indefinite delay
-#max_standby_streaming_delay = 30s	# max delay before canceling queries
-					# when reading streaming WAL;
-					# -1 allows indefinite delay
-#wal_receiver_create_temp_slot = off	# create temp slot if primary_slot_name
-					# is not set
-#wal_receiver_status_interval = 10s	# send replies at least this often
-					# 0 disables
-#hot_standby_feedback = off		# send info from standby to prevent
-					# query conflicts
-#wal_receiver_timeout = 60s		# time that receiver waits for
-					# communication from primary
-					# in milliseconds; 0 disables
-#wal_retrieve_retry_interval = 5s	# time to wait before retrying to
-					# retrieve WAL after a failed attempt
-#recovery_min_apply_delay = 0		# minimum delay for applying changes during recovery
-
-# - Subscribers -
-
-# These settings are ignored on a publisher.
-
-#max_logical_replication_workers = 4	# taken from max_worker_processes
-					# (change requires restart)
-#max_sync_workers_per_subscription = 2	# taken from max_logical_replication_workers
-
-
-#------------------------------------------------------------------------------
-# QUERY TUNING
-#------------------------------------------------------------------------------
-
-# - Planner Method Configuration -
-
-#enable_async_append = on
-#enable_bitmapscan = on
-#enable_gathermerge = on
-#enable_hashagg = on
-#enable_hashjoin = on
-#enable_incremental_sort = on
-#enable_indexscan = on
-#enable_indexonlyscan = on
-#enable_material = on
-#enable_memoize = on
-#enable_mergejoin = on
-#enable_nestloop = on
-#enable_parallel_append = on
-#enable_parallel_hash = on
-#enable_partition_pruning = on
-#enable_partitionwise_join = off
-#enable_partitionwise_aggregate = off
-#enable_seqscan = on
-#enable_sort = on
-#enable_tidscan = on
-
-# - Planner Cost Constants -
-
-#seq_page_cost = 1.0			# measured on an arbitrary scale
-#random_page_cost = 4.0			# same scale as above
-#cpu_tuple_cost = 0.01			# same scale as above
-#cpu_index_tuple_cost = 0.005		# same scale as above
-#cpu_operator_cost = 0.0025		# same scale as above
-#parallel_setup_cost = 1000.0	# same scale as above
-#parallel_tuple_cost = 0.1		# same scale as above
-#min_parallel_table_scan_size = 8MB
-#min_parallel_index_scan_size = 512kB
-#effective_cache_size = 4GB
-
-#jit_above_cost = 100000		# perform JIT compilation if available
-					# and query more expensive than this;
-					# -1 disables
-#jit_inline_above_cost = 500000		# inline small functions if query is
-					# more expensive than this; -1 disables
-#jit_optimize_above_cost = 500000	# use expensive JIT optimizations if
-					# query is more expensive than this;
-					# -1 disables
-
-# - Genetic Query Optimizer -
-
-#geqo = on
-#geqo_threshold = 12
-#geqo_effort = 5			# range 1-10
-#geqo_pool_size = 0			# selects default based on effort
-#geqo_generations = 0			# selects default based on effort
-#geqo_selection_bias = 2.0		# range 1.5-2.0
-#geqo_seed = 0.0			# range 0.0-1.0
-
-# - Other Planner Options -
-
-#default_statistics_target = 100	# range 1-10000
-#constraint_exclusion = partition	# on, off, or partition
-#cursor_tuple_fraction = 0.1		# range 0.0-1.0
-#from_collapse_limit = 8
-#jit = on				# allow JIT compilation
-#join_collapse_limit = 8		# 1 disables collapsing of explicit
-					# JOIN clauses
-#plan_cache_mode = auto			# auto, force_generic_plan or
-					# force_custom_plan
-
-
-#------------------------------------------------------------------------------
-# REPORTING AND LOGGING
-#------------------------------------------------------------------------------
-
-# - Where to Log -
-
-#log_destination = 'stderr'		# Valid values are combinations of
-					# stderr, csvlog, syslog, and eventlog,
-					# depending on platform.  csvlog
-					# requires logging_collector to be on.
-
-# This is used when logging to stderr:
-#logging_collector = off		# Enable capturing of stderr and csvlog
-					# into log files. Required to be on for
-					# csvlogs.
-					# (change requires restart)
-
-# These are only used if logging_collector is on:
-#log_directory = 'log'			# directory where log files are written,
-					# can be absolute or relative to PGDATA
-#log_filename = 'postgresql-%Y-%m-%d_%H%M%S.log'	# log file name pattern,
-					# can include strftime() escapes
-#log_file_mode = 0600			# creation mode for log files,
-					# begin with 0 to use octal notation
-#log_rotation_age = 1d			# Automatic rotation of logfiles will
-					# happen after that time.  0 disables.
-#log_rotation_size = 10MB		# Automatic rotation of logfiles will
-					# happen after that much log output.
-					# 0 disables.
-#log_truncate_on_rotation = off		# If on, an existing log file with the
-					# same name as the new log file will be
-					# truncated rather than appended to.
-					# But such truncation only occurs on
-					# time-driven rotation, not on restarts
-					# or size-driven rotation.  Default is
-					# off, meaning append to existing files
-					# in all cases.
-
-# These are relevant when logging to syslog:
-#syslog_facility = 'LOCAL0'
-#syslog_ident = 'postgres'
-#syslog_sequence_numbers = on
-#syslog_split_messages = on
-
-# This is only relevant when logging to eventlog (Windows):
-# (change requires restart)
-#event_source = 'PostgreSQL'
-
-# - When to Log -
-
-#log_min_messages = warning		# values in order of decreasing detail:
-					#   debug5
-					#   debug4
-					#   debug3
-					#   debug2
-					#   debug1
-					#   info
-					#   notice
-					#   warning
-					#   error
-					#   log
-					#   fatal
-					#   panic
-
-#log_min_error_statement = error	# values in order of decreasing detail:
-					#   debug5
-					#   debug4
-					#   debug3
-					#   debug2
-					#   debug1
-					#   info
-					#   notice
-					#   warning
-					#   error
-					#   log
-					#   fatal
-					#   panic (effectively off)
-
-#log_min_duration_statement = -1	# -1 is disabled, 0 logs all statements
-					# and their durations, > 0 logs only
-					# statements running at least this number
-					# of milliseconds
-
-#log_min_duration_sample = -1		# -1 is disabled, 0 logs a sample of statements
-					# and their durations, > 0 logs only a sample of
-					# statements running at least this number
-					# of milliseconds;
-					# sample fraction is determined by log_statement_sample_rate
-
-#log_statement_sample_rate = 1.0	# fraction of logged statements exceeding
-					# log_min_duration_sample to be logged;
-					# 1.0 logs all such statements, 0.0 never logs
-
-
-#log_transaction_sample_rate = 0.0	# fraction of transactions whose statements
-					# are logged regardless of their duration; 1.0 logs all
-					# statements from all transactions, 0.0 never logs
-
-# - What to Log -
-
-#debug_print_parse = off
-#debug_print_rewritten = off
-#debug_print_plan = off
-#debug_pretty_print = on
-#log_autovacuum_min_duration = -1	# log autovacuum activity;
-					# -1 disables, 0 logs all actions and
-					# their durations, > 0 logs only
-					# actions running at least this number
-					# of milliseconds.
-#log_checkpoints = off
-#log_connections = off
-#log_disconnections = off
-#log_duration = off
-#log_error_verbosity = default		# terse, default, or verbose messages
-#log_hostname = off
-log_line_prefix = '%m [%p] %q%u@%d '		# special values:
-					#   %a = application name
-					#   %u = user name
-					#   %d = database name
-					#   %r = remote host and port
-					#   %h = remote host
-					#   %b = backend type
-					#   %p = process ID
-					#   %P = process ID of parallel group leader
-					#   %t = timestamp without milliseconds
-					#   %m = timestamp with milliseconds
-					#   %n = timestamp with milliseconds (as a Unix epoch)
-					#   %Q = query ID (0 if none or not computed)
-					#   %i = command tag
-					#   %e = SQL state
-					#   %c = session ID
-					#   %l = session line number
-					#   %s = session start timestamp
-					#   %v = virtual transaction ID
-					#   %x = transaction ID (0 if none)
-					#   %q = stop here in non-session
-					#        processes
-					#   %% = '%'
-					# e.g. '<%u%%%d> '
-#log_lock_waits = off			# log lock waits >= deadlock_timeout
-#log_recovery_conflict_waits = off	# log standby recovery conflict waits
-					# >= deadlock_timeout
-#log_parameter_max_length = -1		# when logging statements, limit logged
-					# bind-parameter values to N bytes;
-					# -1 means print in full, 0 disables
-#log_parameter_max_length_on_error = 0	# when logging an error, limit logged
-					# bind-parameter values to N bytes;
-					# -1 means print in full, 0 disables
-#log_statement = 'none'			# none, ddl, mod, all
-#log_replication_commands = off
-#log_temp_files = -1			# log temporary files equal or larger
-					# than the specified size in kilobytes;
-					# -1 disables, 0 logs all temp files
-log_timezone = 'Etc/UTC'
-
-
-#------------------------------------------------------------------------------
-# PROCESS TITLE
-#------------------------------------------------------------------------------
-
-cluster_name = '14/main'			# added to process titles if nonempty
-					# (change requires restart)
-#update_process_title = on
-
-
-#------------------------------------------------------------------------------
-# STATISTICS
-#------------------------------------------------------------------------------
-
-# - Query and Index Statistics Collector -
-
-#track_activities = on
-#track_activity_query_size = 1024	# (change requires restart)
-#track_counts = on
-#track_io_timing = off
-#track_wal_io_timing = off
-#track_functions = none			# none, pl, all
-stats_temp_directory = '/var/run/postgresql/14-main.pg_stat_tmp'
-
-
-# - Monitoring -
-
-#compute_query_id = auto
-#log_statement_stats = off
-#log_parser_stats = off
-#log_planner_stats = off
-#log_executor_stats = off
-
-
-#------------------------------------------------------------------------------
-# AUTOVACUUM
-#------------------------------------------------------------------------------
-
-#autovacuum = on			# Enable autovacuum subprocess?  'on'
-					# requires track_counts to also be on.
-#autovacuum_max_workers = 3		# max number of autovacuum subprocesses
-					# (change requires restart)
-#autovacuum_naptime = 1min		# time between autovacuum runs
-#autovacuum_vacuum_threshold = 50	# min number of row updates before
-					# vacuum
-#autovacuum_vacuum_insert_threshold = 1000	# min number of row inserts
-					# before vacuum; -1 disables insert
-					# vacuums
-#autovacuum_analyze_threshold = 50	# min number of row updates before
-					# analyze
-#autovacuum_vacuum_scale_factor = 0.2	# fraction of table size before vacuum
-#autovacuum_vacuum_insert_scale_factor = 0.2	# fraction of inserts over table
-					# size before insert vacuum
-#autovacuum_analyze_scale_factor = 0.1	# fraction of table size before analyze
-#autovacuum_freeze_max_age = 200000000	# maximum XID age before forced vacuum
-					# (change requires restart)
-#autovacuum_multixact_freeze_max_age = 400000000	# maximum multixact age
-					# before forced vacuum
-					# (change requires restart)
-#autovacuum_vacuum_cost_delay = 2ms	# default vacuum cost delay for
-					# autovacuum, in milliseconds;
-					# -1 means use vacuum_cost_delay
-#autovacuum_vacuum_cost_limit = -1	# default vacuum cost limit for
-					# autovacuum, -1 means use
-					# vacuum_cost_limit
-
-
-#------------------------------------------------------------------------------
-# CLIENT CONNECTION DEFAULTS
-#------------------------------------------------------------------------------
-
-# - Statement Behavior -
-
-#client_min_messages = notice		# values in order of decreasing detail:
-					#   debug5
-					#   debug4
-					#   debug3
-					#   debug2
-					#   debug1
-					#   log
-					#   notice
-					#   warning
-					#   error
-#search_path = '"$user", public'	# schema names
-#row_security = on
-#default_table_access_method = 'heap'
-#default_tablespace = ''		# a tablespace name, '' uses the default
-#default_toast_compression = 'pglz'	# 'pglz' or 'lz4'
-#temp_tablespaces = ''			# a list of tablespace names, '' uses
-					# only default tablespace
-#check_function_bodies = on
-#default_transaction_isolation = 'read committed'
-#default_transaction_read_only = off
-#default_transaction_deferrable = off
-#session_replication_role = 'origin'
-#statement_timeout = 0			# in milliseconds, 0 is disabled
-#lock_timeout = 0			# in milliseconds, 0 is disabled
-#idle_in_transaction_session_timeout = 0	# in milliseconds, 0 is disabled
-#idle_session_timeout = 0		# in milliseconds, 0 is disabled
-#vacuum_freeze_table_age = 150000000
-#vacuum_freeze_min_age = 50000000
-#vacuum_failsafe_age = 1600000000
-#vacuum_multixact_freeze_table_age = 150000000
-#vacuum_multixact_freeze_min_age = 5000000
-#vacuum_multixact_failsafe_age = 1600000000
-#bytea_output = 'hex'			# hex, escape
-#xmlbinary = 'base64'
-#xmloption = 'content'
-#gin_pending_list_limit = 4MB
-
-# - Locale and Formatting -
-
-datestyle = 'iso, mdy'
-#intervalstyle = 'postgres'
-timezone = 'Etc/UTC'
-#timezone_abbreviations = 'Default'     # Select the set of available time zone
-					# abbreviations.  Currently, there are
-					#   Default
-					#   Australia (historical usage)
-					#   India
-					# You can create your own file in
-					# share/timezonesets/.
-#extra_float_digits = 1			# min -15, max 3; any value >0 actually
-					# selects precise output mode
-#client_encoding = sql_ascii		# actually, defaults to database
-					# encoding
-
-# These settings are initialized by initdb, but they can be changed.
-lc_messages = 'C.UTF-8'			# locale for system error message
-					# strings
-lc_monetary = 'C.UTF-8'			# locale for monetary formatting
-lc_numeric = 'C.UTF-8'			# locale for number formatting
-lc_time = 'C.UTF-8'				# locale for time formatting
-
-# default configuration for text search
-default_text_search_config = 'pg_catalog.english'
-
-# - Shared Library Preloading -
-
-#local_preload_libraries = ''
-#session_preload_libraries = ''
-#shared_preload_libraries = ''	# (change requires restart)
-#jit_provider = 'llvmjit'		# JIT library to use
-
-# - Other Defaults -
-
-#dynamic_library_path = '$libdir'
-#extension_destdir = ''			# prepend path when loading extensions
-					# and shared objects (added by Debian)
-#gin_fuzzy_search_limit = 0
-
-
-#------------------------------------------------------------------------------
-# LOCK MANAGEMENT
-#------------------------------------------------------------------------------
-
-#deadlock_timeout = 1s
-#max_locks_per_transaction = 64		# min 10
-					# (change requires restart)
-#max_pred_locks_per_transaction = 64	# min 10
-					# (change requires restart)
-#max_pred_locks_per_relation = -2	# negative values mean
-					# (max_pred_locks_per_transaction
-					#  / -max_pred_locks_per_relation) - 1
-#max_pred_locks_per_page = 2            # min 0
-
-
-#------------------------------------------------------------------------------
-# VERSION AND PLATFORM COMPATIBILITY
-#------------------------------------------------------------------------------
-
-# - Previous PostgreSQL Versions -
-
-#array_nulls = on
-#backslash_quote = safe_encoding	# on, off, or safe_encoding
-#escape_string_warning = on
-#lo_compat_privileges = off
-#quote_all_identifiers = off
-#standard_conforming_strings = on
-#synchronize_seqscans = on
-
-# - Other Platforms and Clients -
-
-#transform_null_equals = off
-
-
-#------------------------------------------------------------------------------
-# ERROR HANDLING
-#------------------------------------------------------------------------------
-
-#exit_on_error = off			# terminate session on any error?
-#restart_after_crash = on		# reinitialize after backend crash?
-#data_sync_retry = off			# retry or panic on failure to fsync
-					# data?
-					# (change requires restart)
-#recovery_init_sync_method = fsync	# fsync, syncfs (Linux 5.8+)
-
-
-#------------------------------------------------------------------------------
-# CONFIG FILE INCLUDES
-#------------------------------------------------------------------------------
-
-# These options allow settings to be loaded from files other than the
-# default postgresql.conf.  Note that these are directives, not variable
-# assignments, so they can usefully be given more than once.
-
-include_dir = 'conf.d'			# include files ending in '.conf' from
-					# a directory, e.g., 'conf.d'
-#include_if_exists = '...'		# include file only if it exists
-#include = '...'			# include file
-
-
-#------------------------------------------------------------------------------
-# CUSTOMIZED OPTIONS
-#------------------------------------------------------------------------------
-
-# Add settings for extensions here

accountsdb-plugin-postgres/src/accounts_selector.rs

@@ -1,69 +0,0 @@
-use {log::*, std::collections::HashSet};
-
-#[derive(Debug)]
-pub(crate) struct AccountsSelector {
-    pub accounts: HashSet<Vec<u8>>,
-    pub owners: HashSet<Vec<u8>>,
-    pub select_all_accounts: bool,
-}
-
-impl AccountsSelector {
-    pub fn default() -> Self {
-        AccountsSelector {
-            accounts: HashSet::default(),
-            owners: HashSet::default(),
-            select_all_accounts: true,
-        }
-    }
-
-    pub fn new(accounts: &[String], owners: &[String]) -> Self {
-        info!(
-            "Creating AccountsSelector from accounts: {:?}, owners: {:?}",
-            accounts, owners
-        );
-
-        let select_all_accounts = accounts.iter().any(|key| key == "*");
-        if select_all_accounts {
-            return AccountsSelector {
-                accounts: HashSet::default(),
-                owners: HashSet::default(),
-                select_all_accounts,
-            };
-        }
-        let accounts = accounts
-            .iter()
-            .map(|key| bs58::decode(key).into_vec().unwrap())
-            .collect();
-        let owners = owners
-            .iter()
-            .map(|key| bs58::decode(key).into_vec().unwrap())
-            .collect();
-        AccountsSelector {
-            accounts,
-            owners,
-            select_all_accounts,
-        }
-    }
-
-    pub fn is_account_selected(&self, account: &[u8], owner: &[u8]) -> bool {
-        self.select_all_accounts || self.accounts.contains(account) || self.owners.contains(owner)
-    }
-}
-
-#[cfg(test)]
-pub(crate) mod tests {
-    use super::*;
-
-    #[test]
-    fn test_create_accounts_selector() {
-        AccountsSelector::new(
-            &["9xQeWvG816bUx9EPjHmaT23yvVM2ZWbrrpZb9PusVFin".to_string()],
-            &[],
-        );
-
-        AccountsSelector::new(
-            &[],
-            &["9xQeWvG816bUx9EPjHmaT23yvVM2ZWbrrpZb9PusVFin".to_string()],
-        );
-    }
-}

accountsdb-plugin-postgres/src/accountsdb_plugin_postgres.rs

@@ -1,345 +0,0 @@
-use solana_measure::measure::Measure;
-/// Main entry for the PostgreSQL plugin
-use {
-    crate::{
-        accounts_selector::AccountsSelector,
-        postgres_client::{ParallelPostgresClient, PostgresClientBuilder},
-    },
-    bs58,
-    log::*,
-    serde_derive::{Deserialize, Serialize},
-    serde_json,
-    solana_accountsdb_plugin_interface::accountsdb_plugin_interface::{
-        AccountsDbPlugin, AccountsDbPluginError, ReplicaAccountInfoVersions, Result, SlotStatus,
-    },
-    solana_metrics::*,
-    std::{fs::File, io::Read},
-    thiserror::Error,
-};
-
-#[derive(Default)]
-pub struct AccountsDbPluginPostgres {
-    client: Option<ParallelPostgresClient>,
-    accounts_selector: Option<AccountsSelector>,
-}
-
-impl std::fmt::Debug for AccountsDbPluginPostgres {
-    fn fmt(&self, _: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        Ok(())
-    }
-}
-
-#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-pub struct AccountsDbPluginPostgresConfig {
-    pub host: Option<String>,
-    pub user: Option<String>,
-    pub port: Option<u16>,
-    pub connection_str: Option<String>,
-    pub threads: Option<usize>,
-    pub batch_size: Option<usize>,
-    pub panic_on_db_errors: Option<bool>,
-}
-
-#[derive(Error, Debug)]
-pub enum AccountsDbPluginPostgresError {
-    #[error("Error connecting to the backend data store. Error message: ({msg})")]
-    DataStoreConnectionError { msg: String },
-
-    #[error("Error preparing data store schema. Error message: ({msg})")]
-    DataSchemaError { msg: String },
-
-    #[error("Error preparing data store schema. Error message: ({msg})")]
-    ConfigurationError { msg: String },
-}
-
-impl AccountsDbPlugin for AccountsDbPluginPostgres {
-    fn name(&self) -> &'static str {
-        "AccountsDbPluginPostgres"
-    }
-
-    /// Do initialization for the PostgreSQL plugin.
-    ///
-    /// # Format of the config file:
-    /// * The `accounts_selector` section allows the user to controls accounts selections.
-    /// "accounts_selector" : {
-    ///     "accounts" : \["pubkey-1", "pubkey-2", ..., "pubkey-n"\],
-    /// }
-    /// or:
-    /// "accounts_selector" = {
-    ///     "owners" : \["pubkey-1", "pubkey-2", ..., "pubkey-m"\]
-    /// }
-    /// Accounts either satisyfing the accounts condition or owners condition will be selected.
-    /// When only owners is specified,
-    /// all accounts belonging to the owners will be streamed.
-    /// The accounts field support wildcard to select all accounts:
-    /// "accounts_selector" : {
-    ///     "accounts" : \["*"\],
-    /// }
-    /// * "host", optional, specifies the PostgreSQL server.
-    /// * "user", optional, specifies the PostgreSQL user.
-    /// * "port", optional, specifies the PostgreSQL server's port.
-    /// * "connection_str", optional, the custom PostgreSQL connection string.
-    /// Please refer to https://docs.rs/postgres/0.19.2/postgres/config/struct.Config.html for the connection configuration.
-    /// When `connection_str` is set, the values in "host", "user" and "port" are ignored. If `connection_str` is not given,
-    /// `host` and `user` must be given.
-    /// * "threads" optional, specifies the number of worker threads for the plugin. A thread
-    /// maintains a PostgreSQL connection to the server. The default is '10'.
-    /// * "batch_size" optional, specifies the batch size of bulk insert when the AccountsDb is created
-    /// from restoring a snapshot. The default is '10'.
-    /// * "panic_on_db_errors", optional, contols if to panic when there are errors replicating data to the
-    /// PostgreSQL database. The default is 'false'.
-    /// # Examples
-    ///
-    /// {
-    ///    "libpath": "/home/solana/target/release/libsolana_accountsdb_plugin_postgres.so",
-    ///    "host": "host_foo",
-    ///    "user": "solana",
-    ///    "threads": 10,
-    ///    "accounts_selector" : {
-    ///       "owners" : ["9oT9R5ZyRovSVnt37QvVoBttGpNqR3J7unkb567NP8k3"]
-    ///    }
-    /// }
-
-    fn on_load(&mut self, config_file: &str) -> Result<()> {
-        solana_logger::setup_with_default("info");
-        info!(
-            "Loading plugin {:?} from config_file {:?}",
-            self.name(),
-            config_file
-        );
-        let mut file = File::open(config_file)?;
-        let mut contents = String::new();
-        file.read_to_string(&mut contents)?;
-
-        let result: serde_json::Value = serde_json::from_str(&contents).unwrap();
-        self.accounts_selector = Some(Self::create_accounts_selector_from_config(&result));
-
-        let result: serde_json::Result<AccountsDbPluginPostgresConfig> =
-            serde_json::from_str(&contents);
-        match result {
-            Err(err) => {
-                return Err(AccountsDbPluginError::ConfigFileReadError {
-                    msg: format!(
-                        "The config file is not in the JSON format expected: {:?}",
-                        err
-                    ),
-                })
-            }
-            Ok(config) => {
-                let client = PostgresClientBuilder::build_pararallel_postgres_client(&config)?;
-                self.client = Some(client);
-            }
-        }
-
-        Ok(())
-    }
-
-    fn on_unload(&mut self) {
-        info!("Unloading plugin: {:?}", self.name());
-
-        match &mut self.client {
-            None => {}
-            Some(client) => {
-                client.join().unwrap();
-            }
-        }
-    }
-
-    fn update_account(
-        &mut self,
-        account: ReplicaAccountInfoVersions,
-        slot: u64,
-        is_startup: bool,
-    ) -> Result<()> {
-        let mut measure_all = Measure::start("accountsdb-plugin-postgres-update-account-main");
-        match account {
-            ReplicaAccountInfoVersions::V0_0_1(account) => {
-                let mut measure_select =
-                    Measure::start("accountsdb-plugin-postgres-update-account-select");
-                if let Some(accounts_selector) = &self.accounts_selector {
-                    if !accounts_selector.is_account_selected(account.pubkey, account.owner) {
-                        return Ok(());
-                    }
-                } else {
-                    return Ok(());
-                }
-                measure_select.stop();
-                inc_new_counter_debug!(
-                    "accountsdb-plugin-postgres-update-account-select-us",
-                    measure_select.as_us() as usize,
-                    100000,
-                    100000
-                );
-
-                debug!(
-                    "Updating account {:?} with owner {:?} at slot {:?} using account selector {:?}",
-                    bs58::encode(account.pubkey).into_string(),
-                    bs58::encode(account.owner).into_string(),
-                    slot,
-                    self.accounts_selector.as_ref().unwrap()
-                );
-
-                match &mut self.client {
-                    None => {
-                        return Err(AccountsDbPluginError::Custom(Box::new(
-                            AccountsDbPluginPostgresError::DataStoreConnectionError {
-                                msg: "There is no connection to the PostgreSQL database."
-                                    .to_string(),
-                            },
-                        )));
-                    }
-                    Some(client) => {
-                        let mut measure_update =
-                            Measure::start("accountsdb-plugin-postgres-update-account-client");
-                        let result = { client.update_account(account, slot, is_startup) };
-                        measure_update.stop();
-
-                        inc_new_counter_debug!(
-                            "accountsdb-plugin-postgres-update-account-client-us",
-                            measure_update.as_us() as usize,
-                            100000,
-                            100000
-                        );
-
-                        if let Err(err) = result {
-                            return Err(AccountsDbPluginError::AccountsUpdateError {
-                                msg: format!("Failed to persist the update of account to the PostgreSQL database. Error: {:?}", err)
-                            });
-                        }
-                    }
-                }
-            }
-        }
-
-        measure_all.stop();
-
-        inc_new_counter_debug!(
-            "accountsdb-plugin-postgres-update-account-main-us",
-            measure_all.as_us() as usize,
-            100000,
-            100000
-        );
-
-        Ok(())
-    }
-
-    fn update_slot_status(
-        &mut self,
-        slot: u64,
-        parent: Option<u64>,
-        status: SlotStatus,
-    ) -> Result<()> {
-        info!("Updating slot {:?} at with status {:?}", slot, status);
-
-        match &mut self.client {
-            None => {
-                return Err(AccountsDbPluginError::Custom(Box::new(
-                    AccountsDbPluginPostgresError::DataStoreConnectionError {
-                        msg: "There is no connection to the PostgreSQL database.".to_string(),
-                    },
-                )));
-            }
-            Some(client) => {
-                let result = client.update_slot_status(slot, parent, status);
-
-                if let Err(err) = result {
-                    return Err(AccountsDbPluginError::SlotStatusUpdateError{
-                        msg: format!("Failed to persist the update of slot to the PostgreSQL database. Error: {:?}", err)
-                    });
-                }
-            }
-        }
-
-        Ok(())
-    }
-
-    fn notify_end_of_startup(&mut self) -> Result<()> {
-        info!("Notifying the end of startup for accounts notifications");
-        match &mut self.client {
-            None => {
-                return Err(AccountsDbPluginError::Custom(Box::new(
-                    AccountsDbPluginPostgresError::DataStoreConnectionError {
-                        msg: "There is no connection to the PostgreSQL database.".to_string(),
-                    },
-                )));
-            }
-            Some(client) => {
-                let result = client.notify_end_of_startup();
-
-                if let Err(err) = result {
-                    return Err(AccountsDbPluginError::SlotStatusUpdateError{
-                        msg: format!("Failed to notify the end of startup for accounts notifications. Error: {:?}", err)
-                    });
-                }
-            }
-        }
-        Ok(())
-    }
-}
-
-impl AccountsDbPluginPostgres {
-    fn create_accounts_selector_from_config(config: &serde_json::Value) -> AccountsSelector {
-        let accounts_selector = &config["accounts_selector"];
-
-        if accounts_selector.is_null() {
-            AccountsSelector::default()
-        } else {
-            let accounts = &accounts_selector["accounts"];
-            let accounts: Vec<String> = if accounts.is_array() {
-                accounts
-                    .as_array()
-                    .unwrap()
-                    .iter()
-                    .map(|val| val.as_str().unwrap().to_string())
-                    .collect()
-            } else {
-                Vec::default()
-            };
-            let owners = &accounts_selector["owners"];
-            let owners: Vec<String> = if owners.is_array() {
-                owners
-                    .as_array()
-                    .unwrap()
-                    .iter()
-                    .map(|val| val.as_str().unwrap().to_string())
-                    .collect()
-            } else {
-                Vec::default()
-            };
-            AccountsSelector::new(&accounts, &owners)
-        }
-    }
-
-    pub fn new() -> Self {
-        AccountsDbPluginPostgres {
-            client: None,
-            accounts_selector: None,
-        }
-    }
-}
-
-#[no_mangle]
-#[allow(improper_ctypes_definitions)]
-/// # Safety
-///
-/// This function returns the AccountsDbPluginPostgres pointer as trait AccountsDbPlugin.
-pub unsafe extern "C" fn _create_plugin() -> *mut dyn AccountsDbPlugin {
-    let plugin = AccountsDbPluginPostgres::new();
-    let plugin: Box<dyn AccountsDbPlugin> = Box::new(plugin);
-    Box::into_raw(plugin)
-}
-
-#[cfg(test)]
-pub(crate) mod tests {
-    use {super::*, serde_json};
-
-    #[test]
-    fn test_accounts_selector_from_config() {
-        let config = "{\"accounts_selector\" : { \
-           \"owners\" : [\"9xQeWvG816bUx9EPjHmaT23yvVM2ZWbrrpZb9PusVFin\"] \
-        }}";
-
-        let config: serde_json::Value = serde_json::from_str(config).unwrap();
-        AccountsDbPluginPostgres::create_accounts_selector_from_config(&config);
-    }
-}

accountsdb-plugin-postgres/src/lib.rs

@@ -1,3 +0,0 @@
-pub mod accounts_selector;
-pub mod accountsdb_plugin_postgres;
-pub mod postgres_client;

accountsdb-plugin-postgres/src/postgres_client.rs

@@ -1,879 +0,0 @@
-#![allow(clippy::integer_arithmetic)]
-
-/// A concurrent implementation for writing accounts into the PostgreSQL in parallel.
-use {
-    crate::accountsdb_plugin_postgres::{
-        AccountsDbPluginPostgresConfig, AccountsDbPluginPostgresError,
-    },
-    chrono::Utc,
-    crossbeam_channel::{bounded, Receiver, RecvTimeoutError, Sender},
-    log::*,
-    postgres::{Client, NoTls, Statement},
-    solana_accountsdb_plugin_interface::accountsdb_plugin_interface::{
-        AccountsDbPluginError, ReplicaAccountInfo, SlotStatus,
-    },
-    solana_measure::measure::Measure,
-    solana_metrics::*,
-    solana_sdk::timing::AtomicInterval,
-    std::{
-        sync::{
-            atomic::{AtomicBool, AtomicUsize, Ordering},
-            Arc, Mutex,
-        },
-        thread::{self, sleep, Builder, JoinHandle},
-        time::Duration,
-    },
-    tokio_postgres::types::ToSql,
-};
-
-/// The maximum asynchronous requests allowed in the channel to avoid excessive
-/// memory usage. The downside -- calls after this threshold is reached can get blocked.
-const MAX_ASYNC_REQUESTS: usize = 40960;
-const DEFAULT_POSTGRES_PORT: u16 = 5432;
-const DEFAULT_THREADS_COUNT: usize = 100;
-const DEFAULT_ACCOUNTS_INSERT_BATCH_SIZE: usize = 10;
-const ACCOUNT_COLUMN_COUNT: usize = 9;
-const DEFAULT_PANIC_ON_DB_ERROR: bool = false;
-
-struct PostgresSqlClientWrapper {
-    client: Client,
-    update_account_stmt: Statement,
-    bulk_account_insert_stmt: Statement,
-    update_slot_with_parent_stmt: Statement,
-    update_slot_without_parent_stmt: Statement,
-}
-
-pub struct SimplePostgresClient {
-    batch_size: usize,
-    pending_account_updates: Vec<DbAccountInfo>,
-    client: Mutex<PostgresSqlClientWrapper>,
-}
-
-struct PostgresClientWorker {
-    client: SimplePostgresClient,
-    /// Indicating if accounts notification during startup is done.
-    is_startup_done: bool,
-}
-
-impl Eq for DbAccountInfo {}
-
-#[derive(Clone, PartialEq, Debug)]
-pub struct DbAccountInfo {
-    pub pubkey: Vec<u8>,
-    pub lamports: i64,
-    pub owner: Vec<u8>,
-    pub executable: bool,
-    pub rent_epoch: i64,
-    pub data: Vec<u8>,
-    pub slot: i64,
-    pub write_version: i64,
-}
-
-pub(crate) fn abort() -> ! {
-    #[cfg(not(test))]
-    {
-        // standard error is usually redirected to a log file, cry for help on standard output as
-        // well
-        eprintln!("Validator process aborted. The validator log may contain further details");
-        std::process::exit(1);
-    }
-
-    #[cfg(test)]
-    panic!("process::exit(1) is intercepted for friendly test failure...");
-}
-
-impl DbAccountInfo {
-    fn new<T: ReadableAccountInfo>(account: &T, slot: u64) -> DbAccountInfo {
-        let data = account.data().to_vec();
-        Self {
-            pubkey: account.pubkey().to_vec(),
-            lamports: account.lamports() as i64,
-            owner: account.owner().to_vec(),
-            executable: account.executable(),
-            rent_epoch: account.rent_epoch() as i64,
-            data,
-            slot: slot as i64,
-            write_version: account.write_version(),
-        }
-    }
-}
-
-pub trait ReadableAccountInfo: Sized {
-    fn pubkey(&self) -> &[u8];
-    fn owner(&self) -> &[u8];
-    fn lamports(&self) -> i64;
-    fn executable(&self) -> bool;
-    fn rent_epoch(&self) -> i64;
-    fn data(&self) -> &[u8];
-    fn write_version(&self) -> i64;
-}
-
-impl ReadableAccountInfo for DbAccountInfo {
-    fn pubkey(&self) -> &[u8] {
-        &self.pubkey
-    }
-
-    fn owner(&self) -> &[u8] {
-        &self.owner
-    }
-
-    fn lamports(&self) -> i64 {
-        self.lamports
-    }
-
-    fn executable(&self) -> bool {
-        self.executable
-    }
-
-    fn rent_epoch(&self) -> i64 {
-        self.rent_epoch
-    }
-
-    fn data(&self) -> &[u8] {
-        &self.data
-    }
-
-    fn write_version(&self) -> i64 {
-        self.write_version
-    }
-}
-
-impl<'a> ReadableAccountInfo for ReplicaAccountInfo<'a> {
-    fn pubkey(&self) -> &[u8] {
-        self.pubkey
-    }
-
-    fn owner(&self) -> &[u8] {
-        self.owner
-    }
-
-    fn lamports(&self) -> i64 {
-        self.lamports as i64
-    }
-
-    fn executable(&self) -> bool {
-        self.executable
-    }
-
-    fn rent_epoch(&self) -> i64 {
-        self.rent_epoch as i64
-    }
-
-    fn data(&self) -> &[u8] {
-        self.data
-    }
-
-    fn write_version(&self) -> i64 {
-        self.write_version as i64
-    }
-}
-
-pub trait PostgresClient {
-    fn join(&mut self) -> thread::Result<()> {
-        Ok(())
-    }
-
-    fn update_account(
-        &mut self,
-        account: DbAccountInfo,
-        is_startup: bool,
-    ) -> Result<(), AccountsDbPluginError>;
-
-    fn update_slot_status(
-        &mut self,
-        slot: u64,
-        parent: Option<u64>,
-        status: SlotStatus,
-    ) -> Result<(), AccountsDbPluginError>;
-
-    fn notify_end_of_startup(&mut self) -> Result<(), AccountsDbPluginError>;
-}
-
-impl SimplePostgresClient {
-    fn connect_to_db(
-        config: &AccountsDbPluginPostgresConfig,
-    ) -> Result<Client, AccountsDbPluginError> {
-        let port = config.port.unwrap_or(DEFAULT_POSTGRES_PORT);
-
-        let connection_str = if let Some(connection_str) = &config.connection_str {
-            connection_str.clone()
-        } else {
-            if config.host.is_none() || config.user.is_none() {
-                let msg = format!(
-                    "\"connection_str\": {:?}, or \"host\": {:?} \"user\": {:?} must be specified",
-                    config.connection_str, config.host, config.user
-                );
-                return Err(AccountsDbPluginError::Custom(Box::new(
-                    AccountsDbPluginPostgresError::ConfigurationError { msg },
-                )));
-            }
-            format!(
-                "host={} user={} port={}",
-                config.host.as_ref().unwrap(),
-                config.user.as_ref().unwrap(),
-                port
-            )
-        };
-
-        match Client::connect(&connection_str, NoTls) {
-            Err(err) => {
-                let msg = format!(
-                    "Error in connecting to the PostgreSQL database: {:?} connection_str: {:?}",
-                    err, connection_str
-                );
-                error!("{}", msg);
-                Err(AccountsDbPluginError::Custom(Box::new(
-                    AccountsDbPluginPostgresError::DataStoreConnectionError { msg },
-                )))
-            }
-            Ok(client) => Ok(client),
-        }
-    }
-
-    fn build_bulk_account_insert_statement(
-        client: &mut Client,
-        config: &AccountsDbPluginPostgresConfig,
-    ) -> Result<Statement, AccountsDbPluginError> {
-        let batch_size = config
-            .batch_size
-            .unwrap_or(DEFAULT_ACCOUNTS_INSERT_BATCH_SIZE);
-        let mut stmt = String::from("INSERT INTO account AS acct (pubkey, slot, owner, lamports, executable, rent_epoch, data, write_version, updated_on) VALUES");
-        for j in 0..batch_size {
-            let row = j * ACCOUNT_COLUMN_COUNT;
-            let val_str = format!(
-                "(${}, ${}, ${}, ${}, ${}, ${}, ${}, ${}, ${})",
-                row + 1,
-                row + 2,
-                row + 3,
-                row + 4,
-                row + 5,
-                row + 6,
-                row + 7,
-                row + 8,
-                row + 9,
-            );
-
-            if j == 0 {
-                stmt = format!("{} {}", &stmt, val_str);
-            } else {
-                stmt = format!("{}, {}", &stmt, val_str);
-            }
-        }
-
-        let handle_conflict = "ON CONFLICT (pubkey) DO UPDATE SET slot=excluded.slot, owner=excluded.owner, lamports=excluded.lamports, executable=excluded.executable, rent_epoch=excluded.rent_epoch, \
-            data=excluded.data, write_version=excluded.write_version, updated_on=excluded.updated_on WHERE acct.slot < excluded.slot OR (\
-            acct.slot = excluded.slot AND acct.write_version < excluded.write_version)";
-
-        stmt = format!("{} {}", stmt, handle_conflict);
-
-        info!("{}", stmt);
-        let bulk_stmt = client.prepare(&stmt);
-
-        match bulk_stmt {
-            Err(err) => {
-                return Err(AccountsDbPluginError::Custom(Box::new(AccountsDbPluginPostgresError::DataSchemaError {
-                    msg: format!(
-                        "Error in preparing for the accounts update PostgreSQL database: {} host: {:?} user: {:?} config: {:?}",
-                        err, config.host, config.user, config
-                    ),
-                })));
-            }
-            Ok(update_account_stmt) => Ok(update_account_stmt),
-        }
-    }
-
-    fn build_single_account_upsert_statement(
-        client: &mut Client,
-        config: &AccountsDbPluginPostgresConfig,
-    ) -> Result<Statement, AccountsDbPluginError> {
-        let stmt = "INSERT INTO account AS acct (pubkey, slot, owner, lamports, executable, rent_epoch, data, write_version, updated_on) \
-        VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9) \
-        ON CONFLICT (pubkey) DO UPDATE SET slot=excluded.slot, owner=excluded.owner, lamports=excluded.lamports, executable=excluded.executable, rent_epoch=excluded.rent_epoch, \
-        data=excluded.data, write_version=excluded.write_version, updated_on=excluded.updated_on  WHERE acct.slot < excluded.slot OR (\
-        acct.slot = excluded.slot AND acct.write_version < excluded.write_version)";
-
-        let stmt = client.prepare(stmt);
-
-        match stmt {
-            Err(err) => {
-                return Err(AccountsDbPluginError::Custom(Box::new(AccountsDbPluginPostgresError::DataSchemaError {
-                    msg: format!(
-                        "Error in preparing for the accounts update PostgreSQL database: {} host: {:?} user: {:?} config: {:?}",
-                        err, config.host, config.user, config
-                    ),
-                })));
-            }
-            Ok(update_account_stmt) => Ok(update_account_stmt),
-        }
-    }
-
-    fn build_slot_upsert_statement_with_parent(
-        client: &mut Client,
-        config: &AccountsDbPluginPostgresConfig,
-    ) -> Result<Statement, AccountsDbPluginError> {
-        let stmt = "INSERT INTO slot (slot, parent, status, updated_on) \
-        VALUES ($1, $2, $3, $4) \
-        ON CONFLICT (slot) DO UPDATE SET parent=excluded.parent, status=excluded.status, updated_on=excluded.updated_on";
-
-        let stmt = client.prepare(stmt);
-
-        match stmt {
-            Err(err) => {
-                return Err(AccountsDbPluginError::Custom(Box::new(AccountsDbPluginPostgresError::DataSchemaError {
-                    msg: format!(
-                        "Error in preparing for the slot update PostgreSQL database: {} host: {:?} user: {:?} config: {:?}",
-                        err, config.host, config.user, config
-                    ),
-                })));
-            }
-            Ok(stmt) => Ok(stmt),
-        }
-    }
-
-    fn build_slot_upsert_statement_without_parent(
-        client: &mut Client,
-        config: &AccountsDbPluginPostgresConfig,
-    ) -> Result<Statement, AccountsDbPluginError> {
-        let stmt = "INSERT INTO slot (slot, status, updated_on) \
-        VALUES ($1, $2, $3) \
-        ON CONFLICT (slot) DO UPDATE SET status=excluded.status, updated_on=excluded.updated_on";
-
-        let stmt = client.prepare(stmt);
-
-        match stmt {
-            Err(err) => {
-                return Err(AccountsDbPluginError::Custom(Box::new(AccountsDbPluginPostgresError::DataSchemaError {
-                    msg: format!(
-                        "Error in preparing for the slot update PostgreSQL database: {} host: {:?} user: {:?} config: {:?}",
-                        err, config.host, config.user, config
-                    ),
-                })));
-            }
-            Ok(stmt) => Ok(stmt),
-        }
-    }
-
-    /// Internal function for updating or inserting a single account
-    fn upsert_account_internal(
-        account: &DbAccountInfo,
-        statement: &Statement,
-        client: &mut Client,
-    ) -> Result<(), AccountsDbPluginError> {
-        let lamports = account.lamports() as i64;
-        let rent_epoch = account.rent_epoch() as i64;
-        let updated_on = Utc::now().naive_utc();
-        let result = client.query(
-            statement,
-            &[
-                &account.pubkey(),
-                &account.slot,
-                &account.owner(),
-                &lamports,
-                &account.executable(),
-                &rent_epoch,
-                &account.data(),
-                &account.write_version(),
-                &updated_on,
-            ],
-        );
-
-        if let Err(err) = result {
-            let msg = format!(
-                "Failed to persist the update of account to the PostgreSQL database. Error: {:?}",
-                err
-            );
-            error!("{}", msg);
-            return Err(AccountsDbPluginError::AccountsUpdateError { msg });
-        }
-
-        Ok(())
-    }
-
-    /// Update or insert a single account
-    fn upsert_account(&mut self, account: &DbAccountInfo) -> Result<(), AccountsDbPluginError> {
-        let client = self.client.get_mut().unwrap();
-        let statement = &client.update_account_stmt;
-        let client = &mut client.client;
-        Self::upsert_account_internal(account, statement, client)
-    }
-
-    /// Insert accounts in batch to reduce network overhead
-    fn insert_accounts_in_batch(
-        &mut self,
-        account: DbAccountInfo,
-    ) -> Result<(), AccountsDbPluginError> {
-        self.pending_account_updates.push(account);
-
-        if self.pending_account_updates.len() == self.batch_size {
-            let mut measure = Measure::start("accountsdb-plugin-postgres-prepare-values");
-
-            let mut values: Vec<&(dyn ToSql + Sync)> =
-                Vec::with_capacity(self.batch_size * ACCOUNT_COLUMN_COUNT);
-            let updated_on = Utc::now().naive_utc();
-            for j in 0..self.batch_size {
-                let account = &self.pending_account_updates[j];
-
-                values.push(&account.pubkey);
-                values.push(&account.slot);
-                values.push(&account.owner);
-                values.push(&account.lamports);
-                values.push(&account.executable);
-                values.push(&account.rent_epoch);
-                values.push(&account.data);
-                values.push(&account.write_version);
-                values.push(&updated_on);
-            }
-            measure.stop();
-            inc_new_counter_debug!(
-                "accountsdb-plugin-postgres-prepare-values-us",
-                measure.as_us() as usize,
-                10000,
-                10000
-            );
-
-            let mut measure = Measure::start("accountsdb-plugin-postgres-update-account");
-            let client = self.client.get_mut().unwrap();
-            let result = client
-                .client
-                .query(&client.bulk_account_insert_stmt, &values);
-
-            self.pending_account_updates.clear();
-            if let Err(err) = result {
-                let msg = format!(
-                    "Failed to persist the update of account to the PostgreSQL database. Error: {:?}",
-                    err
-                );
-                error!("{}", msg);
-                return Err(AccountsDbPluginError::AccountsUpdateError { msg });
-            }
-            measure.stop();
-            inc_new_counter_debug!(
-                "accountsdb-plugin-postgres-update-account-us",
-                measure.as_us() as usize,
-                10000,
-                10000
-            );
-            inc_new_counter_debug!(
-                "accountsdb-plugin-postgres-update-account-count",
-                self.batch_size,
-                10000,
-                10000
-            );
-        }
-        Ok(())
-    }
-
-    /// Flush any left over accounts in batch which are not processed in the last batch
-    fn flush_buffered_writes(&mut self) -> Result<(), AccountsDbPluginError> {
-        if self.pending_account_updates.is_empty() {
-            return Ok(());
-        }
-
-        let client = self.client.get_mut().unwrap();
-        let statement = &client.update_account_stmt;
-        let client = &mut client.client;
-
-        for account in self.pending_account_updates.drain(..) {
-            Self::upsert_account_internal(&account, statement, client)?;
-        }
-
-        Ok(())
-    }
-
-    pub fn new(config: &AccountsDbPluginPostgresConfig) -> Result<Self, AccountsDbPluginError> {
-        info!("Creating SimplePostgresClient...");
-        let mut client = Self::connect_to_db(config)?;
-        let bulk_account_insert_stmt =
-            Self::build_bulk_account_insert_statement(&mut client, config)?;
-        let update_account_stmt = Self::build_single_account_upsert_statement(&mut client, config)?;
-
-        let update_slot_with_parent_stmt =
-            Self::build_slot_upsert_statement_with_parent(&mut client, config)?;
-        let update_slot_without_parent_stmt =
-            Self::build_slot_upsert_statement_without_parent(&mut client, config)?;
-
-        let batch_size = config
-            .batch_size
-            .unwrap_or(DEFAULT_ACCOUNTS_INSERT_BATCH_SIZE);
-        info!("Created SimplePostgresClient.");
-        Ok(Self {
-            batch_size,
-            pending_account_updates: Vec::with_capacity(batch_size),
-            client: Mutex::new(PostgresSqlClientWrapper {
-                client,
-                update_account_stmt,
-                bulk_account_insert_stmt,
-                update_slot_with_parent_stmt,
-                update_slot_without_parent_stmt,
-            }),
-        })
-    }
-}
-
-impl PostgresClient for SimplePostgresClient {
-    fn update_account(
-        &mut self,
-        account: DbAccountInfo,
-        is_startup: bool,
-    ) -> Result<(), AccountsDbPluginError> {
-        trace!(
-            "Updating account {} with owner {} at slot {}",
-            bs58::encode(account.pubkey()).into_string(),
-            bs58::encode(account.owner()).into_string(),
-            account.slot,
-        );
-        if !is_startup {
-            return self.upsert_account(&account);
-        }
-        self.insert_accounts_in_batch(account)
-    }
-
-    fn update_slot_status(
-        &mut self,
-        slot: u64,
-        parent: Option<u64>,
-        status: SlotStatus,
-    ) -> Result<(), AccountsDbPluginError> {
-        info!("Updating slot {:?} at with status {:?}", slot, status);
-
-        let slot = slot as i64; // postgres only supports i64
-        let parent = parent.map(|parent| parent as i64);
-        let updated_on = Utc::now().naive_utc();
-        let status_str = status.as_str();
-        let client = self.client.get_mut().unwrap();
-
-        let result = match parent {
-            Some(parent) => client.client.execute(
-                &client.update_slot_with_parent_stmt,
-                &[&slot, &parent, &status_str, &updated_on],
-            ),
-            None => client.client.execute(
-                &client.update_slot_without_parent_stmt,
-                &[&slot, &status_str, &updated_on],
-            ),
-        };
-
-        match result {
-            Err(err) => {
-                let msg = format!(
-                    "Failed to persist the update of slot to the PostgreSQL database. Error: {:?}",
-                    err
-                );
-                error!("{:?}", msg);
-                return Err(AccountsDbPluginError::SlotStatusUpdateError { msg });
-            }
-            Ok(rows) => {
-                assert_eq!(1, rows, "Expected one rows to be updated a time");
-            }
-        }
-
-        Ok(())
-    }
-
-    fn notify_end_of_startup(&mut self) -> Result<(), AccountsDbPluginError> {
-        self.flush_buffered_writes()
-    }
-}
-
-struct UpdateAccountRequest {
-    account: DbAccountInfo,
-    is_startup: bool,
-}
-
-struct UpdateSlotRequest {
-    slot: u64,
-    parent: Option<u64>,
-    slot_status: SlotStatus,
-}
-
-enum DbWorkItem {
-    UpdateAccount(UpdateAccountRequest),
-    UpdateSlot(UpdateSlotRequest),
-}
-
-impl PostgresClientWorker {
-    fn new(config: AccountsDbPluginPostgresConfig) -> Result<Self, AccountsDbPluginError> {
-        let result = SimplePostgresClient::new(&config);
-        match result {
-            Ok(client) => Ok(PostgresClientWorker {
-                client,
-                is_startup_done: false,
-            }),
-            Err(err) => {
-                error!("Error in creating SimplePostgresClient: {}", err);
-                Err(err)
-            }
-        }
-    }
-
-    fn do_work(
-        &mut self,
-        receiver: Receiver<DbWorkItem>,
-        exit_worker: Arc<AtomicBool>,
-        is_startup_done: Arc<AtomicBool>,
-        startup_done_count: Arc<AtomicUsize>,
-        panic_on_db_errors: bool,
-    ) -> Result<(), AccountsDbPluginError> {
-        while !exit_worker.load(Ordering::Relaxed) {
-            let mut measure = Measure::start("accountsdb-plugin-postgres-worker-recv");
-            let work = receiver.recv_timeout(Duration::from_millis(500));
-            measure.stop();
-            inc_new_counter_debug!(
-                "accountsdb-plugin-postgres-worker-recv-us",
-                measure.as_us() as usize,
-                100000,
-                100000
-            );
-            match work {
-                Ok(work) => match work {
-                    DbWorkItem::UpdateAccount(request) => {
-                        if let Err(err) = self
-                            .client
-                            .update_account(request.account, request.is_startup)
-                        {
-                            error!("Failed to update account: ({})", err);
-                            if panic_on_db_errors {
-                                abort();
-                            }
-                        }
-                    }
-                    DbWorkItem::UpdateSlot(request) => {
-                        if let Err(err) = self.client.update_slot_status(
-                            request.slot,
-                            request.parent,
-                            request.slot_status,
-                        ) {
-                            error!("Failed to update slot: ({})", err);
-                            if panic_on_db_errors {
-                                abort();
-                            }
-                        }
-                    }
-                },
-                Err(err) => match err {
-                    RecvTimeoutError::Timeout => {
-                        if !self.is_startup_done && is_startup_done.load(Ordering::Relaxed) {
-                            if let Err(err) = self.client.notify_end_of_startup() {
-                                error!("Error in notifying end of startup: ({})", err);
-                                if panic_on_db_errors {
-                                    abort();
-                                }
-                            }
-                            self.is_startup_done = true;
-                            startup_done_count.fetch_add(1, Ordering::Relaxed);
-                        }
-
-                        continue;
-                    }
-                    _ => {
-                        error!("Error in receiving the item {:?}", err);
-                        if panic_on_db_errors {
-                            abort();
-                        }
-                        break;
-                    }
-                },
-            }
-        }
-        Ok(())
-    }
-}
-pub struct ParallelPostgresClient {
-    workers: Vec<JoinHandle<Result<(), AccountsDbPluginError>>>,
-    exit_worker: Arc<AtomicBool>,
-    is_startup_done: Arc<AtomicBool>,
-    startup_done_count: Arc<AtomicUsize>,
-    initialized_worker_count: Arc<AtomicUsize>,
-    sender: Sender<DbWorkItem>,
-    last_report: AtomicInterval,
-}
-
-impl ParallelPostgresClient {
-    pub fn new(config: &AccountsDbPluginPostgresConfig) -> Result<Self, AccountsDbPluginError> {
-        info!("Creating ParallelPostgresClient...");
-        let (sender, receiver) = bounded(MAX_ASYNC_REQUESTS);
-        let exit_worker = Arc::new(AtomicBool::new(false));
-        let mut workers = Vec::default();
-        let is_startup_done = Arc::new(AtomicBool::new(false));
-        let startup_done_count = Arc::new(AtomicUsize::new(0));
-        let worker_count = config.threads.unwrap_or(DEFAULT_THREADS_COUNT);
-        let initialized_worker_count = Arc::new(AtomicUsize::new(0));
-        for i in 0..worker_count {
-            let cloned_receiver = receiver.clone();
-            let exit_clone = exit_worker.clone();
-            let is_startup_done_clone = is_startup_done.clone();
-            let startup_done_count_clone = startup_done_count.clone();
-            let initialized_worker_count_clone = initialized_worker_count.clone();
-            let config = config.clone();
-            let worker = Builder::new()
-                .name(format!("worker-{}", i))
-                .spawn(move || -> Result<(), AccountsDbPluginError> {
-                    let panic_on_db_errors = *config
-                        .panic_on_db_errors
-                        .as_ref()
-                        .unwrap_or(&DEFAULT_PANIC_ON_DB_ERROR);
-                    let result = PostgresClientWorker::new(config);
-
-                    match result {
-                        Ok(mut worker) => {
-                            initialized_worker_count_clone.fetch_add(1, Ordering::Relaxed);
-                            worker.do_work(
-                                cloned_receiver,
-                                exit_clone,
-                                is_startup_done_clone,
-                                startup_done_count_clone,
-                                panic_on_db_errors,
-                            )?;
-                            Ok(())
-                        }
-                        Err(err) => {
-                            error!("Error when making connection to database: ({})", err);
-                            if panic_on_db_errors {
-                                abort();
-                            }
-                            Err(err)
-                        }
-                    }
-                })
-                .unwrap();
-
-            workers.push(worker);
-        }
-
-        info!("Created ParallelPostgresClient.");
-        Ok(Self {
-            last_report: AtomicInterval::default(),
-            workers,
-            exit_worker,
-            is_startup_done,
-            startup_done_count,
-            initialized_worker_count,
-            sender,
-        })
-    }
-
-    pub fn join(&mut self) -> thread::Result<()> {
-        self.exit_worker.store(true, Ordering::Relaxed);
-        while !self.workers.is_empty() {
-            let worker = self.workers.pop();
-            if worker.is_none() {
-                break;
-            }
-            let worker = worker.unwrap();
-            let result = worker.join().unwrap();
-            if result.is_err() {
-                error!("The worker thread has failed: {:?}", result);
-            }
-        }
-
-        Ok(())
-    }
-
-    pub fn update_account(
-        &mut self,
-        account: &ReplicaAccountInfo,
-        slot: u64,
-        is_startup: bool,
-    ) -> Result<(), AccountsDbPluginError> {
-        if self.last_report.should_update(30000) {
-            datapoint_debug!(
-                "postgres-plugin-stats",
-                ("message-queue-length", self.sender.len() as i64, i64),
-            );
-        }
-        let mut measure = Measure::start("accountsdb-plugin-posgres-create-work-item");
-        let wrk_item = DbWorkItem::UpdateAccount(UpdateAccountRequest {
-            account: DbAccountInfo::new(account, slot),
-            is_startup,
-        });
-
-        measure.stop();
-
-        inc_new_counter_debug!(
-            "accountsdb-plugin-posgres-create-work-item-us",
-            measure.as_us() as usize,
-            100000,
-            100000
-        );
-
-        let mut measure = Measure::start("accountsdb-plugin-posgres-send-msg");
-
-        if let Err(err) = self.sender.send(wrk_item) {
-            return Err(AccountsDbPluginError::AccountsUpdateError {
-                msg: format!(
-                    "Failed to update the account {:?}, error: {:?}",
-                    bs58::encode(account.pubkey()).into_string(),
-                    err
-                ),
-            });
-        }
-
-        measure.stop();
-        inc_new_counter_debug!(
-            "accountsdb-plugin-posgres-send-msg-us",
-            measure.as_us() as usize,
-            100000,
-            100000
-        );
-
-        Ok(())
-    }
-
-    pub fn update_slot_status(
-        &mut self,
-        slot: u64,
-        parent: Option<u64>,
-        status: SlotStatus,
-    ) -> Result<(), AccountsDbPluginError> {
-        if let Err(err) = self.sender.send(DbWorkItem::UpdateSlot(UpdateSlotRequest {
-            slot,
-            parent,
-            slot_status: status,
-        })) {
-            return Err(AccountsDbPluginError::SlotStatusUpdateError {
-                msg: format!("Failed to update the slot {:?}, error: {:?}", slot, err),
-            });
-        }
-        Ok(())
-    }
-
-    pub fn notify_end_of_startup(&mut self) -> Result<(), AccountsDbPluginError> {
-        info!("Notifying the end of startup");
-        // Ensure all items in the queue has been received by the workers
-        while !self.sender.is_empty() {
-            sleep(Duration::from_millis(100));
-        }
-        self.is_startup_done.store(true, Ordering::Relaxed);
-
-        // Wait for all worker threads to be done with flushing
-        while self.startup_done_count.load(Ordering::Relaxed)
-            != self.initialized_worker_count.load(Ordering::Relaxed)
-        {
-            info!(
-                "Startup done count: {}, good worker thread count: {}",
-                self.startup_done_count.load(Ordering::Relaxed),
-                self.initialized_worker_count.load(Ordering::Relaxed)
-            );
-            sleep(Duration::from_millis(100));
-        }
-
-        info!("Done with notifying the end of startup");
-        Ok(())
-    }
-}
-
-pub struct PostgresClientBuilder {}
-
-impl PostgresClientBuilder {
-    pub fn build_pararallel_postgres_client(
-        config: &AccountsDbPluginPostgresConfig,
-    ) -> Result<ParallelPostgresClient, AccountsDbPluginError> {
-        ParallelPostgresClient::new(config)
-    }
-
-    pub fn build_simple_postgres_client(
-        config: &AccountsDbPluginPostgresConfig,
-    ) -> Result<SimplePostgresClient, AccountsDbPluginError> {
-        SimplePostgresClient::new(config)
-    }
-}

banking-bench/Cargo.toml

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

banking-bench/src/main.rs

@@ -1,37 +1,35 @@
 #![allow(clippy::integer_arithmetic)]
-use {
-    clap::{crate_description, crate_name, value_t, App, Arg},
-    crossbeam_channel::unbounded,
-    log::*,
-    rand::{thread_rng, Rng},
-    rayon::prelude::*,
-    solana_core::banking_stage::BankingStage,
-    solana_gossip::cluster_info::{ClusterInfo, Node},
-    solana_ledger::{
-        blockstore::Blockstore,
-        genesis_utils::{create_genesis_config, GenesisConfigInfo},
-        get_tmp_ledger_path,
-    },
-    solana_measure::measure::Measure,
-    solana_perf::packet::to_packet_batches,
-    solana_poh::poh_recorder::{create_test_recorder, PohRecorder, WorkingBankEntry},
-    solana_runtime::{
-        accounts_background_service::AbsRequestSender, bank::Bank, bank_forks::BankForks,
-        cost_model::CostModel,
-    },
-    solana_sdk::{
-        hash::Hash,
-        signature::{Keypair, Signature},
-        system_transaction,
-        timing::{duration_as_us, timestamp},
-        transaction::Transaction,
-    },
-    solana_streamer::socket::SocketAddrSpace,
-    std::{
-        sync::{atomic::Ordering, mpsc::Receiver, Arc, Mutex, RwLock},
-        thread::sleep,
-        time::{Duration, Instant},
-    },
+use clap::{crate_description, crate_name, value_t, App, Arg};
+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_ledger::{
+    blockstore::Blockstore,
+    genesis_utils::{create_genesis_config, GenesisConfigInfo},
+    get_tmp_ledger_path,
+};
+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,
+};
+use solana_sdk::{
+    hash::Hash,
+    signature::Keypair,
+    signature::Signature,
+    system_transaction,
+    timing::{duration_as_us, timestamp},
+    transaction::Transaction,
+};
+use solana_streamer::socket::SocketAddrSpace;
+use std::{
+    sync::{atomic::Ordering, mpsc::Receiver, Arc, Mutex},
+    thread::sleep,
+    time::{Duration, Instant},
 };
 
 fn check_txs(
@@ -211,7 +209,7 @@ fn main() {
         bank.clear_signatures();
     }
 
-    let mut verified: Vec<_> = to_packet_batches(&transactions, packets_per_chunk);
+    let mut verified: Vec<_> = to_packets_chunked(&transactions, packets_per_chunk);
     let ledger_path = get_tmp_ledger_path!();
     {
         let blockstore = Arc::new(
@@ -233,7 +231,6 @@ fn main() {
             vote_receiver,
             None,
             replay_vote_sender,
-            Arc::new(RwLock::new(CostModel::default())),
         );
         poh_recorder.lock().unwrap().set_bank(&bank);
 
@@ -364,7 +361,7 @@ fn main() {
                     let sig: Vec<u8> = (0..64).map(|_| thread_rng().gen::<u8>()).collect();
                     tx.signatures[0] = Signature::new(&sig[0..64]);
                 }
-                verified = to_packet_batches(&transactions.clone(), packets_per_chunk);
+                verified = to_packets_chunked(&transactions.clone(), packets_per_chunk);
             }
 
             start += chunk_len;

banks-client/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "solana-banks-client"
-version = "1.8.13"
+version = "1.7.18"
 description = "Solana banks client"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -15,16 +15,16 @@ borsh = "0.9.0"
 borsh-derive = "0.9.0"
 futures = "0.3"
 mio = "0.7.6"
-solana-banks-interface = { path = "../banks-interface", version = "=1.8.13" }
-solana-program = { path = "../sdk/program", version = "=1.8.13" }
-solana-sdk = { path = "../sdk", version = "=1.8.13" }
+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" }
 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.8.13" }
-solana-banks-server = { path = "../banks-server", version = "=1.8.13" }
+solana-runtime = { path = "../runtime", version = "=1.7.18" }
+solana-banks-server = { path = "../banks-server", version = "=1.7.18" }
 
 [lib]
 crate-type = ["lib"]

banks-client/src/lib.rs

@@ -5,38 +5,37 @@
 //! but they are undocumented, may change over time, and are generally more
 //! cumbersome to use.
 
+use borsh::BorshDeserialize;
+use futures::{future::join_all, Future, FutureExt};
 pub use solana_banks_interface::{BanksClient as TarpcClient, TransactionStatus};
-use {
-    borsh::BorshDeserialize,
-    futures::{future::join_all, Future, FutureExt},
-    solana_banks_interface::{BanksRequest, BanksResponse},
-    solana_program::{
-        clock::{Clock, Slot},
-        fee_calculator::FeeCalculator,
-        hash::Hash,
-        program_pack::Pack,
-        pubkey::Pubkey,
-        rent::Rent,
-        sysvar::{self, Sysvar},
-    },
-    solana_sdk::{
-        account::{from_account, Account},
-        commitment_config::CommitmentLevel,
-        signature::Signature,
-        transaction::{self, Transaction},
-        transport,
-    },
-    std::io::{self, Error, ErrorKind},
-    tarpc::{
-        client::{self, channel::RequestDispatch, NewClient},
-        context::{self, Context},
-        rpc::{ClientMessage, Response},
-        serde_transport::tcp,
-        Transport,
-    },
-    tokio::{net::ToSocketAddrs, time::Duration},
-    tokio_serde::formats::Bincode,
+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},
 };
+use solana_sdk::{
+    account::{from_account, Account},
+    commitment_config::CommitmentLevel,
+    signature::Signature,
+    transaction::{self, Transaction},
+    transport,
+};
+use std::io::{self, Error, ErrorKind};
+use tarpc::{
+    client::{self, channel::RequestDispatch, NewClient},
+    context::{self, Context},
+    rpc::{ClientMessage, Response},
+    serde_transport::tcp,
+    Transport,
+};
+use tokio::{net::ToSocketAddrs, time::Duration};
+use tokio_serde::formats::Bincode;
 
 // This exists only for backward compatibility
 pub trait BanksClientExt {}
@@ -349,18 +348,16 @@ pub async fn start_tcp_client<T: ToSocketAddrs>(addr: T) -> io::Result<BanksClie
 
 #[cfg(test)]
 mod tests {
-    use {
-        super::*,
-        solana_banks_server::banks_server::start_local_server,
-        solana_runtime::{
-            bank::Bank, bank_forks::BankForks, commitment::BlockCommitmentCache,
-            genesis_utils::create_genesis_config,
-        },
-        solana_sdk::{message::Message, signature::Signer, system_instruction},
-        std::sync::{Arc, RwLock},
-        tarpc::transport,
-        tokio::{runtime::Runtime, time::sleep},
+    use super::*;
+    use solana_banks_server::banks_server::start_local_server;
+    use solana_runtime::{
+        bank::Bank, bank_forks::BankForks, commitment::BlockCommitmentCache,
+        genesis_utils::create_genesis_config,
     };
+    use solana_sdk::{message::Message, signature::Signer, system_instruction};
+    use std::sync::{Arc, RwLock};
+    use tarpc::transport;
+    use tokio::{runtime::Runtime, time::sleep};
 
     #[test]
     fn test_banks_client_new() {
@@ -388,9 +385,7 @@ mod tests {
         let message = Message::new(&[instruction], Some(&mint_pubkey));
 
         Runtime::new()?.block_on(async {
-            let client_transport =
-                start_local_server(bank_forks, block_commitment_cache, Duration::from_millis(1))
-                    .await;
+            let client_transport = start_local_server(bank_forks, block_commitment_cache).await;
             let mut banks_client = start_client(client_transport).await?;
 
             let recent_blockhash = banks_client.get_recent_blockhash().await?;
@@ -421,9 +416,7 @@ mod tests {
         let message = Message::new(&[instruction], Some(mint_pubkey));
 
         Runtime::new()?.block_on(async {
-            let client_transport =
-                start_local_server(bank_forks, block_commitment_cache, Duration::from_millis(1))
-                    .await;
+            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 transaction = Transaction::new(&[&genesis.mint_keypair], message, recent_blockhash);

banks-interface/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "solana-banks-interface"
-version = "1.8.13"
+version = "1.7.18"
 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.8.13" }
+solana-sdk = { path = "../sdk", version = "=1.7.18" }
 tarpc = { version = "0.24.1", features = ["full"] }
 
 [dev-dependencies]

banks-interface/src/lib.rs

@@ -1,15 +1,13 @@
-use {
-    serde::{Deserialize, Serialize},
-    solana_sdk::{
-        account::Account,
-        clock::Slot,
-        commitment_config::CommitmentLevel,
-        fee_calculator::FeeCalculator,
-        hash::Hash,
-        pubkey::Pubkey,
-        signature::Signature,
-        transaction::{self, Transaction, TransactionError},
-    },
+use serde::{Deserialize, Serialize};
+use solana_sdk::{
+    account::Account,
+    clock::Slot,
+    commitment_config::CommitmentLevel,
+    fee_calculator::FeeCalculator,
+    hash::Hash,
+    pubkey::Pubkey,
+    signature::Signature,
+    transaction::{self, Transaction, TransactionError},
 };
 
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
@@ -49,10 +47,8 @@ pub trait Banks {
 
 #[cfg(test)]
 mod tests {
-    use {
-        super::*,
-        tarpc::{client, transport},
-    };
+    use super::*;
+    use tarpc::{client, transport};
 
     #[test]
     fn test_banks_client_new() {

banks-server/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "solana-banks-server"
-version = "1.8.13"
+version = "1.7.18"
 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.8.13" }
-solana-runtime = { path = "../runtime", version = "=1.8.13" }
-solana-sdk = { path = "../sdk", version = "=1.8.13" }
-solana-metrics = { path = "../metrics", version = "=1.8.13" }
+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" }
 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

@@ -1,52 +1,48 @@
-use {
-    crate::send_transaction_service::{SendTransactionService, TransactionInfo},
-    bincode::{deserialize, serialize},
-    futures::{
-        future,
-        prelude::stream::{self, StreamExt},
-    },
-    solana_banks_interface::{
-        Banks, BanksRequest, BanksResponse, TransactionConfirmationStatus, TransactionStatus,
-    },
-    solana_runtime::{bank::Bank, bank_forks::BankForks, commitment::BlockCommitmentCache},
-    solana_sdk::{
-        account::Account,
-        clock::Slot,
-        commitment_config::CommitmentLevel,
-        feature_set::FeatureSet,
-        fee_calculator::FeeCalculator,
-        hash::Hash,
-        pubkey::Pubkey,
-        signature::Signature,
-        transaction::{self, Transaction},
-    },
-    std::{
-        io,
-        net::{Ipv4Addr, SocketAddr},
-        sync::{
-            mpsc::{channel, Receiver, Sender},
-            Arc, RwLock,
-        },
-        thread::Builder,
-        time::Duration,
-    },
-    tarpc::{
-        context::Context,
-        rpc::{transport::channel::UnboundedChannel, ClientMessage, Response},
-        serde_transport::tcp,
-        server::{self, Channel, Handler},
-        transport,
-    },
-    tokio::time::sleep,
-    tokio_serde::formats::Bincode,
+use crate::send_transaction_service::{SendTransactionService, TransactionInfo};
+use bincode::{deserialize, serialize};
+use futures::{
+    future,
+    prelude::stream::{self, StreamExt},
 };
+use solana_banks_interface::{
+    Banks, BanksRequest, BanksResponse, TransactionConfirmationStatus, TransactionStatus,
+};
+use solana_runtime::{bank::Bank, bank_forks::BankForks, commitment::BlockCommitmentCache};
+use solana_sdk::{
+    account::Account,
+    clock::Slot,
+    commitment_config::CommitmentLevel,
+    fee_calculator::FeeCalculator,
+    hash::Hash,
+    pubkey::Pubkey,
+    signature::Signature,
+    transaction::{self, Transaction},
+};
+use std::{
+    io,
+    net::{Ipv4Addr, SocketAddr},
+    sync::{
+        mpsc::{channel, Receiver, Sender},
+        Arc, RwLock,
+    },
+    thread::Builder,
+    time::Duration,
+};
+use tarpc::{
+    context::Context,
+    rpc::{transport::channel::UnboundedChannel, ClientMessage, Response},
+    serde_transport::tcp,
+    server::{self, Channel, Handler},
+    transport,
+};
+use tokio::time::sleep;
+use tokio_serde::formats::Bincode;
 
 #[derive(Clone)]
 struct BanksServer {
     bank_forks: Arc<RwLock<BankForks>>,
     block_commitment_cache: Arc<RwLock<BlockCommitmentCache>>,
     transaction_sender: Sender<TransactionInfo>,
-    poll_signature_status_sleep_duration: Duration,
 }
 
 impl BanksServer {
@@ -58,13 +54,11 @@ impl BanksServer {
         bank_forks: Arc<RwLock<BankForks>>,
         block_commitment_cache: Arc<RwLock<BlockCommitmentCache>>,
         transaction_sender: Sender<TransactionInfo>,
-        poll_signature_status_sleep_duration: Duration,
     ) -> Self {
         Self {
             bank_forks,
             block_commitment_cache,
             transaction_sender,
-            poll_signature_status_sleep_duration,
         }
     }
 
@@ -87,7 +81,6 @@ impl BanksServer {
     fn new_loopback(
         bank_forks: Arc<RwLock<BankForks>>,
         block_commitment_cache: Arc<RwLock<BlockCommitmentCache>>,
-        poll_signature_status_sleep_duration: Duration,
     ) -> Self {
         let (transaction_sender, transaction_receiver) = channel();
         let bank = bank_forks.read().unwrap().working_bank();
@@ -102,12 +95,7 @@ impl BanksServer {
             .name("solana-bank-forks-client".to_string())
             .spawn(move || Self::run(server_bank_forks, transaction_receiver))
             .unwrap();
-        Self::new(
-            bank_forks,
-            block_commitment_cache,
-            transaction_sender,
-            poll_signature_status_sleep_duration,
-        )
+        Self::new(bank_forks, block_commitment_cache, transaction_sender)
     }
 
     fn slot(&self, commitment: CommitmentLevel) -> Slot {
@@ -132,7 +120,7 @@ impl BanksServer {
             .bank(commitment)
             .get_signature_status_with_blockhash(signature, blockhash);
         while status.is_none() {
-            sleep(self.poll_signature_status_sleep_duration).await;
+            sleep(Duration::from_millis(200)).await;
             let bank = self.bank(commitment);
             if bank.block_height() > last_valid_block_height {
                 break;
@@ -145,11 +133,11 @@ impl BanksServer {
 
 fn verify_transaction(
     transaction: &Transaction,
-    feature_set: &Arc<FeatureSet>,
+    libsecp256k1_0_5_upgrade_enabled: bool,
 ) -> transaction::Result<()> {
     if let Err(err) = transaction.verify() {
         Err(err)
-    } else if let Err(err) = transaction.verify_precompiles(feature_set) {
+    } else if let Err(err) = transaction.verify_precompiles(libsecp256k1_0_5_upgrade_enabled) {
         Err(err)
     } else {
         Ok(())
@@ -239,13 +227,19 @@ impl Banks for BanksServer {
         transaction: Transaction,
         commitment: CommitmentLevel,
     ) -> Option<transaction::Result<()>> {
-        if let Err(err) = verify_transaction(&transaction, &self.bank(commitment).feature_set) {
+        if let Err(err) = verify_transaction(
+            &transaction,
+            self.bank(commitment).libsecp256k1_0_5_upgrade_enabled(),
+        ) {
             return Some(Err(err));
         }
 
         let blockhash = &transaction.message.recent_blockhash;
         let last_valid_block_height = self
-            .bank(commitment)
+            .bank_forks
+            .read()
+            .unwrap()
+            .root_bank()
             .get_blockhash_last_valid_block_height(blockhash)
             .unwrap();
         let signature = transaction.signatures.get(0).cloned().unwrap_or_default();
@@ -273,13 +267,8 @@ impl Banks for BanksServer {
 pub async fn start_local_server(
     bank_forks: Arc<RwLock<BankForks>>,
     block_commitment_cache: Arc<RwLock<BlockCommitmentCache>>,
-    poll_signature_status_sleep_duration: Duration,
 ) -> UnboundedChannel<Response<BanksResponse>, ClientMessage<BanksRequest>> {
-    let banks_server = BanksServer::new_loopback(
-        bank_forks,
-        block_commitment_cache,
-        poll_signature_status_sleep_duration,
-    );
+    let banks_server = BanksServer::new_loopback(bank_forks, block_commitment_cache);
     let (client_transport, server_transport) = transport::channel::unbounded();
     let server = server::new(server::Config::default())
         .incoming(stream::once(future::ready(server_transport)))
@@ -314,12 +303,8 @@ pub async fn start_tcp_server(
 
             SendTransactionService::new(tpu_addr, &bank_forks, receiver);
 
-            let server = BanksServer::new(
-                bank_forks.clone(),
-                block_commitment_cache.clone(),
-                sender,
-                Duration::from_millis(200),
-            );
+            let server =
+                BanksServer::new(bank_forks.clone(), block_commitment_cache.clone(), sender);
             chan.respond_with(server.serve()).execute()
         })
         // Max 10 channels.

banks-server/src/rpc_banks_service.rs

@@ -1,23 +1,21 @@
 //! The `rpc_banks_service` module implements the Solana Banks RPC API.
 
-use {
-    crate::banks_server::start_tcp_server,
-    futures::{future::FutureExt, pin_mut, prelude::stream::StreamExt, select},
-    solana_runtime::{bank_forks::BankForks, commitment::BlockCommitmentCache},
-    std::{
-        net::SocketAddr,
-        sync::{
-            atomic::{AtomicBool, Ordering},
-            Arc, RwLock,
-        },
-        thread::{self, Builder, JoinHandle},
+use crate::banks_server::start_tcp_server;
+use futures::{future::FutureExt, pin_mut, prelude::stream::StreamExt, select};
+use solana_runtime::{bank_forks::BankForks, commitment::BlockCommitmentCache};
+use std::{
+    net::SocketAddr,
+    sync::{
+        atomic::{AtomicBool, Ordering},
+        Arc, RwLock,
     },
-    tokio::{
-        runtime::Runtime,
-        time::{self, Duration},
-    },
-    tokio_stream::wrappers::IntervalStream,
+    thread::{self, Builder, JoinHandle},
 };
+use tokio::{
+    runtime::Runtime,
+    time::{self, Duration},
+};
+use tokio_stream::wrappers::IntervalStream;
 
 pub struct RpcBanksService {
     thread_hdl: JoinHandle<()>,
@@ -103,7 +101,8 @@ impl RpcBanksService {
 
 #[cfg(test)]
 mod tests {
-    use {super::*, solana_runtime::bank::Bank};
+    use super::*;
+    use solana_runtime::bank::Bank;
 
     #[test]
     fn test_rpc_banks_server_exit() {

banks-server/src/send_transaction_service.rs

@@ -1,19 +1,17 @@
 // TODO: Merge this implementation with the one at `core/src/send_transaction_service.rs`
-use {
-    log::*,
-    solana_metrics::{datapoint_warn, inc_new_counter_info},
-    solana_runtime::{bank::Bank, bank_forks::BankForks},
-    solana_sdk::signature::Signature,
-    std::{
-        collections::HashMap,
-        net::{SocketAddr, UdpSocket},
-        sync::{
-            mpsc::{Receiver, RecvTimeoutError},
-            Arc, RwLock,
-        },
-        thread::{self, Builder, JoinHandle},
-        time::{Duration, Instant},
+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 std::{
+    collections::HashMap,
+    net::{SocketAddr, UdpSocket},
+    sync::{
+        mpsc::{Receiver, RecvTimeoutError},
+        Arc, RwLock,
     },
+    thread::{self, Builder, JoinHandle},
+    time::{Duration, Instant},
 };
 
 /// Maximum size of the transaction queue
@@ -185,14 +183,12 @@ impl SendTransactionService {
 
 #[cfg(test)]
 mod test {
-    use {
-        super::*,
-        solana_sdk::{
-            genesis_config::create_genesis_config, pubkey::Pubkey, signature::Signer,
-            system_transaction,
-        },
-        std::sync::mpsc::channel,
+    use super::*;
+    use solana_sdk::{
+        genesis_config::create_genesis_config, pubkey::Pubkey, signature::Signer,
+        system_transaction,
     };
+    use std::sync::mpsc::channel;
 
     #[test]
     fn service_exit() {

bench-exchange/Cargo.toml

@@ -2,7 +2,7 @@
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 edition = "2018"
 name = "solana-bench-exchange"
-version = "1.8.13"
+version = "1.7.18"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
@@ -18,23 +18,23 @@ 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.8.13" }
-solana-core = { path = "../core", version = "=1.8.13" }
-solana-genesis = { path = "../genesis", version = "=1.8.13" }
-solana-client = { path = "../client", version = "=1.8.13" }
-solana-exchange-program = { path = "../programs/exchange", version = "=1.8.13" }
-solana-faucet = { path = "../faucet", version = "=1.8.13" }
-solana-gossip = { path = "../gossip", version = "=1.8.13" }
-solana-logger = { path = "../logger", version = "=1.8.13" }
-solana-metrics = { path = "../metrics", version = "=1.8.13" }
-solana-net-utils = { path = "../net-utils", version = "=1.8.13" }
-solana-runtime = { path = "../runtime", version = "=1.8.13" }
-solana-sdk = { path = "../sdk", version = "=1.8.13" }
-solana-streamer = { path = "../streamer", version = "=1.8.13" }
-solana-version = { path = "../version", version = "=1.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" }
 
 [dev-dependencies]
-solana-local-cluster = { path = "../local-cluster", version = "=1.8.13" }
+solana-local-cluster = { path = "../local-cluster", version = "=1.7.18" }
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]

bench-exchange/src/bench.rs

@@ -1,45 +1,43 @@
 #![allow(clippy::useless_attribute)]
 #![allow(clippy::integer_arithmetic)]
 
-use {
-    crate::order_book::*,
-    itertools::izip,
-    log::*,
-    rand::{thread_rng, Rng},
-    rayon::prelude::*,
-    solana_client::perf_utils::{sample_txs, SampleStats},
-    solana_core::gen_keys::GenKeys,
-    solana_exchange_program::{exchange_instruction, exchange_state::*, id},
-    solana_faucet::faucet::request_airdrop_transaction,
-    solana_genesis::Base64Account,
-    solana_metrics::datapoint_info,
-    solana_sdk::{
-        client::{Client, SyncClient},
-        commitment_config::CommitmentConfig,
-        message::Message,
-        pubkey::Pubkey,
-        signature::{Keypair, Signer},
-        system_instruction, system_program,
-        timing::{duration_as_ms, duration_as_s},
-        transaction::Transaction,
-    },
-    std::{
-        cmp,
-        collections::{HashMap, VecDeque},
-        fs::File,
-        io::prelude::*,
-        mem,
-        net::SocketAddr,
-        path::Path,
-        process::exit,
-        sync::{
-            atomic::{AtomicBool, AtomicUsize, Ordering},
-            mpsc::{channel, Receiver, Sender},
-            Arc, RwLock,
-        },
-        thread::{sleep, Builder},
-        time::{Duration, Instant},
+use crate::order_book::*;
+use itertools::izip;
+use log::*;
+use rand::{thread_rng, Rng};
+use rayon::prelude::*;
+use solana_client::perf_utils::{sample_txs, SampleStats};
+use solana_core::gen_keys::GenKeys;
+use solana_exchange_program::{exchange_instruction, exchange_state::*, id};
+use solana_faucet::faucet::request_airdrop_transaction;
+use solana_genesis::Base64Account;
+use solana_metrics::datapoint_info;
+use solana_sdk::{
+    client::{Client, SyncClient},
+    commitment_config::CommitmentConfig,
+    message::Message,
+    pubkey::Pubkey,
+    signature::{Keypair, Signer},
+    timing::{duration_as_ms, duration_as_s},
+    transaction::Transaction,
+    {system_instruction, system_program},
+};
+use std::{
+    cmp,
+    collections::{HashMap, VecDeque},
+    fs::File,
+    io::prelude::*,
+    mem,
+    net::SocketAddr,
+    path::Path,
+    process::exit,
+    sync::{
+        atomic::{AtomicBool, AtomicUsize, Ordering},
+        mpsc::{channel, Receiver, Sender},
+        Arc, RwLock,
     },
+    thread::{sleep, Builder},
+    time::{Duration, Instant},
 };
 
 // TODO Chunk length as specified results in a bunch of failures, divide by 10 helps...

bench-exchange/src/cli.rs

@@ -1,10 +1,10 @@
-use {
-    clap::{crate_description, crate_name, value_t, App, Arg, ArgMatches},
-    solana_core::gen_keys::GenKeys,
-    solana_faucet::faucet::FAUCET_PORT,
-    solana_sdk::signature::{read_keypair_file, Keypair},
-    std::{net::SocketAddr, process::exit, time::Duration},
-};
+use clap::{crate_description, crate_name, value_t, App, Arg, ArgMatches};
+use solana_core::gen_keys::GenKeys;
+use solana_faucet::faucet::FAUCET_PORT;
+use solana_sdk::signature::{read_keypair_file, Keypair};
+use std::net::SocketAddr;
+use std::process::exit;
+use std::time::Duration;
 
 pub struct Config {
     pub entrypoint_addr: SocketAddr,

bench-exchange/src/main.rs

@@ -3,13 +3,11 @@ pub mod bench;
 mod cli;
 pub mod order_book;
 
-use {
-    crate::bench::{airdrop_lamports, create_client_accounts_file, do_bench_exchange, Config},
-    log::*,
-    solana_gossip::gossip_service::{discover_cluster, get_multi_client},
-    solana_sdk::signature::Signer,
-    solana_streamer::socket::SocketAddrSpace,
-};
+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_sdk::signature::Signer;
+use solana_streamer::socket::SocketAddrSpace;
 
 fn main() {
     solana_logger::setup();

bench-exchange/src/order_book.rs

@@ -1,13 +1,11 @@
-use {
-    itertools::{
-        EitherOrBoth::{Both, Left, Right},
-        Itertools,
-    },
-    log::*,
-    solana_exchange_program::exchange_state::*,
-    solana_sdk::pubkey::Pubkey,
-    std::{cmp::Ordering, collections::BinaryHeap, error, fmt},
-};
+use itertools::EitherOrBoth::{Both, Left, Right};
+use itertools::Itertools;
+use log::*;
+use solana_exchange_program::exchange_state::*;
+use solana_sdk::pubkey::Pubkey;
+use std::cmp::Ordering;
+use std::collections::BinaryHeap;
+use std::{error, fmt};
 
 #[derive(Clone, Debug, Eq, PartialEq)]
 pub struct ToOrder {

bench-exchange/tests/bench_exchange.rs

@@ -1,24 +1,22 @@
-use {
-    log::*,
-    solana_bench_exchange::bench::{airdrop_lamports, do_bench_exchange, Config},
-    solana_core::validator::ValidatorConfig,
-    solana_exchange_program::{
-        exchange_processor::process_instruction, id, solana_exchange_program,
-    },
-    solana_faucet::faucet::run_local_faucet_with_port,
-    solana_gossip::gossip_service::{discover_cluster, get_multi_client},
-    solana_local_cluster::{
-        local_cluster::{ClusterConfig, LocalCluster},
-        validator_configs::make_identical_validator_configs,
-    },
-    solana_runtime::{bank::Bank, bank_client::BankClient},
-    solana_sdk::{
-        genesis_config::create_genesis_config,
-        signature::{Keypair, Signer},
-    },
-    solana_streamer::socket::SocketAddrSpace,
-    std::{process::exit, sync::mpsc::channel, time::Duration},
+use log::*;
+use solana_bench_exchange::bench::{airdrop_lamports, do_bench_exchange, Config};
+use solana_core::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,
+};
+use solana_runtime::{bank::Bank, bank_client::BankClient};
+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]
 #[ignore]

bench-streamer/Cargo.toml

@@ -2,7 +2,7 @@
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 edition = "2018"
 name = "solana-bench-streamer"
-version = "1.8.13"
+version = "1.7.18"
 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.8.13" }
-solana-streamer = { path = "../streamer", version = "=1.8.13" }
-solana-logger = { path = "../logger", version = "=1.8.13" }
-solana-net-utils = { path = "../net-utils", version = "=1.8.13" }
-solana-version = { path = "../version", version = "=1.8.13" }
+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" }
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]

bench-streamer/src/main.rs

@@ -1,38 +1,32 @@
 #![allow(clippy::integer_arithmetic)]
-use {
-    clap::{crate_description, crate_name, App, Arg},
-    solana_streamer::{
-        packet::{Packet, PacketBatch, PacketBatchRecycler, PACKET_DATA_SIZE},
-        streamer::{receiver, PacketBatchReceiver},
-    },
-    std::{
-        cmp::max,
-        net::{IpAddr, Ipv4Addr, SocketAddr, UdpSocket},
-        sync::{
-            atomic::{AtomicBool, AtomicUsize, Ordering},
-            mpsc::channel,
-            Arc,
-        },
-        thread::{sleep, spawn, JoinHandle, Result},
-        time::{Duration, SystemTime},
-    },
-};
+use clap::{crate_description, crate_name, App, Arg};
+use solana_streamer::packet::{Packet, Packets, PacketsRecycler, PACKET_DATA_SIZE};
+use solana_streamer::streamer::{receiver, PacketReceiver};
+use std::cmp::max;
+use std::net::{IpAddr, Ipv4Addr, SocketAddr, UdpSocket};
+use std::sync::atomic::{AtomicBool, AtomicUsize, Ordering};
+use std::sync::mpsc::channel;
+use std::sync::Arc;
+use std::thread::sleep;
+use std::thread::{spawn, JoinHandle, Result};
+use std::time::Duration;
+use std::time::SystemTime;
 
 fn producer(addr: &SocketAddr, exit: Arc<AtomicBool>) -> JoinHandle<()> {
     let send = UdpSocket::bind("0.0.0.0:0").unwrap();
-    let mut packet_batch = PacketBatch::default();
-    packet_batch.packets.resize(10, Packet::default());
-    for w in packet_batch.packets.iter_mut() {
+    let mut msgs = Packets::default();
+    msgs.packets.resize(10, Packet::default());
+    for w in msgs.packets.iter_mut() {
         w.meta.size = PACKET_DATA_SIZE;
         w.meta.set_addr(addr);
     }
-    let packet_batch = Arc::new(packet_batch);
+    let msgs = Arc::new(msgs);
     spawn(move || loop {
         if exit.load(Ordering::Relaxed) {
             return;
         }
         let mut num = 0;
-        for p in &packet_batch.packets {
+        for p in &msgs.packets {
             let a = p.meta.addr();
             assert!(p.meta.size <= PACKET_DATA_SIZE);
             send.send_to(&p.data[..p.meta.size], &a).unwrap();
@@ -42,14 +36,14 @@ fn producer(addr: &SocketAddr, exit: Arc<AtomicBool>) -> JoinHandle<()> {
     })
 }
 
-fn sink(exit: Arc<AtomicBool>, rvs: Arc<AtomicUsize>, r: PacketBatchReceiver) -> JoinHandle<()> {
+fn sink(exit: Arc<AtomicBool>, rvs: Arc<AtomicUsize>, r: PacketReceiver) -> JoinHandle<()> {
     spawn(move || loop {
         if exit.load(Ordering::Relaxed) {
             return;
         }
         let timer = Duration::new(1, 0);
-        if let Ok(packet_batch) = r.recv_timeout(timer) {
-            rvs.fetch_add(packet_batch.packets.len(), Ordering::Relaxed);
+        if let Ok(msgs) = r.recv_timeout(timer) {
+            rvs.fetch_add(msgs.packets.len(), Ordering::Relaxed);
         }
     })
 }
@@ -81,7 +75,7 @@ fn main() -> Result<()> {
 
     let mut read_channels = Vec::new();
     let mut read_threads = Vec::new();
-    let recycler = PacketBatchRecycler::default();
+    let recycler = PacketsRecycler::default();
     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();

bench-tps/Cargo.toml

@@ -2,7 +2,7 @@
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 edition = "2018"
 name = "solana-bench-tps"
-version = "1.8.13"
+version = "1.7.18"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
@@ -15,24 +15,24 @@ 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.8.13" }
-solana-core = { path = "../core", version = "=1.8.13" }
-solana-genesis = { path = "../genesis", version = "=1.8.13" }
-solana-client = { path = "../client", version = "=1.8.13" }
-solana-faucet = { path = "../faucet", version = "=1.8.13" }
-solana-gossip = { path = "../gossip", version = "=1.8.13" }
-solana-logger = { path = "../logger", version = "=1.8.13" }
-solana-metrics = { path = "../metrics", version = "=1.8.13" }
-solana-measure = { path = "../measure", version = "=1.8.13" }
-solana-net-utils = { path = "../net-utils", version = "=1.8.13" }
-solana-runtime = { path = "../runtime", version = "=1.8.13" }
-solana-sdk = { path = "../sdk", version = "=1.8.13" }
-solana-streamer = { path = "../streamer", version = "=1.8.13" }
-solana-version = { path = "../version", version = "=1.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" }
 
 [dev-dependencies]
 serial_test = "0.4.0"
-solana-local-cluster = { path = "../local-cluster", version = "=1.8.13" }
+solana-local-cluster = { path = "../local-cluster", version = "=1.7.18" }
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]

bench-tps/src/bench.rs

@@ -1,36 +1,34 @@
-use {
-    crate::cli::Config,
-    log::*,
-    rayon::prelude::*,
-    solana_client::perf_utils::{sample_txs, SampleStats},
-    solana_core::gen_keys::GenKeys,
-    solana_faucet::faucet::request_airdrop_transaction,
-    solana_measure::measure::Measure,
-    solana_metrics::{self, datapoint_info},
-    solana_sdk::{
-        client::Client,
-        clock::{DEFAULT_S_PER_SLOT, MAX_PROCESSING_AGE},
-        commitment_config::CommitmentConfig,
-        fee_calculator::FeeCalculator,
-        hash::Hash,
-        message::Message,
-        pubkey::Pubkey,
-        signature::{Keypair, Signer},
-        system_instruction, system_transaction,
-        timing::{duration_as_ms, duration_as_s, duration_as_us, timestamp},
-        transaction::Transaction,
-    },
-    std::{
-        collections::{HashSet, VecDeque},
-        net::SocketAddr,
-        process::exit,
-        sync::{
-            atomic::{AtomicBool, AtomicIsize, AtomicUsize, Ordering},
-            Arc, Mutex, RwLock,
-        },
-        thread::{sleep, Builder, JoinHandle},
-        time::{Duration, Instant},
+use crate::cli::Config;
+use log::*;
+use rayon::prelude::*;
+use solana_client::perf_utils::{sample_txs, SampleStats};
+use solana_core::gen_keys::GenKeys;
+use solana_faucet::faucet::request_airdrop_transaction;
+use solana_measure::measure::Measure;
+use solana_metrics::{self, datapoint_info};
+use solana_sdk::{
+    client::Client,
+    clock::{DEFAULT_S_PER_SLOT, MAX_PROCESSING_AGE},
+    commitment_config::CommitmentConfig,
+    fee_calculator::FeeCalculator,
+    hash::Hash,
+    message::Message,
+    pubkey::Pubkey,
+    signature::{Keypair, Signer},
+    system_instruction, system_transaction,
+    timing::{duration_as_ms, duration_as_s, duration_as_us, timestamp},
+    transaction::Transaction,
+};
+use std::{
+    collections::{HashSet, VecDeque},
+    net::SocketAddr,
+    process::exit,
+    sync::{
+        atomic::{AtomicBool, AtomicIsize, AtomicUsize, Ordering},
+        Arc, Mutex, RwLock,
     },
+    thread::{sleep, Builder, JoinHandle},
+    time::{Duration, Instant},
 };
 
 // The point at which transactions become "too old", in seconds.
@@ -926,14 +924,12 @@ pub fn generate_and_fund_keypairs<T: 'static + Client + Send + Sync>(
 
 #[cfg(test)]
 mod tests {
-    use {
-        super::*,
-        solana_runtime::{bank::Bank, bank_client::BankClient},
-        solana_sdk::{
-            client::SyncClient, fee_calculator::FeeRateGovernor,
-            genesis_config::create_genesis_config,
-        },
-    };
+    use super::*;
+    use solana_runtime::bank::Bank;
+    use solana_runtime::bank_client::BankClient;
+    use solana_sdk::client::SyncClient;
+    use solana_sdk::fee_calculator::FeeRateGovernor;
+    use solana_sdk::genesis_config::create_genesis_config;
 
     #[test]
     fn test_bench_tps_bank_client() {

bench-tps/src/cli.rs

@@ -1,13 +1,11 @@
-use {
-    clap::{crate_description, crate_name, App, Arg, ArgMatches},
-    solana_faucet::faucet::FAUCET_PORT,
-    solana_sdk::{
-        fee_calculator::FeeRateGovernor,
-        pubkey::Pubkey,
-        signature::{read_keypair_file, Keypair},
-    },
-    std::{net::SocketAddr, process::exit, time::Duration},
+use clap::{crate_description, crate_name, App, Arg, ArgMatches};
+use solana_faucet::faucet::FAUCET_PORT;
+use solana_sdk::fee_calculator::FeeRateGovernor;
+use solana_sdk::{
+    pubkey::Pubkey,
+    signature::{read_keypair_file, Keypair},
 };
+use std::{net::SocketAddr, process::exit, time::Duration};
 
 const NUM_LAMPORTS_PER_ACCOUNT_DEFAULT: u64 = solana_sdk::native_token::LAMPORTS_PER_SOL;
 

bench-tps/src/main.rs

@@ -1,20 +1,14 @@
 #![allow(clippy::integer_arithmetic)]
-use {
-    log::*,
-    solana_bench_tps::{
-        bench::{do_bench_tps, generate_and_fund_keypairs, generate_keypairs},
-        cli,
-    },
-    solana_genesis::Base64Account,
-    solana_gossip::gossip_service::{discover_cluster, get_client, get_multi_client},
-    solana_sdk::{
-        fee_calculator::FeeRateGovernor,
-        signature::{Keypair, Signer},
-        system_program,
-    },
-    solana_streamer::socket::SocketAddrSpace,
-    std::{collections::HashMap, fs::File, io::prelude::*, path::Path, process::exit, sync::Arc},
-};
+use log::*;
+use solana_bench_tps::bench::{do_bench_tps, generate_and_fund_keypairs, generate_keypairs};
+use solana_bench_tps::cli;
+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
 pub const NUM_SIGNATURES_FOR_TXS: u64 = 100_000 * 60 * 60 * 24 * 7;

bench-tps/tests/bench_tps.rs

@@ -1,24 +1,22 @@
 #![allow(clippy::integer_arithmetic)]
-use {
-    serial_test::serial,
-    solana_bench_tps::{
-        bench::{do_bench_tps, generate_and_fund_keypairs},
-        cli::Config,
-    },
-    solana_client::thin_client::create_client,
-    solana_core::validator::ValidatorConfig,
-    solana_faucet::faucet::run_local_faucet_with_port,
-    solana_gossip::cluster_info::VALIDATOR_PORT_RANGE,
-    solana_local_cluster::{
-        local_cluster::{ClusterConfig, LocalCluster},
-        validator_configs::make_identical_validator_configs,
-    },
-    solana_sdk::signature::{Keypair, Signer},
-    solana_streamer::socket::SocketAddrSpace,
-    std::{
-        sync::{mpsc::channel, Arc},
-        time::Duration,
-    },
+use serial_test::serial;
+use solana_bench_tps::{
+    bench::{do_bench_tps, generate_and_fund_keypairs},
+    cli::Config,
+};
+use solana_client::thin_client::create_client;
+use solana_core::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,
 };
 
 fn test_bench_tps_local_cluster(config: Config) {

ci/buildkite-pipeline.sh

@@ -243,15 +243,7 @@ EOF
 
   command_step "local-cluster" \
     ". ci/rust-version.sh; ci/docker-run.sh \$\$rust_stable_docker_image ci/test-local-cluster.sh" \
-    40
-
-  command_step "local-cluster-flakey" \
-    ". ci/rust-version.sh; ci/docker-run.sh \$\$rust_stable_docker_image ci/test-local-cluster-flakey.sh" \
-    10
-
-  command_step "local-cluster-slow" \
-    ". ci/rust-version.sh; ci/docker-run.sh \$\$rust_stable_docker_image ci/test-local-cluster-slow.sh" \
-    30
+    45
 }
 
 pull_or_push_steps() {

ci/buildkite-secondary.yml

@@ -19,8 +19,3 @@ steps:
     timeout_in_minutes: 240
     name: "publish crate"
     branches: "!master"
-  - command: "ci/publish-tarball.sh"
-    agents:
-      - "queue=release-build-aarch64-apple-darwin"
-    timeout_in_minutes: 60
-    name: "publish tarball (aarch64-apple-darwin)"

ci/env.sh

@@ -23,9 +23,6 @@ if [[ -n $CI ]]; then
   elif [[ -n $BUILDKITE ]]; then
     export CI_BRANCH=$BUILDKITE_BRANCH
     export CI_BUILD_ID=$BUILDKITE_BUILD_ID
-    if [[ $BUILDKITE_COMMIT = HEAD ]]; then
-      BUILDKITE_COMMIT="$(git rev-parse HEAD)"
-    fi
     export CI_COMMIT=$BUILDKITE_COMMIT
     export CI_JOB_ID=$BUILDKITE_JOB_ID
     # The standard BUILDKITE_PULL_REQUEST environment variable is always "false" due
@@ -38,18 +35,7 @@ if [[ -n $CI ]]; then
       export CI_BASE_BRANCH=$BUILDKITE_BRANCH
       export CI_PULL_REQUEST=
     fi
-
-    case "$(uname -s)" in
-    Linux)
-      export CI_OS_NAME=linux
-      ;;
-    Darwin)
-      export CI_OS_NAME=osx
-      ;;
-    *)
-      ;;
-    esac
-
+    export CI_OS_NAME=linux
     if [[ -n $BUILDKITE_TRIGGERED_FROM_BUILD_PIPELINE_SLUG ]]; then
       # The solana-secondary pipeline should use the slug of the pipeline that
       # triggered it

ci/publish-tarball.sh

@@ -39,11 +39,7 @@ fi
 
 case "$CI_OS_NAME" in
 osx)
-  _cputype="$(uname -m)"
-  if [[ $_cputype = arm64 ]]; then
-    _cputype=aarch64
-  fi
-  TARGET=${_cputype}-apple-darwin
+  TARGET=x86_64-apple-darwin
   ;;
 linux)
   TARGET=x86_64-unknown-linux-gnu

ci/run-local.sh

@@ -27,8 +27,6 @@ steps+=(test-stable-perf)
 steps+=(test-downstream-builds)
 steps+=(test-bench)
 steps+=(test-local-cluster)
-steps+=(test-local-cluster-flakey)
-steps+=(test-local-cluster-slow)
 
 step_index=0
 if [[ -n "$1" ]]; then

ci/test-local-cluster-flakey.sh

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

ci/test-local-cluster-slow.sh

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

ci/test-stable.sh

@@ -100,17 +100,7 @@ test-stable-perf)
   ;;
 test-local-cluster)
   _ "$cargo" stable build --release --bins ${V:+--verbose}
-  _ "$cargo" stable test --release --package solana-local-cluster --test local_cluster ${V:+--verbose} -- --nocapture --test-threads=1
-  exit 0
-  ;;
-test-local-cluster-flakey)
-  _ "$cargo" stable build --release --bins ${V:+--verbose}
-  _ "$cargo" stable test --release --package solana-local-cluster --test local_cluster_flakey ${V:+--verbose} -- --nocapture --test-threads=1
-  exit 0
-  ;;
-test-local-cluster-slow)
-  _ "$cargo" stable build --release --bins ${V:+--verbose}
-  _ "$cargo" stable test --release --package solana-local-cluster --test local_cluster_slow ${V:+--verbose} -- --nocapture --test-threads=1
+  _ "$cargo" stable test --release --package solana-local-cluster ${V:+--verbose} -- --nocapture --test-threads=1
   exit 0
   ;;
 *)

ci/upload-ci-artifact.sh

@@ -19,24 +19,13 @@ upload-ci-artifact() {
 upload-s3-artifact() {
   echo "--- artifact: $1 to $2"
   (
-    args=(
-      --rm
-      --env AWS_ACCESS_KEY_ID
-      --env AWS_SECRET_ACCESS_KEY
-      --volume "$PWD:/solana"
-
-    )
-    if [[ $(uname -m) = arm64 ]]; then
-      # Ref: https://blog.jaimyn.dev/how-to-build-multi-architecture-docker-images-on-an-m1-mac/#tldr
-      args+=(
-        --platform linux/amd64
-      )
-    fi
-    args+=(
-      eremite/aws-cli:2018.12.18
-      /usr/bin/s3cmd --acl-public put "$1" "$2"
-    )
     set -x
-    docker run "${args[@]}"
+    docker run \
+      --rm \
+      --env AWS_ACCESS_KEY_ID \
+      --env AWS_SECRET_ACCESS_KEY \
+      --volume "$PWD:/solana" \
+      eremite/aws-cli:2018.12.18 \
+      /usr/bin/s3cmd --acl-public put "$1" "$2"
   )
 }

clap-utils/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "solana-clap-utils"
-version = "1.8.13"
+version = "1.7.18"
 description = "Solana utilities for the clap"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -12,9 +12,8 @@ edition = "2018"
 [dependencies]
 clap = "2.33.0"
 rpassword = "4.0"
-solana-perf = { path = "../perf", version = "=1.8.13" }
-solana-remote-wallet = { path = "../remote-wallet", version = "=1.8.13" }
-solana-sdk = { path = "../sdk", version = "=1.8.13" }
+solana-remote-wallet = { path = "../remote-wallet", version = "=1.7.18" }
+solana-sdk = { path = "../sdk", version = "=1.7.18" }
 thiserror = "1.0.21"
 tiny-bip39 = "0.8.1"
 uriparse = "0.6.3"

clap-utils/src/input_parsers.rs

@@ -196,12 +196,10 @@ pub fn commitment_of(matches: &ArgMatches<'_>, name: &str) -> Option<CommitmentC
 
 #[cfg(test)]
 mod tests {
-    use {
-        super::*,
-        clap::{App, Arg},
-        solana_sdk::signature::write_keypair_file,
-        std::fs,
-    };
+    use super::*;
+    use clap::{App, Arg};
+    use solana_sdk::signature::write_keypair_file;
+    use std::fs;
 
     fn app<'ab, 'v>() -> App<'ab, 'v> {
         App::new("test")

clap-utils/src/input_validators.rs

@@ -7,7 +7,8 @@ use {
         pubkey::{Pubkey, MAX_SEED_LEN},
         signature::{read_keypair_file, Signature},
     },
-    std::{fmt::Display, str::FromStr},
+    std::fmt::Display,
+    std::str::FromStr,
 };
 
 fn is_parsable_generic<U, T>(string: T) -> Result<(), String>
@@ -353,27 +354,6 @@ where
     }
 }
 
-pub fn is_niceness_adjustment_valid<T>(value: T) -> Result<(), String>
-where
-    T: AsRef<str> + Display,
-{
-    let adjustment = value.as_ref().parse::<i8>().map_err(|err| {
-        format!(
-            "error parsing niceness adjustment value '{}': {}",
-            value, err
-        )
-    })?;
-    if solana_perf::thread::is_renice_allowed(adjustment) {
-        Ok(())
-    } else {
-        Err(String::from(
-            "niceness adjustment supported only on Linux; negative adjustment \
-             (priority increase) requires root or CAP_SYS_NICE (see `man 7 capabilities` \
-             for details)",
-        ))
-    }
-}
-
 #[cfg(test)]
 mod tests {
     use super::*;
@@ -390,11 +370,4 @@ mod tests {
         assert!(is_derivation("a/b").is_err());
         assert!(is_derivation("0/4294967296").is_err());
     }
-
-    #[test]
-    fn test_is_niceness_adjustment_valid() {
-        assert_eq!(is_niceness_adjustment_valid("0"), Ok(()));
-        assert!(is_niceness_adjustment_valid("128").is_err());
-        assert!(is_niceness_adjustment_valid("-129").is_err());
-    }
 }

clap-utils/src/keypair.rs

@@ -1,14 +1,3 @@
-//! Loading signers and keypairs from the command line.
-//!
-//! This module contains utilities for loading [Signer]s and [Keypair]s from
-//! standard signing sources, from the command line, as in the Solana CLI.
-//!
-//! The key function here is [`signer_from_path`], which loads a `Signer` from
-//! one of several possible sources by interpreting a "path" command line
-//! argument. Its documentation includes a description of all possible signing
-//! sources supported by the Solana CLI. Many other functions here are
-//! variations on, or delegate to, `signer_from_path`.
-
 use {
     crate::{
         input_parsers::{pubkeys_sigs_of, STDOUT_OUTFILE_TOKEN},
@@ -103,56 +92,14 @@ impl CliSignerInfo {
     }
 }
 
-/// A command line argument that loads a default signer in absence of other signers.
-///
-/// This type manages a default signing source which may be overridden by other
-/// signing sources via its [`generate_unique_signers`] method.
-///
-/// [`generate_unique_signers`]: DefaultSigner::generate_unique_signers
-///
-/// `path` is a signing source as documented by [`signer_from_path`], and
-/// `arg_name` is the name of its [clap] command line argument, which is passed
-/// to `signer_from_path` as its `keypair_name` argument.
 #[derive(Debug, Default)]
 pub struct DefaultSigner {
-    /// The name of the signers command line argument.
     pub arg_name: String,
-    /// The signing source.
     pub path: String,
     is_path_checked: RefCell<bool>,
 }
 
 impl DefaultSigner {
-    /// Create a new `DefaultSigner`.
-    ///
-    /// `path` is a signing source as documented by [`signer_from_path`], and
-    /// `arg_name` is the name of its [clap] command line argument, which is
-    /// passed to `signer_from_path` as its `keypair_name` argument.
-    ///
-    /// [clap]: https://docs.rs/clap
-    ///
-    /// # Examples
-    ///
-    /// ```no_run
-    /// use clap::{App, Arg, value_t_or_exit};
-    /// use solana_clap_utils::keypair::DefaultSigner;
-    /// use solana_clap_utils::offline::OfflineArgs;
-    ///
-    /// let clap_app = App::new("my-program")
-    ///     // The argument we'll parse as a signer "path"
-    ///     .arg(Arg::with_name("keypair")
-    ///         .required(true)
-    ///         .help("The default signer"))
-    ///     .offline_args();
-    ///
-    /// let clap_matches = clap_app.get_matches();
-    /// let keypair_str = value_t_or_exit!(clap_matches, "keypair", String);
-    ///
-    /// let default_signer = DefaultSigner::new("keypair", &keypair_str);
-    /// # assert!(default_signer.arg_name.len() > 0);
-    /// assert_eq!(default_signer.path, keypair_str);
-    /// # Ok::<(), Box<dyn std::error::Error>>(())
-    /// ```
     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();
@@ -187,57 +134,6 @@ impl DefaultSigner {
         Ok(&self.path)
     }
 
-    /// Generate a unique set of signers, possibly excluding this default signer.
-    ///
-    /// This function allows a command line application to have a default
-    /// signer, perhaps representing a default wallet, but to override that
-    /// signer and instead sign with one or more other signers.
-    ///
-    /// `bulk_signers` is a vector of signers, all of which are optional. If any
-    /// of those signers is `None`, then the default signer will be loaded; if
-    /// all of those signers are `Some`, then the default signer will not be
-    /// loaded.
-    ///
-    /// The returned value includes all of the `bulk_signers` that were not
-    /// `None`, and maybe the default signer, if it was loaded.
-    ///
-    /// # Examples
-    ///
-    /// ```no_run
-    /// use clap::{App, Arg, value_t_or_exit};
-    /// use solana_clap_utils::keypair::{DefaultSigner, signer_from_path};
-    /// use solana_clap_utils::offline::OfflineArgs;
-    /// use solana_sdk::signer::Signer;
-    ///
-    /// let clap_app = App::new("my-program")
-    ///     // The argument we'll parse as a signer "path"
-    ///     .arg(Arg::with_name("keypair")
-    ///         .required(true)
-    ///         .help("The default signer"))
-    ///     .arg(Arg::with_name("payer")
-    ///         .long("payer")
-    ///         .help("The account paying for the transaction"))
-    ///     .offline_args();
-    ///
-    /// let mut wallet_manager = None;
-    ///
-    /// let clap_matches = clap_app.get_matches();
-    /// let keypair_str = value_t_or_exit!(clap_matches, "keypair", String);
-    /// let maybe_payer = clap_matches.value_of("payer");
-    ///
-    /// let default_signer = DefaultSigner::new("keypair", &keypair_str);
-    /// let maybe_payer_signer = maybe_payer.map(|payer| {
-    ///     signer_from_path(&clap_matches, payer, "payer", &mut wallet_manager)
-    /// }).transpose()?;
-    /// let bulk_signers = vec![maybe_payer_signer];
-    ///
-    /// let unique_signers = default_signer.generate_unique_signers(
-    ///     bulk_signers,
-    ///     &clap_matches,
-    ///     &mut wallet_manager,
-    /// )?;
-    /// # Ok::<(), Box<dyn std::error::Error>>(())
-    /// ```
     pub fn generate_unique_signers(
         &self,
         bulk_signers: Vec<Option<Box<dyn Signer>>>,
@@ -262,45 +158,6 @@ impl DefaultSigner {
         })
     }
 
-    /// Loads the default [Signer] from one of several possible sources.
-    ///
-    /// The `path` is not strictly a file system path, but is interpreted as
-    /// various types of _signing source_, depending on its format, one of which
-    /// is a path to a keypair file. Some sources may require user interaction
-    /// in the course of calling this function.
-    ///
-    /// This simply delegates to the [`signer_from_path`] free function, passing
-    /// it the `DefaultSigner`s `path` and `arg_name` fields as the `path` and
-    /// `keypair_name` arguments.
-    ///
-    /// See the [`signer_from_path`] free function for full documentation of how
-    /// this function interprets its arguments.
-    ///
-    /// # Examples
-    ///
-    /// ```no_run
-    /// use clap::{App, Arg, value_t_or_exit};
-    /// use solana_clap_utils::keypair::DefaultSigner;
-    /// use solana_clap_utils::offline::OfflineArgs;
-    ///
-    /// let clap_app = App::new("my-program")
-    ///     // The argument we'll parse as a signer "path"
-    ///     .arg(Arg::with_name("keypair")
-    ///         .required(true)
-    ///         .help("The default signer"))
-    ///     .offline_args();
-    ///
-    /// let clap_matches = clap_app.get_matches();
-    /// let keypair_str = value_t_or_exit!(clap_matches, "keypair", String);
-    /// let default_signer = DefaultSigner::new("keypair", &keypair_str);
-    /// let mut wallet_manager = None;
-    ///
-    /// let signer = default_signer.signer_from_path(
-    ///     &clap_matches,
-    ///     &mut wallet_manager,
-    /// )?;
-    /// # Ok::<(), Box<dyn std::error::Error>>(())
-    /// ```
     pub fn signer_from_path(
         &self,
         matches: &ArgMatches,
@@ -309,51 +166,6 @@ impl DefaultSigner {
         signer_from_path(matches, self.path()?, &self.arg_name, wallet_manager)
     }
 
-    /// Loads the default [Signer] from one of several possible sources.
-    ///
-    /// The `path` is not strictly a file system path, but is interpreted as
-    /// various types of _signing source_, depending on its format, one of which
-    /// is a path to a keypair file. Some sources may require user interaction
-    /// in the course of calling this function.
-    ///
-    /// This simply delegates to the [`signer_from_path_with_config`] free
-    /// function, passing it the `DefaultSigner`s `path` and `arg_name` fields
-    /// as the `path` and `keypair_name` arguments.
-    ///
-    /// See the [`signer_from_path`] free function for full documentation of how
-    /// this function interprets its arguments.
-    ///
-    /// # Examples
-    ///
-    /// ```no_run
-    /// use clap::{App, Arg, value_t_or_exit};
-    /// use solana_clap_utils::keypair::{SignerFromPathConfig, DefaultSigner};
-    /// use solana_clap_utils::offline::OfflineArgs;
-    ///
-    /// let clap_app = App::new("my-program")
-    ///     // The argument we'll parse as a signer "path"
-    ///     .arg(Arg::with_name("keypair")
-    ///         .required(true)
-    ///         .help("The default signer"))
-    ///     .offline_args();
-    ///
-    /// let clap_matches = clap_app.get_matches();
-    /// let keypair_str = value_t_or_exit!(clap_matches, "keypair", String);
-    /// let default_signer = DefaultSigner::new("keypair", &keypair_str);
-    /// let mut wallet_manager = None;
-    ///
-    /// // Allow pubkey signers without accompanying signatures
-    /// let config = SignerFromPathConfig {
-    ///     allow_null_signer: true,
-    /// };
-    ///
-    /// let signer = default_signer.signer_from_path_with_config(
-    ///     &clap_matches,
-    ///     &mut wallet_manager,
-    ///     &config,
-    /// )?;
-    /// # Ok::<(), Box<dyn std::error::Error>>(())
-    /// ```
     pub fn signer_from_path_with_config(
         &self,
         matches: &ArgMatches,
@@ -521,167 +333,19 @@ pub fn presigner_from_pubkey_sigs(
     })
 }
 
-#[derive(Debug, Default)]
+#[derive(Debug)]
 pub struct SignerFromPathConfig {
     pub allow_null_signer: bool,
 }
 
-/// Loads a [Signer] from one of several possible sources.
-///
-/// The `path` is not strictly a file system path, but is interpreted as various
-/// types of _signing source_, depending on its format, one of which is a path
-/// to a keypair file. Some sources may require user interaction in the course
-/// of calling this function.
-///
-/// The result of this function is a boxed object of the [Signer] trait. To load
-/// a concrete [Keypair], use the [keypair_from_path] function, though note that
-/// it does not support all signer sources.
-///
-/// The `matches` argument is the same set of parsed [clap] matches from which
-/// `path` was parsed. It is used to parse various additional command line
-/// arguments, depending on which signing source is requested, as described
-/// below in "Signing sources".
-///
-/// [clap]: https//docs.rs/clap
-///
-/// The `keypair_name` argument is the "name" of the signer, and is typically
-/// the name of the clap argument from which the `path` argument was parsed,
-/// like "keypair", "from", or "fee-payer". It is used solely for interactively
-/// prompting the user, either when entering seed phrases or selecting from
-/// multiple hardware wallets.
-///
-/// The `wallet_manager` is used for establishing connections to a hardware
-/// device such as Ledger. If `wallet_manager` is a reference to `None`, and a
-/// hardware signer is requested, then this function will attempt to create a
-/// wallet manager, assigning it to the mutable `wallet_manager` reference. This
-/// argument is typically a reference to `None`.
-///
-/// # Signing sources
-///
-/// The `path` argument can simply be a path to a keypair file, but it may also
-/// be interpreted in several other ways, in the following order.
-///
-/// Firstly, the `path` argument may be interpreted as a [URI], with the URI
-/// scheme indicating where to load the signer from. If it parses as a URI, then
-/// the following schemes are supported:
-///
-/// - `file:` &mdash; Read the keypair from a JSON keypair file. The path portion
-///    of the URI is the file path.
-///
-/// - `stdin:` &mdash; Read the keypair from stdin, in the JSON format used by
-///   the keypair file.
-///
-///   Non-scheme parts of the URI are ignored.
-///
-/// - `prompt:` &mdash; The user will be prompted at the command line
-///   for their seed phrase and passphrase.
-///
-///   In this URI the [query string][qs] may contain zero or one of the
-///   following key/value pairs that determine the [BIP44 derivation path][dp]
-///   of the private key from the seed:
-///
-///   - `key` &mdash; In this case the value is either one or two numerical
-///     indexes separated by a slash, which represent the "account", and
-///     "change" components of the BIP44 derivation path. Example: `key=0/0`.
-///
-///   - `full-path` &mdash; In this case the value is a full derivation path,
-///     and the user is responsible for ensuring it is correct. Example:
-///     `full-path=m/44/501/0/0/0`.
-///
-///   If neither is provided, then the default derivation path is used.
-///
-///   Note that when specifying derivation paths, this routine will convert all
-///   indexes into ["hardened"] indexes, even if written as "normal" indexes.
-///
-///   Other components of the URI besides the scheme and query string are ignored.
-///
-///   If the "skip_seed_phrase_validation" argument, as defined in
-///   [SKIP_SEED_PHRASE_VALIDATION_ARG] is found in `matches`, then the keypair
-///   seed will be generated directly from the seed phrase, without parsing or
-///   validating it as a BIP39 seed phrase. This allows the use of non-BIP39 seed
-///   phrases.
-///
-/// - `usb:` &mdash; Use a USB hardware device as the signer. In this case, the
-///   URI host indicates the device type, and is required. The only currently valid host
-///   value is "ledger".
-///
-///   Optionally, the first segment of the URI path indicates the base-58
-///   encoded pubkey of the wallet, and the "account" and "change" indices of
-///   the derivation path can be specified with the `key=` query parameter, as
-///   with the `prompt:` URI.
-///
-///   Examples:
-///
-///   - `usb://ledger`
-///   - `usb://ledger?key=0/0`
-///   - `usb://ledger/9rPVSygg3brqghvdZ6wsL2i5YNQTGhXGdJzF65YxaCQd`
-///   - `usb://ledger/9rPVSygg3brqghvdZ6wsL2i5YNQTGhXGdJzF65YxaCQd?key=0/0`
-///
-/// Next the `path` argument may be one of the following strings:
-///
-/// - `-` &mdash; Read the keypair from stdin. This is the same as the `stdin:`
-///   URI scheme.
-///
-/// - `ASK` &mdash; The user will be prompted at the command line for their seed
-///   phrase and passphrase. _This uses a legacy key derivation method and should
-///   usually be avoided in favor of `prompt:`._
-///
-/// Next, if the `path` argument parses as a base-58 public key, then the signer
-/// is created without a private key, but with presigned signatures, each parsed
-/// from the additional command line arguments, provided by the `matches`
-/// argument.
-///
-/// In this case, the remaining command line arguments are searched for clap
-/// arguments named "signer", as defined by [SIGNER_ARG], and each is parsed as
-/// a key-value pair of the form "pubkey=signature", where `pubkey` is the same
-/// base-58 public key, and `signature` is a serialized signature produced by
-/// the corresponding keypair. One of the "signer" signatures must be for the
-/// pubkey specified in `path` or this function will return an error; unless the
-/// "sign_only" clap argument, as defined by [SIGN_ONLY_ARG], is present in
-/// `matches`, in which case the signer will be created with no associated
-/// signatures.
-///
-/// Finally, if `path`, interpreted as a file path, represents a file on disk,
-/// then the signer is created by reading that file as a JSON-serialized
-/// keypair. This is the same as the `file:` URI scheme.
-///
-/// [qs]: https://en.wikipedia.org/wiki/Query_string
-/// [dp]: https://github.com/bitcoin/bips/blob/master/bip-0044.mediawiki
-/// [URI]: https://en.wikipedia.org/wiki/Uniform_Resource_Identifier
-/// ["hardened"]: https://wiki.trezor.io/Hardened_and_non-hardened_derivation
-///
-/// # Examples
-///
-/// This shows a reasonable way to set up clap to parse all possible signer
-/// sources. Note the use of the [`OfflineArgs::offline_args`] method to add
-/// correct clap definitions of the `--signer` and `--sign-only` arguments, as
-/// required by the base-58 pubkey offline signing method.
-///
-/// [`OfflineArgs::offline_args`]: crate::offline::OfflineArgs::offline_args
-///
-/// ```no_run
-/// use clap::{App, Arg, value_t_or_exit};
-/// use solana_clap_utils::keypair::signer_from_path;
-/// use solana_clap_utils::offline::OfflineArgs;
-///
-/// let clap_app = App::new("my-program")
-///     // The argument we'll parse as a signer "path"
-///     .arg(Arg::with_name("keypair")
-///         .required(true)
-///         .help("The default signer"))
-///     .offline_args();
-///
-/// let clap_matches = clap_app.get_matches();
-/// let keypair_str = value_t_or_exit!(clap_matches, "keypair", String);
-/// let mut wallet_manager = None;
-/// let signer = signer_from_path(
-///     &clap_matches,
-///     &keypair_str,
-///     "keypair",
-///     &mut wallet_manager,
-/// )?;
-/// # Ok::<(), Box<dyn std::error::Error>>(())
-/// ```
+impl Default for SignerFromPathConfig {
+    fn default() -> Self {
+        Self {
+            allow_null_signer: false,
+        }
+    }
+}
+
 pub fn signer_from_path(
     matches: &ArgMatches,
     path: &str,
@@ -692,63 +356,6 @@ pub fn signer_from_path(
     signer_from_path_with_config(matches, path, keypair_name, wallet_manager, &config)
 }
 
-/// Loads a [Signer] from one of several possible sources.
-///
-/// The `path` is not strictly a file system path, but is interpreted as various
-/// types of _signing source_, depending on its format, one of which is a path
-/// to a keypair file. Some sources may require user interaction in the course
-/// of calling this function.
-///
-/// This is the same as [`signer_from_path`] except that it additionaolly
-/// accepts a [`SignerFromPathConfig`] argument.
-///
-/// If the `allow_null_signer` field of `config` is `true`, then pubkey signers
-/// are allowed to have zero associated signatures via additional "signer"
-/// command line arguments. It the same effect as if the "sign_only" clap
-/// argument is present.
-///
-/// See [`signer_from_path`] for full documentation of how this function
-/// interprets its arguments.
-///
-/// # Examples
-///
-/// This shows a reasonable way to set up clap to parse all possible signer
-/// sources. Note the use of the [`OfflineArgs::offline_args`] method to add
-/// correct clap definitions of the `--signer` and `--sign-only` arguments, as
-/// required by the base-58 pubkey offline signing method.
-///
-/// [`OfflineArgs::offline_args`]: crate::offline::OfflineArgs::offline_args
-///
-/// ```no_run
-/// use clap::{App, Arg, value_t_or_exit};
-/// use solana_clap_utils::keypair::{signer_from_path_with_config, SignerFromPathConfig};
-/// use solana_clap_utils::offline::OfflineArgs;
-///
-/// let clap_app = App::new("my-program")
-///     // The argument we'll parse as a signer "path"
-///     .arg(Arg::with_name("keypair")
-///         .required(true)
-///         .help("The default signer"))
-///     .offline_args();
-///
-/// let clap_matches = clap_app.get_matches();
-/// let keypair_str = value_t_or_exit!(clap_matches, "keypair", String);
-/// let mut wallet_manager = None;
-///
-/// // Allow pubkey signers without accompanying signatures
-/// let config = SignerFromPathConfig {
-///     allow_null_signer: true,
-/// };
-///
-/// let signer = signer_from_path_with_config(
-///     &clap_matches,
-///     &keypair_str,
-///     "keypair",
-///     &mut wallet_manager,
-///     &config,
-/// )?;
-/// # Ok::<(), Box<dyn std::error::Error>>(())
-/// ```
 pub fn signer_from_path_with_config(
     matches: &ArgMatches,
     path: &str,
@@ -819,43 +426,6 @@ pub fn signer_from_path_with_config(
     }
 }
 
-/// Loads the pubkey of a [Signer] from one of several possible sources.
-///
-/// The `path` is not strictly a file system path, but is interpreted as various
-/// types of _signing source_, depending on its format, one of which is a path
-/// to a keypair file. Some sources may require user interaction in the course
-/// of calling this function.
-///
-/// The only difference between this function and [`signer_from_path`] is in the
-/// case of a "pubkey" path: this function does not require that accompanying
-/// command line arguments contain an offline signature.
-///
-/// See [`signer_from_path`] for full documentation of how this function
-/// interprets its arguments.
-///
-/// # Examples
-///
-/// ```no_run
-/// use clap::{App, Arg, value_t_or_exit};
-/// use solana_clap_utils::keypair::pubkey_from_path;
-///
-/// let clap_app = App::new("my-program")
-///     // The argument we'll parse as a signer "path"
-///     .arg(Arg::with_name("keypair")
-///         .required(true)
-///         .help("The default signer"));
-///
-/// let clap_matches = clap_app.get_matches();
-/// let keypair_str = value_t_or_exit!(clap_matches, "keypair", String);
-/// let mut wallet_manager = None;
-/// let pubkey = pubkey_from_path(
-///     &clap_matches,
-///     &keypair_str,
-///     "keypair",
-///     &mut wallet_manager,
-/// )?;
-/// # Ok::<(), Box<dyn std::error::Error>>(())
-/// ```
 pub fn pubkey_from_path(
     matches: &ArgMatches,
     path: &str,
@@ -955,46 +525,7 @@ pub fn prompt_passphrase(prompt: &str) -> Result<String, Box<dyn error::Error>>
     Ok(passphrase)
 }
 
-/// Loads a [Keypair] from one of several possible sources.
-///
-/// The `path` is not strictly a file system path, but is interpreted as various
-/// types of _signing source_, depending on its format, one of which is a path
-/// to a keypair file. Some sources may require user interaction in the course
-/// of calling this function.
-///
-/// This is the same as [`signer_from_path`] except that it only supports
-/// signing sources that can result in a [Keypair]: prompt for seed phrase,
-/// keypair file, and stdin.
-///
-/// If `confirm_pubkey` is `true` then after deriving the pubkey, the user will
-/// be prompted to confirm that the pubkey is as expected.
-///
-/// See [`signer_from_path`] for full documentation of how this function
-/// interprets its arguments.
-///
-/// # Examples
-///
-/// ```no_run
-/// use clap::{App, Arg, value_t_or_exit};
-/// use solana_clap_utils::keypair::keypair_from_path;
-///
-/// let clap_app = App::new("my-program")
-///     // The argument we'll parse as a signer "path"
-///     .arg(Arg::with_name("keypair")
-///         .required(true)
-///         .help("The default signer"));
-///
-/// let clap_matches = clap_app.get_matches();
-/// let keypair_str = value_t_or_exit!(clap_matches, "keypair", String);
-///
-/// let signer = keypair_from_path(
-///     &clap_matches,
-///     &keypair_str,
-///     "keypair",
-///     false,
-/// )?;
-/// # Ok::<(), Box<dyn std::error::Error>>(())
-/// ```
+/// Parses a path into a SignerSource and returns a Keypair for supporting SignerSourceKinds
 pub fn keypair_from_path(
     matches: &ArgMatches,
     path: &str,
@@ -1044,10 +575,9 @@ pub fn keypair_from_path(
     }
 }
 
-/// 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.
+/// 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
 pub fn keypair_from_seed_phrase(
     keypair_name: &str,
     skip_validation: bool,
@@ -1123,14 +653,10 @@ fn sanitize_seed_phrase(seed_phrase: &str) -> String {
 
 #[cfg(test)]
 mod tests {
-    use {
-        super::*,
-        crate::offline::OfflineArgs,
-        clap::{value_t_or_exit, App, Arg},
-        solana_remote_wallet::{locator::Manufacturer, remote_wallet::initialize_wallet_manager},
-        solana_sdk::{signer::keypair::write_keypair_file, system_instruction},
-        tempfile::{NamedTempFile, TempDir},
-    };
+    use super::*;
+    use solana_remote_wallet::locator::Manufacturer;
+    use solana_sdk::system_instruction;
+    use tempfile::NamedTempFile;
 
     #[test]
     fn test_sanitize_seed_phrase() {
@@ -1289,41 +815,4 @@ mod tests {
             } if p == relative_path_str)
         );
     }
-
-    #[test]
-    fn signer_from_path_with_file() -> Result<(), Box<dyn std::error::Error>> {
-        let dir = TempDir::new()?;
-        let dir = dir.path();
-        let keypair_path = dir.join("id.json");
-        let keypair_path_str = keypair_path.to_str().expect("utf-8");
-
-        let keypair = Keypair::new();
-        write_keypair_file(&keypair, &keypair_path)?;
-
-        let args = vec!["program", keypair_path_str];
-
-        let clap_app = App::new("my-program")
-            .arg(
-                Arg::with_name("keypair")
-                    .required(true)
-                    .help("The signing keypair"),
-            )
-            .offline_args();
-
-        let clap_matches = clap_app.get_matches_from(args);
-        let keypair_str = value_t_or_exit!(clap_matches, "keypair", String);
-
-        let wallet_manager = initialize_wallet_manager()?;
-
-        let signer = signer_from_path(
-            &clap_matches,
-            &keypair_str,
-            "signer",
-            &mut Some(wallet_manager),
-        )?;
-
-        assert_eq!(keypair.pubkey(), signer.pubkey());
-
-        Ok(())
-    }
 }

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.8.13"
+version = "1.7.18"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"

cli-config/src/config.rs

@@ -1,9 +1,7 @@
 // Wallet settings that can be configured for long-term use
-use {
-    serde_derive::{Deserialize, Serialize},
-    std::{collections::HashMap, io, path::Path},
-    url::Url,
-};
+use serde_derive::{Deserialize, Serialize};
+use std::{collections::HashMap, io, path::Path};
+use url::Url;
 
 lazy_static! {
     pub static ref CONFIG_FILE: Option<String> = {

cli-config/src/lib.rs

@@ -3,6 +3,7 @@ extern crate lazy_static;
 
 mod config;
 pub use config::{Config, CONFIG_FILE};
+
 use std::{
     fs::{create_dir_all, File},
     io::{self, Write},

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.8.13"
+version = "1.7.18"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
@@ -20,12 +20,12 @@ 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.8.13" }
-solana-clap-utils = { path = "../clap-utils", version = "=1.8.13" }
-solana-client = { path = "../client", version = "=1.8.13" }
-solana-sdk = { path = "../sdk", version = "=1.8.13" }
-solana-transaction-status = { path = "../transaction-status", version = "=1.8.13" }
-solana-vote-program = { path = "../programs/vote", version = "=1.8.13" }
+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" }
 spl-memo = { version = "=3.0.1", features = ["no-entrypoint"] }
 
 [package.metadata.docs.rs]

cli-output/src/cli_output.rs

@@ -576,7 +576,7 @@ impl fmt::Display for CliValidators {
         for (version, info) in self.stake_by_version.iter() {
             writeln!(
                 f,
-                "{:<8} - {:4} current validators ({:>5.2}%){}",
+                "{:<8} - {:3} current validators ({:>5.2}%){}",
                 version,
                 info.current_validators,
                 100. * info.current_active_stake as f64 / self.total_active_stake as f64,
@@ -2525,16 +2525,14 @@ impl VerboseDisplay for CliGossipNodes {}
 
 #[cfg(test)]
 mod tests {
-    use {
-        super::*,
-        clap::{App, Arg},
-        solana_sdk::{
-            message::Message,
-            pubkey::Pubkey,
-            signature::{keypair_from_seed, NullSigner, Signature, Signer, SignerError},
-            system_instruction,
-            transaction::Transaction,
-        },
+    use super::*;
+    use clap::{App, Arg};
+    use solana_sdk::{
+        message::Message,
+        pubkey::Pubkey,
+        signature::{keypair_from_seed, NullSigner, Signature, Signer, SignerError},
+        system_instruction,
+        transaction::Transaction,
     };
 
     #[test]

cli-output/src/display.rs

@@ -8,7 +8,8 @@ use {
         program_utils::limited_deserialize, pubkey::Pubkey, stake, transaction::Transaction,
     },
     solana_transaction_status::UiTransactionStatusMeta,
-    spl_memo::{id as spl_memo_id, v1::id as spl_memo_v1_id},
+    spl_memo::id as spl_memo_id,
+    spl_memo::v1::id as spl_memo_v1_id,
     std::{collections::HashMap, fmt, io},
 };
 
@@ -430,7 +431,8 @@ pub fn unix_timestamp_to_string(unix_timestamp: UnixTimestamp) -> String {
 
 #[cfg(test)]
 mod test {
-    use {super::*, solana_sdk::pubkey::Pubkey};
+    use super::*;
+    use solana_sdk::pubkey::Pubkey;
 
     #[test]
     fn test_format_labeled_address() {

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.8.13"
+version = "1.7.18"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
@@ -30,30 +30,30 @@ 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.8.13" }
-solana-bpf-loader-program = { path = "../programs/bpf_loader", version = "=1.8.13" }
-solana-clap-utils = { path = "../clap-utils", version = "=1.8.13" }
-solana-cli-config = { path = "../cli-config", version = "=1.8.13" }
-solana-cli-output = { path = "../cli-output", version = "=1.8.13" }
-solana-client = { path = "../client", version = "=1.8.13" }
-solana-config-program = { path = "../programs/config", version = "=1.8.13" }
-solana-faucet = { path = "../faucet", version = "=1.8.13" }
-solana-logger = { path = "../logger", version = "=1.8.13" }
-solana-net-utils = { path = "../net-utils", version = "=1.8.13" }
-solana_rbpf = "=0.2.21"
-solana-remote-wallet = { path = "../remote-wallet", version = "=1.8.13" }
-solana-sdk = { path = "../sdk", version = "=1.8.13" }
-solana-transaction-status = { path = "../transaction-status", version = "=1.8.13" }
-solana-version = { path = "../version", version = "=1.8.13" }
-solana-vote-program = { path = "../programs/vote", version = "=1.8.13" }
+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" }
 spl-memo = { version = "=3.0.1", features = ["no-entrypoint"] }
 thiserror = "1.0.21"
 tiny-bip39 = "0.8.1"
 url = "2.1.1"
 
 [dev-dependencies]
-solana-core = { path = "../core", version = "=1.8.13" }
-solana-streamer = { path = "../streamer", version = "=1.8.13" }
+solana-core = { path = "../core", version = "=1.7.18" }
+solana-streamer = { path = "../streamer", version = "=1.7.18" }
 tempfile = "3.1.0"
 
 [[bin]]

cli/src/checks.rs

@@ -1,13 +1,11 @@
-use {
-    crate::cli::CliError,
-    solana_client::{
-        client_error::{ClientError, Result as ClientResult},
-        rpc_client::RpcClient,
-    },
-    solana_sdk::{
-        commitment_config::CommitmentConfig, fee_calculator::FeeCalculator, message::Message,
-        native_token::lamports_to_sol, pubkey::Pubkey,
-    },
+use crate::cli::CliError;
+use solana_client::{
+    client_error::{ClientError, Result as ClientResult},
+    rpc_client::RpcClient,
+};
+use solana_sdk::{
+    commitment_config::CommitmentConfig, fee_calculator::FeeCalculator, message::Message,
+    native_token::lamports_to_sol, pubkey::Pubkey,
 };
 
 pub fn check_account_for_fee(
@@ -151,16 +149,14 @@ pub fn check_unique_pubkeys(
 
 #[cfg(test)]
 mod tests {
-    use {
-        super::*,
-        serde_json::json,
-        solana_client::{
-            rpc_request::RpcRequest,
-            rpc_response::{Response, RpcResponseContext},
-        },
-        solana_sdk::system_instruction,
-        std::collections::HashMap,
+    use super::*;
+    use serde_json::json;
+    use solana_client::{
+        rpc_request::RpcRequest,
+        rpc_response::{Response, RpcResponseContext},
     };
+    use solana_sdk::system_instruction;
+    use std::collections::HashMap;
 
     #[test]
     fn test_check_account_for_fees() {

cli/src/clap_app.rs

@@ -1,12 +1,10 @@
-use {
-    crate::{
-        cli::*, cluster_query::*, feature::*, inflation::*, nonce::*, program::*, stake::*,
-        validator_info::*, vote::*, wallet::*,
-    },
-    clap::{App, AppSettings, Arg, ArgGroup, SubCommand},
-    solana_clap_utils::{self, input_validators::*, keypair::*},
-    solana_cli_config::CONFIG_FILE,
+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)

cli/src/cli.rs

@@ -1,41 +1,37 @@
-use {
-    crate::{
-        clap_app::*, cluster_query::*, feature::*, inflation::*, nonce::*, program::*,
-        spend_utils::*, stake::*, validator_info::*, vote::*, wallet::*,
-    },
-    clap::{crate_description, crate_name, value_t_or_exit, ArgMatches, Shell},
-    log::*,
-    num_traits::FromPrimitive,
-    serde_json::{self, Value},
-    solana_clap_utils::{self, input_parsers::*, input_validators::*, keypair::*},
-    solana_cli_output::{
-        display::println_name_value, CliSignature, CliValidatorsSortOrder, OutputFormat,
-    },
-    solana_client::{
-        blockhash_query::BlockhashQuery,
-        client_error::{ClientError, Result as ClientResult},
-        nonce_utils,
-        rpc_client::RpcClient,
-        rpc_config::{
-            RpcLargestAccountsFilter, RpcSendTransactionConfig, RpcTransactionLogsFilter,
-        },
-    },
-    solana_remote_wallet::remote_wallet::RemoteWalletManager,
-    solana_sdk::{
-        clock::{Epoch, Slot},
-        commitment_config::CommitmentConfig,
-        decode_error::DecodeError,
-        hash::Hash,
-        instruction::InstructionError,
-        pubkey::Pubkey,
-        signature::{Signature, Signer, SignerError},
-        stake::{instruction::LockupArgs, state::Lockup},
-        transaction::{Transaction, TransactionError},
-    },
-    solana_vote_program::vote_state::VoteAuthorize,
-    std::{collections::HashMap, error, io::stdout, str::FromStr, sync::Arc, time::Duration},
-    thiserror::Error,
+use crate::{
+    clap_app::*, cluster_query::*, feature::*, inflation::*, nonce::*, program::*, spend_utils::*,
+    stake::*, validator_info::*, vote::*, wallet::*,
 };
+use clap::{crate_description, crate_name, value_t_or_exit, ArgMatches, Shell};
+use log::*;
+use num_traits::FromPrimitive;
+use serde_json::{self, Value};
+use solana_clap_utils::{self, input_parsers::*, input_validators::*, keypair::*};
+use solana_cli_output::{
+    display::println_name_value, CliSignature, CliValidatorsSortOrder, OutputFormat,
+};
+use solana_client::{
+    blockhash_query::BlockhashQuery,
+    client_error::{ClientError, Result as ClientResult},
+    nonce_utils,
+    rpc_client::RpcClient,
+    rpc_config::{RpcLargestAccountsFilter, RpcSendTransactionConfig, RpcTransactionLogsFilter},
+};
+use solana_remote_wallet::remote_wallet::RemoteWalletManager;
+use solana_sdk::{
+    clock::{Epoch, Slot},
+    commitment_config::CommitmentConfig,
+    decode_error::DecodeError,
+    hash::Hash,
+    instruction::InstructionError,
+    pubkey::Pubkey,
+    signature::{Signature, Signer, SignerError},
+    stake::{instruction::LockupArgs, state::Lockup},
+    transaction::{Transaction, TransactionError},
+};
+use solana_vote_program::vote_state::VoteAuthorize;
+use std::{collections::HashMap, error, io::stdout, str::FromStr, sync::Arc, time::Duration};
+use thiserror::Error;
 
 pub const DEFAULT_RPC_TIMEOUT_SECONDS: &str = "30";
 pub const DEFAULT_CONFIRM_TX_TIMEOUT_SECONDS: &str = "5";
@@ -298,13 +294,7 @@ pub enum CliCommand {
         authorized_voter: Option<Pubkey>,
         authorized_withdrawer: Pubkey,
         commission: u8,
-        sign_only: bool,
-        dump_transaction_message: bool,
-        blockhash_query: BlockhashQuery,
-        nonce_account: Option<Pubkey>,
-        nonce_authority: SignerIndex,
         memo: Option<String>,
-        fee_payer: SignerIndex,
     },
     ShowVoteAccount {
         pubkey: Pubkey,
@@ -316,25 +306,13 @@ pub enum CliCommand {
         destination_account_pubkey: Pubkey,
         withdraw_authority: SignerIndex,
         withdraw_amount: SpendAmount,
-        sign_only: bool,
-        dump_transaction_message: bool,
-        blockhash_query: BlockhashQuery,
-        nonce_account: Option<Pubkey>,
-        nonce_authority: SignerIndex,
         memo: Option<String>,
-        fee_payer: SignerIndex,
     },
     VoteAuthorize {
         vote_account_pubkey: Pubkey,
         new_authorized_pubkey: Pubkey,
         vote_authorize: VoteAuthorize,
-        sign_only: bool,
-        dump_transaction_message: bool,
-        blockhash_query: BlockhashQuery,
-        nonce_account: Option<Pubkey>,
-        nonce_authority: SignerIndex,
         memo: Option<String>,
-        fee_payer: SignerIndex,
         authorized: SignerIndex,
         new_authorized: Option<SignerIndex>,
     },
@@ -342,25 +320,13 @@ pub enum CliCommand {
         vote_account_pubkey: Pubkey,
         new_identity_account: SignerIndex,
         withdraw_authority: SignerIndex,
-        sign_only: bool,
-        dump_transaction_message: bool,
-        blockhash_query: BlockhashQuery,
-        nonce_account: Option<Pubkey>,
-        nonce_authority: SignerIndex,
         memo: Option<String>,
-        fee_payer: SignerIndex,
     },
     VoteUpdateCommission {
         vote_account_pubkey: Pubkey,
         commission: u8,
         withdraw_authority: SignerIndex,
-        sign_only: bool,
-        dump_transaction_message: bool,
-        blockhash_query: BlockhashQuery,
-        nonce_account: Option<Pubkey>,
-        nonce_authority: SignerIndex,
         memo: Option<String>,
-        fee_payer: SignerIndex,
     },
     // Wallet Commands
     Address,
@@ -1405,13 +1371,7 @@ pub fn process_command(config: &CliConfig) -> ProcessResult {
             authorized_voter,
             authorized_withdrawer,
             commission,
-            sign_only,
-            dump_transaction_message,
-            blockhash_query,
-            ref nonce_account,
-            nonce_authority,
             memo,
-            fee_payer,
         } => process_create_vote_account(
             &rpc_client,
             config,
@@ -1421,13 +1381,7 @@ pub fn process_command(config: &CliConfig) -> ProcessResult {
             authorized_voter,
             *authorized_withdrawer,
             *commission,
-            *sign_only,
-            *dump_transaction_message,
-            blockhash_query,
-            nonce_account.as_ref(),
-            *nonce_authority,
             memo.as_ref(),
-            *fee_payer,
         ),
         CliCommand::ShowVoteAccount {
             pubkey: vote_account_pubkey,
@@ -1445,13 +1399,7 @@ pub fn process_command(config: &CliConfig) -> ProcessResult {
             withdraw_authority,
             withdraw_amount,
             destination_account_pubkey,
-            sign_only,
-            dump_transaction_message,
-            blockhash_query,
-            ref nonce_account,
-            nonce_authority,
             memo,
-            fee_payer,
         } => process_withdraw_from_vote_account(
             &rpc_client,
             config,
@@ -1459,25 +1407,13 @@ pub fn process_command(config: &CliConfig) -> ProcessResult {
             *withdraw_authority,
             *withdraw_amount,
             destination_account_pubkey,
-            *sign_only,
-            *dump_transaction_message,
-            blockhash_query,
-            nonce_account.as_ref(),
-            *nonce_authority,
             memo.as_ref(),
-            *fee_payer,
         ),
         CliCommand::VoteAuthorize {
             vote_account_pubkey,
             new_authorized_pubkey,
             vote_authorize,
-            sign_only,
-            dump_transaction_message,
-            blockhash_query,
-            nonce_account,
-            nonce_authority,
             memo,
-            fee_payer,
             authorized,
             new_authorized,
         } => process_vote_authorize(
@@ -1488,63 +1424,33 @@ pub fn process_command(config: &CliConfig) -> ProcessResult {
             *vote_authorize,
             *authorized,
             *new_authorized,
-            *sign_only,
-            *dump_transaction_message,
-            blockhash_query,
-            *nonce_account,
-            *nonce_authority,
             memo.as_ref(),
-            *fee_payer,
         ),
         CliCommand::VoteUpdateValidator {
             vote_account_pubkey,
             new_identity_account,
             withdraw_authority,
-            sign_only,
-            dump_transaction_message,
-            blockhash_query,
-            nonce_account,
-            nonce_authority,
             memo,
-            fee_payer,
         } => process_vote_update_validator(
             &rpc_client,
             config,
             vote_account_pubkey,
             *new_identity_account,
             *withdraw_authority,
-            *sign_only,
-            *dump_transaction_message,
-            blockhash_query,
-            *nonce_account,
-            *nonce_authority,
             memo.as_ref(),
-            *fee_payer,
         ),
         CliCommand::VoteUpdateCommission {
             vote_account_pubkey,
             commission,
             withdraw_authority,
-            sign_only,
-            dump_transaction_message,
-            blockhash_query,
-            nonce_account,
-            nonce_authority,
             memo,
-            fee_payer,
         } => process_vote_update_commission(
             &rpc_client,
             config,
             vote_account_pubkey,
             *commission,
             *withdraw_authority,
-            *sign_only,
-            *dump_transaction_message,
-            blockhash_query,
-            *nonce_account,
-            *nonce_authority,
             memo.as_ref(),
-            *fee_payer,
         ),
 
         // Wallet Commands
@@ -1679,26 +1585,22 @@ where
 
 #[cfg(test)]
 mod tests {
-    use {
-        super::*,
-        serde_json::{json, Value},
-        solana_client::{
-            blockhash_query,
-            mock_sender::SIGNATURE,
-            rpc_request::RpcRequest,
-            rpc_response::{Response, RpcResponseContext},
-        },
-        solana_sdk::{
-            pubkey::Pubkey,
-            signature::{
-                keypair_from_seed, read_keypair_file, write_keypair_file, Keypair, Presigner,
-            },
-            stake, system_program,
-            transaction::TransactionError,
-        },
-        solana_transaction_status::TransactionConfirmationStatus,
-        std::path::PathBuf,
+    use super::*;
+    use serde_json::{json, Value};
+    use solana_client::{
+        blockhash_query,
+        mock_sender::SIGNATURE,
+        rpc_request::RpcRequest,
+        rpc_response::{Response, RpcResponseContext},
     };
+    use solana_sdk::{
+        pubkey::Pubkey,
+        signature::{keypair_from_seed, read_keypair_file, write_keypair_file, Keypair, Presigner},
+        stake, system_program,
+        transaction::TransactionError,
+    };
+    use solana_transaction_status::TransactionConfirmationStatus;
+    use std::path::PathBuf;
 
     fn make_tmp_path(name: &str) -> String {
         let out_dir = std::env::var("FARF_DIR").unwrap_or_else(|_| "farf".to_string());
@@ -2043,13 +1945,7 @@ mod tests {
             authorized_voter: Some(bob_pubkey),
             authorized_withdrawer: bob_pubkey,
             commission: 0,
-            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,
         };
         config.signers = vec![&keypair, &bob_keypair, &identity_keypair];
         let result = process_command(&config);
@@ -2080,13 +1976,7 @@ mod tests {
             vote_account_pubkey: bob_pubkey,
             new_authorized_pubkey,
             vote_authorize: VoteAuthorize::Withdrawer,
-            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,
             authorized: 0,
             new_authorized: None,
         };
@@ -2099,13 +1989,7 @@ mod tests {
             vote_account_pubkey: bob_pubkey,
             new_identity_account: 2,
             withdraw_authority: 1,
-            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,
         };
         let result = process_command(&config);
         assert!(result.is_ok());
@@ -2281,13 +2165,7 @@ mod tests {
             authorized_voter: Some(bob_pubkey),
             authorized_withdrawer: bob_pubkey,
             commission: 0,
-            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,
         };
         config.signers = vec![&keypair, &bob_keypair, &identity_keypair];
         assert!(process_command(&config).is_err());
@@ -2296,13 +2174,7 @@ mod tests {
             vote_account_pubkey: bob_pubkey,
             new_authorized_pubkey: bob_pubkey,
             vote_authorize: VoteAuthorize::Voter,
-            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,
             authorized: 0,
             new_authorized: None,
         };
@@ -2312,13 +2184,7 @@ mod tests {
             vote_account_pubkey: bob_pubkey,
             new_identity_account: 1,
             withdraw_authority: 1,
-            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,
         };
         assert!(process_command(&config).is_err());
 

cli/src/cluster_query.rs

@@ -1,78 +1,76 @@
-use {
-    crate::{
-        cli::{CliCommand, CliCommandInfo, CliConfig, CliError, ProcessResult},
-        spend_utils::{resolve_spend_tx_and_check_account_balance, SpendAmount},
-    },
-    clap::{value_t, value_t_or_exit, App, AppSettings, Arg, ArgMatches, SubCommand},
-    console::{style, Emoji},
-    serde::{Deserialize, Serialize},
-    solana_clap_utils::{
-        input_parsers::*,
-        input_validators::*,
-        keypair::DefaultSigner,
-        offline::{blockhash_arg, BLOCKHASH_ARG},
-    },
-    solana_cli_output::{
-        display::{
-            build_balance_message, format_labeled_address, new_spinner_progress_bar,
-            println_name_value, println_transaction, unix_timestamp_to_string, writeln_name_value,
-        },
-        *,
-    },
-    solana_client::{
-        client_error::ClientErrorKind,
-        pubsub_client::PubsubClient,
-        rpc_client::{GetConfirmedSignaturesForAddress2Config, RpcClient},
-        rpc_config::{
-            RpcAccountInfoConfig, RpcBlockConfig, RpcGetVoteAccountsConfig,
-            RpcLargestAccountsConfig, RpcLargestAccountsFilter, RpcProgramAccountsConfig,
-            RpcTransactionConfig, RpcTransactionLogsConfig, RpcTransactionLogsFilter,
-        },
-        rpc_filter,
-        rpc_request::DELINQUENT_VALIDATOR_SLOT_DISTANCE,
-        rpc_response::SlotInfo,
-    },
-    solana_remote_wallet::remote_wallet::RemoteWalletManager,
-    solana_sdk::{
-        account::from_account,
-        account_utils::StateMut,
-        clock::{self, Clock, Slot},
-        commitment_config::CommitmentConfig,
-        epoch_schedule::Epoch,
-        hash::Hash,
-        message::Message,
-        native_token::lamports_to_sol,
-        nonce::State as NonceState,
-        pubkey::{self, Pubkey},
-        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,
-    },
-    solana_transaction_status::UiTransactionEncoding,
-    solana_vote_program::vote_state::VoteState,
-    std::{
-        collections::{BTreeMap, HashMap, VecDeque},
-        fmt,
-        str::FromStr,
-        sync::{
-            atomic::{AtomicBool, Ordering},
-            Arc,
-        },
-        thread::sleep,
-        time::{Duration, Instant, SystemTime, UNIX_EPOCH},
-    },
-    thiserror::Error,
+use crate::{
+    cli::{CliCommand, CliCommandInfo, CliConfig, CliError, ProcessResult},
+    spend_utils::{resolve_spend_tx_and_check_account_balance, SpendAmount},
 };
+use clap::{value_t, value_t_or_exit, App, AppSettings, Arg, ArgMatches, SubCommand};
+use console::{style, Emoji};
+use serde::{Deserialize, Serialize};
+use solana_clap_utils::{
+    input_parsers::*,
+    input_validators::*,
+    keypair::DefaultSigner,
+    offline::{blockhash_arg, BLOCKHASH_ARG},
+};
+use solana_cli_output::{
+    display::{
+        build_balance_message, format_labeled_address, new_spinner_progress_bar,
+        println_name_value, println_transaction, unix_timestamp_to_string, writeln_name_value,
+    },
+    *,
+};
+use solana_client::{
+    client_error::ClientErrorKind,
+    pubsub_client::PubsubClient,
+    rpc_client::{GetConfirmedSignaturesForAddress2Config, RpcClient},
+    rpc_config::{
+        RpcAccountInfoConfig, RpcBlockConfig, RpcGetVoteAccountsConfig, RpcLargestAccountsConfig,
+        RpcLargestAccountsFilter, RpcProgramAccountsConfig, RpcTransactionConfig,
+        RpcTransactionLogsConfig, RpcTransactionLogsFilter,
+    },
+    rpc_filter,
+    rpc_request::DELINQUENT_VALIDATOR_SLOT_DISTANCE,
+    rpc_response::SlotInfo,
+};
+use solana_remote_wallet::remote_wallet::RemoteWalletManager;
+use solana_sdk::{
+    account::from_account,
+    account_utils::StateMut,
+    clock::{self, Clock, Slot},
+    commitment_config::CommitmentConfig,
+    epoch_schedule::Epoch,
+    hash::Hash,
+    message::Message,
+    native_token::lamports_to_sol,
+    nonce::State as NonceState,
+    pubkey::{self, Pubkey},
+    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_transaction_status::UiTransactionEncoding;
+use solana_vote_program::vote_state::VoteState;
+use std::{
+    collections::{BTreeMap, HashMap, VecDeque},
+    fmt,
+    str::FromStr,
+    sync::{
+        atomic::{AtomicBool, Ordering},
+        Arc,
+    },
+    thread::sleep,
+    time::{Duration, Instant, SystemTime, UNIX_EPOCH},
+};
+use thiserror::Error;
 
 static CHECK_MARK: Emoji = Emoji("✅ ", "");
 static CROSS_MARK: Emoji = Emoji("❌ ", "");
@@ -2142,13 +2140,11 @@ pub fn process_calculate_rent(
 
 #[cfg(test)]
 mod tests {
-    use {
-        super::*,
-        crate::{clap_app::get_clap_app, cli::parse_command},
-        solana_sdk::signature::{write_keypair, Keypair},
-        std::str::FromStr,
-        tempfile::NamedTempFile,
-    };
+    use super::*;
+    use crate::{clap_app::get_clap_app, cli::parse_command};
+    use solana_sdk::signature::{write_keypair, Keypair};
+    use std::str::FromStr;
+    use tempfile::NamedTempFile;
 
     fn make_tmp_file() -> (String, NamedTempFile) {
         let tmp_file = NamedTempFile::new().unwrap();

cli/src/feature.rs

@@ -1,31 +1,28 @@
-use {
-    crate::{
-        cli::{CliCommand, CliCommandInfo, CliConfig, CliError, ProcessResult},
-        spend_utils::{resolve_spend_tx_and_check_account_balance, SpendAmount},
-    },
-    clap::{App, AppSettings, Arg, ArgMatches, SubCommand},
-    console::style,
-    serde::{Deserialize, Deserializer, Serialize, Serializer},
-    solana_clap_utils::{input_parsers::*, input_validators::*, keypair::*},
-    solana_cli_output::{QuietDisplay, VerboseDisplay},
-    solana_client::{client_error::ClientError, rpc_client::RpcClient},
-    solana_remote_wallet::remote_wallet::RemoteWalletManager,
-    solana_sdk::{
-        account::Account,
-        clock::Slot,
-        feature::{self, Feature},
-        feature_set::FEATURE_NAMES,
-        message::Message,
-        pubkey::Pubkey,
-        transaction::Transaction,
-    },
-    std::{
-        cmp::Ordering,
-        collections::{HashMap, HashSet},
-        fmt,
-        str::FromStr,
-        sync::Arc,
-    },
+use crate::{
+    cli::{CliCommand, CliCommandInfo, CliConfig, CliError, ProcessResult},
+    spend_utils::{resolve_spend_tx_and_check_account_balance, SpendAmount},
+};
+use clap::{App, AppSettings, Arg, ArgMatches, SubCommand};
+use console::style;
+use serde::{Deserialize, Serialize};
+use solana_clap_utils::{input_parsers::*, input_validators::*, keypair::*};
+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,
+    message::Message,
+    pubkey::Pubkey,
+    transaction::Transaction,
+};
+use std::{
+    cmp::Ordering,
+    collections::{HashMap, HashSet},
+    fmt,
+    sync::Arc,
 };
 
 #[derive(Copy, Clone, Debug, PartialEq)]
@@ -46,7 +43,7 @@ pub enum FeatureCliCommand {
     },
 }
 
-#[derive(Serialize, Deserialize, PartialEq, Eq)]
+#[derive(Serialize, Deserialize)]
 #[serde(rename_all = "camelCase", tag = "status", content = "sinceSlot")]
 pub enum CliFeatureStatus {
     Inactive,
@@ -54,29 +51,7 @@ pub enum CliFeatureStatus {
     Active(Slot),
 }
 
-impl PartialOrd for CliFeatureStatus {
-    fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
-        Some(self.cmp(other))
-    }
-}
-
-impl Ord for CliFeatureStatus {
-    fn cmp(&self, other: &Self) -> Ordering {
-        match (self, other) {
-            (Self::Inactive, Self::Inactive) => Ordering::Equal,
-            (Self::Inactive, _) => Ordering::Greater,
-            (_, Self::Inactive) => Ordering::Less,
-            (Self::Pending, Self::Pending) => Ordering::Equal,
-            (Self::Pending, _) => Ordering::Greater,
-            (_, Self::Pending) => Ordering::Less,
-            (Self::Active(self_active_slot), Self::Active(other_active_slot)) => {
-                self_active_slot.cmp(other_active_slot)
-            }
-        }
-    }
-}
-
-#[derive(Serialize, Deserialize, PartialEq, Eq)]
+#[derive(Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct CliFeature {
     pub id: String,
@@ -85,28 +60,11 @@ pub struct CliFeature {
     pub status: CliFeatureStatus,
 }
 
-impl PartialOrd for CliFeature {
-    fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
-        Some(self.cmp(other))
-    }
-}
-
-impl Ord for CliFeature {
-    fn cmp(&self, other: &Self) -> Ordering {
-        match self.status.cmp(&other.status) {
-            Ordering::Equal => self.id.cmp(&other.id),
-            ordering => ordering,
-        }
-    }
-}
-
 #[derive(Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct CliFeatures {
     pub features: Vec<CliFeature>,
     pub feature_activation_allowed: bool,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub cluster_feature_sets: Option<CliClusterFeatureSets>,
     #[serde(skip)]
     pub inactive: bool,
 }
@@ -133,16 +91,11 @@ impl fmt::Display for CliFeatures {
                     CliFeatureStatus::Inactive => style("inactive".to_string()).red(),
                     CliFeatureStatus::Pending => style("activation pending".to_string()).yellow(),
                     CliFeatureStatus::Active(activation_slot) =>
-                        style(format!("active since slot {:>9}", activation_slot)).green(),
+                        style(format!("active since slot {}", activation_slot)).green(),
                 },
                 feature.description,
             )?;
         }
-
-        if let Some(feature_sets) = &self.cluster_feature_sets {
-            write!(f, "{}", feature_sets)?;
-        }
-
         if self.inactive && !self.feature_activation_allowed {
             writeln!(
                 f,
@@ -159,191 +112,6 @@ impl fmt::Display for CliFeatures {
 impl QuietDisplay for CliFeatures {}
 impl VerboseDisplay for CliFeatures {}
 
-#[derive(Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct CliClusterFeatureSets {
-    pub tool_feature_set: u32,
-    pub feature_sets: Vec<CliFeatureSet>,
-    #[serde(skip)]
-    pub stake_allowed: bool,
-    #[serde(skip)]
-    pub rpc_allowed: bool,
-}
-
-impl fmt::Display for CliClusterFeatureSets {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        let mut tool_feature_set_matches_cluster = false;
-
-        let software_versions_title = "Software Version";
-        let feature_set_title = "Feature Set";
-        let stake_percent_title = "Stake";
-        let rpc_percent_title = "RPC";
-        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();
-
-        let feature_sets: Vec<_> = self
-            .feature_sets
-            .iter()
-            .map(|feature_set_info| {
-                let me = if self.tool_feature_set == feature_set_info.feature_set {
-                    tool_feature_set_matches_cluster = true;
-                    true
-                } else {
-                    false
-                };
-                let software_versions: Vec<_> = feature_set_info
-                    .software_versions
-                    .iter()
-                    .map(ToString::to_string)
-                    .collect();
-                let software_versions = software_versions.join(", ");
-                let feature_set = if feature_set_info.feature_set == 0 {
-                    "unknown".to_string()
-                } else {
-                    feature_set_info.feature_set.to_string()
-                };
-                let stake_percent = format!("{:.2}%", feature_set_info.stake_percent);
-                let rpc_percent = format!("{:.2}%", feature_set_info.rpc_percent);
-
-                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());
-
-                (
-                    software_versions,
-                    feature_set,
-                    stake_percent,
-                    rpc_percent,
-                    me,
-                )
-            })
-            .collect();
-
-        if !tool_feature_set_matches_cluster {
-            writeln!(
-                f,
-                "\n{}",
-                style("To activate features the tool and cluster feature sets must match, select a tool version that matches the cluster")
-                    .bold())?;
-        } else {
-            if !self.stake_allowed {
-                write!(
-                    f,
-                    "\n{}",
-                    style("To activate features the stake must be >= 95%")
-                        .bold()
-                        .red()
-                )?;
-            }
-            if !self.rpc_allowed {
-                write!(
-                    f,
-                    "\n{}",
-                    style("To activate features the RPC nodes must be >= 95%")
-                        .bold()
-                        .red()
-                )?;
-            }
-        }
-        writeln!(
-            f,
-            "\n\n{}",
-            style(format!("Tool Feature Set: {}", self.tool_feature_set)).bold()
-        )?;
-        writeln!(
-            f,
-            "{}",
-            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(),
-        )?;
-        for (software_versions, feature_set, stake_percent, rpc_percent, me) in feature_sets {
-            writeln!(
-                f,
-                "{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 { "" },
-            )?;
-        }
-        writeln!(f)
-    }
-}
-
-impl QuietDisplay for CliClusterFeatureSets {}
-impl VerboseDisplay for CliClusterFeatureSets {}
-
-#[derive(Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct CliFeatureSet {
-    software_versions: Vec<CliVersion>,
-    feature_set: u32,
-    stake_percent: f64,
-    rpc_percent: f32,
-}
-
-#[derive(Eq, PartialEq, Ord, PartialOrd)]
-struct CliVersion(Option<semver::Version>);
-
-impl fmt::Display for CliVersion {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        let s = match &self.0 {
-            None => "unknown".to_string(),
-            Some(version) => version.to_string(),
-        };
-        write!(f, "{}", s)
-    }
-}
-
-impl FromStr for CliVersion {
-    type Err = semver::Error;
-    fn from_str(s: &str) -> Result<Self, Self::Err> {
-        let version_option = if s == "unknown" {
-            None
-        } else {
-            Some(semver::Version::from_str(s)?)
-        };
-        Ok(CliVersion(version_option))
-    }
-}
-
-impl Serialize for CliVersion {
-    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-    where
-        S: Serializer,
-    {
-        serializer.serialize_str(&self.to_string())
-    }
-}
-
-impl<'de> Deserialize<'de> for CliVersion {
-    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
-    where
-        D: Deserializer<'de>,
-    {
-        let s: &str = Deserialize::deserialize(deserializer)?;
-        CliVersion::from_str(s).map_err(serde::de::Error::custom)
-    }
-}
-
 pub trait FeatureSubCommands {
     fn feature_subcommands(self) -> Self;
 }
@@ -560,10 +328,7 @@ fn feature_set_stats(rpc_client: &RpcClient) -> Result<FeatureSetStats, ClientEr
 }
 
 // Feature activation is only allowed when 95% of the active stake is on the current feature set
-fn feature_activation_allowed(
-    rpc_client: &RpcClient,
-    quiet: bool,
-) -> Result<(bool, Option<CliClusterFeatureSets>), ClientError> {
+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)?;
@@ -579,43 +344,54 @@ fn feature_activation_allowed(
         )
         .unwrap_or((false, false));
 
-    let cluster_feature_sets = if quiet {
-        None
-    } else {
-        let mut feature_sets = feature_set_stats
-            .into_iter()
-            .map(
-                |(
-                    feature_set,
-                    FeatureSetStatsEntry {
-                        stake_percent,
-                        rpc_nodes_percent: rpc_percent,
-                        software_versions,
-                    },
-                )| {
-                    CliFeatureSet {
-                        software_versions: software_versions.into_iter().map(CliVersion).collect(),
-                        feature_set,
-                        stake_percent,
-                        rpc_percent,
-                    }
-                },
-            )
-            .collect::<Vec<_>>();
-        feature_sets.sort_by(|l, r| {
-            match l.software_versions[0]
-                .cmp(&r.software_versions[0])
+    if !stake_allowed && !rpc_allowed && !quiet {
+        if feature_set_stats.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.stake_percent)
+                        .partial_cmp(&r.1.stake_percent)
                         .unwrap()
                         .reverse()
                     {
                         Ordering::Equal => {
-                            l.rpc_percent.partial_cmp(&r.rpc_percent).unwrap().reverse()
+                            l.1.rpc_nodes_percent
+                                .partial_cmp(&r.1.rpc_nodes_percent)
+                                .unwrap()
+                                .reverse()
                         }
                         o => o,
                     }
@@ -623,15 +399,96 @@ fn feature_activation_allowed(
                 o => o,
             }
         });
-        Some(CliClusterFeatureSets {
-            tool_feature_set: my_feature_set,
-            feature_sets,
-            stake_allowed,
-            rpc_allowed,
-        })
-    };
 
-    Ok((stake_allowed && rpc_allowed, cluster_feature_sets))
+        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(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(),
+        );
+        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!();
+    }
+
+    Ok(stake_allowed && rpc_allowed)
 }
 
 fn status_from_account(account: Account) -> Option<CliFeatureStatus> {
@@ -691,14 +548,10 @@ fn process_status(
         });
     }
 
-    features.sort_unstable();
-
-    let (feature_activation_allowed, cluster_feature_sets) =
-        feature_activation_allowed(rpc_client, features.len() <= 1)?;
+    let feature_activation_allowed = feature_activation_allowed(rpc_client, features.len() <= 1)?;
     let feature_set = CliFeatures {
         features,
         feature_activation_allowed,
-        cluster_feature_sets,
         inactive,
     };
     Ok(config.output_format.formatted_string(&feature_set))
@@ -722,7 +575,7 @@ fn process_activate(
         }
     }
 
-    if !feature_activation_allowed(rpc_client, false)?.0 {
+    if !feature_activation_allowed(rpc_client, false)? {
         match force {
         ForceActivation::Almost =>
             return Err("Add force argument once more to override the sanity check to force feature activation ".into()),

cli/src/inflation.rs

@@ -1,19 +1,17 @@
-use {
-    crate::cli::{CliCommand, CliCommandInfo, CliConfig, CliError, ProcessResult},
-    clap::{App, Arg, ArgMatches, SubCommand},
-    solana_clap_utils::{
-        input_parsers::{pubkeys_of, value_of},
-        input_validators::is_valid_pubkey,
-        keypair::*,
-    },
-    solana_cli_output::{
-        CliEpochRewardshMetadata, CliInflation, CliKeyedEpochReward, CliKeyedEpochRewards,
-    },
-    solana_client::rpc_client::RpcClient,
-    solana_remote_wallet::remote_wallet::RemoteWalletManager,
-    solana_sdk::{clock::Epoch, pubkey::Pubkey},
-    std::sync::Arc,
+use crate::cli::{CliCommand, CliCommandInfo, CliConfig, CliError, ProcessResult};
+use clap::{App, Arg, ArgMatches, SubCommand};
+use solana_clap_utils::{
+    input_parsers::{pubkeys_of, value_of},
+    input_validators::is_valid_pubkey,
+    keypair::*,
 };
+use solana_cli_output::{
+    CliEpochRewardshMetadata, CliInflation, CliKeyedEpochReward, CliKeyedEpochRewards,
+};
+use solana_client::rpc_client::RpcClient;
+use solana_remote_wallet::remote_wallet::RemoteWalletManager;
+use solana_sdk::{clock::Epoch, pubkey::Pubkey};
+use std::sync::Arc;
 
 #[derive(Debug, PartialEq)]
 pub enum InflationCliCommand {

cli/src/main.rs

@@ -1,21 +1,19 @@
-use {
-    clap::{crate_description, crate_name, value_t_or_exit, ArgMatches},
-    console::style,
-    solana_clap_utils::{
-        input_validators::normalize_to_url_if_moniker,
-        keypair::{CliSigners, DefaultSigner},
-        DisplayError,
-    },
-    solana_cli::{
-        clap_app::get_clap_app,
-        cli::{parse_command, process_command, CliCommandInfo, CliConfig, SettingType},
-    },
-    solana_cli_config::Config,
-    solana_cli_output::{display::println_name_value, OutputFormat},
-    solana_client::rpc_config::RpcSendTransactionConfig,
-    solana_remote_wallet::remote_wallet::RemoteWalletManager,
-    std::{collections::HashMap, error, path::PathBuf, sync::Arc, time::Duration},
+use clap::{crate_description, crate_name, value_t_or_exit, ArgMatches};
+use console::style;
+use solana_clap_utils::{
+    input_validators::normalize_to_url_if_moniker,
+    keypair::{CliSigners, DefaultSigner},
+    DisplayError,
 };
+use solana_cli::{
+    clap_app::get_clap_app,
+    cli::{parse_command, process_command, CliCommandInfo, CliConfig, SettingType},
+};
+use solana_cli_config::Config;
+use solana_cli_output::{display::println_name_value, OutputFormat};
+use solana_client::rpc_config::RpcSendTransactionConfig;
+use solana_remote_wallet::remote_wallet::RemoteWalletManager;
+use std::{collections::HashMap, error, path::PathBuf, sync::Arc, time::Duration};
 
 pub fn println_name_value_or(name: &str, value: &str, setting_type: SettingType) {
     let description = match setting_type {

cli/src/memo.rs

@@ -1,7 +1,6 @@
-use {
-    solana_sdk::{instruction::Instruction, pubkey::Pubkey},
-    spl_memo::id,
-};
+use solana_sdk::instruction::Instruction;
+use solana_sdk::pubkey::Pubkey;
+use spl_memo::id;
 
 pub trait WithMemo {
     fn with_memo<T: AsRef<str>>(self, memo: Option<T>) -> Self;

cli/src/nonce.rs

@@ -1,43 +1,41 @@
-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,
-        },
-        feature::get_feature_is_active,
-        memo::WithMemo,
-        spend_utils::{resolve_spend_tx_and_check_account_balance, SpendAmount},
+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,
     },
-    clap::{App, Arg, ArgMatches, SubCommand},
-    solana_clap_utils::{
-        input_parsers::*,
-        input_validators::*,
-        keypair::{DefaultSigner, SignerIndex},
-        memo::{memo_arg, MEMO_ARG},
-        nonce::*,
-    },
-    solana_cli_output::CliNonceAccount,
-    solana_client::{nonce_utils::*, rpc_client::RpcClient},
-    solana_remote_wallet::remote_wallet::RemoteWalletManager,
-    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,
-        },
-        system_program,
-        transaction::{Transaction, TransactionError},
-    },
-    std::sync::Arc,
+    feature::get_feature_is_active,
+    memo::WithMemo,
+    spend_utils::{resolve_spend_tx_and_check_account_balance, SpendAmount},
 };
+use clap::{App, Arg, ArgMatches, SubCommand};
+use solana_clap_utils::{
+    input_parsers::*,
+    input_validators::*,
+    keypair::{DefaultSigner, SignerIndex},
+    memo::{memo_arg, MEMO_ARG},
+    nonce::*,
+};
+use solana_cli_output::CliNonceAccount;
+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,
+    },
+    system_program,
+    transaction::{Transaction, TransactionError},
+};
+use std::sync::Arc;
 
 pub trait NonceSubCommands {
     fn nonce_subcommands(self) -> Self;
@@ -652,21 +650,19 @@ pub fn process_withdraw_from_nonce_account(
 
 #[cfg(test)]
 mod tests {
-    use {
-        super::*,
-        crate::{clap_app::get_clap_app, cli::parse_command},
-        solana_sdk::{
-            account::Account,
-            account_utils::StateMut,
-            fee_calculator::FeeCalculator,
-            hash::hash,
-            nonce::{self, state::Versions, State},
-            nonce_account,
-            signature::{read_keypair_file, write_keypair, Keypair, Signer},
-            system_program,
-        },
-        tempfile::NamedTempFile,
+    use super::*;
+    use crate::{clap_app::get_clap_app, cli::parse_command};
+    use solana_sdk::{
+        account::Account,
+        account_utils::StateMut,
+        fee_calculator::FeeCalculator,
+        hash::hash,
+        nonce::{self, state::Versions, State},
+        nonce_account,
+        signature::{read_keypair_file, write_keypair, Keypair, Signer},
+        system_program,
     };
+    use tempfile::NamedTempFile;
 
     fn make_tmp_file() -> (String, NamedTempFile) {
         let tmp_file = NamedTempFile::new().unwrap();

cli/src/program.rs

@@ -1,57 +1,66 @@
-use {
-    crate::{
-        checks::*,
-        cli::{
-            log_instruction_custom_error, CliCommand, CliCommandInfo, CliConfig, CliError,
-            ProcessResult,
-        },
-    },
-    bip39::{Language, Mnemonic, MnemonicType, Seed},
-    clap::{App, AppSettings, Arg, ArgMatches, SubCommand},
-    log::*,
-    solana_account_decoder::{UiAccountEncoding, UiDataSliceConfig},
-    solana_bpf_loader_program::{syscalls::register_syscalls, BpfError, ThisInstructionMeter},
-    solana_clap_utils::{self, input_parsers::*, input_validators::*, keypair::*},
-    solana_cli_output::{
-        CliProgram, CliProgramAccountType, CliProgramAuthority, CliProgramBuffer, CliProgramId,
-        CliUpgradeableBuffer, CliUpgradeableBuffers, CliUpgradeableProgram,
-        CliUpgradeableProgramClosed, CliUpgradeablePrograms,
-    },
-    solana_client::{
-        client_error::ClientErrorKind,
-        rpc_client::RpcClient,
-        rpc_config::{RpcAccountInfoConfig, RpcProgramAccountsConfig, RpcSendTransactionConfig},
-        rpc_filter::{Memcmp, MemcmpEncodedBytes, RpcFilterType},
-        tpu_client::{TpuClient, TpuClientConfig},
-    },
-    solana_rbpf::{elf::Executable, verifier, vm::Config},
-    solana_remote_wallet::remote_wallet::RemoteWalletManager,
-    solana_sdk::{
-        account::Account,
-        account_utils::StateMut,
-        bpf_loader, bpf_loader_deprecated,
-        bpf_loader_upgradeable::{self, UpgradeableLoaderState},
-        instruction::{Instruction, InstructionError},
-        loader_instruction,
-        message::Message,
-        native_token::Sol,
-        packet::PACKET_DATA_SIZE,
-        process_instruction::MockInvokeContext,
-        pubkey::Pubkey,
-        signature::{keypair_from_seed, read_keypair_file, Keypair, Signature, Signer},
-        system_instruction::{self, SystemError},
-        system_program,
-        transaction::{Transaction, TransactionError},
-    },
-    std::{
-        fs::File,
-        io::{Read, Write},
-        mem::size_of,
-        path::PathBuf,
-        str::FromStr,
-        sync::Arc,
+use crate::{
+    checks::*,
+    cli::{
+        log_instruction_custom_error, CliCommand, CliCommandInfo, CliConfig, CliError,
+        ProcessResult,
     },
 };
+use bip39::{Language, Mnemonic, MnemonicType, Seed};
+use clap::{App, AppSettings, Arg, ArgMatches, SubCommand};
+use log::*;
+use solana_account_decoder::{UiAccountEncoding, UiDataSliceConfig};
+use solana_bpf_loader_program::{bpf_verifier, BpfError, ThisInstructionMeter};
+use solana_clap_utils::{self, input_parsers::*, input_validators::*, keypair::*};
+use solana_cli_output::{
+    display::new_spinner_progress_bar, CliProgram, CliProgramAccountType, CliProgramAuthority,
+    CliProgramBuffer, CliProgramId, CliUpgradeableBuffer, CliUpgradeableBuffers,
+    CliUpgradeableProgram, CliUpgradeableProgramClosed, CliUpgradeablePrograms,
+};
+use solana_client::{
+    client_error::ClientErrorKind,
+    rpc_client::RpcClient,
+    rpc_config::RpcSendTransactionConfig,
+    rpc_config::{RpcAccountInfoConfig, RpcProgramAccountsConfig},
+    rpc_filter::{Memcmp, MemcmpEncodedBytes, RpcFilterType},
+    rpc_request::MAX_GET_SIGNATURE_STATUSES_QUERY_ITEMS,
+    rpc_response::Fees,
+    tpu_client::{TpuClient, TpuClientConfig},
+};
+use solana_rbpf::vm::{Config, Executable};
+use solana_remote_wallet::remote_wallet::RemoteWalletManager;
+use solana_sdk::{
+    account::Account,
+    account_utils::StateMut,
+    bpf_loader, bpf_loader_deprecated,
+    bpf_loader_upgradeable::{self, UpgradeableLoaderState},
+    commitment_config::CommitmentConfig,
+    instruction::Instruction,
+    instruction::InstructionError,
+    loader_instruction,
+    message::Message,
+    native_token::Sol,
+    packet::PACKET_DATA_SIZE,
+    pubkey::Pubkey,
+    signature::{keypair_from_seed, read_keypair_file, Keypair, Signature, Signer},
+    signers::Signers,
+    system_instruction::{self, SystemError},
+    system_program,
+    transaction::Transaction,
+    transaction::TransactionError,
+};
+use solana_transaction_status::TransactionConfirmationStatus;
+use std::{
+    collections::HashMap,
+    error,
+    fs::File,
+    io::{Read, Write},
+    mem::size_of,
+    path::PathBuf,
+    str::FromStr,
+    sync::Arc,
+    thread::sleep,
+    time::Duration,
+};
 
 #[derive(Debug, PartialEq)]
 pub enum ProgramCliCommand {
@@ -376,7 +385,6 @@ impl ProgramSubCommands for App<'_, '_> {
         .subcommand(
             SubCommand::with_name("deploy")
                 .about("Deploy a program")
-                .setting(AppSettings::Hidden)
                 .arg(
                     Arg::with_name("program_location")
                         .index(1)
@@ -1983,20 +1991,12 @@ fn read_and_verify_elf(program_location: &str) -> Result<Vec<u8>, Box<dyn std::e
     let mut program_data = Vec::new();
     file.read_to_end(&mut program_data)
         .map_err(|err| format!("Unable to read program file: {}", err))?;
-    let mut invoke_context = MockInvokeContext::new(vec![]);
 
     // Verify the program
-    Executable::<BpfError, ThisInstructionMeter>::from_elf(
+    <dyn Executable<BpfError, ThisInstructionMeter>>::from_elf(
         &program_data,
-        Some(verifier::check),
-        Config {
-            reject_unresolved_syscalls: true,
-            verify_mul64_imm_nonzero: false,
-            verify_shift32_imm: true,
-            reject_section_virtual_address_file_offset_mismatch: true,
-            ..Config::default()
-        },
-        register_syscalls(&mut invoke_context).unwrap(),
+        Some(|x| bpf_verifier::check(x)),
+        Config::default(),
     )
     .map_err(|err| format!("ELF error: {}", err))?;
 
@@ -2115,29 +2115,29 @@ fn send_deploy_messages(
     if let Some(write_messages) = write_messages {
         if let Some(write_signer) = write_signer {
             trace!("Writing program data");
-            let tpu_client = TpuClient::new(
+            let Fees {
+                blockhash,
+                last_valid_block_height,
+                ..
+            } = rpc_client
+                .get_fees_with_commitment(config.commitment)?
+                .value;
+            let mut write_transactions = vec![];
+            for message in write_messages.iter() {
+                let mut tx = Transaction::new_unsigned(message.clone());
+                tx.try_sign(&[payer_signer, write_signer], blockhash)?;
+                write_transactions.push(tx);
+            }
+
+            send_and_confirm_transactions_with_spinner(
                 rpc_client.clone(),
                 &config.websocket_url,
-                TpuClientConfig::default(),
-            )?;
-            let transaction_errors = tpu_client
-                .send_and_confirm_messages_with_spinner(
-                    write_messages,
-                    &[payer_signer, write_signer],
-                )
-                .map_err(|err| format!("Data writes to account failed: {}", err))?
-                .into_iter()
-                .flatten()
-                .collect::<Vec<_>>();
-
-            if !transaction_errors.is_empty() {
-                for transaction_error in &transaction_errors {
-                    error!("{:?}", transaction_error);
-                }
-                return Err(
-                    format!("{} write transactions failed", transaction_errors.len()).into(),
-                );
-            }
+                write_transactions,
+                &[payer_signer, write_signer],
+                config.commitment,
+                last_valid_block_height,
+            )
+            .map_err(|err| format!("Data writes to account failed: {}", err))?;
         }
     }
 
@@ -2189,8 +2189,9 @@ fn report_ephemeral_mnemonic(words: usize, mnemonic: bip39::Mnemonic) {
         words
     );
     eprintln!("{}\n{}\n{}", divider, phrase, divider);
-    eprintln!("To resume a deploy, pass the recovered keypair as the");
-    eprintln!("[BUFFER_SIGNER] to `solana program deploy` or `solana write-buffer'.");
+    eprintln!("To resume a deploy, pass the recovered keypair as");
+    eprintln!("the [PROGRAM_ADDRESS_SIGNER] argument to `solana deploy` or");
+    eprintln!("as the [BUFFER_SIGNER] to `solana program deploy` or `solana write-buffer'.");
     eprintln!("Or to recover the account's lamports, pass it as the");
     eprintln!(
         "[BUFFER_ACCOUNT_ADDRESS] argument to `solana program close`.\n{}",
@@ -2198,18 +2199,144 @@ fn report_ephemeral_mnemonic(words: usize, mnemonic: bip39::Mnemonic) {
     );
 }
 
+fn send_and_confirm_transactions_with_spinner<T: Signers>(
+    rpc_client: Arc<RpcClient>,
+    websocket_url: &str,
+    mut transactions: Vec<Transaction>,
+    signer_keys: &T,
+    commitment: CommitmentConfig,
+    mut last_valid_block_height: u64,
+) -> Result<(), Box<dyn error::Error>> {
+    let progress_bar = new_spinner_progress_bar();
+    let mut send_retries = 5;
+
+    progress_bar.set_message("Finding leader nodes...");
+    let tpu_client = TpuClient::new(
+        rpc_client.clone(),
+        websocket_url,
+        TpuClientConfig::default(),
+    )?;
+    loop {
+        // Send all transactions
+        let mut pending_transactions = HashMap::new();
+        let num_transactions = transactions.len();
+        for transaction in transactions {
+            if !tpu_client.send_transaction(&transaction) {
+                let _result = rpc_client
+                    .send_transaction_with_config(
+                        &transaction,
+                        RpcSendTransactionConfig {
+                            preflight_commitment: Some(commitment.commitment),
+                            ..RpcSendTransactionConfig::default()
+                        },
+                    )
+                    .ok();
+            }
+            pending_transactions.insert(transaction.signatures[0], transaction);
+            progress_bar.set_message(&format!(
+                "[{}/{}] Transactions sent",
+                pending_transactions.len(),
+                num_transactions
+            ));
+
+            // Throttle transactions to about 100 TPS
+            sleep(Duration::from_millis(10));
+        }
+
+        // Collect statuses for all the transactions, drop those that are confirmed
+        loop {
+            let mut block_height = 0;
+            let pending_signatures = pending_transactions.keys().cloned().collect::<Vec<_>>();
+            for pending_signatures_chunk in
+                pending_signatures.chunks(MAX_GET_SIGNATURE_STATUSES_QUERY_ITEMS)
+            {
+                if let Ok(result) = rpc_client.get_signature_statuses(pending_signatures_chunk) {
+                    let statuses = result.value;
+                    for (signature, status) in
+                        pending_signatures_chunk.iter().zip(statuses.into_iter())
+                    {
+                        if let Some(status) = status {
+                            if let Some(confirmation_status) = &status.confirmation_status {
+                                if *confirmation_status != TransactionConfirmationStatus::Processed
+                                {
+                                    let _ = pending_transactions.remove(signature);
+                                }
+                            } else if status.confirmations.is_none()
+                                || status.confirmations.unwrap() > 1
+                            {
+                                let _ = pending_transactions.remove(signature);
+                            }
+                        }
+                    }
+                }
+
+                block_height = rpc_client.get_block_height()?;
+                progress_bar.set_message(&format!(
+                    "[{}/{}] Transactions confirmed. Retrying in {} blocks",
+                    num_transactions - pending_transactions.len(),
+                    num_transactions,
+                    last_valid_block_height.saturating_sub(block_height)
+                ));
+            }
+
+            if pending_transactions.is_empty() {
+                return Ok(());
+            }
+
+            if block_height > last_valid_block_height {
+                break;
+            }
+
+            for transaction in pending_transactions.values() {
+                if !tpu_client.send_transaction(transaction) {
+                    let _result = rpc_client
+                        .send_transaction_with_config(
+                            transaction,
+                            RpcSendTransactionConfig {
+                                preflight_commitment: Some(commitment.commitment),
+                                ..RpcSendTransactionConfig::default()
+                            },
+                        )
+                        .ok();
+                }
+            }
+
+            if cfg!(not(test)) {
+                // Retry twice a second
+                sleep(Duration::from_millis(500));
+            }
+        }
+
+        if send_retries == 0 {
+            return Err("Transactions failed".into());
+        }
+        send_retries -= 1;
+
+        // Re-sign any failed transactions with a new blockhash and retry
+        let Fees {
+            blockhash,
+            last_valid_block_height: new_last_valid_block_height,
+            ..
+        } = rpc_client.get_fees_with_commitment(commitment)?.value;
+        last_valid_block_height = new_last_valid_block_height;
+        transactions = vec![];
+        for (_, mut transaction) in pending_transactions.into_iter() {
+            transaction.try_sign(signer_keys, blockhash)?;
+            transactions.push(transaction);
+        }
+    }
+}
+
 #[cfg(test)]
 mod tests {
-    use {
-        super::*,
-        crate::{
-            clap_app::get_clap_app,
-            cli::{parse_command, process_command},
-        },
-        serde_json::Value,
-        solana_cli_output::OutputFormat,
-        solana_sdk::signature::write_keypair_file,
+    use super::*;
+    use crate::{
+        clap_app::get_clap_app,
+        cli::{parse_command, process_command},
     };
+    use serde_json::Value;
+    use solana_cli_output::OutputFormat;
+    use solana_sdk::signature::write_keypair_file;
 
     fn make_tmp_path(name: &str) -> String {
         let out_dir = std::env::var("FARF_DIR").unwrap_or_else(|_| "farf".to_string());

cli/src/spend_utils.rs

@@ -1,22 +1,19 @@
-use {
-    crate::{
-        checks::{calculate_fee, check_account_for_balance_with_commitment},
-        cli::CliError,
-    },
-    clap::ArgMatches,
-    solana_clap_utils::{input_parsers::lamports_of_sol, offline::SIGN_ONLY_ARG},
-    solana_client::rpc_client::RpcClient,
-    solana_sdk::{
-        commitment_config::CommitmentConfig, fee_calculator::FeeCalculator, message::Message,
-        native_token::lamports_to_sol, pubkey::Pubkey,
-    },
+use crate::{
+    checks::{calculate_fee, check_account_for_balance_with_commitment},
+    cli::CliError,
+};
+use clap::ArgMatches;
+use solana_clap_utils::{input_parsers::lamports_of_sol, offline::SIGN_ONLY_ARG};
+use solana_client::rpc_client::RpcClient;
+use solana_sdk::{
+    commitment_config::CommitmentConfig, fee_calculator::FeeCalculator, message::Message,
+    native_token::lamports_to_sol, pubkey::Pubkey,
 };
 
 #[derive(Debug, PartialEq, Clone, Copy)]
 pub enum SpendAmount {
     All,
     Some(u64),
-    RentExempt,
 }
 
 impl Default for SpendAmount {
@@ -90,7 +87,6 @@ where
             0,
             from_pubkey,
             fee_pubkey,
-            0,
             build_message,
         );
         Ok((message, spend))
@@ -98,19 +94,12 @@ where
         let from_balance = rpc_client
             .get_balance_with_commitment(from_pubkey, commitment)?
             .value;
-        let from_rent_exempt_minimum = if amount == SpendAmount::RentExempt {
-            let data = rpc_client.get_account_data(from_pubkey)?;
-            rpc_client.get_minimum_balance_for_rent_exemption(data.len())?
-        } else {
-            0
-        };
         let (message, SpendAndFee { spend, fee }) = resolve_spend_message(
             amount,
             fee_calculator,
             from_balance,
             from_pubkey,
             fee_pubkey,
-            from_rent_exempt_minimum,
             build_message,
         );
         if from_pubkey == fee_pubkey {
@@ -146,7 +135,6 @@ fn resolve_spend_message<F>(
     from_balance: u64,
     from_pubkey: &Pubkey,
     fee_pubkey: &Pubkey,
-    from_rent_exempt_minimum: u64,
     build_message: F,
 ) -> (Message, SpendAndFee)
 where
@@ -180,22 +168,5 @@ where
                 },
             )
         }
-        SpendAmount::RentExempt => {
-            let dummy_message = build_message(0);
-            let fee = calculate_fee(fee_calculator, &[&dummy_message]);
-            let mut lamports = if from_pubkey == fee_pubkey {
-                from_balance.saturating_sub(fee)
-            } else {
-                from_balance
-            };
-            lamports = lamports.saturating_sub(from_rent_exempt_minimum);
-            (
-                build_message(lamports),
-                SpendAndFee {
-                    spend: lamports,
-                    fee,
-                },
-            )
-        }
     }
 }

cli/src/stake.rs

@@ -1,55 +1,53 @@
-use {
-    crate::{
-        checks::{check_account_for_fee_with_commitment, check_unique_pubkeys},
-        cli::{
-            log_instruction_custom_error, CliCommand, CliCommandInfo, CliConfig, CliError,
-            ProcessResult,
-        },
-        memo::WithMemo,
-        nonce::check_nonce_account,
-        spend_utils::{resolve_spend_tx_and_check_account_balances, SpendAmount},
+use crate::{
+    checks::{check_account_for_fee_with_commitment, check_unique_pubkeys},
+    cli::{
+        log_instruction_custom_error, CliCommand, CliCommandInfo, CliConfig, CliError,
+        ProcessResult,
     },
-    clap::{value_t, App, Arg, ArgGroup, ArgMatches, SubCommand},
-    solana_clap_utils::{
-        fee_payer::{fee_payer_arg, FEE_PAYER_ARG},
-        input_parsers::*,
-        input_validators::*,
-        keypair::{DefaultSigner, SignerIndex},
-        memo::{memo_arg, MEMO_ARG},
-        nonce::*,
-        offline::*,
-        ArgConstant,
-    },
-    solana_cli_output::{
-        return_signers_with_config, CliEpochReward, CliStakeHistory, CliStakeHistoryEntry,
-        CliStakeState, CliStakeType, OutputFormat, ReturnSignersConfig,
-    },
-    solana_client::{
-        blockhash_query::BlockhashQuery, nonce_utils, rpc_client::RpcClient,
-        rpc_request::DELINQUENT_VALIDATOR_SLOT_DISTANCE, rpc_response::RpcInflationReward,
-    },
-    solana_remote_wallet::remote_wallet::RemoteWalletManager,
-    solana_sdk::{
-        account::from_account,
-        account_utils::StateMut,
-        clock::{Clock, UnixTimestamp, SECONDS_PER_DAY},
-        commitment_config::CommitmentConfig,
-        epoch_schedule::EpochSchedule,
-        message::Message,
-        pubkey::Pubkey,
-        stake::{
-            self,
-            instruction::{self as stake_instruction, LockupArgs, StakeError},
-            state::{Authorized, Lockup, Meta, StakeActivationStatus, StakeAuthorize, StakeState},
-        },
-        stake_history::StakeHistory,
-        system_instruction::SystemError,
-        sysvar::{clock, stake_history},
-        transaction::Transaction,
-    },
-    solana_vote_program::vote_state::VoteState,
-    std::{ops::Deref, sync::Arc},
+    memo::WithMemo,
+    nonce::check_nonce_account,
+    spend_utils::{resolve_spend_tx_and_check_account_balances, SpendAmount},
 };
+use clap::{value_t, App, Arg, ArgGroup, ArgMatches, SubCommand};
+use solana_clap_utils::{
+    fee_payer::{fee_payer_arg, FEE_PAYER_ARG},
+    input_parsers::*,
+    input_validators::*,
+    keypair::{DefaultSigner, SignerIndex},
+    memo::{memo_arg, MEMO_ARG},
+    nonce::*,
+    offline::*,
+    ArgConstant,
+};
+use solana_cli_output::{
+    return_signers_with_config, CliEpochReward, CliStakeHistory, CliStakeHistoryEntry,
+    CliStakeState, CliStakeType, OutputFormat, ReturnSignersConfig,
+};
+use solana_client::{
+    blockhash_query::BlockhashQuery, nonce_utils, rpc_client::RpcClient,
+    rpc_request::DELINQUENT_VALIDATOR_SLOT_DISTANCE, rpc_response::RpcInflationReward,
+};
+use solana_remote_wallet::remote_wallet::RemoteWalletManager;
+use solana_sdk::{
+    account::from_account,
+    account_utils::StateMut,
+    clock::{Clock, UnixTimestamp, SECONDS_PER_DAY},
+    commitment_config::CommitmentConfig,
+    epoch_schedule::EpochSchedule,
+    message::Message,
+    pubkey::Pubkey,
+    stake::{
+        self,
+        instruction::{self as stake_instruction, LockupArgs, StakeError},
+        state::{Authorized, Lockup, Meta, StakeActivationStatus, StakeAuthorize, StakeState},
+    },
+    stake_history::StakeHistory,
+    system_instruction::SystemError,
+    sysvar::{clock, stake_history},
+    transaction::Transaction,
+};
+use solana_vote_program::vote_state::VoteState;
+use std::{ops::Deref, sync::Arc};
 
 pub const STAKE_AUTHORITY_ARG: ArgConstant<'static> = ArgConstant {
     name: "stake_authority",
@@ -2440,18 +2438,16 @@ pub fn process_delegate_stake(
 
 #[cfg(test)]
 mod tests {
-    use {
-        super::*,
-        crate::{clap_app::get_clap_app, cli::parse_command},
-        solana_client::blockhash_query,
-        solana_sdk::{
-            hash::Hash,
-            signature::{
-                keypair_from_seed, read_keypair_file, write_keypair, Keypair, Presigner, Signer,
-            },
+    use super::*;
+    use crate::{clap_app::get_clap_app, cli::parse_command};
+    use solana_client::blockhash_query;
+    use solana_sdk::{
+        hash::Hash,
+        signature::{
+            keypair_from_seed, read_keypair_file, write_keypair, Keypair, Presigner, Signer,
         },
-        tempfile::NamedTempFile,
     };
+    use tempfile::NamedTempFile;
 
     fn make_tmp_file() -> (String, NamedTempFile) {
         let tmp_file = NamedTempFile::new().unwrap();

cli/src/test_utils.rs

@@ -1,8 +1,6 @@
-use {
-    solana_client::rpc_client::RpcClient,
-    solana_sdk::{clock::DEFAULT_MS_PER_SLOT, commitment_config::CommitmentConfig, pubkey::Pubkey},
-    std::{thread::sleep, time::Duration},
-};
+use solana_client::rpc_client::RpcClient;
+use solana_sdk::{clock::DEFAULT_MS_PER_SLOT, commitment_config::CommitmentConfig, pubkey::Pubkey};
+use std::{thread::sleep, time::Duration};
 
 pub fn check_recent_balance(expected_balance: u64, client: &RpcClient, pubkey: &Pubkey) {
     (0..5).for_each(|tries| {

cli/src/validator_info.rs

@@ -1,33 +1,31 @@
-use {
-    crate::{
-        cli::{CliCommand, CliCommandInfo, CliConfig, CliError, ProcessResult},
-        spend_utils::{resolve_spend_tx_and_check_account_balance, SpendAmount},
-    },
-    bincode::deserialize,
-    clap::{App, AppSettings, Arg, ArgMatches, SubCommand},
-    reqwest::blocking::Client,
-    serde_json::{Map, Value},
-    solana_account_decoder::validator_info::{
-        self, ValidatorInfo, MAX_LONG_FIELD_LENGTH, MAX_SHORT_FIELD_LENGTH,
-    },
-    solana_clap_utils::{
-        input_parsers::pubkey_of,
-        input_validators::{is_pubkey, is_url},
-        keypair::DefaultSigner,
-    },
-    solana_cli_output::{CliValidatorInfo, CliValidatorInfoVec},
-    solana_client::rpc_client::RpcClient,
-    solana_config_program::{config_instruction, get_config_data, ConfigKeys, ConfigState},
-    solana_remote_wallet::remote_wallet::RemoteWalletManager,
-    solana_sdk::{
-        account::Account,
-        message::Message,
-        pubkey::Pubkey,
-        signature::{Keypair, Signer},
-        transaction::Transaction,
-    },
-    std::{error, sync::Arc},
+use crate::{
+    cli::{CliCommand, CliCommandInfo, CliConfig, CliError, ProcessResult},
+    spend_utils::{resolve_spend_tx_and_check_account_balance, SpendAmount},
 };
+use bincode::deserialize;
+use clap::{App, AppSettings, Arg, ArgMatches, SubCommand};
+use reqwest::blocking::Client;
+use serde_json::{Map, Value};
+use solana_account_decoder::validator_info::{
+    self, ValidatorInfo, MAX_LONG_FIELD_LENGTH, MAX_SHORT_FIELD_LENGTH,
+};
+use solana_clap_utils::{
+    input_parsers::pubkey_of,
+    input_validators::{is_pubkey, is_url},
+    keypair::DefaultSigner,
+};
+use solana_cli_output::{CliValidatorInfo, CliValidatorInfoVec};
+use solana_client::rpc_client::RpcClient;
+use solana_config_program::{config_instruction, get_config_data, ConfigKeys, ConfigState};
+use solana_remote_wallet::remote_wallet::RemoteWalletManager;
+use solana_sdk::{
+    account::Account,
+    message::Message,
+    pubkey::Pubkey,
+    signature::{Keypair, Signer},
+    transaction::Transaction,
+};
+use std::{error, sync::Arc};
 
 // Return an error if a validator details are longer than the max length.
 pub fn check_details_length(string: String) -> Result<(), String> {
@@ -409,12 +407,10 @@ pub fn process_get_validator_info(
 
 #[cfg(test)]
 mod tests {
-    use {
-        super::*,
-        crate::clap_app::get_clap_app,
-        bincode::{serialize, serialized_size},
-        serde_json::json,
-    };
+    use super::*;
+    use crate::clap_app::get_clap_app;
+    use bincode::{serialize, serialized_size};
+    use serde_json::json;
 
     #[test]
     fn test_check_url() {

cli/src/wallet.rs

@@ -1,47 +1,45 @@
-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 crate::{
+    cli::{
+        log_instruction_custom_error, request_and_confirm_airdrop, CliCommand, CliCommandInfo,
+        CliConfig, CliError, ProcessResult,
     },
-    clap::{value_t_or_exit, App, Arg, ArgMatches, SubCommand},
-    solana_account_decoder::{UiAccount, UiAccountEncoding},
-    solana_clap_utils::{
-        fee_payer::*,
-        input_parsers::*,
-        input_validators::*,
-        keypair::{DefaultSigner, SignerIndex},
-        memo::*,
-        nonce::*,
-        offline::*,
-    },
-    solana_cli_output::{
-        display::build_balance_message, return_signers_with_config, CliAccount,
-        CliSignatureVerificationStatus, CliTransaction, CliTransactionConfirmation, OutputFormat,
-        ReturnSignersConfig,
-    },
-    solana_client::{
-        blockhash_query::BlockhashQuery, nonce_utils, rpc_client::RpcClient,
-        rpc_config::RpcTransactionConfig, rpc_response::RpcKeyedAccount,
-    },
-    solana_remote_wallet::remote_wallet::RemoteWalletManager,
-    solana_sdk::{
-        commitment_config::CommitmentConfig,
-        message::Message,
-        pubkey::Pubkey,
-        signature::Signature,
-        stake,
-        system_instruction::{self, SystemError},
-        system_program,
-        transaction::Transaction,
-    },
-    solana_transaction_status::{EncodedTransaction, UiTransactionEncoding},
-    std::{fmt::Write as FmtWrite, fs::File, io::Write, sync::Arc},
+    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;

cli/tests/nonce.rs

@@ -1,26 +1,24 @@
-use {
-    solana_cli::{
-        cli::{process_command, request_and_confirm_airdrop, CliCommand, CliConfig},
-        spend_utils::SpendAmount,
-        test_utils::{check_ready, check_recent_balance},
-    },
-    solana_cli_output::{parse_sign_only_reply_string, OutputFormat},
-    solana_client::{
-        blockhash_query::{self, BlockhashQuery},
-        nonce_utils,
-        rpc_client::RpcClient,
-    },
-    solana_core::test_validator::TestValidator,
-    solana_faucet::faucet::run_local_faucet,
-    solana_sdk::{
-        commitment_config::CommitmentConfig,
-        hash::Hash,
-        pubkey::Pubkey,
-        signature::{keypair_from_seed, Keypair, Signer},
-        system_program,
-    },
-    solana_streamer::socket::SocketAddrSpace,
+use solana_cli::{
+    cli::{process_command, request_and_confirm_airdrop, CliCommand, CliConfig},
+    spend_utils::SpendAmount,
+    test_utils::{check_ready, check_recent_balance},
 };
+use solana_cli_output::{parse_sign_only_reply_string, OutputFormat};
+use solana_client::{
+    blockhash_query::{self, BlockhashQuery},
+    nonce_utils,
+    rpc_client::RpcClient,
+};
+use solana_core::test_validator::TestValidator;
+use solana_faucet::faucet::run_local_faucet;
+use solana_sdk::{
+    commitment_config::CommitmentConfig,
+    hash::Hash,
+    pubkey::Pubkey,
+    signature::{keypair_from_seed, Keypair, Signer},
+    system_program,
+};
+use solana_streamer::socket::SocketAddrSpace;
 
 #[test]
 fn test_nonce() {

cli/tests/program.rs

@@ -1,24 +1,22 @@
-use {
-    serde_json::Value,
-    solana_cli::{
-        cli::{process_command, CliCommand, CliConfig},
-        program::ProgramCliCommand,
-    },
-    solana_cli_output::OutputFormat,
-    solana_client::rpc_client::RpcClient,
-    solana_core::test_validator::TestValidator,
-    solana_faucet::faucet::run_local_faucet,
-    solana_sdk::{
-        account_utils::StateMut,
-        bpf_loader,
-        bpf_loader_upgradeable::{self, UpgradeableLoaderState},
-        commitment_config::CommitmentConfig,
-        pubkey::Pubkey,
-        signature::{Keypair, Signer},
-    },
-    solana_streamer::socket::SocketAddrSpace,
-    std::{env, fs::File, io::Read, path::PathBuf, str::FromStr},
+use serde_json::Value;
+use solana_cli::{
+    cli::{process_command, CliCommand, CliConfig},
+    program::ProgramCliCommand,
 };
+use solana_cli_output::OutputFormat;
+use solana_client::rpc_client::RpcClient;
+use solana_core::test_validator::TestValidator;
+use solana_faucet::faucet::run_local_faucet;
+use solana_sdk::{
+    account_utils::StateMut,
+    bpf_loader,
+    bpf_loader_upgradeable::{self, UpgradeableLoaderState},
+    commitment_config::CommitmentConfig,
+    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() {

cli/tests/request_airdrop.rs

@@ -1,14 +1,12 @@
-use {
-    solana_cli::cli::{process_command, CliCommand, CliConfig},
-    solana_client::rpc_client::RpcClient,
-    solana_core::test_validator::TestValidator,
-    solana_faucet::faucet::run_local_faucet,
-    solana_sdk::{
-        commitment_config::CommitmentConfig,
-        signature::{Keypair, Signer},
-    },
-    solana_streamer::socket::SocketAddrSpace,
+use solana_cli::cli::{process_command, CliCommand, CliConfig};
+use solana_client::rpc_client::RpcClient;
+use solana_core::test_validator::TestValidator;
+use solana_faucet::faucet::run_local_faucet;
+use solana_sdk::{
+    commitment_config::CommitmentConfig,
+    signature::{Keypair, Signer},
 };
+use solana_streamer::socket::SocketAddrSpace;
 
 #[test]
 fn test_cli_request_airdrop() {

cli/tests/stake.rs

@@ -1,32 +1,30 @@
-use {
-    solana_cli::{
-        cli::{process_command, request_and_confirm_airdrop, CliCommand, CliConfig},
-        spend_utils::SpendAmount,
-        stake::StakeAuthorizationIndexed,
-        test_utils::{check_ready, check_recent_balance},
-    },
-    solana_cli_output::{parse_sign_only_reply_string, OutputFormat},
-    solana_client::{
-        blockhash_query::{self, BlockhashQuery},
-        nonce_utils,
-        rpc_client::RpcClient,
-    },
-    solana_core::test_validator::TestValidator,
-    solana_faucet::faucet::run_local_faucet,
-    solana_sdk::{
-        account_utils::StateMut,
-        commitment_config::CommitmentConfig,
-        nonce::State as NonceState,
-        pubkey::Pubkey,
-        signature::{keypair_from_seed, Keypair, Signer},
-        stake::{
-            self,
-            instruction::LockupArgs,
-            state::{Lockup, StakeAuthorize, StakeState},
-        },
-    },
-    solana_streamer::socket::SocketAddrSpace,
+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};
+use solana_client::{
+    blockhash_query::{self, BlockhashQuery},
+    nonce_utils,
+    rpc_client::RpcClient,
+};
+use solana_core::test_validator::TestValidator;
+use solana_faucet::faucet::run_local_faucet;
+use solana_sdk::{
+    account_utils::StateMut,
+    commitment_config::CommitmentConfig,
+    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;
 
 #[test]
 fn test_stake_delegation_force() {
@@ -58,13 +56,7 @@ fn test_stake_delegation_force() {
         authorized_voter: None,
         authorized_withdrawer,
         commission: 0,
-        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,
     };
     process_command(&config).unwrap();