remove block limit for bench tests to avoid skew test result

2022-02-16 18:52:32 -06:00
596 changed files with 21976 additions and 33699 deletions
--- a/.buildkite/coverage-in-disk.sh
+++ b/.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
--- a/.buildkite/hooks/pre-command
+++ b/.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
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,9 +1,5 @@
 #### Problem

-
-
 #### Summary of Changes

-
-
 Fixes #
--- a/.github/workflows/client-targets.yml
+++ b/.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 }}
--- a/.github/workflows/explorer_preview.yml
+++ b/.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 }}
--- a/.github/workflows/explorer_production.yml
+++ b/.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 }}
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -93,7 +93,6 @@ pull_request_rules:
      - author=mergify[bot]
      - head~=^mergify/bp/
      - "#status-failure=0"
-      - "-merged"
    actions:
      label:
        add:
--- a/Cargo.lock
+++ b/Cargo.lock
--- a/Cargo.toml
+++ b/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,24 +65,26 @@ 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 = [
    "programs/bpf",
 ]
-
-# This prevents a Travis CI error when building for Windows.
-resolver = "2"
--- a/account-decoder/Cargo.toml
+++ b/account-decoder/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "solana-account-decoder"
-version = "1.10.9"
+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.9" }
-solana-sdk = { path = "../sdk", version = "=1.10.9" }
-solana-vote-program = { path = "../programs/vote", version = "=1.10.9" }
+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"]
--- a/account-decoder/src/lib.rs
+++ b/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,
--- a/accounts-bench/Cargo.toml
+++ b/accounts-bench/Cargo.toml
@@ -2,21 +2,21 @@
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 edition = "2021"
 name = "solana-accounts-bench"
-version = "1.10.9"
+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.9" }
-solana-measure = { path = "../measure", version = "=1.10.9" }
-solana-runtime = { path = "../runtime", version = "=1.10.9" }
-solana-sdk = { path = "../sdk", version = "=1.10.9" }
-solana-version = { path = "../version", version = "=1.10.9" }
+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"]
--- a/accounts-cluster-bench/Cargo.toml
+++ b/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.9"
+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.9" }
-solana-clap-utils = { path = "../clap-utils", version = "=1.10.9" }
-solana-client = { path = "../client", version = "=1.10.9" }
-solana-faucet = { path = "../faucet", version = "=1.10.9" }
-solana-gossip = { path = "../gossip", version = "=1.10.9" }
-solana-logger = { path = "../logger", version = "=1.10.9" }
-solana-measure = { path = "../measure", version = "=1.10.9" }
-solana-net-utils = { path = "../net-utils", version = "=1.10.9" }
-solana-runtime = { path = "../runtime", version = "=1.10.9" }
-solana-sdk = { path = "../sdk", version = "=1.10.9" }
-solana-streamer = { path = "../streamer", version = "=1.10.9" }
-solana-transaction-status = { path = "../transaction-status", version = "=1.10.9" }
-solana-version = { path = "../version", version = "=1.10.9" }
+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.9" }
-solana-local-cluster = { path = "../local-cluster", version = "=1.10.9" }
-solana-test-validator = { path = "../test-validator", version = "=1.10.9" }
+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"]
--- a/accountsdb-plugin-interface/Cargo.toml
+++ b/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.9"
+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.9" }
-solana-transaction-status = { path = "../transaction-status", version = "=1.10.9" }
 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"]
--- a/accountsdb-plugin-interface/README.md
+++ b/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)
--- a/accountsdb-plugin-interface/src/accountsdb_plugin_interface.rs
+++ b/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,
--- a/accountsdb-plugin-interface/src/lib.rs
+++ b/accountsdb-plugin-interface/src/lib.rs
@@ -0,0 +1 @@
+pub mod accountsdb_plugin_interface;
--- a/accountsdb-plugin-manager/Cargo.toml
+++ b/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"]
--- a/accountsdb-plugin-manager/src/accounts_update_notifier.rs
+++ b/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
--- a/accountsdb-plugin-manager/src/accountsdb_plugin_manager.rs
+++ b/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();
--- a/accountsdb-plugin-manager/src/accountsdb_plugin_service.rs
+++ b/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(())
--- a/accountsdb-plugin-manager/src/block_metadata_notifier.rs
+++ b/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 }
    }
 }
--- a/accountsdb-plugin-manager/src/block_metadata_notifier_interface.rs
+++ b/accountsdb-plugin-manager/src/block_metadata_notifier_interface.rs
--- a/accountsdb-plugin-manager/src/lib.rs
+++ b/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;
--- a/accountsdb-plugin-manager/src/slot_status_notifier.rs
+++ b/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
--- a/accountsdb-plugin-manager/src/slot_status_observer.rs
+++ b/accountsdb-plugin-manager/src/slot_status_observer.rs
--- a/accountsdb-plugin-manager/src/transaction_notifier.rs
+++ b/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 }
    }

--- a/banking-bench/Cargo.toml
+++ b/banking-bench/Cargo.toml
@@ -2,7 +2,7 @@
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 edition = "2021"
 name = "solana-banking-bench"
-version = "1.10.9"
+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.9" }
-solana-gossip = { path = "../gossip", version = "=1.10.9" }
-solana-ledger = { path = "../ledger", version = "=1.10.9" }
-solana-logger = { path = "../logger", version = "=1.10.9" }
-solana-measure = { path = "../measure", version = "=1.10.9" }
-solana-perf = { path = "../perf", version = "=1.10.9" }
-solana-poh = { path = "../poh", version = "=1.10.9" }
-solana-runtime = { path = "../runtime", version = "=1.10.9" }
-solana-sdk = { path = "../sdk", version = "=1.10.9" }
-solana-streamer = { path = "../streamer", version = "=1.10.9" }
-solana-version = { path = "../version", version = "=1.10.9" }
+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"]
--- a/banks-client/Cargo.toml
+++ b/banks-client/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "solana-banks-client"
-version = "1.10.9"
+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.9" }
-solana-program = { path = "../sdk/program", version = "=1.10.9" }
-solana-sdk = { path = "../sdk", version = "=1.10.9" }
+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.9" }
-solana-runtime = { path = "../runtime", version = "=1.10.9" }
+solana-runtime = { path = "../runtime", version = "=1.10.0" }
+solana-banks-server = { path = "../banks-server", version = "=1.10.0" }

 [lib]
 crate-type = ["lib"]
--- a/banks-client/src/lib.rs
+++ b/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},
--- a/banks-interface/Cargo.toml
+++ b/banks-interface/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "solana-banks-interface"
-version = "1.10.9"
+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.9" }
+solana-sdk = { path = "../sdk", version = "=1.10.0" }
 tarpc = { version = "0.27.2", features = ["full"] }

 [lib]
