Merge remote-tracking branch 'origin/master' into docs-secp256k1

account-decoder/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "solana-account-decoder"
-version = "1.11.2"
+version = "1.11.3"
 description = "Solana account decoder"
 authors = ["Solana Maintainers <[email protected]>"]
 repository = "https://github.com/solana-labs/solana"
@@ -16,12 +16,12 @@ bincode = "1.3.3"
 bs58 = "0.4.0"
 bv = "0.11.1"
 lazy_static = "1.4.0"
-serde = "1.0.137"
+serde = "1.0.138"
 serde_derive = "1.0.103"
 serde_json = "1.0.81"
-solana-config-program = { path = "../programs/config", version = "=1.11.2" }
-solana-sdk = { path = "../sdk", version = "=1.11.2" }
-solana-vote-program = { path = "../programs/vote", version = "=1.11.2" }
+solana-config-program = { path = "../programs/config", version = "=1.11.3" }
+solana-sdk = { path = "../sdk", version = "=1.11.3" }
+solana-vote-program = { path = "../programs/vote", version = "=1.11.3" }
 spl-token = { version = "=3.3.0", features = ["no-entrypoint"] }
 spl-token-2022 = { version = "=0.3.0", features = ["no-entrypoint"] }
 thiserror = "1.0"

account-decoder/src/parse_account_data.rs

