remove block limit for bench tests to avoid skew test result

.buildkite/coverage-in-disk.sh

@@ -1,19 +0,0 @@
-#!/usr/bin/env bash
-#
-# This script is used to upload the full buildkite pipeline. The steps defined
-# in the buildkite UI should simply be:
-#
-#   steps:
-#    - command: ".buildkite/pipeline-upload.sh"
-#
-
-set -e
-cd "$(dirname "$0")"/..
-source ci/_
-sudo chmod 0777 ci/buildkite-pipeline-in-disk.sh
-
-_ ci/buildkite-pipeline-in-disk.sh pipeline.yml
-echo +++ pipeline
-cat pipeline.yml
-
-_ buildkite-agent pipeline upload pipeline.yml

.buildkite/hooks/pre-command

@@ -13,13 +13,7 @@ export PS4="++"
 #
 eval "$(ci/channel-info.sh)"
 eval "$(ci/sbf-tools-info.sh)"
-source "ci/rust-version.sh"
-HOST_RUST_VERSION="$rust_stable"
-pattern='^[0-9]+\.[0-9]+\.[0-9]+$'
-if [[ ${HOST_RUST_VERSION} =~ ${pattern} ]]; then
-    HOST_RUST_VERSION="${rust_stable%.*}"
-fi
-export CARGO_TARGET_CACHE=$HOME/cargo-target-cache/"$CHANNEL"-"$BUILDKITE_LABEL"-"$SBF_TOOLS_VERSION"-"$HOST_RUST_VERSION"
+export CARGO_TARGET_CACHE=$HOME/cargo-target-cache/"$CHANNEL"-"$BUILDKITE_LABEL"-"$SBF_TOOLS_VERSION"
 (
   set -x
   MAX_CACHE_SIZE=18 # gigabytes

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,9 +1,5 @@
 #### Problem
 
-
-
 #### Summary of Changes
 
-
-
 Fixes #

.github/workflows/client-targets.yml

@@ -1,66 +0,0 @@
-name: client_targets
-
-on:
-  pull_request:
-    branches:
-     - master
-    paths:
-      - "client/**"
-      - "sdk/**"
-      - ".github/workflows/client-targets.yml"
-
-env:
-  CARGO_TERM_COLOR: always
-
-jobs:
-  check_compilation:
-    name: Client compilation
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        target: [aarch64-apple-ios, x86_64-apple-ios, aarch64-apple-darwin, x86_64-apple-darwin, aarch64-linux-android, armv7-linux-androideabi, i686-linux-android, x86_64-linux-android]
-        include:
-          - target: aarch64-apple-ios
-            platform: ios
-            os: macos-latest
-          - target: x86_64-apple-ios
-            platform: ios
-            os: macos-latest
-          - target: aarch64-apple-darwin
-            platform: ios
-            os: macos-latest
-          - target: x86_64-apple-darwin
-            platform: ios
-            os: macos-latest
-          - target: aarch64-linux-android
-            platform: android
-            os: ubuntu-latest
-          - target: armv7-linux-androideabi
-            platform: android
-            os: ubuntu-latest
-          - target: i686-linux-android
-            platform: android
-            os: ubuntu-latest
-          - target: x86_64-linux-android
-            platform: android
-            os: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v2
-      - uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
-          target: ${{ matrix.target }}
-      - name: Install cargo-ndk
-        if: ${{ matrix.platform == 'android' }}
-        run: cargo install cargo-ndk
-      - uses: actions-rs/cargo@v1
-        if: ${{ matrix.platform == 'android' }}
-        with:
-          command: ndk
-          args: --target ${{ matrix.target }} build -p solana-client
-      - uses: actions-rs/cargo@v1
-        if: ${{ matrix.platform == 'ios' }}
-        with:
-          command: build
-          args: -p solana-client --target ${{ matrix.target }}

.github/workflows/explorer_preview.yml

@@ -17,7 +17,8 @@ jobs:
           vercel-token: ${{ secrets.VERCEL_TOKEN }} # Required
           github-token: ${{ secrets.GITHUB_TOKEN }} #Optional 
           vercel-org-id: ${{ secrets.ORG_ID}}  #Required
-          vercel-project-id: ${{ secrets.PROJECT_ID}} #Required
+          vercel-project-id: ${{ secrets.PROJECT_ID}} #Required 
+          working-directory: ./explorer
           scope: ${{ secrets.TEAM_ID }}
      
       - name: vercel url
@@ -35,24 +36,17 @@ jobs:
               #filtered_url=$(cat vercelfile2.txt )
               #echo "$filtered_url" >> .env.preview1 
 
-      - name: Fetching Vercel Preview Deployment Link
+
+      - name: Run tests
         uses: mathiasvr/command-output@v1
-        id: test1
+        id: tests2
         with:
           run: |
                echo "$(cat .env.preview1)"
-      - name: Fetching PR commit URL
-        uses: mathiasvr/command-output@v1
-        id: test2
-        with:
-          run: |
-               HEAD_SHA=$(curl -H "Accept: application/vnd.github.v3+json"  https://api.github.com/repos/solana-labs/solana/pulls | jq .[0] | jq -r .head.sha)
-               USER_NAME=$(curl -H "Accept: application/vnd.github.v3+json"  https://api.github.com/repos/solana-labs/solana/pulls | jq .[0] | jq -r .head.user.login)
-               echo "github.com/$USER_NAME/solana/commit/$HEAD_SHA"
       
-      - name: Slack Notification4
+      - name: Slack Notification1
         uses: rtCamp/action-slack-notify@master
         env:
-         SLACK_MESSAGE: ' Vercel Link: ${{ steps.test1.outputs.stdout }} PR Commit: ${{steps.test2.outputs.stdout}}'
-         SLACK_TITLE: Vercel "Explorer" Preview Deployment Link , PR Commit
+         SLACK_MESSAGE: ${{ steps.tests2.outputs.stdout }}
+         SLACK_TITLE: Vercel "Explorer" Preview Deployment Link
          SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}

.github/workflows/explorer_production.yml

@@ -30,8 +30,7 @@ jobs:
       runs-on: ubuntu-latest
       defaults:
         run:
-            working-directory: explorer
-    
+          working-directory: explorer
       steps:
        - uses: actions/checkout@v2
          with:
@@ -39,8 +38,9 @@ jobs:
        - uses: amondnet/vercel-action@v20
          with:
            vercel-token: ${{ secrets.VERCEL_TOKEN }} # Required
-           github-token: ${{ secrets.PAT }} #Optional 
+           github-token: ${{ secrets.GITHUB_TOKEN }} #Optional 
            vercel-args: '--prod' #for production
            vercel-org-id: ${{ secrets.ORG_ID}}  #Required
            vercel-project-id: ${{ secrets.PROJECT_ID}} #Required 
+           working-directory: ./explorer
            scope: ${{ secrets.TEAM_ID }}

.mergify.yml

@@ -93,7 +93,6 @@ pull_request_rules:
       - author=mergify[bot]
       - head~=^mergify/bp/
       - "#status-failure=0"
-      - "-merged"
     actions:
       label:
         add:

Cargo.toml

@@ -1,68 +1,63 @@
 [workspace]
 members = [
-    "account-decoder",
-    "accounts-bench",
+    "accountsdb-plugin-interface",
+    "accountsdb-plugin-manager",
     "accounts-cluster-bench",
+    "bench-streamer",
+    "bench-tps",
+    "accounts-bench",
     "banking-bench",
     "banks-client",
     "banks-interface",
     "banks-server",
-    "bench-streamer",
-    "bench-tps",
-    "bloom",
     "bucket_map",
+    "bloom",
     "clap-utils",
-    "cli",
     "cli-config",
     "cli-output",
     "client",
-    "client-test",
     "core",
     "dos",
     "download-utils",
     "entry",
     "faucet",
     "frozen-abi",
+    "perf",
+    "validator",
     "genesis",
     "genesis-utils",
-    "geyser-plugin-interface",
-    "geyser-plugin-manager",
     "gossip",
     "install",
     "keygen",
     "ledger",
     "ledger-tool",
     "local-cluster",
-    "log-analyzer",
     "logger",
-    "measure",
+    "log-analyzer",
     "merkle-root-bench",
     "merkle-tree",
+    "storage-bigtable",
+    "storage-proto",
+    "streamer",
+    "measure",
     "metrics",
     "net-shaper",
-    "net-utils",
     "notifier",
-    "perf",
     "poh",
     "poh-bench",
     "program-test",
     "programs/address-lookup-table",
     "programs/address-lookup-table-tests",
+    "programs/ed25519-tests",
     "programs/bpf_loader",
     "programs/bpf_loader/gen-syscall-list",
     "programs/compute-budget",
     "programs/config",
-    "programs/ed25519-tests",
     "programs/stake",
     "programs/vote",
-    "programs/zk-token-proof",
-    "rayon-threadlimit",
     "rbpf-cli",
     "remote-wallet",
-    "replica-lib",
-    "replica-node",
     "rpc",
-    "rpc-test",
     "runtime",
     "runtime/store-tool",
     "sdk",
@@ -70,19 +65,24 @@ members = [
     "sdk/cargo-test-bpf",
     "send-transaction-service",
     "stake-accounts",
-    "storage-bigtable",
-    "storage-proto",
-    "streamer",
     "sys-tuner",
-    "test-validator",
     "tokens",
     "transaction-dos",
     "transaction-status",
+    "account-decoder",
     "upload-perf",
-    "validator",
+    "net-utils",
     "version",
+    "cli",
+    "rayon-threadlimit",
     "watchtower",
+    "replica-node",
+    "replica-lib",
+    "test-validator",
+    "rpc-test",
+    "client-test",
     "zk-token-sdk",
+    "programs/zk-token-proof",
 ]
 
 exclude = [

account-decoder/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "solana-account-decoder"
-version = "1.10.8"
+version = "1.10.0"
 description = "Solana account decoder"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -10,21 +10,21 @@ license = "Apache-2.0"
 edition = "2021"
 
 [dependencies]
-Inflector = "0.11.4"
-base64 = "0.13.0"
+base64 = "0.12.3"
 bincode = "1.3.3"
 bs58 = "0.4.0"
 bv = "0.11.1"
+Inflector = "0.11.4"
 lazy_static = "1.4.0"
 serde = "1.0.136"
 serde_derive = "1.0.103"
-serde_json = "1.0.79"
-solana-config-program = { path = "../programs/config", version = "=1.10.8" }
-solana-sdk = { path = "../sdk", version = "=1.10.8" }
-solana-vote-program = { path = "../programs/vote", version = "=1.10.8" }
+serde_json = "1.0.78"
+solana-config-program = { path = "../programs/config", version = "=1.10.0" }
+solana-sdk = { path = "../sdk", version = "=1.10.0" }
+solana-vote-program = { path = "../programs/vote", version = "=1.10.0" }
 spl-token = { version = "=3.2.0", features = ["no-entrypoint"] }
 thiserror = "1.0"
-zstd = "0.11.1"
+zstd = "0.10.0"
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]

account-decoder/src/lib.rs

@@ -33,7 +33,7 @@ pub type StringDecimals = String;
 pub const MAX_BASE58_BYTES: usize = 128;
 
 /// A duplicate representation of an Account for pretty JSON serialization
-#[derive(Serialize, Deserialize, Clone, Debug, PartialEq)]
+#[derive(Serialize, Deserialize, Clone, Debug)]
 #[serde(rename_all = "camelCase")]
 pub struct UiAccount {
     pub lamports: u64,

accounts-bench/Cargo.toml

@@ -2,21 +2,21 @@
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 edition = "2021"
 name = "solana-accounts-bench"
-version = "1.10.8"
+version = "1.10.0"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
 publish = false
 
 [dependencies]
-clap = "2.33.1"
 log = "0.4.14"
 rayon = "1.5.1"
-solana-logger = { path = "../logger", version = "=1.10.8" }
-solana-measure = { path = "../measure", version = "=1.10.8" }
-solana-runtime = { path = "../runtime", version = "=1.10.8" }
-solana-sdk = { path = "../sdk", version = "=1.10.8" }
-solana-version = { path = "../version", version = "=1.10.8" }
+solana-logger = { path = "../logger", version = "=1.10.0" }
+solana-runtime = { path = "../runtime", version = "=1.10.0" }
+solana-measure = { path = "../measure", version = "=1.10.0" }
+solana-sdk = { path = "../sdk", version = "=1.10.0" }
+solana-version = { path = "../version", version = "=1.10.0" }
+clap = "2.33.1"
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]

accounts-cluster-bench/Cargo.toml

@@ -2,7 +2,7 @@
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 edition = "2021"
 name = "solana-accounts-cluster-bench"
-version = "1.10.8"
+version = "1.10.0"
 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.14"
 rand = "0.7.0"
 rayon = "1.5.1"
-solana-account-decoder = { path = "../account-decoder", version = "=1.10.8" }
-solana-clap-utils = { path = "../clap-utils", version = "=1.10.8" }
-solana-client = { path = "../client", version = "=1.10.8" }
-solana-faucet = { path = "../faucet", version = "=1.10.8" }
-solana-gossip = { path = "../gossip", version = "=1.10.8" }
-solana-logger = { path = "../logger", version = "=1.10.8" }
-solana-measure = { path = "../measure", version = "=1.10.8" }
-solana-net-utils = { path = "../net-utils", version = "=1.10.8" }
-solana-runtime = { path = "../runtime", version = "=1.10.8" }
-solana-sdk = { path = "../sdk", version = "=1.10.8" }
-solana-streamer = { path = "../streamer", version = "=1.10.8" }
-solana-transaction-status = { path = "../transaction-status", version = "=1.10.8" }
-solana-version = { path = "../version", version = "=1.10.8" }
+solana-account-decoder = { path = "../account-decoder", version = "=1.10.0" }
+solana-clap-utils = { path = "../clap-utils", version = "=1.10.0" }
+solana-client = { path = "../client", version = "=1.10.0" }
+solana-faucet = { path = "../faucet", version = "=1.10.0" }
+solana-gossip = { path = "../gossip", version = "=1.10.0" }
+solana-logger = { path = "../logger", version = "=1.10.0" }
+solana-measure = { path = "../measure", version = "=1.10.0" }
+solana-net-utils = { path = "../net-utils", version = "=1.10.0" }
+solana-runtime = { path = "../runtime", version = "=1.10.0" }
+solana-sdk = { path = "../sdk", version = "=1.10.0" }
+solana-streamer = { path = "../streamer", version = "=1.10.0" }
+solana-transaction-status = { path = "../transaction-status", version = "=1.10.0" }
+solana-version = { path = "../version", version = "=1.10.0" }
 spl-token = { version = "=3.2.0", features = ["no-entrypoint"] }
 
 [dev-dependencies]
-solana-core = { path = "../core", version = "=1.10.8" }
-solana-local-cluster = { path = "../local-cluster", version = "=1.10.8" }
-solana-test-validator = { path = "../test-validator", version = "=1.10.8" }
+solana-core = { path = "../core", version = "=1.10.0" }
+solana-local-cluster = { path = "../local-cluster", version = "=1.10.0" }
+solana-test-validator = { path = "../test-validator", version = "=1.10.0" }
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]

accountsdb-plugin-interface/Cargo.toml

@@ -1,19 +1,19 @@
 [package]
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 edition = "2021"
-name = "solana-geyser-plugin-interface"
-description = "The Solana Geyser plugin interface."
-version = "1.10.8"
+name = "solana-accountsdb-plugin-interface"
+description = "The Solana AccountsDb plugin interface."
+version = "1.10.0"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
-documentation = "https://docs.rs/solana-geyser-plugin-interface"
+documentation = "https://docs.rs/solana-accountsdb-plugin-interface"
 
 [dependencies]
 log = "0.4.11"
-solana-sdk = { path = "../sdk", version = "=1.10.8" }
-solana-transaction-status = { path = "../transaction-status", version = "=1.10.8" }
 thiserror = "1.0.30"
+solana-sdk = { path = "../sdk", version = "=1.10.0" }
+solana-transaction-status = { path = "../transaction-status", version = "=1.10.0" }
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]

accountsdb-plugin-interface/README.md

@@ -0,0 +1,20 @@
+<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,5 +1,5 @@
-/// The interface for Geyser plugins. A plugin must implement
-/// the GeyserPlugin trait to work with the runtime.
+/// 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 {
@@ -9,7 +9,9 @@ use {
     thiserror::Error,
 };
 
-#[derive(Debug, Clone, PartialEq, Eq)]
+impl Eq for ReplicaAccountInfo<'_> {}
+
+#[derive(Clone, PartialEq, Debug)]
 /// Information about an account being updated
 pub struct ReplicaAccountInfo<'a> {
     /// The Pubkey for the account
@@ -85,7 +87,7 @@ pub enum ReplicaBlockInfoVersions<'a> {
 
 /// Errors returned by plugin calls
 #[derive(Error, Debug)]
-pub enum GeyserPluginError {
+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}).")]
@@ -110,7 +112,7 @@ pub enum GeyserPluginError {
 }
 
 /// The current status of a slot
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+#[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
@@ -134,12 +136,12 @@ impl SlotStatus {
     }
 }
 
-pub type Result<T> = std::result::Result<T, GeyserPluginError>;
+pub type Result<T> = std::result::Result<T, AccountsDbPluginError>;
 
-/// Defines a Geyser plugin, to stream data from the runtime.
-/// Geyser plugins must describe desired behavior for load and unload,
+/// 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 GeyserPlugin: Any + Send + Sync + std::fmt::Debug {
+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,

accountsdb-plugin-interface/src/lib.rs

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

accountsdb-plugin-manager/Cargo.toml

@@ -0,0 +1,29 @@
+[package]
+authors = ["Solana Maintainers <maintainers@solana.foundation>"]
+edition = "2021"
+name = "solana-accountsdb-plugin-manager"
+description = "The Solana AccountsDb plugin manager."
+version = "1.10.0"
+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.5"
+json5 = "0.4.1"
+libloading = "0.7.3"
+log = "0.4.11"
+serde_json = "1.0.78"
+solana-accountsdb-plugin-interface = { path = "../accountsdb-plugin-interface", version = "=1.10.0" }
+solana-measure = { path = "../measure", version = "=1.10.0" }
+solana-metrics = { path = "../metrics", version = "=1.10.0" }
+solana-rpc = { path = "../rpc", version = "=1.10.0" }
+solana-runtime = { path = "../runtime", version = "=1.10.0" }
+solana-sdk = { path = "../sdk", version = "=1.10.0" }
+solana-transaction-status = { path = "../transaction-status", version = "=1.10.0" }
+thiserror = "1.0.30"
+
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]

accountsdb-plugin-manager/src/accounts_update_notifier.rs

@@ -1,8 +1,8 @@
 /// Module responsible for notifying plugins of account updates
 use {
-    crate::geyser_plugin_manager::GeyserPluginManager,
+    crate::accountsdb_plugin_manager::AccountsDbPluginManager,
     log::*,
-    solana_geyser_plugin_interface::geyser_plugin_interface::{
+    solana_accountsdb_plugin_interface::accountsdb_plugin_interface::{
         ReplicaAccountInfo, ReplicaAccountInfoVersions,
     },
     solana_measure::measure::Measure,
@@ -19,7 +19,7 @@ use {
 };
 #[derive(Debug)]
 pub(crate) struct AccountsUpdateNotifierImpl {
-    plugin_manager: Arc<RwLock<GeyserPluginManager>>,
+    plugin_manager: Arc<RwLock<AccountsDbPluginManager>>,
 }
 
 impl AccountsUpdateNotifierInterface for AccountsUpdateNotifierImpl {
@@ -30,14 +30,14 @@ impl AccountsUpdateNotifierInterface for AccountsUpdateNotifierImpl {
     }
 
     fn notify_account_restore_from_snapshot(&self, slot: Slot, account: &StoredAccountMeta) {
-        let mut measure_all = Measure::start("geyser-plugin-notify-account-restore-all");
-        let mut measure_copy = Measure::start("geyser-plugin-copy-stored-account-info");
+        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!(
-            "geyser-plugin-copy-stored-account-info-us",
+            "accountsdb-plugin-copy-stored-account-info-us",
             measure_copy.as_us() as usize,
             100000,
             100000
@@ -49,7 +49,7 @@ impl AccountsUpdateNotifierInterface for AccountsUpdateNotifierImpl {
         measure_all.stop();
 
         inc_new_counter_debug!(
-            "geyser-plugin-notify-account-restore-all-us",
+            "accountsdb-plugin-notify-account-restore-all-us",
             measure_all.as_us() as usize,
             100000,
             100000
@@ -63,7 +63,7 @@ impl AccountsUpdateNotifierInterface for AccountsUpdateNotifierImpl {
         }
 
         for plugin in plugin_manager.plugins.iter_mut() {
-            let mut measure = Measure::start("geyser-plugin-end-of-restore-from-snapshot");
+            let mut measure = Measure::start("accountsdb-plugin-end-of-restore-from-snapshot");
             match plugin.notify_end_of_startup() {
                 Err(err) => {
                     error!(
@@ -81,7 +81,7 @@ impl AccountsUpdateNotifierInterface for AccountsUpdateNotifierImpl {
             }
             measure.stop();
             inc_new_counter_debug!(
-                "geyser-plugin-end-of-restore-from-snapshot",
+                "accountsdb-plugin-end-of-restore-from-snapshot",
                 measure.as_us() as usize
             );
         }
@@ -89,7 +89,7 @@ impl AccountsUpdateNotifierInterface for AccountsUpdateNotifierImpl {
 }
 
 impl AccountsUpdateNotifierImpl {
-    pub fn new(plugin_manager: Arc<RwLock<GeyserPluginManager>>) -> Self {
+    pub fn new(plugin_manager: Arc<RwLock<AccountsDbPluginManager>>) -> Self {
         AccountsUpdateNotifierImpl { plugin_manager }
     }
 
@@ -130,14 +130,14 @@ impl AccountsUpdateNotifierImpl {
         slot: Slot,
         is_startup: bool,
     ) {
-        let mut measure2 = Measure::start("geyser-plugin-notify_plugins_of_account_update");
+        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("geyser-plugin-update-account");
+            let mut measure = Measure::start("accountsdb-plugin-update-account");
             match plugin.update_account(
                 ReplicaAccountInfoVersions::V0_0_1(&account),
                 slot,
@@ -163,7 +163,7 @@ impl AccountsUpdateNotifierImpl {
             }
             measure.stop();
             inc_new_counter_debug!(
-                "geyser-plugin-update-account-us",
+                "accountsdb-plugin-update-account-us",
                 measure.as_us() as usize,
                 100000,
                 100000
@@ -171,7 +171,7 @@ impl AccountsUpdateNotifierImpl {
         }
         measure2.stop();
         inc_new_counter_debug!(
-            "geyser-plugin-notify_plugins_of_account_update-us",
+            "accountsdb-plugin-notify_plugins_of_account_update-us",
             measure2.as_us() as usize,
             100000,
             100000

accountsdb-plugin-manager/src/accountsdb_plugin_manager.rs

@@ -1,20 +1,20 @@
-/// Managing the Geyser plugins
+/// Managing the AccountsDb plugins
 use {
     libloading::{Library, Symbol},
     log::*,
-    solana_geyser_plugin_interface::geyser_plugin_interface::GeyserPlugin,
+    solana_accountsdb_plugin_interface::accountsdb_plugin_interface::AccountsDbPlugin,
     std::error::Error,
 };
 
 #[derive(Default, Debug)]
-pub struct GeyserPluginManager {
-    pub plugins: Vec<Box<dyn GeyserPlugin>>,
+pub struct AccountsDbPluginManager {
+    pub plugins: Vec<Box<dyn AccountsDbPlugin>>,
     libs: Vec<Library>,
 }
 
-impl GeyserPluginManager {
+impl AccountsDbPluginManager {
     pub fn new() -> Self {
-        GeyserPluginManager {
+        AccountsDbPluginManager {
             plugins: Vec::default(),
             libs: Vec::default(),
         }
@@ -29,7 +29,7 @@ impl GeyserPluginManager {
         libpath: &str,
         config_file: &str,
     ) -> Result<(), Box<dyn Error>> {
-        type PluginConstructor = unsafe fn() -> *mut dyn GeyserPlugin;
+        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();

accountsdb-plugin-manager/src/accountsdb_plugin_service.rs

@@ -1,10 +1,11 @@
 use {
     crate::{
         accounts_update_notifier::AccountsUpdateNotifierImpl,
+        accountsdb_plugin_manager::AccountsDbPluginManager,
         block_metadata_notifier::BlockMetadataNotifierImpl,
         block_metadata_notifier_interface::BlockMetadataNotifierLock,
-        geyser_plugin_manager::GeyserPluginManager, slot_status_notifier::SlotStatusNotifierImpl,
-        slot_status_observer::SlotStatusObserver, transaction_notifier::TransactionNotifierImpl,
+        slot_status_notifier::SlotStatusNotifierImpl, slot_status_observer::SlotStatusObserver,
+        transaction_notifier::TransactionNotifierImpl,
     },
     crossbeam_channel::Receiver,
     log::*,
@@ -24,7 +25,7 @@ use {
 };
 
 #[derive(Error, Debug)]
-pub enum GeyserPluginServiceError {
+pub enum AccountsdbPluginServiceError {
     #[error("Cannot open the the plugin config file")]
     CannotOpenConfigFile(String),
 
@@ -44,41 +45,41 @@ pub enum GeyserPluginServiceError {
     PluginLoadError(String),
 }
 
-/// The service managing the Geyser plugin workflow.
-pub struct GeyserPluginService {
+/// The service managing the AccountsDb plugin workflow.
+pub struct AccountsDbPluginService {
     slot_status_observer: Option<SlotStatusObserver>,
-    plugin_manager: Arc<RwLock<GeyserPluginManager>>,
+    plugin_manager: Arc<RwLock<AccountsDbPluginManager>>,
     accounts_update_notifier: Option<AccountsUpdateNotifier>,
     transaction_notifier: Option<TransactionNotifierLock>,
     block_metadata_notifier: Option<BlockMetadataNotifierLock>,
 }
 
-impl GeyserPluginService {
-    /// Creates and returns the GeyserPluginService.
+impl AccountsDbPluginService {
+    /// Creates and returns the AccountsDbPluginService.
     /// # Arguments
     /// * `confirmed_bank_receiver` - The receiver for confirmed bank notification
-    /// * `geyser_plugin_config_file` - The config file path for the plugin. The
+    /// * `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 `GeyserPlugin`
+    ///    (.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 `GeyserPlugin` and returns to the caller.
+    ///    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>,
-        geyser_plugin_config_files: &[PathBuf],
-    ) -> Result<Self, GeyserPluginServiceError> {
+        accountsdb_plugin_config_files: &[PathBuf],
+    ) -> Result<Self, AccountsdbPluginServiceError> {
         info!(
-            "Starting GeyserPluginService from config files: {:?}",
-            geyser_plugin_config_files
+            "Starting AccountsDbPluginService from config files: {:?}",
+            accountsdb_plugin_config_files
         );
-        let mut plugin_manager = GeyserPluginManager::new();
+        let mut plugin_manager = AccountsDbPluginManager::new();
 
-        for geyser_plugin_config_file in geyser_plugin_config_files {
-            Self::load_plugin(&mut plugin_manager, geyser_plugin_config_file)?;
+        for accountsdb_plugin_config_file in accountsdb_plugin_config_files {
+            Self::load_plugin(&mut plugin_manager, accountsdb_plugin_config_file)?;
         }
         let account_data_notifications_enabled =
             plugin_manager.account_data_notifications_enabled();
@@ -122,8 +123,8 @@ impl GeyserPluginService {
             (None, None)
         };
 
-        info!("Started GeyserPluginService");
-        Ok(GeyserPluginService {
+        info!("Started AccountsDbPluginService");
+        Ok(AccountsDbPluginService {
             slot_status_observer,
             plugin_manager,
             accounts_update_notifier,
@@ -133,55 +134,57 @@ impl GeyserPluginService {
     }
 
     fn load_plugin(
-        plugin_manager: &mut GeyserPluginManager,
-        geyser_plugin_config_file: &Path,
-    ) -> Result<(), GeyserPluginServiceError> {
-        let mut file = match File::open(geyser_plugin_config_file) {
+        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(GeyserPluginServiceError::CannotOpenConfigFile(format!(
+                return Err(AccountsdbPluginServiceError::CannotOpenConfigFile(format!(
                     "Failed to open the plugin config file {:?}, error: {:?}",
-                    geyser_plugin_config_file, err
+                    accountsdb_plugin_config_file, err
                 )));
             }
         };
 
         let mut contents = String::new();
         if let Err(err) = file.read_to_string(&mut contents) {
-            return Err(GeyserPluginServiceError::CannotReadConfigFile(format!(
+            return Err(AccountsdbPluginServiceError::CannotReadConfigFile(format!(
                 "Failed to read the plugin config file {:?}, error: {:?}",
-                geyser_plugin_config_file, err
+                accountsdb_plugin_config_file, err
             )));
         }
 
         let result: serde_json::Value = match json5::from_str(&contents) {
             Ok(value) => value,
             Err(err) => {
-                return Err(GeyserPluginServiceError::InvalidConfigFileFormat(format!(
-                    "The config file {:?} is not in a valid Json5 format, error: {:?}",
-                    geyser_plugin_config_file, err
-                )));
+                return Err(AccountsdbPluginServiceError::InvalidConfigFileFormat(
+                    format!(
+                        "The config file {:?} is not in a valid Json5 format, error: {:?}",
+                        accountsdb_plugin_config_file, err
+                    ),
+                ));
             }
         };
 
         let libpath = result["libpath"]
             .as_str()
-            .ok_or(GeyserPluginServiceError::LibPathNotSet)?;
+            .ok_or(AccountsdbPluginServiceError::LibPathNotSet)?;
         let mut libpath = PathBuf::from(libpath);
         if libpath.is_relative() {
-            let config_dir = geyser_plugin_config_file.parent().ok_or_else(|| {
-                GeyserPluginServiceError::CannotOpenConfigFile(format!(
+            let config_dir = accountsdb_plugin_config_file.parent().ok_or_else(|| {
+                AccountsdbPluginServiceError::CannotOpenConfigFile(format!(
                     "Failed to resolve parent of {:?}",
-                    geyser_plugin_config_file,
+                    accountsdb_plugin_config_file,
                 ))
             })?;
             libpath = config_dir.join(libpath);
         }
 
-        let config_file = geyser_plugin_config_file
+        let config_file = accountsdb_plugin_config_file
             .as_os_str()
             .to_str()
-            .ok_or(GeyserPluginServiceError::InvalidPluginPath)?;
+            .ok_or(AccountsdbPluginServiceError::InvalidPluginPath)?;
 
         unsafe {
             let result = plugin_manager.load_plugin(libpath.to_str().unwrap(), config_file);
@@ -190,7 +193,7 @@ impl GeyserPluginService {
                     "Failed to load the plugin library: {:?}, error: {:?}",
                     libpath, err
                 );
-                return Err(GeyserPluginServiceError::PluginLoadError(msg));
+                return Err(AccountsdbPluginServiceError::PluginLoadError(msg));
             }
         }
         Ok(())

accountsdb-plugin-manager/src/block_metadata_notifier.rs

@@ -1,10 +1,10 @@
 use {
     crate::{
+        accountsdb_plugin_manager::AccountsDbPluginManager,
         block_metadata_notifier_interface::BlockMetadataNotifier,
-        geyser_plugin_manager::GeyserPluginManager,
     },
     log::*,
-    solana_geyser_plugin_interface::geyser_plugin_interface::{
+    solana_accountsdb_plugin_interface::accountsdb_plugin_interface::{
         ReplicaBlockInfo, ReplicaBlockInfoVersions,
     },
     solana_measure::measure::Measure,
@@ -16,7 +16,7 @@ use {
 };
 
 pub(crate) struct BlockMetadataNotifierImpl {
-    plugin_manager: Arc<RwLock<GeyserPluginManager>>,
+    plugin_manager: Arc<RwLock<AccountsDbPluginManager>>,
 }
 
 impl BlockMetadataNotifier for BlockMetadataNotifierImpl {
@@ -36,7 +36,7 @@ impl BlockMetadataNotifier for BlockMetadataNotifierImpl {
         let rewards = Self::build_rewards(rewards);
 
         for plugin in plugin_manager.plugins.iter_mut() {
-            let mut measure = Measure::start("geyser-plugin-update-slot");
+            let mut measure = Measure::start("accountsdb-plugin-update-slot");
             let block_info =
                 Self::build_replica_block_info(slot, blockhash, &rewards, block_time, block_height);
             let block_info = ReplicaBlockInfoVersions::V0_0_1(&block_info);
@@ -59,7 +59,7 @@ impl BlockMetadataNotifier for BlockMetadataNotifierImpl {
             }
             measure.stop();
             inc_new_counter_debug!(
-                "geyser-plugin-update-block-metadata-us",
+                "accountsdb-plugin-update-block-metadata-us",
                 measure.as_us() as usize,
                 1000,
                 1000
@@ -99,7 +99,7 @@ impl BlockMetadataNotifierImpl {
         }
     }
 
-    pub fn new(plugin_manager: Arc<RwLock<GeyserPluginManager>>) -> Self {
+    pub fn new(plugin_manager: Arc<RwLock<AccountsDbPluginManager>>) -> Self {
         Self { plugin_manager }
     }
 }

accountsdb-plugin-manager/src/lib.rs

@@ -1,8 +1,8 @@
 pub mod accounts_update_notifier;
+pub mod accountsdb_plugin_manager;
+pub mod accountsdb_plugin_service;
 pub mod block_metadata_notifier;
 pub mod block_metadata_notifier_interface;
-pub mod geyser_plugin_manager;
-pub mod geyser_plugin_service;
 pub mod slot_status_notifier;
 pub mod slot_status_observer;
 pub mod transaction_notifier;

accountsdb-plugin-manager/src/slot_status_notifier.rs

@@ -1,7 +1,7 @@
 use {
-    crate::geyser_plugin_manager::GeyserPluginManager,
+    crate::accountsdb_plugin_manager::AccountsDbPluginManager,
     log::*,
-    solana_geyser_plugin_interface::geyser_plugin_interface::SlotStatus,
+    solana_accountsdb_plugin_interface::accountsdb_plugin_interface::SlotStatus,
     solana_measure::measure::Measure,
     solana_metrics::*,
     solana_sdk::clock::Slot,
@@ -22,7 +22,7 @@ pub trait SlotStatusNotifierInterface {
 pub type SlotStatusNotifier = Arc<RwLock<dyn SlotStatusNotifierInterface + Sync + Send>>;
 
 pub struct SlotStatusNotifierImpl {
-    plugin_manager: Arc<RwLock<GeyserPluginManager>>,
+    plugin_manager: Arc<RwLock<AccountsDbPluginManager>>,
 }
 
 impl SlotStatusNotifierInterface for SlotStatusNotifierImpl {
@@ -40,7 +40,7 @@ impl SlotStatusNotifierInterface for SlotStatusNotifierImpl {
 }
 
 impl SlotStatusNotifierImpl {
-    pub fn new(plugin_manager: Arc<RwLock<GeyserPluginManager>>) -> Self {
+    pub fn new(plugin_manager: Arc<RwLock<AccountsDbPluginManager>>) -> Self {
         Self { plugin_manager }
     }
 
@@ -51,8 +51,8 @@ impl SlotStatusNotifierImpl {
         }
 
         for plugin in plugin_manager.plugins.iter_mut() {
-            let mut measure = Measure::start("geyser-plugin-update-slot");
-            match plugin.update_slot_status(slot, parent, slot_status) {
+            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 {}",
@@ -71,7 +71,7 @@ impl SlotStatusNotifierImpl {
             }
             measure.stop();
             inc_new_counter_debug!(
-                "geyser-plugin-update-slot-us",
+                "accountsdb-plugin-update-slot-us",
                 measure.as_us() as usize,
                 1000,
                 1000

accountsdb-plugin-manager/src/transaction_notifier.rs

@@ -1,8 +1,8 @@
 /// Module responsible for notifying plugins of transactions
 use {
-    crate::geyser_plugin_manager::GeyserPluginManager,
+    crate::accountsdb_plugin_manager::AccountsDbPluginManager,
     log::*,
-    solana_geyser_plugin_interface::geyser_plugin_interface::{
+    solana_accountsdb_plugin_interface::accountsdb_plugin_interface::{
         ReplicaTransactionInfo, ReplicaTransactionInfoVersions,
     },
     solana_measure::measure::Measure,
@@ -16,9 +16,9 @@ use {
 /// This implementation of TransactionNotifier is passed to the rpc's TransactionStatusService
 /// at the validator startup. TransactionStatusService invokes the notify_transaction method
 /// for new transactions. The implementation in turn invokes the notify_transaction of each
-/// plugin enabled with transaction notification managed by the GeyserPluginManager.
+/// plugin enabled with transaction notification managed by the AccountsDbPluginManager.
 pub(crate) struct TransactionNotifierImpl {
-    plugin_manager: Arc<RwLock<GeyserPluginManager>>,
+    plugin_manager: Arc<RwLock<AccountsDbPluginManager>>,
 }
 
 impl TransactionNotifier for TransactionNotifierImpl {
@@ -29,7 +29,7 @@ impl TransactionNotifier for TransactionNotifierImpl {
         transaction_status_meta: &TransactionStatusMeta,
         transaction: &SanitizedTransaction,
     ) {
-        let mut measure = Measure::start("geyser-plugin-notify_plugins_of_transaction_info");
+        let mut measure = Measure::start("accountsdb-plugin-notify_plugins_of_transaction_info");
         let transaction_log_info =
             Self::build_replica_transaction_info(signature, transaction_status_meta, transaction);
 
@@ -64,7 +64,7 @@ impl TransactionNotifier for TransactionNotifierImpl {
         }
         measure.stop();
         inc_new_counter_debug!(
-            "geyser-plugin-notify_plugins_of_transaction_info-us",
+            "accountsdb-plugin-notify_plugins_of_transaction_info-us",
             measure.as_us() as usize,
             10000,
             10000
@@ -73,7 +73,7 @@ impl TransactionNotifier for TransactionNotifierImpl {
 }
 
 impl TransactionNotifierImpl {
-    pub fn new(plugin_manager: Arc<RwLock<GeyserPluginManager>>) -> Self {
+    pub fn new(plugin_manager: Arc<RwLock<AccountsDbPluginManager>>) -> Self {
         Self { plugin_manager }
     }
 

banking-bench/Cargo.toml

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

banks-client/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "solana-banks-client"
-version = "1.10.8"
+version = "1.10.0"
 description = "Solana banks client"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 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.10.8" }
-solana-program = { path = "../sdk/program", version = "=1.10.8" }
-solana-sdk = { path = "../sdk", version = "=1.10.8" }
+solana-banks-interface = { path = "../banks-interface", version = "=1.10.0" }
+solana-program = { path = "../sdk/program", version = "=1.10.0" }
+solana-sdk = { path = "../sdk", version = "=1.10.0" }
 tarpc = { version = "0.27.2", features = ["full"] }
 thiserror = "1.0"
 tokio = { version = "1", features = ["full"] }
 tokio-serde = { version = "0.8", features = ["bincode"] }
 
 [dev-dependencies]
-solana-banks-server = { path = "../banks-server", version = "=1.10.8" }
-solana-runtime = { path = "../runtime", version = "=1.10.8" }
+solana-runtime = { path = "../runtime", version = "=1.10.0" }
+solana-banks-server = { path = "../banks-server", version = "=1.10.0" }
 
 [lib]
 crate-type = ["lib"]

banks-client/src/lib.rs

@@ -5,10 +5,8 @@
 //! but they are undocumented, may change over time, and are generally more
 //! cumbersome to use.
 
-pub use {
-    crate::error::BanksClientError,
-    solana_banks_interface::{BanksClient as TarpcClient, TransactionStatus},
-};
+pub use crate::error::BanksClientError;
+pub use solana_banks_interface::{BanksClient as TarpcClient, TransactionStatus};
 use {
     borsh::BorshDeserialize,
     futures::{future::join_all, Future, FutureExt, TryFutureExt},

banks-interface/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "solana-banks-interface"
-version = "1.10.8"
+version = "1.10.0"
 description = "Solana banks RPC interface"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -11,7 +11,7 @@ edition = "2021"
 
 [dependencies]
 serde = { version = "1.0.136", features = ["derive"] }
-solana-sdk = { path = "../sdk", version = "=1.10.8" }
+solana-sdk = { path = "../sdk", version = "=1.10.0" }
 tarpc = { version = "0.27.2", features = ["full"] }
 
 [lib]

banks-server/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "solana-banks-server"
-version = "1.10.8"
+version = "1.10.0"
 description = "Solana banks server"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -13,10 +13,10 @@ edition = "2021"
 bincode = "1.3.3"
 crossbeam-channel = "0.5"
 futures = "0.3"
-solana-banks-interface = { path = "../banks-interface", version = "=1.10.8" }
-solana-runtime = { path = "../runtime", version = "=1.10.8" }
-solana-sdk = { path = "../sdk", version = "=1.10.8" }
-solana-send-transaction-service = { path = "../send-transaction-service", version = "=1.10.8" }
+solana-banks-interface = { path = "../banks-interface", version = "=1.10.0" }
+solana-runtime = { path = "../runtime", version = "=1.10.0" }
+solana-sdk = { path = "../sdk", version = "=1.10.0" }
+solana-send-transaction-service = { path = "../send-transaction-service", version = "=1.10.0" }
 tarpc = { version = "0.27.2", features = ["full"] }
 tokio = { version = "1", features = ["full"] }
 tokio-serde = { version = "0.8", features = ["bincode"] }

banks-server/src/banks_server.rs

@@ -24,7 +24,7 @@ use {
         transaction::{self, SanitizedTransaction, Transaction},
     },
     solana_send_transaction_service::{
-        send_transaction_service::{SendTransactionService, TransactionInfo, DEFAULT_TPU_USE_QUIC},
+        send_transaction_service::{SendTransactionService, TransactionInfo},
         tpu_info::NullTpuInfo,
     },
     std::{
@@ -399,7 +399,6 @@ pub async fn start_tcp_server(
                 receiver,
                 5_000,
                 0,
-                DEFAULT_TPU_USE_QUIC,
             );
 
             let server = BanksServer::new(

bench-streamer/Cargo.toml

@@ -2,18 +2,18 @@
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 edition = "2021"
 name = "solana-bench-streamer"
-version = "1.10.8"
+version = "1.10.0"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
 publish = false
 
 [dependencies]
-clap = "2.33.1"
 crossbeam-channel = "0.5"
-solana-net-utils = { path = "../net-utils", version = "=1.10.8" }
-solana-streamer = { path = "../streamer", version = "=1.10.8" }
-solana-version = { path = "../version", version = "=1.10.8" }
+clap = "2.33.1"
+solana-streamer = { path = "../streamer", version = "=1.10.0" }
+solana-net-utils = { path = "../net-utils", version = "=1.10.0" }
+solana-version = { path = "../version", version = "=1.10.0" }
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]

bench-tps/Cargo.toml

@@ -2,7 +2,7 @@
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 edition = "2021"
 name = "solana-bench-tps"
-version = "1.10.8"
+version = "1.10.0"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
@@ -13,25 +13,25 @@ clap = "2.33.1"
 crossbeam-channel = "0.5"
 log = "0.4.14"
 rayon = "1.5.1"
-serde_json = "1.0.79"
+serde_json = "1.0.78"
 serde_yaml = "0.8.23"
-solana-client = { path = "../client", version = "=1.10.8" }
-solana-core = { path = "../core", version = "=1.10.8" }
-solana-faucet = { path = "../faucet", version = "=1.10.8" }
-solana-genesis = { path = "../genesis", version = "=1.10.8" }
-solana-gossip = { path = "../gossip", version = "=1.10.8" }
-solana-logger = { path = "../logger", version = "=1.10.8" }
-solana-measure = { path = "../measure", version = "=1.10.8" }
-solana-metrics = { path = "../metrics", version = "=1.10.8" }
-solana-net-utils = { path = "../net-utils", version = "=1.10.8" }
-solana-runtime = { path = "../runtime", version = "=1.10.8" }
-solana-sdk = { path = "../sdk", version = "=1.10.8" }
-solana-streamer = { path = "../streamer", version = "=1.10.8" }
-solana-version = { path = "../version", version = "=1.10.8" }
+solana-core = { path = "../core", version = "=1.10.0" }
+solana-genesis = { path = "../genesis", version = "=1.10.0" }
+solana-client = { path = "../client", version = "=1.10.0" }
+solana-faucet = { path = "../faucet", version = "=1.10.0" }
+solana-gossip = { path = "../gossip", version = "=1.10.0" }
+solana-logger = { path = "../logger", version = "=1.10.0" }
+solana-metrics = { path = "../metrics", version = "=1.10.0" }
+solana-measure = { path = "../measure", version = "=1.10.0" }
+solana-net-utils = { path = "../net-utils", version = "=1.10.0" }
+solana-runtime = { path = "../runtime", version = "=1.10.0" }
+solana-sdk = { path = "../sdk", version = "=1.10.0" }
+solana-streamer = { path = "../streamer", version = "=1.10.0" }
+solana-version = { path = "../version", version = "=1.10.0" }
 
 [dev-dependencies]
-serial_test = "0.6.0"
-solana-local-cluster = { path = "../local-cluster", version = "=1.10.8" }
+serial_test = "0.5.1"
+solana-local-cluster = { path = "../local-cluster", version = "=1.10.0" }
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]

bench-tps/src/bench.rs

@@ -110,7 +110,7 @@ fn generate_chunked_transfers(
     shared_txs: &SharedTransactions,
     shared_tx_active_thread_count: Arc<AtomicIsize>,
     source_keypair_chunks: Vec<Vec<&Keypair>>,
-    dest_keypair_chunks: &mut [VecDeque<&Keypair>],
+    dest_keypair_chunks: &mut Vec<VecDeque<&Keypair>>,
     threads: usize,
     duration: Duration,
     sustained: bool,
@@ -475,7 +475,6 @@ fn do_tx_transfers<T: Client>(
             let tx_len = txs0.len();
             let transfer_start = Instant::now();
             let mut old_transactions = false;
-            let mut transactions = Vec::<_>::new();
             for tx in txs0 {
                 let now = timestamp();
                 // Transactions that are too old will be rejected by the cluster Don't bother
@@ -484,13 +483,10 @@ fn do_tx_transfers<T: Client>(
                     old_transactions = true;
                     continue;
                 }
-                transactions.push(tx.0);
+                client
+                    .async_send_transaction(tx.0)
+                    .expect("async_send_transaction in do_tx_transfers");
             }
-
-            if let Err(error) = client.async_send_batch(transactions) {
-                warn!("send_batch_sync in do_tx_transfers failed: {}", error);
-            }
-
             if old_transactions {
                 let mut shared_txs_wl = shared_txs.write().expect("write lock in do_tx_transfers");
                 shared_txs_wl.clear();

bloom/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "solana-bloom"
-version = "1.10.8"
+version = "1.10.0"
 description = "Solana bloom filter"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -12,14 +12,14 @@ edition = "2021"
 [dependencies]
 bv = { version = "0.11.1", features = ["serde"] }
 fnv = "1.0.7"
-log = "0.4.14"
 rand = "0.7.0"
-rayon = "1.5.1"
 serde = { version = "1.0.136", features = ["rc"] }
+rayon = "1.5.1"
 serde_derive = "1.0.103"
-solana-frozen-abi = { path = "../frozen-abi", version = "=1.10.8" }
-solana-frozen-abi-macro = { path = "../frozen-abi/macro", version = "=1.10.8" }
-solana-sdk = { path = "../sdk", version = "=1.10.8" }
+solana-frozen-abi = { path = "../frozen-abi", version = "=1.10.0" }
+solana-frozen-abi-macro = { path = "../frozen-abi/macro", version = "=1.10.0" }
+solana-sdk = { path = "../sdk", version = "=1.10.0" }
+log = "0.4.14"
 
 [lib]
 crate-type = ["lib"]

book/src/proposals/handle-duplicate-block.md

@@ -1,7 +1,3 @@
----
-title: Handle Duplicate Block
----
-
 # Leader Duplicate Block Slashing
 
 This design describes how the cluster slashes leaders that produce duplicate

bucket_map/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "solana-bucket-map"
-version = "1.10.8"
+version = "1.10.0"
 description = "solana-bucket-map"
 homepage = "https://solana.com/"
 documentation = "https://docs.rs/solana-bucket-map"
@@ -11,18 +11,18 @@ license = "Apache-2.0"
 edition = "2021"
 
 [dependencies]
+solana-sdk = { path = "../sdk", version = "=1.10.0" }
+memmap2 = "0.5.2"
 log = { version = "0.4.11" }
-memmap2 = "0.5.3"
-modular-bitfield = "0.11.2"
+solana-measure = { path = "../measure", version = "=1.10.0" }
 rand = "0.7.0"
-solana-measure = { path = "../measure", version = "=1.10.8" }
-solana-sdk = { path = "../sdk", version = "=1.10.8" }
 tempfile = "3.3.0"
+modular-bitfield = "0.11.2"
 
 [dev-dependencies]
 fs_extra = "1.2.0"
 rayon = "1.5.0"
-solana-logger = { path = "../logger", version = "=1.10.8" }
+solana-logger = { path = "../logger", version = "=1.10.0" }
 
 [lib]
 crate-type = ["lib"]

ci/buildkite-pipeline-in-disk.sh

@@ -1,365 +0,0 @@
-#!/usr/bin/env bash
-#
-# Builds a buildkite pipeline based on the environment variables
-#
-
-set -e
-cd "$(dirname "$0")"/..
-
-output_file=${1:-/dev/stderr}
-
-if [[ -n $CI_PULL_REQUEST ]]; then
-  IFS=':' read -ra affected_files <<< "$(buildkite-agent meta-data get affected_files)"
-  if [[ ${#affected_files[*]} -eq 0 ]]; then
-    echo "Unable to determine the files affected by this PR"
-    exit 1
-  fi
-else
-  affected_files=()
-fi
-
-annotate() {
-  if [[ -n $BUILDKITE ]]; then
-    buildkite-agent annotate "$@"
-  fi
-}
-
-# Checks if a CI pull request affects one or more path patterns.  Each
-# pattern argument is checked in series. If one of them found to be affected,
-# return immediately as such.
-#
-# Bash regular expressions are permitted in the pattern:
-#     affects .rs$    -- any file or directory ending in .rs
-#     affects .rs     -- also matches foo.rs.bar
-#     affects ^snap/  -- anything under the snap/ subdirectory
-#     affects snap/   -- also matches foo/snap/
-# Any pattern starting with the ! character will be negated:
-#     affects !^docs/  -- anything *not* under the docs/ subdirectory
-#
-affects() {
-  if [[ -z $CI_PULL_REQUEST ]]; then
-    # affected_files metadata is not currently available for non-PR builds so assume
-    # the worse (affected)
-    return 0
-  fi
-  # Assume everyting needs to be tested when any Dockerfile changes
-  for pattern in ^ci/docker-rust/Dockerfile ^ci/docker-rust-nightly/Dockerfile "$@"; do
-    if [[ ${pattern:0:1} = "!" ]]; then
-      for file in "${affected_files[@]}"; do
-        if [[ ! $file =~ ${pattern:1} ]]; then
-          return 0 # affected
-        fi
-      done
-    else
-      for file in "${affected_files[@]}"; do
-        if [[ $file =~ $pattern ]]; then
-          return 0 # affected
-        fi
-      done
-    fi
-  done
-
-  return 1 # not affected
-}
-
-
-# Checks if a CI pull request affects anything other than the provided path patterns
-#
-# Syntax is the same as `affects()` except that the negation prefix is not
-# supported
-#
-affects_other_than() {
-  if [[ -z $CI_PULL_REQUEST ]]; then
-    # affected_files metadata is not currently available for non-PR builds so assume
-    # the worse (affected)
-    return 0
-  fi
-
-  for file in "${affected_files[@]}"; do
-    declare matched=false
-    for pattern in "$@"; do
-        if [[ $file =~ $pattern ]]; then
-          matched=true
-        fi
-    done
-    if ! $matched; then
-      return 0 # affected
-    fi
-  done
-
-  return 1 # not affected
-}
-
-
-start_pipeline() {
-  echo "# $*" > "$output_file"
-  echo "steps:" >> "$output_file"
-}
-
-command_step() {
-  cat >> "$output_file" <<EOF
-  - name: "$1"
-    command: "$2"
-    timeout_in_minutes: $3
-    artifact_paths: "log-*.txt"
-EOF
-}
-
-
-trigger_secondary_step() {
-  cat  >> "$output_file" <<"EOF"
-  - trigger: "solana-secondary"
-    branches: "!pull/*"
-    async: true
-    build:
-      message: "${BUILDKITE_MESSAGE}"
-      commit: "${BUILDKITE_COMMIT}"
-      branch: "${BUILDKITE_BRANCH}"
-      env:
-        TRIGGERED_BUILDKITE_TAG: "${BUILDKITE_TAG}"
-EOF
-}
-
-wait_step() {
-  echo "  - wait" >> "$output_file"
-}
-
-all_test_steps() {
-  command_step checks ". ci/rust-version.sh; ci/docker-run.sh \$\$rust_nightly_docker_image ci/test-checks.sh" 20
-  wait_step
-
-  # Coverage...
-  if affects \
-             .rs$ \
-             Cargo.lock$ \
-             Cargo.toml$ \
-             ^ci/rust-version.sh \
-             ^ci/test-coverage.sh \
-             ^scripts/coverage.sh \
-      ; then
-    command_step coverage ". ci/rust-version.sh; ci/docker-run.sh \$\$rust_nightly_docker_image ci/test-coverage.sh" 50
-    wait_step
-  else
-    annotate --style info --context test-coverage \
-      "Coverage skipped as no .rs files were modified"
-  fi
- # Coverage in disk...
-  if affects \
-             .rs$ \
-             Cargo.lock$ \
-             Cargo.toml$ \
-             ^ci/rust-version.sh \
-             ^ci/test-coverage.sh \
-             ^scripts/coverage-in-disk.sh \
-      ; then
-    command_step coverage-in-disk ". ci/rust-version.sh; ci/docker-run.sh \$\$rust_nightly_docker_image ci/test-coverage.sh" 50
-    wait_step
-  else
-    annotate --style info --context test-coverage \
-      "Coverage skipped as no .rs files were modified"
-  fi
-  # Full test suite
-  command_step stable ". ci/rust-version.sh; ci/docker-run.sh \$\$rust_stable_docker_image ci/test-stable.sh" 70
-  wait_step
-
-  # BPF test suite
-  if affects \
-             .rs$ \
-             Cargo.lock$ \
-             Cargo.toml$ \
-             ^ci/rust-version.sh \
-             ^ci/test-stable-bpf.sh \
-             ^ci/test-stable.sh \
-             ^ci/test-local-cluster.sh \
-             ^core/build.rs \
-             ^fetch-perf-libs.sh \
-             ^programs/ \
-             ^sdk/ \
-      ; then
-    cat >> "$output_file" <<"EOF"
-  - command: "ci/test-stable-bpf.sh"
-    name: "stable-bpf"
-    timeout_in_minutes: 20
-    artifact_paths: "bpf-dumps.tar.bz2"
-    agents:
-      - "queue=default"
-EOF
-  else
-    annotate --style info \
-      "Stable-BPF skipped as no relevant files were modified"
-  fi
-
-  # Perf test suite
-  if affects \
-             .rs$ \
-             Cargo.lock$ \
-             Cargo.toml$ \
-             ^ci/rust-version.sh \
-             ^ci/test-stable-perf.sh \
-             ^ci/test-stable.sh \
-             ^ci/test-local-cluster.sh \
-             ^core/build.rs \
-             ^fetch-perf-libs.sh \
-             ^programs/ \
-             ^sdk/ \
-      ; then
-    cat >> "$output_file" <<"EOF"
-  - command: "ci/test-stable-perf.sh"
-    name: "stable-perf"
-    timeout_in_minutes: 20
-    artifact_paths: "log-*.txt"
-    agents:
-      - "queue=cuda"
-EOF
-  else
-    annotate --style info \
-      "Stable-perf skipped as no relevant files were modified"
-  fi
-
-  # Downstream backwards compatibility
-  if affects \
-             .rs$ \
-             Cargo.lock$ \
-             Cargo.toml$ \
-             ^ci/rust-version.sh \
-             ^ci/test-stable-perf.sh \
-             ^ci/test-stable.sh \
-             ^ci/test-local-cluster.sh \
-             ^core/build.rs \
-             ^fetch-perf-libs.sh \
-             ^programs/ \
-             ^sdk/ \
-             ^scripts/build-downstream-projects.sh \
-      ; then
-    cat >> "$output_file" <<"EOF"
-  - command: "scripts/build-downstream-projects.sh"
-    name: "downstream-projects"
-    timeout_in_minutes: 30
-EOF
-  else
-    annotate --style info \
-      "downstream-projects skipped as no relevant files were modified"
-  fi
-
-  # Downstream Anchor projects backwards compatibility
-  if affects \
-             .rs$ \
-             Cargo.lock$ \
-             Cargo.toml$ \
-             ^ci/rust-version.sh \
-             ^ci/test-stable-perf.sh \
-             ^ci/test-stable.sh \
-             ^ci/test-local-cluster.sh \
-             ^core/build.rs \
-             ^fetch-perf-libs.sh \
-             ^programs/ \
-             ^sdk/ \
-             ^scripts/build-downstream-anchor-projects.sh \
-      ; then
-    cat >> "$output_file" <<"EOF"
-  - command: "scripts/build-downstream-anchor-projects.sh"
-    name: "downstream-anchor-projects"
-    timeout_in_minutes: 10
-EOF
-  else
-    annotate --style info \
-      "downstream-anchor-projects skipped as no relevant files were modified"
-  fi
-
-  # Wasm support
-  if affects \
-             ^ci/test-wasm.sh \
-             ^ci/test-stable.sh \
-             ^sdk/ \
-      ; then
-    command_step wasm ". ci/rust-version.sh; ci/docker-run.sh \$\$rust_stable_docker_image ci/test-wasm.sh" 20
-  else
-    annotate --style info \
-      "wasm skipped as no relevant files were modified"
-  fi
-
-  # Benches...
-  if affects \
-             .rs$ \
-             Cargo.lock$ \
-             Cargo.toml$ \
-             ^ci/rust-version.sh \
-             ^ci/test-coverage.sh \
-             ^ci/test-bench.sh \
-      ; then
-    command_step bench "ci/test-bench.sh" 30
-  else
-    annotate --style info --context test-bench \
-      "Bench skipped as no .rs files were modified"
-  fi
-
-  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
-}
-
-pull_or_push_steps() {
-  command_step sanity "ci/test-sanity.sh" 5
-  wait_step
-
-  # Check for any .sh file changes
-  if affects .sh$; then
-    command_step shellcheck "ci/shellcheck.sh" 5
-    wait_step
-  fi
-
-  # Run the full test suite by default, skipping only if modifications are local
-  # to some particular areas of the tree
-  if affects_other_than ^.buildkite ^.mergify .md$ ^docs/ ^web3.js/ ^explorer/ ^.gitbook; then
-    all_test_steps
-  fi
-
-  # web3.js, explorer and docs changes run on Travis or Github actions...
-}
-
-
-if [[ -n $BUILDKITE_TAG ]]; then
-  start_pipeline "Tag pipeline for $BUILDKITE_TAG"
-
-  annotate --style info --context release-tag \
-    "https://github.com/solana-labs/solana/releases/$BUILDKITE_TAG"
-
-  # Jump directly to the secondary build to publish release artifacts quickly
-  trigger_secondary_step
-  exit 0
-fi
-
-
-if [[ $BUILDKITE_BRANCH =~ ^pull ]]; then
-  echo "+++ Affected files in this PR"
-  for file in "${affected_files[@]}"; do
-    echo "- $file"
-  done
-
-  start_pipeline "Pull request pipeline for $BUILDKITE_BRANCH"
-
-  # Add helpful link back to the corresponding Github Pull Request
-  annotate --style info --context pr-backlink \
-    "Github Pull Request: https://github.com/solana-labs/solana/$BUILDKITE_BRANCH"
-
-  if [[ $GITHUB_USER = "dependabot[bot]" ]]; then
-    command_step dependabot "ci/dependabot-pr.sh" 5
-    wait_step
-  fi
-  pull_or_push_steps
-  exit 0
-fi
-
-start_pipeline "Push pipeline for ${BUILDKITE_BRANCH:-?unknown branch?}"
-pull_or_push_steps
-wait_step
-trigger_secondary_step
-exit 0

ci/buildkite-pipeline.sh

@@ -102,8 +102,6 @@ command_step() {
     command: "$2"
     timeout_in_minutes: $3
     artifact_paths: "log-*.txt"
-    agents:
-      - "queue=solana"
 EOF
 }
 
@@ -139,7 +137,7 @@ all_test_steps() {
              ^ci/test-coverage.sh \
              ^scripts/coverage.sh \
       ; then
-    command_step coverage ". ci/rust-version.sh; ci/docker-run.sh \$\$rust_nightly_docker_image ci/test-coverage.sh" 50
+    command_step coverage ". ci/rust-version.sh; ci/docker-run.sh \$\$rust_nightly_docker_image ci/test-coverage.sh" 40
     wait_step
   else
     annotate --style info --context test-coverage \
@@ -147,7 +145,7 @@ all_test_steps() {
   fi
 
   # Full test suite
-  command_step stable ". ci/rust-version.sh; ci/docker-run.sh \$\$rust_stable_docker_image ci/test-stable.sh" 70
+  command_step stable ". ci/rust-version.sh; ci/docker-run.sh \$\$rust_stable_docker_image ci/test-stable.sh" 60
   wait_step
 
   # BPF test suite
@@ -170,7 +168,7 @@ all_test_steps() {
     timeout_in_minutes: 20
     artifact_paths: "bpf-dumps.tar.bz2"
     agents:
-      - "queue=solana"
+      - "queue=default"
 EOF
   else
     annotate --style info \
@@ -223,8 +221,6 @@ EOF
   - command: "scripts/build-downstream-projects.sh"
     name: "downstream-projects"
     timeout_in_minutes: 30
-    agents:
-      - "queue=solana"
 EOF
   else
     annotate --style info \
@@ -250,8 +246,6 @@ EOF
   - command: "scripts/build-downstream-anchor-projects.sh"
     name: "downstream-anchor-projects"
     timeout_in_minutes: 10
-    agents:
-      - "queue=solana"
 EOF
   else
     annotate --style info \

ci/do-audit.sh

@@ -8,6 +8,11 @@ src_root="$(readlink -f "${here}/..")"
 cd "${src_root}"
 
 cargo_audit_ignores=(
+  # failure is officially deprecated/unmaintained
+  #
+  # Blocked on multiple upstream crates removing their `failure` dependency.
+  --ignore RUSTSEC-2020-0036
+
   # `net2` crate has been deprecated; use `socket2` instead
   #
   # Blocked on https://github.com/paritytech/jsonrpc/issues/575
@@ -25,10 +30,22 @@ cargo_audit_ignores=(
 
   # generic-array: arr! macro erases lifetimes
   #
-  # Blocked on new spl dependencies on solana-program v1.9
-  # due to curve25519-dalek dependency
+  # Blocked on libsecp256k1 releasing with upgraded dependencies
+  # https://github.com/paritytech/libsecp256k1/issues/66
   --ignore RUSTSEC-2020-0146
 
+  # hyper: Lenient `hyper` header parsing of `Content-Length` could allow request smuggling
+  #
+  # Blocked on jsonrpc removing dependency on unmaintained `websocket`
+  # https://github.com/paritytech/jsonrpc/issues/605
+  --ignore RUSTSEC-2021-0078
+
+  # hyper: Integer overflow in `hyper`'s parsing of the `Transfer-Encoding` header leads to data loss
+  #
+  # Blocked on jsonrpc removing dependency on unmaintained `websocket`
+  # https://github.com/paritytech/jsonrpc/issues/605
+  --ignore RUSTSEC-2021-0079
+
   # chrono: Potential segfault in `localtime_r` invocations
   #
   # Blocked due to no safe upgrade

ci/docker-rust-nightly/Dockerfile

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

ci/docker-rust/Dockerfile

@@ -1,6 +1,6 @@
 # Note: when the rust version is changed also modify
 # ci/rust-version.sh to pick up the new image tag
-FROM rust:1.59.0
+FROM rust:1.58.1
 
 # Add Google Protocol Buffers for Libra's metrics library.
 ENV PROTOC_VERSION 3.8.0

ci/publish-crate.sh

@@ -70,7 +70,7 @@ for Cargo_toml in $Cargo_tomls; do
         rm -rf crate-test
         "$cargo" stable init crate-test
         cd crate-test/
-        echo "${crate_name} = \"=${expectedCrateVersion}\"" >> Cargo.toml
+        echo "${crate_name} = \"${expectedCrateVersion}\"" >> Cargo.toml
         echo "[workspace]" >> Cargo.toml
         "$cargo" stable check
       ) && really_uploaded=1

ci/rust-version.sh

@@ -18,13 +18,13 @@
 if [[ -n $RUST_STABLE_VERSION ]]; then
   stable_version="$RUST_STABLE_VERSION"
 else
-  stable_version=1.59.0
+  stable_version=1.58.1
 fi
 
 if [[ -n $RUST_NIGHTLY_VERSION ]]; then
   nightly_version="$RUST_NIGHTLY_VERSION"
 else
-  nightly_version=2022-02-24
+  nightly_version=2022-01-21
 fi
 
 

ci/test-checks.sh

@@ -57,20 +57,32 @@ if [[ $CI_BASE_BRANCH = "$EDGE_CHANNEL" ]]; then
     exit "$check_status"
   fi
 
-   # Ensure nightly and --benches
+  # Ensure nightly and --benches
   _ scripts/cargo-for-all-lock-files.sh nightly check --locked --all-targets
 else
   echo "Note: cargo-for-all-lock-files.sh skipped because $CI_BASE_BRANCH != $EDGE_CHANNEL"
 fi
 
- _ ci/order-crates-for-publishing.py
+_ ci/order-crates-for-publishing.py
 
 # -Z... is needed because of clippy bug: https://github.com/rust-lang/rust-clippy/issues/4612
 # run nightly clippy for `sdk/` as there's a moderate amount of nightly-only code there
- _ scripts/cargo-for-all-lock-files.sh -- nightly clippy -Zunstable-options --all-targets -- --deny=warnings --deny=clippy::integer_arithmetic
+_ "$cargo" nightly clippy -Zunstable-options --workspace --all-targets -- --deny=warnings --deny=clippy::integer_arithmetic
 
-_ scripts/cargo-for-all-lock-files.sh -- nightly fmt --all -- --check
+_ "$cargo" stable fmt --all -- --check
 
- _ ci/do-audit.sh
+_ ci/do-audit.sh
+
+{
+  cd programs/bpf
+  for project in rust/*/ ; do
+    echo "+++ do_bpf_checks $project"
+    (
+      cd "$project"
+      _ "$cargo" nightly clippy -- --deny=warnings --allow=clippy::missing_safety_doc
+      _ "$cargo" stable fmt -- --check
+    )
+  done
+}
 
 echo --- ok

clap-utils/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "solana-clap-utils"
-version = "1.10.8"
+version = "1.10.0"
 description = "Solana utilities for the clap"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -10,16 +10,16 @@ documentation = "https://docs.rs/solana-clap-utils"
 edition = "2021"
 
 [dependencies]
-chrono = "0.4"
 clap = "2.33.0"
-rpassword = "6.0"
-solana-perf = { path = "../perf", version = "=1.10.8" }
-solana-remote-wallet = { path = "../remote-wallet", version = "=1.10.8", default-features = false }
-solana-sdk = { path = "../sdk", version = "=1.10.8" }
+rpassword = "5.0"
+solana-perf = { path = "../perf", version = "=1.10.0" }
+solana-remote-wallet = { path = "../remote-wallet", version = "=1.10.0", default-features = false}
+solana-sdk = { path = "../sdk", version = "=1.10.0" }
 thiserror = "1.0.30"
 tiny-bip39 = "0.8.2"
 uriparse = "0.6.3"
 url = "2.2.2"
+chrono = "0.4"
 
 [dev-dependencies]
 tempfile = "3.3.0"

clap-utils/src/keypair.rs

@@ -17,7 +17,7 @@ use {
     },
     bip39::{Language, Mnemonic, Seed},
     clap::ArgMatches,
-    rpassword::prompt_password,
+    rpassword::prompt_password_stderr,
     solana_remote_wallet::{
         locator::{Locator as RemoteWalletLocator, LocatorError as RemoteWalletLocatorError},
         remote_keypair::generate_remote_keypair,
@@ -945,9 +945,9 @@ pub const SKIP_SEED_PHRASE_VALIDATION_ARG: ArgConstant<'static> = ArgConstant {
 
 /// Prompts user for a passphrase and then asks for confirmirmation to check for mistakes
 pub fn prompt_passphrase(prompt: &str) -> Result<String, Box<dyn error::Error>> {
-    let passphrase = prompt_password(prompt)?;
+    let passphrase = prompt_password_stderr(prompt)?;
     if !passphrase.is_empty() {
-        let confirmed = rpassword::prompt_password("Enter same passphrase again: ")?;
+        let confirmed = rpassword::prompt_password_stderr("Enter same passphrase again: ")?;
         if confirmed != passphrase {
             return Err("Passphrases did not match".into());
         }
@@ -1055,7 +1055,7 @@ pub fn keypair_from_seed_phrase(
     derivation_path: Option<DerivationPath>,
     legacy: bool,
 ) -> Result<Keypair, Box<dyn error::Error>> {
-    let seed_phrase = prompt_password(&format!("[{}] seed phrase: ", keypair_name))?;
+    let seed_phrase = prompt_password_stderr(&format!("[{}] seed phrase: ", keypair_name))?;
     let seed_phrase = seed_phrase.trim();
     let passphrase_prompt = format!(
         "[{}] If this seed phrase has an associated passphrase, enter it now. Otherwise, press ENTER to continue: ",

cli-config/Cargo.toml

@@ -3,7 +3,7 @@ authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 edition = "2021"
 name = "solana-cli-config"
 description = "Blockchain, Rebuilt for Scale"
-version = "1.10.8"
+version = "1.10.0"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
@@ -18,7 +18,7 @@ serde_yaml = "0.8.23"
 url = "2.2.2"
 
 [dev-dependencies]
-anyhow = "1.0.56"
+anyhow = "1.0.53"
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]

cli-output/Cargo.toml

@@ -3,32 +3,29 @@ authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 edition = "2021"
 name = "solana-cli-output"
 description = "Blockchain, Rebuilt for Scale"
-version = "1.10.8"
+version = "1.10.0"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
 documentation = "https://docs.rs/solana-cli-output"
 
 [dependencies]
-Inflector = "0.11.4"
 base64 = "0.13.0"
 chrono = { version = "0.4.11", features = ["serde"] }
 clap = "2.33.0"
 console = "0.15.0"
 humantime = "2.0.1"
+Inflector = "0.11.4"
 indicatif = "0.16.2"
 serde = "1.0.136"
-serde_json = "1.0.79"
-solana-account-decoder = { path = "../account-decoder", version = "=1.10.8" }
-solana-clap-utils = { path = "../clap-utils", version = "=1.10.8" }
-solana-client = { path = "../client", version = "=1.10.8" }
-solana-sdk = { path = "../sdk", version = "=1.10.8" }
-solana-transaction-status = { path = "../transaction-status", version = "=1.10.8" }
-solana-vote-program = { path = "../programs/vote", version = "=1.10.8" }
+serde_json = "1.0.78"
+solana-account-decoder = { path = "../account-decoder", version = "=1.10.0" }
+solana-clap-utils = { path = "../clap-utils", version = "=1.10.0" }
+solana-client = { path = "../client", version = "=1.10.0" }
+solana-sdk = { path = "../sdk", version = "=1.10.0" }
+solana-transaction-status = { path = "../transaction-status", version = "=1.10.0" }
+solana-vote-program = { path = "../programs/vote", version = "=1.10.0" }
 spl-memo = { version = "=3.0.1", features = ["no-entrypoint"] }
 
-[dev-dependencies]
-ed25519-dalek = "=1.0.1"
-
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]

cli-output/src/cli_output.rs

@@ -28,7 +28,7 @@ use {
         signature::Signature,
         stake::state::{Authorized, Lockup},
         stake_history::StakeHistoryEntry,
-        transaction::{Transaction, TransactionError, VersionedTransaction},
+        transaction::{Transaction, TransactionError},
     },
     solana_transaction_status::{
         EncodedConfirmedBlock, EncodedTransaction, TransactionConfirmationStatus,
@@ -393,19 +393,19 @@ impl fmt::Display for CliValidators {
         ) -> fmt::Result {
             fn non_zero_or_dash(v: u64, max_v: u64) -> String {
                 if v == 0 {
-                    "        -      ".into()
+                    "-         ".into()
                 } else if v == max_v {
-                    format!("{:>9} (  0)", v)
+                    format!("{:>8} (  0)", v)
                 } else if v > max_v.saturating_sub(100) {
-                    format!("{:>9} ({:>3})", v, -(max_v.saturating_sub(v) as isize))
+                    format!("{:>8} ({:>3})", v, -(max_v.saturating_sub(v) as isize))
                 } else {
-                    format!("{:>9}      ", v)
+                    format!("{:>8}      ", v)
                 }
             }
 
             writeln!(
                 f,
-                "{} {:<44}  {:<44}  {:>3}%  {:>14}  {:>14} {:>7} {:>8}  {:>7}  {:>22} ({:.2}%)",
+                "{} {:<44}  {:<44}  {:>3}%  {:>14}  {:>14} {:>7} {:>8}  {:>7}  {}",
                 if validator.delinquent {
                     WARNING.to_string()
                 } else {
@@ -419,19 +419,19 @@ impl fmt::Display for CliValidators {
                 if let Some(skip_rate) = validator.skip_rate {
                     format!("{:.2}%", skip_rate)
                 } else {
-                    "-   ".to_string()
+                    "- ".to_string()
                 },
                 validator.epoch_credits,
                 validator.version,
-                build_balance_message_with_config(
-                    validator.activated_stake,
-                    &BuildBalanceMessageConfig {
-                        use_lamports_unit,
-                        trim_trailing_zeros: false,
-                        ..BuildBalanceMessageConfig::default()
-                    }
-                ),
-                100. * validator.activated_stake as f64 / total_active_stake as f64,
+                if validator.activated_stake > 0 {
+                    format!(
+                        "{} ({:.2}%)",
+                        build_balance_message(validator.activated_stake, use_lamports_unit, true),
+                        100. * validator.activated_stake as f64 / total_active_stake as f64,
+                    )
+                } else {
+                    "-".into()
+                },
             )
         }
 
@@ -441,13 +441,13 @@ impl fmt::Display for CliValidators {
             0
         };
         let header = style(format!(
-            "{:padding$} {:<44}  {:<38}  {}  {}  {} {}  {}  {}    {}",
+            "{:padding$} {:<44}  {:<38}  {}  {}  {} {}  {}  {}  {}",
             " ",
             "Identity",
             "Vote Account",
             "Commission",
-            "Last Vote      ",
-            "Root Slot    ",
+            "Last Vote     ",
+            "Root Slot   ",
             "Skip Rate",
             "Credits",
             "Version",
@@ -2218,7 +2218,7 @@ pub enum CliSignatureVerificationStatus {
 }
 
 impl CliSignatureVerificationStatus {
-    pub fn verify_transaction(tx: &VersionedTransaction) -> Vec<Self> {
+    pub fn verify_transaction(tx: &Transaction) -> Vec<Self> {
         tx.verify_with_results()
             .iter()
             .zip(&tx.signatures)
@@ -2335,7 +2335,7 @@ impl fmt::Display for CliBlock {
             writeln_transaction(
                 f,
                 &transaction_with_meta.transaction.decode().unwrap(),
-                transaction_with_meta.meta.as_ref(),
+                &transaction_with_meta.meta,
                 "  ",
                 None,
                 None,
@@ -2354,7 +2354,7 @@ pub struct CliTransaction {
     #[serde(skip_serializing)]
     pub slot: Option<Slot>,
     #[serde(skip_serializing)]
-    pub decoded_transaction: VersionedTransaction,
+    pub decoded_transaction: Transaction,
     #[serde(skip_serializing)]
     pub prefix: String,
     #[serde(skip_serializing_if = "Vec::is_empty")]
@@ -2369,7 +2369,7 @@ impl fmt::Display for CliTransaction {
         writeln_transaction(
             f,
             &self.decoded_transaction,
-            self.meta.as_ref(),
+            &self.meta,
             &self.prefix,
             if !self.sigverify_status.is_empty() {
                 Some(&self.sigverify_status)
@@ -2451,8 +2451,6 @@ pub struct CliGossipNode {
     pub rpc_host: Option<String>,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub version: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub feature_set: Option<u32>,
 }
 
 impl CliGossipNode {
@@ -2465,7 +2463,6 @@ impl CliGossipNode {
             tpu_port: info.tpu.map(|addr| addr.port()),
             rpc_host: info.rpc.map(|addr| addr.to_string()),
             version: info.version,
-            feature_set: info.feature_set,
         }
     }
 }
@@ -2491,7 +2488,7 @@ impl fmt::Display for CliGossipNode {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         write!(
             f,
-            "{:15} | {:44} | {:6} | {:5} | {:21} | {:8}| {}",
+            "{:15} | {:44} | {:6} | {:5} | {:21} | {}",
             unwrap_to_string_or_none(self.ip_address.as_ref()),
             self.identity_label
                 .as_ref()
@@ -2500,7 +2497,6 @@ impl fmt::Display for CliGossipNode {
             unwrap_to_string_or_none(self.tpu_port.as_ref()),
             unwrap_to_string_or_none(self.rpc_host.as_ref()),
             unwrap_to_string_or_default(self.version.as_ref(), "unknown"),
-            unwrap_to_string_or_default(self.feature_set.as_ref(), "unknown"),
         )
     }
 }
@@ -2515,10 +2511,10 @@ impl fmt::Display for CliGossipNodes {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         writeln!(
             f,
-            "IP Address      | Identity                                     \
-             | Gossip | TPU   | RPC Address           | Version | Feature Set\n\
+            "IP Address      | Node identifier                              \
+             | Gossip | TPU   | RPC Address           | Version\n\
              ----------------+----------------------------------------------+\
-             --------+-------+-----------------------+---------+----------------",
+             --------+-------+-----------------------+----------------",
         )?;
         for node in self.0.iter() {
             writeln!(f, "{}", node)?;
@@ -2776,10 +2772,10 @@ mod tests {
 
         let expected_msg = "AwECBwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDgTl3Dqh9\
             F19Wo1Rmw0x+zMuNipG07jeiXfYPW4/Js5QEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQE\
-            BAQEBAUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBgYGBgYGBgYGBgYGBgYGBgYG\
-            BgYGBgYGBgYGBgYGBgYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAan1RcZLFaO\
-            4IqEX3PSl4jPA1wxRbIas0TYBi6pQAAABwcHBwcHBwcHBwcHBwcHBwcHBwcHBwcHBwcHBwcH\
-            BwcCBQMEBgIEBAAAAAUCAQMMAgAAACoAAAAAAAAA"
+            BAQEBAYGBgYGBgYGBgYGBgYGBgYGBgYGBgYGBgYGBgYGBgYGBQUFBQUFBQUFBQUFBQUFBQUF\
+            BQUFBQUFBQUFBQUFBQUGp9UXGSxWjuCKhF9z0peIzwNcMUWyGrNE2AYuqUAAAAAAAAAAAAAA\
+            AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwcHBwcHBwcHBwcHBwcHBwcHBwcHBwcHBwcHBwcH\
+            BwcCBgMDBQIEBAAAAAYCAQQMAgAAACoAAAAAAAAA"
             .to_string();
         let config = ReturnSignersConfig {
             dump_transaction_message: true,

cli-output/src/display.rs

@@ -4,18 +4,10 @@ use {
     console::style,
     indicatif::{ProgressBar, ProgressStyle},
     solana_sdk::{
-        clock::UnixTimestamp,
-        hash::Hash,
-        instruction::CompiledInstruction,
-        message::v0::MessageAddressTableLookup,
-        native_token::lamports_to_sol,
-        program_utils::limited_deserialize,
-        pubkey::Pubkey,
-        signature::Signature,
-        stake,
-        transaction::{TransactionError, TransactionVersion, VersionedTransaction},
+        clock::UnixTimestamp, hash::Hash, message::Message, native_token::lamports_to_sol,
+        program_utils::limited_deserialize, pubkey::Pubkey, stake, transaction::Transaction,
     },
-    solana_transaction_status::{Rewards, UiTransactionStatusMeta},
+    solana_transaction_status::UiTransactionStatusMeta,
     spl_memo::{id as spl_memo_id, v1::id as spl_memo_v1_id},
     std::{collections::HashMap, fmt, io},
 };
@@ -139,28 +131,22 @@ pub fn println_signers(
     println!();
 }
 
-struct CliAccountMeta {
-    is_signer: bool,
-    is_writable: bool,
-    is_invoked: bool,
-}
-
-fn format_account_mode(meta: CliAccountMeta) -> String {
+fn format_account_mode(message: &Message, index: usize) -> String {
     format!(
         "{}r{}{}", // accounts are always readable...
-        if meta.is_signer {
+        if message.is_signer(index) {
             "s" // stands for signer
         } else {
             "-"
         },
-        if meta.is_writable {
+        if message.is_writable(index) {
             "w" // comment for consistent rust fmt (no joking; lol)
         } else {
             "-"
         },
         // account may be executable on-chain while not being
         // designated as a program-id in the message
-        if meta.is_invoked {
+        if message.maybe_executable(index) {
             "x"
         } else {
             // programs to be executed via CPI cannot be identified as
@@ -170,178 +156,41 @@ fn format_account_mode(meta: CliAccountMeta) -> String {
     )
 }
 
-fn write_transaction<W: io::Write>(
+pub fn write_transaction<W: io::Write>(
     w: &mut W,
-    transaction: &VersionedTransaction,
-    transaction_status: Option<&UiTransactionStatusMeta>,
+    transaction: &Transaction,
+    transaction_status: &Option<UiTransactionStatusMeta>,
     prefix: &str,
     sigverify_status: Option<&[CliSignatureVerificationStatus]>,
     block_time: Option<UnixTimestamp>,
-    timezone: CliTimezone,
 ) -> io::Result<()> {
-    write_block_time(w, block_time, timezone, prefix)?;
-
     let message = &transaction.message;
-    let account_keys: Vec<AccountKeyType> = {
-        let static_keys_iter = message
-            .static_account_keys()
-            .iter()
-            .map(AccountKeyType::Known);
-        let dynamic_keys: Vec<AccountKeyType> = message
-            .address_table_lookups()
-            .map(transform_lookups_to_unknown_keys)
-            .unwrap_or_default();
-        static_keys_iter.chain(dynamic_keys).collect()
-    };
-
-    write_version(w, transaction.version(), prefix)?;
-    write_recent_blockhash(w, message.recent_blockhash(), prefix)?;
-    write_signatures(w, &transaction.signatures, sigverify_status, prefix)?;
-
-    let mut fee_payer_index = None;
-    for (account_index, account) in account_keys.iter().enumerate() {
-        if fee_payer_index.is_none() && message.is_non_loader_key(account_index) {
-            fee_payer_index = Some(account_index)
-        }
-
-        let account_meta = CliAccountMeta {
-            is_signer: message.is_signer(account_index),
-            is_writable: message.is_maybe_writable(account_index),
-            is_invoked: message.is_invoked(account_index),
-        };
-
-        write_account(
-            w,
-            account_index,
-            *account,
-            format_account_mode(account_meta),
-            Some(account_index) == fee_payer_index,
-            prefix,
-        )?;
-    }
-
-    for (instruction_index, instruction) in message.instructions().iter().enumerate() {
-        let program_pubkey = account_keys[instruction.program_id_index as usize];
-        let instruction_accounts = instruction
-            .accounts
-            .iter()
-            .map(|account_index| (account_keys[*account_index as usize], *account_index));
-
-        write_instruction(
-            w,
-            instruction_index,
-            program_pubkey,
-            instruction,
-            instruction_accounts,
-            prefix,
-        )?;
-    }
-
-    if let Some(address_table_lookups) = message.address_table_lookups() {
-        write_address_table_lookups(w, address_table_lookups, prefix)?;
-    }
-
-    if let Some(transaction_status) = transaction_status {
-        write_status(w, &transaction_status.status, prefix)?;
-        write_fees(w, transaction_status.fee, prefix)?;
-        write_balances(w, transaction_status, prefix)?;
-        write_log_messages(w, transaction_status.log_messages.as_ref(), prefix)?;
-        write_rewards(w, transaction_status.rewards.as_ref(), prefix)?;
-    } else {
-        writeln!(w, "{}Status: Unavailable", prefix)?;
-    }
-
-    Ok(())
-}
-
-fn transform_lookups_to_unknown_keys(lookups: &[MessageAddressTableLookup]) -> Vec<AccountKeyType> {
-    let unknown_writable_keys = lookups
-        .iter()
-        .enumerate()
-        .flat_map(|(lookup_index, lookup)| {
-            lookup
-                .writable_indexes
-                .iter()
-                .map(move |table_index| AccountKeyType::Unknown {
-                    lookup_index,
-                    table_index: *table_index,
-                })
-        });
-
-    let unknown_readonly_keys = lookups
-        .iter()
-        .enumerate()
-        .flat_map(|(lookup_index, lookup)| {
-            lookup
-                .readonly_indexes
-                .iter()
-                .map(move |table_index| AccountKeyType::Unknown {
-                    lookup_index,
-                    table_index: *table_index,
-                })
-        });
-
-    unknown_writable_keys.chain(unknown_readonly_keys).collect()
-}
-
-enum CliTimezone {
-    Local,
-    #[allow(dead_code)]
-    Utc,
-}
-
-fn write_block_time<W: io::Write>(
-    w: &mut W,
-    block_time: Option<UnixTimestamp>,
-    timezone: CliTimezone,
-    prefix: &str,
-) -> io::Result<()> {
     if let Some(block_time) = block_time {
-        let block_time_output = match timezone {
-            CliTimezone::Local => format!("{:?}", Local.timestamp(block_time, 0)),
-            CliTimezone::Utc => format!("{:?}", Utc.timestamp(block_time, 0)),
-        };
-        writeln!(w, "{}Block Time: {}", prefix, block_time_output,)?;
+        writeln!(
+            w,
+            "{}Block Time: {:?}",
+            prefix,
+            Local.timestamp(block_time, 0)
+        )?;
     }
-    Ok(())
-}
-
-fn write_version<W: io::Write>(
-    w: &mut W,
-    version: TransactionVersion,
-    prefix: &str,
-) -> io::Result<()> {
-    let version = match version {
-        TransactionVersion::Legacy(_) => "legacy".to_string(),
-        TransactionVersion::Number(number) => number.to_string(),
-    };
-    writeln!(w, "{}Version: {}", prefix, version)
-}
-
-fn write_recent_blockhash<W: io::Write>(
-    w: &mut W,
-    recent_blockhash: &Hash,
-    prefix: &str,
-) -> io::Result<()> {
-    writeln!(w, "{}Recent Blockhash: {:?}", prefix, recent_blockhash)
-}
-
-fn write_signatures<W: io::Write>(
-    w: &mut W,
-    signatures: &[Signature],
-    sigverify_status: Option<&[CliSignatureVerificationStatus]>,
-    prefix: &str,
-) -> io::Result<()> {
+    writeln!(
+        w,
+        "{}Recent Blockhash: {:?}",
+        prefix, message.recent_blockhash
+    )?;
     let sigverify_statuses = if let Some(sigverify_status) = sigverify_status {
         sigverify_status
             .iter()
             .map(|s| format!(" ({})", s))
             .collect()
     } else {
-        vec!["".to_string(); signatures.len()]
+        vec!["".to_string(); transaction.signatures.len()]
     };
-    for (signature_index, (signature, sigverify_status)) in
-        signatures.iter().zip(&sigverify_statuses).enumerate()
+    for (signature_index, (signature, sigverify_status)) in transaction
+        .signatures
+        .iter()
+        .zip(&sigverify_statuses)
+        .enumerate()
     {
         writeln!(
             w,
@@ -349,80 +198,44 @@ fn write_signatures<W: io::Write>(
             prefix, signature_index, signature, sigverify_status,
         )?;
     }
-    Ok(())
-}
-
-#[derive(Debug, Clone, Copy, PartialEq)]
-enum AccountKeyType<'a> {
-    Known(&'a Pubkey),
-    Unknown {
-        lookup_index: usize,
-        table_index: u8,
-    },
-}
-
-impl fmt::Display for AccountKeyType<'_> {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        match self {
-            Self::Known(address) => write!(f, "{}", address),
-            Self::Unknown {
-                lookup_index,
-                table_index,
-            } => {
-                write!(
-                    f,
-                    "Unknown Address (uses lookup {} and index {})",
-                    lookup_index, table_index
-                )
-            }
+    let mut fee_payer_index = None;
+    for (account_index, account) in message.account_keys.iter().enumerate() {
+        if fee_payer_index.is_none() && message.is_non_loader_key(account_index) {
+            fee_payer_index = Some(account_index)
         }
-    }
-}
-
-fn write_account<W: io::Write>(
-    w: &mut W,
-    account_index: usize,
-    account_address: AccountKeyType,
-    account_mode: String,
-    is_fee_payer: bool,
-    prefix: &str,
-) -> io::Result<()> {
-    writeln!(
-        w,
-        "{}Account {}: {} {}{}",
-        prefix,
-        account_index,
-        account_mode,
-        account_address,
-        if is_fee_payer { " (fee payer)" } else { "" },
-    )
-}
-
-fn write_instruction<'a, W: io::Write>(
-    w: &mut W,
-    instruction_index: usize,
-    program_pubkey: AccountKeyType,
-    instruction: &CompiledInstruction,
-    instruction_accounts: impl Iterator<Item = (AccountKeyType<'a>, u8)>,
-    prefix: &str,
-) -> io::Result<()> {
-    writeln!(w, "{}Instruction {}", prefix, instruction_index)?;
-    writeln!(
-        w,
-        "{}  Program:   {} ({})",
-        prefix, program_pubkey, instruction.program_id_index
-    )?;
-    for (index, (account_address, account_index)) in instruction_accounts.enumerate() {
         writeln!(
             w,
-            "{}  Account {}: {} ({})",
-            prefix, index, account_address, account_index
+            "{}Account {}: {} {}{}",
+            prefix,
+            account_index,
+            format_account_mode(message, account_index),
+            account,
+            if Some(account_index) == fee_payer_index {
+                " (fee payer)"
+            } else {
+                ""
+            },
         )?;
     }
+    for (instruction_index, instruction) in message.instructions.iter().enumerate() {
+        let program_pubkey = message.account_keys[instruction.program_id_index as usize];
+        writeln!(w, "{}Instruction {}", prefix, instruction_index)?;
+        writeln!(
+            w,
+            "{}  Program:   {} ({})",
+            prefix, program_pubkey, instruction.program_id_index
+        )?;
+        for (account_index, account) in instruction.accounts.iter().enumerate() {
+            let account_pubkey = message.account_keys[*account as usize];
+            writeln!(
+                w,
+                "{}  Account {}: {} ({})",
+                prefix, account_index, account_pubkey, account
+            )?;
+        }
 
-    let mut raw = true;
-    if let AccountKeyType::Known(program_pubkey) = program_pubkey {
-        if program_pubkey == &solana_vote_program::id() {
+        let mut raw = true;
+        if program_pubkey == solana_vote_program::id() {
             if let Ok(vote_instruction) = limited_deserialize::<
                 solana_vote_program::vote_instruction::VoteInstruction,
             >(&instruction.data)
@@ -430,14 +243,14 @@ fn write_instruction<'a, W: io::Write>(
                 writeln!(w, "{}  {:?}", prefix, vote_instruction)?;
                 raw = false;
             }
-        } else if program_pubkey == &stake::program::id() {
+        } else if program_pubkey == stake::program::id() {
             if let Ok(stake_instruction) =
                 limited_deserialize::<stake::instruction::StakeInstruction>(&instruction.data)
             {
                 writeln!(w, "{}  {:?}", prefix, stake_instruction)?;
                 raw = false;
             }
-        } else if program_pubkey == &solana_sdk::system_program::id() {
+        } else if program_pubkey == solana_sdk::system_program::id() {
             if let Ok(system_instruction) = limited_deserialize::<
                 solana_sdk::system_instruction::SystemInstruction,
             >(&instruction.data)
@@ -445,156 +258,110 @@ fn write_instruction<'a, W: io::Write>(
                 writeln!(w, "{}  {:?}", prefix, system_instruction)?;
                 raw = false;
             }
-        } else if is_memo_program(program_pubkey) {
+        } else if is_memo_program(&program_pubkey) {
             if let Ok(s) = std::str::from_utf8(&instruction.data) {
                 writeln!(w, "{}  Data: \"{}\"", prefix, s)?;
                 raw = false;
             }
         }
+
+        if raw {
+            writeln!(w, "{}  Data: {:?}", prefix, instruction.data)?;
+        }
     }
 
-    if raw {
-        writeln!(w, "{}  Data: {:?}", prefix, instruction.data)?;
-    }
-
-    Ok(())
-}
-
-fn write_address_table_lookups<W: io::Write>(
-    w: &mut W,
-    address_table_lookups: &[MessageAddressTableLookup],
-    prefix: &str,
-) -> io::Result<()> {
-    for (lookup_index, lookup) in address_table_lookups.iter().enumerate() {
-        writeln!(w, "{}Address Table Lookup {}", prefix, lookup_index,)?;
-        writeln!(w, "{}  Table Account: {}", prefix, lookup.account_key,)?;
+    if let Some(transaction_status) = transaction_status {
         writeln!(
             w,
-            "{}  Writable Indexes: {:?}",
+            "{}Status: {}",
             prefix,
-            &lookup.writable_indexes[..],
+            match &transaction_status.status {
+                Ok(_) => "Ok".into(),
+                Err(err) => err.to_string(),
+            }
         )?;
         writeln!(
             w,
-            "{}  Readonly Indexes: {:?}",
+            "{}  Fee: ◎{}",
             prefix,
-            &lookup.readonly_indexes[..],
+            lamports_to_sol(transaction_status.fee)
         )?;
-    }
-    Ok(())
-}
-
-fn write_rewards<W: io::Write>(
-    w: &mut W,
-    rewards: Option<&Rewards>,
-    prefix: &str,
-) -> io::Result<()> {
-    if let Some(rewards) = rewards {
-        if !rewards.is_empty() {
-            writeln!(w, "{}Rewards:", prefix,)?;
-            writeln!(
-                w,
-                "{}  {:<44}  {:^15}  {:<16}  {:<20}",
-                prefix, "Address", "Type", "Amount", "New Balance"
-            )?;
-            for reward in rewards {
-                let sign = if reward.lamports < 0 { "-" } else { "" };
+        assert_eq!(
+            transaction_status.pre_balances.len(),
+            transaction_status.post_balances.len()
+        );
+        for (i, (pre, post)) in transaction_status
+            .pre_balances
+            .iter()
+            .zip(transaction_status.post_balances.iter())
+            .enumerate()
+        {
+            if pre == post {
                 writeln!(
                     w,
-                    "{}  {:<44}  {:^15}  {}◎{:<14.9}  ◎{:<18.9}",
+                    "{}  Account {} balance: ◎{}",
                     prefix,
-                    reward.pubkey,
-                    if let Some(reward_type) = reward.reward_type {
-                        format!("{}", reward_type)
-                    } else {
-                        "-".to_string()
-                    },
-                    sign,
-                    lamports_to_sol(reward.lamports.abs() as u64),
-                    lamports_to_sol(reward.post_balance)
+                    i,
+                    lamports_to_sol(*pre)
+                )?;
+            } else {
+                writeln!(
+                    w,
+                    "{}  Account {} balance: ◎{} -> ◎{}",
+                    prefix,
+                    i,
+                    lamports_to_sol(*pre),
+                    lamports_to_sol(*post)
                 )?;
             }
         }
-    }
-    Ok(())
-}
 
-fn write_status<W: io::Write>(
-    w: &mut W,
-    transaction_status: &Result<(), TransactionError>,
-    prefix: &str,
-) -> io::Result<()> {
-    writeln!(
-        w,
-        "{}Status: {}",
-        prefix,
-        match transaction_status {
-            Ok(_) => "Ok".into(),
-            Err(err) => err.to_string(),
-        }
-    )
-}
-
-fn write_fees<W: io::Write>(w: &mut W, transaction_fee: u64, prefix: &str) -> io::Result<()> {
-    writeln!(w, "{}  Fee: ◎{}", prefix, lamports_to_sol(transaction_fee))
-}
-
-fn write_balances<W: io::Write>(
-    w: &mut W,
-    transaction_status: &UiTransactionStatusMeta,
-    prefix: &str,
-) -> io::Result<()> {
-    assert_eq!(
-        transaction_status.pre_balances.len(),
-        transaction_status.post_balances.len()
-    );
-    for (i, (pre, post)) in transaction_status
-        .pre_balances
-        .iter()
-        .zip(transaction_status.post_balances.iter())
-        .enumerate()
-    {
-        if pre == post {
-            writeln!(
-                w,
-                "{}  Account {} balance: ◎{}",
-                prefix,
-                i,
-                lamports_to_sol(*pre)
-            )?;
-        } else {
-            writeln!(
-                w,
-                "{}  Account {} balance: ◎{} -> ◎{}",
-                prefix,
-                i,
-                lamports_to_sol(*pre),
-                lamports_to_sol(*post)
-            )?;
-        }
-    }
-    Ok(())
-}
-
-fn write_log_messages<W: io::Write>(
-    w: &mut W,
-    log_messages: Option<&Vec<String>>,
-    prefix: &str,
-) -> io::Result<()> {
-    if let Some(log_messages) = log_messages {
-        if !log_messages.is_empty() {
-            writeln!(w, "{}Log Messages:", prefix,)?;
-            for log_message in log_messages {
-                writeln!(w, "{}  {}", prefix, log_message)?;
+        if let Some(log_messages) = &transaction_status.log_messages {
+            if !log_messages.is_empty() {
+                writeln!(w, "{}Log Messages:", prefix,)?;
+                for log_message in log_messages {
+                    writeln!(w, "{}  {}", prefix, log_message)?;
+                }
             }
         }
+
+        if let Some(rewards) = &transaction_status.rewards {
+            if !rewards.is_empty() {
+                writeln!(w, "{}Rewards:", prefix,)?;
+                writeln!(
+                    w,
+                    "{}  {:<44}  {:^15}  {:<15}  {:<20}",
+                    prefix, "Address", "Type", "Amount", "New Balance"
+                )?;
+                for reward in rewards {
+                    let sign = if reward.lamports < 0 { "-" } else { "" };
+                    writeln!(
+                        w,
+                        "{}  {:<44}  {:^15}  {}◎{:<14.9}  ◎{:<18.9}",
+                        prefix,
+                        reward.pubkey,
+                        if let Some(reward_type) = reward.reward_type {
+                            format!("{}", reward_type)
+                        } else {
+                            "-".to_string()
+                        },
+                        sign,
+                        lamports_to_sol(reward.lamports.abs() as u64),
+                        lamports_to_sol(reward.post_balance)
+                    )?;
+                }
+            }
+        }
+    } else {
+        writeln!(w, "{}Status: Unavailable", prefix)?;
     }
+
     Ok(())
 }
 
 pub fn println_transaction(
-    transaction: &VersionedTransaction,
-    transaction_status: Option<&UiTransactionStatusMeta>,
+    transaction: &Transaction,
+    transaction_status: &Option<UiTransactionStatusMeta>,
     prefix: &str,
     sigverify_status: Option<&[CliSignatureVerificationStatus]>,
     block_time: Option<UnixTimestamp>,
@@ -607,7 +374,6 @@ pub fn println_transaction(
         prefix,
         sigverify_status,
         block_time,
-        CliTimezone::Local,
     )
     .is_ok()
     {
@@ -619,24 +385,23 @@ pub fn println_transaction(
 
 pub fn writeln_transaction(
     f: &mut dyn fmt::Write,
-    transaction: &VersionedTransaction,
-    transaction_status: Option<&UiTransactionStatusMeta>,
+    transaction: &Transaction,
+    transaction_status: &Option<UiTransactionStatusMeta>,
     prefix: &str,
     sigverify_status: Option<&[CliSignatureVerificationStatus]>,
     block_time: Option<UnixTimestamp>,
 ) -> fmt::Result {
     let mut w = Vec::new();
-    let write_result = write_transaction(
+    if write_transaction(
         &mut w,
         transaction,
         transaction_status,
         prefix,
         sigverify_status,
         block_time,
-        CliTimezone::Local,
-    );
-
-    if write_result.is_ok() {
+    )
+    .is_ok()
+    {
         if let Ok(s) = String::from_utf8(w) {
             write!(f, "{}", s)?;
         }
@@ -662,215 +427,7 @@ pub fn unix_timestamp_to_string(unix_timestamp: UnixTimestamp) -> String {
 
 #[cfg(test)]
 mod test {
-    use {
-        super::*,
-        solana_sdk::{
-            message::{
-                v0::{self, LoadedAddresses},
-                Message as LegacyMessage, MessageHeader, VersionedMessage,
-            },
-            pubkey::Pubkey,
-            signature::{Keypair, Signer},
-            transaction::Transaction,
-        },
-        solana_transaction_status::{Reward, RewardType, TransactionStatusMeta},
-        std::io::BufWriter,
-    };
-
-    fn new_test_keypair() -> Keypair {
-        let secret = ed25519_dalek::SecretKey::from_bytes(&[0u8; 32]).unwrap();
-        let public = ed25519_dalek::PublicKey::from(&secret);
-        let keypair = ed25519_dalek::Keypair { secret, public };
-        Keypair::from_bytes(&keypair.to_bytes()).unwrap()
-    }
-
-    fn new_test_v0_transaction() -> VersionedTransaction {
-        let keypair = new_test_keypair();
-        let account_key = Pubkey::new_from_array([1u8; 32]);
-        let address_table_key = Pubkey::new_from_array([2u8; 32]);
-        VersionedTransaction::try_new(
-            VersionedMessage::V0(v0::Message {
-                header: MessageHeader {
-                    num_required_signatures: 1,
-                    num_readonly_signed_accounts: 0,
-                    num_readonly_unsigned_accounts: 1,
-                },
-                recent_blockhash: Hash::default(),
-                account_keys: vec![keypair.pubkey(), account_key],
-                address_table_lookups: vec![MessageAddressTableLookup {
-                    account_key: address_table_key,
-                    writable_indexes: vec![0],
-                    readonly_indexes: vec![1],
-                }],
-                instructions: vec![CompiledInstruction::new_from_raw_parts(
-                    3,
-                    vec![],
-                    vec![1, 2],
-                )],
-            }),
-            &[&keypair],
-        )
-        .unwrap()
-    }
-
-    #[test]
-    fn test_write_legacy_transaction() {
-        let keypair = new_test_keypair();
-        let account_key = Pubkey::new_from_array([1u8; 32]);
-        let transaction = VersionedTransaction::from(Transaction::new(
-            &[&keypair],
-            LegacyMessage {
-                header: MessageHeader {
-                    num_required_signatures: 1,
-                    num_readonly_signed_accounts: 0,
-                    num_readonly_unsigned_accounts: 1,
-                },
-                recent_blockhash: Hash::default(),
-                account_keys: vec![keypair.pubkey(), account_key],
-                instructions: vec![CompiledInstruction::new_from_raw_parts(1, vec![], vec![0])],
-            },
-            Hash::default(),
-        ));
-
-        let sigverify_status = CliSignatureVerificationStatus::verify_transaction(&transaction);
-        let meta = TransactionStatusMeta {
-            status: Ok(()),
-            fee: 5000,
-            pre_balances: vec![5000, 10_000],
-            post_balances: vec![0, 9_900],
-            inner_instructions: None,
-            log_messages: Some(vec!["Test message".to_string()]),
-            pre_token_balances: None,
-            post_token_balances: None,
-            rewards: Some(vec![Reward {
-                pubkey: account_key.to_string(),
-                lamports: -100,
-                post_balance: 9_900,
-                reward_type: Some(RewardType::Rent),
-                commission: None,
-            }]),
-            loaded_addresses: LoadedAddresses::default(),
-        };
-
-        let output = {
-            let mut write_buffer = BufWriter::new(Vec::new());
-            write_transaction(
-                &mut write_buffer,
-                &transaction,
-                Some(&meta.into()),
-                "",
-                Some(&sigverify_status),
-                Some(1628633791),
-                CliTimezone::Utc,
-            )
-            .unwrap();
-            let bytes = write_buffer.into_inner().unwrap();
-            String::from_utf8(bytes).unwrap()
-        };
-
-        assert_eq!(
-            output,
-            r#"Block Time: 2021-08-10T22:16:31Z
-Version: legacy
-Recent Blockhash: 11111111111111111111111111111111
-Signature 0: 5pkjrE4VBa3Bu9CMKXgh1U345cT1gGo8QBVRTzHAo6gHeiPae5BTbShP15g6NgqRMNqu8Qrhph1ATmrfC1Ley3rx (pass)
-Account 0: srw- 4zvwRjXUKGfvwnParsHAS3HuSVzV5cA4McphgmoCtajS (fee payer)
-Account 1: -r-x 4vJ9JU1bJJE96FWSJKvHsmmFADCg4gpZQff4P3bkLKi
-Instruction 0
-  Program:   4vJ9JU1bJJE96FWSJKvHsmmFADCg4gpZQff4P3bkLKi (1)
-  Account 0: 4zvwRjXUKGfvwnParsHAS3HuSVzV5cA4McphgmoCtajS (0)
-  Data: []
-Status: Ok
-  Fee: ◎0.000005
-  Account 0 balance: ◎0.000005 -> ◎0
-  Account 1 balance: ◎0.00001 -> ◎0.0000099
-Log Messages:
-  Test message
-Rewards:
-  Address                                            Type        Amount            New Balance         \0
-  4vJ9JU1bJJE96FWSJKvHsmmFADCg4gpZQff4P3bkLKi        rent        -◎0.000000100     ◎0.000009900       \0
-"#.replace("\\0", "") // replace marker used to subvert trailing whitespace linter on CI
-        );
-    }
-
-    #[test]
-    fn test_write_v0_transaction() {
-        let versioned_tx = new_test_v0_transaction();
-        let sigverify_status = CliSignatureVerificationStatus::verify_transaction(&versioned_tx);
-        let address_table_entry1 = Pubkey::new_from_array([3u8; 32]);
-        let address_table_entry2 = Pubkey::new_from_array([4u8; 32]);
-        let loaded_addresses = LoadedAddresses {
-            writable: vec![address_table_entry1],
-            readonly: vec![address_table_entry2],
-        };
-        let meta = TransactionStatusMeta {
-            status: Ok(()),
-            fee: 5000,
-            pre_balances: vec![5000, 10_000, 15_000, 20_000],
-            post_balances: vec![0, 10_000, 14_900, 20_000],
-            inner_instructions: None,
-            log_messages: Some(vec!["Test message".to_string()]),
-            pre_token_balances: None,
-            post_token_balances: None,
-            rewards: Some(vec![Reward {
-                pubkey: address_table_entry1.to_string(),
-                lamports: -100,
-                post_balance: 14_900,
-                reward_type: Some(RewardType::Rent),
-                commission: None,
-            }]),
-            loaded_addresses,
-        };
-
-        let output = {
-            let mut write_buffer = BufWriter::new(Vec::new());
-            write_transaction(
-                &mut write_buffer,
-                &versioned_tx,
-                Some(&meta.into()),
-                "",
-                Some(&sigverify_status),
-                Some(1628633791),
-                CliTimezone::Utc,
-            )
-            .unwrap();
-            let bytes = write_buffer.into_inner().unwrap();
-            String::from_utf8(bytes).unwrap()
-        };
-
-        assert_eq!(
-            output,
-            r#"Block Time: 2021-08-10T22:16:31Z
-Version: 0
-Recent Blockhash: 11111111111111111111111111111111
-Signature 0: 5iEy3TT3ZhTA1NkuCY8GrQGNVY8d5m1bpjdh5FT3Ca4Py81fMipAZjafDuKJKrkw5q5UAAd8oPcgZ4nyXpHt4Fp7 (pass)
-Account 0: srw- 4zvwRjXUKGfvwnParsHAS3HuSVzV5cA4McphgmoCtajS (fee payer)
-Account 1: -r-- 4vJ9JU1bJJE96FWSJKvHsmmFADCg4gpZQff4P3bkLKi
-Account 2: -rw- Unknown Address (uses lookup 0 and index 0)
-Account 3: -r-x Unknown Address (uses lookup 0 and index 1)
-Instruction 0
-  Program:   Unknown Address (uses lookup 0 and index 1) (3)
-  Account 0: 4vJ9JU1bJJE96FWSJKvHsmmFADCg4gpZQff4P3bkLKi (1)
-  Account 1: Unknown Address (uses lookup 0 and index 0) (2)
-  Data: []
-Address Table Lookup 0
-  Table Account: 8qbHbw2BbbTHBW1sbeqakYXVKRQM8Ne7pLK7m6CVfeR
-  Writable Indexes: [0]
-  Readonly Indexes: [1]
-Status: Ok
-  Fee: ◎0.000005
-  Account 0 balance: ◎0.000005 -> ◎0
-  Account 1 balance: ◎0.00001
-  Account 2 balance: ◎0.000015 -> ◎0.0000149
-  Account 3 balance: ◎0.00002
-Log Messages:
-  Test message
-Rewards:
-  Address                                            Type        Amount            New Balance         \0
-  CktRuQ2mttgRGkXJtyksdKHjUdc2C4TgDzyB98oEzy8        rent        -◎0.000000100     ◎0.000014900       \0
-"#.replace("\\0", "") // replace marker used to subvert trailing whitespace linter on CI
-        );
-    }
+    use {super::*, solana_sdk::pubkey::Pubkey};
 
     #[test]
     fn test_format_labeled_address() {

cli/Cargo.toml

@@ -3,7 +3,7 @@ authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 edition = "2021"
 name = "solana-cli"
 description = "Blockchain, Rebuilt for Scale"
-version = "1.10.8"
+version = "1.10.0"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
@@ -13,43 +13,43 @@ documentation = "https://docs.rs/solana-cli"
 bincode = "1.3.3"
 bs58 = "0.4.0"
 clap = "2.33.1"
+criterion-stats = "0.3.0"
+ctrlc = { version = "3.2.1", features = ["termination"] }
 console = "0.15.0"
 const_format = "0.2.22"
-criterion-stats = "0.3.0"
 crossbeam-channel = "0.5"
-ctrlc = { version = "3.2.1", features = ["termination"] }
-humantime = "2.0.1"
 log = "0.4.14"
+humantime = "2.0.1"
 num-traits = "0.2"
 pretty-hex = "0.2.1"
-reqwest = { version = "0.11.10", default-features = false, features = ["blocking", "rustls-tls", "json"] }
-semver = "1.0.6"
+reqwest = { version = "0.11.6", default-features = false, features = ["blocking", "rustls-tls", "json"] }
+semver = "1.0.5"
 serde = "1.0.136"
 serde_derive = "1.0.103"
-serde_json = "1.0.79"
-solana-account-decoder = { path = "../account-decoder", version = "=1.10.8" }
-solana-bpf-loader-program = { path = "../programs/bpf_loader", version = "=1.10.8" }
-solana-clap-utils = { path = "../clap-utils", version = "=1.10.8" }
-solana-cli-config = { path = "../cli-config", version = "=1.10.8" }
-solana-cli-output = { path = "../cli-output", version = "=1.10.8" }
-solana-client = { path = "../client", version = "=1.10.8" }
-solana-config-program = { path = "../programs/config", version = "=1.10.8" }
-solana-faucet = { path = "../faucet", version = "=1.10.8" }
-solana-logger = { path = "../logger", version = "=1.10.8" }
-solana-program-runtime = { path = "../program-runtime", version = "=1.10.8" }
-solana-remote-wallet = { path = "../remote-wallet", version = "=1.10.8" }
-solana-sdk = { path = "../sdk", version = "=1.10.8" }
-solana-transaction-status = { path = "../transaction-status", version = "=1.10.8" }
-solana-version = { path = "../version", version = "=1.10.8" }
-solana-vote-program = { path = "../programs/vote", version = "=1.10.8" }
-solana_rbpf = "=0.2.24"
+serde_json = "1.0.78"
+solana-account-decoder = { path = "../account-decoder", version = "=1.10.0" }
+solana-bpf-loader-program = { path = "../programs/bpf_loader", version = "=1.10.0" }
+solana-clap-utils = { path = "../clap-utils", version = "=1.10.0" }
+solana-cli-config = { path = "../cli-config", version = "=1.10.0" }
+solana-cli-output = { path = "../cli-output", version = "=1.10.0" }
+solana-client = { path = "../client", version = "=1.10.0" }
+solana-config-program = { path = "../programs/config", version = "=1.10.0" }
+solana-faucet = { path = "../faucet", version = "=1.10.0" }
+solana-logger = { path = "../logger", version = "=1.10.0" }
+solana-program-runtime = { path = "../program-runtime", version = "=1.10.0" }
+solana_rbpf = "=0.2.23"
+solana-remote-wallet = { path = "../remote-wallet", version = "=1.10.0" }
+solana-sdk = { path = "../sdk", version = "=1.10.0" }
+solana-transaction-status = { path = "../transaction-status", version = "=1.10.0" }
+solana-version = { path = "../version", version = "=1.10.0" }
+solana-vote-program = { path = "../programs/vote", version = "=1.10.0" }
 spl-memo = { version = "=3.0.1", features = ["no-entrypoint"] }
 thiserror = "1.0.30"
 tiny-bip39 = "0.8.2"
 
 [dev-dependencies]
-solana-streamer = { path = "../streamer", version = "=1.10.8" }
-solana-test-validator = { path = "../test-validator", version = "=1.10.8" }
+solana-streamer = { path = "../streamer", version = "=1.10.0" }
+solana-test-validator = { path = "../test-validator", version = "=1.10.0" }
 tempfile = "3.3.0"
 
 [[bin]]

cli/src/cli.rs

@@ -30,7 +30,7 @@ use {
         pubkey::Pubkey,
         signature::{Signature, Signer, SignerError},
         stake::{instruction::LockupArgs, state::Lockup},
-        transaction::{TransactionError, VersionedTransaction},
+        transaction::{Transaction, TransactionError},
     },
     solana_vote_program::vote_state::VoteAuthorize,
     std::{collections::HashMap, error, io::stdout, str::FromStr, sync::Arc, time::Duration},
@@ -88,7 +88,6 @@ pub enum CliCommand {
         timeout: Duration,
         blockhash: Option<Hash>,
         print_timestamp: bool,
-        additional_fee: Option<u32>,
     },
     Rent {
         data_length: usize,
@@ -162,7 +161,6 @@ pub enum CliCommand {
         address: Option<SignerIndex>,
         use_deprecated_loader: bool,
         allow_excessive_balance: bool,
-        skip_fee_check: bool,
     },
     Program(ProgramCliCommand),
     // Stake Commands
@@ -386,7 +384,7 @@ pub enum CliCommand {
         seed: String,
         program_id: Pubkey,
     },
-    DecodeTransaction(VersionedTransaction),
+    DecodeTransaction(Transaction),
     ResolveSigner(Option<String>),
     ShowAccount {
         pubkey: Pubkey,
@@ -745,7 +743,6 @@ pub fn parse_command(
                 signers.push(signer);
                 1
             });
-            let skip_fee_check = matches.is_present("skip_fee_check");
 
             Ok(CliCommandInfo {
                 command: CliCommand::Deploy {
@@ -753,7 +750,6 @@ pub fn parse_command(
                     address,
                     use_deprecated_loader: matches.is_present("use_deprecated_loader"),
                     allow_excessive_balance: matches.is_present("allow_excessive_balance"),
-                    skip_fee_check,
                 },
                 signers,
             })
@@ -981,7 +977,6 @@ pub fn process_command(config: &CliConfig) -> ProcessResult {
             timeout,
             blockhash,
             print_timestamp,
-            additional_fee,
         } => process_ping(
             &rpc_client,
             config,
@@ -990,7 +985,6 @@ pub fn process_command(config: &CliConfig) -> ProcessResult {
             timeout,
             blockhash,
             *print_timestamp,
-            additional_fee,
         ),
         CliCommand::Rent {
             data_length,
@@ -1132,7 +1126,6 @@ pub fn process_command(config: &CliConfig) -> ProcessResult {
             address,
             use_deprecated_loader,
             allow_excessive_balance,
-            skip_fee_check,
         } => process_deploy(
             rpc_client,
             config,
@@ -1140,7 +1133,6 @@ pub fn process_command(config: &CliConfig) -> ProcessResult {
             *address,
             *use_deprecated_loader,
             *allow_excessive_balance,
-            *skip_fee_check,
         ),
         CliCommand::Program(program_subcommand) => {
             process_program_subcommand(rpc_client, config, program_subcommand)
@@ -1972,7 +1964,6 @@ mod tests {
                     address: None,
                     use_deprecated_loader: false,
                     allow_excessive_balance: false,
-                    skip_fee_check: false,
                 },
                 signers: vec![read_keypair_file(&keypair_file).unwrap().into()],
             }
@@ -1995,7 +1986,6 @@ mod tests {
                     address: Some(1),
                     use_deprecated_loader: false,
                     allow_excessive_balance: false,
-                    skip_fee_check: false,
                 },
                 signers: vec![
                     read_keypair_file(&keypair_file).unwrap().into(),
@@ -2389,7 +2379,6 @@ mod tests {
             address: None,
             use_deprecated_loader: false,
             allow_excessive_balance: false,
-            skip_fee_check: false,
         };
         config.output_format = OutputFormat::JsonCompact;
         let result = process_command(&config);
@@ -2410,7 +2399,6 @@ mod tests {
             address: None,
             use_deprecated_loader: false,
             allow_excessive_balance: false,
-            skip_fee_check: false,
         };
         assert!(process_command(&config).is_err());
     }

cli/src/cluster_query.rs

@@ -33,14 +33,12 @@ use {
         rpc_request::DELINQUENT_VALIDATOR_SLOT_DISTANCE,
         rpc_response::SlotInfo,
     },
-    solana_program_runtime::compute_budget,
     solana_remote_wallet::remote_wallet::RemoteWalletManager,
     solana_sdk::{
         account::from_account,
         account_utils::StateMut,
         clock::{self, Clock, Slot},
         commitment_config::CommitmentConfig,
-        compute_budget::ComputeBudgetInstruction,
         epoch_schedule::Epoch,
         hash::Hash,
         message::Message,
@@ -271,13 +269,6 @@ impl ClusterQuerySubCommands for App<'_, '_> {
                         .default_value("15")
                         .help("Wait up to timeout seconds for transaction confirmation"),
                 )
-                .arg(
-                    Arg::with_name("additional_fee")
-                        .long("additional-fee")
-                        .value_name("NUMBER")
-                        .takes_value(true)
-                        .help("Request additional-fee for transaction"),
-                )
                 .arg(blockhash_arg()),
         )
         .subcommand(
@@ -522,7 +513,6 @@ pub fn parse_cluster_ping(
     let timeout = Duration::from_secs(value_t_or_exit!(matches, "timeout", u64));
     let blockhash = value_of(matches, BLOCKHASH_ARG.name);
     let print_timestamp = matches.is_present("print_timestamp");
-    let additional_fee = value_of(matches, "additional_fee");
     Ok(CliCommandInfo {
         command: CliCommand::Ping {
             interval,
@@ -530,7 +520,6 @@ pub fn parse_cluster_ping(
             timeout,
             blockhash,
             print_timestamp,
-            additional_fee,
         },
         signers: vec![default_signer.signer_from_path(matches, wallet_manager)?],
     })
@@ -1058,7 +1047,6 @@ pub fn process_get_block(
             RpcBlockConfig {
                 encoding: Some(UiTransactionEncoding::Base64),
                 commitment: Some(CommitmentConfig::confirmed()),
-                max_supported_transaction_version: Some(0),
                 ..RpcBlockConfig::default()
             },
         )?
@@ -1362,7 +1350,6 @@ pub fn process_ping(
     timeout: &Duration,
     fixed_blockhash: &Option<Hash>,
     print_timestamp: bool,
-    additional_fee: &Option<u32>,
 ) -> ProcessResult {
     let (signal_sender, signal_receiver) = unbounded();
     ctrlc::set_handler(move || {
@@ -1387,7 +1374,6 @@ pub fn process_ping(
             blockhash_from_cluster = true;
         }
     }
-
     'mainloop: for seq in 0..count.unwrap_or(std::u64::MAX) {
         let now = Instant::now();
         if fixed_blockhash.is_none() && now.duration_since(blockhash_acquired).as_secs() > 60 {
@@ -1402,18 +1388,8 @@ pub fn process_ping(
         lamports += 1;
 
         let build_message = |lamports| {
-            let mut ixs = vec![system_instruction::transfer(
-                &config.signers[0].pubkey(),
-                &to,
-                lamports,
-            )];
-            if let Some(additional_fee) = additional_fee {
-                ixs.push(ComputeBudgetInstruction::request_units(
-                    compute_budget::DEFAULT_UNITS,
-                    *additional_fee,
-                ));
-            }
-            Message::new(&ixs, Some(&config.signers[0].pubkey()))
+            let ix = system_instruction::transfer(&config.signers[0].pubkey(), &to, lamports);
+            Message::new(&[ix], Some(&config.signers[0].pubkey()))
         };
         let (message, _) = resolve_spend_tx_and_check_account_balance(
             rpc_client,
@@ -2043,7 +2019,6 @@ pub fn process_transaction_history(
                     RpcTransactionConfig {
                         encoding: Some(UiTransactionEncoding::Base64),
                         commitment: Some(CommitmentConfig::confirmed()),
-                        max_supported_transaction_version: Some(0),
                     },
                 ) {
                     Ok(confirmed_transaction) => {
@@ -2053,7 +2028,7 @@ pub fn process_transaction_history(
                                 .transaction
                                 .decode()
                                 .expect("Successful decode"),
-                            confirmed_transaction.transaction.meta.as_ref(),
+                            &confirmed_transaction.transaction.meta,
                             "  ",
                             None,
                             None,
@@ -2337,7 +2312,6 @@ mod tests {
                         Hash::from_str("4CCNp28j6AhGq7PkjPDP4wbQWBS8LLbQin2xV5n8frKX").unwrap()
                     ),
                     print_timestamp: true,
-                    additional_fee: None,
                 },
                 signers: vec![default_keypair.into()],
             }

cli/src/program.rs

@@ -66,7 +66,6 @@ pub enum ProgramCliCommand {
         is_final: bool,
         max_len: Option<usize>,
         allow_excessive_balance: bool,
-        skip_fee_check: bool,
     },
     WriteBuffer {
         program_location: String,
@@ -74,7 +73,6 @@ pub enum ProgramCliCommand {
         buffer_pubkey: Option<Pubkey>,
         buffer_authority_signer_index: Option<SignerIndex>,
         max_len: Option<usize>,
-        skip_fee_check: bool,
     },
     SetBufferAuthority {
         buffer_pubkey: Pubkey,
@@ -116,13 +114,6 @@ impl ProgramSubCommands for App<'_, '_> {
             SubCommand::with_name("program")
                 .about("Program management")
                 .setting(AppSettings::SubcommandRequiredElseHelp)
-                .arg(
-                    Arg::with_name("skip_fee_check")
-                        .long("skip-fee-check")
-                        .hidden(true)
-                        .takes_value(false)
-                        .global(true)
-                )
                 .subcommand(
                     SubCommand::with_name("deploy")
                         .about("Deploy a program")
@@ -415,12 +406,6 @@ impl ProgramSubCommands for App<'_, '_> {
                         .long("allow-excessive-deploy-account-balance")
                         .takes_value(false)
                         .help("Use the designated program id, even if the account already holds a large balance of SOL")
-                )
-                .arg(
-                    Arg::with_name("skip_fee_check")
-                        .long("skip-fee-check")
-                        .hidden(true)
-                        .takes_value(false)
                 ),
         )
     }
@@ -431,14 +416,7 @@ pub fn parse_program_subcommand(
     default_signer: &DefaultSigner,
     wallet_manager: &mut Option<Arc<RemoteWalletManager>>,
 ) -> Result<CliCommandInfo, CliError> {
-    let (subcommand, sub_matches) = matches.subcommand();
-    let matches_skip_fee_check = matches.is_present("skip_fee_check");
-    let sub_matches_skip_fee_check = sub_matches
-        .map(|m| m.is_present("skip_fee_check"))
-        .unwrap_or(false);
-    let skip_fee_check = matches_skip_fee_check || sub_matches_skip_fee_check;
-
-    let response = match (subcommand, sub_matches) {
+    let response = match matches.subcommand() {
         ("deploy", Some(matches)) => {
             let mut bulk_signers = vec![Some(
                 default_signer.signer_from_path(matches, wallet_manager)?,
@@ -498,7 +476,6 @@ pub fn parse_program_subcommand(
                     is_final: matches.is_present("final"),
                     max_len,
                     allow_excessive_balance: matches.is_present("allow_excessive_balance"),
-                    skip_fee_check,
                 }),
                 signers: signer_info.signers,
             }
@@ -544,7 +521,6 @@ pub fn parse_program_subcommand(
                     buffer_authority_signer_index: signer_info
                         .index_of_or_none(buffer_authority_pubkey),
                     max_len,
-                    skip_fee_check,
                 }),
                 signers: signer_info.signers,
             }
@@ -693,7 +669,6 @@ pub fn process_program_subcommand(
             is_final,
             max_len,
             allow_excessive_balance,
-            skip_fee_check,
         } => process_program_deploy(
             rpc_client,
             config,
@@ -706,7 +681,6 @@ pub fn process_program_subcommand(
             *is_final,
             *max_len,
             *allow_excessive_balance,
-            *skip_fee_check,
         ),
         ProgramCliCommand::WriteBuffer {
             program_location,
@@ -714,7 +688,6 @@ pub fn process_program_subcommand(
             buffer_pubkey,
             buffer_authority_signer_index,
             max_len,
-            skip_fee_check,
         } => process_write_buffer(
             rpc_client,
             config,
@@ -723,7 +696,6 @@ pub fn process_program_subcommand(
             *buffer_pubkey,
             *buffer_authority_signer_index,
             *max_len,
-            *skip_fee_check,
         ),
         ProgramCliCommand::SetBufferAuthority {
             buffer_pubkey,
@@ -821,7 +793,6 @@ fn process_program_deploy(
     is_final: bool,
     max_len: Option<usize>,
     allow_excessive_balance: bool,
-    skip_fee_check: bool,
 ) -> ProcessResult {
     let (words, mnemonic, buffer_keypair) = create_ephemeral_keypair()?;
     let (buffer_provided, buffer_signer, buffer_pubkey) = if let Some(i) = buffer_signer_index {
@@ -976,7 +947,6 @@ fn process_program_deploy(
             &buffer_pubkey,
             Some(upgrade_authority_signer),
             allow_excessive_balance,
-            skip_fee_check,
         )
     } else {
         do_process_program_upgrade(
@@ -987,7 +957,6 @@ fn process_program_deploy(
             config.signers[upgrade_authority_signer_index],
             &buffer_pubkey,
             buffer_signer,
-            skip_fee_check,
         )
     };
     if result.is_ok() && is_final {
@@ -1014,7 +983,6 @@ fn process_write_buffer(
     buffer_pubkey: Option<Pubkey>,
     buffer_authority_signer_index: Option<SignerIndex>,
     max_len: Option<usize>,
-    skip_fee_check: bool,
 ) -> ProcessResult {
     // Create ephemeral keypair to use for Buffer account, if not provided
     let (words, mnemonic, buffer_keypair) = create_ephemeral_keypair()?;
@@ -1082,7 +1050,6 @@ fn process_write_buffer(
         &buffer_pubkey,
         Some(buffer_authority),
         true,
-        skip_fee_check,
     );
 
     if result.is_err() && buffer_signer_index.is_none() && buffer_signer.is_some() {
@@ -1669,7 +1636,6 @@ pub fn process_deploy(
     buffer_signer_index: Option<SignerIndex>,
     use_deprecated_loader: bool,
     allow_excessive_balance: bool,
-    skip_fee_check: bool,
 ) -> ProcessResult {
     // Create ephemeral keypair to use for Buffer account, if not provided
     let (words, mnemonic, buffer_keypair) = create_ephemeral_keypair()?;
@@ -1700,7 +1666,6 @@ pub fn process_deploy(
         &buffer_signer.pubkey(),
         Some(buffer_signer),
         allow_excessive_balance,
-        skip_fee_check,
     );
     if result.is_err() && buffer_signer_index.is_none() {
         report_ephemeral_mnemonic(words, mnemonic);
@@ -1739,7 +1704,6 @@ fn do_process_program_write_and_deploy(
     buffer_pubkey: &Pubkey,
     buffer_authority_signer: Option<&dyn Signer>,
     allow_excessive_balance: bool,
-    skip_fee_check: bool,
 ) -> ProcessResult {
     // Build messages to calculate fees
     let mut messages: Vec<&Message> = Vec::new();
@@ -1870,9 +1834,7 @@ fn do_process_program_write_and_deploy(
         messages.push(message);
     }
 
-    if !skip_fee_check {
-        check_payer(&rpc_client, config, balance_needed, &messages)?;
-    }
+    check_payer(&rpc_client, config, balance_needed, &messages)?;
 
     send_deploy_messages(
         rpc_client,
@@ -1906,7 +1868,6 @@ fn do_process_program_upgrade(
     upgrade_authority: &dyn Signer,
     buffer_pubkey: &Pubkey,
     buffer_signer: Option<&dyn Signer>,
-    skip_fee_check: bool,
 ) -> ProcessResult {
     let loader_id = bpf_loader_upgradeable::id();
     let data_len = program_data.len();
@@ -2006,10 +1967,7 @@ fn do_process_program_upgrade(
     );
     messages.push(&final_message);
 
-    if !skip_fee_check {
-        check_payer(&rpc_client, config, balance_needed, &messages)?;
-    }
-
+    check_payer(&rpc_client, config, balance_needed, &messages)?;
     send_deploy_messages(
         rpc_client,
         config,
@@ -2297,7 +2255,6 @@ mod tests {
                     is_final: false,
                     max_len: None,
                     allow_excessive_balance: false,
-                    skip_fee_check: false,
                 }),
                 signers: vec![read_keypair_file(&keypair_file).unwrap().into()],
             }
@@ -2324,7 +2281,6 @@ mod tests {
                     is_final: false,
                     max_len: Some(42),
                     allow_excessive_balance: false,
-                    skip_fee_check: false,
                 }),
                 signers: vec![read_keypair_file(&keypair_file).unwrap().into()],
             }
@@ -2353,7 +2309,6 @@ mod tests {
                     is_final: false,
                     max_len: None,
                     allow_excessive_balance: false,
-                    skip_fee_check: false,
                 }),
                 signers: vec![
                     read_keypair_file(&keypair_file).unwrap().into(),
@@ -2384,7 +2339,6 @@ mod tests {
                     is_final: false,
                     max_len: None,
                     allow_excessive_balance: false,
-                    skip_fee_check: false,
                 }),
                 signers: vec![read_keypair_file(&keypair_file).unwrap().into()],
             }
@@ -2414,7 +2368,6 @@ mod tests {
                     is_final: false,
                     max_len: None,
                     allow_excessive_balance: false,
-                    skip_fee_check: false,
                 }),
                 signers: vec![
                     read_keypair_file(&keypair_file).unwrap().into(),
@@ -2447,7 +2400,6 @@ mod tests {
                     is_final: false,
                     max_len: None,
                     allow_excessive_balance: false,
-                    skip_fee_check: false,
                 }),
                 signers: vec![
                     read_keypair_file(&keypair_file).unwrap().into(),
@@ -2475,7 +2427,6 @@ mod tests {
                     upgrade_authority_signer_index: 0,
                     is_final: true,
                     max_len: None,
-                    skip_fee_check: false,
                     allow_excessive_balance: false,
                 }),
                 signers: vec![read_keypair_file(&keypair_file).unwrap().into()],
@@ -2509,7 +2460,6 @@ mod tests {
                     buffer_pubkey: None,
                     buffer_authority_signer_index: Some(0),
                     max_len: None,
-                    skip_fee_check: false,
                 }),
                 signers: vec![read_keypair_file(&keypair_file).unwrap().into()],
             }
@@ -2533,7 +2483,6 @@ mod tests {
                     buffer_pubkey: None,
                     buffer_authority_signer_index: Some(0),
                     max_len: Some(42),
-                    skip_fee_check: false,
                 }),
                 signers: vec![read_keypair_file(&keypair_file).unwrap().into()],
             }
@@ -2560,7 +2509,6 @@ mod tests {
                     buffer_pubkey: Some(buffer_keypair.pubkey()),
                     buffer_authority_signer_index: Some(0),
                     max_len: None,
-                    skip_fee_check: false,
                 }),
                 signers: vec![
                     read_keypair_file(&keypair_file).unwrap().into(),
@@ -2590,7 +2538,6 @@ mod tests {
                     buffer_pubkey: None,
                     buffer_authority_signer_index: Some(1),
                     max_len: None,
-                    skip_fee_check: false,
                 }),
                 signers: vec![
                     read_keypair_file(&keypair_file).unwrap().into(),
@@ -2625,7 +2572,6 @@ mod tests {
                     buffer_pubkey: Some(buffer_keypair.pubkey()),
                     buffer_authority_signer_index: Some(2),
                     max_len: None,
-                    skip_fee_check: false,
                 }),
                 signers: vec![
                     read_keypair_file(&keypair_file).unwrap().into(),
@@ -3068,7 +3014,6 @@ mod tests {
                 is_final: false,
                 max_len: None,
                 allow_excessive_balance: false,
-                skip_fee_check: false,
             }),
             signers: vec![&default_keypair],
             output_format: OutputFormat::JsonCompact,

cli/src/stake.rs

@@ -1383,12 +1383,17 @@ pub fn process_stake_authorize(
             };
             if let Some(authorized) = authorized {
                 match authorization_type {
-                    StakeAuthorize::Staker => check_current_authority(
-                        &[authorized.withdrawer, authorized.staker],
-                        &authority.pubkey(),
-                    )?,
+                    StakeAuthorize::Staker => {
+                        // first check authorized withdrawer
+                        check_current_authority(&authorized.withdrawer, &authority.pubkey())
+                            .or_else(|_| {
+                                // ...then check authorized staker. If neither matches, error will
+                                // print the stake key as `expected`
+                                check_current_authority(&authorized.staker, &authority.pubkey())
+                            })?;
+                    }
                     StakeAuthorize::Withdrawer => {
-                        check_current_authority(&[authorized.withdrawer], &authority.pubkey())?;
+                        check_current_authority(&authorized.withdrawer, &authority.pubkey())?;
                     }
                 }
             } else {
@@ -1930,7 +1935,7 @@ pub fn process_stake_set_lockup(
         };
         if let Some(lockup) = lockup {
             if lockup.custodian != Pubkey::default() {
-                check_current_authority(&[lockup.custodian], &custodian.pubkey())?;
+                check_current_authority(&lockup.custodian, &custodian.pubkey())?;
             }
         } else {
             return Err(CliError::RpcRequestError(format!(
@@ -2114,13 +2119,13 @@ fn get_stake_account_state(
 }
 
 pub(crate) fn check_current_authority(
-    permitted_authorities: &[Pubkey],
+    account_current_authority: &Pubkey,
     provided_current_authority: &Pubkey,
 ) -> Result<(), CliError> {
-    if !permitted_authorities.contains(provided_current_authority) {
+    if account_current_authority != provided_current_authority {
         Err(CliError::RpcRequestError(format!(
-            "Invalid authority provided: {:?}, expected {:?}",
-            provided_current_authority, permitted_authorities
+            "Invalid current authority provided: {:?}, expected {:?}",
+            provided_current_authority, account_current_authority
         )))
     } else {
         Ok(())

cli/src/validator_info.rs

@@ -291,12 +291,8 @@ pub fn process_set_validator_info(
     // Check existence of validator-info account
     let balance = rpc_client.get_balance(&info_pubkey).unwrap_or(0);
 
-    let keys = vec![
-        (validator_info::id(), false),
-        (config.signers[0].pubkey(), true),
-    ];
-    let data_len = ValidatorInfo::max_space() + ConfigKeys::serialized_size(keys.clone());
-    let lamports = rpc_client.get_minimum_balance_for_rent_exemption(data_len as usize)?;
+    let lamports =
+        rpc_client.get_minimum_balance_for_rent_exemption(ValidatorInfo::max_space() as usize)?;
 
     let signers = if balance == 0 {
         if info_pubkey != info_keypair.pubkey() {
@@ -312,7 +308,10 @@ pub fn process_set_validator_info(
     };
 
     let build_message = |lamports| {
-        let keys = keys.clone();
+        let keys = vec![
+            (validator_info::id(), false),
+            (config.signers[0].pubkey(), true),
+        ];
         if balance == 0 {
             println!(
                 "Publishing info for Validator {:?}",

cli/src/vote.rs

@@ -910,10 +910,7 @@ pub fn process_vote_authorize(
                             "Invalid vote account state; no authorized voters found".to_string(),
                         )
                     })?;
-                check_current_authority(
-                    &[current_authorized_voter, vote_state.authorized_withdrawer],
-                    &authorized.pubkey(),
-                )?;
+                check_current_authority(&current_authorized_voter, &authorized.pubkey())?;
                 if let Some(signer) = new_authorized_signer {
                     if signer.is_interactive() {
                         return Err(CliError::BadParameter(format!(
@@ -930,7 +927,7 @@ pub fn process_vote_authorize(
                 (new_authorized_pubkey, "new_authorized_pubkey".to_string()),
             )?;
             if let Some(vote_state) = vote_state {
-                check_current_authority(&[vote_state.authorized_withdrawer], &authorized.pubkey())?
+                check_current_authority(&vote_state.authorized_withdrawer, &authorized.pubkey())?
             }
         }
     }

cli/src/wallet.rs

@@ -37,12 +37,9 @@ use {
         stake,
         system_instruction::{self, SystemError},
         system_program,
-        transaction::{Transaction, VersionedTransaction},
-    },
-    solana_transaction_status::{
-        EncodableWithMeta, EncodedConfirmedTransactionWithStatusMeta, EncodedTransaction,
-        TransactionBinaryEncoding, UiTransactionEncoding,
+        transaction::Transaction,
     },
+    solana_transaction_status::{Encodable, EncodedTransaction, UiTransactionEncoding},
     std::{fmt::Write as FmtWrite, fs::File, io::Write, sync::Arc},
 };
 
@@ -192,7 +189,7 @@ impl WalletSubCommands for App<'_, '_> {
                     Arg::with_name("encoding")
                         .index(2)
                         .value_name("ENCODING")
-                        .possible_values(&["base58", "base64"]) // Variants of `TransactionBinaryEncoding` enum
+                        .possible_values(&["base58", "base64"]) // Subset of `UiTransactionEncoding` enum
                         .default_value("base58")
                         .takes_value(true)
                         .required(true)
@@ -276,14 +273,11 @@ impl WalletSubCommands for App<'_, '_> {
 }
 
 fn resolve_derived_address_program_id(matches: &ArgMatches<'_>, arg_name: &str) -> Option<Pubkey> {
-    matches.value_of(arg_name).and_then(|v| {
-        let upper = v.to_ascii_uppercase();
-        match upper.as_str() {
-            "NONCE" | "SYSTEM" => Some(system_program::id()),
-            "STAKE" => Some(stake::program::id()),
-            "VOTE" => Some(solana_vote_program::id()),
-            _ => pubkey_of(matches, arg_name),
-        }
+    matches.value_of(arg_name).and_then(|v| match v {
+        "NONCE" => Some(system_program::id()),
+        "STAKE" => Some(stake::program::id()),
+        "VOTE" => Some(solana_vote_program::id()),
+        _ => pubkey_of(matches, arg_name),
     })
 }
 
@@ -344,13 +338,13 @@ pub fn parse_balance(
 
 pub fn parse_decode_transaction(matches: &ArgMatches<'_>) -> Result<CliCommandInfo, CliError> {
     let blob = value_t_or_exit!(matches, "transaction", String);
-    let binary_encoding = match matches.value_of("encoding").unwrap() {
-        "base58" => TransactionBinaryEncoding::Base58,
-        "base64" => TransactionBinaryEncoding::Base64,
+    let encoding = match matches.value_of("encoding").unwrap() {
+        "base58" => UiTransactionEncoding::Base58,
+        "base64" => UiTransactionEncoding::Base64,
         _ => unreachable!(),
     };
 
-    let encoded_transaction = EncodedTransaction::Binary(blob, binary_encoding);
+    let encoded_transaction = EncodedTransaction::Binary(blob, encoding);
     if let Some(transaction) = encoded_transaction.decode() {
         Ok(CliCommandInfo {
             command: CliCommand::DecodeTransaction(transaction),
@@ -562,25 +556,22 @@ pub fn process_confirm(
                         RpcTransactionConfig {
                             encoding: Some(UiTransactionEncoding::Base64),
                             commitment: Some(CommitmentConfig::confirmed()),
-                            max_supported_transaction_version: Some(0),
                         },
                     ) {
                         Ok(confirmed_transaction) => {
-                            let EncodedConfirmedTransactionWithStatusMeta {
-                                block_time,
-                                slot,
-                                transaction: transaction_with_meta,
-                            } = confirmed_transaction;
-
-                            let decoded_transaction =
-                                transaction_with_meta.transaction.decode().unwrap();
-                            let json_transaction = decoded_transaction.json_encode();
+                            let decoded_transaction = confirmed_transaction
+                                .transaction
+                                .transaction
+                                .decode()
+                                .expect("Successful decode");
+                            let json_transaction =
+                                decoded_transaction.encode(UiTransactionEncoding::Json);
 
                             transaction = Some(CliTransaction {
                                 transaction: json_transaction,
-                                meta: transaction_with_meta.meta,
-                                block_time,
-                                slot: Some(slot),
+                                meta: confirmed_transaction.transaction.meta,
+                                block_time: confirmed_transaction.block_time,
+                                slot: Some(confirmed_transaction.slot),
                                 decoded_transaction,
                                 prefix: "  ".to_string(),
                                 sigverify_status: vec![],
@@ -612,14 +603,11 @@ pub fn process_confirm(
 }
 
 #[allow(clippy::unnecessary_wraps)]
-pub fn process_decode_transaction(
-    config: &CliConfig,
-    transaction: &VersionedTransaction,
-) -> ProcessResult {
+pub fn process_decode_transaction(config: &CliConfig, transaction: &Transaction) -> ProcessResult {
     let sigverify_status = CliSignatureVerificationStatus::verify_transaction(transaction);
     let decode_transaction = CliTransaction {
         decoded_transaction: transaction.clone(),
-        transaction: transaction.json_encode(),
+        transaction: transaction.encode(UiTransactionEncoding::Json),
         meta: None,
         block_time: None,
         slot: None,

cli/tests/program.rs

@@ -62,7 +62,6 @@ fn test_cli_program_deploy_non_upgradeable() {
         address: None,
         use_deprecated_loader: false,
         allow_excessive_balance: false,
-        skip_fee_check: false,
     };
     config.output_format = OutputFormat::JsonCompact;
     let response = process_command(&config);
@@ -92,7 +91,6 @@ fn test_cli_program_deploy_non_upgradeable() {
         address: Some(1),
         use_deprecated_loader: false,
         allow_excessive_balance: false,
-        skip_fee_check: false,
     };
     process_command(&config).unwrap();
     let account1 = rpc_client
@@ -120,7 +118,6 @@ fn test_cli_program_deploy_non_upgradeable() {
         address: Some(1),
         use_deprecated_loader: false,
         allow_excessive_balance: false,
-        skip_fee_check: false,
     };
     process_command(&config).unwrap_err();
 
@@ -130,7 +127,6 @@ fn test_cli_program_deploy_non_upgradeable() {
         address: Some(1),
         use_deprecated_loader: false,
         allow_excessive_balance: true,
-        skip_fee_check: false,
     };
     process_command(&config).unwrap();
     let account2 = rpc_client
@@ -197,7 +193,6 @@ fn test_cli_program_deploy_no_authority() {
         upgrade_authority_signer_index: 1,
         is_final: true,
         max_len: None,
-        skip_fee_check: false,
     });
     config.output_format = OutputFormat::JsonCompact;
     let response = process_command(&config);
@@ -223,7 +218,6 @@ fn test_cli_program_deploy_no_authority() {
         upgrade_authority_signer_index: 1,
         is_final: false,
         max_len: None,
-        skip_fee_check: false,
     });
     process_command(&config).unwrap_err();
 }
@@ -284,7 +278,6 @@ fn test_cli_program_deploy_with_authority() {
         upgrade_authority_signer_index: 1,
         is_final: false,
         max_len: Some(max_len),
-        skip_fee_check: false,
     });
     config.output_format = OutputFormat::JsonCompact;
     let response = process_command(&config);
@@ -332,7 +325,6 @@ fn test_cli_program_deploy_with_authority() {
         upgrade_authority_signer_index: 1,
         is_final: false,
         max_len: Some(max_len),
-        skip_fee_check: false,
     });
     let response = process_command(&config);
     let json: Value = serde_json::from_str(&response.unwrap()).unwrap();
@@ -374,7 +366,6 @@ fn test_cli_program_deploy_with_authority() {
         upgrade_authority_signer_index: 1,
         is_final: false,
         max_len: Some(max_len),
-        skip_fee_check: false,
     });
     process_command(&config).unwrap();
     let program_account = rpc_client.get_account(&program_pubkey).unwrap();
@@ -429,7 +420,6 @@ fn test_cli_program_deploy_with_authority() {
         upgrade_authority_signer_index: 1,
         is_final: false,
         max_len: None,
-        skip_fee_check: false,
     });
     process_command(&config).unwrap();
     let program_account = rpc_client.get_account(&program_pubkey).unwrap();
@@ -504,7 +494,6 @@ fn test_cli_program_deploy_with_authority() {
         upgrade_authority_signer_index: 1,
         is_final: false,
         max_len: None,
-        skip_fee_check: false,
     });
     process_command(&config).unwrap_err();
 
@@ -520,7 +509,6 @@ fn test_cli_program_deploy_with_authority() {
         upgrade_authority_signer_index: 1,
         is_final: true,
         max_len: None,
-        skip_fee_check: false,
     });
     let response = process_command(&config);
     let json: Value = serde_json::from_str(&response.unwrap()).unwrap();
@@ -623,7 +611,6 @@ fn test_cli_program_close_program() {
         upgrade_authority_signer_index: 1,
         is_final: false,
         max_len: Some(max_len),
-        skip_fee_check: false,
     });
     config.output_format = OutputFormat::JsonCompact;
     process_command(&config).unwrap();
@@ -708,7 +695,6 @@ fn test_cli_program_write_buffer() {
         buffer_pubkey: None,
         buffer_authority_signer_index: None,
         max_len: None,
-        skip_fee_check: false,
     });
     config.output_format = OutputFormat::JsonCompact;
     let response = process_command(&config);
@@ -743,7 +729,6 @@ fn test_cli_program_write_buffer() {
         buffer_pubkey: Some(buffer_keypair.pubkey()),
         buffer_authority_signer_index: None,
         max_len: Some(max_len),
-        skip_fee_check: false,
     });
     let response = process_command(&config);
     let json: Value = serde_json::from_str(&response.unwrap()).unwrap();
@@ -805,7 +790,6 @@ fn test_cli_program_write_buffer() {
         buffer_pubkey: Some(buffer_keypair.pubkey()),
         buffer_authority_signer_index: Some(2),
         max_len: None,
-        skip_fee_check: false,
     });
     let response = process_command(&config);
     let json: Value = serde_json::from_str(&response.unwrap()).unwrap();
@@ -843,7 +827,6 @@ fn test_cli_program_write_buffer() {
         buffer_pubkey: None,
         buffer_authority_signer_index: Some(2),
         max_len: None,
-        skip_fee_check: false,
     });
     let response = process_command(&config);
     let json: Value = serde_json::from_str(&response.unwrap()).unwrap();
@@ -916,7 +899,6 @@ fn test_cli_program_write_buffer() {
         buffer_pubkey: None,
         buffer_authority_signer_index: None,
         max_len: None,
-        skip_fee_check: false,
     });
     config.output_format = OutputFormat::JsonCompact;
     let response = process_command(&config);
@@ -956,7 +938,6 @@ fn test_cli_program_write_buffer() {
         buffer_pubkey: Some(buffer_keypair.pubkey()),
         buffer_authority_signer_index: None,
         max_len: None, //Some(max_len),
-        skip_fee_check: false,
     });
     process_command(&config).unwrap();
     config.signers = vec![&keypair, &buffer_keypair];
@@ -970,7 +951,6 @@ fn test_cli_program_write_buffer() {
         upgrade_authority_signer_index: 1,
         is_final: true,
         max_len: None,
-        skip_fee_check: false,
     });
     config.output_format = OutputFormat::JsonCompact;
     let error = process_command(&config).unwrap_err();
@@ -1028,7 +1008,6 @@ fn test_cli_program_set_buffer_authority() {
         buffer_pubkey: Some(buffer_keypair.pubkey()),
         buffer_authority_signer_index: None,
         max_len: None,
-        skip_fee_check: false,
     });
     process_command(&config).unwrap();
     let buffer_account = rpc_client.get_account(&buffer_keypair.pubkey()).unwrap();
@@ -1144,7 +1123,6 @@ fn test_cli_program_mismatch_buffer_authority() {
         buffer_pubkey: Some(buffer_keypair.pubkey()),
         buffer_authority_signer_index: Some(2),
         max_len: None,
-        skip_fee_check: false,
     });
     process_command(&config).unwrap();
     let buffer_account = rpc_client.get_account(&buffer_keypair.pubkey()).unwrap();
@@ -1167,7 +1145,6 @@ fn test_cli_program_mismatch_buffer_authority() {
         upgrade_authority_signer_index: 1,
         is_final: true,
         max_len: None,
-        skip_fee_check: false,
     });
     process_command(&config).unwrap_err();
 
@@ -1183,7 +1160,6 @@ fn test_cli_program_mismatch_buffer_authority() {
         upgrade_authority_signer_index: 1,
         is_final: true,
         max_len: None,
-        skip_fee_check: false,
     });
     process_command(&config).unwrap();
 }
@@ -1240,7 +1216,6 @@ fn test_cli_program_show() {
         buffer_pubkey: Some(buffer_keypair.pubkey()),
         buffer_authority_signer_index: Some(2),
         max_len: None,
-        skip_fee_check: false,
     });
     process_command(&config).unwrap();
 
@@ -1300,7 +1275,6 @@ fn test_cli_program_show() {
         upgrade_authority_signer_index: 1,
         is_final: false,
         max_len: Some(max_len),
-        skip_fee_check: false,
     });
     config.output_format = OutputFormat::JsonCompact;
     let min_slot = rpc_client.get_slot().unwrap();
@@ -1427,7 +1401,6 @@ fn test_cli_program_dump() {
         buffer_pubkey: Some(buffer_keypair.pubkey()),
         buffer_authority_signer_index: Some(2),
         max_len: None,
-        skip_fee_check: false,
     });
     process_command(&config).unwrap();
 

client-test/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "solana-client-test"
-version = "1.10.8"
+version = "1.10.0"
 description = "Solana RPC Test"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -8,31 +8,30 @@ license = "Apache-2.0"
 homepage = "https://solana.com/"
 documentation = "https://docs.rs/solana-client-test"
 edition = "2021"
-publish = false
 
 [dependencies]
-futures-util = "0.3.21"
-serde_json = "1.0.79"
-serial_test = "0.6.0"
-solana-client = { path = "../client", version = "=1.10.8" }
-solana-ledger = { path = "../ledger", version = "=1.10.8" }
-solana-measure = { path = "../measure", version = "=1.10.8" }
-solana-merkle-tree = { path = "../merkle-tree", version = "=1.10.8" }
-solana-metrics = { path = "../metrics", version = "=1.10.8" }
-solana-perf = { path = "../perf", version = "=1.10.8" }
-solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "=1.10.8" }
-solana-rpc = { path = "../rpc", version = "=1.10.8" }
-solana-runtime = { path = "../runtime", version = "=1.10.8" }
-solana-sdk = { path = "../sdk", version = "=1.10.8" }
-solana-streamer = { path = "../streamer", version = "=1.10.8" }
-solana-test-validator = { path = "../test-validator", version = "=1.10.8" }
-solana-transaction-status = { path = "../transaction-status", version = "=1.10.8" }
-solana-version = { path = "../version", version = "=1.10.8" }
+futures-util = "0.3.19"
+serde_json = "1.0.78"
+serial_test = "0.5.1"
+solana-client = { path = "../client", version = "=1.10.0" }
+solana-ledger = { path = "../ledger", version = "=1.10.0" }
+solana-measure = { path = "../measure", version = "=1.10.0" }
+solana-merkle-tree = { path = "../merkle-tree", version = "=1.10.0" }
+solana-metrics = { path = "../metrics", version = "=1.10.0" }
+solana-perf = { path = "../perf", version = "=1.10.0" }
+solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "=1.10.0" }
+solana-rpc = { path = "../rpc", version = "=1.10.0" }
+solana-runtime = { path = "../runtime", version = "=1.10.0" }
+solana-sdk = { path = "../sdk", version = "=1.10.0" }
+solana-streamer = { path = "../streamer", version = "=1.10.0" }
+solana-test-validator = { path = "../test-validator", version = "=1.10.0" }
+solana-transaction-status = { path = "../transaction-status", version = "=1.10.0" }
+solana-version = { path = "../version", version = "=1.10.0" }
 systemstat = "0.1.10"
 tokio = { version = "1", features = ["full"] }
 
 [dev-dependencies]
-solana-logger = { path = "../logger", version = "=1.10.8" }
+solana-logger = { path = "../logger", version = "=1.10.0" }
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]

client-test/tests/client.rs

@@ -15,7 +15,7 @@ use {
     solana_ledger::{blockstore::Blockstore, get_tmp_ledger_path},
     solana_rpc::{
         optimistically_confirmed_bank_tracker::OptimisticallyConfirmedBank,
-        rpc::{create_test_transaction_entries, populate_blockstore_for_tests},
+        rpc::create_test_transactions_and_populate_blockstore,
         rpc_pubsub_service::{PubSubConfig, PubSubService},
         rpc_subscriptions::RpcSubscriptions,
     },
@@ -36,9 +36,7 @@ use {
     },
     solana_streamer::socket::SocketAddrSpace,
     solana_test_validator::TestValidator,
-    solana_transaction_status::{
-        BlockEncodingOptions, ConfirmedBlock, TransactionDetails, UiTransactionEncoding,
-    },
+    solana_transaction_status::{ConfirmedBlock, TransactionDetails, UiTransactionEncoding},
     std::{
         collections::HashSet,
         net::{IpAddr, SocketAddr},
@@ -232,12 +230,9 @@ fn test_block_subscription() {
     let max_complete_transaction_status_slot = Arc::new(AtomicU64::new(blockstore.max_root()));
     bank.transfer(rent_exempt_amount, &alice, &keypair2.pubkey())
         .unwrap();
-    populate_blockstore_for_tests(
-        create_test_transaction_entries(
-            vec![&alice, &keypair1, &keypair2, &keypair3],
-            bank.clone(),
-        )
-        .0,
+    let _confirmed_block_signatures = create_test_transactions_and_populate_blockstore(
+        vec![&alice, &keypair1, &keypair2, &keypair3],
+        0,
         bank,
         blockstore.clone(),
         max_complete_transaction_status_slot,
@@ -275,7 +270,6 @@ fn test_block_subscription() {
             encoding: Some(UiTransactionEncoding::Json),
             transaction_details: Some(TransactionDetails::Signatures),
             show_rewards: None,
-            max_supported_transaction_version: None,
         }),
     )
     .unwrap();
@@ -287,17 +281,14 @@ fn test_block_subscription() {
     match maybe_actual {
         Ok(actual) => {
             let versioned_block = blockstore.get_complete_block(slot, false).unwrap();
-            let confirmed_block = ConfirmedBlock::from(versioned_block);
-            let block = confirmed_block
-                .encode_with_options(
-                    UiTransactionEncoding::Json,
-                    BlockEncodingOptions {
-                        transaction_details: TransactionDetails::Signatures,
-                        show_rewards: false,
-                        max_supported_transaction_version: None,
-                    },
-                )
+            let legacy_block = ConfirmedBlock::from(versioned_block)
+                .into_legacy_block()
                 .unwrap();
+            let block = legacy_block.configure(
+                UiTransactionEncoding::Json,
+                TransactionDetails::Signatures,
+                false,
+            );
             assert_eq!(actual.value.slot, slot);
             assert!(block.eq(&actual.value.block.unwrap()));
         }

client/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "solana-client"
-version = "1.10.8"
+version = "1.10.0"
 description = "Solana Client"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -10,52 +10,42 @@ license = "Apache-2.0"
 edition = "2021"
 
 [dependencies]
-async-mutex = "1.4.0"
 async-trait = "0.1.52"
 base64 = "0.13.0"
 bincode = "1.3.3"
 bs58 = "0.4.0"
-bytes = "1.1.0"
 clap = "2.33.0"
 crossbeam-channel = "0.5"
-futures = "0.3"
-futures-util = "0.3.21"
+futures-util = "0.3.19"
 indicatif = "0.16.2"
-itertools = "0.10.2"
 jsonrpc-core = "18.0.0"
-lazy_static = "1.4.0"
 log = "0.4.14"
-quinn = "0.8.0"
-rand = "0.7.0"
-rand_chacha = "0.2.2"
 rayon = "1.5.1"
-reqwest = { version = "0.11.10", default-features = false, features = ["blocking", "rustls-tls", "json"] }
-rustls = { version = "0.20.2", features = ["dangerous_configuration"] }
-semver = "1.0.6"
+reqwest = { version = "0.11.6", default-features = false, features = ["blocking", "rustls-tls", "json"] }
+semver = "1.0.5"
 serde = "1.0.136"
 serde_derive = "1.0.103"
-serde_json = "1.0.79"
-solana-account-decoder = { path = "../account-decoder", version = "=1.10.8" }
-solana-clap-utils = { path = "../clap-utils", version = "=1.10.8" }
-solana-faucet = { path = "../faucet", version = "=1.10.8" }
-solana-measure = { path = "../measure", version = "=1.10.8" }
-solana-net-utils = { path = "../net-utils", version = "=1.10.8" }
-solana-sdk = { path = "../sdk", version = "=1.10.8" }
-solana-streamer = { path = "../streamer", version = "=1.10.8" }
-solana-transaction-status = { path = "../transaction-status", version = "=1.10.8" }
-solana-version = { path = "../version", version = "=1.10.8" }
-solana-vote-program = { path = "../programs/vote", version = "=1.10.8" }
+serde_json = "1.0.78"
+solana-account-decoder = { path = "../account-decoder", version = "=1.10.0" }
+solana-clap-utils = { path = "../clap-utils", version = "=1.10.0" }
+solana-faucet = { path = "../faucet", version = "=1.10.0" }
+solana-net-utils = { path = "../net-utils", version = "=1.10.0" }
+solana-measure = { path = "../measure", version = "=1.10.0" }
+solana-sdk = { path = "../sdk", version = "=1.10.0" }
+solana-transaction-status = { path = "../transaction-status", version = "=1.10.0" }
+solana-version = { path = "../version", version = "=1.10.0" }
+solana-vote-program = { path = "../programs/vote", version = "=1.10.0" }
 thiserror = "1.0"
 tokio = { version = "1", features = ["full"] }
 tokio-stream = "0.1.8"
-tokio-tungstenite = { version = "0.17.1", features = ["rustls-tls-webpki-roots"] }
-tungstenite = { version = "0.17.2", features = ["rustls-tls-webpki-roots"] }
+tokio-tungstenite = { version = "0.16.0", features = ["rustls-tls-webpki-roots"] }
+tungstenite = { version = "0.16.0", features = ["rustls-tls-webpki-roots"] }
 url = "2.2.2"
 
 [dev-dependencies]
 assert_matches = "1.5.0"
 jsonrpc-http-server = "18.0.0"
-solana-logger = { path = "../logger", version = "=1.10.8" }
+solana-logger = { path = "../logger", version = "=1.10.0" }
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]

client/src/client_error.rs

@@ -1,7 +1,6 @@
 pub use reqwest;
 use {
     crate::{rpc_request, rpc_response},
-    quinn::{ConnectError, WriteError},
     solana_faucet::faucet::FaucetError,
     solana_sdk::{
         signature::SignerError, transaction::TransactionError, transport::TransportError,
@@ -73,18 +72,6 @@ impl From<ClientErrorKind> for TransportError {
     }
 }
 
-impl From<WriteError> for ClientErrorKind {
-    fn from(write_error: WriteError) -> Self {
-        Self::Custom(format!("{:?}", write_error))
-    }
-}
-
-impl From<ConnectError> for ClientErrorKind {
-    fn from(connect_error: ConnectError) -> Self {
-        Self::Custom(format!("{:?}", connect_error))
-    }
-}
-
 #[derive(Error, Debug)]
 #[error("{kind}")]
 pub struct ClientError {

client/src/connection_cache.rs

@@ -1,241 +0,0 @@
-use {
-    crate::{
-        quic_client::QuicTpuConnection, tpu_connection::TpuConnection, udp_client::UdpTpuConnection,
-    },
-    lazy_static::lazy_static,
-    solana_sdk::{transaction::VersionedTransaction, transport::TransportError},
-    std::{
-        collections::{hash_map::Entry, BTreeMap, HashMap},
-        net::{SocketAddr, UdpSocket},
-        sync::{Arc, Mutex},
-    },
-};
-
-// Should be non-zero
-static MAX_CONNECTIONS: usize = 64;
-
-#[derive(Clone)]
-enum Connection {
-    Udp(Arc<UdpTpuConnection>),
-    Quic(Arc<QuicTpuConnection>),
-}
-
-struct ConnMap {
-    // Keeps track of the connection associated with an addr and the last time it was used
-    map: HashMap<SocketAddr, (Connection, u64)>,
-    // Helps to find the least recently used connection. The search and inserts are O(log(n))
-    // but since we're bounding the size of the collections, this should be constant
-    // (and hopefully negligible) time. In theory, we can do this in constant time
-    // with a queue implemented as a doubly-linked list (and all the
-    // HashMap entries holding a "pointer" to the corresponding linked-list node),
-    // so we can push, pop and bump a used connection back to the end of the queue in O(1) time, but
-    // that seems non-"Rust-y" and low bang/buck. This is still pretty terrible though...
-    last_used_times: BTreeMap<u64, SocketAddr>,
-    ticks: u64,
-    use_quic: bool,
-}
-
-impl ConnMap {
-    pub fn new() -> Self {
-        Self {
-            map: HashMap::new(),
-            last_used_times: BTreeMap::new(),
-            ticks: 0,
-            use_quic: false,
-        }
-    }
-
-    pub fn set_use_quic(&mut self, use_quic: bool) {
-        self.use_quic = use_quic;
-    }
-}
-
-lazy_static! {
-    static ref CONNECTION_MAP: Mutex<ConnMap> = Mutex::new(ConnMap::new());
-}
-
-pub fn set_use_quic(use_quic: bool) {
-    let mut map = (*CONNECTION_MAP).lock().unwrap();
-    map.set_use_quic(use_quic);
-}
-
-#[allow(dead_code)]
-// TODO: see https://github.com/solana-labs/solana/issues/23661
-// remove lazy_static and optimize and refactor this
-fn get_connection(addr: &SocketAddr) -> Connection {
-    let mut map = (*CONNECTION_MAP).lock().unwrap();
-    let ticks = map.ticks;
-    let use_quic = map.use_quic;
-    let (conn, target_ticks) = match map.map.entry(*addr) {
-        Entry::Occupied(mut entry) => {
-            let mut pair = entry.get_mut();
-            let old_ticks = pair.1;
-            pair.1 = ticks;
-            (pair.0.clone(), old_ticks)
-        }
-        Entry::Vacant(entry) => {
-            let send_socket = UdpSocket::bind("0.0.0.0:0").unwrap();
-            // TODO: see https://github.com/solana-labs/solana/issues/23659
-            // make it configurable (e.g. via the command line) whether to use UDP or Quic
-
-            let conn = if use_quic {
-                Connection::Quic(Arc::new(QuicTpuConnection::new(send_socket, *addr)))
-            } else {
-                Connection::Udp(Arc::new(UdpTpuConnection::new(send_socket, *addr)))
-            };
-
-            entry.insert((conn.clone(), ticks));
-            (conn, ticks)
-        }
-    };
-
-    let num_connections = map.map.len();
-    if num_connections > MAX_CONNECTIONS {
-        let (old_ticks, target_addr) = {
-            let (old_ticks, target_addr) = map.last_used_times.iter().next().unwrap();
-            (*old_ticks, *target_addr)
-        };
-        map.map.remove(&target_addr);
-        map.last_used_times.remove(&old_ticks);
-    }
-
-    if target_ticks != ticks {
-        map.last_used_times.remove(&target_ticks);
-    }
-    map.last_used_times.insert(ticks, *addr);
-
-    map.ticks += 1;
-    conn
-}
-
-// TODO: see https://github.com/solana-labs/solana/issues/23851
-// use enum_dispatch and get rid of this tedious code.
-// The main blocker to using enum_dispatch right now is that
-// the it doesn't work with static methods like TpuConnection::new
-// which is used by thin_client. This will be eliminated soon
-// once thin_client is moved to using this connection cache.
-// Once that is done, we will migrate to using enum_dispatch
-// This will be done in a followup to
-// https://github.com/solana-labs/solana/pull/23817
-pub fn send_wire_transaction_batch(
-    packets: &[&[u8]],
-    addr: &SocketAddr,
-) -> Result<(), TransportError> {
-    let conn = get_connection(addr);
-    match conn {
-        Connection::Udp(conn) => conn.send_wire_transaction_batch(packets),
-        Connection::Quic(conn) => conn.send_wire_transaction_batch(packets),
-    }
-}
-
-pub fn send_wire_transaction(
-    wire_transaction: &[u8],
-    addr: &SocketAddr,
-) -> Result<(), TransportError> {
-    let conn = get_connection(addr);
-    match conn {
-        Connection::Udp(conn) => conn.send_wire_transaction(wire_transaction),
-        Connection::Quic(conn) => conn.send_wire_transaction(wire_transaction),
-    }
-}
-
-pub fn serialize_and_send_transaction(
-    transaction: &VersionedTransaction,
-    addr: &SocketAddr,
-) -> Result<(), TransportError> {
-    let conn = get_connection(addr);
-    match conn {
-        Connection::Udp(conn) => conn.serialize_and_send_transaction(transaction),
-        Connection::Quic(conn) => conn.serialize_and_send_transaction(transaction),
-    }
-}
-
-pub fn par_serialize_and_send_transaction_batch(
-    transactions: &[VersionedTransaction],
-    addr: &SocketAddr,
-) -> Result<(), TransportError> {
-    let conn = get_connection(addr);
-    match conn {
-        Connection::Udp(conn) => conn.par_serialize_and_send_transaction_batch(transactions),
-        Connection::Quic(conn) => conn.par_serialize_and_send_transaction_batch(transactions),
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use {
-        crate::{
-            connection_cache::{get_connection, Connection, CONNECTION_MAP, MAX_CONNECTIONS},
-            tpu_connection::TpuConnection,
-        },
-        rand::{Rng, SeedableRng},
-        rand_chacha::ChaChaRng,
-        std::net::{IpAddr, SocketAddr},
-    };
-
-    fn get_addr(rng: &mut ChaChaRng) -> SocketAddr {
-        let a = rng.gen_range(1, 255);
-        let b = rng.gen_range(1, 255);
-        let c = rng.gen_range(1, 255);
-        let d = rng.gen_range(1, 255);
-
-        let addr_str = format!("{}.{}.{}.{}:80", a, b, c, d);
-
-        addr_str.parse().expect("Invalid address")
-    }
-
-    fn ip(conn: Connection) -> IpAddr {
-        match conn {
-            Connection::Udp(conn) => conn.tpu_addr().ip(),
-            Connection::Quic(conn) => conn.tpu_addr().ip(),
-        }
-    }
-
-    #[test]
-    fn test_connection_cache() {
-        // Allow the test to run deterministically
-        // with the same pseudorandom sequence between runs
-        // and on different platforms - the cryptographic security
-        // property isn't important here but ChaChaRng provides a way
-        // to get the same pseudorandom sequence on different platforms
-        let mut rng = ChaChaRng::seed_from_u64(42);
-
-        // Generate a bunch of random addresses and create TPUConnections to them
-        // Since TPUConnection::new is infallible, it should't matter whether or not
-        // we can actually connect to those addresses - TPUConnection implementations should either
-        // be lazy and not connect until first use or handle connection errors somehow
-        // (without crashing, as would be required in a real practical validator)
-        let first_addr = get_addr(&mut rng);
-        assert!(ip(get_connection(&first_addr)) == first_addr.ip());
-        let addrs = (0..MAX_CONNECTIONS)
-            .into_iter()
-            .map(|_| {
-                let addr = get_addr(&mut rng);
-                get_connection(&addr);
-                addr
-            })
-            .collect::<Vec<_>>();
-        {
-            let map = (*CONNECTION_MAP).lock().unwrap();
-            addrs.iter().for_each(|a| {
-                let conn = map.map.get(a).expect("Address not found");
-                assert!(a.ip() == ip(conn.0.clone()));
-            });
-
-            assert!(map.map.get(&first_addr).is_none());
-        }
-
-        // Test that get_connection updates which connection is next up for eviction
-        // when an existing connection is used. Initially, addrs[0] should be next up for eviction, since
-        // it was the earliest added. But we do get_connection(&addrs[0]), thereby using
-        // that connection, and bumping it back to the end of the queue. So addrs[1] should be
-        // the next up for eviction. So we add a new connection, and test that addrs[0] is not
-        // evicted but addrs[1] is.
-        get_connection(&addrs[0]);
-        get_connection(&get_addr(&mut rng));
-
-        let map = (*CONNECTION_MAP).lock().unwrap();
-        assert!(map.map.get(&addrs[0]).is_some());
-        assert!(map.map.get(&addrs[1]).is_none());
-    }
-}

client/src/lib.rs

@@ -4,14 +4,12 @@ extern crate serde_derive;
 
 pub mod blockhash_query;
 pub mod client_error;
-pub mod connection_cache;
 pub(crate) mod http_sender;
 pub(crate) mod mock_sender;
 pub mod nonblocking;
 pub mod nonce_utils;
 pub mod perf_utils;
 pub mod pubsub_client;
-pub mod quic_client;
 pub mod rpc_cache;
 pub mod rpc_client;
 pub mod rpc_config;
@@ -20,13 +18,11 @@ pub mod rpc_deprecated_config;
 pub mod rpc_filter;
 pub mod rpc_request;
 pub mod rpc_response;
-pub mod rpc_sender;
+pub(crate) mod rpc_sender;
 pub mod spinner;
 pub mod thin_client;
 pub mod tpu_client;
-pub mod tpu_connection;
 pub mod transaction_executor;
-pub mod udp_client;
 
 pub mod mock_sender_for_cli {
     /// Magic `SIGNATURE` value used by `solana-cli` unit tests.

client/src/mock_sender.rs

@@ -28,13 +28,13 @@ use {
         pubkey::Pubkey,
         signature::Signature,
         sysvar::epoch_schedule::EpochSchedule,
-        transaction::{self, Transaction, TransactionError, TransactionVersion},
+        transaction::{self, Transaction, TransactionError},
     },
     solana_transaction_status::{
         EncodedConfirmedBlock, EncodedConfirmedTransactionWithStatusMeta, EncodedTransaction,
-        EncodedTransactionWithStatusMeta, Rewards, TransactionBinaryEncoding,
-        TransactionConfirmationStatus, TransactionStatus, UiCompiledInstruction, UiMessage,
-        UiRawMessage, UiTransaction, UiTransactionStatusMeta,
+        EncodedTransactionWithStatusMeta, Rewards, TransactionConfirmationStatus,
+        TransactionStatus, UiCompiledInstruction, UiMessage, UiRawMessage, UiTransaction,
+        UiTransactionEncoding, UiTransactionStatusMeta,
     },
     solana_version::Version,
     std::{collections::HashMap, net::SocketAddr, str::FromStr, sync::RwLock},
@@ -192,7 +192,6 @@ impl RpcSender for MockSender {
             "getTransaction" => serde_json::to_value(EncodedConfirmedTransactionWithStatusMeta {
                 slot: 2,
                 transaction: EncodedTransactionWithStatusMeta {
-                    version: Some(TransactionVersion::LEGACY),
                     transaction: EncodedTransaction::Json(
                         UiTransaction {
                             signatures: vec!["3AsdoALgZFuq2oUVWrDYhg2pNeaLJKPLf8hU2mQ6U8qJxeJ6hsrPVpMn9ma39DtfYCrDQSvngWRP8NnTpEhezJpE".to_string()],
@@ -214,7 +213,6 @@ impl RpcSender for MockSender {
                                         accounts: vec![0, 1],
                                         data: "3Bxs49DitAvXtoDR".to_string(),
                                     }],
-                                    address_table_lookups: None,
                                 })
                         }),
                     meta: Some(UiTransactionStatusMeta {
@@ -228,7 +226,6 @@ impl RpcSender for MockSender {
                             pre_token_balances: None,
                             post_token_balances: None,
                             rewards: None,
-                            loaded_addresses: None,
                         }),
                 },
                 block_time: Some(1628633791),
@@ -381,10 +378,9 @@ impl RpcSender for MockSender {
                                  pLHxcaShD81xBNaFDgnA2nkkdHnKtZt4hVSfKAmw3VRZbjrZ7L2fKZBx21CwsG\
                                  hD6onjM2M3qZW5C8J6d1pj41MxKmZgPBSha3MyKkNLkAGFASK"
                             .to_string(),
-                        TransactionBinaryEncoding::Base58,
+                        UiTransactionEncoding::Base58,
                     ),
                     meta: None,
-                    version: Some(TransactionVersion::LEGACY),
                 }],
                 rewards: Rewards::new(),
                 block_time: None,

client/src/nonblocking/pubsub_client.rs

@@ -238,7 +238,6 @@ impl PubsubClient {
                         },
                         Message::Pong(_data) => continue,
                         Message::Close(_frame) => break,
-                        Message::Frame(_frame) => continue,
                     };
 
 

client/src/nonblocking/rpc_client.rs

@@ -6,7 +6,6 @@
 //!
 //! [JSON-RPC]: https://www.jsonrpc.org/specification
 
-pub use crate::mock_sender::Mocks;
 #[allow(deprecated)]
 use crate::rpc_deprecated_config::{
     RpcConfirmedBlockConfig, RpcConfirmedTransactionConfig,
@@ -16,7 +15,7 @@ use {
     crate::{
         client_error::{ClientError, ClientErrorKind, Result as ClientResult},
         http_sender::HttpSender,
-        mock_sender::MockSender,
+        mock_sender::{MockSender, Mocks},
         rpc_client::{GetConfirmedSignaturesForAddress2Config, RpcClientConfig},
         rpc_config::{RpcAccountInfoConfig, *},
         rpc_request::{RpcError, RpcRequest, RpcResponseErrorData, TokenAccountsFilter},
@@ -53,9 +52,10 @@ use {
         cmp::min,
         net::SocketAddr,
         str::FromStr,
+        sync::RwLock,
         time::{Duration, Instant},
     },
-    tokio::{sync::RwLock, time::sleep},
+    tokio::time::sleep,
 };
 
 /// A client of a remote Solana node.
@@ -147,9 +147,9 @@ impl RpcClient {
     ///
     /// This is the basic constructor, allowing construction with any type of
     /// `RpcSender`. Most applications should use one of the other constructors,
-    /// such as [`RpcClient::new`], [`RpcClient::new_with_commitment`] or
-    /// [`RpcClient::new_with_timeout`].
-    pub fn new_sender<T: RpcSender + Send + Sync + 'static>(
+    /// such as [`new`] and [`new_mock`], which create an `RpcClient`
+    /// encapsulating an [`HttpSender`] and [`MockSender`] respectively.
+    pub(crate) fn new_sender<T: RpcSender + Send + Sync + 'static>(
         sender: T,
         config: RpcClientConfig,
     ) -> Self {
@@ -315,34 +315,8 @@ impl RpcClient {
 
     /// Create a mock `RpcClient`.
     ///
-    /// A mock `RpcClient` contains an implementation of [`RpcSender`] that does
-    /// not use the network, and instead returns synthetic responses, for use in
-    /// tests.
-    ///
-    /// It is primarily for internal use, with limited customizability, and
-    /// behaviors determined by internal Solana test cases. New users should
-    /// consider implementing `RpcSender` themselves and constructing
-    /// `RpcClient` with [`RpcClient::new_sender`] to get mock behavior.
-    ///
-    /// Unless directed otherwise, a mock `RpcClient` will generally return a
-    /// reasonable default response to any request, at least for [`RpcRequest`]
-    /// values for which responses have been implemented.
-    ///
-    /// This mock can be customized by changing the `url` argument, which is not
-    /// actually a URL, but a simple string directive that changes the mock
-    /// behavior in specific scenarios:
-    ///
-    /// - It is customary to set the `url` to "succeeds" for mocks that should
-    ///   return sucessfully, though this value is not actually interpreted.
-    ///
-    /// - If `url` is "fails" then any call to `send` will return `Ok(Value::Null)`.
-    ///
-    /// - Other possible values of `url` are specific to different `RpcRequest`
-    ///   values. Read the implementation of (non-public) `MockSender` for
-    ///   details.
-    ///
-    /// The [`RpcClient::new_mock_with_mocks`] function offers further
-    /// customization options.
+    /// See the [`MockSender`] documentation for an explanation of
+    /// how it treats the `url` argument.
     ///
     /// # Examples
     ///
@@ -368,43 +342,8 @@ impl RpcClient {
 
     /// Create a mock `RpcClient`.
     ///
-    /// A mock `RpcClient` contains an implementation of [`RpcSender`] that does
-    /// not use the network, and instead returns synthetic responses, for use in
-    /// tests.
-    ///
-    /// It is primarily for internal use, with limited customizability, and
-    /// behaviors determined by internal Solana test cases. New users should
-    /// consider implementing `RpcSender` themselves and constructing
-    /// `RpcClient` with [`RpcClient::new_sender`] to get mock behavior.
-    ///
-    /// Unless directed otherwise, a mock `RpcClient` will generally return a
-    /// reasonable default response to any request, at least for [`RpcRequest`]
-    /// values for which responses have been implemented.
-    ///
-    /// This mock can be customized in two ways:
-    ///
-    /// 1) By changing the `url` argument, which is not actually a URL, but a
-    ///    simple string directive that changes the mock behavior in specific
-    ///    scenarios.
-    ///
-    ///    It is customary to set the `url` to "succeeds" for mocks that should
-    ///    return sucessfully, though this value is not actually interpreted.
-    ///
-    ///    If `url` is "fails" then any call to `send` will return `Ok(Value::Null)`.
-    ///
-    ///    Other possible values of `url` are specific to different `RpcRequest`
-    ///    values. Read the implementation of `MockSender` (which is non-public)
-    ///    for details.
-    ///
-    /// 2) Custom responses can be configured by providing [`Mocks`]. This type
-    ///    is a [`HashMap`] from [`RpcRequest`] to a JSON [`Value`] response,
-    ///    Any entries in this map override the default behavior for the given
-    ///    request.
-    ///
-    /// The [`RpcClient::new_mock_with_mocks`] function offers further
-    /// customization options.
-    ///
-    /// [`HashMap`]: std::collections::HashMap
+    /// See the [`MockSender`] documentation for an explanation of how it treats
+    /// the `url` argument.
     ///
     /// # Examples
     ///
@@ -503,12 +442,12 @@ impl RpcClient {
     }
 
     async fn get_node_version(&self) -> Result<semver::Version, RpcError> {
-        let r_node_version = self.node_version.read().await;
+        let r_node_version = self.node_version.read().unwrap();
         if let Some(version) = &*r_node_version {
             Ok(version.clone())
         } else {
             drop(r_node_version);
-            let mut w_node_version = self.node_version.write().await;
+            let mut w_node_version = self.node_version.write().unwrap();
             let node_version = self.get_version().await.map_err(|e| {
                 RpcError::RpcRequestError(format!("cluster version query failed: {}", e))
             })?;
@@ -2473,7 +2412,6 @@ impl RpcClient {
     ///     transaction_details: Some(TransactionDetails::None),
     ///     rewards: Some(true),
     ///     commitment: None,
-    ///     max_supported_transaction_version: Some(0),
     /// };
     /// let block = rpc_client.get_block_with_config(
     ///     slot,
@@ -3114,7 +3052,6 @@ impl RpcClient {
     /// let config = RpcTransactionConfig {
     ///     encoding: Some(UiTransactionEncoding::Json),
     ///     commitment: Some(CommitmentConfig::confirmed()),
-    ///     max_supported_transaction_version: Some(0),
     /// };
     /// let transaction = rpc_client.get_transaction_with_config(
     ///     &signature,
@@ -3727,61 +3664,6 @@ impl RpcClient {
             commitment: Some(self.maybe_map_commitment(commitment_config).await?),
             data_slice: None,
         };
-
-        self.get_account_with_config(pubkey, config).await
-    }
-
-    /// Returns all information associated with the account of the provided pubkey.
-    ///
-    /// If the account does not exist, this method returns `Ok(None)`.
-    ///
-    /// To get multiple accounts at once, use the [`get_multiple_accounts_with_config`] method.
-    ///
-    /// [`get_multiple_accounts_with_config`]: RpcClient::get_multiple_accounts_with_config
-    ///
-    /// # RPC Reference
-    ///
-    /// This method is built on the [`getAccountInfo`] RPC method.
-    ///
-    /// [`getAccountInfo`]: https://docs.solana.com/developing/clients/jsonrpc-api#getaccountinfo
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// # use solana_client::{
-    /// #     rpc_client::{self, RpcClient},
-    /// #     rpc_config::RpcAccountInfoConfig,
-    /// #     client_error::ClientError,
-    /// # };
-    /// # use solana_sdk::{
-    /// #     signature::Signer,
-    /// #     signer::keypair::Keypair,
-    /// #     pubkey::Pubkey,
-    /// #     commitment_config::CommitmentConfig,
-    /// # };
-    /// # use solana_account_decoder::UiAccountEncoding;
-    /// # use std::str::FromStr;
-    /// # let mocks = rpc_client::create_rpc_client_mocks();
-    /// # let rpc_client = RpcClient::new_mock_with_mocks("succeeds".to_string(), mocks);
-    /// let alice_pubkey = Pubkey::from_str("BgvYtJEfmZYdVKiptmMjxGzv8iQoo4MWjsP3QsTkhhxa").unwrap();
-    /// let commitment_config = CommitmentConfig::processed();
-    /// let config = RpcAccountInfoConfig {
-    ///     encoding: Some(UiAccountEncoding::Base64),
-    ///     commitment: Some(commitment_config),
-    ///     .. RpcAccountInfoConfig::default()
-    /// };
-    /// let account = rpc_client.get_account_with_config(
-    ///     &alice_pubkey,
-    ///     config,
-    /// )?;
-    /// assert!(account.value.is_some());
-    /// # Ok::<(), ClientError>(())
-    /// ```
-    pub async fn get_account_with_config(
-        &self,
-        pubkey: &Pubkey,
-        config: RpcAccountInfoConfig,
-    ) -> RpcResult<Option<Account>> {
         let response = self
             .send(
                 RpcRequest::GetAccountInfo,

client/src/quic_client.rs

@@ -1,213 +0,0 @@
-//! Simple client that connects to a given UDP port with the QUIC protocol and provides
-//! an interface for sending transactions which is restricted by the server's flow control.
-
-use {
-    crate::{client_error::ClientErrorKind, tpu_connection::TpuConnection},
-    async_mutex::Mutex,
-    futures::future::join_all,
-    itertools::Itertools,
-    quinn::{ClientConfig, Endpoint, EndpointConfig, NewConnection, WriteError},
-    solana_sdk::{
-        quic::{QUIC_MAX_CONCURRENT_STREAMS, QUIC_PORT_OFFSET},
-        transport::Result as TransportResult,
-    },
-    std::{
-        net::{SocketAddr, UdpSocket},
-        sync::Arc,
-    },
-    tokio::runtime::Runtime,
-};
-
-struct SkipServerVerification;
-
-impl SkipServerVerification {
-    pub fn new() -> Arc<Self> {
-        Arc::new(Self)
-    }
-}
-
-impl rustls::client::ServerCertVerifier for SkipServerVerification {
-    fn verify_server_cert(
-        &self,
-        _end_entity: &rustls::Certificate,
-        _intermediates: &[rustls::Certificate],
-        _server_name: &rustls::ServerName,
-        _scts: &mut dyn Iterator<Item = &[u8]>,
-        _ocsp_response: &[u8],
-        _now: std::time::SystemTime,
-    ) -> Result<rustls::client::ServerCertVerified, rustls::Error> {
-        Ok(rustls::client::ServerCertVerified::assertion())
-    }
-}
-
-struct QuicClient {
-    runtime: Runtime,
-    endpoint: Endpoint,
-    connection: Arc<Mutex<Option<Arc<NewConnection>>>>,
-    addr: SocketAddr,
-}
-
-pub struct QuicTpuConnection {
-    client: Arc<QuicClient>,
-}
-
-impl TpuConnection for QuicTpuConnection {
-    fn new(client_socket: UdpSocket, tpu_addr: SocketAddr) -> Self {
-        let tpu_addr = SocketAddr::new(tpu_addr.ip(), tpu_addr.port() + QUIC_PORT_OFFSET);
-        let client = Arc::new(QuicClient::new(client_socket, tpu_addr));
-
-        Self { client }
-    }
-
-    fn tpu_addr(&self) -> &SocketAddr {
-        &self.client.addr
-    }
-
-    fn send_wire_transaction<T>(&self, wire_transaction: T) -> TransportResult<()>
-    where
-        T: AsRef<[u8]>,
-    {
-        let _guard = self.client.runtime.enter();
-        let send_buffer = self.client.send_buffer(wire_transaction);
-        self.client.runtime.block_on(send_buffer)?;
-        Ok(())
-    }
-
-    fn send_wire_transaction_batch<T>(&self, buffers: &[T]) -> TransportResult<()>
-    where
-        T: AsRef<[u8]>,
-    {
-        let _guard = self.client.runtime.enter();
-        let send_batch = self.client.send_batch(buffers);
-        self.client.runtime.block_on(send_batch)?;
-        Ok(())
-    }
-}
-
-impl QuicClient {
-    pub fn new(client_socket: UdpSocket, addr: SocketAddr) -> Self {
-        let runtime = tokio::runtime::Builder::new_multi_thread()
-            .enable_all()
-            .build()
-            .unwrap();
-
-        let _guard = runtime.enter();
-
-        let crypto = rustls::ClientConfig::builder()
-            .with_safe_defaults()
-            .with_custom_certificate_verifier(SkipServerVerification::new())
-            .with_no_client_auth();
-
-        let create_endpoint = QuicClient::create_endpoint(EndpointConfig::default(), client_socket);
-
-        let mut endpoint = runtime.block_on(create_endpoint);
-
-        endpoint.set_default_client_config(ClientConfig::new(Arc::new(crypto)));
-
-        Self {
-            runtime,
-            endpoint,
-            connection: Arc::new(Mutex::new(None)),
-            addr,
-        }
-    }
-
-    // If this function becomes public, it should be changed to
-    // not expose details of the specific Quic implementation we're using
-    async fn create_endpoint(config: EndpointConfig, client_socket: UdpSocket) -> Endpoint {
-        quinn::Endpoint::new(config, None, client_socket).unwrap().0
-    }
-
-    async fn _send_buffer_using_conn(
-        data: &[u8],
-        connection: &NewConnection,
-    ) -> Result<(), WriteError> {
-        let mut send_stream = connection.connection.open_uni().await?;
-        send_stream.write_all(data).await?;
-        send_stream.finish().await?;
-        Ok(())
-    }
-
-    // Attempts to send data, connecting/reconnecting as necessary
-    // On success, returns the connection used to successfully send the data
-    async fn _send_buffer(&self, data: &[u8]) -> Result<Arc<NewConnection>, WriteError> {
-        let connection = {
-            let mut conn_guard = self.connection.lock().await;
-
-            let maybe_conn = (*conn_guard).clone();
-            match maybe_conn {
-                Some(conn) => conn.clone(),
-                None => {
-                    let connecting = self.endpoint.connect(self.addr, "connect").unwrap();
-                    let connection = Arc::new(connecting.await?);
-                    *conn_guard = Some(connection.clone());
-                    connection
-                }
-            }
-        };
-        match Self::_send_buffer_using_conn(data, &connection).await {
-            Ok(()) => Ok(connection),
-            _ => {
-                let connection = {
-                    let connecting = self.endpoint.connect(self.addr, "connect").unwrap();
-                    let connection = Arc::new(connecting.await?);
-                    let mut conn_guard = self.connection.lock().await;
-                    *conn_guard = Some(connection.clone());
-                    connection
-                };
-                Self::_send_buffer_using_conn(data, &connection).await?;
-                Ok(connection)
-            }
-        }
-    }
-
-    pub async fn send_buffer<T>(&self, data: T) -> Result<(), ClientErrorKind>
-    where
-        T: AsRef<[u8]>,
-    {
-        self._send_buffer(data.as_ref()).await?;
-        Ok(())
-    }
-
-    pub async fn send_batch<T>(&self, buffers: &[T]) -> Result<(), ClientErrorKind>
-    where
-        T: AsRef<[u8]>,
-    {
-        // Start off by "testing" the connection by sending the first transaction
-        // This will also connect to the server if not already connected
-        // and reconnect and retry if the first send attempt failed
-        // (for example due to a timed out connection), returning an error
-        // or the connection that was used to successfully send the transaction.
-        // We will use the returned connection to send the rest of the transactions in the batch
-        // to avoid touching the mutex in self, and not bother reconnecting if we fail along the way
-        // since testing even in the ideal GCE environment has found no cases
-        // where reconnecting and retrying in the middle of a batch send
-        // (i.e. we encounter a connection error in the middle of a batch send, which presumably cannot
-        // be due to a timed out connection) has succeeded
-        if buffers.is_empty() {
-            return Ok(());
-        }
-        let connection = self._send_buffer(buffers[0].as_ref()).await?;
-
-        // Used to avoid dereferencing the Arc multiple times below
-        // by just getting a reference to the NewConnection once
-        let connection_ref: &NewConnection = &connection;
-
-        let chunks = buffers[1..buffers.len()]
-            .iter()
-            .chunks(QUIC_MAX_CONCURRENT_STREAMS);
-
-        let futures = chunks.into_iter().map(|buffs| {
-            join_all(
-                buffs
-                    .into_iter()
-                    .map(|buf| Self::_send_buffer_using_conn(buf.as_ref(), connection_ref)),
-            )
-        });
-
-        for f in futures {
-            f.await.into_iter().try_for_each(|res| res)?;
-        }
-        Ok(())
-    }
-}

client/src/rpc_client.rs

@@ -6,14 +6,13 @@
 //!
 //! [JSON-RPC]: https://www.jsonrpc.org/specification
 
-pub use crate::mock_sender::Mocks;
 #[allow(deprecated)]
 use crate::rpc_deprecated_config::{RpcConfirmedBlockConfig, RpcConfirmedTransactionConfig};
 use {
     crate::{
         client_error::Result as ClientResult,
         http_sender::HttpSender,
-        mock_sender::MockSender,
+        mock_sender::{MockSender, Mocks},
         nonblocking::{self, rpc_client::get_rpc_request_str},
         rpc_config::{RpcAccountInfoConfig, *},
         rpc_request::{RpcRequest, TokenAccountsFilter},
@@ -104,8 +103,8 @@ pub struct GetConfirmedSignaturesForAddress2Config {
 /// [`Processed`] commitment level. These exceptions are noted in the method
 /// documentation.
 ///
-/// [`Finalized`]: solana_sdk::commitment_config::CommitmentLevel::Finalized
-/// [`Processed`]: solana_sdk::commitment_config::CommitmentLevel::Processed
+/// [`Finalized`]: CommitmentLevel::Finalized
+/// [`Processed`]: CommitmentLevel::Processed
 /// [jsonprot]: https://docs.solana.com/developing/clients/jsonrpc-api
 /// [JSON-RPC]: https://www.jsonrpc.org/specification
 /// [slots]: https://docs.solana.com/terminology#slot
@@ -146,10 +145,6 @@ pub struct GetConfirmedSignaturesForAddress2Config {
 /// [`is_timeout`](crate::client_error::reqwest::Error::is_timeout) method
 /// returns `true`. The default timeout is 30 seconds, and may be changed by
 /// calling an appropriate constructor with a `timeout` parameter.
-///
-/// [`ClientError`]: crate::client_error::ClientError
-/// [`ClientErrorKind`]: crate::client_error::ClientErrorKind
-/// [`ClientErrorKind::Reqwest`]: crate::client_error::ClientErrorKind::Reqwest
 pub struct RpcClient {
     rpc_client: nonblocking::rpc_client::RpcClient,
     runtime: Option<tokio::runtime::Runtime>,
@@ -166,9 +161,9 @@ impl RpcClient {
     ///
     /// This is the basic constructor, allowing construction with any type of
     /// `RpcSender`. Most applications should use one of the other constructors,
-    /// such as [`RpcClient::new`], [`RpcClient::new_with_commitment`] or
-    /// [`RpcClient::new_with_timeout`].
-    pub fn new_sender<T: RpcSender + Send + Sync + 'static>(
+    /// such as [`new`] and [`new_mock`], which create an `RpcClient`
+    /// encapsulating an [`HttpSender`] and [`MockSender`] respectively.
+    fn new_sender<T: RpcSender + Send + Sync + 'static>(
         sender: T,
         config: RpcClientConfig,
     ) -> Self {
@@ -191,10 +186,9 @@ impl RpcClient {
     /// "http://localhost:8899".
     ///
     /// The client has a default timeout of 30 seconds, and a default [commitment
-    /// level][cl] of [`Finalized`].
+    /// level][cl] of [`Finalized`](CommitmentLevel::Finalized).
     ///
     /// [cl]: https://docs.solana.com/developing/clients/jsonrpc-api#configuring-state-commitment
-    /// [`Finalized`]: solana_sdk::commitment_config::CommitmentLevel::Finalized
     ///
     /// # Examples
     ///
@@ -217,8 +211,6 @@ impl RpcClient {
     /// The client has a default timeout of 30 seconds, and a user-specified
     /// [`CommitmentLevel`] via [`CommitmentConfig`].
     ///
-    /// [`CommitmentLevel`]: solana_sdk::commitment_config::CommitmentLevel
-    ///
     /// # Examples
     ///
     /// ```
@@ -241,10 +233,9 @@ impl RpcClient {
     /// "http://localhost:8899".
     ///
     /// The client has and a default [commitment level][cl] of
-    /// [`Finalized`].
+    /// [`Finalized`](CommitmentLevel::Finalized).
     ///
     /// [cl]: https://docs.solana.com/developing/clients/jsonrpc-api#configuring-state-commitment
-    /// [`Finalized`]: solana_sdk::commitment_config::CommitmentLevel::Finalized
     ///
     /// # Examples
     ///
@@ -344,34 +335,8 @@ impl RpcClient {
 
     /// Create a mock `RpcClient`.
     ///
-    /// A mock `RpcClient` contains an implementation of [`RpcSender`] that does
-    /// not use the network, and instead returns synthetic responses, for use in
-    /// tests.
-    ///
-    /// It is primarily for internal use, with limited customizability, and
-    /// behaviors determined by internal Solana test cases. New users should
-    /// consider implementing `RpcSender` themselves and constructing
-    /// `RpcClient` with [`RpcClient::new_sender`] to get mock behavior.
-    ///
-    /// Unless directed otherwise, a mock `RpcClient` will generally return a
-    /// reasonable default response to any request, at least for [`RpcRequest`]
-    /// values for which responses have been implemented.
-    ///
-    /// This mock can be customized by changing the `url` argument, which is not
-    /// actually a URL, but a simple string directive that changes the mock
-    /// behavior in specific scenarios:
-    ///
-    /// - It is customary to set the `url` to "succeeds" for mocks that should
-    ///   return sucessfully, though this value is not actually interpreted.
-    ///
-    /// - If `url` is "fails" then any call to `send` will return `Ok(Value::Null)`.
-    ///
-    /// - Other possible values of `url` are specific to different `RpcRequest`
-    ///   values. Read the implementation of (non-public) `MockSender` for
-    ///   details.
-    ///
-    /// The [`RpcClient::new_mock_with_mocks`] function offers further
-    /// customization options.
+    /// See the [`MockSender`] documentation for an explanation of
+    /// how it treats the `url` argument.
     ///
     /// # Examples
     ///
@@ -397,43 +362,8 @@ impl RpcClient {
 
     /// Create a mock `RpcClient`.
     ///
-    /// A mock `RpcClient` contains an implementation of [`RpcSender`] that does
-    /// not use the network, and instead returns synthetic responses, for use in
-    /// tests.
-    ///
-    /// It is primarily for internal use, with limited customizability, and
-    /// behaviors determined by internal Solana test cases. New users should
-    /// consider implementing `RpcSender` themselves and constructing
-    /// `RpcClient` with [`RpcClient::new_sender`] to get mock behavior.
-    ///
-    /// Unless directed otherwise, a mock `RpcClient` will generally return a
-    /// reasonable default response to any request, at least for [`RpcRequest`]
-    /// values for which responses have been implemented.
-    ///
-    /// This mock can be customized in two ways:
-    ///
-    /// 1) By changing the `url` argument, which is not actually a URL, but a
-    ///    simple string directive that changes the mock behavior in specific
-    ///    scenarios.
-    ///
-    ///    It is customary to set the `url` to "succeeds" for mocks that should
-    ///    return sucessfully, though this value is not actually interpreted.
-    ///
-    ///    If `url` is "fails" then any call to `send` will return `Ok(Value::Null)`.
-    ///
-    ///    Other possible values of `url` are specific to different `RpcRequest`
-    ///    values. Read the implementation of `MockSender` (which is non-public)
-    ///    for details.
-    ///
-    /// 2) Custom responses can be configured by providing [`Mocks`]. This type
-    ///    is a [`HashMap`] from [`RpcRequest`] to a JSON [`Value`] response,
-    ///    Any entries in this map override the default behavior for the given
-    ///    request.
-    ///
-    /// The [`RpcClient::new_mock_with_mocks`] function offers further
-    /// customization options.
-    ///
-    /// [`HashMap`]: std::collections::HashMap
+    /// See the [`MockSender`] documentation for an explanation of how it treats
+    /// the `url` argument.
     ///
     /// # Examples
     ///
@@ -467,10 +397,9 @@ impl RpcClient {
     /// Create an HTTP `RpcClient` from a [`SocketAddr`].
     ///
     /// The client has a default timeout of 30 seconds, and a default [commitment
-    /// level][cl] of [`Finalized`].
+    /// level][cl] of [`Finalized`](CommitmentLevel::Finalized).
     ///
     /// [cl]: https://docs.solana.com/developing/clients/jsonrpc-api#configuring-state-commitment
-    /// [`Finalized`]: solana_sdk::commitment_config::CommitmentLevel::Finalized
     ///
     /// # Examples
     ///
@@ -491,8 +420,6 @@ impl RpcClient {
     /// The client has a default timeout of 30 seconds, and a user-specified
     /// [`CommitmentLevel`] via [`CommitmentConfig`].
     ///
-    /// [`CommitmentLevel`]: solana_sdk::commitment_config::CommitmentLevel
-    ///
     /// # Examples
     ///
     /// ```
@@ -515,10 +442,9 @@ impl RpcClient {
 
     /// Create an HTTP `RpcClient` from a [`SocketAddr`] with specified timeout.
     ///
-    /// The client has a default [commitment level][cl] of [`Finalized`].
+    /// The client has a default [commitment level][cl] of [`Finalized`](CommitmentLevel::Finalized).
     ///
     /// [cl]: https://docs.solana.com/developing/clients/jsonrpc-api#configuring-state-commitment
-    /// [`Finalized`]: solana_sdk::commitment_config::CommitmentLevel::Finalized
     ///
     /// # Examples
     ///
@@ -543,9 +469,7 @@ impl RpcClient {
     /// determines how thoroughly committed a transaction must be when waiting
     /// for its confirmation or otherwise checking for confirmation. If not
     /// specified, the default commitment level is
-    /// [`Finalized`].
-    ///
-    /// [`Finalized`]: solana_sdk::commitment_config::CommitmentLevel::Finalized
+    /// [`Finalized`](CommitmentLevel::Finalized).
     ///
     /// The default commitment level is overridden when calling methods that
     /// explicitly provide a [`CommitmentConfig`], like
@@ -579,8 +503,7 @@ impl RpcClient {
     /// containing an [`RpcResponseError`] with `code` set to
     /// [`JSON_RPC_SERVER_ERROR_NODE_UNHEALTHY`].
     ///
-    /// [`RpcError`]: crate::rpc_request::RpcError
-    /// [`RpcResponseError`]: crate::rpc_request::RpcError::RpcResponseError
+    /// [`RpcResponseError`]: RpcError::RpcResponseError
     /// [`JSON_RPC_SERVER_ERROR_TRANSACTION_SIGNATURE_VERIFICATION_FAILURE`]: crate::rpc_custom_error::JSON_RPC_SERVER_ERROR_TRANSACTION_SIGNATURE_VERIFICATION_FAILURE
     /// [`JSON_RPC_SERVER_ERROR_SEND_TRANSACTION_PREFLIGHT_FAILURE`]: crate::rpc_custom_error::JSON_RPC_SERVER_ERROR_SEND_TRANSACTION_PREFLIGHT_FAILURE
     /// [`JSON_RPC_SERVER_ERROR_NODE_UNHEALTHY`]: crate::rpc_custom_error::JSON_RPC_SERVER_ERROR_NODE_UNHEALTHY
@@ -693,8 +616,7 @@ impl RpcClient {
     /// containing an [`RpcResponseError`] with `code` set to
     /// [`JSON_RPC_SERVER_ERROR_NODE_UNHEALTHY`].
     ///
-    /// [`RpcError`]: crate::rpc_request::RpcError
-    /// [`RpcResponseError`]: crate::rpc_request::RpcError::RpcResponseError
+    /// [`RpcResponseError`]: RpcError::RpcResponseError
     /// [`JSON_RPC_SERVER_ERROR_TRANSACTION_SIGNATURE_VERIFICATION_FAILURE`]: crate::rpc_custom_error::JSON_RPC_SERVER_ERROR_TRANSACTION_SIGNATURE_VERIFICATION_FAILURE
     /// [`JSON_RPC_SERVER_ERROR_SEND_TRANSACTION_PREFLIGHT_FAILURE`]: crate::rpc_custom_error::JSON_RPC_SERVER_ERROR_SEND_TRANSACTION_PREFLIGHT_FAILURE
     /// [`JSON_RPC_SERVER_ERROR_NODE_UNHEALTHY`]: crate::rpc_custom_error::JSON_RPC_SERVER_ERROR_NODE_UNHEALTHY
@@ -768,8 +690,7 @@ impl RpcClient {
     /// containing an [`RpcResponseError`] with `code` set to
     /// [`JSON_RPC_SERVER_ERROR_NODE_UNHEALTHY`].
     ///
-    /// [`RpcError`]: crate::rpc_request::RpcError
-    /// [`RpcResponseError`]: crate::rpc_request::RpcError::RpcResponseError
+    /// [`RpcResponseError`]: RpcError::RpcResponseError
     /// [`JSON_RPC_SERVER_ERROR_TRANSACTION_SIGNATURE_VERIFICATION_FAILURE`]: crate::rpc_custom_error::JSON_RPC_SERVER_ERROR_TRANSACTION_SIGNATURE_VERIFICATION_FAILURE
     /// [`JSON_RPC_SERVER_ERROR_SEND_TRANSACTION_PREFLIGHT_FAILURE`]: crate::rpc_custom_error::JSON_RPC_SERVER_ERROR_SEND_TRANSACTION_PREFLIGHT_FAILURE
     /// [`JSON_RPC_SERVER_ERROR_NODE_UNHEALTHY`]: crate::rpc_custom_error::JSON_RPC_SERVER_ERROR_NODE_UNHEALTHY
@@ -2113,7 +2034,6 @@ impl RpcClient {
     ///     transaction_details: Some(TransactionDetails::None),
     ///     rewards: Some(true),
     ///     commitment: None,
-    ///     max_supported_transaction_version: Some(0),
     /// };
     /// let block = rpc_client.get_block_with_config(
     ///     slot,
@@ -2181,7 +2101,7 @@ impl RpcClient {
     ///
     /// This method uses the [`Finalized`] [commitment level][cl].
     ///
-    /// [`Finalized`]: solana_sdk::commitment_config::CommitmentLevel::Finalized
+    /// [`Finalized`]: CommitmentLevel::Finalized
     /// [`get_blocks_with_limit`]: RpcClient::get_blocks_with_limit.
     /// [cl]: https://docs.solana.com/developing/clients/jsonrpc-api#configuring-state-commitment
     ///
@@ -2240,7 +2160,7 @@ impl RpcClient {
     /// This method returns an error if the given commitment level is below
     /// [`Confirmed`].
     ///
-    /// [`Confirmed`]: solana_sdk::commitment_config::CommitmentLevel::Confirmed
+    /// [`Confirmed`]: CommitmentLevel::Confirmed
     ///
     /// # RPC Reference
     ///
@@ -2333,7 +2253,7 @@ impl RpcClient {
     /// [`Confirmed`].
     ///
     /// [cl]: https://docs.solana.com/developing/clients/jsonrpc-api#configuring-state-commitment
-    /// [`Confirmed`]: solana_sdk::commitment_config::CommitmentLevel::Confirmed
+    /// [`Confirmed`]: CommitmentLevel::Confirmed
     ///
     /// # RPC Reference
     ///
@@ -2494,7 +2414,7 @@ impl RpcClient {
     /// [`Confirmed`].
     ///
     /// [cl]: https://docs.solana.com/developing/clients/jsonrpc-api#configuring-state-commitment
-    /// [`Confirmed`]: solana_sdk::commitment_config::CommitmentLevel::Confirmed
+    /// [`Confirmed`]: CommitmentLevel::Confirmed
     ///
     /// # RPC Reference
     ///
@@ -2584,7 +2504,7 @@ impl RpcClient {
     ///
     /// This method uses the [`Finalized`] [commitment level][cl].
     ///
-    /// [`Finalized`]: solana_sdk::commitment_config::CommitmentLevel::Finalized
+    /// [`Finalized`]: CommitmentLevel::Finalized
     /// [cl]: https://docs.solana.com/developing/clients/jsonrpc-api#configuring-state-commitment
     ///
     /// # RPC Reference
@@ -2639,7 +2559,7 @@ impl RpcClient {
     /// [`Confirmed`].
     ///
     /// [cl]: https://docs.solana.com/developing/clients/jsonrpc-api#configuring-state-commitment
-    /// [`Confirmed`]: solana_sdk::commitment_config::CommitmentLevel::Confirmed
+    /// [`Confirmed`]: CommitmentLevel::Confirmed
     ///
     /// # RPC Reference
     ///
@@ -2676,7 +2596,6 @@ impl RpcClient {
     /// let config = RpcTransactionConfig {
     ///     encoding: Some(UiTransactionEncoding::Json),
     ///     commitment: Some(CommitmentConfig::confirmed()),
-    ///     max_supported_transaction_version: Some(0),
     /// };
     /// let transaction = rpc_client.get_transaction_with_config(
     ///     &signature,
@@ -3005,7 +2924,7 @@ impl RpcClient {
     ///
     /// This method uses the [`Finalized`] [commitment level][cl].
     ///
-    /// [`Finalized`]: solana_sdk::commitment_config::CommitmentLevel::Finalized
+    /// [`Finalized`]: CommitmentLevel::Finalized
     /// [cl]: https://docs.solana.com/developing/clients/jsonrpc-api#configuring-state-commitment
     ///
     /// # RPC Reference
@@ -3163,7 +3082,6 @@ impl RpcClient {
     /// [`RpcError::ForUser`]. This is unlike [`get_account_with_commitment`],
     /// which returns `Ok(None)` if the account does not exist.
     ///
-    /// [`RpcError::ForUser`]: crate::rpc_request::RpcError::ForUser
     /// [`get_account_with_commitment`]: RpcClient::get_account_with_commitment
     ///
     /// # RPC Reference
@@ -3245,60 +3163,6 @@ impl RpcClient {
         )
     }
 
-    /// Returns all information associated with the account of the provided pubkey.
-    ///
-    /// If the account does not exist, this method returns `Ok(None)`.
-    ///
-    /// To get multiple accounts at once, use the [`get_multiple_accounts_with_config`] method.
-    ///
-    /// [`get_multiple_accounts_with_config`]: RpcClient::get_multiple_accounts_with_config
-    ///
-    /// # RPC Reference
-    ///
-    /// This method is built on the [`getAccountInfo`] RPC method.
-    ///
-    /// [`getAccountInfo`]: https://docs.solana.com/developing/clients/jsonrpc-api#getaccountinfo
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// # use solana_client::{
-    /// #     rpc_client::{self, RpcClient},
-    /// #     rpc_config::RpcAccountInfoConfig,
-    /// #     client_error::ClientError,
-    /// # };
-    /// # use solana_sdk::{
-    /// #     signature::Signer,
-    /// #     signer::keypair::Keypair,
-    /// #     pubkey::Pubkey,
-    /// #     commitment_config::CommitmentConfig,
-    /// # };
-    /// # use solana_account_decoder::UiAccountEncoding;
-    /// # use std::str::FromStr;
-    /// # let mocks = rpc_client::create_rpc_client_mocks();
-    /// # let rpc_client = RpcClient::new_mock_with_mocks("succeeds".to_string(), mocks);
-    /// let alice_pubkey = Pubkey::from_str("BgvYtJEfmZYdVKiptmMjxGzv8iQoo4MWjsP3QsTkhhxa").unwrap();
-    /// let commitment_config = CommitmentConfig::processed();
-    /// let config = RpcAccountInfoConfig {
-    ///     encoding: Some(UiAccountEncoding::Base64),
-    ///     commitment: Some(commitment_config),
-    ///     .. RpcAccountInfoConfig::default()
-    /// };
-    /// let account = rpc_client.get_account_with_config(
-    ///     &alice_pubkey,
-    ///     config,
-    /// )?;
-    /// assert!(account.value.is_some());
-    /// # Ok::<(), ClientError>(())
-    /// ```
-    pub fn get_account_with_config(
-        &self,
-        pubkey: &Pubkey,
-        config: RpcAccountInfoConfig,
-    ) -> RpcResult<Option<Account>> {
-        self.invoke(self.rpc_client.get_account_with_config(pubkey, config))
-    }
-
     /// Get the max slot seen from retransmit stage.
     ///
     /// # RPC Reference

client/src/rpc_config.rs

@@ -197,7 +197,6 @@ pub struct RpcBlockSubscribeConfig {
     pub encoding: Option<UiTransactionEncoding>,
     pub transaction_details: Option<TransactionDetails>,
     pub show_rewards: Option<bool>,
-    pub max_supported_transaction_version: Option<u8>,
 }
 
 #[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize)]
@@ -249,7 +248,6 @@ pub struct RpcBlockConfig {
     pub rewards: Option<bool>,
     #[serde(flatten)]
     pub commitment: Option<CommitmentConfig>,
-    pub max_supported_transaction_version: Option<u8>,
 }
 
 impl EncodingConfig for RpcBlockConfig {
@@ -290,7 +288,6 @@ pub struct RpcTransactionConfig {
     pub encoding: Option<UiTransactionEncoding>,
     #[serde(flatten)]
     pub commitment: Option<CommitmentConfig>,
-    pub max_supported_transaction_version: Option<u8>,
 }
 
 impl EncodingConfig for RpcTransactionConfig {

client/src/rpc_custom_error.rs

@@ -3,7 +3,6 @@ use {
     crate::rpc_response::RpcSimulateTransactionResult,
     jsonrpc_core::{Error, ErrorCode},
     solana_sdk::clock::Slot,
-    solana_transaction_status::EncodeError,
     thiserror::Error,
 };
 
@@ -60,7 +59,7 @@ pub enum RpcCustomError {
     #[error("BlockStatusNotAvailableYet")]
     BlockStatusNotAvailableYet { slot: Slot },
     #[error("UnsupportedTransactionVersion")]
-    UnsupportedTransactionVersion(u8),
+    UnsupportedTransactionVersion,
 }
 
 #[derive(Debug, Serialize, Deserialize)]
@@ -69,16 +68,6 @@ pub struct NodeUnhealthyErrorData {
     pub num_slots_behind: Option<Slot>,
 }
 
-impl From<EncodeError> for RpcCustomError {
-    fn from(err: EncodeError) -> Self {
-        match err {
-            EncodeError::UnsupportedTransactionVersion(version) => {
-                Self::UnsupportedTransactionVersion(version)
-            }
-        }
-    }
-}
-
 impl From<RpcCustomError> for Error {
     fn from(e: RpcCustomError) -> Self {
         match e {
@@ -183,9 +172,9 @@ impl From<RpcCustomError> for Error {
                 message: format!("Block status not yet available for slot {}", slot),
                 data: None,
             },
-            RpcCustomError::UnsupportedTransactionVersion(version) => Self {
+            RpcCustomError::UnsupportedTransactionVersion => Self {
                 code: ErrorCode::ServerError(JSON_RPC_SERVER_ERROR_UNSUPPORTED_TRANSACTION_VERSION),
-                message: format!("Transaction version ({}) is not supported", version),
+                message: "Versioned transactions are not supported".to_string(),
                 data: None,
             },
         }

client/src/rpc_deprecated_config.rs

@@ -71,7 +71,6 @@ impl From<RpcConfirmedBlockConfig> for RpcBlockConfig {
             transaction_details: config.transaction_details,
             rewards: config.rewards,
             commitment: config.commitment,
-            max_supported_transaction_version: None,
         }
     }
 }
@@ -99,7 +98,6 @@ impl From<RpcConfirmedTransactionConfig> for RpcTransactionConfig {
         Self {
             encoding: config.encoding,
             commitment: config.commitment,
-            max_supported_transaction_version: None,
         }
     }
 }

client/src/rpc_response.rs

@@ -117,7 +117,7 @@ pub struct RpcInflationRate {
     pub epoch: Epoch,
 }
 
-#[derive(Serialize, Deserialize, Clone, Debug, PartialEq)]
+#[derive(Serialize, Deserialize, Clone, Debug)]
 #[serde(rename_all = "camelCase")]
 pub struct RpcKeyedAccount {
     pub pubkey: String,
@@ -246,7 +246,7 @@ pub struct RpcBlockProductionRange {
     pub last_slot: Slot,
 }
 
-#[derive(Serialize, Deserialize, Clone, Debug, PartialEq)]
+#[derive(Serialize, Deserialize, Clone)]
 #[serde(rename_all = "camelCase")]
 pub struct RpcBlockProduction {
     /// Map of leader base58 identity pubkeys to a tuple of `(number of leader slots, number of blocks produced)`
@@ -363,7 +363,7 @@ pub struct RpcAccountBalance {
     pub lamports: u64,
 }
 
-#[derive(Serialize, Deserialize, Clone, Debug, PartialEq)]
+#[derive(Serialize, Deserialize, Clone, Debug)]
 #[serde(rename_all = "camelCase")]
 pub struct RpcSupply {
     pub total: u64,
@@ -432,8 +432,8 @@ pub enum RpcBlockUpdateError {
     #[error("block store error")]
     BlockStoreError,
 
-    #[error("unsupported transaction version ({0})")]
-    UnsupportedTransactionVersion(u8),
+    #[error("unsupported transaction version")]
+    UnsupportedTransactionVersion,
 }
 
 #[derive(Serialize, Deserialize, Debug)]

client/src/rpc_sender.rs

@@ -23,9 +23,13 @@ pub struct RpcTransportStats {
 /// `RpcSender` implements the underlying transport of requests to, and
 /// responses from, a Solana node, and is used primarily by [`RpcClient`].
 ///
-/// [`RpcClient`]: crate::rpc_client::RpcClient
+/// It is typically implemented by [`HttpSender`] in production, and
+/// [`MockSender`] in unit tests.
+///
+/// [`HttpSender`]: crate::http_sender::HttpSender
+/// [`MockSender`]: crate::mock_sender::MockSender
 #[async_trait]
-pub trait RpcSender {
+pub(crate) trait RpcSender {
     async fn send(
         &self,
         request: RpcRequest,

client/src/thin_client.rs

@@ -4,10 +4,8 @@
 //! unstable and may change in future releases.
 
 use {
-    crate::{
-        rpc_client::RpcClient, rpc_config::RpcProgramAccountsConfig, rpc_response::Response,
-        tpu_connection::TpuConnection, udp_client::UdpTpuConnection,
-    },
+    crate::{rpc_client::RpcClient, rpc_config::RpcProgramAccountsConfig, rpc_response::Response},
+    bincode::{serialize_into, serialized_size},
     log::*,
     solana_sdk::{
         account::Account,
@@ -19,12 +17,13 @@ use {
         hash::Hash,
         instruction::Instruction,
         message::Message,
+        packet::PACKET_DATA_SIZE,
         pubkey::Pubkey,
         signature::{Keypair, Signature, Signer},
         signers::Signers,
         system_instruction,
         timing::duration_as_ms,
-        transaction::{self, Transaction, VersionedTransaction},
+        transaction::{self, Transaction},
         transport::Result as TransportResult,
     },
     std::{
@@ -118,20 +117,22 @@ impl ClientOptimizer {
 }
 
 /// An object for querying and sending transactions to the network.
-pub struct ThinClient<C: 'static + TpuConnection> {
+pub struct ThinClient {
+    transactions_socket: UdpSocket,
+    tpu_addrs: Vec<SocketAddr>,
     rpc_clients: Vec<RpcClient>,
-    tpu_connections: Vec<C>,
     optimizer: ClientOptimizer,
 }
 
-impl<C: 'static + TpuConnection> ThinClient<C> {
+impl ThinClient {
     /// Create a new ThinClient that will interface with the Rpc at `rpc_addr` using TCP
-    /// and the Tpu at `tpu_addr` over `transactions_socket` using Quic or UDP
-    /// (currently hardcoded to UDP)
+    /// and the Tpu at `tpu_addr` over `transactions_socket` using UDP.
     pub fn new(rpc_addr: SocketAddr, tpu_addr: SocketAddr, transactions_socket: UdpSocket) -> Self {
-        let tpu_connection = C::new(transactions_socket, tpu_addr);
-
-        Self::new_from_client(RpcClient::new_socket(rpc_addr), tpu_connection)
+        Self::new_from_client(
+            tpu_addr,
+            transactions_socket,
+            RpcClient::new_socket(rpc_addr),
+        )
     }
 
     pub fn new_socket_with_timeout(
@@ -141,14 +142,18 @@ impl<C: 'static + TpuConnection> ThinClient<C> {
         timeout: Duration,
     ) -> Self {
         let rpc_client = RpcClient::new_socket_with_timeout(rpc_addr, timeout);
-        let tpu_connection = C::new(transactions_socket, tpu_addr);
-        Self::new_from_client(rpc_client, tpu_connection)
+        Self::new_from_client(tpu_addr, transactions_socket, rpc_client)
     }
 
-    fn new_from_client(rpc_client: RpcClient, tpu_connection: C) -> Self {
+    fn new_from_client(
+        tpu_addr: SocketAddr,
+        transactions_socket: UdpSocket,
+        rpc_client: RpcClient,
+    ) -> Self {
         Self {
+            transactions_socket,
+            tpu_addrs: vec![tpu_addr],
             rpc_clients: vec![rpc_client],
-            tpu_connections: vec![tpu_connection],
             optimizer: ClientOptimizer::new(0),
         }
     }
@@ -163,19 +168,16 @@ impl<C: 'static + TpuConnection> ThinClient<C> {
 
         let rpc_clients: Vec<_> = rpc_addrs.into_iter().map(RpcClient::new_socket).collect();
         let optimizer = ClientOptimizer::new(rpc_clients.len());
-        let tpu_connections: Vec<_> = tpu_addrs
-            .into_iter()
-            .map(|tpu_addr| C::new(transactions_socket.try_clone().unwrap(), tpu_addr))
-            .collect();
         Self {
+            transactions_socket,
+            tpu_addrs,
             rpc_clients,
-            tpu_connections,
             optimizer,
         }
     }
 
-    fn tpu_connection(&self) -> &C {
-        &self.tpu_connections[self.optimizer.best()]
+    fn tpu_addr(&self) -> &SocketAddr {
+        &self.tpu_addrs[self.optimizer.best()]
     }
 
     fn rpc_client(&self) -> &RpcClient {
@@ -203,6 +205,7 @@ impl<C: 'static + TpuConnection> ThinClient<C> {
         self.send_and_confirm_transaction(&[keypair], transaction, tries, 0)
     }
 
+    /// Retry sending a signed Transaction to the server for processing
     pub fn send_and_confirm_transaction<T: Signers>(
         &self,
         keypairs: &T,
@@ -212,16 +215,18 @@ impl<C: 'static + TpuConnection> ThinClient<C> {
     ) -> TransportResult<Signature> {
         for x in 0..tries {
             let now = Instant::now();
+            let mut buf = vec![0; serialized_size(&transaction).unwrap() as usize];
+            let mut wr = std::io::Cursor::new(&mut buf[..]);
             let mut num_confirmed = 0;
             let mut wait_time = MAX_PROCESSING_AGE;
+            serialize_into(&mut wr, &transaction)
+                .expect("serialize Transaction in pub fn transfer_signed");
             // resend the same transaction until the transaction has no chance of succeeding
-            let wire_transaction =
-                bincode::serialize(&transaction).expect("transaction serialization failed");
             while now.elapsed().as_secs() < wait_time as u64 {
                 if num_confirmed == 0 {
                     // Send the transaction if there has been no confirmation (e.g. the first time)
-                    self.tpu_connection()
-                        .send_wire_transaction(&wire_transaction)?;
+                    self.transactions_socket
+                        .send_to(&buf[..], &self.tpu_addr())?;
                 }
 
                 if let Ok(confirmed_blocks) = self.poll_for_signature_confirmation(
@@ -316,13 +321,13 @@ impl<C: 'static + TpuConnection> ThinClient<C> {
     }
 }
 
-impl<C: 'static + TpuConnection> Client for ThinClient<C> {
+impl Client for ThinClient {
     fn tpu_addr(&self) -> String {
-        self.tpu_connection().tpu_addr().to_string()
+        self.tpu_addr().to_string()
     }
 }
 
-impl<C: 'static + TpuConnection> SyncClient for ThinClient<C> {
+impl SyncClient for ThinClient {
     fn send_and_confirm_message<T: Signers>(
         &self,
         keypairs: &T,
@@ -602,21 +607,17 @@ impl<C: 'static + TpuConnection> SyncClient for ThinClient<C> {
     }
 }
 
-impl<C: 'static + TpuConnection> AsyncClient for ThinClient<C> {
+impl AsyncClient for ThinClient {
     fn async_send_transaction(&self, transaction: Transaction) -> TransportResult<Signature> {
-        let transaction = VersionedTransaction::from(transaction);
-        self.tpu_connection()
-            .serialize_and_send_transaction(&transaction)?;
+        let mut buf = vec![0; serialized_size(&transaction).unwrap() as usize];
+        let mut wr = std::io::Cursor::new(&mut buf[..]);
+        serialize_into(&mut wr, &transaction)
+            .expect("serialize Transaction in pub fn transfer_signed");
+        assert!(buf.len() < PACKET_DATA_SIZE);
+        self.transactions_socket
+            .send_to(&buf[..], &self.tpu_addr())?;
         Ok(transaction.signatures[0])
     }
-
-    fn async_send_batch(&self, transactions: Vec<Transaction>) -> TransportResult<()> {
-        let batch: Vec<VersionedTransaction> = transactions.into_iter().map(Into::into).collect();
-        self.tpu_connection()
-            .par_serialize_and_send_transaction_batch(&batch[..])?;
-        Ok(())
-    }
-
     fn async_send_message<T: Signers>(
         &self,
         keypairs: &T,
@@ -648,23 +649,20 @@ impl<C: 'static + TpuConnection> AsyncClient for ThinClient<C> {
     }
 }
 
-pub fn create_client(
-    (rpc, tpu): (SocketAddr, SocketAddr),
-    range: (u16, u16),
-) -> ThinClient<UdpTpuConnection> {
+pub fn create_client((rpc, tpu): (SocketAddr, SocketAddr), range: (u16, u16)) -> ThinClient {
     let (_, transactions_socket) =
         solana_net_utils::bind_in_range(IpAddr::V4(Ipv4Addr::new(0, 0, 0, 0)), range).unwrap();
-    ThinClient::<UdpTpuConnection>::new(rpc, tpu, transactions_socket)
+    ThinClient::new(rpc, tpu, transactions_socket)
 }
 
 pub fn create_client_with_timeout(
     (rpc, tpu): (SocketAddr, SocketAddr),
     range: (u16, u16),
     timeout: Duration,
-) -> ThinClient<UdpTpuConnection> {
+) -> ThinClient {
     let (_, transactions_socket) =
         solana_net_utils::bind_in_range(IpAddr::V4(Ipv4Addr::new(0, 0, 0, 0)), range).unwrap();
-    ThinClient::<UdpTpuConnection>::new_socket_with_timeout(rpc, tpu, transactions_socket, timeout)
+    ThinClient::new_socket_with_timeout(rpc, tpu, transactions_socket, timeout)
 }
 
 #[cfg(test)]

client/src/tpu_connection.rs

@@ -1,40 +0,0 @@
-use {
-    rayon::iter::{IntoParallelIterator, ParallelIterator},
-    solana_sdk::{transaction::VersionedTransaction, transport::Result as TransportResult},
-    std::net::{SocketAddr, UdpSocket},
-};
-
-pub trait TpuConnection {
-    fn new(client_socket: UdpSocket, tpu_addr: SocketAddr) -> Self;
-
-    fn tpu_addr(&self) -> &SocketAddr;
-
-    fn serialize_and_send_transaction(
-        &self,
-        transaction: &VersionedTransaction,
-    ) -> TransportResult<()> {
-        let wire_transaction =
-            bincode::serialize(transaction).expect("serialize Transaction in send_batch");
-        self.send_wire_transaction(&wire_transaction)
-    }
-
-    fn send_wire_transaction<T>(&self, wire_transaction: T) -> TransportResult<()>
-    where
-        T: AsRef<[u8]>;
-
-    fn par_serialize_and_send_transaction_batch(
-        &self,
-        transactions: &[VersionedTransaction],
-    ) -> TransportResult<()> {
-        let buffers = transactions
-            .into_par_iter()
-            .map(|tx| bincode::serialize(&tx).expect("serialize Transaction in send_batch"))
-            .collect::<Vec<_>>();
-
-        self.send_wire_transaction_batch(&buffers)
-    }
-
-    fn send_wire_transaction_batch<T>(&self, buffers: &[T]) -> TransportResult<()>
-    where
-        T: AsRef<[u8]>;
-}

client/src/udp_client.rs

@@ -1,45 +0,0 @@
-//! Simple TPU client that communicates with the given UDP port with UDP and provides
-//! an interface for sending transactions
-
-use {
-    crate::tpu_connection::TpuConnection,
-    core::iter::repeat,
-    solana_sdk::transport::Result as TransportResult,
-    solana_streamer::sendmmsg::batch_send,
-    std::net::{SocketAddr, UdpSocket},
-};
-
-pub struct UdpTpuConnection {
-    socket: UdpSocket,
-    addr: SocketAddr,
-}
-
-impl TpuConnection for UdpTpuConnection {
-    fn new(client_socket: UdpSocket, tpu_addr: SocketAddr) -> Self {
-        Self {
-            socket: client_socket,
-            addr: tpu_addr,
-        }
-    }
-
-    fn tpu_addr(&self) -> &SocketAddr {
-        &self.addr
-    }
-
-    fn send_wire_transaction<T>(&self, wire_transaction: T) -> TransportResult<()>
-    where
-        T: AsRef<[u8]>,
-    {
-        self.socket.send_to(wire_transaction.as_ref(), self.addr)?;
-        Ok(())
-    }
-
-    fn send_wire_transaction_batch<T>(&self, buffers: &[T]) -> TransportResult<()>
-    where
-        T: AsRef<[u8]>,
-    {
-        let pkts: Vec<_> = buffers.iter().zip(repeat(self.tpu_addr())).collect();
-        batch_send(&self.socket, &pkts)?;
-        Ok(())
-    }
-}

core/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "solana-core"
 description = "Blockchain, Rebuilt for Scale"
-version = "1.10.8"
+version = "1.10.0"
 homepage = "https://solana.com/"
 documentation = "https://docs.rs/solana-core"
 readme = "../README.md"
@@ -15,69 +15,73 @@ codecov = { repository = "solana-labs/solana", branch = "master", service = "git
 
 [dependencies]
 ahash = "0.7.6"
-base64 = "0.13.0"
+base64 = "0.12.3"
 bincode = "1.3.3"
 bs58 = "0.4.0"
 chrono = { version = "0.4.11", features = ["serde"] }
 crossbeam-channel = "0.5"
 dashmap = { version = "4.0.2", features = ["rayon", "raw-api"] }
-etcd-client = { version = "0.9.0", features = ["tls"] }
+etcd-client = { version = "0.8.3", features = ["tls"]}
 fs_extra = "1.2.0"
 histogram = "0.6.9"
 itertools = "0.10.3"
 log = "0.4.14"
-lru = "0.7.5"
+lru = "0.7.2"
 rand = "0.7.0"
 rand_chacha = "0.2.2"
 rayon = "1.5.1"
-retain_mut = "0.1.7"
+retain_mut = "0.1.5"
 serde = "1.0.136"
 serde_derive = "1.0.103"
-solana-address-lookup-table-program = { path = "../programs/address-lookup-table", version = "=1.10.8" }
-solana-bloom = { path = "../bloom", version = "=1.10.8" }
-solana-client = { path = "../client", version = "=1.10.8" }
-solana-entry = { path = "../entry", version = "=1.10.8" }
-solana-frozen-abi = { path = "../frozen-abi", version = "=1.10.8" }
-solana-frozen-abi-macro = { path = "../frozen-abi/macro", version = "=1.10.8" }
-solana-geyser-plugin-manager = { path = "../geyser-plugin-manager", version = "=1.10.8" }
-solana-gossip = { path = "../gossip", version = "=1.10.8" }
-solana-ledger = { path = "../ledger", version = "=1.10.8" }
-solana-measure = { path = "../measure", version = "=1.10.8" }
-solana-metrics = { path = "../metrics", version = "=1.10.8" }
-solana-net-utils = { path = "../net-utils", version = "=1.10.8" }
-solana-perf = { path = "../perf", version = "=1.10.8" }
-solana-poh = { path = "../poh", version = "=1.10.8" }
-solana-program-runtime = { path = "../program-runtime", version = "=1.10.8" }
-solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "=1.10.8" }
-solana-replica-lib = { path = "../replica-lib", version = "=1.10.8" }
-solana-rpc = { path = "../rpc", version = "=1.10.8" }
-solana-runtime = { path = "../runtime", version = "=1.10.8" }
-solana-sdk = { path = "../sdk", version = "=1.10.8" }
-solana-send-transaction-service = { path = "../send-transaction-service", version = "=1.10.8" }
-solana-streamer = { path = "../streamer", version = "=1.10.8" }
-solana-transaction-status = { path = "../transaction-status", version = "=1.10.8" }
-solana-vote-program = { path = "../programs/vote", version = "=1.10.8" }
-sys-info = "0.9.1"
+solana-address-lookup-table-program = { path = "../programs/address-lookup-table", version = "=1.10.0" }
+solana-bloom = { path = "../bloom", version = "=1.10.0" }
+solana-accountsdb-plugin-manager = { path = "../accountsdb-plugin-manager", version = "=1.10.0" }
+solana-client = { path = "../client", version = "=1.10.0" }
+solana-entry = { path = "../entry", version = "=1.10.0" }
+solana-gossip = { path = "../gossip", version = "=1.10.0" }
+solana-ledger = { path = "../ledger", version = "=1.10.0" }
+solana-measure = { path = "../measure", version = "=1.10.0" }
+solana-metrics = { path = "../metrics", version = "=1.10.0" }
+solana-net-utils = { path = "../net-utils", version = "=1.10.0" }
+solana-perf = { path = "../perf", version = "=1.10.0" }
+solana-poh = { path = "../poh", version = "=1.10.0" }
+solana-program-runtime = { path = "../program-runtime", version = "=1.10.0" }
+solana-rpc = { path = "../rpc", version = "=1.10.0" }
+solana-replica-lib = { path = "../replica-lib", version = "=1.10.0" }
+solana-runtime = { path = "../runtime", version = "=1.10.0" }
+solana-sdk = { path = "../sdk", version = "=1.10.0" }
+solana-frozen-abi = { path = "../frozen-abi", version = "=1.10.0" }
+solana-frozen-abi-macro = { path = "../frozen-abi/macro", version = "=1.10.0" }
+solana-send-transaction-service = { path = "../send-transaction-service", version = "=1.10.0" }
+solana-streamer = { path = "../streamer", version = "=1.10.0" }
+solana-transaction-status = { path = "../transaction-status", version = "=1.10.0" }
+solana-vote-program = { path = "../programs/vote", version = "=1.10.0" }
 tempfile = "3.3.0"
 thiserror = "1.0"
+solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "=1.10.0" }
+sys-info = "0.9.1"
 tokio = { version = "1", features = ["full"] }
 trees = "0.4.2"
 
 [dev-dependencies]
+jsonrpc-core = "18.0.0"
+jsonrpc-core-client = { version = "18.0.0", features = ["ipc", "ws"] }
+jsonrpc-derive = "18.0.0"
+jsonrpc-pubsub = "18.0.0"
 matches = "0.1.9"
 raptorq = "1.6.5"
-reqwest = { version = "0.11.10", default-features = false, features = ["blocking", "rustls-tls", "json"] }
-serde_json = "1.0.79"
-serial_test = "0.6.0"
-solana-logger = { path = "../logger", version = "=1.10.8" }
-solana-program-runtime = { path = "../program-runtime", version = "=1.10.8" }
-solana-stake-program = { path = "../programs/stake", version = "=1.10.8" }
-solana-version = { path = "../version", version = "=1.10.8" }
+reqwest = { version = "0.11.6", default-features = false, features = ["blocking", "rustls-tls", "json"] }
+serde_json = "1.0.78"
+serial_test = "0.5.1"
+solana-logger = { path = "../logger", version = "=1.10.0" }
+solana-program-runtime = { path = "../program-runtime", version = "=1.10.0" }
+solana-stake-program = { path = "../programs/stake", version = "=1.10.0" }
+solana-version = { path = "../version", version = "=1.10.0" }
 static_assertions = "1.1.0"
 systemstat = "0.1.10"
 
 [target."cfg(unix)".dependencies]
-sysctl = "0.4.4"
+sysctl = "0.4.3"
 
 [build-dependencies]
 rustc_version = "0.4"

core/benches/banking_stage.rs

@@ -12,7 +12,6 @@ use {
         banking_stage::{BankingStage, BankingStageStats},
         leader_slot_banking_stage_metrics::LeaderSlotMetricsTracker,
         qos_service::QosService,
-        unprocessed_packet_batches::*,
     },
     solana_entry::entry::{next_hash, Entry},
     solana_gossip::cluster_info::{ClusterInfo, Node},
@@ -37,6 +36,7 @@ use {
     },
     solana_streamer::socket::SocketAddrSpace,
     std::{
+        collections::VecDeque,
         sync::{atomic::Ordering, Arc, RwLock},
         time::{Duration, Instant},
     },
@@ -79,14 +79,10 @@ fn bench_consume_buffered(bencher: &mut Bencher) {
         let len = 4096;
         let chunk_size = 1024;
         let batches = to_packet_batches(&vec![tx; len], chunk_size);
-        let mut packet_batches = UnprocessedPacketBatches::new();
+        let mut packet_batches = VecDeque::new();
         for batch in batches {
             let batch_len = batch.packets.len();
-            packet_batches.push_back(DeserializedPacketBatch::new(
-                batch,
-                vec![0usize; batch_len],
-                false,
-            ));
+            packet_batches.push_back((batch, vec![0usize; batch_len], false));
         }
         let (s, _r) = unbounded();
         // This tests the performance of buffering packets.

core/benches/cluster_nodes.rs

@@ -1,78 +0,0 @@
-#![feature(test)]
-
-extern crate test;
-
-use {
-    rand::{seq::SliceRandom, Rng},
-    solana_core::{
-        cluster_nodes::{make_test_cluster, new_cluster_nodes, ClusterNodes},
-        retransmit_stage::RetransmitStage,
-    },
-    solana_gossip::contact_info::ContactInfo,
-    solana_ledger::{
-        genesis_utils::{create_genesis_config, GenesisConfigInfo},
-        shred::Shred,
-    },
-    solana_runtime::bank::Bank,
-    solana_sdk::pubkey::Pubkey,
-    test::Bencher,
-};
-
-const NUM_SIMULATED_SHREDS: usize = 4;
-
-fn make_cluster_nodes<R: Rng>(
-    rng: &mut R,
-    unstaked_ratio: Option<(u32, u32)>,
-) -> (Vec<ContactInfo>, ClusterNodes<RetransmitStage>) {
-    let (nodes, stakes, cluster_info) = make_test_cluster(rng, 5_000, unstaked_ratio);
-    let cluster_nodes = new_cluster_nodes::<RetransmitStage>(&cluster_info, &stakes);
-    (nodes, cluster_nodes)
-}
-
-fn get_retransmit_peers_deterministic(
-    cluster_nodes: &ClusterNodes<RetransmitStage>,
-    shred: &mut Shred,
-    slot_leader: &Pubkey,
-    root_bank: &Bank,
-    num_simulated_shreds: usize,
-) {
-    for i in 0..num_simulated_shreds {
-        shred.common_header.index = i as u32;
-        let (_neighbors, _children) = cluster_nodes.get_retransmit_peers(
-            *slot_leader,
-            shred,
-            root_bank,
-            solana_gossip::cluster_info::DATA_PLANE_FANOUT,
-        );
-    }
-}
-
-fn get_retransmit_peers_deterministic_wrapper(b: &mut Bencher, unstaked_ratio: Option<(u32, u32)>) {
-    let mut rng = rand::thread_rng();
-    let GenesisConfigInfo { genesis_config, .. } = create_genesis_config(10_000);
-    let bank = Bank::new_for_benches(&genesis_config);
-    let (nodes, cluster_nodes) = make_cluster_nodes(&mut rng, unstaked_ratio);
-    let slot_leader = nodes[1..].choose(&mut rng).unwrap().id;
-    let slot = rand::random::<u64>();
-    let mut shred = Shred::new_empty_data_shred();
-    shred.common_header.slot = slot;
-    b.iter(|| {
-        get_retransmit_peers_deterministic(
-            &cluster_nodes,
-            &mut shred,
-            &slot_leader,
-            &bank,
-            NUM_SIMULATED_SHREDS,
-        )
-    });
-}
-
-#[bench]
-fn bench_get_retransmit_peers_deterministic_unstaked_ratio_1_2(b: &mut Bencher) {
-    get_retransmit_peers_deterministic_wrapper(b, Some((1, 2)));
-}
-
-#[bench]
-fn bench_get_retransmit_peers_deterministic_unstaked_ratio_1_32(b: &mut Bencher) {
-    get_retransmit_peers_deterministic_wrapper(b, Some((1, 32)));
-}

core/benches/sigverify_stage.rs

@@ -9,10 +9,7 @@ use {
     log::*,
     rand::{thread_rng, Rng},
     solana_core::{sigverify::TransactionSigVerifier, sigverify_stage::SigVerifyStage},
-    solana_perf::{
-        packet::{to_packet_batches, PacketBatch},
-        test_tx::test_tx,
-    },
+    solana_perf::{packet::to_packet_batches, packet::PacketBatch, test_tx::test_tx},
     solana_sdk::{
         hash::Hash,
         signature::{Keypair, Signer},
@@ -159,7 +156,7 @@ fn bench_sigverify_stage(bencher: &mut Bencher) {
         for _ in 0..batches.len() {
             if let Some(batch) = batches.pop() {
                 sent_len += batch.packets.len();
-                packet_s.send(vec![batch]).unwrap();
+                packet_s.send(batch).unwrap();
             }
         }
         let mut received = 0;

core/src/ancestor_hashes_service.rs

@@ -3,7 +3,6 @@ use {
         cluster_slots::ClusterSlots,
         duplicate_repair_status::{DeadSlotAncestorRequestStatus, DuplicateAncestorDecision},
         outstanding_requests::OutstandingRequests,
-        packet_threshold::DynamicPacketToProcessThreshold,
         repair_response::{self},
         repair_service::{DuplicateSlotsResetSender, RepairInfo, RepairStatsGroup},
         replay_stage::DUPLICATE_THRESHOLD,
@@ -13,6 +12,7 @@ use {
     crossbeam_channel::{unbounded, Receiver, Sender},
     dashmap::{mapref::entry::Entry::Occupied, DashMap},
     solana_ledger::{blockstore::Blockstore, shred::SIZE_OF_NONCE},
+    solana_measure::measure::Measure,
     solana_perf::{
         packet::{limited_deserialize, Packet, PacketBatch},
         recycler::Recycler,
@@ -208,7 +208,7 @@ impl AncestorHashesService {
             .spawn(move || {
                 let mut last_stats_report = Instant::now();
                 let mut stats = AncestorHashesResponsesStats::default();
-                let mut packet_threshold = DynamicPacketToProcessThreshold::default();
+                let mut max_packets = 1024;
                 loop {
                     let result = Self::process_new_packets_from_channel(
                         &ancestor_hashes_request_statuses,
@@ -216,13 +216,13 @@ impl AncestorHashesService {
                         &blockstore,
                         &outstanding_requests,
                         &mut stats,
-                        &mut packet_threshold,
+                        &mut max_packets,
                         &duplicate_slots_reset_sender,
                         &retryable_slots_sender,
                     );
                     match result {
                         Err(Error::RecvTimeout(_)) | Ok(_) => {}
-                        Err(err) => info!("ancestors hashes responses listener error: {:?}", err),
+                        Err(err) => info!("ancestors hashes reponses listener error: {:?}", err),
                     };
                     if exit.load(Ordering::Relaxed) {
                         return;
@@ -243,7 +243,7 @@ impl AncestorHashesService {
         blockstore: &Blockstore,
         outstanding_requests: &RwLock<OutstandingAncestorHashesRepairs>,
         stats: &mut AncestorHashesResponsesStats,
-        packet_threshold: &mut DynamicPacketToProcessThreshold,
+        max_packets: &mut usize,
         duplicate_slots_reset_sender: &DuplicateSlotsResetSender,
         retryable_slots_sender: &RetryableSlotsSender,
     ) -> Result<()> {
@@ -254,17 +254,18 @@ impl AncestorHashesService {
         let mut dropped_packets = 0;
         while let Ok(batch) = response_receiver.try_recv() {
             total_packets += batch.packets.len();
-            if packet_threshold.should_drop(total_packets) {
-                dropped_packets += batch.packets.len();
-            } else {
+            if total_packets < *max_packets {
+                // Drop the rest in the channel in case of DOS
                 packet_batches.push(batch);
+            } else {
+                dropped_packets += batch.packets.len();
             }
         }
 
         stats.dropped_packets += dropped_packets;
         stats.total_packets += total_packets;
 
-        let timer = Instant::now();
+        let mut time = Measure::start("ancestor_hashes::handle_packets");
         for packet_batch in packet_batches {
             Self::process_packet_batch(
                 ancestor_hashes_request_statuses,
@@ -276,7 +277,14 @@ impl AncestorHashesService {
                 retryable_slots_sender,
             );
         }
-        packet_threshold.update(total_packets, timer.elapsed());
+        time.stop();
+        if total_packets >= *max_packets {
+            if time.as_ms() > 1000 {
+                *max_packets = (*max_packets * 9) / 10;
+            } else {
+                *max_packets = (*max_packets * 10) / 9;
+            }
+        }
         Ok(())
     }
 

core/src/cluster_nodes.rs

@@ -2,22 +2,20 @@ use {
     crate::{broadcast_stage::BroadcastStage, retransmit_stage::RetransmitStage},
     itertools::Itertools,
     lru::LruCache,
-    rand::{seq::SliceRandom, Rng, SeedableRng},
+    rand::SeedableRng,
     rand_chacha::ChaChaRng,
     solana_gossip::{
         cluster_info::{compute_retransmit_peers, ClusterInfo},
         contact_info::ContactInfo,
-        crds::GossipRoute,
         crds_gossip_pull::CRDS_GOSSIP_PULL_CRDS_TIMEOUT_MS,
-        crds_value::{CrdsData, CrdsValue},
-        weighted_shuffle::WeightedShuffle,
+        weighted_shuffle::{weighted_best, weighted_shuffle, WeightedShuffle},
     },
     solana_ledger::shred::Shred,
     solana_runtime::bank::Bank,
     solana_sdk::{
         clock::{Epoch, Slot},
+        feature_set,
         pubkey::Pubkey,
-        signature::Keypair,
         timing::timestamp,
     },
     solana_streamer::socket::SocketAddrSpace,
@@ -25,7 +23,6 @@ use {
         any::TypeId,
         cmp::Reverse,
         collections::HashMap,
-        iter::repeat_with,
         marker::PhantomData,
         net::SocketAddr,
         ops::Deref,
@@ -42,7 +39,7 @@ enum NodeId {
     Pubkey(Pubkey),
 }
 
-pub struct Node {
+struct Node {
     node: NodeId,
     stake: u64,
 }
@@ -55,6 +52,10 @@ pub struct ClusterNodes<T> {
     // Reverse index from nodes pubkey to their index in self.nodes.
     index: HashMap<Pubkey, /*index:*/ usize>,
     weighted_shuffle: WeightedShuffle</*stake:*/ u64>,
+    // Weights and indices for sampling peers. weighted_{shuffle,best} expect
+    // weights >= 1. For backward compatibility we use max(1, stake) for
+    // weights and exclude nodes with no contact-info.
+    compat_index: Vec<(/*weight:*/ u64, /*index:*/ usize)>,
     _phantom: PhantomData<T>,
 }
 
@@ -87,15 +88,14 @@ impl Node {
 
 impl<T> ClusterNodes<T> {
     pub(crate) fn num_peers(&self) -> usize {
-        self.nodes.len().saturating_sub(1)
+        self.compat_index.len()
     }
 
     // A peer is considered live if they generated their contact info recently.
     pub(crate) fn num_peers_live(&self, now: u64) -> usize {
-        self.nodes
+        self.compat_index
             .iter()
-            .filter(|node| node.pubkey() != self.pubkey)
-            .filter_map(|node| node.contact_info())
+            .filter_map(|(_, index)| self.nodes[*index].contact_info())
             .filter(|node| {
                 let elapsed = if node.wallclock < now {
                     now - node.wallclock
@@ -116,12 +116,20 @@ impl ClusterNodes<BroadcastStage> {
     pub(crate) fn get_broadcast_addrs(
         &self,
         shred: &Shred,
-        _root_bank: &Bank,
+        root_bank: &Bank,
         fanout: usize,
         socket_addr_space: &SocketAddrSpace,
     ) -> Vec<SocketAddr> {
         const MAX_CONTACT_INFO_AGE: Duration = Duration::from_secs(2 * 60);
-        let shred_seed = shred.seed(self.pubkey);
+        let shred_seed = shred.seed(self.pubkey, root_bank);
+        if !enable_turbine_peers_shuffle_patch(shred.slot(), root_bank) {
+            if let Some(node) = self.get_broadcast_peer(shred_seed) {
+                if socket_addr_space.check(&node.tvu) {
+                    return vec![node.tvu];
+                }
+            }
+            return Vec::default();
+        }
         let mut rng = ChaChaRng::from_seed(shred_seed);
         let index = match self.weighted_shuffle.first(&mut rng) {
             None => return Vec::default(),
@@ -163,6 +171,20 @@ impl ClusterNodes<BroadcastStage> {
             .filter(|addr| ContactInfo::is_valid_address(addr, socket_addr_space))
             .collect()
     }
+
+    /// Returns the root of turbine broadcast tree, which the leader sends the
+    /// shred to.
+    fn get_broadcast_peer(&self, shred_seed: [u8; 32]) -> Option<&ContactInfo> {
+        if self.compat_index.is_empty() {
+            None
+        } else {
+            let index = weighted_best(&self.compat_index, shred_seed);
+            match &self.nodes[index].node {
+                NodeId::ContactInfo(node) => Some(node),
+                NodeId::Pubkey(_) => panic!("this should not happen!"),
+            }
+        }
+    }
 }
 
 impl ClusterNodes<RetransmitStage> {
@@ -197,17 +219,20 @@ impl ClusterNodes<RetransmitStage> {
             .collect()
     }
 
-    pub fn get_retransmit_peers(
+    fn get_retransmit_peers(
         &self,
         slot_leader: Pubkey,
         shred: &Shred,
-        _root_bank: &Bank,
+        root_bank: &Bank,
         fanout: usize,
     ) -> (
         Vec<&Node>, // neighbors
         Vec<&Node>, // children
     ) {
-        let shred_seed = shred.seed(slot_leader);
+        let shred_seed = shred.seed(slot_leader, root_bank);
+        if !enable_turbine_peers_shuffle_patch(shred.slot(), root_bank) {
+            return self.get_retransmit_peers_compat(shred_seed, fanout, slot_leader);
+        }
         let mut weighted_shuffle = self.weighted_shuffle.clone();
         // Exclude slot leader from list of nodes.
         if slot_leader == self.pubkey {
@@ -230,9 +255,49 @@ impl ClusterNodes<RetransmitStage> {
         debug_assert_eq!(neighbors[self_index % fanout].pubkey(), self.pubkey);
         (neighbors, children)
     }
+
+    fn get_retransmit_peers_compat(
+        &self,
+        shred_seed: [u8; 32],
+        fanout: usize,
+        slot_leader: Pubkey,
+    ) -> (
+        Vec<&Node>, // neighbors
+        Vec<&Node>, // children
+    ) {
+        // Exclude leader from list of nodes.
+        let (weights, index): (Vec<u64>, Vec<usize>) = if slot_leader == self.pubkey {
+            error!("retransmit from slot leader: {}", slot_leader);
+            self.compat_index.iter().copied().unzip()
+        } else {
+            self.compat_index
+                .iter()
+                .filter(|(_, i)| self.nodes[*i].pubkey() != slot_leader)
+                .copied()
+                .unzip()
+        };
+        let index: Vec<_> = {
+            let shuffle = weighted_shuffle(weights.into_iter(), shred_seed);
+            shuffle.into_iter().map(|i| index[i]).collect()
+        };
+        let self_index = index
+            .iter()
+            .position(|i| self.nodes[*i].pubkey() == self.pubkey)
+            .unwrap();
+        let (neighbors, children) = compute_retransmit_peers(fanout, self_index, &index);
+        // Assert that the node itself is included in the set of neighbors, at
+        // the right offset.
+        debug_assert_eq!(
+            self.nodes[neighbors[self_index % fanout]].pubkey(),
+            self.pubkey
+        );
+        let neighbors = neighbors.into_iter().map(|i| &self.nodes[i]).collect();
+        let children = children.into_iter().map(|i| &self.nodes[i]).collect();
+        (neighbors, children)
+    }
 }
 
-pub fn new_cluster_nodes<T: 'static>(
+fn new_cluster_nodes<T: 'static>(
     cluster_info: &ClusterInfo,
     stakes: &HashMap<Pubkey, u64>,
 ) -> ClusterNodes<T> {
@@ -245,15 +310,30 @@ pub fn new_cluster_nodes<T: 'static>(
         .collect();
     let broadcast = TypeId::of::<T>() == TypeId::of::<BroadcastStage>();
     let stakes: Vec<u64> = nodes.iter().map(|node| node.stake).collect();
-    let mut weighted_shuffle = WeightedShuffle::new("cluster-nodes", &stakes);
+    let mut weighted_shuffle = WeightedShuffle::new(&stakes).unwrap();
     if broadcast {
         weighted_shuffle.remove_index(index[&self_pubkey]);
     }
+    // For backward compatibility:
+    //   * nodes which do not have contact-info are excluded.
+    //   * stakes are floored at 1.
+    // The sorting key here should be equivalent to
+    // solana_gossip::deprecated::sorted_stakes_with_index.
+    // Leader itself is excluded when sampling broadcast peers.
+    let compat_index = nodes
+        .iter()
+        .enumerate()
+        .filter(|(_, node)| node.contact_info().is_some())
+        .filter(|(_, node)| !broadcast || node.pubkey() != self_pubkey)
+        .sorted_by_key(|(_, node)| Reverse((node.stake.max(1), node.pubkey())))
+        .map(|(index, node)| (node.stake.max(1), index))
+        .collect();
     ClusterNodes {
         pubkey: self_pubkey,
         nodes,
         index,
         weighted_shuffle,
+        compat_index,
         _phantom: PhantomData::default(),
     }
 }
@@ -291,6 +371,21 @@ fn get_nodes(cluster_info: &ClusterInfo, stakes: &HashMap<Pubkey, u64>) -> Vec<N
     .collect()
 }
 
+fn enable_turbine_peers_shuffle_patch(shred_slot: Slot, root_bank: &Bank) -> bool {
+    let feature_slot = root_bank
+        .feature_set
+        .activated_slot(&feature_set::turbine_peers_shuffle::id());
+    match feature_slot {
+        None => false,
+        Some(feature_slot) => {
+            let epoch_schedule = root_bank.epoch_schedule();
+            let feature_epoch = epoch_schedule.get_epoch(feature_slot);
+            let shred_epoch = epoch_schedule.get_epoch(shred_slot);
+            feature_epoch < shred_epoch
+        }
+    }
+}
+
 impl<T> ClusterNodesCache<T> {
     pub fn new(
         // Capacity of underlying LRU-cache in terms of number of epochs.
@@ -367,66 +462,98 @@ impl From<Pubkey> for NodeId {
     }
 }
 
-pub fn make_test_cluster<R: Rng>(
-    rng: &mut R,
-    num_nodes: usize,
-    unstaked_ratio: Option<(u32, u32)>,
-) -> (
-    Vec<ContactInfo>,
-    HashMap<Pubkey, u64>, // stakes
-    ClusterInfo,
-) {
-    let (unstaked_numerator, unstaked_denominator) = unstaked_ratio.unwrap_or((1, 7));
-    let mut nodes: Vec<_> = repeat_with(|| ContactInfo::new_rand(rng, None))
-        .take(num_nodes)
-        .collect();
-    nodes.shuffle(rng);
-    let this_node = nodes[0].clone();
-    let mut stakes: HashMap<Pubkey, u64> = nodes
-        .iter()
-        .filter_map(|node| {
-            if rng.gen_ratio(unstaked_numerator, unstaked_denominator) {
-                None // No stake for some of the nodes.
-            } else {
-                Some((node.id, rng.gen_range(0, 20)))
-            }
-        })
-        .collect();
-    // Add some staked nodes with no contact-info.
-    stakes.extend(repeat_with(|| (Pubkey::new_unique(), rng.gen_range(0, 20))).take(100));
-    let cluster_info = ClusterInfo::new(
-        this_node,
-        Arc::new(Keypair::new()),
-        SocketAddrSpace::Unspecified,
-    );
-    {
-        let now = timestamp();
-        let mut gossip_crds = cluster_info.gossip.crds.write().unwrap();
-        // First node is pushed to crds table by ClusterInfo constructor.
-        for node in nodes.iter().skip(1) {
-            let node = CrdsData::ContactInfo(node.clone());
-            let node = CrdsValue::new_unsigned(node);
-            assert_eq!(
-                gossip_crds.insert(node, now, GossipRoute::LocalMessage),
-                Ok(())
-            );
-        }
-    }
-    (nodes, stakes, cluster_info)
-}
-
 #[cfg(test)]
 mod tests {
-    use super::*;
+    use {
+        super::*,
+        rand::{seq::SliceRandom, Rng},
+        solana_gossip::{
+            crds::GossipRoute,
+            crds_value::{CrdsData, CrdsValue},
+            deprecated::{
+                shuffle_peers_and_index, sorted_retransmit_peers_and_stakes,
+                sorted_stakes_with_index,
+            },
+        },
+        solana_sdk::{signature::Keypair, timing::timestamp},
+        solana_streamer::socket::SocketAddrSpace,
+        std::{iter::repeat_with, sync::Arc},
+    };
+
+    // Legacy methods copied for testing backward compatibility.
+
+    fn get_broadcast_peers(
+        cluster_info: &ClusterInfo,
+        stakes: Option<&HashMap<Pubkey, u64>>,
+    ) -> (Vec<ContactInfo>, Vec<(u64, usize)>) {
+        let mut peers = cluster_info.tvu_peers();
+        let peers_and_stakes = stake_weight_peers(&mut peers, stakes);
+        (peers, peers_and_stakes)
+    }
+
+    fn stake_weight_peers(
+        peers: &mut Vec<ContactInfo>,
+        stakes: Option<&HashMap<Pubkey, u64>>,
+    ) -> Vec<(u64, usize)> {
+        peers.dedup();
+        sorted_stakes_with_index(peers, stakes)
+    }
+
+    fn make_cluster<R: Rng>(
+        rng: &mut R,
+    ) -> (
+        Vec<ContactInfo>,
+        HashMap<Pubkey, u64>, // stakes
+        ClusterInfo,
+    ) {
+        let mut nodes: Vec<_> = repeat_with(|| ContactInfo::new_rand(rng, None))
+            .take(1000)
+            .collect();
+        nodes.shuffle(rng);
+        let this_node = nodes[0].clone();
+        let mut stakes: HashMap<Pubkey, u64> = nodes
+            .iter()
+            .filter_map(|node| {
+                if rng.gen_ratio(1, 7) {
+                    None // No stake for some of the nodes.
+                } else {
+                    Some((node.id, rng.gen_range(0, 20)))
+                }
+            })
+            .collect();
+        // Add some staked nodes with no contact-info.
+        stakes.extend(repeat_with(|| (Pubkey::new_unique(), rng.gen_range(0, 20))).take(100));
+        let cluster_info = ClusterInfo::new(
+            this_node,
+            Arc::new(Keypair::new()),
+            SocketAddrSpace::Unspecified,
+        );
+        {
+            let now = timestamp();
+            let mut gossip_crds = cluster_info.gossip.crds.write().unwrap();
+            // First node is pushed to crds table by ClusterInfo constructor.
+            for node in nodes.iter().skip(1) {
+                let node = CrdsData::ContactInfo(node.clone());
+                let node = CrdsValue::new_unsigned(node);
+                assert_eq!(
+                    gossip_crds.insert(node, now, GossipRoute::LocalMessage),
+                    Ok(())
+                );
+            }
+        }
+        (nodes, stakes, cluster_info)
+    }
 
     #[test]
     fn test_cluster_nodes_retransmit() {
         let mut rng = rand::thread_rng();
-        let (nodes, stakes, cluster_info) = make_test_cluster(&mut rng, 1_000, None);
+        let (nodes, stakes, cluster_info) = make_cluster(&mut rng);
+        let this_node = cluster_info.my_contact_info();
         // ClusterInfo::tvu_peers excludes the node itself.
         assert_eq!(cluster_info.tvu_peers().len(), nodes.len() - 1);
         let cluster_nodes = new_cluster_nodes::<RetransmitStage>(&cluster_info, &stakes);
         // All nodes with contact-info should be in the index.
+        assert_eq!(cluster_nodes.compat_index.len(), nodes.len());
         // Staked nodes with no contact-info should be included.
         assert!(cluster_nodes.nodes.len() > nodes.len());
         // Assert that all nodes keep their contact-info.
@@ -446,17 +573,68 @@ mod tests {
                 }
             }
         }
+        let (peers, stakes_and_index) =
+            sorted_retransmit_peers_and_stakes(&cluster_info, Some(&stakes));
+        assert_eq!(stakes_and_index.len(), peers.len());
+        assert_eq!(cluster_nodes.compat_index.len(), peers.len());
+        for (i, node) in cluster_nodes
+            .compat_index
+            .iter()
+            .map(|(_, i)| &cluster_nodes.nodes[*i])
+            .enumerate()
+        {
+            let (stake, index) = stakes_and_index[i];
+            // Wallclock may be update by ClusterInfo::push_self.
+            if node.pubkey() == this_node.id {
+                assert_eq!(this_node.id, peers[index].id)
+            } else {
+                assert_eq!(node.contact_info().unwrap(), &peers[index]);
+            }
+            assert_eq!(node.stake.max(1), stake);
+        }
+        let slot_leader = nodes[1..].choose(&mut rng).unwrap().id;
+        // Remove slot leader from peers indices.
+        let stakes_and_index: Vec<_> = stakes_and_index
+            .into_iter()
+            .filter(|(_stake, index)| peers[*index].id != slot_leader)
+            .collect();
+        assert_eq!(peers.len(), stakes_and_index.len() + 1);
+        let mut shred_seed = [0u8; 32];
+        rng.fill(&mut shred_seed[..]);
+        let (self_index, shuffled_peers_and_stakes) =
+            shuffle_peers_and_index(&this_node.id, &peers, &stakes_and_index, shred_seed);
+        let shuffled_index: Vec<_> = shuffled_peers_and_stakes
+            .into_iter()
+            .map(|(_, index)| index)
+            .collect();
+        assert_eq!(this_node.id, peers[shuffled_index[self_index]].id);
+        for fanout in 1..200 {
+            let (neighbors_indices, children_indices) =
+                compute_retransmit_peers(fanout, self_index, &shuffled_index);
+            let (neighbors, children) =
+                cluster_nodes.get_retransmit_peers_compat(shred_seed, fanout, slot_leader);
+            assert_eq!(children.len(), children_indices.len());
+            for (node, index) in children.into_iter().zip(children_indices) {
+                assert_eq!(*node.contact_info().unwrap(), peers[index]);
+            }
+            assert_eq!(neighbors.len(), neighbors_indices.len());
+            assert_eq!(neighbors[0].pubkey(), peers[neighbors_indices[0]].id);
+            for (node, index) in neighbors.into_iter().zip(neighbors_indices).skip(1) {
+                assert_eq!(*node.contact_info().unwrap(), peers[index]);
+            }
+        }
     }
 
     #[test]
     fn test_cluster_nodes_broadcast() {
         let mut rng = rand::thread_rng();
-        let (nodes, stakes, cluster_info) = make_test_cluster(&mut rng, 1_000, None);
+        let (nodes, stakes, cluster_info) = make_cluster(&mut rng);
         // ClusterInfo::tvu_peers excludes the node itself.
         assert_eq!(cluster_info.tvu_peers().len(), nodes.len() - 1);
         let cluster_nodes = ClusterNodes::<BroadcastStage>::new(&cluster_info, &stakes);
         // All nodes with contact-info should be in the index.
         // Excluding this node itself.
+        assert_eq!(cluster_nodes.compat_index.len() + 1, nodes.len());
         // Staked nodes with no contact-info should be included.
         assert!(cluster_nodes.nodes.len() > nodes.len());
         // Assert that all nodes keep their contact-info.
@@ -476,5 +654,25 @@ mod tests {
                 }
             }
         }
+        let (peers, peers_and_stakes) = get_broadcast_peers(&cluster_info, Some(&stakes));
+        assert_eq!(peers_and_stakes.len(), peers.len());
+        assert_eq!(cluster_nodes.compat_index.len(), peers.len());
+        for (i, node) in cluster_nodes
+            .compat_index
+            .iter()
+            .map(|(_, i)| &cluster_nodes.nodes[*i])
+            .enumerate()
+        {
+            let (stake, index) = peers_and_stakes[i];
+            assert_eq!(node.contact_info().unwrap(), &peers[index]);
+            assert_eq!(node.stake.max(1), stake);
+        }
+        for _ in 0..100 {
+            let mut shred_seed = [0u8; 32];
+            rng.fill(&mut shred_seed[..]);
+            let index = weighted_best(&peers_and_stakes, shred_seed);
+            let peer = cluster_nodes.get_broadcast_peer(shred_seed).unwrap();
+            assert_eq!(*peer, peers[index]);
+        }
     }
 }

core/src/consensus.rs

@@ -1,9 +1,9 @@
+use crate::tower1_7_14::Tower1_7_14;
 use {
     crate::{
         heaviest_subtree_fork_choice::HeaviestSubtreeForkChoice,
         latest_validator_votes_for_frozen_banks::LatestValidatorVotesForFrozenBanks,
         progress_map::{LockoutIntervals, ProgressMap},
-        tower1_7_14::Tower1_7_14,
         tower_storage::{SavedTower, SavedTowerVersions, TowerStorage},
     },
     chrono::prelude::*,

core/src/cost_update_service.rs

@@ -16,24 +16,39 @@ use {
     },
 };
 
+// Update blockstore persistence storage when accumulated cost_table updates count exceeds the threshold
+const PERSIST_THRESHOLD: u64 = 1_000;
+
 #[derive(Default)]
 pub struct CostUpdateServiceTiming {
     last_print: u64,
     update_cost_model_count: u64,
     update_cost_model_elapsed: u64,
+    persist_cost_table_elapsed: u64,
 }
 
 impl CostUpdateServiceTiming {
-    fn update(&mut self, update_cost_model_count: u64, update_cost_model_elapsed: u64) {
-        self.update_cost_model_count += update_cost_model_count;
-        self.update_cost_model_elapsed += update_cost_model_elapsed;
+    fn update(
+        &mut self,
+        update_cost_model_count: Option<u64>,
+        update_cost_model_elapsed: Option<u64>,
+        persist_cost_table_elapsed: Option<u64>,
+    ) {
+        if let Some(update_cost_model_count) = update_cost_model_count {
+            self.update_cost_model_count += update_cost_model_count;
+        }
+        if let Some(update_cost_model_elapsed) = update_cost_model_elapsed {
+            self.update_cost_model_elapsed += update_cost_model_elapsed;
+        }
+        if let Some(persist_cost_table_elapsed) = persist_cost_table_elapsed {
+            self.persist_cost_table_elapsed += persist_cost_table_elapsed;
+        }
 
         let now = timestamp();
         let elapsed_ms = now - self.last_print;
         if elapsed_ms > 1000 {
             datapoint_info!(
                 "cost-update-service-stats",
-                ("total_elapsed_us", elapsed_ms * 1000, i64),
                 (
                     "update_cost_model_count",
                     self.update_cost_model_count as i64,
@@ -44,6 +59,11 @@ impl CostUpdateServiceTiming {
                     self.update_cost_model_elapsed as i64,
                     i64
                 ),
+                (
+                    "persist_cost_table_elapsed",
+                    self.persist_cost_table_elapsed as i64,
+                    i64
+                ),
             );
 
             *self = CostUpdateServiceTiming::default();
@@ -89,11 +109,13 @@ impl CostUpdateService {
     }
 
     fn service_loop(
-        _blockstore: Arc<Blockstore>,
+        blockstore: Arc<Blockstore>,
         cost_model: Arc<RwLock<CostModel>>,
         cost_update_receiver: CostUpdateReceiver,
     ) {
         let mut cost_update_service_timing = CostUpdateServiceTiming::default();
+        let mut update_count = 0_u64;
+
         for cost_update in cost_update_receiver.iter() {
             match cost_update {
                 CostUpdate::FrozenBank { bank } => {
@@ -102,17 +124,33 @@ impl CostUpdateService {
                 CostUpdate::ExecuteTiming {
                     mut execute_timings,
                 } => {
-                    let (update_count, update_cost_model_time) = Measure::this(
-                        |_| Self::update_cost_model(&cost_model, &mut execute_timings),
-                        (),
-                        "update_cost_model_time",
+                    let mut update_cost_model_time = Measure::start("update_cost_model_time");
+                    update_count += Self::update_cost_model(&cost_model, &mut execute_timings);
+                    update_cost_model_time.stop();
+                    cost_update_service_timing.update(
+                        Some(update_count),
+                        Some(update_cost_model_time.as_us()),
+                        None,
                     );
-                    cost_update_service_timing.update(update_count, update_cost_model_time.as_us());
+
+                    if update_count > PERSIST_THRESHOLD {
+                        let mut persist_cost_table_time = Measure::start("persist_cost_table_time");
+                        Self::persist_cost_table(&blockstore, &cost_model);
+                        update_count = 0_u64;
+                        persist_cost_table_time.stop();
+                        cost_update_service_timing.update(
+                            None,
+                            None,
+                            Some(persist_cost_table_time.as_us()),
+                        );
+                    }
                 }
             }
         }
     }
 
+    // Normalize `program_timings` with current estimated cost, update instruction_cost table
+    // Returns number of updates applied
     fn update_cost_model(
         cost_model: &RwLock<CostModel>,
         execute_timings: &mut ExecuteTimings,
@@ -133,9 +171,38 @@ impl CostUpdateService {
                 .unwrap()
                 .upsert_instruction_cost(program_id, units);
             update_count += 1;
+            debug!(
+                "After replayed into bank, updated cost for instruction {:?}, update_value {}, pre_aggregated_value {}",
+                program_id, units, current_estimated_program_cost
+            );
         }
         update_count
     }
+
+    // 1. Remove obsolete program entries from persisted table to limit its size
+    // 2. Update persisted program cost. This involves EMA cost calculation at
+    //    execute_cost_table.get_cost()
+    fn persist_cost_table(blockstore: &Blockstore, cost_model: &RwLock<CostModel>) {
+        let db_records = blockstore.read_program_costs().expect("read programs");
+        let cost_model = cost_model.read().unwrap();
+        let active_program_keys = cost_model.get_program_keys();
+
+        // delete records from blockstore if they are no longer in cost_table
+        db_records.iter().for_each(|(pubkey, _)| {
+            if !active_program_keys.contains(&pubkey) {
+                blockstore
+                    .delete_program_cost(pubkey)
+                    .expect("delete old program");
+            }
+        });
+
+        active_program_keys.iter().for_each(|program_id| {
+            let cost = cost_model.find_instruction_cost(program_id);
+            blockstore
+                .write_program_cost(program_id, &cost)
+                .expect("persist program costs to blockstore");
+        });
+    }
 }
 
 #[cfg(test)]
@@ -146,10 +213,9 @@ mod tests {
     fn test_update_cost_model_with_empty_execute_timings() {
         let cost_model = Arc::new(RwLock::new(CostModel::default()));
         let mut empty_execute_timings = ExecuteTimings::default();
-
         assert_eq!(
-            0,
             CostUpdateService::update_cost_model(&cost_model, &mut empty_execute_timings),
+            0
         );
     }
 
@@ -167,7 +233,7 @@ mod tests {
             let accumulated_units: u64 = 100;
             let total_errored_units = 0;
             let count: u32 = 10;
-            expected_cost = accumulated_units / count as u64;
+            expected_cost = accumulated_units / count as u64; // = 10
 
             execute_timings.details.per_program_timings.insert(
                 program_key_1,
@@ -179,10 +245,9 @@ mod tests {
                     total_errored_units,
                 },
             );
-            assert_eq!(
-                1,
-                CostUpdateService::update_cost_model(&cost_model, &mut execute_timings),
-            );
+            let update_count =
+                CostUpdateService::update_cost_model(&cost_model, &mut execute_timings);
+            assert_eq!(1, update_count);
             assert_eq!(
                 expected_cost,
                 cost_model
@@ -197,8 +262,8 @@ mod tests {
             let accumulated_us: u64 = 2000;
             let accumulated_units: u64 = 200;
             let count: u32 = 10;
-            // to expect new cost is Average(new_value, existing_value)
-            expected_cost = ((accumulated_units / count as u64) + expected_cost) / 2;
+            // to expect new cost = (mean + 2 * std) of [10, 20]
+            expected_cost = 13;
 
             execute_timings.details.per_program_timings.insert(
                 program_key_1,
@@ -210,10 +275,9 @@ mod tests {
                     total_errored_units: 0,
                 },
             );
-            assert_eq!(
-                1,
-                CostUpdateService::update_cost_model(&cost_model, &mut execute_timings),
-            );
+            let update_count =
+                CostUpdateService::update_cost_model(&cost_model, &mut execute_timings);
+            assert_eq!(1, update_count);
             assert_eq!(
                 expected_cost,
                 cost_model
@@ -264,10 +328,9 @@ mod tests {
                     total_errored_units: 0,
                 },
             );
-            assert_eq!(
-                CostUpdateService::update_cost_model(&cost_model, &mut execute_timings),
-                1
-            );
+            let update_count =
+                CostUpdateService::update_cost_model(&cost_model, &mut execute_timings);
+            assert_eq!(1, update_count);
             assert_eq!(
                 current_program_cost,
                 cost_model
@@ -281,8 +344,12 @@ mod tests {
         // greater than the current instruction cost for the program. Should update with the
         // new erroring compute costs
         let cost_per_error = 1000;
-        // the expect cost is (previous_cost + new_cost)/2 = (100 + 1000)/2 = 550
-        let expected_units = 550;
+        // expected_cost = (mean + 2*std) of data points:
+        // [
+        //  100,  // original program_cost
+        //  1000, // cost_per_error
+        // ]
+        let expected_cost = 289u64;
         {
             let errored_txs_compute_consumed = vec![cost_per_error; 3];
             let total_errored_units = errored_txs_compute_consumed.iter().sum();
@@ -296,12 +363,12 @@ mod tests {
                     total_errored_units,
                 },
             );
+            let update_count =
+                CostUpdateService::update_cost_model(&cost_model, &mut execute_timings);
+
+            assert_eq!(1, update_count);
             assert_eq!(
-                CostUpdateService::update_cost_model(&cost_model, &mut execute_timings),
-                1
-            );
-            assert_eq!(
-                expected_units,
+                expected_cost,
                 cost_model
                     .read()
                     .unwrap()
@@ -312,7 +379,7 @@ mod tests {
         // Test updating cost model with only erroring compute costs where the error cost is
         // `smaller_cost_per_error`, less than the current instruction cost for the program.
         // The cost should not decrease for these new lesser errors
-        let smaller_cost_per_error = expected_units - 10;
+        let smaller_cost_per_error = expected_cost - 10;
         {
             let errored_txs_compute_consumed = vec![smaller_cost_per_error; 3];
             let total_errored_units = errored_txs_compute_consumed.iter().sum();
@@ -326,12 +393,19 @@ mod tests {
                     total_errored_units,
                 },
             );
+            let update_count =
+                CostUpdateService::update_cost_model(&cost_model, &mut execute_timings);
+
+            // expected_cost = (mean = 2*std) of data points:
+            // [
+            //  100,  // original program cost,
+            //  1000, // cost_per_error from above test
+            //  289, // the smaller_cost_per_error will be coalesced to prev cost
+            // ]
+            let expected_cost = 293u64;
+            assert_eq!(1, update_count);
             assert_eq!(
-                CostUpdateService::update_cost_model(&cost_model, &mut execute_timings),
-                1
-            );
-            assert_eq!(
-                expected_units,
+                expected_cost,
                 cost_model
                     .read()
                     .unwrap()

core/src/find_packet_sender_stake_stage.rs

@@ -1,185 +0,0 @@
-use {
-    crossbeam_channel::{Receiver, RecvTimeoutError, Sender},
-    rayon::{prelude::*, ThreadPool},
-    solana_gossip::cluster_info::ClusterInfo,
-    solana_measure::measure::Measure,
-    solana_perf::packet::PacketBatch,
-    solana_rayon_threadlimit::get_thread_count,
-    solana_runtime::bank_forks::BankForks,
-    solana_sdk::timing::timestamp,
-    solana_streamer::streamer::{self, StreamerError},
-    std::{
-        cell::RefCell,
-        collections::HashMap,
-        net::IpAddr,
-        sync::{Arc, RwLock},
-        thread::{self, Builder, JoinHandle},
-        time::{Duration, Instant},
-    },
-};
-
-const IP_TO_STAKE_REFRESH_DURATION: Duration = Duration::from_secs(5);
-
-thread_local!(static PAR_THREAD_POOL: RefCell<ThreadPool> = RefCell::new(rayon::ThreadPoolBuilder::new()
-                    .num_threads(get_thread_count())
-                    .thread_name(|ix| format!("transaction_sender_stake_stage_{}", ix))
-                    .build()
-                    .unwrap()));
-
-pub type FindPacketSenderStakeSender = Sender<Vec<PacketBatch>>;
-pub type FindPacketSenderStakeReceiver = Receiver<Vec<PacketBatch>>;
-
-#[derive(Debug, Default)]
-struct FindPacketSenderStakeStats {
-    last_print: u64,
-    refresh_ip_to_stake_time: u64,
-    apply_sender_stakes_time: u64,
-    send_batches_time: u64,
-    receive_batches_time: u64,
-    total_batches: u64,
-    total_packets: u64,
-}
-
-impl FindPacketSenderStakeStats {
-    fn report(&mut self) {
-        let now = timestamp();
-        let elapsed_ms = now - self.last_print;
-        if elapsed_ms > 2000 {
-            datapoint_info!(
-                "find_packet_sender_stake-services_stats",
-                (
-                    "refresh_ip_to_stake_time",
-                    self.refresh_ip_to_stake_time as i64,
-                    i64
-                ),
-                (
-                    "apply_sender_stakes_time",
-                    self.apply_sender_stakes_time as i64,
-                    i64
-                ),
-                ("send_batches_time", self.send_batches_time as i64, i64),
-                (
-                    "receive_batches_time",
-                    self.receive_batches_time as i64,
-                    i64
-                ),
-                ("total_batches", self.total_batches as i64, i64),
-                ("total_packets", self.total_packets as i64, i64),
-            );
-            *self = FindPacketSenderStakeStats::default();
-            self.last_print = now;
-        }
-    }
-}
-
-pub struct FindPacketSenderStakeStage {
-    thread_hdl: JoinHandle<()>,
-}
-
-impl FindPacketSenderStakeStage {
-    pub fn new(
-        packet_receiver: streamer::PacketBatchReceiver,
-        sender: FindPacketSenderStakeSender,
-        bank_forks: Arc<RwLock<BankForks>>,
-        cluster_info: Arc<ClusterInfo>,
-    ) -> Self {
-        let mut stats = FindPacketSenderStakeStats::default();
-        let thread_hdl = Builder::new()
-            .name("find-packet-sender-stake".to_string())
-            .spawn(move || {
-                let mut last_stakes = Instant::now();
-                let mut ip_to_stake: HashMap<IpAddr, u64> = HashMap::new();
-                loop {
-                    let mut refresh_ip_to_stake_time = Measure::start("refresh_ip_to_stake_time");
-                    Self::try_refresh_ip_to_stake(
-                        &mut last_stakes,
-                        &mut ip_to_stake,
-                        bank_forks.clone(),
-                        cluster_info.clone(),
-                    );
-                    refresh_ip_to_stake_time.stop();
-                    stats.refresh_ip_to_stake_time = stats
-                        .refresh_ip_to_stake_time
-                        .saturating_add(refresh_ip_to_stake_time.as_us());
-
-                    match streamer::recv_packet_batches(&packet_receiver) {
-                        Ok((mut batches, num_packets, recv_duration)) => {
-                            let num_batches = batches.len();
-                            let mut apply_sender_stakes_time =
-                                Measure::start("apply_sender_stakes_time");
-                            Self::apply_sender_stakes(&mut batches, &ip_to_stake);
-                            apply_sender_stakes_time.stop();
-
-                            let mut send_batches_time = Measure::start("send_batches_time");
-                            if let Err(e) = sender.send(batches) {
-                                info!("Sender error: {:?}", e);
-                            }
-                            send_batches_time.stop();
-
-                            stats.apply_sender_stakes_time = stats
-                                .apply_sender_stakes_time
-                                .saturating_add(apply_sender_stakes_time.as_us());
-                            stats.send_batches_time = stats
-                                .send_batches_time
-                                .saturating_add(send_batches_time.as_us());
-                            stats.receive_batches_time = stats
-                                .receive_batches_time
-                                .saturating_add(recv_duration.as_nanos() as u64);
-                            stats.total_batches =
-                                stats.total_batches.saturating_add(num_batches as u64);
-                            stats.total_packets =
-                                stats.total_packets.saturating_add(num_packets as u64);
-                        }
-                        Err(e) => match e {
-                            StreamerError::RecvTimeout(RecvTimeoutError::Disconnected) => break,
-                            StreamerError::RecvTimeout(RecvTimeoutError::Timeout) => (),
-                            _ => error!("error: {:?}", e),
-                        },
-                    }
-
-                    stats.report();
-                }
-            })
-            .unwrap();
-        Self { thread_hdl }
-    }
-
-    fn try_refresh_ip_to_stake(
-        last_stakes: &mut Instant,
-        ip_to_stake: &mut HashMap<IpAddr, u64>,
-        bank_forks: Arc<RwLock<BankForks>>,
-        cluster_info: Arc<ClusterInfo>,
-    ) {
-        if last_stakes.elapsed() > IP_TO_STAKE_REFRESH_DURATION {
-            let root_bank = bank_forks.read().unwrap().root_bank();
-            let staked_nodes = root_bank.staked_nodes();
-            *ip_to_stake = cluster_info
-                .tvu_peers()
-                .into_iter()
-                .filter_map(|node| {
-                    let stake = staked_nodes.get(&node.id)?;
-                    Some((node.tvu.ip(), *stake))
-                })
-                .collect();
-            *last_stakes = Instant::now();
-        }
-    }
-
-    fn apply_sender_stakes(batches: &mut [PacketBatch], ip_to_stake: &HashMap<IpAddr, u64>) {
-        PAR_THREAD_POOL.with(|thread_pool| {
-            thread_pool.borrow().install(|| {
-                batches
-                    .into_par_iter()
-                    .flat_map(|batch| batch.packets.par_iter_mut())
-                    .for_each(|packet| {
-                        packet.meta.sender_stake =
-                            *ip_to_stake.get(&packet.meta.addr().ip()).unwrap_or(&0);
-                    });
-            })
-        });
-    }
-
-    pub fn join(self) -> thread::Result<()> {
-        self.thread_hdl.join()
-    }
-}

core/src/heaviest_subtree_fork_choice.rs

@@ -2715,8 +2715,7 @@ mod test {
                 stake
             );
         }
-        {
-            let slot = &17;
+        for slot in &[17] {
             assert_eq!(
                 tree1
                     .stake_voted_subtree(&(*slot, Hash::default()))

core/src/leader_slot_banking_stage_metrics.rs

@@ -1,5 +1,4 @@
 use {
-    crate::leader_slot_banking_stage_timing_metrics::*,
     solana_poh::poh_recorder::BankStart,
     solana_sdk::{clock::Slot, saturating_add_assign},
     std::time::Instant,
@@ -39,12 +38,41 @@ pub(crate) struct ProcessTransactionsSummary {
 
     // The number of transactions filtered out by the cost model
     pub cost_model_throttled_transactions_count: usize,
+}
 
-    // Total amount of time spent running the cost model
-    pub cost_model_us: u64,
+// Metrics capturing wallclock time spent in various parts of BankingStage during this
+// validator's leader slot
+#[derive(Debug)]
+struct LeaderSlotTimingMetrics {
+    bank_detected_time: Instant,
 
-    // Breakdown of time spent executing and comitting transactions
-    pub execute_and_commit_timings: LeaderExecuteAndCommitTimings,
+    // Delay from when the bank was created to when this thread detected it
+    bank_detected_delay_us: u64,
+}
+
+impl LeaderSlotTimingMetrics {
+    fn new(bank_creation_time: &Instant) -> Self {
+        Self {
+            bank_detected_time: Instant::now(),
+            bank_detected_delay_us: bank_creation_time.elapsed().as_micros() as u64,
+        }
+    }
+
+    fn report(&self, id: u32, slot: Slot) {
+        let bank_detected_to_now = self.bank_detected_time.elapsed().as_micros() as u64;
+        datapoint_info!(
+            "banking_stage-leader_slot_loop_timings",
+            ("id", id as i64, i64),
+            ("slot", slot as i64, i64),
+            ("bank_detected_to_now_us", bank_detected_to_now, i64),
+            (
+                "bank_creation_to_now_us",
+                bank_detected_to_now + self.bank_detected_delay_us,
+                i64
+            ),
+            ("bank_detected_delay_us", self.bank_detected_delay_us, i64),
+        );
+    }
 }
 
 // Metrics describing packets ingested/processed in various parts of BankingStage during this
@@ -334,8 +362,6 @@ impl LeaderSlotMetricsTracker {
                 failed_commit_count,
                 ref retryable_transaction_indexes,
                 cost_model_throttled_transactions_count,
-                cost_model_us,
-                ref execute_and_commit_timings,
                 ..
             } = process_transactions_summary;
 
@@ -389,23 +415,9 @@ impl LeaderSlotMetricsTracker {
                     .cost_model_throttled_transactions_count,
                 *cost_model_throttled_transactions_count as u64
             );
-
-            saturating_add_assign!(
-                leader_slot_metrics
-                    .timing_metrics
-                    .process_packets_timings
-                    .cost_model_us,
-                *cost_model_us as u64
-            );
-
-            leader_slot_metrics
-                .timing_metrics
-                .execute_and_commit_timings
-                .accumulate(execute_and_commit_timings);
         }
     }
 
-    // Packet inflow/outflow/processing metrics
     pub(crate) fn increment_total_new_valid_packets(&mut self, count: u64) {
         if let Some(leader_slot_metrics) = &mut self.leader_slot_metrics {
             saturating_add_assign!(
@@ -515,166 +527,6 @@ impl LeaderSlotMetricsTracker {
             );
         }
     }
-
-    // Outermost banking thread's loop timing metrics
-    pub(crate) fn increment_process_buffered_packets_us(&mut self, us: u64) {
-        if let Some(leader_slot_metrics) = &mut self.leader_slot_metrics {
-            saturating_add_assign!(
-                leader_slot_metrics
-                    .timing_metrics
-                    .outer_loop_timings
-                    .process_buffered_packets_us,
-                us
-            );
-        }
-    }
-
-    pub(crate) fn increment_slot_metrics_check_slot_boundary_us(&mut self, us: u64) {
-        if let Some(leader_slot_metrics) = &mut self.leader_slot_metrics {
-            saturating_add_assign!(
-                leader_slot_metrics
-                    .timing_metrics
-                    .outer_loop_timings
-                    .slot_metrics_check_slot_boundary_us,
-                us
-            );
-        }
-    }
-
-    pub(crate) fn increment_receive_and_buffer_packets_us(&mut self, us: u64) {
-        if let Some(leader_slot_metrics) = &mut self.leader_slot_metrics {
-            saturating_add_assign!(
-                leader_slot_metrics
-                    .timing_metrics
-                    .outer_loop_timings
-                    .receive_and_buffer_packets_us,
-                us
-            );
-        }
-    }
-
-    // Processing buffer timing metrics
-    pub(crate) fn increment_make_decision_us(&mut self, us: u64) {
-        if let Some(leader_slot_metrics) = &mut self.leader_slot_metrics {
-            saturating_add_assign!(
-                leader_slot_metrics
-                    .timing_metrics
-                    .process_buffered_packets_timings
-                    .make_decision_us,
-                us
-            );
-        }
-    }
-
-    pub(crate) fn increment_consume_buffered_packets_us(&mut self, us: u64) {
-        if let Some(leader_slot_metrics) = &mut self.leader_slot_metrics {
-            saturating_add_assign!(
-                leader_slot_metrics
-                    .timing_metrics
-                    .process_buffered_packets_timings
-                    .consume_buffered_packets_us,
-                us
-            );
-        }
-    }
-
-    pub(crate) fn increment_forward_us(&mut self, us: u64) {
-        if let Some(leader_slot_metrics) = &mut self.leader_slot_metrics {
-            saturating_add_assign!(
-                leader_slot_metrics
-                    .timing_metrics
-                    .process_buffered_packets_timings
-                    .forward_us,
-                us
-            );
-        }
-    }
-
-    pub(crate) fn increment_forward_and_hold_us(&mut self, us: u64) {
-        if let Some(leader_slot_metrics) = &mut self.leader_slot_metrics {
-            saturating_add_assign!(
-                leader_slot_metrics
-                    .timing_metrics
-                    .process_buffered_packets_timings
-                    .forward_and_hold_us,
-                us
-            );
-        }
-    }
-
-    // Consuming buffered packets timing metrics
-    pub(crate) fn increment_end_of_slot_filtering_us(&mut self, us: u64) {
-        if let Some(leader_slot_metrics) = &mut self.leader_slot_metrics {
-            saturating_add_assign!(
-                leader_slot_metrics
-                    .timing_metrics
-                    .consume_buffered_packets_timings
-                    .end_of_slot_filtering_us,
-                us
-            );
-        }
-    }
-
-    pub(crate) fn increment_consume_buffered_packets_poh_recorder_lock_us(&mut self, us: u64) {
-        if let Some(leader_slot_metrics) = &mut self.leader_slot_metrics {
-            saturating_add_assign!(
-                leader_slot_metrics
-                    .timing_metrics
-                    .consume_buffered_packets_timings
-                    .poh_recorder_lock_us,
-                us
-            );
-        }
-    }
-
-    pub(crate) fn increment_process_packets_transactions_us(&mut self, us: u64) {
-        if let Some(leader_slot_metrics) = &mut self.leader_slot_metrics {
-            saturating_add_assign!(
-                leader_slot_metrics
-                    .timing_metrics
-                    .consume_buffered_packets_timings
-                    .process_packets_transactions_us,
-                us
-            );
-        }
-    }
-
-    // Processing packets timing metrics
-    pub(crate) fn increment_transactions_from_packets_us(&mut self, us: u64) {
-        if let Some(leader_slot_metrics) = &mut self.leader_slot_metrics {
-            saturating_add_assign!(
-                leader_slot_metrics
-                    .timing_metrics
-                    .process_packets_timings
-                    .transactions_from_packets_us,
-                us
-            );
-        }
-    }
-
-    pub(crate) fn increment_process_transactions_us(&mut self, us: u64) {
-        if let Some(leader_slot_metrics) = &mut self.leader_slot_metrics {
-            saturating_add_assign!(
-                leader_slot_metrics
-                    .timing_metrics
-                    .process_packets_timings
-                    .process_transactions_us,
-                us
-            );
-        }
-    }
-
-    pub(crate) fn increment_filter_retryable_packets_us(&mut self, us: u64) {
-        if let Some(leader_slot_metrics) = &mut self.leader_slot_metrics {
-            saturating_add_assign!(
-                leader_slot_metrics
-                    .timing_metrics
-                    .process_packets_timings
-                    .filter_retryable_packets_us,
-                us
-            );
-        }
-    }
 }
 
 #[cfg(test)]

core/src/leader_slot_banking_stage_timing_metrics.rs

@@ -1,286 +0,0 @@
-use {
-    solana_program_runtime::timings::ExecuteTimings,
-    solana_sdk::{clock::Slot, saturating_add_assign},
-    std::time::Instant,
-};
-
-#[derive(Default, Debug)]
-pub struct LeaderExecuteAndCommitTimings {
-    pub collect_balances_us: u64,
-    pub load_execute_us: u64,
-    pub freeze_lock_us: u64,
-    pub record_us: u64,
-    pub commit_us: u64,
-    pub find_and_send_votes_us: u64,
-    pub record_transactions_timings: RecordTransactionsTimings,
-    pub execute_timings: ExecuteTimings,
-}
-
-impl LeaderExecuteAndCommitTimings {
-    pub fn accumulate(&mut self, other: &LeaderExecuteAndCommitTimings) {
-        saturating_add_assign!(self.collect_balances_us, other.collect_balances_us);
-        saturating_add_assign!(self.load_execute_us, other.load_execute_us);
-        saturating_add_assign!(self.freeze_lock_us, other.freeze_lock_us);
-        saturating_add_assign!(self.record_us, other.record_us);
-        saturating_add_assign!(self.commit_us, other.commit_us);
-        saturating_add_assign!(self.find_and_send_votes_us, other.find_and_send_votes_us);
-        saturating_add_assign!(self.commit_us, other.commit_us);
-        self.record_transactions_timings
-            .accumulate(&other.record_transactions_timings);
-        self.execute_timings.accumulate(&other.execute_timings);
-    }
-
-    pub fn report(&self, id: u32, slot: Slot) {
-        datapoint_info!(
-            "banking_stage-leader_slot_execute_and_commit_timings",
-            ("id", id as i64, i64),
-            ("slot", slot as i64, i64),
-            ("collect_balances_us", self.collect_balances_us as i64, i64),
-            ("load_execute_us", self.load_execute_us as i64, i64),
-            ("freeze_lock_us", self.freeze_lock_us as i64, i64),
-            ("record_us", self.record_us as i64, i64),
-            ("commit_us", self.commit_us as i64, i64),
-            (
-                "find_and_send_votes_us",
-                self.find_and_send_votes_us as i64,
-                i64
-            ),
-        );
-
-        datapoint_info!(
-            "banking_stage-leader_slot_record_timings",
-            ("id", id as i64, i64),
-            ("slot", slot as i64, i64),
-            (
-                "execution_results_to_transactions_us",
-                self.record_transactions_timings
-                    .execution_results_to_transactions_us as i64,
-                i64
-            ),
-            (
-                "hash_us",
-                self.record_transactions_timings.hash_us as i64,
-                i64
-            ),
-            (
-                "poh_record_us",
-                self.record_transactions_timings.poh_record_us as i64,
-                i64
-            ),
-        );
-    }
-}
-
-#[derive(Default, Debug)]
-pub struct RecordTransactionsTimings {
-    pub execution_results_to_transactions_us: u64,
-    pub hash_us: u64,
-    pub poh_record_us: u64,
-}
-
-impl RecordTransactionsTimings {
-    pub fn accumulate(&mut self, other: &RecordTransactionsTimings) {
-        saturating_add_assign!(
-            self.execution_results_to_transactions_us,
-            other.execution_results_to_transactions_us
-        );
-        saturating_add_assign!(self.hash_us, other.hash_us);
-        saturating_add_assign!(self.poh_record_us, other.poh_record_us);
-    }
-}
-
-// Metrics capturing wallclock time spent in various parts of BankingStage during this
-// validator's leader slot
-#[derive(Debug)]
-pub(crate) struct LeaderSlotTimingMetrics {
-    pub outer_loop_timings: OuterLoopTimings,
-    pub process_buffered_packets_timings: ProcessBufferedPacketsTimings,
-    pub consume_buffered_packets_timings: ConsumeBufferedPacketsTimings,
-    pub process_packets_timings: ProcessPacketsTimings,
-    pub execute_and_commit_timings: LeaderExecuteAndCommitTimings,
-}
-
-impl LeaderSlotTimingMetrics {
-    pub(crate) fn new(bank_creation_time: &Instant) -> Self {
-        Self {
-            outer_loop_timings: OuterLoopTimings::new(bank_creation_time),
-            process_buffered_packets_timings: ProcessBufferedPacketsTimings::default(),
-            consume_buffered_packets_timings: ConsumeBufferedPacketsTimings::default(),
-            process_packets_timings: ProcessPacketsTimings::default(),
-            execute_and_commit_timings: LeaderExecuteAndCommitTimings::default(),
-        }
-    }
-
-    pub(crate) fn report(&self, id: u32, slot: Slot) {
-        self.outer_loop_timings.report(id, slot);
-        self.process_buffered_packets_timings.report(id, slot);
-        self.consume_buffered_packets_timings.report(id, slot);
-        self.process_packets_timings.report(id, slot);
-        self.execute_and_commit_timings.report(id, slot);
-    }
-}
-
-#[derive(Debug)]
-pub(crate) struct OuterLoopTimings {
-    pub bank_detected_time: Instant,
-
-    // Delay from when the bank was created to when this thread detected it
-    pub bank_detected_delay_us: u64,
-
-    // Time spent processing buffered packets
-    pub process_buffered_packets_us: u64,
-
-    // Time spent checking for slot boundary and reporting leader slot metrics
-    pub slot_metrics_check_slot_boundary_us: u64,
-
-    // Time spent processing new incoming packets to the banking thread
-    pub receive_and_buffer_packets_us: u64,
-}
-
-impl OuterLoopTimings {
-    fn new(bank_creation_time: &Instant) -> Self {
-        Self {
-            bank_detected_time: Instant::now(),
-            bank_detected_delay_us: bank_creation_time.elapsed().as_micros() as u64,
-            process_buffered_packets_us: 0,
-            slot_metrics_check_slot_boundary_us: 0,
-            receive_and_buffer_packets_us: 0,
-        }
-    }
-
-    fn report(&self, id: u32, slot: Slot) {
-        let bank_detected_to_now_us = self.bank_detected_time.elapsed().as_micros() as u64;
-        datapoint_info!(
-            "banking_stage-leader_slot_loop_timings",
-            ("id", id as i64, i64),
-            ("slot", slot as i64, i64),
-            (
-                "bank_detected_to_slot_end_detected_us",
-                bank_detected_to_now_us,
-                i64
-            ),
-            (
-                "bank_creation_to_slot_end_detected_us",
-                bank_detected_to_now_us + self.bank_detected_delay_us,
-                i64
-            ),
-            ("bank_detected_delay_us", self.bank_detected_delay_us, i64),
-            (
-                "process_buffered_packets_us",
-                self.process_buffered_packets_us,
-                i64
-            ),
-            (
-                "slot_metrics_check_slot_boundary_us",
-                self.slot_metrics_check_slot_boundary_us,
-                i64
-            ),
-            (
-                "receive_and_buffer_packets_us",
-                self.receive_and_buffer_packets_us,
-                i64
-            ),
-        );
-    }
-}
-
-#[derive(Debug, Default)]
-pub(crate) struct ProcessBufferedPacketsTimings {
-    pub make_decision_us: u64,
-    pub consume_buffered_packets_us: u64,
-    pub forward_us: u64,
-    pub forward_and_hold_us: u64,
-}
-impl ProcessBufferedPacketsTimings {
-    fn report(&self, id: u32, slot: Slot) {
-        datapoint_info!(
-            "banking_stage-leader_slot_process_buffered_packets_timings",
-            ("id", id as i64, i64),
-            ("slot", slot as i64, i64),
-            ("make_decision_us", self.make_decision_us as i64, i64),
-            (
-                "consume_buffered_packets_us",
-                self.consume_buffered_packets_us as i64,
-                i64
-            ),
-            ("forward_us", self.forward_us as i64, i64),
-            ("forward_and_hold_us", self.forward_and_hold_us as i64, i64),
-        );
-    }
-}
-
-#[derive(Debug, Default)]
-pub(crate) struct ConsumeBufferedPacketsTimings {
-    // Time spent grabbing poh recorder lock
-    pub poh_recorder_lock_us: u64,
-
-    // Time spent filtering invalid packets after leader slot has ended
-    pub end_of_slot_filtering_us: u64,
-
-    // Time spent processing transactions
-    pub process_packets_transactions_us: u64,
-}
-
-impl ConsumeBufferedPacketsTimings {
-    fn report(&self, id: u32, slot: Slot) {
-        datapoint_info!(
-            "banking_stage-leader_slot_consume_buffered_packets_timings",
-            ("id", id as i64, i64),
-            ("slot", slot as i64, i64),
-            (
-                "poh_recorder_lock_us",
-                self.poh_recorder_lock_us as i64,
-                i64
-            ),
-            (
-                "end_of_slot_filtering_us",
-                self.end_of_slot_filtering_us as i64,
-                i64
-            ),
-            (
-                "process_packets_transactions_us",
-                self.process_packets_transactions_us as i64,
-                i64
-            ),
-        );
-    }
-}
-
-#[derive(Debug, Default)]
-pub(crate) struct ProcessPacketsTimings {
-    // Time spent converting packets to transactions
-    pub transactions_from_packets_us: u64,
-
-    // Time spent processing transactions
-    pub process_transactions_us: u64,
-
-    // Time spent filtering retryable packets that were returned after transaction
-    // processing
-    pub filter_retryable_packets_us: u64,
-
-    // Time spent running the cost model in processing transactions before executing
-    // transactions
-    pub cost_model_us: u64,
-}
-
-impl ProcessPacketsTimings {
-    fn report(&self, id: u32, slot: Slot) {
-        datapoint_info!(
-            "banking_stage-leader_slot_process_packets_timings",
-            ("id", id as i64, i64),
-            ("slot", slot as i64, i64),
-            (
-                "transactions_from_packets_us",
-                self.transactions_from_packets_us,
-                i64
-            ),
-            ("process_transactions_us", self.process_transactions_us, i64),
-            (
-                "filter_retryable_packets_us",
-                self.filter_retryable_packets_us,
-                i64
-            ),
-            ("cost_model_us", self.cost_model_us, i64),
-        );
-    }
-}

core/src/ledger_metric_report_service.rs

@@ -1,44 +0,0 @@
-//! The `ledger_metric_report_service` periodically reports ledger store metrics.
-
-use {
-    solana_ledger::blockstore::Blockstore,
-    std::{
-        string::ToString,
-        sync::{
-            atomic::{AtomicBool, Ordering},
-            Arc,
-        },
-        thread::{self, Builder, JoinHandle},
-        time::Duration,
-    },
-};
-
-// Determines how often we report blockstore metrics.
-const BLOCKSTORE_METRICS_REPORT_PERIOD_MILLIS: u64 = 10000;
-
-pub struct LedgerMetricReportService {
-    t_cf_metric: JoinHandle<()>,
-}
-
-impl LedgerMetricReportService {
-    pub fn new(blockstore: Arc<Blockstore>, exit: &Arc<AtomicBool>) -> Self {
-        let exit_signal = exit.clone();
-        let t_cf_metric = Builder::new()
-            .name("metric_report_rocksdb_cf_metrics".to_string())
-            .spawn(move || loop {
-                if exit_signal.load(Ordering::Relaxed) {
-                    break;
-                }
-                thread::sleep(Duration::from_millis(
-                    BLOCKSTORE_METRICS_REPORT_PERIOD_MILLIS,
-                ));
-                blockstore.submit_rocksdb_cf_metrics_for_all_cfs();
-            })
-            .unwrap();
-        Self { t_cf_metric }
-    }
-
-    pub fn join(self) -> thread::Result<()> {
-        self.t_cf_metric.join()
-    }
-}

core/src/lib.rs

@@ -24,19 +24,15 @@ pub mod cost_update_service;
 pub mod drop_bank_service;
 pub mod duplicate_repair_status;
 pub mod fetch_stage;
-pub mod find_packet_sender_stake_stage;
 pub mod fork_choice;
 pub mod gen_keys;
 pub mod heaviest_subtree_fork_choice;
 pub mod latest_validator_votes_for_frozen_banks;
 pub mod leader_slot_banking_stage_metrics;
-pub mod leader_slot_banking_stage_timing_metrics;
 pub mod ledger_cleanup_service;
-pub mod ledger_metric_report_service;
 pub mod optimistic_confirmation_verifier;
 pub mod outstanding_requests;
 pub mod packet_hasher;
-pub mod packet_threshold;
 pub mod progress_map;
 pub mod qos_service;
 pub mod repair_generic_traversal;
@@ -65,7 +61,6 @@ pub mod tpu;
 pub mod tree_diff;
 pub mod tvu;
 pub mod unfrozen_gossip_verified_vote_hashes;
-pub mod unprocessed_packet_batches;
 pub mod validator;
 pub mod verified_vote_packets;
 pub mod vote_simulator;

core/src/packet_threshold.rs

@@ -1,84 +0,0 @@
-use std::time::Duration;
-
-enum PacketThresholdUpdate {
-    Increase,
-    Decrease,
-}
-
-impl PacketThresholdUpdate {
-    const PERCENTAGE: usize = 90;
-
-    fn calculate(&self, current: usize) -> usize {
-        match *self {
-            PacketThresholdUpdate::Increase => {
-                current.saturating_mul(100).saturating_div(Self::PERCENTAGE)
-            }
-            PacketThresholdUpdate::Decrease => {
-                current.saturating_mul(Self::PERCENTAGE).saturating_div(100)
-            }
-        }
-    }
-}
-
-#[derive(Debug)]
-pub struct DynamicPacketToProcessThreshold {
-    max_packets: usize,
-}
-
-impl Default for DynamicPacketToProcessThreshold {
-    fn default() -> Self {
-        Self {
-            max_packets: Self::DEFAULT_MAX_PACKETS,
-        }
-    }
-}
-
-impl DynamicPacketToProcessThreshold {
-    const DEFAULT_MAX_PACKETS: usize = 1024;
-    const TIME_THRESHOLD: Duration = Duration::from_secs(1);
-
-    pub fn update(&mut self, total_packets: usize, compute_time: Duration) {
-        if total_packets >= self.max_packets {
-            let threshold_update = if compute_time > Self::TIME_THRESHOLD {
-                PacketThresholdUpdate::Decrease
-            } else {
-                PacketThresholdUpdate::Increase
-            };
-            self.max_packets = threshold_update.calculate(self.max_packets);
-        }
-    }
-
-    pub fn should_drop(&self, total: usize) -> bool {
-        total >= self.max_packets
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use {super::DynamicPacketToProcessThreshold, std::time::Duration};
-
-    #[test]
-    fn test_dynamic_packet_threshold() {
-        let mut threshold = DynamicPacketToProcessThreshold::default();
-        assert_eq!(
-            threshold.max_packets,
-            DynamicPacketToProcessThreshold::DEFAULT_MAX_PACKETS
-        );
-
-        assert!(!threshold.should_drop(10));
-        assert!(threshold.should_drop(2000));
-
-        let old = threshold.max_packets;
-
-        // Increase
-        let total = 2000;
-        let compute_time = Duration::from_millis(500);
-        threshold.update(total, compute_time);
-        assert!(threshold.max_packets > old);
-
-        // Decrease
-        let compute_time = Duration::from_millis(2000);
-        threshold.update(total, compute_time);
-        assert_eq!(threshold.max_packets, old - 1); // due to rounding error, there is a difference of 1
-    }
-}

core/src/progress_map.rs

@@ -6,12 +6,10 @@ use {
         replay_stage::SUPERMINORITY_THRESHOLD,
     },
     solana_ledger::blockstore_processor::{ConfirmationProgress, ConfirmationTiming},
-    solana_program_runtime::timings::ExecuteTimingType,
     solana_runtime::{bank::Bank, bank_forks::BankForks, vote_account::VoteAccount},
     solana_sdk::{clock::Slot, hash::Hash, pubkey::Pubkey},
     std::{
         collections::{BTreeMap, HashMap, HashSet},
-        ops::Index,
         sync::{Arc, RwLock},
         time::Instant,
     },
@@ -64,60 +62,23 @@ impl ReplaySlotStats {
             ),
             ("total_entries", num_entries as i64, i64),
             ("total_shreds", num_shreds as i64, i64),
-            (
-                "check_us",
-                *self
-                    .execute_timings
-                    .metrics
-                    .index(ExecuteTimingType::CheckUs),
-                i64
-            ),
-            (
-                "load_us",
-                *self
-                    .execute_timings
-                    .metrics
-                    .index(ExecuteTimingType::LoadUs),
-                i64
-            ),
-            (
-                "execute_us",
-                *self
-                    .execute_timings
-                    .metrics
-                    .index(ExecuteTimingType::ExecuteUs),
-                i64
-            ),
-            (
-                "store_us",
-                *self
-                    .execute_timings
-                    .metrics
-                    .index(ExecuteTimingType::StoreUs),
-                i64
-            ),
+            ("check_us", self.execute_timings.check_us, i64),
+            ("load_us", self.execute_timings.load_us, i64),
+            ("execute_us", self.execute_timings.execute_us, i64),
+            ("store_us", self.execute_timings.store_us, i64),
             (
                 "update_stakes_cache_us",
-                *self
-                    .execute_timings
-                    .metrics
-                    .index(ExecuteTimingType::UpdateStakesCacheUs),
+                self.execute_timings.update_stakes_cache_us,
                 i64
             ),
             (
                 "total_batches_len",
-                *self
-                    .execute_timings
-                    .metrics
-                    .index(ExecuteTimingType::TotalBatchesLen),
+                self.execute_timings.total_batches_len,
                 i64
             ),
             (
                 "num_execute_batches",
-                *self
-                    .execute_timings
-                    .metrics
-                    .index(ExecuteTimingType::NumExecuteBatches),
+                self.execute_timings.num_execute_batches,
                 i64
             ),
             (
@@ -339,7 +300,7 @@ pub struct RetransmitInfo {
 impl RetransmitInfo {
     pub fn reached_retransmit_threshold(&self) -> bool {
         let backoff = std::cmp::min(self.retry_iteration, RETRANSMIT_BACKOFF_CAP);
-        let backoff_duration_ms = (1_u64 << backoff) * RETRANSMIT_BASE_DELAY_MS;
+        let backoff_duration_ms = 2_u64.pow(backoff) * RETRANSMIT_BASE_DELAY_MS;
         self.retry_time
             .map(|time| time.elapsed().as_millis() > backoff_duration_ms.into())
             .unwrap_or(true)

core/src/qos_service.rs

@@ -3,7 +3,7 @@
 //! how transactions are included in blocks, and optimize those blocks.
 //!
 use {
-    crate::banking_stage::BatchedTransactionDetails,
+    crate::banking_stage::BatchedTransactionCostDetails,
     crossbeam_channel::{unbounded, Receiver, Sender},
     solana_measure::measure::Measure,
     solana_runtime::{
@@ -68,8 +68,8 @@ impl QosService {
         let running_flag = Arc::new(AtomicBool::new(true));
         let metrics = Arc::new(QosServiceMetrics::new(id));
 
-        let running_flag_clone = Arc::clone(&running_flag);
-        let metrics_clone = Arc::clone(&metrics);
+        let running_flag_clone = running_flag.clone();
+        let metrics_clone = metrics.clone();
         let reporting_thread = Some(
             Builder::new()
                 .name("solana-qos-service-metrics-repoting".to_string())
@@ -109,11 +109,9 @@ impl QosService {
             .collect();
         compute_cost_time.stop();
         self.metrics
-            .stats
             .compute_cost_time
             .fetch_add(compute_cost_time.as_us(), Ordering::Relaxed);
         self.metrics
-            .stats
             .compute_cost_count
             .fetch_add(txs_costs.len() as u64, Ordering::Relaxed);
         txs_costs
@@ -133,10 +131,10 @@ impl QosService {
         let mut num_included = 0;
         let select_results = transactions
             .zip(transactions_costs)
-            .map(|(tx, cost)| match cost_tracker.try_add(cost) {
+            .map(|(tx, cost)| match cost_tracker.try_add(tx, cost) {
                 Ok(current_block_cost) => {
                     debug!("slot {:?}, transaction {:?}, cost {:?}, fit into current block, current block cost {}", bank.slot(), tx, cost, current_block_cost);
-                    self.metrics.stats.selected_txs_count.fetch_add(1, Ordering::Relaxed);
+                    self.metrics.selected_txs_count.fetch_add(1, Ordering::Relaxed);
                     num_included += 1;
                     Ok(())
                 },
@@ -144,19 +142,20 @@ impl QosService {
                     debug!("slot {:?}, transaction {:?}, cost {:?}, not fit into current block, '{:?}'", bank.slot(), tx, cost, e);
                     match e {
                         CostTrackerError::WouldExceedBlockMaxLimit => {
+                            self.metrics.retried_txs_per_block_limit_count.fetch_add(1, Ordering::Relaxed);
                             Err(TransactionError::WouldExceedMaxBlockCostLimit)
                         }
                         CostTrackerError::WouldExceedVoteMaxLimit => {
+                            self.metrics.retried_txs_per_vote_limit_count.fetch_add(1, Ordering::Relaxed);
                             Err(TransactionError::WouldExceedMaxVoteCostLimit)
                         }
                         CostTrackerError::WouldExceedAccountMaxLimit => {
+                            self.metrics.retried_txs_per_account_limit_count.fetch_add(1, Ordering::Relaxed);
                             Err(TransactionError::WouldExceedMaxAccountCostLimit)
                         }
-                        CostTrackerError::WouldExceedAccountDataBlockLimit => {
-                            Err(TransactionError::WouldExceedAccountDataBlockLimit)
-                        }
-                        CostTrackerError::WouldExceedAccountDataTotalLimit => {
-                            Err(TransactionError::WouldExceedAccountDataTotalLimit)
+                        CostTrackerError::WouldExceedAccountDataMaxLimit => {
+                            self.metrics.retried_txs_per_account_data_limit_count.fetch_add(1, Ordering::Relaxed);
+                            Err(TransactionError::WouldExceedMaxAccountDataCostLimit)
                         }
                     }
                 }
@@ -164,41 +163,11 @@ impl QosService {
             .collect();
         cost_tracking_time.stop();
         self.metrics
-            .stats
             .cost_tracking_time
             .fetch_add(cost_tracking_time.as_us(), Ordering::Relaxed);
         (select_results, num_included)
     }
 
-    /// Update the transaction cost in the cost_tracker with the real cost for
-    /// transactions that were executed successfully;
-    /// Otherwise remove the cost from the cost tracker, therefore preventing cost_tracker
-    /// being inflated with unsuccessfully executed transactions.
-    pub fn update_or_remove_transaction_costs<'a>(
-        transaction_costs: impl Iterator<Item = &'a TransactionCost>,
-        transaction_qos_results: impl Iterator<Item = &'a transaction::Result<()>>,
-        retryable_transaction_indexes: &[usize],
-        bank: &Arc<Bank>,
-    ) {
-        let mut cost_tracker = bank.write_cost_tracker().unwrap();
-        transaction_costs
-            .zip(transaction_qos_results)
-            .enumerate()
-            .for_each(|(index, (tx_cost, qos_inclusion_result))| {
-                // Only transactions that the qos service incuded have been added to the
-                // cost tracker.
-                if qos_inclusion_result.is_ok() && retryable_transaction_indexes.contains(&index) {
-                    cost_tracker.remove(tx_cost);
-                } else {
-                    // TODO: Update the cost tracker with the actual execution compute units.
-                    // Will have to plumb it in next; For now, keep estimated costs.
-                    //
-                    // let actual_execution_cost = 0;
-                    // cost_tracker.update_execution_cost(tx_cost, actual_execution_cost);
-                }
-            });
-    }
-
     // metrics are reported by bank slot
     pub fn report_metrics(&self, bank: Arc<Bank>) {
         self.report_sender
@@ -208,82 +177,30 @@ impl QosService {
 
     pub fn accumulate_estimated_transaction_costs(
         &self,
-        batched_transaction_details: &BatchedTransactionDetails,
+        cost_details: &BatchedTransactionCostDetails,
     ) {
-        self.metrics.stats.estimated_signature_cu.fetch_add(
-            batched_transaction_details.costs.batched_signature_cost,
-            Ordering::Relaxed,
-        );
-        self.metrics.stats.estimated_write_lock_cu.fetch_add(
-            batched_transaction_details.costs.batched_write_lock_cost,
-            Ordering::Relaxed,
-        );
-        self.metrics.stats.estimated_data_bytes_cu.fetch_add(
-            batched_transaction_details.costs.batched_data_bytes_cost,
-            Ordering::Relaxed,
-        );
-        self.metrics.stats.estimated_execute_cu.fetch_add(
-            batched_transaction_details.costs.batched_execute_cost,
-            Ordering::Relaxed,
-        );
-
         self.metrics
-            .errors
-            .retried_txs_per_block_limit_count
-            .fetch_add(
-                batched_transaction_details
-                    .errors
-                    .batched_retried_txs_per_block_limit_count,
-                Ordering::Relaxed,
-            );
+            .estimated_signature_cu
+            .fetch_add(cost_details.batched_signature_cost, Ordering::Relaxed);
         self.metrics
-            .errors
-            .retried_txs_per_vote_limit_count
-            .fetch_add(
-                batched_transaction_details
-                    .errors
-                    .batched_retried_txs_per_vote_limit_count,
-                Ordering::Relaxed,
-            );
+            .estimated_write_lock_cu
+            .fetch_add(cost_details.batched_write_lock_cost, Ordering::Relaxed);
         self.metrics
-            .errors
-            .retried_txs_per_account_limit_count
-            .fetch_add(
-                batched_transaction_details
-                    .errors
-                    .batched_retried_txs_per_account_limit_count,
-                Ordering::Relaxed,
-            );
+            .estimated_data_bytes_cu
+            .fetch_add(cost_details.batched_data_bytes_cost, Ordering::Relaxed);
         self.metrics
-            .errors
-            .retried_txs_per_account_data_block_limit_count
-            .fetch_add(
-                batched_transaction_details
-                    .errors
-                    .batched_retried_txs_per_account_data_block_limit_count,
-                Ordering::Relaxed,
-            );
-        self.metrics
-            .errors
-            .dropped_txs_per_account_data_total_limit_count
-            .fetch_add(
-                batched_transaction_details
-                    .errors
-                    .batched_dropped_txs_per_account_data_total_limit_count,
-                Ordering::Relaxed,
-            );
+            .estimated_execute_cu
+            .fetch_add(cost_details.batched_execute_cost, Ordering::Relaxed);
     }
 
     pub fn accumulate_actual_execute_cu(&self, units: u64) {
         self.metrics
-            .stats
             .actual_execute_cu
             .fetch_add(units, Ordering::Relaxed);
     }
 
     pub fn accumulate_actual_execute_time(&self, micro_sec: u64) {
         self.metrics
-            .stats
             .actual_execute_time_us
             .fetch_add(micro_sec, Ordering::Relaxed);
     }
@@ -306,75 +223,61 @@ impl QosService {
     }
 }
 
-#[derive(Debug, Default)]
+#[derive(Default)]
 struct QosServiceMetrics {
-    /// banking_stage creates one QosService instance per working threads, that is uniquely
-    /// identified by id. This field allows to categorize metrics for gossip votes, TPU votes
-    /// and other transactions.
+    // banking_stage creates one QosService instance per working threads, that is uniquely
+    // identified by id. This field allows to categorize metrics for gossip votes, TPU votes
+    // and other transactions.
     id: u32,
 
-    /// aggregate metrics per slot
+    // aggregate metrics per slot
     slot: AtomicU64,
 
-    stats: QosServiceMetricsStats,
-    errors: QosServiceMetricsErrors,
-}
-
-#[derive(Debug, Default)]
-struct QosServiceMetricsStats {
-    /// accumulated time in micro-sec spent in computing transaction cost. It is the main performance
-    /// overhead introduced by cost_model
+    // accumulated time in micro-sec spent in computing transaction cost. It is the main performance
+    // overhead introduced by cost_model
     compute_cost_time: AtomicU64,
 
-    /// total nummber of transactions in the reporting period to be computed for theit cost. It is
-    /// usually the number of sanitized transactions leader receives.
+    // total nummber of transactions in the reporting period to be computed for theit cost. It is
+    // usually the number of sanitized transactions leader receives.
     compute_cost_count: AtomicU64,
 
-    /// acumulated time in micro-sec spent in tracking each bank's cost. It is the second part of
-    /// overhead introduced
+    // acumulated time in micro-sec spent in tracking each bank's cost. It is the second part of
+    // overhead introduced
     cost_tracking_time: AtomicU64,
 
-    /// number of transactions to be included in blocks
+    // number of transactions to be included in blocks
     selected_txs_count: AtomicU64,
 
-    /// accumulated estimated signature Compute Unites to be packed into block
-    estimated_signature_cu: AtomicU64,
-
-    /// accumulated estimated write locks Compute Units to be packed into block
-    estimated_write_lock_cu: AtomicU64,
-
-    /// accumulated estimated instructino data Compute Units to be packed into block
-    estimated_data_bytes_cu: AtomicU64,
-
-    /// accumulated estimated program Compute Units to be packed into block
-    estimated_execute_cu: AtomicU64,
-
-    /// accumulated actual program Compute Units that have been packed into block
-    actual_execute_cu: AtomicU64,
-
-    /// accumulated actual program execute micro-sec that have been packed into block
-    actual_execute_time_us: AtomicU64,
-}
-
-#[derive(Debug, Default)]
-struct QosServiceMetricsErrors {
-    /// number of transactions to be queued for retry due to their potential to breach block limit
+    // number of transactions to be queued for retry due to its potential to breach block limit
     retried_txs_per_block_limit_count: AtomicU64,
 
-    /// number of transactions to be queued for retry due to their potential to breach vote limit
+    // number of transactions to be queued for retry due to its potential to breach vote limit
     retried_txs_per_vote_limit_count: AtomicU64,
 
-    /// number of transactions to be queued for retry due to their potential to breach writable
-    /// account limit
+    // number of transactions to be queued for retry due to its potential to breach writable
+    // account limit
     retried_txs_per_account_limit_count: AtomicU64,
 
-    /// number of transactions to be queued for retry due to their potential to breach account data
-    /// block limits
-    retried_txs_per_account_data_block_limit_count: AtomicU64,
+    // number of transactions to be queued for retry due to its account data limits
+    retried_txs_per_account_data_limit_count: AtomicU64,
 
-    /// number of transactions to be dropped due to their potential to breach account data total
-    /// limits
-    dropped_txs_per_account_data_total_limit_count: AtomicU64,
+    // accumulated estimated signature Compute Unites to be packed into block
+    estimated_signature_cu: AtomicU64,
+
+    // accumulated estimated write locks Compute Units to be packed into block
+    estimated_write_lock_cu: AtomicU64,
+
+    // accumulated estimated instructino data Compute Units to be packed into block
+    estimated_data_bytes_cu: AtomicU64,
+
+    // accumulated estimated program Compute Units to be packed into block
+    estimated_execute_cu: AtomicU64,
+
+    // accumulated actual program Compute Units that have been packed into block
+    actual_execute_cu: AtomicU64,
+
+    // accumulated actual program execute micro-sec that have been packed into block
+    actual_execute_time_us: AtomicU64,
 }
 
 impl QosServiceMetrics {
@@ -393,96 +296,76 @@ impl QosServiceMetrics {
                 ("bank_slot", bank_slot as i64, i64),
                 (
                     "compute_cost_time",
-                    self.stats.compute_cost_time.swap(0, Ordering::Relaxed) as i64,
+                    self.compute_cost_time.swap(0, Ordering::Relaxed) as i64,
                     i64
                 ),
                 (
                     "compute_cost_count",
-                    self.stats.compute_cost_count.swap(0, Ordering::Relaxed) as i64,
+                    self.compute_cost_count.swap(0, Ordering::Relaxed) as i64,
                     i64
                 ),
                 (
                     "cost_tracking_time",
-                    self.stats.cost_tracking_time.swap(0, Ordering::Relaxed) as i64,
+                    self.cost_tracking_time.swap(0, Ordering::Relaxed) as i64,
                     i64
                 ),
                 (
                     "selected_txs_count",
-                    self.stats.selected_txs_count.swap(0, Ordering::Relaxed) as i64,
+                    self.selected_txs_count.swap(0, Ordering::Relaxed) as i64,
                     i64
                 ),
-                (
-                    "estimated_signature_cu",
-                    self.stats.estimated_signature_cu.swap(0, Ordering::Relaxed) as i64,
-                    i64
-                ),
-                (
-                    "estimated_write_lock_cu",
-                    self.stats
-                        .estimated_write_lock_cu
-                        .swap(0, Ordering::Relaxed) as i64,
-                    i64
-                ),
-                (
-                    "estimated_data_bytes_cu",
-                    self.stats
-                        .estimated_data_bytes_cu
-                        .swap(0, Ordering::Relaxed) as i64,
-                    i64
-                ),
-                (
-                    "estimated_execute_cu",
-                    self.stats.estimated_execute_cu.swap(0, Ordering::Relaxed) as i64,
-                    i64
-                ),
-                (
-                    "actual_execute_cu",
-                    self.stats.actual_execute_cu.swap(0, Ordering::Relaxed) as i64,
-                    i64
-                ),
-                (
-                    "actual_execute_time_us",
-                    self.stats.actual_execute_time_us.swap(0, Ordering::Relaxed) as i64,
-                    i64
-                ),
-            );
-            datapoint_info!(
-                "qos-service-errors",
-                ("id", self.id as i64, i64),
-                ("bank_slot", bank_slot as i64, i64),
                 (
                     "retried_txs_per_block_limit_count",
-                    self.errors
-                        .retried_txs_per_block_limit_count
+                    self.retried_txs_per_block_limit_count
                         .swap(0, Ordering::Relaxed) as i64,
                     i64
                 ),
                 (
                     "retried_txs_per_vote_limit_count",
-                    self.errors
-                        .retried_txs_per_vote_limit_count
+                    self.retried_txs_per_vote_limit_count
                         .swap(0, Ordering::Relaxed) as i64,
                     i64
                 ),
                 (
                     "retried_txs_per_account_limit_count",
-                    self.errors
-                        .retried_txs_per_account_limit_count
+                    self.retried_txs_per_account_limit_count
                         .swap(0, Ordering::Relaxed) as i64,
                     i64
                 ),
                 (
-                    "retried_txs_per_account_data_block_limit_count",
-                    self.errors
-                        .retried_txs_per_account_data_block_limit_count
+                    "retried_txs_per_account_data_limit_count",
+                    self.retried_txs_per_account_data_limit_count
                         .swap(0, Ordering::Relaxed) as i64,
                     i64
                 ),
                 (
-                    "dropped_txs_per_account_data_total_limit_count",
-                    self.errors
-                        .dropped_txs_per_account_data_total_limit_count
-                        .swap(0, Ordering::Relaxed) as i64,
+                    "estimated_signature_cu",
+                    self.estimated_signature_cu.swap(0, Ordering::Relaxed) as i64,
+                    i64
+                ),
+                (
+                    "estimated_write_lock_cu",
+                    self.estimated_write_lock_cu.swap(0, Ordering::Relaxed) as i64,
+                    i64
+                ),
+                (
+                    "estimated_data_bytes_cu",
+                    self.estimated_data_bytes_cu.swap(0, Ordering::Relaxed) as i64,
+                    i64
+                ),
+                (
+                    "estimated_execute_cu",
+                    self.estimated_execute_cu.swap(0, Ordering::Relaxed) as i64,
+                    i64
+                ),
+                (
+                    "actual_execute_cu",
+                    self.actual_execute_cu.swap(0, Ordering::Relaxed) as i64,
+                    i64
+                ),
+                (
+                    "actual_execute_time_us",
+                    self.actual_execute_time_us.swap(0, Ordering::Relaxed) as i64,
                     i64
                 ),
             );

core/src/repair_weight.rs

@@ -642,7 +642,7 @@ impl RepairWeight {
     }
 
     // Heavier, smaller slots come first
-    fn sort_by_stake_weight_slot(slot_stake_voted: &mut [(Slot, u64)]) {
+    fn sort_by_stake_weight_slot(slot_stake_voted: &mut Vec<(Slot, u64)>) {
         slot_stake_voted.sort_by(|(slot, stake_voted), (slot_, stake_voted_)| {
             if stake_voted == stake_voted_ {
                 slot.cmp(slot_)