--- a/banks-server/Cargo.toml
+++ b/banks-server/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "solana-banks-server"
-version = "1.10.9"
+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.9" }
-solana-runtime = { path = "../runtime", version = "=1.10.9" }
-solana-sdk = { path = "../sdk", version = "=1.10.9" }
-solana-send-transaction-service = { path = "../send-transaction-service", version = "=1.10.9" }
+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"] }
--- a/banks-server/src/banks_server.rs
+++ b/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(
--- a/bench-streamer/Cargo.toml
+++ b/bench-streamer/Cargo.toml
@@ -2,18 +2,18 @@
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 edition = "2021"
 name = "solana-bench-streamer"
-version = "1.10.9"
+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.9" }
-solana-streamer = { path = "../streamer", version = "=1.10.9" }
-solana-version = { path = "../version", version = "=1.10.9" }
+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"]
--- a/bench-tps/Cargo.toml
+++ b/bench-tps/Cargo.toml
@@ -2,7 +2,7 @@
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 edition = "2021"
 name = "solana-bench-tps"
-version = "1.10.9"
+version = "1.10.0"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
@@ -13,30 +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-clap-utils = { path = "../clap-utils", version = "=1.10.9" }
-solana-cli-config = { path = "../cli-config", version = "=1.10.9" }
-solana-client = { path = "../client", version = "=1.10.9" }
-solana-core = { path = "../core", version = "=1.10.9" }
-solana-faucet = { path = "../faucet", version = "=1.10.9" }
-solana-genesis = { path = "../genesis", version = "=1.10.9" }
-solana-gossip = { path = "../gossip", version = "=1.10.9" }
-solana-logger = { path = "../logger", version = "=1.10.9" }
-solana-measure = { path = "../measure", version = "=1.10.9" }
-solana-metrics = { path = "../metrics", version = "=1.10.9" }
-solana-net-utils = { path = "../net-utils", version = "=1.10.9" }
-solana-rpc = { path = "../rpc", version = "=1.10.9" }
-solana-runtime = { path = "../runtime", version = "=1.10.9" }
-solana-sdk = { path = "../sdk", version = "=1.10.9" }
-solana-streamer = { path = "../streamer", version = "=1.10.9" }
-solana-version = { path = "../version", version = "=1.10.9" }
-thiserror = "1.0"
+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.9" }
-solana-test-validator = { path = "../test-validator", version = "=1.10.9" }
+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"]
--- a/bench-tps/src/bench.rs
+++ b/bench-tps/src/bench.rs
@@ -1,21 +1,19 @@
 use {
-    crate::{
-        bench_tps_client::*,
-        cli::Config,
-        perf_utils::{sample_txs, SampleStats},
-    },
+    crate::cli::Config,
    log::*,
    rayon::prelude::*,
+    solana_client::perf_utils::{sample_txs, SampleStats},
    solana_core::gen_keys::GenKeys,
+    solana_faucet::faucet::request_airdrop_transaction,
    solana_measure::measure::Measure,
    solana_metrics::{self, datapoint_info},
    solana_sdk::{
+        client::Client,
        clock::{DEFAULT_MS_PER_SLOT, DEFAULT_S_PER_SLOT, MAX_PROCESSING_AGE},
        commitment_config::CommitmentConfig,
        hash::Hash,
        instruction::{AccountMeta, Instruction},
        message::Message,
-        native_token::Sol,
        pubkey::Pubkey,
        signature::{Keypair, Signer},
        system_instruction, system_transaction,
@@ -24,6 +22,7 @@ use {
    },
    std::{
        collections::{HashSet, VecDeque},
+        net::SocketAddr,
        process::exit,
        sync::{
            atomic::{AtomicBool, AtomicIsize, AtomicUsize, Ordering},
@@ -39,9 +38,16 @@ const MAX_TX_QUEUE_AGE: u64 = (MAX_PROCESSING_AGE as f64 * DEFAULT_S_PER_SLOT) a

 pub const MAX_SPENDS_PER_TX: u64 = 4;

+#[derive(Debug)]
+pub enum BenchTpsError {
+    AirdropFailure,
+}
+
+pub type Result<T> = std::result::Result<T, BenchTpsError>;
+
 pub type SharedTransactions = Arc<RwLock<VecDeque<Vec<(Transaction, u64)>>>>;

-fn get_latest_blockhash<T: BenchTpsClient>(client: &T) -> Hash {
+fn get_latest_blockhash<T: Client>(client: &T) -> Hash {
    loop {
        match client.get_latest_blockhash_with_commitment(CommitmentConfig::processed()) {
            Ok((blockhash, _)) => return blockhash,
@@ -55,7 +61,7 @@ fn get_latest_blockhash<T: BenchTpsClient>(client: &T) -> Hash {

 fn wait_for_target_slots_per_epoch<T>(target_slots_per_epoch: u64, client: &Arc<T>)
 where
-    T: 'static + BenchTpsClient + Send + Sync,
+    T: 'static + Client + Send + Sync,
 {
    if target_slots_per_epoch != 0 {
        info!(
@@ -85,7 +91,7 @@ fn create_sampler_thread<T>(
    maxes: &Arc<RwLock<Vec<(String, SampleStats)>>>,
 ) -> JoinHandle<()>
 where
-    T: 'static + BenchTpsClient + Send + Sync,
+    T: 'static + Client + Send + Sync,
 {
    info!("Sampling TPS every {} second...", sample_period);
    let exit_signal = exit_signal.clone();
@@ -104,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,
@@ -163,7 +169,7 @@ fn create_sender_threads<T>(
    shared_tx_active_thread_count: &Arc<AtomicIsize>,
 ) -> Vec<JoinHandle<()>>
 where
-    T: 'static + BenchTpsClient + Send + Sync,
+    T: 'static + Client + Send + Sync,
 {
    (0..threads)
        .map(|_| {
@@ -191,7 +197,7 @@ where

 pub fn do_bench_tps<T>(client: Arc<T>, config: Config, gen_keypairs: Vec<Keypair>) -> u64
 where
-    T: 'static + BenchTpsClient + Send + Sync,
+    T: 'static + Client + Send + Sync,
 {
    let Config {
        id,
@@ -385,7 +391,7 @@ fn generate_txs(
    }
 }

-fn get_new_latest_blockhash<T: BenchTpsClient>(client: &Arc<T>, blockhash: &Hash) -> Option<Hash> {
+fn get_new_latest_blockhash<T: Client>(client: &Arc<T>, blockhash: &Hash) -> Option<Hash> {
    let start = Instant::now();
    while start.elapsed().as_secs() < 5 {
        if let Ok(new_blockhash) = client.get_latest_blockhash() {
@@ -401,7 +407,7 @@ fn get_new_latest_blockhash<T: BenchTpsClient>(client: &Arc<T>, blockhash: &Hash
    None
 }

-fn poll_blockhash<T: BenchTpsClient>(
+fn poll_blockhash<T: Client>(
    exit_signal: &Arc<AtomicBool>,
    blockhash: &Arc<RwLock<Hash>>,
    client: &Arc<T>,
@@ -443,7 +449,7 @@ fn poll_blockhash<T: BenchTpsClient>(
    }
 }

-fn do_tx_transfers<T: BenchTpsClient>(
+fn do_tx_transfers<T: Client>(
    exit_signal: &Arc<AtomicBool>,
    shared_txs: &SharedTransactions,
    shared_tx_thread_count: &Arc<AtomicIsize>,
@@ -461,11 +467,14 @@ fn do_tx_transfers<T: BenchTpsClient>(
        };
        if let Some(txs0) = txs {
            shared_tx_thread_count.fetch_add(1, Ordering::Relaxed);
-            info!("Transferring 1 unit {} times...", txs0.len());
+            info!(
+                "Transferring 1 unit {} times... to {}",
+                txs0.len(),
+                client.as_ref().tpu_addr(),
+            );
            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
@@ -474,13 +483,10 @@ fn do_tx_transfers<T: BenchTpsClient>(
                    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.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();
@@ -504,11 +510,7 @@ fn do_tx_transfers<T: BenchTpsClient>(
    }
 }

-fn verify_funding_transfer<T: BenchTpsClient>(
-    client: &Arc<T>,
-    tx: &Transaction,
-    amount: u64,
-) -> bool {
+fn verify_funding_transfer<T: Client>(client: &Arc<T>, tx: &Transaction, amount: u64) -> bool {
    for a in &tx.message().account_keys[1..] {
        match client.get_balance_with_commitment(a, CommitmentConfig::processed()) {
            Ok(balance) => return balance >= amount,
@@ -519,7 +521,7 @@ fn verify_funding_transfer<T: BenchTpsClient>(
 }

 trait FundingTransactions<'a> {
-    fn fund<T: 'static + BenchTpsClient + Send + Sync>(
+    fn fund<T: 'static + Client + Send + Sync>(
        &mut self,
        client: &Arc<T>,
        to_fund: &[(&'a Keypair, Vec<(Pubkey, u64)>)],
@@ -527,16 +529,12 @@ trait FundingTransactions<'a> {
    );
    fn make(&mut self, to_fund: &[(&'a Keypair, Vec<(Pubkey, u64)>)]);
    fn sign(&mut self, blockhash: Hash);
-    fn send<T: BenchTpsClient>(&self, client: &Arc<T>);
-    fn verify<T: 'static + BenchTpsClient + Send + Sync>(
-        &mut self,
-        client: &Arc<T>,
-        to_lamports: u64,
-    );
+    fn send<T: Client>(&self, client: &Arc<T>);
+    fn verify<T: 'static + Client + Send + Sync>(&mut self, client: &Arc<T>, to_lamports: u64);
 }

 impl<'a> FundingTransactions<'a> for Vec<(&'a Keypair, Transaction)> {
-    fn fund<T: 'static + BenchTpsClient + Send + Sync>(
+    fn fund<T: 'static + Client + Send + Sync>(
        &mut self,
        client: &Arc<T>,
        to_fund: &[(&'a Keypair, Vec<(Pubkey, u64)>)],
@@ -605,20 +603,16 @@ impl<'a> FundingTransactions<'a> for Vec<(&'a Keypair, Transaction)> {
        debug!("sign {} txs: {}us", self.len(), sign_txs.as_us());
    }

-    fn send<T: BenchTpsClient>(&self, client: &Arc<T>) {
+    fn send<T: Client>(&self, client: &Arc<T>) {
        let mut send_txs = Measure::start("send_txs");
        self.iter().for_each(|(_, tx)| {
-            client.send_transaction(tx.clone()).expect("transfer");
+            client.async_send_transaction(tx.clone()).expect("transfer");
        });
        send_txs.stop();
        debug!("send {} txs: {}us", self.len(), send_txs.as_us());
    }

-    fn verify<T: 'static + BenchTpsClient + Send + Sync>(
-        &mut self,
-        client: &Arc<T>,
-        to_lamports: u64,
-    ) {
+    fn verify<T: 'static + Client + Send + Sync>(&mut self, client: &Arc<T>, to_lamports: u64) {
        let starting_txs = self.len();
        let verified_txs = Arc::new(AtomicUsize::new(0));
        let too_many_failures = Arc::new(AtomicBool::new(false));
@@ -693,7 +687,7 @@ impl<'a> FundingTransactions<'a> for Vec<(&'a Keypair, Transaction)> {
 /// fund the dests keys by spending all of the source keys into MAX_SPENDS_PER_TX
 /// on every iteration.  This allows us to replay the transfers because the source is either empty,
 /// or full
-pub fn fund_keys<T: 'static + BenchTpsClient + Send + Sync>(
+pub fn fund_keys<T: 'static + Client + Send + Sync>(
    client: Arc<T>,
    source: &Keypair,
    dests: &[Keypair],
@@ -735,6 +729,75 @@ pub fn fund_keys<T: 'static + BenchTpsClient + Send + Sync>(
    }
 }

+pub fn airdrop_lamports<T: Client>(
+    client: &T,
+    faucet_addr: &SocketAddr,
+    id: &Keypair,
+    desired_balance: u64,
+) -> Result<()> {
+    let starting_balance = client.get_balance(&id.pubkey()).unwrap_or(0);
+    metrics_submit_lamport_balance(starting_balance);
+    info!("starting balance {}", starting_balance);
+
+    if starting_balance < desired_balance {
+        let airdrop_amount = desired_balance - starting_balance;
+        info!(
+            "Airdropping {:?} lamports from {} for {}",
+            airdrop_amount,
+            faucet_addr,
+            id.pubkey(),
+        );
+
+        let blockhash = get_latest_blockhash(client);
+        match request_airdrop_transaction(faucet_addr, &id.pubkey(), airdrop_amount, blockhash) {
+            Ok(transaction) => {
+                let mut tries = 0;
+                loop {
+                    tries += 1;
+                    let signature = client.async_send_transaction(transaction.clone()).unwrap();
+                    let result = client.poll_for_signature_confirmation(&signature, 1);
+
+                    if result.is_ok() {
+                        break;
+                    }
+                    if tries >= 5 {
+                        panic!(
+                            "Error requesting airdrop: to addr: {:?} amount: {} {:?}",
+                            faucet_addr, airdrop_amount, result
+                        )
+                    }
+                }
+            }
+            Err(err) => {
+                panic!(
+                    "Error requesting airdrop: {:?} to addr: {:?} amount: {}",
+                    err, faucet_addr, airdrop_amount
+                );
+            }
+        };
+
+        let current_balance = client
+            .get_balance_with_commitment(&id.pubkey(), CommitmentConfig::processed())
+            .unwrap_or_else(|e| {
+                info!("airdrop error {}", e);
+                starting_balance
+            });
+        info!("current balance {}...", current_balance);
+
+        metrics_submit_lamport_balance(current_balance);
+        if current_balance - starting_balance != airdrop_amount {
+            info!(
+                "Airdrop failed! {} {} {}",
+                id.pubkey(),
+                current_balance,
+                starting_balance
+            );
+            return Err(BenchTpsError::AirdropFailure);
+        }
+    }
+    Ok(())
+}
+
 fn compute_and_report_stats(
    maxes: &Arc<RwLock<Vec<(String, SampleStats)>>>,
    sample_period: u64,
@@ -818,33 +881,15 @@ pub fn generate_keypairs(seed_keypair: &Keypair, count: u64) -> (Vec<Keypair>, u
    (rnd.gen_n_keypairs(total_keys), extra)
 }

-pub fn generate_and_fund_keypairs<T: 'static + BenchTpsClient + Send + Sync>(
+pub fn generate_and_fund_keypairs<T: 'static + Client + Send + Sync>(
    client: Arc<T>,
+    faucet_addr: Option<SocketAddr>,
    funding_key: &Keypair,
    keypair_count: usize,
    lamports_per_account: u64,
 ) -> Result<Vec<Keypair>> {
-    let rent = client.get_minimum_balance_for_rent_exemption(0)?;
-    let lamports_per_account = lamports_per_account + rent;
-
    info!("Creating {} keypairs...", keypair_count);
    let (mut keypairs, extra) = generate_keypairs(funding_key, keypair_count as u64);
-    fund_keypairs(client, funding_key, &keypairs, extra, lamports_per_account)?;
-
-    // 'generate_keypairs' generates extra keys to be able to have size-aligned funding batches for fund_keys.
-    keypairs.truncate(keypair_count);
-
-    Ok(keypairs)
-}
-
-pub fn fund_keypairs<T: 'static + BenchTpsClient + Send + Sync>(
-    client: Arc<T>,
-    funding_key: &Keypair,
-    keypairs: &[Keypair],
-    extra: u64,
-    lamports_per_account: u64,
-) -> Result<()> {
-    let rent = client.get_minimum_balance_for_rent_exemption(0)?;
    info!("Get lamports...");

    // Sample the first keypair, to prevent lamport loss on repeated solana-bench-tps executions
@@ -852,7 +897,7 @@ pub fn fund_keypairs<T: 'static + BenchTpsClient + Send + Sync>(
    let first_keypair_balance = client.get_balance(&first_key).unwrap_or(0);

    // Sample the last keypair, to check if funding was already completed
-    let last_key = keypairs[keypairs.len() - 1].pubkey();
+    let last_key = keypairs[keypair_count - 1].pubkey();
    let last_keypair_balance = client.get_balance(&last_key).unwrap_or(0);

    // Repeated runs will eat up keypair balances from transaction fees. In order to quickly
@@ -881,35 +926,24 @@ pub fn fund_keypairs<T: 'static + BenchTpsClient + Send + Sync>(
            funding_key_balance, max_fee, lamports_per_account, extra, total
        );

-        if funding_key_balance < total + rent {
-            error!(
-                "funder has {}, needed {}",
-                Sol(funding_key_balance),
-                Sol(total)
-            );
-            let latest_blockhash = get_latest_blockhash(client.as_ref());
-            if client
-                .request_airdrop_with_blockhash(
-                    &funding_key.pubkey(),
-                    total + rent - funding_key_balance,
-                    &latest_blockhash,
-                )
-                .is_err()
-            {
-                return Err(BenchTpsError::AirdropFailure);
-            }
+        if client.get_balance(&funding_key.pubkey()).unwrap_or(0) < total {
+            airdrop_lamports(client.as_ref(), &faucet_addr.unwrap(), funding_key, total)?;
        }

        fund_keys(
            client,
            funding_key,
-            keypairs,
+            &keypairs,
            total,
            max_fee,
            lamports_per_account,
        );
    }
-    Ok(())
+
+    // 'generate_keypairs' generates extra keys to be able to have size-aligned funding batches for fund_keys.
+    keypairs.truncate(keypair_count);
+
+    Ok(keypairs)
 }

 #[cfg(test)]
@@ -918,14 +952,14 @@ mod tests {
        super::*,
        solana_runtime::{bank::Bank, bank_client::BankClient},
        solana_sdk::{
-            fee_calculator::FeeRateGovernor, genesis_config::create_genesis_config,
-            native_token::sol_to_lamports,
+            client::SyncClient, fee_calculator::FeeRateGovernor,
+            genesis_config::create_genesis_config,
        },
    };

    #[test]
    fn test_bench_tps_bank_client() {
-        let (genesis_config, id) = create_genesis_config(sol_to_lamports(10_000.0));
+        let (genesis_config, id) = create_genesis_config(10_000);
        let bank = Bank::new_for_tests(&genesis_config);
        let client = Arc::new(BankClient::new(bank));

@@ -938,49 +972,48 @@ mod tests {

        let keypair_count = config.tx_count * config.keypair_multiplier;
        let keypairs =
-            generate_and_fund_keypairs(client.clone(), &config.id, keypair_count, 20).unwrap();
+            generate_and_fund_keypairs(client.clone(), None, &config.id, keypair_count, 20)
+                .unwrap();

        do_bench_tps(client, config, keypairs);
    }

    #[test]
    fn test_bench_tps_fund_keys() {
-        let (genesis_config, id) = create_genesis_config(sol_to_lamports(10_000.0));
+        let (genesis_config, id) = create_genesis_config(10_000);
        let bank = Bank::new_for_tests(&genesis_config);
        let client = Arc::new(BankClient::new(bank));
        let keypair_count = 20;
        let lamports = 20;
-        let rent = client.get_minimum_balance_for_rent_exemption(0).unwrap();

        let keypairs =
-            generate_and_fund_keypairs(client.clone(), &id, keypair_count, lamports).unwrap();
+            generate_and_fund_keypairs(client.clone(), None, &id, keypair_count, lamports).unwrap();

        for kp in &keypairs {
            assert_eq!(
                client
                    .get_balance_with_commitment(&kp.pubkey(), CommitmentConfig::processed())
                    .unwrap(),
-                lamports + rent
+                lamports
            );
        }
    }

    #[test]
    fn test_bench_tps_fund_keys_with_fees() {
-        let (mut genesis_config, id) = create_genesis_config(sol_to_lamports(10_000.0));
+        let (mut genesis_config, id) = create_genesis_config(10_000);
        let fee_rate_governor = FeeRateGovernor::new(11, 0);
        genesis_config.fee_rate_governor = fee_rate_governor;
        let bank = Bank::new_for_tests(&genesis_config);
        let client = Arc::new(BankClient::new(bank));
        let keypair_count = 20;
        let lamports = 20;
-        let rent = client.get_minimum_balance_for_rent_exemption(0).unwrap();

        let keypairs =
-            generate_and_fund_keypairs(client.clone(), &id, keypair_count, lamports).unwrap();
+            generate_and_fund_keypairs(client.clone(), None, &id, keypair_count, lamports).unwrap();

        for kp in &keypairs {
-            assert_eq!(client.get_balance(&kp.pubkey()).unwrap(), lamports + rent);
+            assert_eq!(client.get_balance(&kp.pubkey()).unwrap(), lamports);
        }
    }
 }
--- a/bench-tps/src/bench_tps_client.rs
+++ b/bench-tps/src/bench_tps_client.rs
@@ -1,87 +0,0 @@
-use {
-    solana_client::{client_error::ClientError, tpu_client::TpuSenderError},
-    solana_sdk::{
-        commitment_config::CommitmentConfig, epoch_info::EpochInfo, hash::Hash, message::Message,
-        pubkey::Pubkey, signature::Signature, transaction::Transaction, transport::TransportError,
-    },
-    thiserror::Error,
-};
-
-#[derive(Error, Debug)]
-pub enum BenchTpsError {
-    #[error("Airdrop failure")]
-    AirdropFailure,
-    #[error("IO error: {0:?}")]
-    IoError(#[from] std::io::Error),
-    #[error("Client error: {0:?}")]
-    ClientError(#[from] ClientError),
-    #[error("TpuClient error: {0:?}")]
-    TpuSenderError(#[from] TpuSenderError),
-    #[error("Transport error: {0:?}")]
-    TransportError(#[from] TransportError),
-    #[error("Custom error: {0}")]
-    Custom(String),
-}
-
-pub(crate) type Result<T> = std::result::Result<T, BenchTpsError>;
-
-pub trait BenchTpsClient {
-    /// Send a signed transaction without confirmation
-    fn send_transaction(&self, transaction: Transaction) -> Result<Signature>;
-
-    /// Send a batch of signed transactions without confirmation.
-    fn send_batch(&self, transactions: Vec<Transaction>) -> Result<()>;
-
-    /// Get latest blockhash
-    fn get_latest_blockhash(&self) -> Result<Hash>;
-
-    /// Get latest blockhash and its last valid block height, using explicit commitment
-    fn get_latest_blockhash_with_commitment(
-        &self,
-        commitment_config: CommitmentConfig,
-    ) -> Result<(Hash, u64)>;
-
-    /// Get transaction count
-    fn get_transaction_count(&self) -> Result<u64>;
-
-    /// Get transaction count, using explicit commitment
-    fn get_transaction_count_with_commitment(
-        &self,
-        commitment_config: CommitmentConfig,
-    ) -> Result<u64>;
-
-    /// Get epoch info
-    fn get_epoch_info(&self) -> Result<EpochInfo>;
-
-    /// Get account balance
-    fn get_balance(&self, pubkey: &Pubkey) -> Result<u64>;
-
-    /// Get account balance, using explicit commitment
-    fn get_balance_with_commitment(
-        &self,
-        pubkey: &Pubkey,
-        commitment_config: CommitmentConfig,
-    ) -> Result<u64>;
-
-    /// Calculate the fee for a `Message`
-    fn get_fee_for_message(&self, message: &Message) -> Result<u64>;
-
-    /// Get the rent-exempt minimum for an account
-    fn get_minimum_balance_for_rent_exemption(&self, data_len: usize) -> Result<u64>;
-
-    /// Return the address of client
-    fn addr(&self) -> String;
-
-    /// Request, submit, and confirm an airdrop transaction
-    fn request_airdrop_with_blockhash(
-        &self,
-        pubkey: &Pubkey,
-        lamports: u64,
-        recent_blockhash: &Hash,
-    ) -> Result<Signature>;
-}
-
-mod bank_client;
-mod rpc_client;
-mod thin_client;
-mod tpu_client;
--- a/bench-tps/src/bench_tps_client/bank_client.rs
+++ b/bench-tps/src/bench_tps_client/bank_client.rs
@@ -1,85 +0,0 @@
-use {
-    crate::bench_tps_client::{BenchTpsClient, BenchTpsError, Result},
-    solana_runtime::bank_client::BankClient,
-    solana_sdk::{
-        client::{AsyncClient, SyncClient},
-        commitment_config::CommitmentConfig,
-        epoch_info::EpochInfo,
-        hash::Hash,
-        message::Message,
-        pubkey::Pubkey,
-        signature::Signature,
-        transaction::Transaction,
-    },
-};
-
-impl BenchTpsClient for BankClient {
-    fn send_transaction(&self, transaction: Transaction) -> Result<Signature> {
-        AsyncClient::async_send_transaction(self, transaction).map_err(|err| err.into())
-    }
-    fn send_batch(&self, transactions: Vec<Transaction>) -> Result<()> {
-        AsyncClient::async_send_batch(self, transactions).map_err(|err| err.into())
-    }
-    fn get_latest_blockhash(&self) -> Result<Hash> {
-        SyncClient::get_latest_blockhash(self).map_err(|err| err.into())
-    }
-
-    fn get_latest_blockhash_with_commitment(
-        &self,
-        commitment_config: CommitmentConfig,
-    ) -> Result<(Hash, u64)> {
-        SyncClient::get_latest_blockhash_with_commitment(self, commitment_config)
-            .map_err(|err| err.into())
-    }
-
-    fn get_transaction_count(&self) -> Result<u64> {
-        SyncClient::get_transaction_count(self).map_err(|err| err.into())
-    }
-
-    fn get_transaction_count_with_commitment(
-        &self,
-        commitment_config: CommitmentConfig,
-    ) -> Result<u64> {
-        SyncClient::get_transaction_count_with_commitment(self, commitment_config)
-            .map_err(|err| err.into())
-    }
-
-    fn get_epoch_info(&self) -> Result<EpochInfo> {
-        SyncClient::get_epoch_info(self).map_err(|err| err.into())
-    }
-
-    fn get_balance(&self, pubkey: &Pubkey) -> Result<u64> {
-        SyncClient::get_balance(self, pubkey).map_err(|err| err.into())
-    }
-
-    fn get_balance_with_commitment(
-        &self,
-        pubkey: &Pubkey,
-        commitment_config: CommitmentConfig,
-    ) -> Result<u64> {
-        SyncClient::get_balance_with_commitment(self, pubkey, commitment_config)
-            .map_err(|err| err.into())
-    }
-
-    fn get_fee_for_message(&self, message: &Message) -> Result<u64> {
-        SyncClient::get_fee_for_message(self, message).map_err(|err| err.into())
-    }
-
-    fn get_minimum_balance_for_rent_exemption(&self, data_len: usize) -> Result<u64> {
-        SyncClient::get_minimum_balance_for_rent_exemption(self, data_len).map_err(|err| err.into())
-    }
-
-    fn addr(&self) -> String {
-        "Local BankClient".to_string()
-    }
-
-    fn request_airdrop_with_blockhash(
-        &self,
-        _pubkey: &Pubkey,
-        _lamports: u64,
-        _recent_blockhash: &Hash,
-    ) -> Result<Signature> {
-        // BankClient doesn't support airdrops
-        Err(BenchTpsError::AirdropFailure)
-    }
-}
--- a/bench-tps/src/bench_tps_client/rpc_client.rs
+++ b/bench-tps/src/bench_tps_client/rpc_client.rs
@@ -1,83 +0,0 @@
-use {
-    crate::bench_tps_client::{BenchTpsClient, Result},
-    solana_client::rpc_client::RpcClient,
-    solana_sdk::{
-        commitment_config::CommitmentConfig, epoch_info::EpochInfo, hash::Hash, message::Message,
-        pubkey::Pubkey, signature::Signature, transaction::Transaction,
-    },
-};
-
-impl BenchTpsClient for RpcClient {
-    fn send_transaction(&self, transaction: Transaction) -> Result<Signature> {
-        RpcClient::send_transaction(self, &transaction).map_err(|err| err.into())
-    }
-    fn send_batch(&self, transactions: Vec<Transaction>) -> Result<()> {
-        for transaction in transactions {
-            BenchTpsClient::send_transaction(self, transaction)?;
-        }
-        Ok(())
-    }
-    fn get_latest_blockhash(&self) -> Result<Hash> {
-        RpcClient::get_latest_blockhash(self).map_err(|err| err.into())
-    }
-
-    fn get_latest_blockhash_with_commitment(
-        &self,
-        commitment_config: CommitmentConfig,
-    ) -> Result<(Hash, u64)> {
-        RpcClient::get_latest_blockhash_with_commitment(self, commitment_config)
-            .map_err(|err| err.into())
-    }
-
-    fn get_transaction_count(&self) -> Result<u64> {
-        RpcClient::get_transaction_count(self).map_err(|err| err.into())
-    }
-
-    fn get_transaction_count_with_commitment(
-        &self,
-        commitment_config: CommitmentConfig,
-    ) -> Result<u64> {
-        RpcClient::get_transaction_count_with_commitment(self, commitment_config)
-            .map_err(|err| err.into())
-    }
-
-    fn get_epoch_info(&self) -> Result<EpochInfo> {
-        RpcClient::get_epoch_info(self).map_err(|err| err.into())
-    }
-
-    fn get_balance(&self, pubkey: &Pubkey) -> Result<u64> {
-        RpcClient::get_balance(self, pubkey).map_err(|err| err.into())
-    }
-
-    fn get_balance_with_commitment(
-        &self,
-        pubkey: &Pubkey,
-        commitment_config: CommitmentConfig,
-    ) -> Result<u64> {
-        RpcClient::get_balance_with_commitment(self, pubkey, commitment_config)
-            .map(|res| res.value)
-            .map_err(|err| err.into())
-    }
-
-    fn get_fee_for_message(&self, message: &Message) -> Result<u64> {
-        RpcClient::get_fee_for_message(self, message).map_err(|err| err.into())
-    }
-
-    fn get_minimum_balance_for_rent_exemption(&self, data_len: usize) -> Result<u64> {
-        RpcClient::get_minimum_balance_for_rent_exemption(self, data_len).map_err(|err| err.into())
-    }
-
-    fn addr(&self) -> String {
-        self.url()
-    }
-
-    fn request_airdrop_with_blockhash(
-        &self,
-        pubkey: &Pubkey,
-        lamports: u64,
-        recent_blockhash: &Hash,
-    ) -> Result<Signature> {
-        RpcClient::request_airdrop_with_blockhash(self, pubkey, lamports, recent_blockhash)
-            .map_err(|err| err.into())
-    }
-}
--- a/bench-tps/src/bench_tps_client/thin_client.rs
+++ b/bench-tps/src/bench_tps_client/thin_client.rs
@@ -1,86 +0,0 @@
-use {
-    crate::bench_tps_client::{BenchTpsClient, Result},
-    solana_client::thin_client::ThinClient,
-    solana_sdk::{
-        client::{AsyncClient, Client, SyncClient},
-        commitment_config::CommitmentConfig,
-        epoch_info::EpochInfo,
-        hash::Hash,
-        message::Message,
-        pubkey::Pubkey,
-        signature::Signature,
-        transaction::Transaction,
-    },
-};
-
-impl BenchTpsClient for ThinClient {
-    fn send_transaction(&self, transaction: Transaction) -> Result<Signature> {
-        AsyncClient::async_send_transaction(self, transaction).map_err(|err| err.into())
-    }
-    fn send_batch(&self, transactions: Vec<Transaction>) -> Result<()> {
-        AsyncClient::async_send_batch(self, transactions).map_err(|err| err.into())
-    }
-    fn get_latest_blockhash(&self) -> Result<Hash> {
-        SyncClient::get_latest_blockhash(self).map_err(|err| err.into())
-    }
-
-    fn get_latest_blockhash_with_commitment(
-        &self,
-        commitment_config: CommitmentConfig,
-    ) -> Result<(Hash, u64)> {
-        SyncClient::get_latest_blockhash_with_commitment(self, commitment_config)
-            .map_err(|err| err.into())
-    }
-
-    fn get_transaction_count(&self) -> Result<u64> {
-        SyncClient::get_transaction_count(self).map_err(|err| err.into())
-    }
-
-    fn get_transaction_count_with_commitment(
-        &self,
-        commitment_config: CommitmentConfig,
-    ) -> Result<u64> {
-        SyncClient::get_transaction_count_with_commitment(self, commitment_config)
-            .map_err(|err| err.into())
-    }
-
-    fn get_epoch_info(&self) -> Result<EpochInfo> {
-        SyncClient::get_epoch_info(self).map_err(|err| err.into())
-    }
-
-    fn get_balance(&self, pubkey: &Pubkey) -> Result<u64> {
-        SyncClient::get_balance(self, pubkey).map_err(|err| err.into())
-    }
-
-    fn get_balance_with_commitment(
-        &self,
-        pubkey: &Pubkey,
-        commitment_config: CommitmentConfig,
-    ) -> Result<u64> {
-        SyncClient::get_balance_with_commitment(self, pubkey, commitment_config)
-            .map_err(|err| err.into())
-    }
-
-    fn get_fee_for_message(&self, message: &Message) -> Result<u64> {
-        SyncClient::get_fee_for_message(self, message).map_err(|err| err.into())
-    }
-
-    fn get_minimum_balance_for_rent_exemption(&self, data_len: usize) -> Result<u64> {
-        SyncClient::get_minimum_balance_for_rent_exemption(self, data_len).map_err(|err| err.into())
-    }
-
-    fn addr(&self) -> String {
-        Client::tpu_addr(self)
-    }
-
-    fn request_airdrop_with_blockhash(
-        &self,
-        pubkey: &Pubkey,
-        lamports: u64,
-        recent_blockhash: &Hash,
-    ) -> Result<Signature> {
-        self.rpc_client()
-            .request_airdrop_with_blockhash(pubkey, lamports, recent_blockhash)
-            .map_err(|err| err.into())
-    }
-}
--- a/bench-tps/src/bench_tps_client/tpu_client.rs
+++ b/bench-tps/src/bench_tps_client/tpu_client.rs
@@ -1,99 +0,0 @@
-use {
-    crate::bench_tps_client::{BenchTpsClient, Result},
-    solana_client::tpu_client::TpuClient,
-    solana_sdk::{
-        commitment_config::CommitmentConfig, epoch_info::EpochInfo, hash::Hash, message::Message,
-        pubkey::Pubkey, signature::Signature, transaction::Transaction,
-    },
-};
-
-impl BenchTpsClient for TpuClient {
-    fn send_transaction(&self, transaction: Transaction) -> Result<Signature> {
-        let signature = transaction.signatures[0];
-        self.try_send_transaction(&transaction)?;
-        Ok(signature)
-    }
-    fn send_batch(&self, transactions: Vec<Transaction>) -> Result<()> {
-        for transaction in transactions {
-            BenchTpsClient::send_transaction(self, transaction)?;
-        }
-        Ok(())
-    }
-    fn get_latest_blockhash(&self) -> Result<Hash> {
-        self.rpc_client()
-            .get_latest_blockhash()
-            .map_err(|err| err.into())
-    }
-
-    fn get_latest_blockhash_with_commitment(
-        &self,
-        commitment_config: CommitmentConfig,
-    ) -> Result<(Hash, u64)> {
-        self.rpc_client()
-            .get_latest_blockhash_with_commitment(commitment_config)
-            .map_err(|err| err.into())
-    }
-
-    fn get_transaction_count(&self) -> Result<u64> {
-        self.rpc_client()
-            .get_transaction_count()
-            .map_err(|err| err.into())
-    }
-
-    fn get_transaction_count_with_commitment(
-        &self,
-        commitment_config: CommitmentConfig,
-    ) -> Result<u64> {
-        self.rpc_client()
-            .get_transaction_count_with_commitment(commitment_config)
-            .map_err(|err| err.into())
-    }
-
-    fn get_epoch_info(&self) -> Result<EpochInfo> {
-        self.rpc_client().get_epoch_info().map_err(|err| err.into())
-    }
-
-    fn get_balance(&self, pubkey: &Pubkey) -> Result<u64> {
-        self.rpc_client()
-            .get_balance(pubkey)
-            .map_err(|err| err.into())
-    }
-
-    fn get_balance_with_commitment(
-        &self,
-        pubkey: &Pubkey,
-        commitment_config: CommitmentConfig,
-    ) -> Result<u64> {
-        self.rpc_client()
-            .get_balance_with_commitment(pubkey, commitment_config)
-            .map(|res| res.value)
-            .map_err(|err| err.into())
-    }
-
-    fn get_fee_for_message(&self, message: &Message) -> Result<u64> {
-        self.rpc_client()
-            .get_fee_for_message(message)
-            .map_err(|err| err.into())
-    }
-
-    fn get_minimum_balance_for_rent_exemption(&self, data_len: usize) -> Result<u64> {
-        self.rpc_client()
-            .get_minimum_balance_for_rent_exemption(data_len)
-            .map_err(|err| err.into())
-    }
-
-    fn addr(&self) -> String {
-        self.rpc_client().url()
-    }
-
-    fn request_airdrop_with_blockhash(
-        &self,
-        pubkey: &Pubkey,
-        lamports: u64,
-        recent_blockhash: &Hash,
-    ) -> Result<Signature> {
-        self.rpc_client()
-            .request_airdrop_with_blockhash(pubkey, lamports, recent_blockhash)
-            .map_err(|err| err.into())
-    }
-}
--- a/bench-tps/src/cli.rs
+++ b/bench-tps/src/cli.rs
@@ -1,7 +1,6 @@
 use {
    clap::{crate_description, crate_name, App, Arg, ArgMatches},
-    solana_clap_utils::input_validators::{is_url, is_url_or_moniker},
-    solana_cli_config::{ConfigInput, CONFIG_FILE},
+    solana_faucet::faucet::FAUCET_PORT,
    solana_sdk::{
        fee_calculator::FeeRateGovernor,
        pubkey::Pubkey,
@@ -12,28 +11,10 @@ use {

 const NUM_LAMPORTS_PER_ACCOUNT_DEFAULT: u64 = solana_sdk::native_token::LAMPORTS_PER_SOL;

-pub enum ExternalClientType {
-    // Submits transactions to an Rpc node using an RpcClient
-    RpcClient,
-    // Submits transactions directly to leaders using a ThinClient, broadcasting to multiple
-    // leaders when num_nodes > 1
-    ThinClient,
-    // Submits transactions directly to leaders using a TpuClient, broadcasting to upcoming leaders
-    // via TpuClient default configuration
-    TpuClient,
-}
-
-impl Default for ExternalClientType {
-    fn default() -> Self {
-        Self::ThinClient
-    }
-}
-
 /// Holds the configuration for a single run of the benchmark
 pub struct Config {
    pub entrypoint_addr: SocketAddr,
-    pub json_rpc_url: String,
-    pub websocket_url: String,
+    pub faucet_addr: SocketAddr,
    pub id: Keypair,
    pub threads: usize,
    pub num_nodes: usize,
@@ -50,16 +31,13 @@ pub struct Config {
    pub num_lamports_per_account: u64,
    pub target_slots_per_epoch: u64,
    pub target_node: Option<Pubkey>,
-    pub external_client_type: ExternalClientType,
-    pub use_quic: bool,
 }

 impl Default for Config {
    fn default() -> Config {
        Config {
            entrypoint_addr: SocketAddr::from(([127, 0, 0, 1], 8001)),
-            json_rpc_url: ConfigInput::default().json_rpc_url,
-            websocket_url: ConfigInput::default().websocket_url,
+            faucet_addr: SocketAddr::from(([127, 0, 0, 1], FAUCET_PORT)),
            id: Keypair::new(),
            threads: 4,
            num_nodes: 1,
@@ -76,8 +54,6 @@ impl Default for Config {
            num_lamports_per_account: NUM_LAMPORTS_PER_ACCOUNT_DEFAULT,
            target_slots_per_epoch: 0,
            target_node: None,
-            external_client_type: ExternalClientType::default(),
-            use_quic: false,
        }
    }
 }
@@ -86,42 +62,6 @@ impl Default for Config {
 pub fn build_args<'a, 'b>(version: &'b str) -> App<'a, 'b> {
    App::new(crate_name!()).about(crate_description!())
        .version(version)
-        .arg({
-            let arg = Arg::with_name("config_file")
-                .short("C")
-                .long("config")
-                .value_name("FILEPATH")
-                .takes_value(true)
-                .global(true)
-                .help("Configuration file to use");
-            if let Some(ref config_file) = *CONFIG_FILE {
-                arg.default_value(config_file)
-            } else {
-                arg
-            }
-        })
-        .arg(
-            Arg::with_name("json_rpc_url")
-                .short("u")
-                .long("url")
-                .value_name("URL_OR_MONIKER")
-                .takes_value(true)
-                .global(true)
-                .validator(is_url_or_moniker)
-                .help(
-                    "URL for Solana's JSON RPC or moniker (or their first letter): \
-                       [mainnet-beta, testnet, devnet, localhost]",
-                ),
-        )
-        .arg(
-            Arg::with_name("websocket_url")
-                .long("ws")
-                .value_name("URL")
-                .takes_value(true)
-                .global(true)
-                .validator(is_url)
-                .help("WebSocket URL for the solana cluster"),
-        )
        .arg(
            Arg::with_name("entrypoint")
                .short("n")
@@ -136,8 +76,7 @@ pub fn build_args<'a, 'b>(version: &'b str) -> App<'a, 'b> {
                .long("faucet")
                .value_name("HOST:PORT")
                .takes_value(true)
-                .hidden(true)
-                .help("Deprecated. BenchTps no longer queries the faucet directly"),
+                .help("Location of the faucet; defaults to entrypoint:FAUCET_PORT"),
        )
        .arg(
            Arg::with_name("identity")
@@ -252,27 +191,6 @@ pub fn build_args<'a, 'b>(version: &'b str) -> App<'a, 'b> {
                    "Wait until epochs are this many slots long.",
                ),
        )
-        .arg(
-            Arg::with_name("rpc_client")
-                .long("use-rpc-client")
-                .conflicts_with("tpu_client")
-                .takes_value(false)
-                .help("Submit transactions with a RpcClient")
-        )
-        .arg(
-            Arg::with_name("tpu_client")
-                .long("use-tpu-client")
-                .conflicts_with("rpc_client")
-                .takes_value(false)
-                .help("Submit transactions with a TpuClient")
-        )
-        .arg(
-            Arg::with_name("tpu_use_quic")
-                .long("tpu-use-quic")
-                .takes_value(false)
-                .help("Submit transactions via QUIC; only affects ThinClient (default) \
-                    or TpuClient sends"),
-        )
 }

 /// Parses a clap `ArgMatches` structure into a `Config`
@@ -283,45 +201,6 @@ pub fn build_args<'a, 'b>(version: &'b str) -> App<'a, 'b> {
 pub fn extract_args(matches: &ArgMatches) -> Config {
    let mut args = Config::default();

-    let config = if let Some(config_file) = matches.value_of("config_file") {
-        solana_cli_config::Config::load(config_file).unwrap_or_default()
-    } else {
-        solana_cli_config::Config::default()
-    };
-    let (_, json_rpc_url) = ConfigInput::compute_json_rpc_url_setting(
-        matches.value_of("json_rpc_url").unwrap_or(""),
-        &config.json_rpc_url,
-    );
-    args.json_rpc_url = json_rpc_url;
-
-    let (_, websocket_url) = ConfigInput::compute_websocket_url_setting(
-        matches.value_of("websocket_url").unwrap_or(""),
-        &config.websocket_url,
-        matches.value_of("json_rpc_url").unwrap_or(""),
-        &config.json_rpc_url,
-    );
-    args.websocket_url = websocket_url;
-
-    let (_, id_path) = ConfigInput::compute_keypair_path_setting(
-        matches.value_of("identity").unwrap_or(""),
-        &config.keypair_path,
-    );
-    if let Ok(id) = read_keypair_file(id_path) {
-        args.id = id;
-    } else if matches.is_present("identity") {
-        panic!("could not parse identity path");
-    }
-
-    if matches.is_present("tpu_client") {
-        args.external_client_type = ExternalClientType::TpuClient;
-    } else if matches.is_present("rpc_client") {
-        args.external_client_type = ExternalClientType::RpcClient;
-    }
-
-    if matches.is_present("tpu_use_quic") {
-        args.use_quic = true;
-    }
-
    if let Some(addr) = matches.value_of("entrypoint") {
        args.entrypoint_addr = solana_net_utils::parse_host_port(addr).unwrap_or_else(|e| {
            eprintln!("failed to parse entrypoint address: {}", e);
@@ -329,6 +208,18 @@ pub fn extract_args(matches: &ArgMatches) -> Config {
        });
    }

+    if let Some(addr) = matches.value_of("faucet") {
+        args.faucet_addr = solana_net_utils::parse_host_port(addr).unwrap_or_else(|e| {
+            eprintln!("failed to parse faucet address: {}", e);
+            exit(1)
+        });
+    }
+
+    if matches.is_present("identity") {
+        args.id = read_keypair_file(matches.value_of("identity").unwrap())
+            .expect("can't read client identity");
+    }
+
    if let Some(t) = matches.value_of("threads") {
        args.threads = t.to_string().parse().expect("can't parse threads");
    }
--- a/bench-tps/src/keypairs.rs
+++ b/bench-tps/src/keypairs.rs
@@ -1,72 +0,0 @@
-use {
-    crate::{
-        bench::{fund_keypairs, generate_and_fund_keypairs},
-        bench_tps_client::BenchTpsClient,
-    },
-    log::*,
-    solana_genesis::Base64Account,
-    solana_sdk::signature::{Keypair, Signer},
-    std::{collections::HashMap, fs::File, path::Path, process::exit, sync::Arc},
-};
-
-pub fn get_keypairs<T>(
-    client: Arc<T>,
-    id: &Keypair,
-    keypair_count: usize,
-    num_lamports_per_account: u64,
-    client_ids_and_stake_file: &str,
-    read_from_client_file: bool,
-) -> Vec<Keypair>
-where
-    T: 'static + BenchTpsClient + Send + Sync,
-{
-    if read_from_client_file {
-        let path = Path::new(client_ids_and_stake_file);
-        let file = File::open(path).unwrap();
-
-        info!("Reading {}", client_ids_and_stake_file);
-        let accounts: HashMap<String, Base64Account> = serde_yaml::from_reader(file).unwrap();
-        let mut keypairs = vec![];
-        let mut last_balance = 0;
-
-        accounts
-            .into_iter()
-            .for_each(|(keypair, primordial_account)| {
-                let bytes: Vec<u8> = serde_json::from_str(keypair.as_str()).unwrap();
-                keypairs.push(Keypair::from_bytes(&bytes).unwrap());
-                last_balance = primordial_account.balance;
-            });
-
-        if keypairs.len() < keypair_count {
-            eprintln!(
-                "Expected {} accounts in {}, only received {} (--tx_count mismatch?)",
-                keypair_count,
-                client_ids_and_stake_file,
-                keypairs.len(),
-            );
-            exit(1);
-        }
-        // Sort keypairs so that do_bench_tps() uses the same subset of accounts for each run.
-        // This prevents the amount of storage needed for bench-tps accounts from creeping up
-        // across multiple runs.
-        keypairs.sort_by_key(|x| x.pubkey().to_string());
-        fund_keypairs(
-            client,
-            id,
-            &keypairs,
-            keypairs.len().saturating_sub(keypair_count) as u64,
-            last_balance,
-        )
-        .unwrap_or_else(|e| {
-            eprintln!("Error could not fund keys: {:?}", e);
-            exit(1);
-        });
-        keypairs
-    } else {
-        generate_and_fund_keypairs(client, id, keypair_count, num_lamports_per_account)
-            .unwrap_or_else(|e| {
-                eprintln!("Error could not fund keys: {:?}", e);
-                exit(1);
-            })
-    }
-}
--- a/bench-tps/src/lib.rs
+++ b/bench-tps/src/lib.rs
@@ -1,6 +1,3 @@
 #![allow(clippy::integer_arithmetic)]
 pub mod bench;
-pub mod bench_tps_client;
 pub mod cli;
-pub mod keypairs;
-mod perf_utils;
--- a/bench-tps/src/main.rs
+++ b/bench-tps/src/main.rs
@@ -2,19 +2,15 @@
 use {
    log::*,
    solana_bench_tps::{
-        bench::{do_bench_tps, generate_keypairs},
-        cli::{self, ExternalClientType},
-        keypairs::get_keypairs,
-    },
-    solana_client::{
-        connection_cache,
-        rpc_client::RpcClient,
-        tpu_client::{TpuClient, TpuClientConfig},
+        bench::{do_bench_tps, generate_and_fund_keypairs, generate_keypairs},
+        cli,
    },
    solana_genesis::Base64Account,
    solana_gossip::gossip_service::{discover_cluster, get_client, get_multi_client},
    solana_sdk::{
-        commitment_config::CommitmentConfig, fee_calculator::FeeRateGovernor, system_program,
+        fee_calculator::FeeRateGovernor,
+        signature::{Keypair, Signer},
+        system_program,
    },
    solana_streamer::socket::SocketAddrSpace,
    std::{collections::HashMap, fs::File, io::prelude::*, path::Path, process::exit, sync::Arc},
@@ -32,8 +28,7 @@ fn main() {

    let cli::Config {
        entrypoint_addr,
-        json_rpc_url,
-        websocket_url,
+        faucet_addr,
        id,
        num_nodes,
        tx_count,
@@ -45,8 +40,6 @@ fn main() {
        multi_client,
        num_lamports_per_account,
        target_node,
-        external_client_type,
-        use_quic,
        ..
    } = &cli_config;

@@ -82,93 +75,83 @@ fn main() {
    }

    info!("Connecting to the cluster");
+    let nodes = discover_cluster(entrypoint_addr, *num_nodes, SocketAddrSpace::Unspecified)
+        .unwrap_or_else(|err| {
+            eprintln!("Failed to discover {} nodes: {:?}", num_nodes, err);
+            exit(1);
+        });

-    match external_client_type {
-        ExternalClientType::RpcClient => {
-            let client = Arc::new(RpcClient::new_with_commitment(
-                json_rpc_url.to_string(),
-                CommitmentConfig::confirmed(),
-            ));
-            let keypairs = get_keypairs(
-                client.clone(),
-                id,
-                keypair_count,
-                *num_lamports_per_account,
-                client_ids_and_stake_file,
-                *read_from_client_file,
+    let client = if *multi_client {
+        let (client, num_clients) = get_multi_client(&nodes, &SocketAddrSpace::Unspecified);
+        if nodes.len() < num_clients {
+            eprintln!(
+                "Error: Insufficient nodes discovered.  Expecting {} or more",
+                num_nodes
            );
-            do_bench_tps(client, cli_config, keypairs);
+            exit(1);
        }
-        ExternalClientType::ThinClient => {
-            let nodes = discover_cluster(entrypoint_addr, *num_nodes, SocketAddrSpace::Unspecified)
-                .unwrap_or_else(|err| {
-                    eprintln!("Failed to discover {} nodes: {:?}", num_nodes, err);
-                    exit(1);
-                });
-            if *use_quic {
-                connection_cache::set_use_quic(true);
+        Arc::new(client)
+    } else if let Some(target_node) = target_node {
+        info!("Searching for target_node: {:?}", target_node);
+        let mut target_client = None;
+        for node in nodes {
+            if node.id == *target_node {
+                target_client = Some(Arc::new(get_client(&[node], &SocketAddrSpace::Unspecified)));
+                break;
            }
-            let client = if *multi_client {
-                let (client, num_clients) = get_multi_client(&nodes, &SocketAddrSpace::Unspecified);
-                if nodes.len() < num_clients {
-                    eprintln!(
-                        "Error: Insufficient nodes discovered.  Expecting {} or more",
-                        num_nodes
-                    );
-                    exit(1);
-                }
-                Arc::new(client)
-            } else if let Some(target_node) = target_node {
-                info!("Searching for target_node: {:?}", target_node);
-                let mut target_client = None;
-                for node in nodes {
-                    if node.id == *target_node {
-                        target_client =
-                            Some(Arc::new(get_client(&[node], &SocketAddrSpace::Unspecified)));
-                        break;
-                    }
-                }
-                target_client.unwrap_or_else(|| {
-                    eprintln!("Target node {} not found", target_node);
-                    exit(1);
-                })
-            } else {
-                Arc::new(get_client(&nodes, &SocketAddrSpace::Unspecified))
-            };
-            let keypairs = get_keypairs(
-                client.clone(),
-                id,
-                keypair_count,
-                *num_lamports_per_account,
-                client_ids_and_stake_file,
-                *read_from_client_file,
-            );
-            do_bench_tps(client, cli_config, keypairs);
        }
-        ExternalClientType::TpuClient => {
-            let rpc_client = Arc::new(RpcClient::new_with_commitment(
-                json_rpc_url.to_string(),
-                CommitmentConfig::confirmed(),
-            ));
-            if *use_quic {
-                connection_cache::set_use_quic(true);
-            }
-            let client = Arc::new(
-                TpuClient::new(rpc_client, websocket_url, TpuClientConfig::default())
-                    .unwrap_or_else(|err| {
-                        eprintln!("Could not create TpuClient {:?}", err);
-                        exit(1);
-                    }),
-            );
-            let keypairs = get_keypairs(
-                client.clone(),
-                id,
+        target_client.unwrap_or_else(|| {
+            eprintln!("Target node {} not found", target_node);
+            exit(1);
+        })
+    } else {
+        Arc::new(get_client(&nodes, &SocketAddrSpace::Unspecified))
+    };
+
+    let keypairs = if *read_from_client_file {
+        let path = Path::new(&client_ids_and_stake_file);
+        let file = File::open(path).unwrap();
+
+        info!("Reading {}", client_ids_and_stake_file);
+        let accounts: HashMap<String, Base64Account> = serde_yaml::from_reader(file).unwrap();
+        let mut keypairs = vec![];
+        let mut last_balance = 0;
+
+        accounts
+            .into_iter()
+            .for_each(|(keypair, primordial_account)| {
+                let bytes: Vec<u8> = serde_json::from_str(keypair.as_str()).unwrap();
+                keypairs.push(Keypair::from_bytes(&bytes).unwrap());
+                last_balance = primordial_account.balance;
+            });
+
+        if keypairs.len() < keypair_count {
+            eprintln!(
+                "Expected {} accounts in {}, only received {} (--tx_count mismatch?)",
                keypair_count,
-                *num_lamports_per_account,
                client_ids_and_stake_file,
-                *read_from_client_file,
+                keypairs.len(),
            );
-            do_bench_tps(client, cli_config, keypairs);
+            exit(1);
        }
-    }
+        // Sort keypairs so that do_bench_tps() uses the same subset of accounts for each run.
+        // This prevents the amount of storage needed for bench-tps accounts from creeping up
+        // across multiple runs.
+        keypairs.sort_by_key(|x| x.pubkey().to_string());
+        keypairs
+    } else {
+        generate_and_fund_keypairs(
+            client.clone(),
+            Some(*faucet_addr),
+            id,
+            keypair_count,
+            *num_lamports_per_account,
+        )
+        .unwrap_or_else(|e| {
+            eprintln!("Error could not fund keys: {:?}", e);
+            exit(1);
+        })
+    };
+
+    do_bench_tps(client, cli_config, keypairs);
 }
--- a/bench-tps/tests/bench_tps.rs
+++ b/bench-tps/tests/bench_tps.rs
@@ -6,24 +6,16 @@ use {
        bench::{do_bench_tps, generate_and_fund_keypairs},
        cli::Config,
    },
-    solana_client::{
-        rpc_client::RpcClient,
-        thin_client::create_client,
-        tpu_client::{TpuClient, TpuClientConfig},
-    },
+    solana_client::thin_client::create_client,
    solana_core::validator::ValidatorConfig,
-    solana_faucet::faucet::{run_local_faucet, run_local_faucet_with_port},
+    solana_faucet::faucet::run_local_faucet_with_port,
+    solana_gossip::cluster_info::VALIDATOR_PORT_RANGE,
    solana_local_cluster::{
        local_cluster::{ClusterConfig, LocalCluster},
        validator_configs::make_identical_validator_configs,
    },
-    solana_rpc::rpc::JsonRpcConfig,
-    solana_sdk::{
-        commitment_config::CommitmentConfig,
-        signature::{Keypair, Signer},
-    },
+    solana_sdk::signature::{Keypair, Signer},
    solana_streamer::socket::SocketAddrSpace,
-    solana_test_validator::TestValidator,
    std::{sync::Arc, time::Duration},
 };

@@ -31,34 +23,13 @@ fn test_bench_tps_local_cluster(config: Config) {
    let native_instruction_processors = vec![];

    solana_logger::setup();
-
-    let faucet_keypair = Keypair::new();
-    let faucet_pubkey = faucet_keypair.pubkey();
-    let (addr_sender, addr_receiver) = unbounded();
-    run_local_faucet_with_port(faucet_keypair, addr_sender, None, 0);
-    let faucet_addr = addr_receiver
-        .recv_timeout(Duration::from_secs(2))
-        .expect("run_local_faucet")
-        .expect("faucet_addr");
-
    const NUM_NODES: usize = 1;
-    let mut validator_config = ValidatorConfig::default_for_test();
-    validator_config.rpc_config = JsonRpcConfig {
-        faucet_addr: Some(faucet_addr),
-        ..JsonRpcConfig::default_for_test()
-    };
    let cluster = LocalCluster::new(
        &mut ClusterConfig {
            node_stakes: vec![999_990; NUM_NODES],
            cluster_lamports: 200_000_000,
            validator_configs: make_identical_validator_configs(
-                &ValidatorConfig {
-                    rpc_config: JsonRpcConfig {
-                        faucet_addr: Some(faucet_addr),
-                        ..JsonRpcConfig::default_for_test()
-                    },
-                    ..ValidatorConfig::default_for_test()
-                },
+                &ValidatorConfig::default_for_test(),
                NUM_NODES,
            ),
            native_instruction_processors,
@@ -67,55 +38,31 @@ fn test_bench_tps_local_cluster(config: Config) {
        SocketAddrSpace::Unspecified,
    );

-    cluster.transfer(&cluster.funding_keypair, &faucet_pubkey, 100_000_000);
+    let faucet_keypair = Keypair::new();
+    cluster.transfer(
+        &cluster.funding_keypair,
+        &faucet_keypair.pubkey(),
+        100_000_000,
+    );

-    let client = Arc::new(create_client((
-        cluster.entry_point_info.rpc,
-        cluster.entry_point_info.tpu,
-    )));
-
-    let lamports_per_account = 100;
-
-    let keypair_count = config.tx_count * config.keypair_multiplier;
-    let keypairs = generate_and_fund_keypairs(
-        client.clone(),
-        &config.id,
-        keypair_count,
-        lamports_per_account,
-    )
-    .unwrap();
-
-    let _total = do_bench_tps(client, config, keypairs);
-
-    #[cfg(not(debug_assertions))]
-    assert!(_total > 100);
-}
-
-fn test_bench_tps_test_validator(config: Config) {
-    solana_logger::setup();
-
-    let mint_keypair = Keypair::new();
-    let mint_pubkey = mint_keypair.pubkey();
-
-    let faucet_addr = run_local_faucet(mint_keypair, None);
-
-    let test_validator =
-        TestValidator::with_no_fees(mint_pubkey, Some(faucet_addr), SocketAddrSpace::Unspecified);
-
-    let rpc_client = Arc::new(RpcClient::new_with_commitment(
-        test_validator.rpc_url(),
-        CommitmentConfig::processed(),
+    let client = Arc::new(create_client(
+        (cluster.entry_point_info.rpc, cluster.entry_point_info.tpu),
+        VALIDATOR_PORT_RANGE,
    ));
-    let websocket_url = test_validator.rpc_pubsub_url();

-    let client =
-        Arc::new(TpuClient::new(rpc_client, &websocket_url, TpuClientConfig::default()).unwrap());
+    let (addr_sender, addr_receiver) = unbounded();
+    run_local_faucet_with_port(faucet_keypair, addr_sender, None, 0);
+    let faucet_addr = addr_receiver
+        .recv_timeout(Duration::from_secs(2))
+        .expect("run_local_faucet")
+        .expect("faucet_addr");

    let lamports_per_account = 100;

    let keypair_count = config.tx_count * config.keypair_multiplier;
    let keypairs = generate_and_fund_keypairs(
        client.clone(),
+        Some(faucet_addr),
        &config.id,
        keypair_count,
        lamports_per_account,
@@ -137,13 +84,3 @@ fn test_bench_tps_local_cluster_solana() {
        ..Config::default()
    });
 }
-
-#[test]
-#[serial]
-fn test_bench_tps_tpu_client() {
-    test_bench_tps_test_validator(Config {
-        tx_count: 100,
-        duration: Duration::from_secs(10),
-        ..Config::default()
-    });
-}
--- a/bloom/Cargo.toml
+++ b/bloom/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "solana-bloom"
-version = "1.10.9"
+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.9" }
-solana-frozen-abi-macro = { path = "../frozen-abi/macro", version = "=1.10.9" }
-solana-sdk = { path = "../sdk", version = "=1.10.9" }
+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"]
--- a/book/src/proposals/handle-duplicate-block.md
+++ b/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
--- a/bucket_map/Cargo.toml
+++ b/bucket_map/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "solana-bucket-map"
-version = "1.10.9"
+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.9" }
-solana-sdk = { path = "../sdk", version = "=1.10.9" }
 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.9" }
+solana-logger = { path = "../logger", version = "=1.10.0" }

 [lib]
 crate-type = ["lib"]
--- a/ci/buildkite-pipeline-in-disk.sh
+++ b/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
--- a/ci/buildkite-pipeline.sh
+++ b/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 \
--- a/ci/do-audit.sh
+++ b/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
--- a/ci/docker-rust-nightly/Dockerfile
+++ b/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 \
--- a/ci/docker-rust/Dockerfile
+++ b/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
--- a/ci/publish-crate.sh
+++ b/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
--- a/ci/rust-version.sh
+++ b/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


--- a/ci/test-checks.sh
+++ b/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
--- a/clap-utils/Cargo.toml
+++ b/clap-utils/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "solana-clap-utils"
-version = "1.10.9"
+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.9" }
-solana-remote-wallet = { path = "../remote-wallet", version = "=1.10.9", default-features = false }
-solana-sdk = { path = "../sdk", version = "=1.10.9" }
+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"
--- a/clap-utils/src/keypair.rs
+++ b/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: ",
--- a/cli-config/Cargo.toml
+++ b/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.9"
+version = "1.10.0"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
@@ -15,12 +15,10 @@ lazy_static = "1.4.0"
 serde = "1.0.136"
 serde_derive = "1.0.103"
 serde_yaml = "0.8.23"
-solana-clap-utils = { path = "../clap-utils", version = "=1.10.9" }
-solana-sdk = { path = "../sdk", version = "=1.10.9" }
 url = "2.2.2"

 [dev-dependencies]
-anyhow = "1.0.56"
+anyhow = "1.0.53"

 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
--- a/cli-config/src/config_input.rs
+++ b/cli-config/src/config_input.rs
@@ -1,126 +0,0 @@
-use {
-    crate::Config, solana_clap_utils::input_validators::normalize_to_url_if_moniker,
-    solana_sdk::commitment_config::CommitmentConfig, std::str::FromStr,
-};
-
-pub enum SettingType {
-    Explicit,
-    Computed,
-    SystemDefault,
-}
-
-pub struct ConfigInput {
-    pub json_rpc_url: String,
-    pub websocket_url: String,
-    pub keypair_path: String,
-    pub commitment: CommitmentConfig,
-}
-
-impl ConfigInput {
-    fn default_keypair_path() -> String {
-        Config::default().keypair_path
-    }
-
-    fn default_json_rpc_url() -> String {
-        Config::default().json_rpc_url
-    }
-
-    fn default_websocket_url() -> String {
-        Config::default().websocket_url
-    }
-
-    fn default_commitment() -> CommitmentConfig {
-        CommitmentConfig::confirmed()
-    }
-
-    fn first_nonempty_setting(
-        settings: std::vec::Vec<(SettingType, String)>,
-    ) -> (SettingType, String) {
-        settings
-            .into_iter()
-            .find(|(_, value)| !value.is_empty())
-            .expect("no nonempty setting")
-    }
-
-    fn first_setting_is_some<T>(
-        settings: std::vec::Vec<(SettingType, Option<T>)>,
-    ) -> (SettingType, T) {
-        let (setting_type, setting_option) = settings
-            .into_iter()
-            .find(|(_, value)| value.is_some())
-            .expect("all settings none");
-        (setting_type, setting_option.unwrap())
-    }
-
-    pub fn compute_websocket_url_setting(
-        websocket_cmd_url: &str,
-        websocket_cfg_url: &str,
-        json_rpc_cmd_url: &str,
-        json_rpc_cfg_url: &str,
-    ) -> (SettingType, String) {
-        Self::first_nonempty_setting(vec![
-            (SettingType::Explicit, websocket_cmd_url.to_string()),
-            (SettingType::Explicit, websocket_cfg_url.to_string()),
-            (
-                SettingType::Computed,
-                Config::compute_websocket_url(&normalize_to_url_if_moniker(json_rpc_cmd_url)),
-            ),
-            (
-                SettingType::Computed,
-                Config::compute_websocket_url(&normalize_to_url_if_moniker(json_rpc_cfg_url)),
-            ),
-            (SettingType::SystemDefault, Self::default_websocket_url()),
-        ])
-    }
-
-    pub fn compute_json_rpc_url_setting(
-        json_rpc_cmd_url: &str,
-        json_rpc_cfg_url: &str,
-    ) -> (SettingType, String) {
-        let (setting_type, url_or_moniker) = Self::first_nonempty_setting(vec![
-            (SettingType::Explicit, json_rpc_cmd_url.to_string()),
-            (SettingType::Explicit, json_rpc_cfg_url.to_string()),
-            (SettingType::SystemDefault, Self::default_json_rpc_url()),
-        ]);
-        (setting_type, normalize_to_url_if_moniker(&url_or_moniker))
-    }
-
-    pub fn compute_keypair_path_setting(
-        keypair_cmd_path: &str,
-        keypair_cfg_path: &str,
-    ) -> (SettingType, String) {
-        Self::first_nonempty_setting(vec![
-            (SettingType::Explicit, keypair_cmd_path.to_string()),
-            (SettingType::Explicit, keypair_cfg_path.to_string()),
-            (SettingType::SystemDefault, Self::default_keypair_path()),
-        ])
-    }
-
-    pub fn compute_commitment_config(
-        commitment_cmd: &str,
-        commitment_cfg: &str,
-    ) -> (SettingType, CommitmentConfig) {
-        Self::first_setting_is_some(vec![
-            (
-                SettingType::Explicit,
-                CommitmentConfig::from_str(commitment_cmd).ok(),
-            ),
-            (
-                SettingType::Explicit,
-                CommitmentConfig::from_str(commitment_cfg).ok(),
-            ),
-            (SettingType::SystemDefault, Some(Self::default_commitment())),
-        ])
-    }
-}
-
-impl Default for ConfigInput {
-    fn default() -> ConfigInput {
-        ConfigInput {
-            json_rpc_url: Self::default_json_rpc_url(),
-            websocket_url: Self::default_websocket_url(),
-            keypair_path: Self::default_keypair_path(),
-            commitment: CommitmentConfig::confirmed(),
-        }
-    }
-}
--- a/cli-config/src/lib.rs
+++ b/cli-config/src/lib.rs
@@ -55,16 +55,12 @@
 extern crate lazy_static;

 mod config;
-mod config_input;
+pub use config::{Config, CONFIG_FILE};
 use std::{
    fs::{create_dir_all, File},
    io::{self, Write},
    path::Path,
 };
-pub use {
-    config::{Config, CONFIG_FILE},
-    config_input::{ConfigInput, SettingType},
-};

 /// Load a value from a file in YAML format.
 ///
--- a/cli-output/Cargo.toml
+++ b/cli-output/Cargo.toml
@@ -3,34 +3,29 @@ authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 edition = "2021"
 name = "solana-cli-output"
 description = "Blockchain, Rebuilt for Scale"
-version = "1.10.9"
+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"
-semver = "1.0.6"
 serde = "1.0.136"
-serde_json = "1.0.79"
-solana-account-decoder = { path = "../account-decoder", version = "=1.10.9" }
-solana-clap-utils = { path = "../clap-utils", version = "=1.10.9" }
-solana-client = { path = "../client", version = "=1.10.9" }
-solana-cli-config = { path = "../cli-config", version = "=1.10.9" }
-solana-sdk = { path = "../sdk", version = "=1.10.9" }
-solana-transaction-status = { path = "../transaction-status", version = "=1.10.9" }
-solana-vote-program = { path = "../programs/vote", version = "=1.10.9" }
+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"]
--- a/cli-output/src/cli_output.rs
+++ b/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,
@@ -356,7 +356,6 @@ pub enum CliValidatorsSortOrder {
    SkipRate,
    Stake,
    VoteAccount,
-    Version,
 }

 #[derive(Serialize, Deserialize)]
@@ -394,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 {
@@ -420,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()
+                },
            )
        }

@@ -442,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",
@@ -495,22 +494,6 @@ impl fmt::Display for CliValidators {
            CliValidatorsSortOrder::Stake => {
                sorted_validators.sort_by_key(|a| a.activated_stake);
            }
-            CliValidatorsSortOrder::Version => {
-                sorted_validators.sort_by(|a, b| {
-                    use std::cmp::Ordering;
-                    let a_version = semver::Version::parse(a.version.as_str()).ok();
-                    let b_version = semver::Version::parse(b.version.as_str()).ok();
-                    match (a_version, b_version) {
-                        (None, None) => a.version.cmp(&b.version),
-                        (None, Some(_)) => Ordering::Less,
-                        (Some(_), None) => Ordering::Greater,
-                        (Some(va), Some(vb)) => match va.cmp(&vb) {
-                            Ordering::Equal => a.activated_stake.cmp(&b.activated_stake),
-                            ordering => ordering,
-                        },
-                    }
-                });
-            }
        }

        if self.validators_reverse_sort {
@@ -2235,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)
@@ -2352,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,
@@ -2371,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")]
@@ -2386,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)
@@ -2468,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 {
@@ -2482,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,
        }
    }
 }
@@ -2508,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()
@@ -2517,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"),
        )
    }
 }
@@ -2532,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)?;
@@ -2793,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,
--- a/cli-output/src/display.rs
+++ b/cli-output/src/display.rs
@@ -3,20 +3,11 @@ use {
    chrono::{DateTime, Local, NaiveDateTime, SecondsFormat, TimeZone, Utc},
    console::style,
    indicatif::{ProgressBar, ProgressStyle},
-    solana_cli_config::SettingType,
    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},
 };
@@ -104,21 +95,6 @@ pub fn writeln_name_value(f: &mut dyn fmt::Write, name: &str, value: &str) -> fm
    writeln!(f, "{} {}", style(name).bold(), styled_value)
 }

-pub fn println_name_value_or(name: &str, value: &str, setting_type: SettingType) {
-    let description = match setting_type {
-        SettingType::Explicit => "",
-        SettingType::Computed => "(computed)",
-        SettingType::SystemDefault => "(default)",
-    };
-
-    println!(
-        "{} {} {}",
-        style(name).bold(),
-        style(value),
-        style(description).italic(),
-    );
-}
-
 pub fn format_labeled_address(pubkey: &str, address_labels: &HashMap<String, String>) -> String {
    let label = address_labels.get(pubkey);
    match label {
@@ -155,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
@@ -186,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,
@@ -365,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)
@@ -446,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)
@@ -461,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>,
@@ -623,7 +374,6 @@ pub fn println_transaction(
        prefix,
        sigverify_status,
        block_time,
-        CliTimezone::Local,
    )
    .is_ok()
    {
@@ -635,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)?;
        }
@@ -678,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() {
--- a/cli/Cargo.toml
+++ b/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.9"
+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.9" }
-solana-bpf-loader-program = { path = "../programs/bpf_loader", version = "=1.10.9" }
-solana-clap-utils = { path = "../clap-utils", version = "=1.10.9" }
-solana-cli-config = { path = "../cli-config", version = "=1.10.9" }
-solana-cli-output = { path = "../cli-output", version = "=1.10.9" }
-solana-client = { path = "../client", version = "=1.10.9" }
-solana-config-program = { path = "../programs/config", version = "=1.10.9" }
-solana-faucet = { path = "../faucet", version = "=1.10.9" }
-solana-logger = { path = "../logger", version = "=1.10.9" }
-solana-program-runtime = { path = "../program-runtime", version = "=1.10.9" }
-solana-remote-wallet = { path = "../remote-wallet", version = "=1.10.9" }
-solana-sdk = { path = "../sdk", version = "=1.10.9" }
-solana-transaction-status = { path = "../transaction-status", version = "=1.10.9" }
-solana-version = { path = "../version", version = "=1.10.9" }
-solana-vote-program = { path = "../programs/vote", version = "=1.10.9" }
-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.9" }
-solana-test-validator = { path = "../test-validator", version = "=1.10.9" }
+solana-streamer = { path = "../streamer", version = "=1.10.0" }
+solana-test-validator = { path = "../test-validator", version = "=1.10.0" }
 tempfile = "3.3.0"

 [[bin]]
--- a/cli/src/cli.rs
+++ b/cli/src/cli.rs
@@ -7,8 +7,7 @@ use {
    log::*,
    num_traits::FromPrimitive,
    serde_json::{self, Value},
-    solana_clap_utils::{self, input_parsers::*, keypair::*},
-    solana_cli_config::ConfigInput,
+    solana_clap_utils::{self, input_parsers::*, input_validators::*, keypair::*},
    solana_cli_output::{
        display::println_name_value, CliSignature, CliValidatorsSortOrder, OutputFormat,
    },
@@ -31,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},
@@ -89,7 +88,6 @@ pub enum CliCommand {
        timeout: Duration,
        blockhash: Option<Hash>,
        print_timestamp: bool,
-        additional_fee: Option<u32>,
    },
    Rent {
        data_length: usize,
@@ -163,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
@@ -387,7 +384,7 @@ pub enum CliCommand {
        seed: String,
        program_id: Pubkey,
    },
-    DecodeTransaction(VersionedTransaction),
+    DecodeTransaction(Transaction),
    ResolveSigner(Option<String>),
    ShowAccount {
        pubkey: Pubkey,
@@ -457,23 +454,129 @@ impl From<nonce_utils::Error> for CliError {
    }
 }

+pub enum SettingType {
+    Explicit,
+    Computed,
+    SystemDefault,
+}
+
 pub struct CliConfig<'a> {
    pub command: CliCommand,
    pub json_rpc_url: String,
    pub websocket_url: String,
-    pub keypair_path: String,
-    pub commitment: CommitmentConfig,
    pub signers: Vec<&'a dyn Signer>,
+    pub keypair_path: String,
    pub rpc_client: Option<Arc<RpcClient>>,
    pub rpc_timeout: Duration,
    pub verbose: bool,
    pub output_format: OutputFormat,
+    pub commitment: CommitmentConfig,
    pub send_transaction_config: RpcSendTransactionConfig,
    pub confirm_transaction_initial_timeout: Duration,
    pub address_labels: HashMap<String, String>,
 }

 impl CliConfig<'_> {
+    fn default_keypair_path() -> String {
+        solana_cli_config::Config::default().keypair_path
+    }
+
+    fn default_json_rpc_url() -> String {
+        solana_cli_config::Config::default().json_rpc_url
+    }
+
+    fn default_websocket_url() -> String {
+        solana_cli_config::Config::default().websocket_url
+    }
+
+    fn default_commitment() -> CommitmentConfig {
+        CommitmentConfig::confirmed()
+    }
+
+    fn first_nonempty_setting(
+        settings: std::vec::Vec<(SettingType, String)>,
+    ) -> (SettingType, String) {
+        settings
+            .into_iter()
+            .find(|(_, value)| !value.is_empty())
+            .expect("no nonempty setting")
+    }
+
+    fn first_setting_is_some<T>(
+        settings: std::vec::Vec<(SettingType, Option<T>)>,
+    ) -> (SettingType, T) {
+        let (setting_type, setting_option) = settings
+            .into_iter()
+            .find(|(_, value)| value.is_some())
+            .expect("all settings none");
+        (setting_type, setting_option.unwrap())
+    }
+
+    pub fn compute_websocket_url_setting(
+        websocket_cmd_url: &str,
+        websocket_cfg_url: &str,
+        json_rpc_cmd_url: &str,
+        json_rpc_cfg_url: &str,
+    ) -> (SettingType, String) {
+        Self::first_nonempty_setting(vec![
+            (SettingType::Explicit, websocket_cmd_url.to_string()),
+            (SettingType::Explicit, websocket_cfg_url.to_string()),
+            (
+                SettingType::Computed,
+                solana_cli_config::Config::compute_websocket_url(&normalize_to_url_if_moniker(
+                    json_rpc_cmd_url,
+                )),
+            ),
+            (
+                SettingType::Computed,
+                solana_cli_config::Config::compute_websocket_url(&normalize_to_url_if_moniker(
+                    json_rpc_cfg_url,
+                )),
+            ),
+            (SettingType::SystemDefault, Self::default_websocket_url()),
+        ])
+    }
+
+    pub fn compute_json_rpc_url_setting(
+        json_rpc_cmd_url: &str,
+        json_rpc_cfg_url: &str,
+    ) -> (SettingType, String) {
+        let (setting_type, url_or_moniker) = Self::first_nonempty_setting(vec![
+            (SettingType::Explicit, json_rpc_cmd_url.to_string()),
+            (SettingType::Explicit, json_rpc_cfg_url.to_string()),
+            (SettingType::SystemDefault, Self::default_json_rpc_url()),
+        ]);
+        (setting_type, normalize_to_url_if_moniker(&url_or_moniker))
+    }
+
+    pub fn compute_keypair_path_setting(
+        keypair_cmd_path: &str,
+        keypair_cfg_path: &str,
+    ) -> (SettingType, String) {
+        Self::first_nonempty_setting(vec![
+            (SettingType::Explicit, keypair_cmd_path.to_string()),
+            (SettingType::Explicit, keypair_cfg_path.to_string()),
+            (SettingType::SystemDefault, Self::default_keypair_path()),
+        ])
+    }
+
+    pub fn compute_commitment_config(
+        commitment_cmd: &str,
+        commitment_cfg: &str,
+    ) -> (SettingType, CommitmentConfig) {
+        Self::first_setting_is_some(vec![
+            (
+                SettingType::Explicit,
+                CommitmentConfig::from_str(commitment_cmd).ok(),
+            ),
+            (
+                SettingType::Explicit,
+                CommitmentConfig::from_str(commitment_cfg).ok(),
+            ),
+            (SettingType::SystemDefault, Some(Self::default_commitment())),
+        ])
+    }
+
    pub(crate) fn pubkey(&self) -> Result<Pubkey, SignerError> {
        if !self.signers.is_empty() {
            self.signers[0].try_pubkey()
@@ -504,15 +607,15 @@ impl Default for CliConfig<'_> {
                pubkey: Some(Pubkey::default()),
                use_lamports_unit: false,
            },
-            json_rpc_url: ConfigInput::default().json_rpc_url,
-            websocket_url: ConfigInput::default().websocket_url,
-            keypair_path: ConfigInput::default().keypair_path,
-            commitment: ConfigInput::default().commitment,
+            json_rpc_url: Self::default_json_rpc_url(),
+            websocket_url: Self::default_websocket_url(),
            signers: Vec::new(),
+            keypair_path: Self::default_keypair_path(),
            rpc_client: None,
            rpc_timeout: Duration::from_secs(u64::from_str(DEFAULT_RPC_TIMEOUT_SECONDS).unwrap()),
            verbose: false,
            output_format: OutputFormat::Display,
+            commitment: CommitmentConfig::confirmed(),
            send_transaction_config: RpcSendTransactionConfig::default(),
            confirm_transaction_initial_timeout: Duration::from_secs(
                u64::from_str(DEFAULT_CONFIRM_TX_TIMEOUT_SECONDS).unwrap(),
@@ -640,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 {
@@ -648,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,
            })
@@ -876,7 +977,6 @@ pub fn process_command(config: &CliConfig) -> ProcessResult {
            timeout,
            blockhash,
            print_timestamp,
-            additional_fee,
        } => process_ping(
            &rpc_client,
            config,
@@ -885,7 +985,6 @@ pub fn process_command(config: &CliConfig) -> ProcessResult {
            timeout,
            blockhash,
            *print_timestamp,
-            additional_fee,
        ),
        CliCommand::Rent {
            data_length,
@@ -1027,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,
@@ -1035,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)
@@ -1867,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()],
            }
@@ -1890,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(),
@@ -2284,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);
@@ -2305,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());
    }
--- a/cli/src/cluster_query.rs
+++ b/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(
@@ -379,7 +370,6 @@ impl ClusterQuerySubCommands for App<'_, '_> {
                            "root",
                            "skip-rate",
                            "stake",
-                            "version",
                            "vote-account",
                        ])
                        .default_value("stake")
@@ -523,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,
@@ -531,7 +520,6 @@ pub fn parse_cluster_ping(
            timeout,
            blockhash,
            print_timestamp,
-            additional_fee,
        },
        signers: vec![default_signer.signer_from_path(matches, wallet_manager)?],
    })
@@ -651,7 +639,6 @@ pub fn parse_show_validators(matches: &ArgMatches<'_>) -> Result<CliCommandInfo,
        "skip-rate" => CliValidatorsSortOrder::SkipRate,
        "stake" => CliValidatorsSortOrder::Stake,
        "vote-account" => CliValidatorsSortOrder::VoteAccount,
-        "version" => CliValidatorsSortOrder::Version,
        _ => unreachable!(),
    };

@@ -1060,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()
            },
        )?
@@ -1364,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 || {
@@ -1389,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 {
@@ -1404,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,
@@ -2045,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) => {
@@ -2055,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,
@@ -2339,7 +2312,6 @@ mod tests {
                        Hash::from_str("4CCNp28j6AhGq7PkjPDP4wbQWBS8LLbQin2xV5n8frKX").unwrap()
                    ),
                    print_timestamp: true,
-                    additional_fee: None,
                },
                signers: vec![default_keypair.into()],
            }
--- a/cli/src/main.rs
+++ b/cli/src/main.rs
@@ -8,18 +8,30 @@ use {
    },
    solana_cli::{
        clap_app::get_clap_app,
-        cli::{parse_command, process_command, CliCommandInfo, CliConfig},
-    },
-    solana_cli_config::{Config, ConfigInput},
-    solana_cli_output::{
-        display::{println_name_value, println_name_value_or},
-        OutputFormat,
+        cli::{parse_command, process_command, CliCommandInfo, CliConfig, SettingType},
    },
+    solana_cli_config::Config,
+    solana_cli_output::{display::println_name_value, OutputFormat},
    solana_client::rpc_config::RpcSendTransactionConfig,
    solana_remote_wallet::remote_wallet::RemoteWalletManager,
    std::{collections::HashMap, error, path::PathBuf, sync::Arc, time::Duration},
 };

+pub fn println_name_value_or(name: &str, value: &str, setting_type: SettingType) {
+    let description = match setting_type {
+        SettingType::Explicit => "",
+        SettingType::Computed => "(computed)",
+        SettingType::SystemDefault => "(default)",
+    };
+
+    println!(
+        "{} {} {}",
+        style(name).bold(),
+        style(value),
+        style(description).italic(),
+    );
+}
+
 fn parse_settings(matches: &ArgMatches<'_>) -> Result<bool, Box<dyn error::Error>> {
    let parse_args = match matches.subcommand() {
        ("config", Some(matches)) => {
@@ -38,18 +50,17 @@ fn parse_settings(matches: &ArgMatches<'_>) -> Result<bool, Box<dyn error::Error
            match matches.subcommand() {
                ("get", Some(subcommand_matches)) => {
                    let (url_setting_type, json_rpc_url) =
-                        ConfigInput::compute_json_rpc_url_setting("", &config.json_rpc_url);
-                    let (ws_setting_type, websocket_url) =
-                        ConfigInput::compute_websocket_url_setting(
-                            "",
-                            &config.websocket_url,
-                            "",
-                            &config.json_rpc_url,
-                        );
+                        CliConfig::compute_json_rpc_url_setting("", &config.json_rpc_url);
+                    let (ws_setting_type, websocket_url) = CliConfig::compute_websocket_url_setting(
+                        "",
+                        &config.websocket_url,
+                        "",
+                        &config.json_rpc_url,
+                    );
                    let (keypair_setting_type, keypair_path) =
-                        ConfigInput::compute_keypair_path_setting("", &config.keypair_path);
+                        CliConfig::compute_keypair_path_setting("", &config.keypair_path);
                    let (commitment_setting_type, commitment) =
-                        ConfigInput::compute_commitment_config("", &config.commitment);
+                        CliConfig::compute_commitment_config("", &config.commitment);

                    if let Some(field) = subcommand_matches.value_of("specific_setting") {
                        let (field_name, value, setting_type) = match field {
@@ -96,18 +107,17 @@ fn parse_settings(matches: &ArgMatches<'_>) -> Result<bool, Box<dyn error::Error
                    config.save(config_file)?;

                    let (url_setting_type, json_rpc_url) =
-                        ConfigInput::compute_json_rpc_url_setting("", &config.json_rpc_url);
-                    let (ws_setting_type, websocket_url) =
-                        ConfigInput::compute_websocket_url_setting(
-                            "",
-                            &config.websocket_url,
-                            "",
-                            &config.json_rpc_url,
-                        );
+                        CliConfig::compute_json_rpc_url_setting("", &config.json_rpc_url);
+                    let (ws_setting_type, websocket_url) = CliConfig::compute_websocket_url_setting(
+                        "",
+                        &config.websocket_url,
+                        "",
+                        &config.json_rpc_url,
+                    );
                    let (keypair_setting_type, keypair_path) =
-                        ConfigInput::compute_keypair_path_setting("", &config.keypair_path);
+                        CliConfig::compute_keypair_path_setting("", &config.keypair_path);
                    let (commitment_setting_type, commitment) =
-                        ConfigInput::compute_commitment_config("", &config.commitment);
+                        CliConfig::compute_commitment_config("", &config.commitment);

                    println_name_value("Config File:", config_file);
                    println_name_value_or("RPC URL:", &json_rpc_url, url_setting_type);
@@ -148,7 +158,7 @@ pub fn parse_args<'a>(
    } else {
        Config::default()
    };
-    let (_, json_rpc_url) = ConfigInput::compute_json_rpc_url_setting(
+    let (_, json_rpc_url) = CliConfig::compute_json_rpc_url_setting(
        matches.value_of("json_rpc_url").unwrap_or(""),
        &config.json_rpc_url,
    );
@@ -161,14 +171,14 @@ pub fn parse_args<'a>(
    let confirm_transaction_initial_timeout =
        Duration::from_secs(confirm_transaction_initial_timeout);

-    let (_, websocket_url) = ConfigInput::compute_websocket_url_setting(
+    let (_, websocket_url) = CliConfig::compute_websocket_url_setting(
        matches.value_of("websocket_url").unwrap_or(""),
        &config.websocket_url,
        matches.value_of("json_rpc_url").unwrap_or(""),
        &config.json_rpc_url,
    );
    let default_signer_arg_name = "keypair".to_string();
-    let (_, default_signer_path) = ConfigInput::compute_keypair_path_setting(
+    let (_, default_signer_path) = CliConfig::compute_keypair_path_setting(
        matches.value_of(&default_signer_arg_name).unwrap_or(""),
        &config.keypair_path,
    );
@@ -191,7 +201,7 @@ pub fn parse_args<'a>(
    let verbose = matches.is_present("verbose");
    let output_format = OutputFormat::from_matches(matches, "output_format", verbose);

-    let (_, commitment) = ConfigInput::compute_commitment_config(
+    let (_, commitment) = CliConfig::compute_commitment_config(
        matches.value_of("commitment").unwrap_or(""),
        &config.commitment,
    );
--- a/cli/src/program.rs
+++ b/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,
--- a/cli/src/stake.rs
+++ b/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(())
--- a/cli/src/validator_info.rs
+++ b/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 {:?}",
--- a/cli/src/vote.rs
+++ b/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())?
            }
        }
    }
--- a/cli/src/wallet.rs
+++ b/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,
--- a/cli/tests/program.rs
+++ b/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();

--- a/client-test/Cargo.toml
+++ b/client-test/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "solana-client-test"
-version = "1.10.9"
+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.9" }
-solana-ledger = { path = "../ledger", version = "=1.10.9" }
-solana-measure = { path = "../measure", version = "=1.10.9" }
-solana-merkle-tree = { path = "../merkle-tree", version = "=1.10.9" }
-solana-metrics = { path = "../metrics", version = "=1.10.9" }
-solana-perf = { path = "../perf", version = "=1.10.9" }
-solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "=1.10.9" }
-solana-rpc = { path = "../rpc", version = "=1.10.9" }
-solana-runtime = { path = "../runtime", version = "=1.10.9" }
-solana-sdk = { path = "../sdk", version = "=1.10.9" }
-solana-streamer = { path = "../streamer", version = "=1.10.9" }
-solana-test-validator = { path = "../test-validator", version = "=1.10.9" }
-solana-transaction-status = { path = "../transaction-status", version = "=1.10.9" }
-solana-version = { path = "../version", version = "=1.10.9" }
+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.9" }
+solana-logger = { path = "../logger", version = "=1.10.0" }

 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
--- a/client-test/tests/client.rs
+++ b/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()));
        }
--- a/client/Cargo.toml
+++ b/client/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "solana-client"
-version = "1.10.9"
+version = "1.10.0"
 description = "Solana Client"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -10,55 +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"
-lru = "0.7.5"
-quinn = "0.8.0"
-quinn-proto = "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.9" }
-solana-clap-utils = { path = "../clap-utils", version = "=1.10.9" }
-solana-faucet = { path = "../faucet", version = "=1.10.9" }
-solana-measure = { path = "../measure", version = "=1.10.9" }
-solana-metrics = { path = "../metrics", version = "=1.10.9" }
-solana-net-utils = { path = "../net-utils", version = "=1.10.9" }
-solana-sdk = { path = "../sdk", version = "=1.10.9" }
-solana-streamer = { path = "../streamer", version = "=1.10.9" }
-solana-transaction-status = { path = "../transaction-status", version = "=1.10.9" }
-solana-version = { path = "../version", version = "=1.10.9" }
-solana-vote-program = { path = "../programs/vote", version = "=1.10.9" }
+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.9" }
+solana-logger = { path = "../logger", version = "=1.10.0" }

 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
--- a/client/src/client_error.rs
+++ b/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 {
--- a/client/src/connection_cache.rs
+++ b/client/src/connection_cache.rs
@@ -1,375 +0,0 @@
-use {
-    crate::{
-        quic_client::QuicTpuConnection,
-        tpu_connection::{ClientStats, TpuConnection},
-        udp_client::UdpTpuConnection,
-    },
-    lazy_static::lazy_static,
-    lru::LruCache,
-    solana_net_utils::VALIDATOR_PORT_RANGE,
-    solana_sdk::{
-        timing::AtomicInterval, transaction::VersionedTransaction, transport::TransportError,
-    },
-    std::{
-        net::{IpAddr, Ipv4Addr, SocketAddr},
-        sync::{
-            atomic::{AtomicU64, Ordering},
-            Arc, Mutex,
-        },
-    },
-};
-
-// Should be non-zero
-static MAX_CONNECTIONS: usize = 64;
-
-#[derive(Clone)]
-enum Connection {
-    Udp(Arc<UdpTpuConnection>),
-    Quic(Arc<QuicTpuConnection>),
-}
-
-#[derive(Default)]
-struct ConnectionCacheStats {
-    cache_hits: AtomicU64,
-    cache_misses: AtomicU64,
-    sent_packets: AtomicU64,
-    total_batches: AtomicU64,
-    batch_success: AtomicU64,
-    batch_failure: AtomicU64,
-
-    // Need to track these separately per-connection
-    // because we need to track the base stat value from quinn
-    total_client_stats: ClientStats,
-}
-
-const CONNECTION_STAT_SUBMISSION_INTERVAL: u64 = 2000;
-
-impl ConnectionCacheStats {
-    fn add_client_stats(&self, client_stats: &ClientStats, num_packets: usize, is_success: bool) {
-        self.total_client_stats.total_connections.fetch_add(
-            client_stats.total_connections.load(Ordering::Relaxed),
-            Ordering::Relaxed,
-        );
-        self.total_client_stats.connection_reuse.fetch_add(
-            client_stats.connection_reuse.load(Ordering::Relaxed),
-            Ordering::Relaxed,
-        );
-        self.sent_packets
-            .fetch_add(num_packets as u64, Ordering::Relaxed);
-        self.total_batches.fetch_add(1, Ordering::Relaxed);
-        if is_success {
-            self.batch_success.fetch_add(1, Ordering::Relaxed);
-        } else {
-            self.batch_failure.fetch_add(1, Ordering::Relaxed);
-        }
-    }
-
-    fn report(&self) {
-        datapoint_info!(
-            "quic-client-connection-stats",
-            (
-                "cache_hits",
-                self.cache_hits.swap(0, Ordering::Relaxed),
-                i64
-            ),
-            (
-                "cache_misses",
-                self.cache_misses.swap(0, Ordering::Relaxed),
-                i64
-            ),
-            (
-                "total_connections",
-                self.total_client_stats
-                    .total_connections
-                    .swap(0, Ordering::Relaxed),
-                i64
-            ),
-            (
-                "connection_reuse",
-                self.total_client_stats
-                    .connection_reuse
-                    .swap(0, Ordering::Relaxed),
-                i64
-            ),
-            (
-                "congestion_events",
-                self.total_client_stats.congestion_events.load_and_reset(),
-                i64
-            ),
-            (
-                "tx_streams_blocked_uni",
-                self.total_client_stats
-                    .tx_streams_blocked_uni
-                    .load_and_reset(),
-                i64
-            ),
-            (
-                "tx_data_blocked",
-                self.total_client_stats.tx_data_blocked.load_and_reset(),
-                i64
-            ),
-            (
-                "tx_acks",
-                self.total_client_stats.tx_acks.load_and_reset(),
-                i64
-            ),
-        );
-    }
-}
-
-struct ConnMap {
-    map: LruCache<SocketAddr, Connection>,
-    stats: Arc<ConnectionCacheStats>,
-    last_stats: AtomicInterval,
-    use_quic: bool,
-}
-
-impl ConnMap {
-    pub fn new() -> Self {
-        Self {
-            map: LruCache::new(MAX_CONNECTIONS),
-            stats: Arc::new(ConnectionCacheStats::default()),
-            last_stats: AtomicInterval::default(),
-            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);
-}
-
-// TODO: see https://github.com/solana-labs/solana/issues/23661
-// remove lazy_static and optimize and refactor this
-fn get_connection(addr: &SocketAddr) -> (Connection, Arc<ConnectionCacheStats>) {
-    let mut map = (*CONNECTION_MAP).lock().unwrap();
-
-    if map
-        .last_stats
-        .should_update(CONNECTION_STAT_SUBMISSION_INTERVAL)
-    {
-        map.stats.report();
-    }
-
-    let (connection, hit, maybe_stats) = match map.map.get(addr) {
-        Some(connection) => {
-            let mut stats = None;
-            // update connection stats
-            if let Connection::Quic(conn) = connection {
-                stats = conn.stats().map(|s| (conn.base_stats(), s));
-            }
-            (connection.clone(), true, stats)
-        }
-        None => {
-            let (_, send_socket) = solana_net_utils::bind_in_range(
-                IpAddr::V4(Ipv4Addr::new(0, 0, 0, 0)),
-                VALIDATOR_PORT_RANGE,
-            )
-            .unwrap();
-            let connection = if map.use_quic {
-                Connection::Quic(Arc::new(QuicTpuConnection::new(send_socket, *addr)))
-            } else {
-                Connection::Udp(Arc::new(UdpTpuConnection::new(send_socket, *addr)))
-            };
-
-            map.map.put(*addr, connection.clone());
-            (connection, false, None)
-        }
-    };
-
-    if let Some((connection_stats, new_stats)) = maybe_stats {
-        map.stats.total_client_stats.congestion_events.update_stat(
-            &connection_stats.congestion_events,
-            new_stats.path.congestion_events,
-        );
-
-        map.stats
-            .total_client_stats
-            .tx_streams_blocked_uni
-            .update_stat(
-                &connection_stats.tx_streams_blocked_uni,
-                new_stats.frame_tx.streams_blocked_uni,
-            );
-
-        map.stats.total_client_stats.tx_data_blocked.update_stat(
-            &connection_stats.tx_data_blocked,
-            new_stats.frame_tx.data_blocked,
-        );
-
-        map.stats
-            .total_client_stats
-            .tx_acks
-            .update_stat(&connection_stats.tx_acks, new_stats.frame_tx.acks);
-    }
-
-    if hit {
-        map.stats.cache_hits.fetch_add(1, Ordering::Relaxed);
-    } else {
-        map.stats.cache_misses.fetch_add(1, Ordering::Relaxed);
-    }
-    (connection, map.stats.clone())
-}
-
-// 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, stats) = get_connection(addr);
-    let client_stats = ClientStats::default();
-    let r = match conn {
-        Connection::Udp(conn) => conn.send_wire_transaction_batch(packets, &client_stats),
-        Connection::Quic(conn) => conn.send_wire_transaction_batch(packets, &client_stats),
-    };
-    stats.add_client_stats(&client_stats, packets.len(), r.is_ok());
-    r
-}
-
-pub fn send_wire_transaction_async(
-    packets: Vec<u8>,
-    addr: &SocketAddr,
-) -> Result<(), TransportError> {
-    let (conn, stats) = get_connection(addr);
-    let client_stats = Arc::new(ClientStats::default());
-    let r = match conn {
-        Connection::Udp(conn) => conn.send_wire_transaction_async(packets, client_stats.clone()),
-        Connection::Quic(conn) => conn.send_wire_transaction_async(packets, client_stats.clone()),
-    };
-    stats.add_client_stats(&client_stats, 1, r.is_ok());
-    r
-}
-
-pub fn send_wire_transaction(
-    wire_transaction: &[u8],
-    addr: &SocketAddr,
-) -> Result<(), TransportError> {
-    send_wire_transaction_batch(&[wire_transaction], addr)
-}
-
-pub fn serialize_and_send_transaction(
-    transaction: &VersionedTransaction,
-    addr: &SocketAddr,
-) -> Result<(), TransportError> {
-    let (conn, stats) = get_connection(addr);
-    let client_stats = ClientStats::default();
-    let r = match conn {
-        Connection::Udp(conn) => conn.serialize_and_send_transaction(transaction, &client_stats),
-        Connection::Quic(conn) => conn.serialize_and_send_transaction(transaction, &client_stats),
-    };
-    stats.add_client_stats(&client_stats, 1, r.is_ok());
-    r
-}
-
-pub fn par_serialize_and_send_transaction_batch(
-    transactions: &[VersionedTransaction],
-    addr: &SocketAddr,
-) -> Result<(), TransportError> {
-    let (conn, stats) = get_connection(addr);
-    let client_stats = ClientStats::default();
-    let r = match conn {
-        Connection::Udp(conn) => {
-            conn.par_serialize_and_send_transaction_batch(transactions, &client_stats)
-        }
-        Connection::Quic(conn) => {
-            conn.par_serialize_and_send_transaction_batch(transactions, &client_stats)
-        }
-    };
-    stats.add_client_stats(&client_stats, transactions.len(), r.is_ok());
-    r
-}
-
-#[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).0) == 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.peek(a).expect("Address not found");
-                assert!(a.ip() == ip(conn.clone()));
-            });
-
-            assert!(map.map.peek(&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.peek(&addrs[0]).is_some());
-        assert!(map.map.peek(&addrs[1]).is_none());
-    }
-}
--- a/client/src/http_sender.rs
+++ b/client/src/http_sender.rs
@@ -197,10 +197,6 @@ impl RpcSender for HttpSender {
            return Ok(json["result"].take());
        }
    }
-
-    fn url(&self) -> String {
-        self.url.clone()
-    }
 }

 #[cfg(test)]
--- a/client/src/lib.rs
+++ b/client/src/lib.rs
@@ -4,13 +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;
@@ -19,16 +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;
-
-#[macro_use]
-extern crate solana_metrics;

 pub mod mock_sender_for_cli {
    /// Magic `SIGNATURE` value used by `solana-cli` unit tests.
--- a/client/src/mock_sender.rs
+++ b/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,
@@ -468,8 +464,4 @@ impl RpcSender for MockSender {
        };
        Ok(val)
    }
-
-    fn url(&self) -> String {
-        format!("MockSender: {}", self.url)
-    }
 }
--- a/client/src/nonblocking/pubsub_client.rs
+++ b/client/src/nonblocking/pubsub_client.rs
@@ -238,7 +238,6 @@ impl PubsubClient {
                        },
                        Message::Pong(_data) => continue,
                        Message::Close(_frame) => break,
-                        Message::Frame(_frame) => continue,
                    };


--- a/client/src/nonblocking/rpc_client.rs
+++ b/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
    ///
@@ -502,18 +441,13 @@ impl RpcClient {
        Self::new_with_timeout(url, timeout)
    }

-    /// Get the configured url of the client's sender
-    pub fn url(&self) -> String {
-        self.sender.url()
-    }
-
    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))
            })?;
@@ -2478,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,
@@ -3119,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,
@@ -3732,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,
--- a/bench-tps/src/perf_utils.rs
+++ b/bench-tps/src/perf_utils.rs
@@ -1,7 +1,6 @@
 use {
-    crate::bench_tps_client::BenchTpsClient,
    log::*,
-    solana_sdk::{commitment_config::CommitmentConfig, timing::duration_as_s},
+    solana_sdk::{client::Client, commitment_config::CommitmentConfig, timing::duration_as_s},
    std::{
        sync::{
            atomic::{AtomicBool, Ordering},
@@ -28,7 +27,7 @@ pub fn sample_txs<T>(
    sample_period: u64,
    client: &Arc<T>,
 ) where
-    T: BenchTpsClient,
+    T: Client,
 {
    let mut max_tps = 0.0;
    let mut total_elapsed;
@@ -82,7 +81,10 @@ pub fn sample_txs<T>(
                elapsed: total_elapsed,
                txs: total_txs,
            };
-            sample_stats.write().unwrap().push((client.addr(), stats));
+            sample_stats
+                .write()
+                .unwrap()
+                .push((client.tpu_addr(), stats));
            return;
        }
        sleep(Duration::from_secs(sample_period));
--- a/client/src/quic_client.rs
+++ b/client/src/quic_client.rs
@@ -1,285 +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::{ClientStats, TpuConnection},
-    },
-    async_mutex::Mutex,
-    futures::future::join_all,
-    itertools::Itertools,
-    lazy_static::lazy_static,
-    log::*,
-    quinn::{ClientConfig, Endpoint, EndpointConfig, NewConnection, WriteError},
-    quinn_proto::ConnectionStats,
-    solana_sdk::{
-        quic::{QUIC_MAX_CONCURRENT_STREAMS, QUIC_PORT_OFFSET},
-        transport::Result as TransportResult,
-    },
-    std::{
-        net::{SocketAddr, UdpSocket},
-        sync::{atomic::Ordering, 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())
-    }
-}
-lazy_static! {
-    static ref RUNTIME: Runtime = tokio::runtime::Builder::new_multi_thread()
-        .enable_all()
-        .build()
-        .unwrap();
-}
-
-struct QuicClient {
-    endpoint: Endpoint,
-    connection: Arc<Mutex<Option<Arc<NewConnection>>>>,
-    addr: SocketAddr,
-    stats: Arc<ClientStats>,
-}
-
-pub struct QuicTpuConnection {
-    client: Arc<QuicClient>,
-}
-
-impl QuicTpuConnection {
-    pub fn stats(&self) -> Option<ConnectionStats> {
-        self.client.stats()
-    }
-
-    pub fn base_stats(&self) -> Arc<ClientStats> {
-        self.client.stats.clone()
-    }
-}
-
-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,
-        stats: &ClientStats,
-    ) -> TransportResult<()>
-    where
-        T: AsRef<[u8]>,
-    {
-        let _guard = RUNTIME.enter();
-        let send_buffer = self.client.send_buffer(wire_transaction, stats);
-        RUNTIME.block_on(send_buffer)?;
-        Ok(())
-    }
-
-    fn send_wire_transaction_batch<T>(
-        &self,
-        buffers: &[T],
-        stats: &ClientStats,
-    ) -> TransportResult<()>
-    where
-        T: AsRef<[u8]>,
-    {
-        let _guard = RUNTIME.enter();
-        let send_batch = self.client.send_batch(buffers, stats);
-        RUNTIME.block_on(send_batch)?;
-        Ok(())
-    }
-
-    fn send_wire_transaction_async(
-        &self,
-        wire_transaction: Vec<u8>,
-        stats: Arc<ClientStats>,
-    ) -> TransportResult<()> {
-        let _guard = RUNTIME.enter();
-        //drop and detach the task
-        let client = self.client.clone();
-        inc_new_counter_info!("send_wire_transaction_async", 1);
-        let _ = RUNTIME.spawn(async move {
-            let send_buffer = client.send_buffer(wire_transaction, &stats);
-            if let Err(e) = send_buffer.await {
-                inc_new_counter_warn!("send_wire_transaction_async_fail", 1);
-                warn!("Failed to send transaction async to {:?}", e);
-            } else {
-                inc_new_counter_info!("send_wire_transaction_async_pass", 1);
-            }
-        });
-        Ok(())
-    }
-}
-
-impl QuicClient {
-    pub fn new(client_socket: UdpSocket, addr: SocketAddr) -> Self {
-        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 {
-            endpoint,
-            connection: Arc::new(Mutex::new(None)),
-            addr,
-            stats: Arc::new(ClientStats::default()),
-        }
-    }
-
-    pub fn stats(&self) -> Option<ConnectionStats> {
-        let conn_guard = self.connection.lock();
-        let x = RUNTIME.block_on(conn_guard);
-        x.as_ref().map(|c| c.connection.stats())
-    }
-
-    // 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(())
-    }
-
-    async fn make_connection(&self, stats: &ClientStats) -> Result<Arc<NewConnection>, WriteError> {
-        let connecting = self.endpoint.connect(self.addr, "connect").unwrap();
-        stats.total_connections.fetch_add(1, Ordering::Relaxed);
-        let connecting_result = connecting.await;
-        if connecting_result.is_err() {
-            stats.connection_errors.fetch_add(1, Ordering::Relaxed);
-        }
-        let connection = connecting_result?;
-        Ok(Arc::new(connection))
-    }
-
-    // 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],
-        stats: &ClientStats,
-    ) -> 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) => {
-                    stats.connection_reuse.fetch_add(1, Ordering::Relaxed);
-                    conn.clone()
-                }
-                None => {
-                    let connection = self.make_connection(stats).await?;
-                    *conn_guard = Some(connection.clone());
-                    connection
-                }
-            }
-        };
-        match Self::_send_buffer_using_conn(data, &connection).await {
-            Ok(()) => Ok(connection),
-            _ => {
-                let connection = {
-                    let connection = self.make_connection(stats).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, stats: &ClientStats) -> Result<(), ClientErrorKind>
-    where
-        T: AsRef<[u8]>,
-    {
-        self._send_buffer(data.as_ref(), stats).await?;
-        Ok(())
-    }
-
-    pub async fn send_batch<T>(
-        &self,
-        buffers: &[T],
-        stats: &ClientStats,
-    ) -> 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(), stats).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(())
-    }
-}
--- a/client/src/rpc_client.rs
+++ b/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
    ///
@@ -535,11 +461,6 @@ impl RpcClient {
        Self::new_with_timeout(url, timeout)
    }

-    /// Get the configured url of the client's sender
-    pub fn url(&self) -> String {
-        self.rpc_client.url()
-    }
-
    /// Get the configured default [commitment level][cl].
    ///
    /// [cl]: https://docs.solana.com/developing/clients/jsonrpc-api#configuring-state-commitment
@@ -548,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
@@ -584,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
@@ -698,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
@@ -773,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
@@ -2118,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,
@@ -2186,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
    ///
@@ -2245,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
    ///
@@ -2338,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
    ///
@@ -2499,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
    ///
@@ -2589,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
@@ -2644,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
    ///
@@ -2681,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,
@@ -3010,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
@@ -3168,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
@@ -3250,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
--- a/client/src/rpc_config.rs
+++ b/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 {
--- a/client/src/rpc_custom_error.rs
+++ b/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,
            },
        }
--- a/client/src/rpc_deprecated_config.rs
+++ b/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,
        }
    }
 }
--- a/client/src/rpc_response.rs
+++ b/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)]
--- a/client/src/rpc_sender.rs
+++ b/client/src/rpc_sender.rs
@@ -23,14 +23,17 @@ 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,
        params: serde_json::Value,
    ) -> Result<serde_json::Value>;
    fn get_transport_stats(&self) -> RpcTransportStats;
-    fn url(&self) -> String;
 }
--- a/client/src/thin_client.rs
+++ b/client/src/thin_client.rs
@@ -4,15 +4,8 @@
 //! unstable and may change in future releases.

 use {
-    crate::{
-        connection_cache::{
-            par_serialize_and_send_transaction_batch, send_wire_transaction,
-            serialize_and_send_transaction,
-        },
-        rpc_client::RpcClient,
-        rpc_config::RpcProgramAccountsConfig,
-        rpc_response::Response,
-    },
+    crate::{rpc_client::RpcClient, rpc_config::RpcProgramAccountsConfig, rpc_response::Response},
+    bincode::{serialize_into, serialized_size},
    log::*,
    solana_sdk::{
        account::Account,
@@ -24,17 +17,18 @@ 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::{
        io,
-        net::SocketAddr,
+        net::{IpAddr, Ipv4Addr, SocketAddr, UdpSocket},
        sync::{
            atomic::{AtomicBool, AtomicUsize, Ordering},
            RwLock,
@@ -124,45 +118,60 @@ impl ClientOptimizer {

 /// An object for querying and sending transactions to the network.
 pub struct ThinClient {
-    rpc_clients: Vec<RpcClient>,
+    transactions_socket: UdpSocket,
    tpu_addrs: Vec<SocketAddr>,
+    rpc_clients: Vec<RpcClient>,
    optimizer: ClientOptimizer,
 }

 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)
-    pub fn new(rpc_addr: SocketAddr, tpu_addr: SocketAddr) -> Self {
-        Self::new_from_client(RpcClient::new_socket(rpc_addr), tpu_addr)
+    /// and the Tpu at `tpu_addr` over `transactions_socket` using UDP.
+    pub fn new(rpc_addr: SocketAddr, tpu_addr: SocketAddr, transactions_socket: UdpSocket) -> Self {
+        Self::new_from_client(
+            tpu_addr,
+            transactions_socket,
+            RpcClient::new_socket(rpc_addr),
+        )
    }

    pub fn new_socket_with_timeout(
        rpc_addr: SocketAddr,
        tpu_addr: SocketAddr,
+        transactions_socket: UdpSocket,
        timeout: Duration,
    ) -> Self {
        let rpc_client = RpcClient::new_socket_with_timeout(rpc_addr, timeout);
-        Self::new_from_client(rpc_client, tpu_addr)
+        Self::new_from_client(tpu_addr, transactions_socket, rpc_client)
    }

-    fn new_from_client(rpc_client: RpcClient, tpu_addr: SocketAddr) -> Self {
+    fn new_from_client(
+        tpu_addr: SocketAddr,
+        transactions_socket: UdpSocket,
+        rpc_client: RpcClient,
+    ) -> Self {
        Self {
-            rpc_clients: vec![rpc_client],
+            transactions_socket,
            tpu_addrs: vec![tpu_addr],
+            rpc_clients: vec![rpc_client],
            optimizer: ClientOptimizer::new(0),
        }
    }

-    pub fn new_from_addrs(rpc_addrs: Vec<SocketAddr>, tpu_addrs: Vec<SocketAddr>) -> Self {
+    pub fn new_from_addrs(
+        rpc_addrs: Vec<SocketAddr>,
+        tpu_addrs: Vec<SocketAddr>,
+        transactions_socket: UdpSocket,
+    ) -> Self {
        assert!(!rpc_addrs.is_empty());
        assert_eq!(rpc_addrs.len(), tpu_addrs.len());

        let rpc_clients: Vec<_> = rpc_addrs.into_iter().map(RpcClient::new_socket).collect();
        let optimizer = ClientOptimizer::new(rpc_clients.len());
        Self {
-            rpc_clients,
+            transactions_socket,
            tpu_addrs,
+            rpc_clients,
            optimizer,
        }
    }
@@ -171,7 +180,7 @@ impl ThinClient {
        &self.tpu_addrs[self.optimizer.best()]
    }

-    pub fn rpc_client(&self) -> &RpcClient {
+    fn rpc_client(&self) -> &RpcClient {
        &self.rpc_clients[self.optimizer.best()]
    }

@@ -196,6 +205,7 @@ impl ThinClient {
        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,
@@ -205,15 +215,18 @@ impl ThinClient {
    ) -> 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)
-                    send_wire_transaction(&wire_transaction, self.tpu_addr())?;
+                    self.transactions_socket
+                        .send_to(&buf[..], &self.tpu_addr())?;
                }

                if let Ok(confirmed_blocks) = self.poll_for_signature_confirmation(
@@ -596,17 +609,15 @@ impl SyncClient for ThinClient {

 impl AsyncClient for ThinClient {
    fn async_send_transaction(&self, transaction: Transaction) -> TransportResult<Signature> {
-        let transaction = VersionedTransaction::from(transaction);
-        serialize_and_send_transaction(&transaction, self.tpu_addr())?;
+        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();
-        par_serialize_and_send_transaction_batch(&batch[..], self.tpu_addr())?;
-        Ok(())
-    }
-
    fn async_send_message<T: Signers>(
        &self,
        keypairs: &T,
@@ -638,15 +649,20 @@ impl AsyncClient for ThinClient {
    }
 }

-pub fn create_client((rpc, tpu): (SocketAddr, SocketAddr)) -> ThinClient {
-    ThinClient::new(rpc, tpu)
+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::new(rpc, tpu, transactions_socket)
 }

 pub fn create_client_with_timeout(
    (rpc, tpu): (SocketAddr, SocketAddr),
+    range: (u16, u16),
    timeout: Duration,
 ) -> ThinClient {
-    ThinClient::new_socket_with_timeout(rpc, tpu, timeout)
+    let (_, transactions_socket) =
+        solana_net_utils::bind_in_range(IpAddr::V4(Ipv4Addr::new(0, 0, 0, 0)), range).unwrap();
+    ThinClient::new_socket_with_timeout(rpc, tpu, transactions_socket, timeout)
 }

 #[cfg(test)]
--- a/client/src/tpu_client.rs
+++ b/client/src/tpu_client.rs
@@ -1,7 +1,6 @@
 use {
    crate::{
        client_error::ClientError,
-        connection_cache::send_wire_transaction_async,
        pubsub_client::{PubsubClient, PubsubClientError, PubsubClientSubscription},
        rpc_client::RpcClient,
        rpc_request::MAX_GET_SIGNATURE_STATUSES_QUERY_ITEMS,
@@ -18,7 +17,6 @@ use {
        signature::SignerError,
        signers::Signers,
        transaction::{Transaction, TransactionError},
-        transport::{Result as TransportResult, TransportError},
    },
    std::{
        collections::{HashMap, HashSet, VecDeque},
@@ -75,7 +73,7 @@ impl Default for TpuClientConfig {
 /// Client which sends transactions directly to the current leader's TPU port over UDP.
 /// The client uses RPC to determine the current leader and fetch node contact info
 pub struct TpuClient {
-    _deprecated: UdpSocket, // TpuClient now uses the connection_cache to choose a send_socket
+    send_socket: UdpSocket,
    fanout_slots: u64,
    leader_tpu_service: LeaderTpuService,
    exit: Arc<AtomicBool>,
@@ -87,48 +85,25 @@ impl TpuClient {
    /// size
    pub fn send_transaction(&self, transaction: &Transaction) -> bool {
        let wire_transaction = serialize(transaction).expect("serialization should succeed");
-        self.send_wire_transaction(wire_transaction)
+        self.send_wire_transaction(&wire_transaction)
    }

    /// Send a wire transaction to the current and upcoming leader TPUs according to fanout size
-    pub fn send_wire_transaction(&self, wire_transaction: Vec<u8>) -> bool {
-        self.try_send_wire_transaction(wire_transaction).is_ok()
-    }
-
-    /// Serialize and send transaction to the current and upcoming leader TPUs according to fanout
-    /// size
-    /// Returns the last error if all sends fail
-    pub fn try_send_transaction(&self, transaction: &Transaction) -> TransportResult<()> {
-        let wire_transaction = serialize(transaction).expect("serialization should succeed");
-        self.try_send_wire_transaction(wire_transaction)
-    }
-
-    /// Send a wire transaction to the current and upcoming leader TPUs according to fanout size
-    /// Returns the last error if all sends fail
-    fn try_send_wire_transaction(&self, wire_transaction: Vec<u8>) -> TransportResult<()> {
-        let mut last_error: Option<TransportError> = None;
-        let mut some_success = false;
-
+    pub fn send_wire_transaction(&self, wire_transaction: &[u8]) -> bool {
+        let mut sent = false;
        for tpu_address in self
            .leader_tpu_service
            .leader_tpu_sockets(self.fanout_slots)
        {
-            let result = send_wire_transaction_async(wire_transaction.clone(), &tpu_address);
-            if let Err(err) = result {
-                last_error = Some(err);
-            } else {
-                some_success = true;
+            if self
+                .send_socket
+                .send_to(wire_transaction, tpu_address)
+                .is_ok()
+            {
+                sent = true;
            }
        }
-        if !some_success {
-            Err(if let Some(err) = last_error {
-                err
-            } else {
-                std::io::Error::new(std::io::ErrorKind::Other, "No sends attempted").into()
-            })
-        } else {
-            Ok(())
-        }
+        sent
    }

    /// Create a new client that disconnects when dropped
@@ -142,7 +117,7 @@ impl TpuClient {
            LeaderTpuService::new(rpc_client.clone(), websocket_url, exit.clone())?;

        Ok(Self {
-            _deprecated: UdpSocket::bind("0.0.0.0:0").unwrap(),
+            send_socket: UdpSocket::bind("0.0.0.0:0").unwrap(),
            fanout_slots: config.fanout_slots.min(MAX_FANOUT_SLOTS).max(1),
            leader_tpu_service,
            exit,
@@ -291,10 +266,6 @@ impl TpuClient {
        }
        Err(TpuSenderError::Custom("Max retries exceeded".into()))
    }
-
-    pub fn rpc_client(&self) -> &RpcClient {
-        &self.rpc_client
-    }
 }

 impl Drop for TpuClient {
--- a/client/src/tpu_connection.rs
+++ b/client/src/tpu_connection.rs
@@ -1,73 +0,0 @@
-use {
-    rayon::iter::{IntoParallelIterator, ParallelIterator},
-    solana_metrics::MovingStat,
-    solana_sdk::{transaction::VersionedTransaction, transport::Result as TransportResult},
-    std::{
-        net::{SocketAddr, UdpSocket},
-        sync::{atomic::AtomicU64, Arc},
-    },
-};
-
-#[derive(Default)]
-pub struct ClientStats {
-    pub total_connections: AtomicU64,
-    pub connection_reuse: AtomicU64,
-    pub connection_errors: AtomicU64,
-
-    // these will be the last values of these stats
-    pub congestion_events: MovingStat,
-    pub tx_streams_blocked_uni: MovingStat,
-    pub tx_data_blocked: MovingStat,
-    pub tx_acks: MovingStat,
-}
-
-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,
-        stats: &ClientStats,
-    ) -> TransportResult<()> {
-        let wire_transaction =
-            bincode::serialize(transaction).expect("serialize Transaction in send_batch");
-        self.send_wire_transaction(&wire_transaction, stats)
-    }
-
-    fn send_wire_transaction<T>(
-        &self,
-        wire_transaction: T,
-        stats: &ClientStats,
-    ) -> TransportResult<()>
-    where
-        T: AsRef<[u8]>;
-
-    fn send_wire_transaction_async(
-        &self,
-        wire_transaction: Vec<u8>,
-        stats: Arc<ClientStats>,
-    ) -> TransportResult<()>;
-
-    fn par_serialize_and_send_transaction_batch(
-        &self,
-        transactions: &[VersionedTransaction],
-        stats: &ClientStats,
-    ) -> 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, stats)
-    }
-
-    fn send_wire_transaction_batch<T>(
-        &self,
-        buffers: &[T],
-        stats: &ClientStats,
-    ) -> TransportResult<()>
-    where
-        T: AsRef<[u8]>;
-}
--- a/client/src/udp_client.rs
+++ b/client/src/udp_client.rs
@@ -1,65 +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::{ClientStats, TpuConnection},
-    core::iter::repeat,
-    solana_sdk::transport::Result as TransportResult,
-    solana_streamer::sendmmsg::batch_send,
-    std::{
-        net::{SocketAddr, UdpSocket},
-        sync::Arc,
-    },
-};
-
-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,
-        _stats: &ClientStats,
-    ) -> TransportResult<()>
-    where
-        T: AsRef<[u8]>,
-    {
-        self.socket.send_to(wire_transaction.as_ref(), self.addr)?;
-        Ok(())
-    }
-
-    fn send_wire_transaction_async(
-        &self,
-        wire_transaction: Vec<u8>,
-        _stats: Arc<ClientStats>,
-    ) -> TransportResult<()> {
-        self.socket.send_to(wire_transaction.as_ref(), self.addr)?;
-        Ok(())
-    }
-
-    fn send_wire_transaction_batch<T>(
-        &self,
-        buffers: &[T],
-        _stats: &ClientStats,
-    ) -> TransportResult<()>
-    where
-        T: AsRef<[u8]>,
-    {
-        let pkts: Vec<_> = buffers.iter().zip(repeat(self.tpu_addr())).collect();
-        batch_send(&self.socket, &pkts)?;
-        Ok(())
-    }
-}
--- a/core/Cargo.toml
+++ b/core/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "solana-core"
 description = "Blockchain, Rebuilt for Scale"
-version = "1.10.9"
+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.9" }
-solana-bloom = { path = "../bloom", version = "=1.10.9" }
-solana-client = { path = "../client", version = "=1.10.9" }
-solana-entry = { path = "../entry", version = "=1.10.9" }
-solana-frozen-abi = { path = "../frozen-abi", version = "=1.10.9" }
-solana-frozen-abi-macro = { path = "../frozen-abi/macro", version = "=1.10.9" }
-solana-geyser-plugin-manager = { path = "../geyser-plugin-manager", version = "=1.10.9" }
-solana-gossip = { path = "../gossip", version = "=1.10.9" }
-solana-ledger = { path = "../ledger", version = "=1.10.9" }
-solana-measure = { path = "../measure", version = "=1.10.9" }
-solana-metrics = { path = "../metrics", version = "=1.10.9" }
-solana-net-utils = { path = "../net-utils", version = "=1.10.9" }
-solana-perf = { path = "../perf", version = "=1.10.9" }
-solana-poh = { path = "../poh", version = "=1.10.9" }
-solana-program-runtime = { path = "../program-runtime", version = "=1.10.9" }
-solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "=1.10.9" }
-solana-replica-lib = { path = "../replica-lib", version = "=1.10.9" }
-solana-rpc = { path = "../rpc", version = "=1.10.9" }
-solana-runtime = { path = "../runtime", version = "=1.10.9" }
-solana-sdk = { path = "../sdk", version = "=1.10.9" }
-solana-send-transaction-service = { path = "../send-transaction-service", version = "=1.10.9" }
-solana-streamer = { path = "../streamer", version = "=1.10.9" }
-solana-transaction-status = { path = "../transaction-status", version = "=1.10.9" }
-solana-vote-program = { path = "../programs/vote", version = "=1.10.9" }
-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.9" }
-solana-program-runtime = { path = "../program-runtime", version = "=1.10.9" }
-solana-stake-program = { path = "../programs/stake", version = "=1.10.9" }
-solana-version = { path = "../version", version = "=1.10.9" }
+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"
--- a/core/benches/banking_stage.rs
+++ b/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.
--- a/core/benches/cluster_nodes.rs
+++ b/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)));
-}
--- a/Show More
+++ b/Show More