@@ -145,10 +145,7 @@ mod test {
         assert_eq!(parsed.program, "vote".to_string());
         assert_eq!(parsed.space, VoteState::size_of() as u64);
 
-        let nonce_data = Versions::new(
-            State::Initialized(Data::default()),
-            true, // separate_domains
-        );
+        let nonce_data = Versions::new(State::Initialized(Data::default()));
         let nonce_account_data = bincode::serialize(&nonce_data).unwrap();
         let parsed = parse_account_data(
             &account_pubkey,

account-decoder/src/parse_nonce.rs

@@ -57,10 +57,7 @@ mod test {
 
     #[test]
     fn test_parse_nonce() {
-        let nonce_data = Versions::new(
-            State::Initialized(Data::default()),
-            true, // separate_domains
-        );
+        let nonce_data = Versions::new(State::Initialized(Data::default()));
         let nonce_account_data = bincode::serialize(&nonce_data).unwrap();
         assert_eq!(
             parse_nonce(&nonce_account_data).unwrap(),

accounts-bench/Cargo.toml

@@ -2,7 +2,7 @@
 authors = ["Solana Maintainers <[email protected]>"]
 edition = "2021"
 name = "solana-accounts-bench"
-version = "1.11.2"
+version = "1.11.3"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
@@ -12,11 +12,11 @@ publish = false
 clap = "2.33.1"
 log = "0.4.17"
 rayon = "1.5.3"
-solana-logger = { path = "../logger", version = "=1.11.2" }
-solana-measure = { path = "../measure", version = "=1.11.2" }
-solana-runtime = { path = "../runtime", version = "=1.11.2" }
-solana-sdk = { path = "../sdk", version = "=1.11.2" }
-solana-version = { path = "../version", version = "=1.11.2" }
+solana-logger = { path = "../logger", version = "=1.11.3" }
+solana-measure = { path = "../measure", version = "=1.11.3" }
+solana-runtime = { path = "../runtime", version = "=1.11.3" }
+solana-sdk = { path = "../sdk", version = "=1.11.3" }
+solana-version = { path = "../version", version = "=1.11.3" }
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]

accounts-cluster-bench/Cargo.toml

@@ -2,7 +2,7 @@
 authors = ["Solana Maintainers <[email protected]>"]
 edition = "2021"
 name = "solana-accounts-cluster-bench"
-version = "1.11.2"
+version = "1.11.3"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
@@ -13,25 +13,25 @@ clap = "2.33.1"
 log = "0.4.17"
 rand = "0.7.0"
 rayon = "1.5.3"
-solana-account-decoder = { path = "../account-decoder", version = "=1.11.2" }
-solana-clap-utils = { path = "../clap-utils", version = "=1.11.2" }
-solana-client = { path = "../client", version = "=1.11.2" }
-solana-faucet = { path = "../faucet", version = "=1.11.2" }
-solana-gossip = { path = "../gossip", version = "=1.11.2" }
-solana-logger = { path = "../logger", version = "=1.11.2" }
-solana-measure = { path = "../measure", version = "=1.11.2" }
-solana-net-utils = { path = "../net-utils", version = "=1.11.2" }
-solana-runtime = { path = "../runtime", version = "=1.11.2" }
-solana-sdk = { path = "../sdk", version = "=1.11.2" }
-solana-streamer = { path = "../streamer", version = "=1.11.2" }
-solana-transaction-status = { path = "../transaction-status", version = "=1.11.2" }
-solana-version = { path = "../version", version = "=1.11.2" }
+solana-account-decoder = { path = "../account-decoder", version = "=1.11.3" }
+solana-clap-utils = { path = "../clap-utils", version = "=1.11.3" }
+solana-client = { path = "../client", version = "=1.11.3" }
+solana-faucet = { path = "../faucet", version = "=1.11.3" }
+solana-gossip = { path = "../gossip", version = "=1.11.3" }
+solana-logger = { path = "../logger", version = "=1.11.3" }
+solana-measure = { path = "../measure", version = "=1.11.3" }
+solana-net-utils = { path = "../net-utils", version = "=1.11.3" }
+solana-runtime = { path = "../runtime", version = "=1.11.3" }
+solana-sdk = { path = "../sdk", version = "=1.11.3" }
+solana-streamer = { path = "../streamer", version = "=1.11.3" }
+solana-transaction-status = { path = "../transaction-status", version = "=1.11.3" }
+solana-version = { path = "../version", version = "=1.11.3" }
 spl-token = { version = "=3.3.0", features = ["no-entrypoint"] }
 
 [dev-dependencies]
-solana-core = { path = "../core", version = "=1.11.2" }
-solana-local-cluster = { path = "../local-cluster", version = "=1.11.2" }
-solana-test-validator = { path = "../test-validator", version = "=1.11.2" }
+solana-core = { path = "../core", version = "=1.11.3" }
+solana-local-cluster = { path = "../local-cluster", version = "=1.11.3" }
+solana-test-validator = { path = "../test-validator", version = "=1.11.3" }
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]

banking-bench/Cargo.toml

@@ -2,7 +2,7 @@
 authors = ["Solana Maintainers <[email protected]>"]
 edition = "2021"
 name = "solana-banking-bench"
-version = "1.11.2"
+version = "1.11.3"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
@@ -14,18 +14,18 @@ crossbeam-channel = "0.5"
 log = "0.4.17"
 rand = "0.7.0"
 rayon = "1.5.3"
-solana-client = { path = "../client", version = "=1.11.2" }
-solana-core = { path = "../core", version = "=1.11.2" }
-solana-gossip = { path = "../gossip", version = "=1.11.2" }
-solana-ledger = { path = "../ledger", version = "=1.11.2" }
-solana-logger = { path = "../logger", version = "=1.11.2" }
-solana-measure = { path = "../measure", version = "=1.11.2" }
-solana-perf = { path = "../perf", version = "=1.11.2" }
-solana-poh = { path = "../poh", version = "=1.11.2" }
-solana-runtime = { path = "../runtime", version = "=1.11.2" }
-solana-sdk = { path = "../sdk", version = "=1.11.2" }
-solana-streamer = { path = "../streamer", version = "=1.11.2" }
-solana-version = { path = "../version", version = "=1.11.2" }
+solana-client = { path = "../client", version = "=1.11.3" }
+solana-core = { path = "../core", version = "=1.11.3" }
+solana-gossip = { path = "../gossip", version = "=1.11.3" }
+solana-ledger = { path = "../ledger", version = "=1.11.3" }
+solana-logger = { path = "../logger", version = "=1.11.3" }
+solana-measure = { path = "../measure", version = "=1.11.3" }
+solana-perf = { path = "../perf", version = "=1.11.3" }
+solana-poh = { path = "../poh", version = "=1.11.3" }
+solana-runtime = { path = "../runtime", version = "=1.11.3" }
+solana-sdk = { path = "../sdk", version = "=1.11.3" }
+solana-streamer = { path = "../streamer", version = "=1.11.3" }
+solana-version = { path = "../version", version = "=1.11.3" }
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]

banking-bench/src/main.rs

@@ -5,7 +5,7 @@ use {
     log::*,
     rand::{thread_rng, Rng},
     rayon::prelude::*,
-    solana_client::connection_cache::{ConnectionCache, UseQUIC, DEFAULT_TPU_CONNECTION_POOL_SIZE},
+    solana_client::connection_cache::{ConnectionCache, DEFAULT_TPU_CONNECTION_POOL_SIZE},
     solana_core::banking_stage::BankingStage,
     solana_gossip::cluster_info::{ClusterInfo, Node},
     solana_ledger::{
@@ -30,7 +30,7 @@ use {
     },
     solana_streamer::socket::SocketAddrSpace,
     std::{
-        sync::{atomic::Ordering, Arc, Mutex, RwLock},
+        sync::{atomic::Ordering, Arc, RwLock},
         thread::sleep,
         time::{Duration, Instant},
     },
@@ -39,7 +39,7 @@ use {
 fn check_txs(
     receiver: &Arc<Receiver<WorkingBankEntry>>,
     ref_tx_count: usize,
-    poh_recorder: &Arc<Mutex<PohRecorder>>,
+    poh_recorder: &Arc<RwLock<PohRecorder>>,
 ) -> bool {
     let mut total = 0;
     let now = Instant::now();
@@ -55,7 +55,7 @@ fn check_txs(
         if now.elapsed().as_secs() > 60 {
             break;
         }
-        if poh_recorder.lock().unwrap().bank().is_none() {
+        if poh_recorder.read().unwrap().bank().is_none() {
             no_bank = true;
             break;
         }
@@ -249,8 +249,8 @@ fn main() {
     let (tpu_vote_sender, tpu_vote_receiver) = unbounded();
     let (replay_vote_sender, _replay_vote_receiver) = unbounded();
     let bank0 = Bank::new_for_benches(&genesis_config);
-    let mut bank_forks = BankForks::new(bank0);
-    let mut bank = bank_forks.working_bank();
+    let bank_forks = Arc::new(RwLock::new(BankForks::new(bank0)));
+    let mut bank = bank_forks.read().unwrap().working_bank();
 
     // set cost tracker limits to MAX so it will not filter out TXs
     bank.write_cost_tracker()
@@ -341,8 +341,11 @@ fn main() {
             SocketAddrSpace::Unspecified,
         );
         let cluster_info = Arc::new(cluster_info);
-        let tpu_use_quic = UseQUIC::new(matches.is_present("tpu_use_quic"))
-            .expect("Failed to initialize QUIC flags");
+        let tpu_use_quic = matches.is_present("tpu_use_quic");
+        let connection_cache = match tpu_use_quic {
+            true => ConnectionCache::new(DEFAULT_TPU_CONNECTION_POOL_SIZE),
+            false => ConnectionCache::with_udp(DEFAULT_TPU_CONNECTION_POOL_SIZE),
+        };
         let banking_stage = BankingStage::new_num_threads(
             &cluster_info,
             &poh_recorder,
@@ -353,12 +356,10 @@ fn main() {
             None,
             replay_vote_sender,
             Arc::new(RwLock::new(CostModel::default())),
-            Arc::new(ConnectionCache::new(
-                tpu_use_quic,
-                DEFAULT_TPU_CONNECTION_POOL_SIZE,
-            )),
+            Arc::new(connection_cache),
+            bank_forks.clone(),
         );
-        poh_recorder.lock().unwrap().set_bank(&bank, false);
+        poh_recorder.write().unwrap().set_bank(&bank, false);
 
         // This is so that the signal_receiver does not go out of scope after the closure.
         // If it is dropped before poh_service, then poh_service will error when
@@ -396,7 +397,7 @@ fn main() {
                     if bank.get_signature_status(&tx.signatures[0]).is_some() {
                         break;
                     }
-                    if poh_recorder.lock().unwrap().bank().is_none() {
+                    if poh_recorder.read().unwrap().bank().is_none() {
                         break;
                     }
                     sleep(Duration::from_millis(5));
@@ -418,7 +419,7 @@ fn main() {
 
                 let mut poh_time = Measure::start("poh_time");
                 poh_recorder
-                    .lock()
+                    .write()
                     .unwrap()
                     .reset(bank.clone(), Some((bank.slot(), bank.slot() + 1)));
                 poh_time.stop();
@@ -428,8 +429,8 @@ fn main() {
                 new_bank_time.stop();
 
                 let mut insert_time = Measure::start("insert_time");
-                bank_forks.insert(new_bank);
-                bank = bank_forks.working_bank();
+                bank_forks.write().unwrap().insert(new_bank);
+                bank = bank_forks.read().unwrap().working_bank();
                 insert_time.stop();
 
                 // set cost tracker limits to MAX so it will not filter out TXs
@@ -439,11 +440,14 @@ fn main() {
                     std::u64::MAX,
                 );
 
-                poh_recorder.lock().unwrap().set_bank(&bank, false);
-                assert!(poh_recorder.lock().unwrap().bank().is_some());
+                poh_recorder.write().unwrap().set_bank(&bank, false);
+                assert!(poh_recorder.read().unwrap().bank().is_some());
                 if bank.slot() > 32 {
                     leader_schedule_cache.set_root(&bank);
-                    bank_forks.set_root(root, &AbsRequestSender::default(), None);
+                    bank_forks
+                        .write()
+                        .unwrap()
+                        .set_root(root, &AbsRequestSender::default(), None);
                     root += 1;
                 }
                 debug!(
@@ -476,7 +480,11 @@ fn main() {
                 }
             }
         }
-        let txs_processed = bank_forks.working_bank().transaction_count();
+        let txs_processed = bank_forks
+            .read()
+            .unwrap()
+            .working_bank()
+            .transaction_count();
         debug!("processed: {} base: {}", txs_processed, base_tx_count);
         eprintln!(
             "{{'name': 'banking_bench_total', 'median': '{:.2}'}}",

banks-client/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "solana-banks-client"
-version = "1.11.2"
+version = "1.11.3"
 description = "Solana banks client"
 authors = ["Solana Maintainers <[email protected]>"]
 repository = "https://github.com/solana-labs/solana"
@@ -12,17 +12,17 @@ edition = "2021"
 [dependencies]
 borsh = "0.9.3"
 futures = "0.3"
-solana-banks-interface = { path = "../banks-interface", version = "=1.11.2" }
-solana-program = { path = "../sdk/program", version = "=1.11.2" }
-solana-sdk = { path = "../sdk", version = "=1.11.2" }
+solana-banks-interface = { path = "../banks-interface", version = "=1.11.3" }
+solana-program = { path = "../sdk/program", version = "=1.11.3" }
+solana-sdk = { path = "../sdk", version = "=1.11.3" }
 tarpc = { version = "0.29.0", features = ["full"] }
 thiserror = "1.0"
 tokio = { version = "~1.14.1", features = ["full"] }
 tokio-serde = { version = "0.8", features = ["bincode"] }
 
 [dev-dependencies]
-solana-banks-server = { path = "../banks-server", version = "=1.11.2" }
-solana-runtime = { path = "../runtime", version = "=1.11.2" }
+solana-banks-server = { path = "../banks-server", version = "=1.11.3" }
+solana-runtime = { path = "../runtime", version = "=1.11.3" }
 
 [lib]
 crate-type = ["lib"]

banks-interface/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "solana-banks-interface"
-version = "1.11.2"
+version = "1.11.3"
 description = "Solana banks RPC interface"
 authors = ["Solana Maintainers <[email protected]>"]
 repository = "https://github.com/solana-labs/solana"
@@ -10,8 +10,8 @@ documentation = "https://docs.rs/solana-banks-interface"
 edition = "2021"
 
 [dependencies]
-serde = { version = "1.0.137", features = ["derive"] }
-solana-sdk = { path = "../sdk", version = "=1.11.2" }
+serde = { version = "1.0.138", features = ["derive"] }
+solana-sdk = { path = "../sdk", version = "=1.11.3" }
 tarpc = { version = "0.29.0", features = ["full"] }
 
 [lib]

banks-server/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "solana-banks-server"
-version = "1.11.2"
+version = "1.11.3"
 description = "Solana banks server"
 authors = ["Solana Maintainers <[email protected]>"]
 repository = "https://github.com/solana-labs/solana"
@@ -13,11 +13,11 @@ edition = "2021"
 bincode = "1.3.3"
 crossbeam-channel = "0.5"
 futures = "0.3"
-solana-banks-interface = { path = "../banks-interface", version = "=1.11.2" }
-solana-client = { path = "../client", version = "=1.11.2" }
-solana-runtime = { path = "../runtime", version = "=1.11.2" }
-solana-sdk = { path = "../sdk", version = "=1.11.2" }
-solana-send-transaction-service = { path = "../send-transaction-service", version = "=1.11.2" }
+solana-banks-interface = { path = "../banks-interface", version = "=1.11.3" }
+solana-client = { path = "../client", version = "=1.11.3" }
+solana-runtime = { path = "../runtime", version = "=1.11.3" }
+solana-sdk = { path = "../sdk", version = "=1.11.3" }
+solana-send-transaction-service = { path = "../send-transaction-service", version = "=1.11.3" }
 tarpc = { version = "0.29.0", features = ["full"] }
 tokio = { version = "~1.14.1", features = ["full"] }
 tokio-serde = { version = "0.8", features = ["bincode"] }

bench-streamer/Cargo.toml

@@ -2,7 +2,7 @@
 authors = ["Solana Maintainers <[email protected]>"]
 edition = "2021"
 name = "solana-bench-streamer"
-version = "1.11.2"
+version = "1.11.3"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
@@ -11,9 +11,9 @@ publish = false
 [dependencies]
 clap = { version = "3.1.5", features = ["cargo"] }
 crossbeam-channel = "0.5"
-solana-net-utils = { path = "../net-utils", version = "=1.11.2" }
-solana-streamer = { path = "../streamer", version = "=1.11.2" }
-solana-version = { path = "../version", version = "=1.11.2" }
+solana-net-utils = { path = "../net-utils", version = "=1.11.3" }
+solana-streamer = { path = "../streamer", version = "=1.11.3" }
+solana-version = { path = "../version", version = "=1.11.3" }
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]