Update InvalidRentPayingAccount error (#23680) (#23693)

(cherry picked from commit 410463fb72)

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

.buildkite/coverage-in-disk.sh

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

.buildkite/hooks/pre-command

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

.github/ISSUE_TEMPLATE.md

@@ -4,4 +4,3 @@
 
 #### Proposed Solution
 
-

.github/PULL_REQUEST_TEMPLATE.md

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

.github/workflows/client-targets.yml

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

.github/workflows/explorer_preview.yml

@@ -10,49 +10,11 @@ jobs:
     if: ${{ github.event.workflow_run.conclusion == 'success' }}
     steps:
       - uses: actions/checkout@v2
-        with:
-          ref: ${{ github.event.pull_request.head.sha }}
       - uses: amondnet/vercel-action@v20
         with:
           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
-        run : |
-              touch vercelfile.txt
-              vercel --token ${{secrets.VERCEL_TOKEN}}  ls explorer --scope team_8A2WD7p4uR7tmKX9M68loHXI > vercelfile.txt
-              touch vercelfile1.txt
-              head -n 2 vercelfile.txt > vercelfile1.txt
-              touch vercelfile2.txt
-              tail -n 1 vercelfile1.txt > vercelfile2.txt
-              filtered_url7=$(cut -f7 -d" " vercelfile2.txt)
-              echo "filtered_url7 is: $filtered_url7" 
-              touch .env.preview1
-              echo "$filtered_url7" > .env.preview1
-              #filtered_url=$(cat vercelfile2.txt )
-              #echo "$filtered_url" >> .env.preview1 
-
-      - name: Fetching Vercel Preview Deployment Link
-        uses: mathiasvr/command-output@v1
-        id: test1
-        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
-        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_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}

.github/workflows/explorer_production.yml

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

.github/workflows/web3.yml

@@ -65,7 +65,20 @@ jobs:
           node-version: ${{ matrix.node }}
           cache: 'npm'
           cache-dependency-path: web3.js/package-lock.json
+      - run: npm i -g npm@7
+      - run: npm ci
+      - run: npm run lint
       - run: |
-          source .travis/before_install.sh
-          npm install
-          source .travis/script.sh
+          npm run build
+          ls -l lib
+          test -r lib/index.iife.js
+          test -r lib/index.cjs.js
+          test -r lib/index.esm.js
+      - run: npm run doc
+      - run: npm run codecov
+      - run: |
+          sh -c "$(curl -sSfL https://release.solana.com/edge/install)"
+          echo "$HOME/.local/share/solana/install/active_release/bin" >> $GITHUB_PATH
+          PATH="$HOME/.local/share/solana/install/active_release/bin:$PATH"
+          solana --version
+      - run: npm run test:live-with-test-validator

.travis.yml

@@ -78,24 +78,6 @@ jobs:
     #    - sudo apt-get install libssl-dev libudev-dev
 
     # docs pull request
-#     - name: "explorer"
-#       if: type = pull_request AND branch = master
-
-#       language: node_js
-#       node_js:
-#         - "lts/*"
-
-#       cache:
-#         directories:
-#           - ~/.npm
-
-#       before_install:
-#         - .travis/affects.sh explorer/ .travis || travis_terminate 0
-#         - cd explorer
-
-#       script:
-#         - npm run build
-#         - npm run format
     - name: "docs"
       if: type IN (push, pull_request) OR tag IS present
       language: node_js

CONTRIBUTING.md

@@ -74,7 +74,7 @@ minutes to execute. Use that time to write a detailed problem description. Once
 the description is written and CI succeeds, click the "Ready to Review" button
 and add reviewers. Adding reviewers before CI succeeds is a fast path to losing
 reviewer engagement. Not only will they be notified and see the PR is not yet
-ready for them, they will also be bombarded with additional notifications
+ready for them, they will also be bombarded them with additional notifications
 each time you push a commit to get past CI or until they "mute" the PR. Once
 muted, you'll need to reach out over some other medium, such as Discord, to
 request they have another look. When you use draft PRs, no notifications are

Cargo.toml

@@ -1,15 +1,14 @@
 [workspace]
 members = [
-    "accountsdb-plugin-interface",
-    "accountsdb-plugin-manager",
-    "accounts-cluster-bench",
-    "bench-streamer",
-    "bench-tps",
+    "account-decoder",
     "accounts-bench",
+    "accounts-cluster-bench",
     "banking-bench",
     "banks-client",
     "banks-interface",
     "banks-server",
+    "bench-streamer",
+    "bench-tps",
     "bucket_map",
     "bloom",
     "clap-utils",
@@ -26,6 +25,8 @@ members = [
     "validator",
     "genesis",
     "genesis-utils",
+    "geyser-plugin-interface",
+    "geyser-plugin-manager",
     "gossip",
     "install",
     "keygen",
@@ -69,7 +70,6 @@ members = [
     "tokens",
     "transaction-dos",
     "transaction-status",
-    "account-decoder",
     "upload-perf",
     "net-utils",
     "version",
@@ -81,10 +81,13 @@ members = [
     "test-validator",
     "rpc-test",
     "client-test",
-    "zk-token-sdk",
-    "programs/zk-token-proof",
 ]
 
 exclude = [
     "programs/bpf",
 ]
+
+# TODO: Remove once the "simd-accel" feature from the reed-solomon-erasure
+# dependency is supported on Apple M1. v2 of the feature resolver is needed to
+# specify arch-specific features.
+resolver = "2"

LICENSE

@@ -1,4 +1,4 @@
-Copyright 2022 Solana Foundation.
+Copyright 2020 Solana Foundation.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

README.md

@@ -38,6 +38,12 @@ $ sudo apt-get update
 $ sudo apt-get install libssl-dev libudev-dev pkg-config zlib1g-dev llvm clang make
 ```
 
+On Mac M1s, make sure you set up your terminal & homebrew [to use](https://5balloons.info/correct-way-to-install-and-use-homebrew-on-m1-macs/) Rosetta. You can install it with:
+
+```bash
+$ softwareupdate --install-rosetta
+```
+
 ## **2. Download the source code.**
 
 ```bash
@@ -68,7 +74,7 @@ devnet.solana.com. Runs 24/7. Learn more about the [public clusters](https://doc
 
 # Benchmarking
 
-First, install the nightly build of rustc. `cargo bench` requires the use of the
+First install the nightly build of rustc. `cargo bench` requires use of the
 unstable features only available in the nightly build.
 
 ```bash
@@ -115,12 +121,12 @@ the reader to check and validate their accuracy and truthfulness.
 Furthermore, nothing in this project constitutes a solicitation for
 investment.
 
-Any content produced by SF or developer resources that SF provides are
+Any content produced by SF or developer resources that SF provides, are
 for educational and inspirational purposes only. SF does not encourage,
 induce or sanction the deployment, integration or use of any such
 applications (including the code comprising the Solana blockchain
 protocol) in violation of applicable laws or regulations and hereby
-prohibits any such deployment, integration or use. This includes the use of
+prohibits any such deployment, integration or use. This includes use of
 any such applications by the reader (a) in violation of export control
 or sanctions laws of the United States or any other applicable
 jurisdiction, (b) if the reader is located in or ordinarily resident in
@@ -133,7 +139,7 @@ prohibitions.
 The reader should be aware that U.S. export control and sanctions laws
 prohibit U.S. persons (and other persons that are subject to such laws)
 from transacting with persons in certain countries and territories or
-that are on the SDN list. As a project-based primarily on open-source
+that are on the SDN list. As a project based primarily on open-source
 software, it is possible that such sanctioned persons may nevertheless
 bypass prohibitions, obtain the code comprising the Solana blockchain
 protocol (or other project code or applications) and deploy, integrate,

RELEASE.md

@@ -94,7 +94,7 @@ Alternatively use the Github UI.
     ```
 1. Confirm that your freshly cut release branch is shown as `BETA_CHANNEL` and the previous release branch as `STABLE_CHANNEL`:
     ```
-    ci/channel-info.sh
+    ci/channel_info.sh
     ```
 
 ## Steps to Create a Release
@@ -152,5 +152,5 @@ appearing.  To check for progress:
 [Crates.io](https://crates.io/crates/solana) should have an updated Solana version.  This can take 2-3 hours, and sometimes fails in the `solana-secondary` job.
 If this happens and the error is non-fatal, click "Retry" on the "publish crate" job
 
-### Update software on testnet.solana.com
-See the documentation at https://github.com/solana-labs/cluster-ops/. devnet.solana.com and mainnet-beta.solana.com run stable releases that have been tested on testnet. Do not update devnet or mainnet-beta with a beta release.
+### Update software on devnet.solana.com/testnet.solana.com/mainnet-beta.solana.com
+See the documentation at https://github.com/solana-labs/cluster-ops/

account-decoder/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "solana-account-decoder"
-version = "1.10.1"
+version = "1.9.13"
 description = "Solana account decoder"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -16,15 +16,15 @@ bs58 = "0.4.0"
 bv = "0.11.1"
 Inflector = "0.11.4"
 lazy_static = "1.4.0"
-serde = "1.0.136"
+serde = "1.0.130"
 serde_derive = "1.0.103"
-serde_json = "1.0.79"
-solana-config-program = { path = "../programs/config", version = "=1.10.1" }
-solana-sdk = { path = "../sdk", version = "=1.10.1" }
-solana-vote-program = { path = "../programs/vote", version = "=1.10.1" }
+serde_json = "1.0.72"
+solana-config-program = { path = "../programs/config", version = "=1.9.13" }
+solana-sdk = { path = "../sdk", version = "=1.9.13" }
+solana-vote-program = { path = "../programs/vote", version = "=1.9.13" }
 spl-token = { version = "=3.2.0", features = ["no-entrypoint"] }
 thiserror = "1.0"
-zstd = "0.10.0"
+zstd = "0.9.0"
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]

account-decoder/src/lib.rs

@@ -33,7 +33,7 @@ pub type StringDecimals = String;
 pub const MAX_BASE58_BYTES: usize = 128;
 
 /// A duplicate representation of an Account for pretty JSON serialization
-#[derive(Serialize, Deserialize, Clone, Debug, PartialEq)]
+#[derive(Serialize, Deserialize, Clone, Debug)]
 #[serde(rename_all = "camelCase")]
 pub struct UiAccount {
     pub lamports: u64,
@@ -136,13 +136,16 @@ impl UiAccount {
             UiAccountData::Binary(blob, encoding) => match encoding {
                 UiAccountEncoding::Base58 => bs58::decode(blob).into_vec().ok(),
                 UiAccountEncoding::Base64 => base64::decode(blob).ok(),
-                UiAccountEncoding::Base64Zstd => base64::decode(blob).ok().and_then(|zstd_data| {
-                    let mut data = vec![];
-                    zstd::stream::read::Decoder::new(zstd_data.as_slice())
-                        .and_then(|mut reader| reader.read_to_end(&mut data))
-                        .map(|_| data)
-                        .ok()
-                }),
+                UiAccountEncoding::Base64Zstd => base64::decode(blob)
+                    .ok()
+                    .map(|zstd_data| {
+                        let mut data = vec![];
+                        zstd::stream::read::Decoder::new(zstd_data.as_slice())
+                            .and_then(|mut reader| reader.read_to_end(&mut data))
+                            .map(|_| data)
+                            .ok()
+                    })
+                    .flatten(),
                 UiAccountEncoding::Binary | UiAccountEncoding::JsonParsed => None,
             },
         }?;

accounts-bench/Cargo.toml

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

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.1"
+version = "1.9.13"
 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.1" }
-solana-clap-utils = { path = "../clap-utils", version = "=1.10.1" }
-solana-client = { path = "../client", version = "=1.10.1" }
-solana-faucet = { path = "../faucet", version = "=1.10.1" }
-solana-gossip = { path = "../gossip", version = "=1.10.1" }
-solana-logger = { path = "../logger", version = "=1.10.1" }
-solana-measure = { path = "../measure", version = "=1.10.1" }
-solana-net-utils = { path = "../net-utils", version = "=1.10.1" }
-solana-runtime = { path = "../runtime", version = "=1.10.1" }
-solana-sdk = { path = "../sdk", version = "=1.10.1" }
-solana-streamer = { path = "../streamer", version = "=1.10.1" }
-solana-transaction-status = { path = "../transaction-status", version = "=1.10.1" }
-solana-version = { path = "../version", version = "=1.10.1" }
+solana-account-decoder = { path = "../account-decoder", version = "=1.9.13" }
+solana-clap-utils = { path = "../clap-utils", version = "=1.9.13" }
+solana-client = { path = "../client", version = "=1.9.13" }
+solana-core = { path = "../core", version = "=1.9.13" }
+solana-faucet = { path = "../faucet", version = "=1.9.13" }
+solana-gossip = { path = "../gossip", version = "=1.9.13" }
+solana-logger = { path = "../logger", version = "=1.9.13" }
+solana-measure = { path = "../measure", version = "=1.9.13" }
+solana-net-utils = { path = "../net-utils", version = "=1.9.13" }
+solana-runtime = { path = "../runtime", version = "=1.9.13" }
+solana-sdk = { path = "../sdk", version = "=1.9.13" }
+solana-streamer = { path = "../streamer", version = "=1.9.13" }
+solana-test-validator = { path = "../test-validator", version = "=1.9.13" }
+solana-transaction-status = { path = "../transaction-status", version = "=1.9.13" }
+solana-version = { path = "../version", version = "=1.9.13" }
 spl-token = { version = "=3.2.0", features = ["no-entrypoint"] }
 
 [dev-dependencies]
-solana-core = { path = "../core", version = "=1.10.1" }
-solana-local-cluster = { path = "../local-cluster", version = "=1.10.1" }
-solana-test-validator = { path = "../test-validator", version = "=1.10.1" }
+solana-local-cluster = { path = "../local-cluster", version = "=1.9.13" }
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]

accounts-cluster-bench/src/main.rs

@@ -116,7 +116,7 @@ fn make_create_message(
 
     let instructions: Vec<_> = (0..num_instructions)
         .into_iter()
-        .flat_map(|_| {
+        .map(|_| {
             let program_id = if mint.is_some() {
                 inline_spl_token::id()
             } else {
@@ -148,6 +148,7 @@ fn make_create_message(
 
             instructions
         })
+        .flatten()
         .collect();
 
     Message::new(&instructions, Some(&keypair.pubkey()))

accountsdb-plugin-interface/README.md

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

accountsdb-plugin-interface/src/lib.rs

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

accountsdb-plugin-manager/Cargo.toml

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

banking-bench/Cargo.toml

@@ -2,7 +2,7 @@
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 edition = "2021"
 name = "solana-banking-bench"
-version = "1.10.1"
+version = "1.9.13"
 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.1" }
-solana-gossip = { path = "../gossip", version = "=1.10.1" }
-solana-ledger = { path = "../ledger", version = "=1.10.1" }
-solana-logger = { path = "../logger", version = "=1.10.1" }
-solana-measure = { path = "../measure", version = "=1.10.1" }
-solana-perf = { path = "../perf", version = "=1.10.1" }
-solana-poh = { path = "../poh", version = "=1.10.1" }
-solana-runtime = { path = "../runtime", version = "=1.10.1" }
-solana-streamer = { path = "../streamer", version = "=1.10.1" }
-solana-sdk = { path = "../sdk", version = "=1.10.1" }
-solana-version = { path = "../version", version = "=1.10.1" }
+solana-core = { path = "../core", version = "=1.9.13" }
+solana-gossip = { path = "../gossip", version = "=1.9.13" }
+solana-ledger = { path = "../ledger", version = "=1.9.13" }
+solana-logger = { path = "../logger", version = "=1.9.13" }
+solana-measure = { path = "../measure", version = "=1.9.13" }
+solana-perf = { path = "../perf", version = "=1.9.13" }
+solana-poh = { path = "../poh", version = "=1.9.13" }
+solana-runtime = { path = "../runtime", version = "=1.9.13" }
+solana-streamer = { path = "../streamer", version = "=1.9.13" }
+solana-sdk = { path = "../sdk", version = "=1.9.13" }
+solana-version = { path = "../version", version = "=1.9.13" }
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]

banking-bench/src/main.rs

@@ -1,7 +1,7 @@
 #![allow(clippy::integer_arithmetic)]
 use {
     clap::{crate_description, crate_name, value_t, App, Arg},
-    crossbeam_channel::{unbounded, Receiver},
+    crossbeam_channel::unbounded,
     log::*,
     rand::{thread_rng, Rng},
     rayon::prelude::*,
@@ -29,7 +29,7 @@ use {
     },
     solana_streamer::socket::SocketAddrSpace,
     std::{
-        sync::{atomic::Ordering, Arc, Mutex, RwLock},
+        sync::{atomic::Ordering, mpsc::Receiver, Arc, Mutex, RwLock},
         thread::sleep,
         time::{Duration, Instant},
     },
@@ -175,11 +175,6 @@ fn main() {
     let mut bank_forks = BankForks::new(bank0);
     let mut bank = bank_forks.working_bank();
 
-    // set cost tracker limits to MAX so it will not filter out TXs
-    bank.write_cost_tracker()
-        .unwrap()
-        .set_limits(std::u64::MAX, std::u64::MAX, std::u64::MAX);
-
     info!("threads: {} txs: {}", num_threads, total_num_transactions);
 
     let same_payer = matches.is_present("same_payer");
@@ -340,13 +335,6 @@ fn main() {
                 bank = bank_forks.working_bank();
                 insert_time.stop();
 
-                // set cost tracker limits to MAX so it will not filter out TXs
-                bank.write_cost_tracker().unwrap().set_limits(
-                    std::u64::MAX,
-                    std::u64::MAX,
-                    std::u64::MAX,
-                );
-
                 poh_recorder.lock().unwrap().set_bank(&bank);
                 assert!(poh_recorder.lock().unwrap().bank().is_some());
                 if bank.slot() > 32 {

banks-client/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "solana-banks-client"
-version = "1.10.1"
+version = "1.9.13"
 description = "Solana banks client"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -10,19 +10,19 @@ documentation = "https://docs.rs/solana-banks-client"
 edition = "2021"
 
 [dependencies]
-borsh = "0.9.3"
+borsh = "0.9.1"
 futures = "0.3"
-solana-banks-interface = { path = "../banks-interface", version = "=1.10.1" }
-solana-program = { path = "../sdk/program", version = "=1.10.1" }
-solana-sdk = { path = "../sdk", version = "=1.10.1" }
+solana-banks-interface = { path = "../banks-interface", version = "=1.9.13" }
+solana-program = { path = "../sdk/program", version = "=1.9.13" }
+solana-sdk = { path = "../sdk", version = "=1.9.13" }
 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-runtime = { path = "../runtime", version = "=1.10.1" }
-solana-banks-server = { path = "../banks-server", version = "=1.10.1" }
+solana-runtime = { path = "../runtime", version = "=1.9.13" }
+solana-banks-server = { path = "../banks-server", version = "=1.9.13" }
 
 [lib]
 crate-type = ["lib"]

banks-client/src/lib.rs

@@ -5,10 +5,8 @@
 //! but they are undocumented, may change over time, and are generally more
 //! cumbersome to use.
 
-pub use {
-    crate::error::BanksClientError,
-    solana_banks_interface::{BanksClient as TarpcClient, TransactionStatus},
-};
+pub use crate::error::BanksClientError;
+pub use solana_banks_interface::{BanksClient as TarpcClient, TransactionStatus};
 use {
     borsh::BorshDeserialize,
     futures::{future::join_all, Future, FutureExt, TryFutureExt},
@@ -23,7 +21,9 @@ use {
         message::Message,
         signature::Signature,
         transaction::{self, Transaction},
+        transport,
     },
+    std::io,
     tarpc::{
         client::{self, NewClient, RequestDispatch},
         context::{self, Context},
@@ -60,9 +60,10 @@ impl BanksClient {
         &mut self,
         ctx: Context,
         transaction: Transaction,
-    ) -> impl Future<Output = Result<(), BanksClientError>> + '_ {
+    ) -> impl Future<Output = io::Result<()>> + '_ {
         self.inner
             .send_transaction_with_context(ctx, transaction)
+            .map_err(BanksClientError::from) // Remove this when return Err type updated to BanksClientError
             .map_err(Into::into)
     }
 
@@ -74,10 +75,11 @@ impl BanksClient {
         &mut self,
         ctx: Context,
         commitment: CommitmentLevel,
-    ) -> impl Future<Output = Result<(FeeCalculator, Hash, u64), BanksClientError>> + '_ {
+    ) -> impl Future<Output = io::Result<(FeeCalculator, Hash, u64)>> + '_ {
         #[allow(deprecated)]
         self.inner
             .get_fees_with_commitment_and_context(ctx, commitment)
+            .map_err(BanksClientError::from) // Remove this when return Err type updated to BanksClientError
             .map_err(Into::into)
     }
 
@@ -85,9 +87,10 @@ impl BanksClient {
         &mut self,
         ctx: Context,
         signature: Signature,
-    ) -> impl Future<Output = Result<Option<TransactionStatus>, BanksClientError>> + '_ {
+    ) -> impl Future<Output = io::Result<Option<TransactionStatus>>> + '_ {
         self.inner
             .get_transaction_status_with_context(ctx, signature)
+            .map_err(BanksClientError::from) // Remove this when return Err type updated to BanksClientError
             .map_err(Into::into)
     }
 
@@ -95,9 +98,10 @@ impl BanksClient {
         &mut self,
         ctx: Context,
         commitment: CommitmentLevel,
-    ) -> impl Future<Output = Result<Slot, BanksClientError>> + '_ {
+    ) -> impl Future<Output = io::Result<Slot>> + '_ {
         self.inner
             .get_slot_with_context(ctx, commitment)
+            .map_err(BanksClientError::from) // Remove this when return Err type updated to BanksClientError
             .map_err(Into::into)
     }
 
@@ -105,9 +109,10 @@ impl BanksClient {
         &mut self,
         ctx: Context,
         commitment: CommitmentLevel,
-    ) -> impl Future<Output = Result<Slot, BanksClientError>> + '_ {
+    ) -> impl Future<Output = io::Result<Slot>> + '_ {
         self.inner
             .get_block_height_with_context(ctx, commitment)
+            .map_err(BanksClientError::from) // Remove this when return Err type updated to BanksClientError
             .map_err(Into::into)
     }
 
@@ -116,9 +121,10 @@ impl BanksClient {
         ctx: Context,
         transaction: Transaction,
         commitment: CommitmentLevel,
-    ) -> impl Future<Output = Result<Option<transaction::Result<()>>, BanksClientError>> + '_ {
+    ) -> impl Future<Output = io::Result<Option<transaction::Result<()>>>> + '_ {
         self.inner
             .process_transaction_with_commitment_and_context(ctx, transaction, commitment)
+            .map_err(BanksClientError::from) // Remove this when return Err type updated to BanksClientError
             .map_err(Into::into)
     }
 
@@ -143,9 +149,10 @@ impl BanksClient {
         ctx: Context,
         address: Pubkey,
         commitment: CommitmentLevel,
-    ) -> impl Future<Output = Result<Option<Account>, BanksClientError>> + '_ {
+    ) -> impl Future<Output = io::Result<Option<Account>>> + '_ {
         self.inner
             .get_account_with_commitment_and_context(ctx, address, commitment)
+            .map_err(BanksClientError::from) // Remove this when return Err type updated to BanksClientError
             .map_err(Into::into)
     }
 
@@ -155,7 +162,7 @@ impl BanksClient {
     pub fn send_transaction(
         &mut self,
         transaction: Transaction,
-    ) -> impl Future<Output = Result<(), BanksClientError>> + '_ {
+    ) -> impl Future<Output = io::Result<()>> + '_ {
         self.send_transaction_with_context(context::current(), transaction)
     }
 
@@ -168,25 +175,27 @@ impl BanksClient {
     )]
     pub fn get_fees(
         &mut self,
-    ) -> impl Future<Output = Result<(FeeCalculator, Hash, u64), BanksClientError>> + '_ {
+    ) -> impl Future<Output = io::Result<(FeeCalculator, Hash, u64)>> + '_ {
         #[allow(deprecated)]
         self.get_fees_with_commitment_and_context(context::current(), CommitmentLevel::default())
     }
 
     /// Return the cluster Sysvar
-    pub fn get_sysvar<T: Sysvar>(
-        &mut self,
-    ) -> impl Future<Output = Result<T, BanksClientError>> + '_ {
+    pub fn get_sysvar<T: Sysvar>(&mut self) -> impl Future<Output = io::Result<T>> + '_ {
         self.get_account(T::id()).map(|result| {
-            let sysvar = result?.ok_or(BanksClientError::ClientError("Sysvar not present"))?;
-            from_account::<T, _>(&sysvar).ok_or(BanksClientError::ClientError(
-                "Failed to deserialize sysvar",
-            ))
+            let sysvar = result?
+                .ok_or(BanksClientError::ClientError("Sysvar not present"))
+                .map_err(io::Error::from)?; // Remove this map when return Err type updated to BanksClientError
+            from_account::<T, _>(&sysvar)
+                .ok_or(BanksClientError::ClientError(
+                    "Failed to deserialize sysvar",
+                ))
+                .map_err(Into::into) // Remove this when return Err type updated to BanksClientError
         })
     }
 
     /// Return the cluster rent
-    pub fn get_rent(&mut self) -> impl Future<Output = Result<Rent, BanksClientError>> + '_ {
+    pub fn get_rent(&mut self) -> impl Future<Output = io::Result<Rent>> + '_ {
         self.get_sysvar::<Rent>()
     }
 
@@ -194,9 +203,7 @@ impl BanksClient {
     /// transactions with a blockhash that has not yet expired. Use the `get_fees`
     /// method to get both a blockhash and the blockhash's last valid slot.
     #[deprecated(since = "1.9.0", note = "Please use `get_latest_blockhash` instead")]
-    pub fn get_recent_blockhash(
-        &mut self,
-    ) -> impl Future<Output = Result<Hash, BanksClientError>> + '_ {
+    pub fn get_recent_blockhash(&mut self) -> impl Future<Output = io::Result<Hash>> + '_ {
         #[allow(deprecated)]
         self.get_fees().map(|result| Ok(result?.1))
     }
@@ -207,7 +214,7 @@ impl BanksClient {
         &mut self,
         transaction: Transaction,
         commitment: CommitmentLevel,
-    ) -> impl Future<Output = Result<(), BanksClientError>> + '_ {
+    ) -> impl Future<Output = transport::Result<()>> + '_ {
         let mut ctx = context::current();
         ctx.deadline += Duration::from_secs(50);
         self.process_transaction_with_commitment_and_context(ctx, transaction, commitment)
@@ -217,6 +224,7 @@ impl BanksClient {
                 )),
                 Some(transaction_result) => Ok(transaction_result?),
             })
+            .map_err(Into::into) // Remove this when return Err type updated to BanksClientError
     }
 
     /// Send a transaction and return any preflight (sanitization or simulation) errors, or return
@@ -271,7 +279,7 @@ impl BanksClient {
     pub fn process_transaction(
         &mut self,
         transaction: Transaction,
-    ) -> impl Future<Output = Result<(), BanksClientError>> + '_ {
+    ) -> impl Future<Output = transport::Result<()>> + '_ {
         self.process_transaction_with_commitment(transaction, CommitmentLevel::default())
     }
 
@@ -279,7 +287,7 @@ impl BanksClient {
         &mut self,
         transactions: Vec<Transaction>,
         commitment: CommitmentLevel,
-    ) -> Result<(), BanksClientError> {
+    ) -> transport::Result<()> {
         let mut clients: Vec<_> = transactions.iter().map(|_| self.clone()).collect();
         let futures = clients
             .iter_mut()
@@ -295,21 +303,19 @@ impl BanksClient {
     pub fn process_transactions(
         &mut self,
         transactions: Vec<Transaction>,
-    ) -> impl Future<Output = Result<(), BanksClientError>> + '_ {
+    ) -> impl Future<Output = transport::Result<()>> + '_ {
         self.process_transactions_with_commitment(transactions, CommitmentLevel::default())
     }
 
     /// Return the most recent rooted slot. All transactions at or below this slot
     /// are said to be finalized. The cluster will not fork to a higher slot.
-    pub fn get_root_slot(&mut self) -> impl Future<Output = Result<Slot, BanksClientError>> + '_ {
+    pub fn get_root_slot(&mut self) -> impl Future<Output = io::Result<Slot>> + '_ {
         self.get_slot_with_context(context::current(), CommitmentLevel::default())
     }
 
     /// Return the most recent rooted block height. All transactions at or below this height
     /// are said to be finalized. The cluster will not fork to a higher block height.
-    pub fn get_root_block_height(
-        &mut self,
-    ) -> impl Future<Output = Result<Slot, BanksClientError>> + '_ {
+    pub fn get_root_block_height(&mut self) -> impl Future<Output = io::Result<Slot>> + '_ {
         self.get_block_height_with_context(context::current(), CommitmentLevel::default())
     }
 
@@ -319,7 +325,7 @@ impl BanksClient {
         &mut self,
         address: Pubkey,
         commitment: CommitmentLevel,
-    ) -> impl Future<Output = Result<Option<Account>, BanksClientError>> + '_ {
+    ) -> impl Future<Output = io::Result<Option<Account>>> + '_ {
         self.get_account_with_commitment_and_context(context::current(), address, commitment)
     }
 
@@ -328,7 +334,7 @@ impl BanksClient {
     pub fn get_account(
         &mut self,
         address: Pubkey,
-    ) -> impl Future<Output = Result<Option<Account>, BanksClientError>> + '_ {
+    ) -> impl Future<Output = io::Result<Option<Account>>> + '_ {
         self.get_account_with_commitment(address, CommitmentLevel::default())
     }
 
@@ -337,11 +343,14 @@ impl BanksClient {
     pub fn get_packed_account_data<T: Pack>(
         &mut self,
         address: Pubkey,
-    ) -> impl Future<Output = Result<T, BanksClientError>> + '_ {
+    ) -> impl Future<Output = io::Result<T>> + '_ {
         self.get_account(address).map(|result| {
-            let account = result?.ok_or(BanksClientError::ClientError("Account not found"))?;
+            let account = result?
+                .ok_or(BanksClientError::ClientError("Account not found"))
+                .map_err(io::Error::from)?; // Remove this map when return Err type updated to BanksClientError
             T::unpack_from_slice(&account.data)
                 .map_err(|_| BanksClientError::ClientError("Failed to deserialize account"))
+                .map_err(Into::into) // Remove this when return Err type updated to BanksClientError
         })
     }
 
@@ -350,7 +359,7 @@ impl BanksClient {
     pub fn get_account_data_with_borsh<T: BorshDeserialize>(
         &mut self,
         address: Pubkey,
-    ) -> impl Future<Output = Result<T, BanksClientError>> + '_ {
+    ) -> impl Future<Output = io::Result<T>> + '_ {
         self.get_account(address).map(|result| {
             let account = result?.ok_or(BanksClientError::ClientError("Account not found"))?;
             T::try_from_slice(&account.data).map_err(Into::into)
@@ -363,17 +372,14 @@ impl BanksClient {
         &mut self,
         address: Pubkey,
         commitment: CommitmentLevel,
-    ) -> impl Future<Output = Result<u64, BanksClientError>> + '_ {
+    ) -> impl Future<Output = io::Result<u64>> + '_ {
         self.get_account_with_commitment_and_context(context::current(), address, commitment)
             .map(|result| Ok(result?.map(|x| x.lamports).unwrap_or(0)))
     }
 
     /// Return the balance in lamports of an account at the given address at the time
     /// of the most recent root slot.
-    pub fn get_balance(
-        &mut self,
-        address: Pubkey,
-    ) -> impl Future<Output = Result<u64, BanksClientError>> + '_ {
+    pub fn get_balance(&mut self, address: Pubkey) -> impl Future<Output = io::Result<u64>> + '_ {
         self.get_balance_with_commitment(address, CommitmentLevel::default())
     }
 
@@ -385,7 +391,7 @@ impl BanksClient {
     pub fn get_transaction_status(
         &mut self,
         signature: Signature,
-    ) -> impl Future<Output = Result<Option<TransactionStatus>, BanksClientError>> + '_ {
+    ) -> impl Future<Output = io::Result<Option<TransactionStatus>>> + '_ {
         self.get_transaction_status_with_context(context::current(), signature)
     }
 
@@ -393,7 +399,7 @@ impl BanksClient {
     pub async fn get_transaction_statuses(
         &mut self,
         signatures: Vec<Signature>,
-    ) -> Result<Vec<Option<TransactionStatus>>, BanksClientError> {
+    ) -> io::Result<Vec<Option<TransactionStatus>>> {
         // tarpc futures oddly hold a mutable reference back to the client so clone the client upfront
         let mut clients_and_signatures: Vec<_> = signatures
             .into_iter()
@@ -410,9 +416,7 @@ impl BanksClient {
         statuses.into_iter().collect()
     }
 
-    pub fn get_latest_blockhash(
-        &mut self,
-    ) -> impl Future<Output = Result<Hash, BanksClientError>> + '_ {
+    pub fn get_latest_blockhash(&mut self) -> impl Future<Output = io::Result<Hash>> + '_ {
         self.get_latest_blockhash_with_commitment(CommitmentLevel::default())
             .map(|result| {
                 result?
@@ -425,7 +429,7 @@ impl BanksClient {
     pub fn get_latest_blockhash_with_commitment(
         &mut self,
         commitment: CommitmentLevel,
-    ) -> impl Future<Output = Result<Option<(Hash, u64)>, BanksClientError>> + '_ {
+    ) -> impl Future<Output = io::Result<Option<(Hash, u64)>>> + '_ {
         self.get_latest_blockhash_with_commitment_and_context(context::current(), commitment)
     }
 
@@ -433,9 +437,10 @@ impl BanksClient {
         &mut self,
         ctx: Context,
         commitment: CommitmentLevel,
-    ) -> impl Future<Output = Result<Option<(Hash, u64)>, BanksClientError>> + '_ {
+    ) -> impl Future<Output = io::Result<Option<(Hash, u64)>>> + '_ {
         self.inner
             .get_latest_blockhash_with_commitment_and_context(ctx, commitment)
+            .map_err(BanksClientError::from) // Remove this when return Err type updated to BanksClientError
             .map_err(Into::into)
     }
 
@@ -444,14 +449,15 @@ impl BanksClient {
         ctx: Context,
         commitment: CommitmentLevel,
         message: Message,
-    ) -> impl Future<Output = Result<Option<u64>, BanksClientError>> + '_ {
+    ) -> impl Future<Output = io::Result<Option<u64>>> + '_ {
         self.inner
             .get_fee_for_message_with_commitment_and_context(ctx, commitment, message)
+            .map_err(BanksClientError::from) // Remove this when return Err type updated to BanksClientError
             .map_err(Into::into)
     }
 }
 
-pub async fn start_client<C>(transport: C) -> Result<BanksClient, BanksClientError>
+pub async fn start_client<C>(transport: C) -> io::Result<BanksClient>
 where
     C: Transport<ClientMessage<BanksRequest>, Response<BanksResponse>> + Send + 'static,
 {
@@ -460,7 +466,7 @@ where
     })
 }
 
-pub async fn start_tcp_client<T: ToSocketAddrs>(addr: T) -> Result<BanksClient, BanksClientError> {
+pub async fn start_tcp_client<T: ToSocketAddrs>(addr: T) -> io::Result<BanksClient> {
     let transport = tcp::connect(addr, Bincode::default).await?;
     Ok(BanksClient {
         inner: TarpcClient::new(client::Config::default(), transport).spawn(),

banks-interface/Cargo.toml

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

banks-server/Cargo.toml

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

banks-server/src/banks_server.rs

@@ -1,6 +1,5 @@
 use {
     bincode::{deserialize, serialize},
-    crossbeam_channel::{unbounded, Receiver, Sender},
     futures::{future, prelude::stream::StreamExt},
     solana_banks_interface::{
         Banks, BanksRequest, BanksResponse, BanksTransactionResultWithSimulation,
@@ -31,7 +30,10 @@ use {
         convert::TryFrom,
         io,
         net::{Ipv4Addr, SocketAddr},
-        sync::{Arc, RwLock},
+        sync::{
+            mpsc::{channel, Receiver, Sender},
+            Arc, RwLock,
+        },
         thread::Builder,
         time::Duration,
     },
@@ -94,7 +96,7 @@ impl BanksServer {
         block_commitment_cache: Arc<RwLock<BlockCommitmentCache>>,
         poll_signature_status_sleep_duration: Duration,
     ) -> Self {
-        let (transaction_sender, transaction_receiver) = unbounded();
+        let (transaction_sender, transaction_receiver) = channel();
         let bank = bank_forks.read().unwrap().working_bank();
         let slot = bank.slot();
         {
@@ -390,7 +392,7 @@ pub async fn start_tcp_server(
         // serve is generated by the service attribute. It takes as input any type implementing
         // the generated Banks trait.
         .map(move |chan| {
-            let (sender, receiver) = unbounded();
+            let (sender, receiver) = channel();
 
             SendTransactionService::new::<NullTpuInfo>(
                 tpu_addr,

bench-streamer/Cargo.toml

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

bench-streamer/src/main.rs

@@ -1,7 +1,6 @@
 #![allow(clippy::integer_arithmetic)]
 use {
-    clap::{crate_description, crate_name, value_t, App, Arg},
-    crossbeam_channel::unbounded,
+    clap::{crate_description, crate_name, App, Arg},
     solana_streamer::{
         packet::{Packet, PacketBatch, PacketBatchRecycler, PACKET_DATA_SIZE},
         streamer::{receiver, PacketBatchReceiver},
@@ -11,6 +10,7 @@ use {
         net::{IpAddr, Ipv4Addr, SocketAddr, UdpSocket},
         sync::{
             atomic::{AtomicBool, AtomicUsize, Ordering},
+            mpsc::channel,
             Arc,
         },
         thread::{sleep, spawn, JoinHandle, Result},
@@ -67,22 +67,13 @@ fn main() -> Result<()> {
                 .takes_value(true)
                 .help("Use NUM receive sockets"),
         )
-        .arg(
-            Arg::with_name("num-producers")
-                .long("num-producers")
-                .value_name("NUM")
-                .takes_value(true)
-                .help("Use this many producer threads."),
-        )
         .get_matches();
 
     if let Some(n) = matches.value_of("num-recv-sockets") {
         num_sockets = max(num_sockets, n.to_string().parse().expect("integer"));
     }
 
-    let num_producers = value_t!(matches, "num_producers", u64).unwrap_or(4);
-
-    let port = 0;
+    let mut port = 0;
     let ip_addr = IpAddr::V4(Ipv4Addr::new(0, 0, 0, 0));
     let mut addr = SocketAddr::new(ip_addr, 0);
 
@@ -91,17 +82,14 @@ fn main() -> Result<()> {
     let mut read_channels = Vec::new();
     let mut read_threads = Vec::new();
     let recycler = PacketBatchRecycler::default();
-    let (_port, read_sockets) = solana_net_utils::multi_bind_in_range(
-        ip_addr,
-        (port, port + num_sockets as u16),
-        num_sockets,
-    )
-    .unwrap();
-    for read in read_sockets {
+    for _ in 0..num_sockets {
+        let read = solana_net_utils::bind_to(ip_addr, port, false).unwrap();
         read.set_read_timeout(Some(Duration::new(1, 0))).unwrap();
 
         addr = read.local_addr().unwrap();
-        let (s_reader, r_reader) = unbounded();
+        port = addr.port();
+
+        let (s_reader, r_reader) = channel();
         read_channels.push(r_reader);
         read_threads.push(receiver(
             Arc::new(read),
@@ -114,10 +102,9 @@ fn main() -> Result<()> {
         ));
     }
 
-    let producer_threads: Vec<_> = (0..num_producers)
-        .into_iter()
-        .map(|_| producer(&addr, exit.clone()))
-        .collect();
+    let t_producer1 = producer(&addr, exit.clone());
+    let t_producer2 = producer(&addr, exit.clone());
+    let t_producer3 = producer(&addr, exit.clone());
 
     let rvs = Arc::new(AtomicUsize::new(0));
     let sink_threads: Vec<_> = read_channels
@@ -137,9 +124,9 @@ fn main() -> Result<()> {
     for t_reader in read_threads {
         t_reader.join()?;
     }
-    for t_producer in producer_threads {
-        t_producer.join()?;
-    }
+    t_producer1.join()?;
+    t_producer2.join()?;
+    t_producer3.join()?;
     for t_sink in sink_threads {
         t_sink.join()?;
     }

bench-tps/Cargo.toml

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

bench-tps/src/bench.rs

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

bench-tps/tests/bench_tps.rs

@@ -1,6 +1,5 @@
 #![allow(clippy::integer_arithmetic)]
 use {
-    crossbeam_channel::unbounded,
     serial_test::serial,
     solana_bench_tps::{
         bench::{do_bench_tps, generate_and_fund_keypairs},
@@ -16,7 +15,10 @@ use {
     },
     solana_sdk::signature::{Keypair, Signer},
     solana_streamer::socket::SocketAddrSpace,
-    std::{sync::Arc, time::Duration},
+    std::{
+        sync::{mpsc::channel, Arc},
+        time::Duration,
+    },
 };
 
 fn test_bench_tps_local_cluster(config: Config) {
@@ -50,7 +52,7 @@ fn test_bench_tps_local_cluster(config: Config) {
         VALIDATOR_PORT_RANGE,
     ));
 
-    let (addr_sender, addr_receiver) = unbounded();
+    let (addr_sender, addr_receiver) = channel();
     run_local_faucet_with_port(faucet_keypair, addr_sender, None, 0);
     let faucet_addr = addr_receiver
         .recv_timeout(Duration::from_secs(2))

bloom/Cargo.toml

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

bucket_map/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "solana-bucket-map"
-version = "1.10.1"
+version = "1.9.13"
 description = "solana-bucket-map"
 homepage = "https://solana.com/"
 documentation = "https://docs.rs/solana-bucket-map"
@@ -11,18 +11,15 @@ license = "Apache-2.0"
 edition = "2021"
 
 [dependencies]
-solana-sdk = { path = "../sdk", version = "=1.10.1" }
-memmap2 = "0.5.3"
-log = { version = "0.4.11" }
-solana-measure = { path = "../measure", version = "=1.10.1" }
-rand = "0.7.0"
-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.1" }
+solana-logger = { path = "../logger", version = "=1.9.13" }
+solana-sdk = { path = "../sdk", version = "=1.9.13" }
+memmap2 = "0.5.0"
+log = { version = "0.4.11" }
+solana-measure = { path = "../measure", version = "=1.9.13" }
+rand = "0.7.0"
+fs_extra = "1.2.0"
+tempfile = "3.2.0"
 
 [lib]
 crate-type = ["lib"]

bucket_map/src/bucket.rs

@@ -3,7 +3,7 @@ use {
         bucket_item::BucketItem,
         bucket_map::BucketMapError,
         bucket_stats::BucketMapStats,
-        bucket_storage::{BucketStorage, Uid, DEFAULT_CAPACITY_POW2},
+        bucket_storage::{BucketStorage, Uid, DEFAULT_CAPACITY_POW2, UID_UNLOCKED},
         index_entry::IndexEntry,
         MaxSearch, RefCount,
     },
@@ -17,7 +17,7 @@ use {
         ops::RangeBounds,
         path::PathBuf,
         sync::{
-            atomic::{AtomicU64, AtomicUsize, Ordering},
+            atomic::{AtomicUsize, Ordering},
             Arc, Mutex,
         },
     },
@@ -81,7 +81,6 @@ impl<T: Clone + Copy> Bucket<T> {
         drives: Arc<Vec<PathBuf>>,
         max_search: MaxSearch,
         stats: Arc<BucketMapStats>,
-        count: Arc<AtomicU64>,
     ) -> Self {
         let index = BucketStorage::new(
             Arc::clone(&drives),
@@ -89,7 +88,6 @@ impl<T: Clone + Copy> Bucket<T> {
             std::mem::size_of::<IndexEntry>() as u64,
             max_search,
             Arc::clone(&stats.index),
-            count,
         );
         Self {
             random: thread_rng().gen(),
@@ -102,10 +100,14 @@ impl<T: Clone + Copy> Bucket<T> {
         }
     }
 
+    pub fn bucket_len(&self) -> u64 {
+        self.index.used.load(Ordering::Relaxed)
+    }
+
     pub fn keys(&self) -> Vec<Pubkey> {
         let mut rv = vec![];
         for i in 0..self.index.capacity() {
-            if self.index.is_free(i) {
+            if self.index.uid(i) == UID_UNLOCKED {
                 continue;
             }
             let ix: &IndexEntry = self.index.get(i);
@@ -118,10 +120,10 @@ impl<T: Clone + Copy> Bucket<T> {
     where
         R: RangeBounds<Pubkey>,
     {
-        let mut result = Vec::with_capacity(self.index.count.load(Ordering::Relaxed) as usize);
+        let mut result = Vec::with_capacity(self.index.used.load(Ordering::Relaxed) as usize);
         for i in 0..self.index.capacity() {
             let ii = i % self.index.capacity();
-            if self.index.is_free(ii) {
+            if self.index.uid(ii) == UID_UNLOCKED {
                 continue;
             }
             let ix: &IndexEntry = self.index.get(ii);
@@ -154,7 +156,7 @@ impl<T: Clone + Copy> Bucket<T> {
         let ix = Self::bucket_index_ix(index, key, random);
         for i in ix..ix + index.max_search() {
             let ii = i % index.capacity();
-            if index.is_free(ii) {
+            if index.uid(ii) == UID_UNLOCKED {
                 continue;
             }
             let elem: &mut IndexEntry = index.get_mut(ii);
@@ -173,7 +175,7 @@ impl<T: Clone + Copy> Bucket<T> {
         let ix = Self::bucket_index_ix(index, key, random);
         for i in ix..ix + index.max_search() {
             let ii = i % index.capacity();
-            if index.is_free(ii) {
+            if index.uid(ii) == UID_UNLOCKED {
                 continue;
             }
             let elem: &IndexEntry = index.get(ii);
@@ -185,23 +187,26 @@ impl<T: Clone + Copy> Bucket<T> {
     }
 
     fn bucket_create_key(
-        index: &mut BucketStorage,
+        index: &BucketStorage,
         key: &Pubkey,
         elem_uid: Uid,
         random: u64,
-        is_resizing: bool,
     ) -> Result<u64, BucketMapError> {
         let ix = Self::bucket_index_ix(index, key, random);
         for i in ix..ix + index.max_search() {
             let ii = i as u64 % index.capacity();
-            if !index.is_free(ii) {
+            if index.uid(ii) != UID_UNLOCKED {
                 continue;
             }
-            index.allocate(ii, elem_uid, is_resizing).unwrap();
-            let elem: &mut IndexEntry = index.get_mut(ii);
-            // These fields will be overwritten after allocation by callers.
+            index.allocate(ii, elem_uid).unwrap();
+            let mut elem: &mut IndexEntry = index.get_mut(ii);
+            elem.key = *key;
+            // These will be overwritten after allocation by callers.
             // Since this part of the mmapped file could have previously been used by someone else, there can be garbage here.
-            elem.init(key);
+            elem.ref_count = 0;
+            elem.storage_offset = 0;
+            elem.storage_capacity_when_created_pow2 = 0;
+            elem.num_slots = 0;
             //debug!(                "INDEX ALLOC {:?} {} {} {}",                key, ii, index.capacity, elem_uid            );
             return Ok(ii);
         }
@@ -220,14 +225,8 @@ impl<T: Clone + Copy> Bucket<T> {
         Some(elem.ref_count)
     }
 
-    fn create_key(&mut self, key: &Pubkey) -> Result<u64, BucketMapError> {
-        Self::bucket_create_key(
-            &mut self.index,
-            key,
-            IndexEntry::key_uid(key),
-            self.random,
-            false,
-        )
+    fn create_key(&self, key: &Pubkey) -> Result<u64, BucketMapError> {
+        Self::bucket_create_key(&self.index, key, IndexEntry::key_uid(key), self.random)
     }
 
     pub fn read_value(&self, key: &Pubkey) -> Option<(&[T], RefCount)> {
@@ -257,17 +256,16 @@ impl<T: Clone + Copy> Bucket<T> {
             Some(res) => res,
         };
         elem.ref_count = ref_count;
-        let elem_uid = self.index.uid_unchecked(elem_ix);
+        let elem_uid = self.index.uid(elem_ix);
         let bucket_ix = elem.data_bucket_ix();
         let current_bucket = &self.data[bucket_ix as usize];
-        let num_slots = data.len() as u64;
         if best_fit_bucket == bucket_ix && elem.num_slots > 0 {
             // in place update
             let elem_loc = elem.data_loc(current_bucket);
             let slice: &mut [T] = current_bucket.get_mut_cell_slice(elem_loc, data.len() as u64);
-            assert_eq!(current_bucket.uid(elem_loc), Some(elem_uid));
-            elem.num_slots = num_slots;
-            slice.copy_from_slice(data);
+            assert!(current_bucket.uid(elem_loc) == elem_uid);
+            elem.num_slots = data.len() as u64;
+            slice.clone_from_slice(data);
             Ok(())
         } else {
             // need to move the allocation to a best fit spot
@@ -277,21 +275,18 @@ impl<T: Clone + Copy> Bucket<T> {
             let pos = thread_rng().gen_range(0, cap);
             for i in pos..pos + self.index.max_search() {
                 let ix = i % cap;
-                if best_bucket.is_free(ix) {
+                if best_bucket.uid(ix) == UID_UNLOCKED {
                     let elem_loc = elem.data_loc(current_bucket);
-                    let old_slots = elem.num_slots;
-                    elem.set_storage_offset(ix);
-                    elem.set_storage_capacity_when_created_pow2(best_bucket.capacity_pow2);
-                    elem.num_slots = num_slots;
-                    if old_slots > 0 {
-                        let current_bucket = &mut self.data[bucket_ix as usize];
+                    if elem.num_slots > 0 {
                         current_bucket.free(elem_loc, elem_uid);
                     }
+                    elem.storage_offset = ix;
+                    elem.storage_capacity_when_created_pow2 = best_bucket.capacity_pow2;
+                    elem.num_slots = data.len() as u64;
                     //debug!(                        "DATA ALLOC {:?} {} {} {}",                        key, elem.data_location, best_bucket.capacity, elem_uid                    );
-                    if num_slots > 0 {
-                        let best_bucket = &mut self.data[best_fit_bucket as usize];
-                        best_bucket.allocate(ix, elem_uid, false).unwrap();
-                        let slice = best_bucket.get_mut_cell_slice(ix, num_slots);
+                    if elem.num_slots > 0 {
+                        best_bucket.allocate(ix, elem_uid).unwrap();
+                        let slice = best_bucket.get_mut_cell_slice(ix, data.len() as u64);
                         slice.copy_from_slice(data);
                     }
                     return Ok(());
@@ -303,12 +298,10 @@ impl<T: Clone + Copy> Bucket<T> {
 
     pub fn delete_key(&mut self, key: &Pubkey) {
         if let Some((elem, elem_ix)) = self.find_entry(key) {
-            let elem_uid = self.index.uid_unchecked(elem_ix);
+            let elem_uid = self.index.uid(elem_ix);
             if elem.num_slots > 0 {
-                let ix = elem.data_bucket_ix() as usize;
-                let data_bucket = &self.data[ix];
+                let data_bucket = &self.data[elem.data_bucket_ix() as usize];
                 let loc = elem.data_loc(data_bucket);
-                let data_bucket = &mut self.data[ix];
                 //debug!(                    "DATA FREE {:?} {} {} {}",                    key, elem.data_location, data_bucket.capacity, elem_uid                );
                 data_bucket.free(loc, elem_uid);
             }
@@ -326,7 +319,7 @@ impl<T: Clone + Copy> Bucket<T> {
                 //increasing the capacity by ^4 reduces the
                 //likelyhood of a re-index collision of 2^(max_search)^2
                 //1 in 2^32
-                let mut index = BucketStorage::new_with_capacity(
+                let index = BucketStorage::new_with_capacity(
                     Arc::clone(&self.drives),
                     1,
                     std::mem::size_of::<IndexEntry>() as u64,
@@ -334,16 +327,14 @@ impl<T: Clone + Copy> Bucket<T> {
                     self.index.capacity_pow2 + i, // * 2,
                     self.index.max_search,
                     Arc::clone(&self.stats.index),
-                    Arc::clone(&self.index.count),
                 );
                 let random = thread_rng().gen();
                 let mut valid = true;
                 for ix in 0..self.index.capacity() {
                     let uid = self.index.uid(ix);
-                    if let Some(uid) = uid {
+                    if UID_UNLOCKED != uid {
                         let elem: &IndexEntry = self.index.get(ix);
-                        let new_ix =
-                            Self::bucket_create_key(&mut index, &elem.key, uid, random, true);
+                        let new_ix = Self::bucket_create_key(&index, &elem.key, uid, random);
                         if new_ix.is_err() {
                             valid = false;
                             break;
@@ -400,7 +391,6 @@ impl<T: Clone + Copy> Bucket<T> {
                     Self::elem_size(),
                     self.index.max_search,
                     Arc::clone(&self.stats.data),
-                    Arc::default(),
                 ))
             }
             self.data.push(bucket);

bucket_map/src/bucket_api.rs

@@ -30,13 +30,14 @@ impl<T: Clone + Copy> BucketApi<T> {
         drives: Arc<Vec<PathBuf>>,
         max_search: MaxSearch,
         stats: Arc<BucketMapStats>,
+        count: Arc<AtomicU64>,
     ) -> Self {
         Self {
             drives,
             max_search,
             stats,
             bucket: RwLock::default(),
-            count: Arc::default(),
+            count,
         }
     }
 
@@ -72,7 +73,12 @@ impl<T: Clone + Copy> BucketApi<T> {
     }
 
     pub fn bucket_len(&self) -> u64 {
-        self.count.load(Ordering::Relaxed)
+        self.bucket
+            .read()
+            .unwrap()
+            .as_ref()
+            .map(|bucket| bucket.bucket_len())
+            .unwrap_or_default()
     }
 
     pub fn delete_key(&self, key: &Pubkey) {
@@ -89,11 +95,11 @@ impl<T: Clone + Copy> BucketApi<T> {
                 Arc::clone(&self.drives),
                 self.max_search,
                 Arc::clone(&self.stats),
-                Arc::clone(&self.count),
             ));
         } else {
             let write = bucket.as_mut().unwrap();
             write.handle_delayed_grows();
+            self.count.store(write.bucket_len(), Ordering::Relaxed);
         }
         bucket
     }

bucket_map/src/bucket_map.rs

@@ -79,14 +79,21 @@ impl<T: Clone + Copy + Debug> BucketMap<T> {
         });
         let drives = Arc::new(drives);
 
-        let stats = Arc::default();
-        let buckets = (0..config.max_buckets)
-            .into_iter()
-            .map(|_| {
+        let mut per_bucket_count = Vec::with_capacity(config.max_buckets);
+        per_bucket_count.resize_with(config.max_buckets, Arc::default);
+        let stats = Arc::new(BucketMapStats {
+            per_bucket_count,
+            ..BucketMapStats::default()
+        });
+        let buckets = stats
+            .per_bucket_count
+            .iter()
+            .map(|per_bucket_count| {
                 Arc::new(BucketApi::new(
                     Arc::clone(&drives),
                     max_search,
                     Arc::clone(&stats),
+                    Arc::clone(per_bucket_count),
                 ))
             })
             .collect();

bucket_map/src/bucket_stats.rs

@@ -14,4 +14,5 @@ pub struct BucketStats {
 pub struct BucketMapStats {
     pub index: Arc<BucketStats>,
     pub data: Arc<BucketStats>,
+    pub per_bucket_count: Vec<Arc<AtomicU64>>,
 }

bucket_map/src/bucket_storage.rs

@@ -35,42 +35,27 @@ use {
 pub const DEFAULT_CAPACITY_POW2: u8 = 5;
 
 /// A Header UID of 0 indicates that the header is unlocked
-const UID_UNLOCKED: Uid = 0;
+pub(crate) const UID_UNLOCKED: Uid = 0;
 
 pub(crate) type Uid = u64;
 
 #[repr(C)]
 struct Header {
-    lock: u64,
+    lock: AtomicU64,
 }
 
 impl Header {
-    /// try to lock this entry with 'uid'
-    /// return true if it could be locked
-    fn try_lock(&mut self, uid: Uid) -> bool {
-        if self.lock == UID_UNLOCKED {
-            self.lock = uid;
-            true
-        } else {
-            false
-        }
+    fn try_lock(&self, uid: Uid) -> bool {
+        Ok(UID_UNLOCKED)
+            == self
+                .lock
+                .compare_exchange(UID_UNLOCKED, uid, Ordering::AcqRel, Ordering::Relaxed)
     }
-    /// mark this entry as unlocked
-    fn unlock(&mut self, expected: Uid) {
-        assert_eq!(expected, self.lock);
-        self.lock = UID_UNLOCKED;
+    fn unlock(&self) -> Uid {
+        self.lock.swap(UID_UNLOCKED, Ordering::Release)
     }
-    /// uid that has locked this entry or None if unlocked
-    fn uid(&self) -> Option<Uid> {
-        if self.lock == UID_UNLOCKED {
-            None
-        } else {
-            Some(self.lock)
-        }
-    }
-    /// true if this entry is unlocked
-    fn is_unlocked(&self) -> bool {
-        self.lock == UID_UNLOCKED
+    fn uid(&self) -> Uid {
+        self.lock.load(Ordering::Acquire)
     }
 }
 
@@ -79,7 +64,7 @@ pub struct BucketStorage {
     mmap: MmapMut,
     pub cell_size: u64,
     pub capacity_pow2: u8,
-    pub count: Arc<AtomicU64>,
+    pub used: AtomicU64,
     pub stats: Arc<BucketStats>,
     pub max_search: MaxSearch,
 }
@@ -103,7 +88,6 @@ impl BucketStorage {
         capacity_pow2: u8,
         max_search: MaxSearch,
         stats: Arc<BucketStats>,
-        count: Arc<AtomicU64>,
     ) -> Self {
         let cell_size = elem_size * num_elems + std::mem::size_of::<Header>() as u64;
         let (mmap, path) = Self::new_map(&drives, cell_size as usize, capacity_pow2, &stats);
@@ -111,7 +95,7 @@ impl BucketStorage {
             path,
             mmap,
             cell_size,
-            count,
+            used: AtomicU64::new(0),
             capacity_pow2,
             stats,
             max_search,
@@ -128,7 +112,6 @@ impl BucketStorage {
         elem_size: u64,
         max_search: MaxSearch,
         stats: Arc<BucketStats>,
-        count: Arc<AtomicU64>,
     ) -> Self {
         Self::new_with_capacity(
             drives,
@@ -137,74 +120,53 @@ impl BucketStorage {
             DEFAULT_CAPACITY_POW2,
             max_search,
             stats,
-            count,
         )
     }
 
-    /// return ref to header of item 'ix' in mmapped file
-    fn header_ptr(&self, ix: u64) -> &Header {
+    pub fn uid(&self, ix: u64) -> Uid {
+        assert!(ix < self.capacity(), "bad index size");
         let ix = (ix * self.cell_size) as usize;
         let hdr_slice: &[u8] = &self.mmap[ix..ix + std::mem::size_of::<Header>()];
         unsafe {
             let hdr = hdr_slice.as_ptr() as *const Header;
-            hdr.as_ref().unwrap()
+            return hdr.as_ref().unwrap().uid();
         }
     }
 
-    /// return ref to header of item 'ix' in mmapped file
-    fn header_mut_ptr(&mut self, ix: u64) -> &mut Header {
-        let ix = (ix * self.cell_size) as usize;
-        let hdr_slice: &mut [u8] = &mut self.mmap[ix..ix + std::mem::size_of::<Header>()];
-        unsafe {
-            let hdr = hdr_slice.as_mut_ptr() as *mut Header;
-            hdr.as_mut().unwrap()
-        }
-    }
-
-    /// return uid allocated at index 'ix' or None if vacant
-    pub fn uid(&self, ix: u64) -> Option<Uid> {
-        assert!(ix < self.capacity(), "bad index size");
-        self.header_ptr(ix).uid()
-    }
-
-    /// true if the entry at index 'ix' is free (as opposed to being allocated)
-    pub fn is_free(&self, ix: u64) -> bool {
-        // note that the terminology in the implementation is locked or unlocked.
-        // but our api is allocate/free
-        self.header_ptr(ix).is_unlocked()
-    }
-
-    /// caller knows id is not empty
-    pub fn uid_unchecked(&self, ix: u64) -> Uid {
-        self.uid(ix).unwrap()
-    }
-
-    /// 'is_resizing' true if caller is resizing the index (so don't increment count)
-    /// 'is_resizing' false if caller is adding an item to the index (so increment count)
-    pub fn allocate(
-        &mut self,
-        ix: u64,
-        uid: Uid,
-        is_resizing: bool,
-    ) -> Result<(), BucketStorageError> {
+    pub fn allocate(&self, ix: u64, uid: Uid) -> Result<(), BucketStorageError> {
         assert!(ix < self.capacity(), "allocate: bad index size");
         assert!(UID_UNLOCKED != uid, "allocate: bad uid");
         let mut e = Err(BucketStorageError::AlreadyAllocated);
+        let ix = (ix * self.cell_size) as usize;
         //debug!("ALLOC {} {}", ix, uid);
-        if self.header_mut_ptr(ix).try_lock(uid) {
-            e = Ok(());
-            if !is_resizing {
-                self.count.fetch_add(1, Ordering::Relaxed);
+        let hdr_slice: &[u8] = &self.mmap[ix..ix + std::mem::size_of::<Header>()];
+        unsafe {
+            let hdr = hdr_slice.as_ptr() as *const Header;
+            if hdr.as_ref().unwrap().try_lock(uid) {
+                e = Ok(());
+                self.used.fetch_add(1, Ordering::Relaxed);
             }
-        }
+        };
         e
     }
 
-    pub fn free(&mut self, ix: u64, uid: Uid) {
+    pub fn free(&self, ix: u64, uid: Uid) {
         assert!(ix < self.capacity(), "bad index size");
         assert!(UID_UNLOCKED != uid, "free: bad uid");
-        self.header_mut_ptr(ix).unlock(uid);
-        self.count.fetch_sub(1, Ordering::Relaxed);
+        let ix = (ix * self.cell_size) as usize;
+        //debug!("FREE {} {}", ix, uid);
+        let hdr_slice: &[u8] = &self.mmap[ix..ix + std::mem::size_of::<Header>()];
+        unsafe {
+            let hdr = hdr_slice.as_ptr() as *const Header;
+            //debug!("FREE uid: {}", hdr.as_ref().unwrap().uid());
+            let previous_uid = hdr.as_ref().unwrap().unlock();
+            assert_eq!(
+                previous_uid, uid,
+                "free: unlocked a header with a differet uid: {}",
+                previous_uid
+            );
+            self.used.fetch_sub(1, Ordering::Relaxed);
+        }
     }
 
     pub fn get<T: Sized>(&self, ix: u64) -> &T {
@@ -362,9 +324,6 @@ impl BucketStorage {
             capacity_pow_2,
             max_search,
             Arc::clone(stats),
-            bucket
-                .map(|bucket| Arc::clone(&bucket.count))
-                .unwrap_or_default(),
         );
         if let Some(bucket) = bucket {
             new_bucket.copy_contents(bucket);
@@ -382,43 +341,3 @@ impl BucketStorage {
         1 << self.capacity_pow2
     }
 }
-
-#[cfg(test)]
-mod test {
-    use super::*;
-
-    #[test]
-    fn test_bucket_storage() {
-        let tmpdir1 = std::env::temp_dir().join("bucket_map_test_mt");
-        let paths: Vec<PathBuf> = [tmpdir1]
-            .iter()
-            .filter(|x| std::fs::create_dir_all(x).is_ok())
-            .cloned()
-            .collect();
-        assert!(!paths.is_empty());
-
-        let mut storage =
-            BucketStorage::new(Arc::new(paths), 1, 1, 1, Arc::default(), Arc::default());
-        let ix = 0;
-        let uid = Uid::MAX;
-        assert!(storage.is_free(ix));
-        assert!(storage.allocate(ix, uid, false).is_ok());
-        assert!(storage.allocate(ix, uid, false).is_err());
-        assert!(!storage.is_free(ix));
-        assert_eq!(storage.uid(ix), Some(uid));
-        assert_eq!(storage.uid_unchecked(ix), uid);
-        storage.free(ix, uid);
-        assert!(storage.is_free(ix));
-        assert_eq!(storage.uid(ix), None);
-        let uid = 1;
-        assert!(storage.is_free(ix));
-        assert!(storage.allocate(ix, uid, false).is_ok());
-        assert!(storage.allocate(ix, uid, false).is_err());
-        assert!(!storage.is_free(ix));
-        assert_eq!(storage.uid(ix), Some(uid));
-        assert_eq!(storage.uid_unchecked(ix), uid);
-        storage.free(ix, uid);
-        assert!(storage.is_free(ix));
-        assert_eq!(storage.uid(ix), None);
-    }
-}

bucket_map/src/index_entry.rs

@@ -1,11 +1,9 @@
-#![allow(dead_code)]
 use {
     crate::{
         bucket::Bucket,
         bucket_storage::{BucketStorage, Uid},
         RefCount,
     },
-    modular_bitfield::prelude::*,
     solana_sdk::{clock::Slot, pubkey::Pubkey},
     std::{
         collections::hash_map::DefaultHasher,
@@ -21,42 +19,13 @@ use {
 pub struct IndexEntry {
     pub key: Pubkey, // can this be smaller if we have reduced the keys into buckets already?
     pub ref_count: RefCount, // can this be smaller? Do we ever need more than 4B refcounts?
-    storage_cap_and_offset: PackedStorage,
+    pub storage_offset: u64, // smaller? since these are variably sized, this could get tricky. well, actually accountinfo is not variable sized...
     // if the bucket doubled, the index can be recomputed using create_bucket_capacity_pow2
+    pub storage_capacity_when_created_pow2: u8, // see data_location
     pub num_slots: Slot, // can this be smaller? epoch size should ~ be the max len. this is the num elements in the slot list
 }
 
-/// Pack the storage offset and capacity-when-crated-pow2 fields into a single u64
-#[bitfield(bits = 64)]
-#[repr(C)]
-#[derive(Debug, Default, Copy, Clone, Eq, PartialEq)]
-struct PackedStorage {
-    capacity_when_created_pow2: B8,
-    offset: B56,
-}
-
 impl IndexEntry {
-    pub fn init(&mut self, pubkey: &Pubkey) {
-        self.key = *pubkey;
-        self.ref_count = 0;
-        self.storage_cap_and_offset = PackedStorage::default();
-        self.num_slots = 0;
-    }
-
-    pub fn set_storage_capacity_when_created_pow2(
-        &mut self,
-        storage_capacity_when_created_pow2: u8,
-    ) {
-        self.storage_cap_and_offset
-            .set_capacity_when_created_pow2(storage_capacity_when_created_pow2)
-    }
-
-    pub fn set_storage_offset(&mut self, storage_offset: u64) {
-        self.storage_cap_and_offset
-            .set_offset_checked(storage_offset)
-            .expect("New storage offset must fit into 7 bytes!")
-    }
-
     pub fn data_bucket_from_num_slots(num_slots: Slot) -> u64 {
         (num_slots as f64).log2().ceil() as u64 // use int log here?
     }
@@ -69,18 +38,10 @@ impl IndexEntry {
         self.ref_count
     }
 
-    fn storage_capacity_when_created_pow2(&self) -> u8 {
-        self.storage_cap_and_offset.capacity_when_created_pow2()
-    }
-
-    fn storage_offset(&self) -> u64 {
-        self.storage_cap_and_offset.offset()
-    }
-
     // This function maps the original data location into an index in the current bucket storage.
     // This is coupled with how we resize bucket storages.
     pub fn data_loc(&self, storage: &BucketStorage) -> u64 {
-        self.storage_offset() << (storage.capacity_pow2 - self.storage_capacity_when_created_pow2())
+        self.storage_offset << (storage.capacity_pow2 - self.storage_capacity_when_created_pow2)
     }
 
     pub fn read_value<'a, T>(&self, bucket: &'a Bucket<T>) -> Option<(&'a [T], RefCount)> {
@@ -89,7 +50,7 @@ impl IndexEntry {
         let slice = if self.num_slots > 0 {
             let loc = self.data_loc(data_bucket);
             let uid = Self::key_uid(&self.key);
-            assert_eq!(Some(uid), bucket.data[data_bucket_ix as usize].uid(loc));
+            assert_eq!(uid, bucket.data[data_bucket_ix as usize].uid(loc));
             bucket.data[data_bucket_ix as usize].get_cell_slice(loc, self.num_slots)
         } else {
             // num_slots is 0. This means we don't have an actual allocation.
@@ -98,59 +59,9 @@ impl IndexEntry {
         };
         Some((slice, self.ref_count))
     }
-
     pub fn key_uid(key: &Pubkey) -> Uid {
         let mut s = DefaultHasher::new();
         key.hash(&mut s);
         s.finish().max(1u64)
     }
 }
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    impl IndexEntry {
-        pub fn new(key: Pubkey) -> Self {
-            IndexEntry {
-                key,
-                ref_count: 0,
-                storage_cap_and_offset: PackedStorage::default(),
-                num_slots: 0,
-            }
-        }
-    }
-
-    /// verify that accessors for storage_offset and capacity_when_created are
-    /// correct and independent
-    #[test]
-    fn test_api() {
-        for offset in [0, 1, u32::MAX as u64] {
-            let mut index = IndexEntry::new(solana_sdk::pubkey::new_rand());
-            if offset != 0 {
-                index.set_storage_offset(offset);
-            }
-            assert_eq!(index.storage_offset(), offset);
-            assert_eq!(index.storage_capacity_when_created_pow2(), 0);
-            for pow in [1, 255, 0] {
-                index.set_storage_capacity_when_created_pow2(pow);
-                assert_eq!(index.storage_offset(), offset);
-                assert_eq!(index.storage_capacity_when_created_pow2(), pow);
-            }
-        }
-    }
-
-    #[test]
-    fn test_size() {
-        assert_eq!(std::mem::size_of::<PackedStorage>(), 1 + 7);
-        assert_eq!(std::mem::size_of::<IndexEntry>(), 32 + 8 + 8 + 8);
-    }
-
-    #[test]
-    #[should_panic(expected = "New storage offset must fit into 7 bytes!")]
-    fn test_set_storage_offset_value_too_large() {
-        let too_big = 1 << 56;
-        let mut index = IndexEntry::new(Pubkey::new_unique());
-        index.set_storage_offset(too_big);
-    }
-}

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" 40
-    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" 40
-    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" 60
-  wait_step
-
-  # BPF test suite
-  if affects \
-             .rs$ \
-             Cargo.lock$ \
-             Cargo.toml$ \
-             ^ci/rust-version.sh \
-             ^ci/test-stable-bpf.sh \
-             ^ci/test-stable.sh \
-             ^ci/test-local-cluster.sh \
-             ^core/build.rs \
-             ^fetch-perf-libs.sh \
-             ^programs/ \
-             ^sdk/ \
-      ; then
-    cat >> "$output_file" <<"EOF"
-  - command: "ci/test-stable-bpf.sh"
-    name: "stable-bpf"
-    timeout_in_minutes: 20
-    artifact_paths: "bpf-dumps.tar.bz2"
-    agents:
-      - "queue=default"
-EOF
-  else
-    annotate --style info \
-      "Stable-BPF skipped as no relevant files were modified"
-  fi
-
-  # Perf test suite
-  if affects \
-             .rs$ \
-             Cargo.lock$ \
-             Cargo.toml$ \
-             ^ci/rust-version.sh \
-             ^ci/test-stable-perf.sh \
-             ^ci/test-stable.sh \
-             ^ci/test-local-cluster.sh \
-             ^core/build.rs \
-             ^fetch-perf-libs.sh \
-             ^programs/ \
-             ^sdk/ \
-      ; then
-    cat >> "$output_file" <<"EOF"
-  - command: "ci/test-stable-perf.sh"
-    name: "stable-perf"
-    timeout_in_minutes: 20
-    artifact_paths: "log-*.txt"
-    agents:
-      - "queue=cuda"
-EOF
-  else
-    annotate --style info \
-      "Stable-perf skipped as no relevant files were modified"
-  fi
-
-  # Downstream backwards compatibility
-  if affects \
-             .rs$ \
-             Cargo.lock$ \
-             Cargo.toml$ \
-             ^ci/rust-version.sh \
-             ^ci/test-stable-perf.sh \
-             ^ci/test-stable.sh \
-             ^ci/test-local-cluster.sh \
-             ^core/build.rs \
-             ^fetch-perf-libs.sh \
-             ^programs/ \
-             ^sdk/ \
-             ^scripts/build-downstream-projects.sh \
-      ; then
-    cat >> "$output_file" <<"EOF"
-  - command: "scripts/build-downstream-projects.sh"
-    name: "downstream-projects"
-    timeout_in_minutes: 30
-EOF
-  else
-    annotate --style info \
-      "downstream-projects skipped as no relevant files were modified"
-  fi
-
-  # Downstream Anchor projects backwards compatibility
-  if affects \
-             .rs$ \
-             Cargo.lock$ \
-             Cargo.toml$ \
-             ^ci/rust-version.sh \
-             ^ci/test-stable-perf.sh \
-             ^ci/test-stable.sh \
-             ^ci/test-local-cluster.sh \
-             ^core/build.rs \
-             ^fetch-perf-libs.sh \
-             ^programs/ \
-             ^sdk/ \
-             ^scripts/build-downstream-anchor-projects.sh \
-      ; then
-    cat >> "$output_file" <<"EOF"
-  - command: "scripts/build-downstream-anchor-projects.sh"
-    name: "downstream-anchor-projects"
-    timeout_in_minutes: 10
-EOF
-  else
-    annotate --style info \
-      "downstream-anchor-projects skipped as no relevant files were modified"
-  fi
-
-  # Wasm support
-  if affects \
-             ^ci/test-wasm.sh \
-             ^ci/test-stable.sh \
-             ^sdk/ \
-      ; then
-    command_step wasm ". ci/rust-version.sh; ci/docker-run.sh \$\$rust_stable_docker_image ci/test-wasm.sh" 20
-  else
-    annotate --style info \
-      "wasm skipped as no relevant files were modified"
-  fi
-
-  # Benches...
-  if affects \
-             .rs$ \
-             Cargo.lock$ \
-             Cargo.toml$ \
-             ^ci/rust-version.sh \
-             ^ci/test-coverage.sh \
-             ^ci/test-bench.sh \
-      ; then
-    command_step bench "ci/test-bench.sh" 30
-  else
-    annotate --style info --context test-bench \
-      "Bench skipped as no .rs files were modified"
-  fi
-
-  command_step "local-cluster" \
-    ". ci/rust-version.sh; ci/docker-run.sh \$\$rust_stable_docker_image ci/test-local-cluster.sh" \
-    40
-
-  command_step "local-cluster-flakey" \
-    ". ci/rust-version.sh; ci/docker-run.sh \$\$rust_stable_docker_image ci/test-local-cluster-flakey.sh" \
-    10
-
-  command_step "local-cluster-slow" \
-    ". ci/rust-version.sh; ci/docker-run.sh \$\$rust_stable_docker_image ci/test-local-cluster-slow.sh" \
-    30
-}
-
-pull_or_push_steps() {
-  command_step sanity "ci/test-sanity.sh" 5
-  wait_step
-
-  # Check for any .sh file changes
-  if affects .sh$; then
-    command_step shellcheck "ci/shellcheck.sh" 5
-    wait_step
-  fi
-
-  # Run the full test suite by default, skipping only if modifications are local
-  # to some particular areas of the tree
-  if affects_other_than ^.buildkite ^.mergify .md$ ^docs/ ^web3.js/ ^explorer/ ^.gitbook; then
-    all_test_steps
-  fi
-
-  # web3.js, explorer and docs changes run on Travis or Github actions...
-}
-
-
-if [[ -n $BUILDKITE_TAG ]]; then
-  start_pipeline "Tag pipeline for $BUILDKITE_TAG"
-
-  annotate --style info --context release-tag \
-    "https://github.com/solana-labs/solana/releases/$BUILDKITE_TAG"
-
-  # Jump directly to the secondary build to publish release artifacts quickly
-  trigger_secondary_step
-  exit 0
-fi
-
-
-if [[ $BUILDKITE_BRANCH =~ ^pull ]]; then
-  echo "+++ Affected files in this PR"
-  for file in "${affected_files[@]}"; do
-    echo "- $file"
-  done
-
-  start_pipeline "Pull request pipeline for $BUILDKITE_BRANCH"
-
-  # Add helpful link back to the corresponding Github Pull Request
-  annotate --style info --context pr-backlink \
-    "Github Pull Request: https://github.com/solana-labs/solana/$BUILDKITE_BRANCH"
-
-  if [[ $GITHUB_USER = "dependabot[bot]" ]]; then
-    command_step dependabot "ci/dependabot-pr.sh" 5
-    wait_step
-  fi
-  pull_or_push_steps
-  exit 0
-fi
-
-start_pipeline "Push pipeline for ${BUILDKITE_BRANCH:-?unknown branch?}"
-pull_or_push_steps
-wait_step
-trigger_secondary_step
-exit 0

ci/buildkite-pipeline.sh

@@ -231,33 +231,6 @@ EOF
       "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
-    agents:
-      - "queue=solana"
-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/buildkite-secondary.yml

@@ -16,7 +16,7 @@ steps:
   - command: "ci/publish-crate.sh"
     agents:
       - "queue=release-build"
-    timeout_in_minutes: 240
+    timeout_in_minutes: 360
     name: "publish crate"
     branches: "!master"
   - command: "ci/publish-tarball.sh"

ci/do-audit.sh

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

ci/docker-rust-nightly/Dockerfile

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

ci/docker-rust/Dockerfile

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

ci/run-sanity.sh

@@ -7,7 +7,7 @@ source multinode-demo/common.sh
 
 rm -rf config/run/init-completed config/ledger config/snapshot-ledger
 
-SOLANA_RUN_SH_VALIDATOR_ARGS="--full-snapshot-interval-slots 200" timeout 120 ./scripts/run.sh &
+SOLANA_RUN_SH_VALIDATOR_ARGS="--snapshot-interval-slots 200" timeout 120 ./scripts/run.sh &
 pid=$!
 
 attempts=20

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.57.0
 fi
 
 if [[ -n $RUST_NIGHTLY_VERSION ]]; then
   nightly_version="$RUST_NIGHTLY_VERSION"
 else
-  nightly_version=2022-02-24
+  nightly_version=2021-12-03
 fi
 
 

ci/test-checks.sh

@@ -69,14 +69,20 @@ _ ci/order-crates-for-publishing.py
 # run nightly clippy for `sdk/` as there's a moderate amount of nightly-only code there
 _ "$cargo" nightly clippy -Zunstable-options --workspace --all-targets -- --deny=warnings --deny=clippy::integer_arithmetic
 
-_ "$cargo" nightly fmt --all -- --check
+_ "$cargo" stable fmt --all -- --check
 
 _ ci/do-audit.sh
 
 {
   cd programs/bpf
-  _ "$cargo" nightly clippy --all -- --deny=warnings --allow=clippy::missing_safety_doc
-  _ "$cargo" nightly fmt --all -- --check
+  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

ci/test-stable.sh

@@ -21,16 +21,15 @@ export RUST_BACKTRACE=1
 export RUSTFLAGS="-D warnings"
 source scripts/ulimit-n.sh
 
-# limit jobs to 4gb/thread
-JOBS=$(grep MemTotal /proc/meminfo | awk '{printf "%.0f", ($2 / (4 * 1024 * 1024))}')
+# Limit compiler jobs to reduce memory usage
+# on machines with 2gb/thread of memory
 NPROC=$(nproc)
-JOBS=$((JOBS>NPROC ? NPROC : JOBS))
-
+NPROC=$((NPROC>14 ? 14 : NPROC))
 
 echo "Executing $testName"
 case $testName in
 test-stable)
-  _ "$cargo" stable test --jobs "$JOBS" --all --exclude solana-local-cluster ${V:+--verbose} -- --nocapture
+  _ "$cargo" stable test --jobs "$NPROC" --all --exclude solana-local-cluster ${V:+--verbose} -- --nocapture
   ;;
 test-stable-bpf)
   # Clear the C dependency files, if dependency moves these files are not regenerated
@@ -66,9 +65,6 @@ test-stable-bpf)
     fi
   done
 
-  # bpf-tools version
-  "$cargo_build_bpf" -V
-
   # BPF program instruction count assertion
   bpf_target_path=programs/bpf/target
   _ "$cargo" stable test \

clap-utils/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "solana-clap-utils"
-version = "1.10.1"
+version = "1.9.13"
 description = "Solana utilities for the clap"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -12,9 +12,9 @@ edition = "2021"
 [dependencies]
 clap = "2.33.0"
 rpassword = "5.0"
-solana-perf = { path = "../perf", version = "=1.10.1" }
-solana-remote-wallet = { path = "../remote-wallet", version = "=1.10.1", default-features = false}
-solana-sdk = { path = "../sdk", version = "=1.10.1" }
+solana-perf = { path = "../perf", version = "=1.9.13" }
+solana-remote-wallet = { path = "../remote-wallet", version = "=1.9.13" }
+solana-sdk = { path = "../sdk", version = "=1.9.13" }
 thiserror = "1.0.30"
 tiny-bip39 = "0.8.2"
 uriparse = "0.6.3"
@@ -22,7 +22,7 @@ url = "2.2.2"
 chrono = "0.4"
 
 [dev-dependencies]
-tempfile = "3.3.0"
+tempfile = "3.2.0"
 
 [lib]
 name = "solana_clap_utils"

clap-utils/src/input_validators.rs

@@ -328,7 +328,7 @@ pub fn is_derivation<T>(value: T) -> Result<(), String>
 where
     T: AsRef<str> + Display,
 {
-    let value = value.as_ref().replace('\'', "");
+    let value = value.as_ref().replace("'", "");
     let mut parts = value.split('/');
     let account = parts.next().unwrap();
     account

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.1"
+version = "1.9.13"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
@@ -12,13 +12,13 @@ documentation = "https://docs.rs/solana-cli-config"
 [dependencies]
 dirs-next = "2.0.0"
 lazy_static = "1.4.0"
-serde = "1.0.136"
+serde = "1.0.130"
 serde_derive = "1.0.103"
-serde_yaml = "0.8.23"
+serde_yaml = "0.8.21"
 url = "2.2.2"
 
 [dev-dependencies]
-anyhow = "1.0.56"
+anyhow = "1.0.51"
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]

cli-output/Cargo.toml

@@ -3,7 +3,7 @@ authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 edition = "2021"
 name = "solana-cli-output"
 description = "Blockchain, Rebuilt for Scale"
-version = "1.10.1"
+version = "1.9.13"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
@@ -17,14 +17,14 @@ console = "0.15.0"
 humantime = "2.0.1"
 Inflector = "0.11.4"
 indicatif = "0.16.2"
-serde = "1.0.136"
-serde_json = "1.0.79"
-solana-account-decoder = { path = "../account-decoder", version = "=1.10.1" }
-solana-clap-utils = { path = "../clap-utils", version = "=1.10.1" }
-solana-client = { path = "../client", version = "=1.10.1" }
-solana-sdk = { path = "../sdk", version = "=1.10.1" }
-solana-transaction-status = { path = "../transaction-status", version = "=1.10.1" }
-solana-vote-program = { path = "../programs/vote", version = "=1.10.1" }
+serde = "1.0.130"
+serde_json = "1.0.72"
+solana-account-decoder = { path = "../account-decoder", version = "=1.9.13" }
+solana-clap-utils = { path = "../clap-utils", version = "=1.9.13" }
+solana-client = { path = "../client", version = "=1.9.13" }
+solana-sdk = { path = "../sdk", version = "=1.9.13" }
+solana-transaction-status = { path = "../transaction-status", version = "=1.9.13" }
+solana-vote-program = { path = "../programs/vote", version = "=1.9.13" }
 spl-memo = { version = "=3.0.1", features = ["no-entrypoint"] }
 
 [package.metadata.docs.rs]

cli-output/src/cli_output.rs

@@ -2287,7 +2287,6 @@ impl fmt::Display for CliBlock {
                 let sign = if reward.lamports < 0 { "-" } else { "" };
 
                 total_rewards += reward.lamports;
-                #[allow(clippy::format_in_format_args)]
                 writeln!(
                     f,
                     "  {:<44}  {:^15}  {:>15}  {}  {}",
@@ -2451,8 +2450,6 @@ pub struct CliGossipNode {
     pub rpc_host: Option<String>,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub version: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub feature_set: Option<u32>,
 }
 
 impl CliGossipNode {
@@ -2465,7 +2462,6 @@ impl CliGossipNode {
             tpu_port: info.tpu.map(|addr| addr.port()),
             rpc_host: info.rpc.map(|addr| addr.to_string()),
             version: info.version,
-            feature_set: info.feature_set,
         }
     }
 }
@@ -2491,7 +2487,7 @@ impl fmt::Display for CliGossipNode {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         write!(
             f,
-            "{:15} | {:44} | {:6} | {:5} | {:21} | {:8}| {}",
+            "{:15} | {:44} | {:6} | {:5} | {:21} | {}",
             unwrap_to_string_or_none(self.ip_address.as_ref()),
             self.identity_label
                 .as_ref()
@@ -2500,7 +2496,6 @@ impl fmt::Display for CliGossipNode {
             unwrap_to_string_or_none(self.tpu_port.as_ref()),
             unwrap_to_string_or_none(self.rpc_host.as_ref()),
             unwrap_to_string_or_default(self.version.as_ref(), "unknown"),
-            unwrap_to_string_or_default(self.feature_set.as_ref(), "unknown"),
         )
     }
 }
@@ -2515,10 +2510,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)?;

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.1"
+version = "1.9.13"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
@@ -17,40 +17,39 @@ criterion-stats = "0.3.0"
 ctrlc = { version = "3.2.1", features = ["termination"] }
 console = "0.15.0"
 const_format = "0.2.22"
-crossbeam-channel = "0.5"
 log = "0.4.14"
 humantime = "2.0.1"
 num-traits = "0.2"
 pretty-hex = "0.2.1"
-reqwest = { version = "0.11.9", default-features = false, features = ["blocking", "rustls-tls", "json"] }
-semver = "1.0.6"
-serde = "1.0.136"
+reqwest = { version = "0.11.6", default-features = false, features = ["blocking", "rustls-tls", "json"] }
+semver = "1.0.4"
+serde = "1.0.130"
 serde_derive = "1.0.103"
-serde_json = "1.0.79"
-solana-account-decoder = { path = "../account-decoder", version = "=1.10.1" }
-solana-bpf-loader-program = { path = "../programs/bpf_loader", version = "=1.10.1" }
-solana-clap-utils = { path = "../clap-utils", version = "=1.10.1" }
-solana-cli-config = { path = "../cli-config", version = "=1.10.1" }
-solana-cli-output = { path = "../cli-output", version = "=1.10.1" }
-solana-client = { path = "../client", version = "=1.10.1" }
-solana-config-program = { path = "../programs/config", version = "=1.10.1" }
-solana-faucet = { path = "../faucet", version = "=1.10.1" }
-solana-logger = { path = "../logger", version = "=1.10.1" }
-solana-program-runtime = { path = "../program-runtime", version = "=1.10.1" }
+serde_json = "1.0.72"
+solana-account-decoder = { path = "../account-decoder", version = "=1.9.13" }
+solana-bpf-loader-program = { path = "../programs/bpf_loader", version = "=1.9.13" }
+solana-clap-utils = { path = "../clap-utils", version = "=1.9.13" }
+solana-cli-config = { path = "../cli-config", version = "=1.9.13" }
+solana-cli-output = { path = "../cli-output", version = "=1.9.13" }
+solana-client = { path = "../client", version = "=1.9.13" }
+solana-config-program = { path = "../programs/config", version = "=1.9.13" }
+solana-faucet = { path = "../faucet", version = "=1.9.13" }
+solana-logger = { path = "../logger", version = "=1.9.13" }
+solana-program-runtime = { path = "../program-runtime", version = "=1.9.13" }
 solana_rbpf = "=0.2.24"
-solana-remote-wallet = { path = "../remote-wallet", version = "=1.10.1" }
-solana-sdk = { path = "../sdk", version = "=1.10.1" }
-solana-transaction-status = { path = "../transaction-status", version = "=1.10.1" }
-solana-version = { path = "../version", version = "=1.10.1" }
-solana-vote-program = { path = "../programs/vote", version = "=1.10.1" }
+solana-remote-wallet = { path = "../remote-wallet", version = "=1.9.13" }
+solana-sdk = { path = "../sdk", version = "=1.9.13" }
+solana-transaction-status = { path = "../transaction-status", version = "=1.9.13" }
+solana-version = { path = "../version", version = "=1.9.13" }
+solana-vote-program = { path = "../programs/vote", version = "=1.9.13" }
 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.1" }
-solana-test-validator = { path = "../test-validator", version = "=1.10.1" }
-tempfile = "3.3.0"
+solana-streamer = { path = "../streamer", version = "=1.9.13" }
+solana-test-validator = { path = "../test-validator", version = "=1.9.13" }
+tempfile = "3.2.0"
 
 [[bin]]
 name = "solana"

cli/src/cli.rs

@@ -88,7 +88,6 @@ pub enum CliCommand {
         timeout: Duration,
         blockhash: Option<Hash>,
         print_timestamp: bool,
-        additional_fee: Option<u32>,
     },
     Rent {
         data_length: usize,
@@ -978,7 +977,6 @@ pub fn process_command(config: &CliConfig) -> ProcessResult {
             timeout,
             blockhash,
             print_timestamp,
-            additional_fee,
         } => process_ping(
             &rpc_client,
             config,
@@ -987,7 +985,6 @@ pub fn process_command(config: &CliConfig) -> ProcessResult {
             timeout,
             blockhash,
             *print_timestamp,
-            additional_fee,
         ),
         CliCommand::Rent {
             data_length,
@@ -1709,7 +1706,7 @@ mod tests {
         serde_json::{json, Value},
         solana_client::{
             blockhash_query,
-            mock_sender_for_cli::SIGNATURE,
+            mock_sender::SIGNATURE,
             rpc_request::RpcRequest,
             rpc_response::{Response, RpcResponseContext},
         },

cli/src/cluster_query.rs

@@ -5,7 +5,6 @@ use {
     },
     clap::{value_t, value_t_or_exit, App, AppSettings, Arg, ArgMatches, SubCommand},
     console::style,
-    crossbeam_channel::unbounded,
     serde::{Deserialize, Serialize},
     solana_clap_utils::{
         input_parsers::*,
@@ -33,14 +32,12 @@ use {
         rpc_request::DELINQUENT_VALIDATOR_SLOT_DISTANCE,
         rpc_response::SlotInfo,
     },
-    solana_program_runtime::compute_budget::ComputeBudget,
     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 +268,6 @@ impl ClusterQuerySubCommands for App<'_, '_> {
                         .default_value("15")
                         .help("Wait up to timeout seconds for transaction confirmation"),
                 )
-                .arg(
-                    Arg::with_name("additional_fee")
-                        .long("additional-fee")
-                        .value_name("NUMBER")
-                        .takes_value(true)
-                        .help("Request additional-fee for transaction"),
-                )
                 .arg(blockhash_arg()),
         )
         .subcommand(
@@ -522,7 +512,6 @@ pub fn parse_cluster_ping(
     let timeout = Duration::from_secs(value_t_or_exit!(matches, "timeout", u64));
     let blockhash = value_of(matches, BLOCKHASH_ARG.name);
     let print_timestamp = matches.is_present("print_timestamp");
-    let additional_fee = value_of(matches, "additional_fee");
     Ok(CliCommandInfo {
         command: CliCommand::Ping {
             interval,
@@ -530,7 +519,6 @@ pub fn parse_cluster_ping(
             timeout,
             blockhash,
             print_timestamp,
-            additional_fee,
         },
         signers: vec![default_signer.signer_from_path(matches, wallet_manager)?],
     })
@@ -1361,9 +1349,8 @@ pub fn process_ping(
     timeout: &Duration,
     fixed_blockhash: &Option<Hash>,
     print_timestamp: bool,
-    additional_fee: &Option<u32>,
 ) -> ProcessResult {
-    let (signal_sender, signal_receiver) = unbounded();
+    let (signal_sender, signal_receiver) = std::sync::mpsc::channel();
     ctrlc::set_handler(move || {
         let _ = signal_sender.send(());
     })
@@ -1386,7 +1373,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 {
@@ -1401,18 +1387,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(
-                    ComputeBudget::new(false).max_units as u32,
-                    *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,
@@ -2042,7 +2018,6 @@ pub fn process_transaction_history(
                     RpcTransactionConfig {
                         encoding: Some(UiTransactionEncoding::Base64),
                         commitment: Some(CommitmentConfig::confirmed()),
-                        max_supported_transaction_version: None,
                     },
                 ) {
                     Ok(confirmed_transaction) => {
@@ -2336,7 +2311,6 @@ mod tests {
                         Hash::from_str("4CCNp28j6AhGq7PkjPDP4wbQWBS8LLbQin2xV5n8frKX").unwrap()
                     ),
                     print_timestamp: true,
-                    additional_fee: None,
                 },
                 signers: vec![default_keypair.into()],
             }

cli/src/nonce.rs

@@ -334,17 +334,9 @@ pub fn check_nonce_account(
     match state_from_account(nonce_account)? {
         State::Initialized(ref data) => {
             if &data.blockhash != nonce_hash {
-                Err(Error::InvalidHash {
-                    provided: *nonce_hash,
-                    expected: data.blockhash,
-                }
-                .into())
+                Err(Error::InvalidHash.into())
             } else if nonce_authority != &data.authority {
-                Err(Error::InvalidAuthority {
-                    provided: *nonce_authority,
-                    expected: data.authority,
-                }
-                .into())
+                Err(Error::InvalidAuthority.into())
             } else {
                 Ok(())
             }
@@ -954,22 +946,15 @@ mod tests {
             hash(b"invalid"),
             0,
         )));
-        let invalid_hash = Account::new_data(1, &data, &system_program::ID).unwrap();
+        let invalid_hash = Account::new_data(1, &data, &system_program::ID);
         if let CliError::InvalidNonce(err) =
-            check_nonce_account(&invalid_hash, &nonce_pubkey, &blockhash).unwrap_err()
+            check_nonce_account(&invalid_hash.unwrap(), &nonce_pubkey, &blockhash).unwrap_err()
         {
-            assert_eq!(
-                err,
-                Error::InvalidHash {
-                    provided: blockhash,
-                    expected: hash(b"invalid"),
-                }
-            );
+            assert_eq!(err, Error::InvalidHash,);
         }
 
-        let new_nonce_authority = solana_sdk::pubkey::new_rand();
         let data = Versions::new_current(State::Initialized(nonce::state::Data::new(
-            new_nonce_authority,
+            solana_sdk::pubkey::new_rand(),
             blockhash,
             0,
         )));
@@ -977,13 +962,7 @@ mod tests {
         if let CliError::InvalidNonce(err) =
             check_nonce_account(&invalid_authority.unwrap(), &nonce_pubkey, &blockhash).unwrap_err()
         {
-            assert_eq!(
-                err,
-                Error::InvalidAuthority {
-                    provided: nonce_pubkey,
-                    expected: new_nonce_authority,
-                }
-            );
+            assert_eq!(err, Error::InvalidAuthority,);
         }
 
         let data = Versions::new_current(State::Uninitialized);

cli/src/program.rs

@@ -42,7 +42,6 @@ use {
         system_instruction::{self, SystemError},
         system_program,
         transaction::{Transaction, TransactionError},
-        transaction_context::TransactionContext,
     },
     std::{
         fs::File,
@@ -1991,8 +1990,7 @@ fn read_and_verify_elf(program_location: &str) -> Result<Vec<u8>, Box<dyn std::e
     let mut program_data = Vec::new();
     file.read_to_end(&mut program_data)
         .map_err(|err| format!("Unable to read program file: {}", err))?;
-    let mut transaction_context = TransactionContext::new(Vec::new(), 1, 1);
-    let mut invoke_context = InvokeContext::new_mock(&mut transaction_context, &[]);
+    let mut invoke_context = InvokeContext::new_mock(&[], &[]);
 
     // Verify the program
     Executable::<BpfError, ThisInstructionMeter>::from_elf(

cli/src/validator_info.rs

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

cli/src/vote.rs

@@ -35,8 +35,7 @@ use {
         transaction::Transaction,
     },
     solana_vote_program::{
-        vote_error::VoteError,
-        vote_instruction::{self, withdraw},
+        vote_instruction::{self, withdraw, VoteError},
         vote_state::{VoteAuthorize, VoteInit, VoteState},
     },
     std::sync::Arc,

cli/src/wallet.rs

@@ -39,9 +39,7 @@ use {
         system_program,
         transaction::Transaction,
     },
-    solana_transaction_status::{
-        Encodable, EncodedTransaction, TransactionBinaryEncoding, UiTransactionEncoding,
-    },
+    solana_transaction_status::{EncodedTransaction, UiTransactionEncoding},
     std::{fmt::Write as FmtWrite, fs::File, io::Write, sync::Arc},
 };
 
@@ -191,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)
@@ -275,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),
     })
 }
 
@@ -343,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),
@@ -561,7 +556,6 @@ pub fn process_confirm(
                         RpcTransactionConfig {
                             encoding: Some(UiTransactionEncoding::Base64),
                             commitment: Some(CommitmentConfig::confirmed()),
-                            max_supported_transaction_version: None,
                         },
                     ) {
                         Ok(confirmed_transaction) => {
@@ -570,8 +564,10 @@ pub fn process_confirm(
                                 .transaction
                                 .decode()
                                 .expect("Successful decode");
-                            let json_transaction =
-                                decoded_transaction.encode(UiTransactionEncoding::Json);
+                            let json_transaction = EncodedTransaction::encode(
+                                decoded_transaction.clone(),
+                                UiTransactionEncoding::Json,
+                            );
 
                             transaction = Some(CliTransaction {
                                 transaction: json_transaction,
@@ -613,7 +609,7 @@ pub fn process_decode_transaction(config: &CliConfig, transaction: &Transaction)
     let sigverify_status = CliSignatureVerificationStatus::verify_transaction(transaction);
     let decode_transaction = CliTransaction {
         decoded_transaction: transaction.clone(),
-        transaction: transaction.encode(UiTransactionEncoding::Json),
+        transaction: EncodedTransaction::encode(transaction.clone(), UiTransactionEncoding::Json),
         meta: None,
         block_time: None,
         slot: None,

cli/tests/program.rs

@@ -78,7 +78,7 @@ fn test_cli_program_deploy_non_upgradeable() {
     assert_eq!(account0.lamports, minimum_balance_for_rent_exemption);
     assert_eq!(account0.owner, bpf_loader::id());
     assert!(account0.executable);
-    let mut file = File::open(noop_path.to_str().unwrap()).unwrap();
+    let mut file = File::open(noop_path.to_str().unwrap().to_string()).unwrap();
     let mut elf = Vec::new();
     file.read_to_end(&mut elf).unwrap();
     assert_eq!(account0.data, elf);

client-test/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "solana-client-test"
-version = "1.10.1"
+version = "1.9.13"
 description = "Solana RPC Test"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -8,30 +8,29 @@ 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.1" }
-solana-ledger = { path = "../ledger", version = "=1.10.1" }
-solana-measure = { path = "../measure", version = "=1.10.1" }
-solana-merkle-tree = { path = "../merkle-tree", version = "=1.10.1" }
-solana-metrics = { path = "../metrics", version = "=1.10.1" }
-solana-perf = { path = "../perf", version = "=1.10.1" }
-solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "=1.10.1" }
-solana-rpc = { path = "../rpc", version = "=1.10.1" }
-solana-runtime = { path = "../runtime", version = "=1.10.1" }
-solana-sdk = { path = "../sdk", version = "=1.10.1" }
-solana-streamer = { path = "../streamer", version = "=1.10.1" }
-solana-test-validator = { path = "../test-validator", version = "=1.10.1" }
-solana-transaction-status = { path = "../transaction-status", version = "=1.10.1" }
-solana-version = { path = "../version", version = "=1.10.1" }
+serde_json = "1.0.72"
+serial_test = "0.5.1"
+solana-client = { path = "../client", version = "=1.9.13" }
+solana-ledger = { path = "../ledger", version = "=1.9.13" }
+solana-measure = { path = "../measure", version = "=1.9.13" }
+solana-merkle-tree = { path = "../merkle-tree", version = "=1.9.13" }
+solana-metrics = { path = "../metrics", version = "=1.9.13" }
+solana-perf = { path = "../perf", version = "=1.9.13" }
+solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "=1.9.13" }
+solana-rpc = { path = "../rpc", version = "=1.9.13" }
+solana-runtime = { path = "../runtime", version = "=1.9.13" }
+solana-sdk = { path = "../sdk", version = "=1.9.13" }
+solana-streamer = { path = "../streamer", version = "=1.9.13" }
+solana-test-validator = { path = "../test-validator", version = "=1.9.13" }
+solana-transaction-status = { path = "../transaction-status", version = "=1.9.13" }
+solana-version = { path = "../version", version = "=1.9.13" }
 systemstat = "0.1.10"
-tokio = { version = "1", features = ["full"] }
 
 [dev-dependencies]
-solana-logger = { path = "../logger", version = "=1.10.1" }
+solana-logger = { path = "../logger", version = "=1.9.13" }
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]

client-test/tests/client.rs

@@ -1,9 +1,7 @@
 use {
-    futures_util::StreamExt,
     serde_json::{json, Value},
     serial_test::serial,
     solana_client::{
-        nonblocking,
         pubsub_client::PubsubClient,
         rpc_client::RpcClient,
         rpc_config::{
@@ -15,7 +13,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,
     },
@@ -37,7 +35,7 @@ use {
     solana_streamer::socket::SocketAddrSpace,
     solana_test_validator::TestValidator,
     solana_transaction_status::{
-        BlockEncodingOptions, ConfirmedBlock, TransactionDetails, UiTransactionEncoding,
+        ConfirmedBlockWithOptionalMetadata, TransactionDetails, UiTransactionEncoding,
     },
     std::{
         collections::HashSet,
@@ -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();
@@ -286,18 +280,12 @@ fn test_block_subscription() {
     let maybe_actual = receiver.recv_timeout(Duration::from_millis(400));
     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,
-                    },
-                )
-                .unwrap();
+            let complete_block = blockstore.get_complete_block(slot, false).unwrap();
+            let block = ConfirmedBlockWithOptionalMetadata::from(complete_block).configure(
+                UiTransactionEncoding::Json,
+                TransactionDetails::Signatures,
+                false,
+            );
             assert_eq!(actual.value.slot, slot);
             assert!(block.eq(&actual.value.block.unwrap()));
         }
@@ -520,86 +508,3 @@ fn test_slot_subscription() {
 
     assert_eq!(errors, [].to_vec());
 }
-
-#[tokio::test]
-#[serial]
-async fn test_slot_subscription_async() {
-    let sync_service = Arc::new(AtomicU64::new(0));
-    let sync_client = Arc::clone(&sync_service);
-    fn wait_until(atomic: &Arc<AtomicU64>, value: u64) {
-        while atomic.load(Ordering::Relaxed) != value {
-            sleep(Duration::from_millis(1))
-        }
-    }
-
-    let pubsub_addr = SocketAddr::new(
-        IpAddr::V4(Ipv4Addr::new(0, 0, 0, 0)),
-        rpc_port::DEFAULT_RPC_PUBSUB_PORT,
-    );
-
-    tokio::task::spawn_blocking(move || {
-        let exit = Arc::new(AtomicBool::new(false));
-        let GenesisConfigInfo { genesis_config, .. } = create_genesis_config(10_000);
-        let bank = Bank::new_for_tests(&genesis_config);
-        let bank_forks = Arc::new(RwLock::new(BankForks::new(bank)));
-        let optimistically_confirmed_bank =
-            OptimisticallyConfirmedBank::locked_from_bank_forks_root(&bank_forks);
-        let max_complete_transaction_status_slot = Arc::new(AtomicU64::default());
-        let subscriptions = Arc::new(RpcSubscriptions::new_for_tests(
-            &exit,
-            max_complete_transaction_status_slot,
-            bank_forks,
-            Arc::new(RwLock::new(BlockCommitmentCache::default())),
-            optimistically_confirmed_bank,
-        ));
-        let (trigger, pubsub_service) =
-            PubSubService::new(PubSubConfig::default(), &subscriptions, pubsub_addr);
-        sleep(Duration::from_millis(100));
-        sync_service.store(1, Ordering::Relaxed);
-
-        wait_until(&sync_service, 2);
-        subscriptions.notify_slot(1, 0, 0);
-        sync_service.store(3, Ordering::Relaxed);
-
-        wait_until(&sync_service, 4);
-        subscriptions.notify_slot(2, 1, 1);
-        sync_service.store(5, Ordering::Relaxed);
-
-        wait_until(&sync_service, 6);
-        exit.store(true, Ordering::Relaxed);
-        trigger.cancel();
-        pubsub_service.close().unwrap();
-    });
-
-    wait_until(&sync_client, 1);
-    let url = format!("ws://0.0.0.0:{}/", pubsub_addr.port());
-    let pubsub_client = nonblocking::pubsub_client::PubsubClient::new(&url)
-        .await
-        .unwrap();
-    let (mut notifications, unsubscribe) = pubsub_client.slot_subscribe().await.unwrap();
-    sync_client.store(2, Ordering::Relaxed);
-
-    wait_until(&sync_client, 3);
-    assert_eq!(
-        tokio::time::timeout(Duration::from_millis(25), notifications.next()).await,
-        Ok(Some(SlotInfo {
-            slot: 1,
-            parent: 0,
-            root: 0,
-        }))
-    );
-    sync_client.store(4, Ordering::Relaxed);
-
-    wait_until(&sync_client, 5);
-    assert_eq!(
-        tokio::time::timeout(Duration::from_millis(25), notifications.next()).await,
-        Ok(Some(SlotInfo {
-            slot: 2,
-            parent: 1,
-            root: 1,
-        }))
-    );
-    sync_client.store(6, Ordering::Relaxed);
-
-    unsubscribe().await;
-}

client/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "solana-client"
-version = "1.10.1"
+version = "1.9.13"
 description = "Solana Client"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -10,48 +10,37 @@ 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"
 indicatif = "0.16.2"
-itertools = "0.10.2"
 jsonrpc-core = "18.0.0"
 log = "0.4.14"
-quinn = "0.8.0"
 rayon = "1.5.1"
-reqwest = { version = "0.11.9", default-features = false, features = ["blocking", "rustls-tls", "json"] }
-rustls = { version = "0.20.2", features = ["dangerous_configuration"] }
-semver = "1.0.6"
-serde = "1.0.136"
+reqwest = { version = "0.11.6", default-features = false, features = ["blocking", "rustls-tls", "json"] }
+semver = "1.0.4"
+serde = "1.0.130"
 serde_derive = "1.0.103"
-serde_json = "1.0.79"
-solana-account-decoder = { path = "../account-decoder", version = "=1.10.1" }
-solana-clap-utils = { path = "../clap-utils", version = "=1.10.1" }
-solana-faucet = { path = "../faucet", version = "=1.10.1" }
-solana-net-utils = { path = "../net-utils", version = "=1.10.1" }
-solana-measure = { path = "../measure", version = "=1.10.1" }
-solana-sdk = { path = "../sdk", version = "=1.10.1" }
-solana-transaction-status = { path = "../transaction-status", version = "=1.10.1" }
-solana-version = { path = "../version", version = "=1.10.1" }
-solana-vote-program = { path = "../programs/vote", version = "=1.10.1" }
+serde_json = "1.0.72"
+solana-account-decoder = { path = "../account-decoder", version = "=1.9.13" }
+solana-clap-utils = { path = "../clap-utils", version = "=1.9.13" }
+solana-faucet = { path = "../faucet", version = "=1.9.13" }
+solana-net-utils = { path = "../net-utils", version = "=1.9.13" }
+solana-measure = { path = "../measure", version = "=1.9.13" }
+solana-sdk = { path = "../sdk", version = "=1.9.13" }
+solana-transaction-status = { path = "../transaction-status", version = "=1.9.13" }
+solana-version = { path = "../version", version = "=1.9.13" }
+solana-vote-program = { path = "../programs/vote", version = "=1.9.13" }
 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"] }
+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.1" }
+solana-logger = { path = "../logger", version = "=1.9.13" }
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]

client/src/client_error.rs

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

client/src/http_sender.rs

@@ -1,4 +1,4 @@
-//! Nonblocking [`RpcSender`] over HTTP.
+//! The standard [`RpcSender`] over HTTP.
 
 use {
     crate::{
@@ -8,7 +8,6 @@ use {
         rpc_response::RpcSimulateTransactionResult,
         rpc_sender::*,
     },
-    async_trait::async_trait,
     log::*,
     reqwest::{
         self,
@@ -26,13 +25,13 @@ use {
 };
 
 pub struct HttpSender {
-    client: Arc<reqwest::Client>,
+    client: Arc<reqwest::blocking::Client>,
     url: String,
     request_id: AtomicU64,
     stats: RwLock<RpcTransportStats>,
 }
 
-/// Nonblocking [`RpcSender`] over HTTP.
+/// The standard [`RpcSender`] over HTTP.
 impl HttpSender {
     /// Create an HTTP RPC sender.
     ///
@@ -46,11 +45,15 @@ impl HttpSender {
     ///
     /// The URL is an HTTP URL, usually for port 8899.
     pub fn new_with_timeout<U: ToString>(url: U, timeout: Duration) -> Self {
+        // `reqwest::blocking::Client` panics if run in a tokio async context.  Shuttle the
+        // request to a different tokio thread to avoid this
         let client = Arc::new(
-            reqwest::Client::builder()
-                .timeout(timeout)
-                .build()
-                .expect("build rpc client"),
+            tokio::task::block_in_place(move || {
+                reqwest::blocking::Client::builder()
+                    .timeout(timeout)
+                    .build()
+            })
+            .expect("build rpc client"),
         );
 
         Self {
@@ -63,9 +66,9 @@ impl HttpSender {
 }
 
 #[derive(Deserialize, Debug)]
-pub(crate) struct RpcErrorObject {
-    pub code: i64,
-    pub message: String,
+struct RpcErrorObject {
+    code: i64,
+    message: String,
 }
 
 struct StatsUpdater<'a> {
@@ -97,17 +100,12 @@ impl<'a> Drop for StatsUpdater<'a> {
     }
 }
 
-#[async_trait]
 impl RpcSender for HttpSender {
     fn get_transport_stats(&self) -> RpcTransportStats {
         self.stats.read().unwrap().clone()
     }
 
-    async fn send(
-        &self,
-        request: RpcRequest,
-        params: serde_json::Value,
-    ) -> Result<serde_json::Value> {
+    fn send(&self, request: RpcRequest, params: serde_json::Value) -> Result<serde_json::Value> {
         let mut stats_updater = StatsUpdater::new(&self.stats);
 
         let request_id = self.request_id.fetch_add(1, Ordering::Relaxed);
@@ -115,15 +113,18 @@ impl RpcSender for HttpSender {
 
         let mut too_many_requests_retries = 5;
         loop {
+            // `reqwest::blocking::Client` panics if run in a tokio async context.  Shuttle the
+            // request to a different tokio thread to avoid this
             let response = {
                 let client = self.client.clone();
                 let request_json = request_json.clone();
-                client
-                    .post(&self.url)
-                    .header(CONTENT_TYPE, "application/json")
-                    .body(request_json)
-                    .send()
-                    .await
+                tokio::task::block_in_place(move || {
+                    client
+                        .post(&self.url)
+                        .header(CONTENT_TYPE, "application/json")
+                        .body(request_json)
+                        .send()
+                })
             }?;
 
             if !response.status().is_success() {
@@ -154,7 +155,8 @@ impl RpcSender for HttpSender {
                 return Err(response.error_for_status().unwrap_err().into());
             }
 
-            let mut json = response.json::<serde_json::Value>().await?;
+            let mut json =
+                tokio::task::block_in_place(move || response.json::<serde_json::Value>())?;
             if json["error"].is_object() {
                 return match serde_json::from_value::<RpcErrorObject>(json["error"].clone()) {
                     Ok(rpc_error_object) => {
@@ -206,16 +208,14 @@ mod tests {
     #[tokio::test(flavor = "multi_thread")]
     async fn http_sender_on_tokio_multi_thread() {
         let http_sender = HttpSender::new("http://localhost:1234".to_string());
-        let _ = http_sender
-            .send(RpcRequest::GetVersion, serde_json::Value::Null)
-            .await;
+        let _ = http_sender.send(RpcRequest::GetVersion, serde_json::Value::Null);
     }
 
     #[tokio::test(flavor = "current_thread")]
-    async fn http_sender_on_tokio_current_thread() {
-        let http_sender = HttpSender::new("http://localhost:1234".to_string());
-        let _ = http_sender
-            .send(RpcRequest::GetVersion, serde_json::Value::Null)
-            .await;
+    #[should_panic(expected = "can call blocking only when running on the multi-threaded runtime")]
+    async fn http_sender_ontokio_current_thread_should_panic() {
+        // RpcClient::new() will panic in the tokio current-thread runtime due to `tokio::task::block_in_place()` usage, and there
+        // doesn't seem to be a way to detect whether the tokio runtime is multi_thread or current_thread...
+        let _ = HttpSender::new("http://localhost:1234".to_string());
     }
 }

client/src/lib.rs

@@ -4,13 +4,11 @@ extern crate serde_derive;
 
 pub mod blockhash_query;
 pub mod client_error;
-pub(crate) mod http_sender;
-pub(crate) mod mock_sender;
-pub mod nonblocking;
+pub mod http_sender;
+pub mod mock_sender;
 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;
@@ -23,13 +21,4 @@ pub mod rpc_sender;
 pub mod spinner;
 pub mod thin_client;
 pub mod tpu_client;
-pub mod tpu_connection;
 pub mod transaction_executor;
-pub mod udp_client;
-
-pub mod mock_sender_for_cli {
-    /// Magic `SIGNATURE` value used by `solana-cli` unit tests.
-    /// Please don't use this constant.
-    pub const SIGNATURE: &str =
-        "43yNSFC6fYTuPgTNFFhF4axw7AfWxB2BPdurme8yrsWEYwm8299xh8n6TAHjGymiSub1XtyxTNyd9GBfY2hxoBw8";
-}

client/src/mock_sender.rs

@@ -1,4 +1,4 @@
-//! A nonblocking [`RpcSender`] used for unit testing [`RpcClient`](crate::rpc_client::RpcClient).
+//! An [`RpcSender`] used for unit testing [`RpcClient`](crate::rpc_client::RpcClient).
 
 use {
     crate::{
@@ -15,7 +15,6 @@ use {
         },
         rpc_sender::*,
     },
-    async_trait::async_trait,
     serde_json::{json, Number, Value},
     solana_account_decoder::{UiAccount, UiAccountEncoding},
     solana_sdk::{
@@ -28,19 +27,21 @@ 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,
+        EncodedConfirmedBlock, EncodedConfirmedTransaction, EncodedTransaction,
+        EncodedTransactionWithStatusMeta, Rewards, TransactionConfirmationStatus,
+        TransactionStatus, UiCompiledInstruction, UiMessage, UiRawMessage, UiTransaction,
+        UiTransactionEncoding, UiTransactionStatusMeta,
     },
     solana_version::Version,
     std::{collections::HashMap, net::SocketAddr, str::FromStr, sync::RwLock},
 };
 
 pub const PUBKEY: &str = "7RoSF9fUmdphVCpabEoefH81WwrW7orsWonXWqTXkKV8";
+pub const SIGNATURE: &str =
+    "43yNSFC6fYTuPgTNFFhF4axw7AfWxB2BPdurme8yrsWEYwm8299xh8n6TAHjGymiSub1XtyxTNyd9GBfY2hxoBw8";
 
 pub type Mocks = HashMap<RpcRequest, Value>;
 pub struct MockSender {
@@ -86,17 +87,12 @@ impl MockSender {
     }
 }
 
-#[async_trait]
 impl RpcSender for MockSender {
     fn get_transport_stats(&self) -> RpcTransportStats {
         RpcTransportStats::default()
     }
 
-    async fn send(
-        &self,
-        request: RpcRequest,
-        params: serde_json::Value,
-    ) -> Result<serde_json::Value> {
+    fn send(&self, request: RpcRequest, params: serde_json::Value) -> Result<serde_json::Value> {
         if let Some(value) = self.mocks.write().unwrap().remove(&request) {
             return Ok(value);
         }
@@ -189,10 +185,9 @@ impl RpcSender for MockSender {
                     value: statuses,
                 })?
             }
-            "getTransaction" => serde_json::to_value(EncodedConfirmedTransactionWithStatusMeta {
+            "getTransaction" => serde_json::to_value(EncodedConfirmedTransaction {
                 slot: 2,
                 transaction: EncodedTransactionWithStatusMeta {
-                    version: Some(TransactionVersion::LEGACY),
                     transaction: EncodedTransaction::Json(
                         UiTransaction {
                             signatures: vec!["3AsdoALgZFuq2oUVWrDYhg2pNeaLJKPLf8hU2mQ6U8qJxeJ6hsrPVpMn9ma39DtfYCrDQSvngWRP8NnTpEhezJpE".to_string()],
@@ -214,7 +209,6 @@ impl RpcSender for MockSender {
                                         accounts: vec![0, 1],
                                         data: "3Bxs49DitAvXtoDR".to_string(),
                                     }],
-                                    address_table_lookups: None,
                                 })
                         }),
                     meta: Some(UiTransactionStatusMeta {
@@ -228,7 +222,6 @@ impl RpcSender for MockSender {
                             pre_token_balances: None,
                             post_token_balances: None,
                             rewards: None,
-                            loaded_addresses: None,
                         }),
                 },
                 block_time: Some(1628633791),
@@ -381,10 +374,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,
@@ -394,7 +386,7 @@ impl RpcSender for MockSender {
             "getBlocksWithLimit" => serde_json::to_value(vec![1, 2, 3])?,
             "getSignaturesForAddress" => {
                 serde_json::to_value(vec![RpcConfirmedTransactionStatusWithSignature {
-                    signature: crate::mock_sender_for_cli::SIGNATURE.to_string(),
+                    signature: SIGNATURE.to_string(),
                     slot: 123,
                     err: None,
                     memo: None,
@@ -443,7 +435,7 @@ impl RpcSender for MockSender {
                 value: vec![Value::Null, Value::Null]
             })?,
             "getProgramAccounts" => {
-                let pubkey = Pubkey::from_str(PUBKEY).unwrap();
+                let pubkey = Pubkey::from_str(&PUBKEY.to_string()).unwrap();
                 let account = Account {
                     lamports: 1_000_000,
                     data: vec![],

client/src/nonblocking/mod.rs

@@ -1,2 +0,0 @@
-pub mod pubsub_client;
-pub mod rpc_client;

client/src/nonblocking/pubsub_client.rs

@@ -1,341 +0,0 @@
-use {
-    crate::{
-        http_sender::RpcErrorObject,
-        rpc_config::{
-            RpcAccountInfoConfig, RpcBlockSubscribeConfig, RpcBlockSubscribeFilter,
-            RpcProgramAccountsConfig, RpcSignatureSubscribeConfig, RpcTransactionLogsConfig,
-            RpcTransactionLogsFilter,
-        },
-        rpc_response::{
-            Response as RpcResponse, RpcBlockUpdate, RpcKeyedAccount, RpcLogsResponse,
-            RpcSignatureResult, RpcVote, SlotInfo, SlotUpdate,
-        },
-    },
-    futures_util::{
-        future::{ready, BoxFuture, FutureExt},
-        sink::SinkExt,
-        stream::{BoxStream, StreamExt},
-    },
-    log::*,
-    serde::de::DeserializeOwned,
-    serde_json::{json, Map, Value},
-    solana_account_decoder::UiAccount,
-    solana_sdk::{clock::Slot, pubkey::Pubkey, signature::Signature},
-    std::collections::BTreeMap,
-    thiserror::Error,
-    tokio::{
-        net::TcpStream,
-        sync::{mpsc, oneshot},
-        task::JoinHandle,
-        time::{sleep, Duration},
-    },
-    tokio_stream::wrappers::UnboundedReceiverStream,
-    tokio_tungstenite::{
-        connect_async,
-        tungstenite::{
-            protocol::frame::{coding::CloseCode, CloseFrame},
-            Message,
-        },
-        MaybeTlsStream, WebSocketStream,
-    },
-    url::Url,
-};
-
-pub type PubsubClientResult<T = ()> = Result<T, PubsubClientError>;
-
-#[derive(Debug, Error)]
-pub enum PubsubClientError {
-    #[error("url parse error")]
-    UrlParseError(#[from] url::ParseError),
-
-    #[error("unable to connect to server")]
-    ConnectionError(tokio_tungstenite::tungstenite::Error),
-
-    #[error("websocket error")]
-    WsError(#[from] tokio_tungstenite::tungstenite::Error),
-
-    #[error("connection closed (({0})")]
-    ConnectionClosed(String),
-
-    #[error("json parse error")]
-    JsonParseError(#[from] serde_json::error::Error),
-
-    #[error("subscribe failed: {reason}")]
-    SubscribeFailed { reason: String, message: String },
-}
-
-type UnsubscribeFn = Box<dyn FnOnce() -> BoxFuture<'static, ()> + Send>;
-type SubscribeResponseMsg =
-    Result<(mpsc::UnboundedReceiver<Value>, UnsubscribeFn), PubsubClientError>;
-type SubscribeRequestMsg = (String, Value, oneshot::Sender<SubscribeResponseMsg>);
-type SubscribeResult<'a, T> = PubsubClientResult<(BoxStream<'a, T>, UnsubscribeFn)>;
-
-#[derive(Debug)]
-pub struct PubsubClient {
-    subscribe_tx: mpsc::UnboundedSender<SubscribeRequestMsg>,
-    shutdown_tx: oneshot::Sender<()>,
-    ws: JoinHandle<PubsubClientResult>,
-}
-
-impl PubsubClient {
-    pub async fn new(url: &str) -> PubsubClientResult<Self> {
-        let url = Url::parse(url)?;
-        let (ws, _response) = connect_async(url)
-            .await
-            .map_err(PubsubClientError::ConnectionError)?;
-
-        let (subscribe_tx, subscribe_rx) = mpsc::unbounded_channel();
-        let (shutdown_tx, shutdown_rx) = oneshot::channel();
-
-        Ok(Self {
-            subscribe_tx,
-            shutdown_tx,
-            ws: tokio::spawn(PubsubClient::run_ws(ws, subscribe_rx, shutdown_rx)),
-        })
-    }
-
-    pub async fn shutdown(self) -> PubsubClientResult {
-        let _ = self.shutdown_tx.send(());
-        self.ws.await.unwrap() // WS future should not be cancelled or panicked
-    }
-
-    async fn subscribe<'a, T>(&self, operation: &str, params: Value) -> SubscribeResult<'a, T>
-    where
-        T: DeserializeOwned + Send + 'a,
-    {
-        let (response_tx, response_rx) = oneshot::channel();
-        self.subscribe_tx
-            .send((operation.to_string(), params, response_tx))
-            .map_err(|err| PubsubClientError::ConnectionClosed(err.to_string()))?;
-
-        let (notifications, unsubscribe) = response_rx
-            .await
-            .map_err(|err| PubsubClientError::ConnectionClosed(err.to_string()))??;
-        Ok((
-            UnboundedReceiverStream::new(notifications)
-                .filter_map(|value| ready(serde_json::from_value::<T>(value).ok()))
-                .boxed(),
-            unsubscribe,
-        ))
-    }
-
-    pub async fn account_subscribe(
-        &self,
-        pubkey: &Pubkey,
-        config: Option<RpcAccountInfoConfig>,
-    ) -> SubscribeResult<'_, RpcResponse<UiAccount>> {
-        let params = json!([pubkey.to_string(), config]);
-        self.subscribe("account", params).await
-    }
-
-    pub async fn block_subscribe(
-        &self,
-        filter: RpcBlockSubscribeFilter,
-        config: Option<RpcBlockSubscribeConfig>,
-    ) -> SubscribeResult<'_, RpcResponse<RpcBlockUpdate>> {
-        self.subscribe("block", json!([filter, config])).await
-    }
-
-    pub async fn logs_subscribe(
-        &self,
-        filter: RpcTransactionLogsFilter,
-        config: RpcTransactionLogsConfig,
-    ) -> SubscribeResult<'_, RpcResponse<RpcLogsResponse>> {
-        self.subscribe("logs", json!([filter, config])).await
-    }
-
-    pub async fn program_subscribe(
-        &self,
-        pubkey: &Pubkey,
-        config: Option<RpcProgramAccountsConfig>,
-    ) -> SubscribeResult<'_, RpcResponse<RpcKeyedAccount>> {
-        let params = json!([pubkey.to_string(), config]);
-        self.subscribe("program", params).await
-    }
-
-    pub async fn vote_subscribe(&self) -> SubscribeResult<'_, RpcVote> {
-        self.subscribe("vote", json!([])).await
-    }
-
-    pub async fn root_subscribe(&self) -> SubscribeResult<'_, Slot> {
-        self.subscribe("root", json!([])).await
-    }
-
-    pub async fn signature_subscribe(
-        &self,
-        signature: &Signature,
-        config: Option<RpcSignatureSubscribeConfig>,
-    ) -> SubscribeResult<'_, RpcResponse<RpcSignatureResult>> {
-        let params = json!([signature.to_string(), config]);
-        self.subscribe("signature", params).await
-    }
-
-    pub async fn slot_subscribe(&self) -> SubscribeResult<'_, SlotInfo> {
-        self.subscribe("slot", json!([])).await
-    }
-
-    pub async fn slot_updates_subscribe(&self) -> SubscribeResult<'_, SlotUpdate> {
-        self.subscribe("slotsUpdates", json!([])).await
-    }
-
-    async fn run_ws(
-        mut ws: WebSocketStream<MaybeTlsStream<TcpStream>>,
-        mut subscribe_rx: mpsc::UnboundedReceiver<SubscribeRequestMsg>,
-        mut shutdown_rx: oneshot::Receiver<()>,
-    ) -> PubsubClientResult {
-        let mut request_id: u64 = 0;
-
-        let mut requests_subscribe = BTreeMap::new();
-        let mut requests_unsubscribe = BTreeMap::<u64, oneshot::Sender<()>>::new();
-        let mut subscriptions = BTreeMap::new();
-        let (unsubscribe_tx, mut unsubscribe_rx) = mpsc::unbounded_channel();
-
-        loop {
-            tokio::select! {
-                // Send close on shutdown signal
-                _ = (&mut shutdown_rx) => {
-                    let frame = CloseFrame { code: CloseCode::Normal, reason: "".into() };
-                    ws.send(Message::Close(Some(frame))).await?;
-                    ws.flush().await?;
-                    break;
-                },
-                // Send `Message::Ping` each 10s if no any other communication
-                () = sleep(Duration::from_secs(10)) => {
-                    ws.send(Message::Ping(Vec::new())).await?;
-                },
-                // Read message for subscribe
-                Some((operation, params, response_tx)) = subscribe_rx.recv() => {
-                    request_id += 1;
-                    let method = format!("{}Subscribe", operation);
-                    let text = json!({"jsonrpc":"2.0","id":request_id,"method":method,"params":params}).to_string();
-                    ws.send(Message::Text(text)).await?;
-                    requests_subscribe.insert(request_id, (operation, response_tx));
-                },
-                // Read message for unsubscribe
-                Some((operation, sid, response_tx)) = unsubscribe_rx.recv() => {
-                    subscriptions.remove(&sid);
-                    request_id += 1;
-                    let method = format!("{}Unsubscribe", operation);
-                    let text = json!({"jsonrpc":"2.0","id":request_id,"method":method,"params":[sid]}).to_string();
-                    ws.send(Message::Text(text)).await?;
-                    requests_unsubscribe.insert(request_id, response_tx);
-                },
-                // Read incoming WebSocket message
-                next_msg = ws.next() => {
-                    let msg = match next_msg {
-                        Some(msg) => msg?,
-                        None => break,
-                    };
-                    trace!("ws.next(): {:?}", &msg);
-
-                    // Get text from the message
-                    let text = match msg {
-                        Message::Text(text) => text,
-                        Message::Binary(_data) => continue, // Ignore
-                        Message::Ping(data) => {
-                            ws.send(Message::Pong(data)).await?;
-                            continue
-                        },
-                        Message::Pong(_data) => continue,
-                        Message::Close(_frame) => break,
-                        Message::Frame(_frame) => continue,
-                    };
-
-
-                    let mut json: Map<String, Value> = serde_json::from_str(&text)?;
-
-                    // Subscribe/Unsubscribe response, example:
-                    // `{"jsonrpc":"2.0","result":5308752,"id":1}`
-                    if let Some(id) = json.get("id") {
-                        let id = id.as_u64().ok_or_else(|| {
-                            PubsubClientError::SubscribeFailed { reason: "invalid `id` field".into(), message: text.clone() }
-                        })?;
-
-                        let err = json.get("error").map(|error_object| {
-                            match serde_json::from_value::<RpcErrorObject>(error_object.clone()) {
-                                Ok(rpc_error_object) => {
-                                    format!("{} ({})",  rpc_error_object.message, rpc_error_object.code)
-                                }
-                                Err(err) => format!(
-                                    "Failed to deserialize RPC error response: {} [{}]",
-                                    serde_json::to_string(error_object).unwrap(),
-                                    err
-                                )
-                            }
-                        });
-
-                        if let Some(response_tx) = requests_unsubscribe.remove(&id) {
-                            let _ = response_tx.send(()); // do not care if receiver is closed
-                        } else if let Some((operation, response_tx)) = requests_subscribe.remove(&id) {
-                            match err {
-                                Some(reason) => {
-                                    let _ = response_tx.send(Err(PubsubClientError::SubscribeFailed { reason, message: text.clone()}));
-                                },
-                                None => {
-                                    // Subscribe Id
-                                    let sid = json.get("result").and_then(Value::as_u64).ok_or_else(|| {
-                                        PubsubClientError::SubscribeFailed { reason: "invalid `result` field".into(), message: text.clone() }
-                                    })?;
-
-                                    // Create notifications channel and unsubscribe function
-                                    let (notifications_tx, notifications_rx) = mpsc::unbounded_channel();
-                                    let unsubscribe_tx = unsubscribe_tx.clone();
-                                    let unsubscribe = Box::new(move || async move {
-                                        let (response_tx, response_rx) = oneshot::channel();
-                                        // do nothing if ws already closed
-                                        if unsubscribe_tx.send((operation, sid, response_tx)).is_ok() {
-                                            let _ = response_rx.await; // channel can be closed only if ws is closed
-                                        }
-                                    }.boxed());
-
-                                    if response_tx.send(Ok((notifications_rx, unsubscribe))).is_err() {
-                                        break;
-                                    }
-                                    subscriptions.insert(sid, notifications_tx);
-                                }
-                            }
-                        } else {
-                            error!("Unknown request id: {}", id);
-                            break;
-                        }
-                        continue;
-                    }
-
-                    // Notification, example:
-                    // `{"jsonrpc":"2.0","method":"logsNotification","params":{"result":{...},"subscription":3114862}}`
-                    if let Some(Value::Object(params)) = json.get_mut("params") {
-                        if let Some(sid) = params.get("subscription").and_then(Value::as_u64) {
-                            let mut unsubscribe_required = false;
-
-                            if let Some(notifications_tx) = subscriptions.get(&sid) {
-                                if let Some(result) = params.remove("result") {
-                                    if notifications_tx.send(result).is_err() {
-                                        unsubscribe_required = true;
-                                    }
-                                }
-                            } else {
-                                unsubscribe_required = true;
-                            }
-
-                            if unsubscribe_required {
-                                if let Some(Value::String(method)) = json.remove("method") {
-                                    if let Some(operation) = method.strip_suffix("Notification") {
-                                        let (response_tx, _response_rx) = oneshot::channel();
-                                        let _ = unsubscribe_tx.send((operation.to_string(), sid, response_tx));
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        Ok(())
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    // see client-test/test/client.rs
-}

client/src/nonce_utils.rs

@@ -4,7 +4,6 @@ use {
         account::{Account, ReadableAccount},
         account_utils::StateMut,
         commitment_config::CommitmentConfig,
-        hash::Hash,
         nonce::{
             state::{Data, Versions},
             State,
@@ -22,10 +21,10 @@ pub enum Error {
     InvalidAccountData,
     #[error("unexpected account data size")]
     UnexpectedDataSize,
-    #[error("provided hash ({provided}) does not match nonce hash ({expected})")]
-    InvalidHash { provided: Hash, expected: Hash },
-    #[error("provided authority ({provided}) does not match nonce authority ({expected})")]
-    InvalidAuthority { provided: Pubkey, expected: Pubkey },
+    #[error("query hash does not match stored hash")]
+    InvalidHash,
+    #[error("query authority does not match account authority")]
+    InvalidAuthority,
     #[error("invalid state for requested operation")]
     InvalidStateForOperation,
     #[error("client error: {0}")]

client/src/perf_utils.rs

@@ -43,16 +43,18 @@ pub fn sample_txs<T>(
         total_elapsed = start_time.elapsed();
         let elapsed = now.elapsed();
         now = Instant::now();
-        let mut txs =
-            match client.get_transaction_count_with_commitment(CommitmentConfig::processed()) {
-                Err(e) => {
-                    // ThinClient with multiple options should pick a better one now.
-                    info!("Couldn't get transaction count {:?}", e);
-                    sleep(Duration::from_secs(sample_period));
-                    continue;
-                }
-                Ok(tx_count) => tx_count,
-            };
+        let mut txs;
+        match client.get_transaction_count_with_commitment(CommitmentConfig::processed()) {
+            Err(e) => {
+                // ThinClient with multiple options should pick a better one now.
+                info!("Couldn't get transaction count {:?}", e);
+                sleep(Duration::from_secs(sample_period));
+                continue;
+            }
+            Ok(tx_count) => {
+                txs = tx_count;
+            }
+        }
 
         if txs < last_txs {
             info!("Expected txs({}) >= last_txs({})", txs, last_txs);

client/src/pubsub_client.rs

@@ -10,7 +10,6 @@ use {
             RpcSignatureResult, RpcVote, SlotInfo, SlotUpdate,
         },
     },
-    crossbeam_channel::{unbounded, Receiver, Sender},
     log::*,
     serde::de::DeserializeOwned,
     serde_json::{
@@ -25,6 +24,7 @@ use {
         net::TcpStream,
         sync::{
             atomic::{AtomicBool, Ordering},
+            mpsc::{channel, Receiver, Sender},
             Arc, RwLock,
         },
         thread::{sleep, JoinHandle},
@@ -242,7 +242,7 @@ impl PubsubClient {
     ) -> Result<AccountSubscription, PubsubClientError> {
         let url = Url::parse(url)?;
         let socket = connect_with_retry(url)?;
-        let (sender, receiver) = unbounded();
+        let (sender, receiver) = channel();
 
         let socket = Arc::new(RwLock::new(socket));
         let socket_clone = socket.clone();
@@ -283,7 +283,7 @@ impl PubsubClient {
     ) -> Result<BlockSubscription, PubsubClientError> {
         let url = Url::parse(url)?;
         let socket = connect_with_retry(url)?;
-        let (sender, receiver) = unbounded();
+        let (sender, receiver) = channel();
 
         let socket = Arc::new(RwLock::new(socket));
         let socket_clone = socket.clone();
@@ -322,7 +322,7 @@ impl PubsubClient {
     ) -> Result<LogsSubscription, PubsubClientError> {
         let url = Url::parse(url)?;
         let socket = connect_with_retry(url)?;
-        let (sender, receiver) = unbounded();
+        let (sender, receiver) = channel();
 
         let socket = Arc::new(RwLock::new(socket));
         let socket_clone = socket.clone();
@@ -361,7 +361,7 @@ impl PubsubClient {
     ) -> Result<ProgramSubscription, PubsubClientError> {
         let url = Url::parse(url)?;
         let socket = connect_with_retry(url)?;
-        let (sender, receiver) = unbounded();
+        let (sender, receiver) = channel();
 
         let socket = Arc::new(RwLock::new(socket));
         let socket_clone = socket.clone();
@@ -398,7 +398,7 @@ impl PubsubClient {
     pub fn vote_subscribe(url: &str) -> Result<VoteSubscription, PubsubClientError> {
         let url = Url::parse(url)?;
         let socket = connect_with_retry(url)?;
-        let (sender, receiver) = unbounded();
+        let (sender, receiver) = channel();
 
         let socket = Arc::new(RwLock::new(socket));
         let socket_clone = socket.clone();
@@ -431,7 +431,7 @@ impl PubsubClient {
     pub fn root_subscribe(url: &str) -> Result<RootSubscription, PubsubClientError> {
         let url = Url::parse(url)?;
         let socket = connect_with_retry(url)?;
-        let (sender, receiver) = unbounded();
+        let (sender, receiver) = channel();
 
         let socket = Arc::new(RwLock::new(socket));
         let socket_clone = socket.clone();
@@ -468,7 +468,7 @@ impl PubsubClient {
     ) -> Result<SignatureSubscription, PubsubClientError> {
         let url = Url::parse(url)?;
         let socket = connect_with_retry(url)?;
-        let (sender, receiver) = unbounded();
+        let (sender, receiver) = channel();
 
         let socket = Arc::new(RwLock::new(socket));
         let socket_clone = socket.clone();
@@ -506,7 +506,7 @@ impl PubsubClient {
     pub fn slot_subscribe(url: &str) -> Result<SlotsSubscription, PubsubClientError> {
         let url = Url::parse(url)?;
         let socket = connect_with_retry(url)?;
-        let (sender, receiver) = unbounded::<SlotInfo>();
+        let (sender, receiver) = channel::<SlotInfo>();
 
         let socket = Arc::new(RwLock::new(socket));
         let socket_clone = socket.clone();
@@ -615,5 +615,5 @@ impl PubsubClient {
 
 #[cfg(test)]
 mod tests {
-    // see client-test/test/client.rs
+    // see core/tests/client.rs#test_slot_subscription()
 }

client/src/quic_client.rs

@@ -1,208 +0,0 @@
-//! Simple client that connects to a given UDP port with the QUIC protocol and provides
-//! an interface for sending transactions which is restricted by the server's flow control.
-
-use {
-    crate::{client_error::ClientErrorKind, tpu_connection::TpuConnection},
-    async_mutex::Mutex,
-    futures::future::join_all,
-    itertools::Itertools,
-    quinn::{ClientConfig, Endpoint, EndpointConfig, NewConnection, WriteError},
-    rayon::iter::{IntoParallelIterator, ParallelIterator},
-    solana_sdk::{
-        quic::{QUIC_MAX_CONCURRENT_STREAMS, QUIC_PORT_OFFSET},
-        transaction::Transaction,
-        transport::Result as TransportResult,
-    },
-    std::{
-        net::{SocketAddr, UdpSocket},
-        sync::Arc,
-    },
-    tokio::runtime::Runtime,
-};
-
-struct SkipServerVerification;
-
-impl SkipServerVerification {
-    pub fn new() -> Arc<Self> {
-        Arc::new(Self)
-    }
-}
-
-impl rustls::client::ServerCertVerifier for SkipServerVerification {
-    fn verify_server_cert(
-        &self,
-        _end_entity: &rustls::Certificate,
-        _intermediates: &[rustls::Certificate],
-        _server_name: &rustls::ServerName,
-        _scts: &mut dyn Iterator<Item = &[u8]>,
-        _ocsp_response: &[u8],
-        _now: std::time::SystemTime,
-    ) -> Result<rustls::client::ServerCertVerified, rustls::Error> {
-        Ok(rustls::client::ServerCertVerified::assertion())
-    }
-}
-
-struct QuicClient {
-    runtime: Runtime,
-    endpoint: Endpoint,
-    connection: Arc<Mutex<Option<Arc<NewConnection>>>>,
-    addr: SocketAddr,
-}
-
-pub struct QuicTpuConnection {
-    client: Arc<QuicClient>,
-}
-
-impl TpuConnection for QuicTpuConnection {
-    fn new(client_socket: UdpSocket, tpu_addr: SocketAddr) -> Self {
-        let tpu_addr = SocketAddr::new(tpu_addr.ip(), tpu_addr.port() + QUIC_PORT_OFFSET);
-        let client = Arc::new(QuicClient::new(client_socket, tpu_addr));
-
-        Self { client }
-    }
-
-    fn tpu_addr(&self) -> &SocketAddr {
-        &self.client.addr
-    }
-
-    fn send_wire_transaction(&self, data: Vec<u8>) -> TransportResult<()> {
-        let _guard = self.client.runtime.enter();
-        let send_buffer = self.client.send_buffer(&data[..]);
-        self.client.runtime.block_on(send_buffer)?;
-        Ok(())
-    }
-
-    fn send_batch(&self, transactions: Vec<Transaction>) -> TransportResult<()> {
-        let buffers = transactions
-            .into_par_iter()
-            .map(|tx| bincode::serialize(&tx).expect("serialize Transaction in send_batch"))
-            .collect::<Vec<_>>();
-
-        let _guard = self.client.runtime.enter();
-        let send_batch = self.client.send_batch(&buffers[..]);
-        self.client.runtime.block_on(send_batch)?;
-        Ok(())
-    }
-}
-
-impl QuicClient {
-    pub fn new(client_socket: UdpSocket, addr: SocketAddr) -> Self {
-        let runtime = tokio::runtime::Builder::new_multi_thread()
-            .enable_all()
-            .build()
-            .unwrap();
-
-        let _guard = runtime.enter();
-
-        let crypto = rustls::ClientConfig::builder()
-            .with_safe_defaults()
-            .with_custom_certificate_verifier(SkipServerVerification::new())
-            .with_no_client_auth();
-
-        let create_endpoint = QuicClient::create_endpoint(EndpointConfig::default(), client_socket);
-
-        let mut endpoint = runtime.block_on(create_endpoint);
-
-        endpoint.set_default_client_config(ClientConfig::new(Arc::new(crypto)));
-
-        Self {
-            runtime,
-            endpoint,
-            connection: Arc::new(Mutex::new(None)),
-            addr,
-        }
-    }
-
-    // If this function becomes public, it should be changed to
-    // not expose details of the specific Quic implementation we're using
-    async fn create_endpoint(config: EndpointConfig, client_socket: UdpSocket) -> Endpoint {
-        quinn::Endpoint::new(config, None, client_socket).unwrap().0
-    }
-
-    async fn _send_buffer_using_conn(
-        data: &[u8],
-        connection: &NewConnection,
-    ) -> Result<(), WriteError> {
-        let mut send_stream = connection.connection.open_uni().await?;
-        send_stream.write_all(data).await?;
-        send_stream.finish().await?;
-        Ok(())
-    }
-
-    // Attempts to send data, connecting/reconnecting as necessary
-    // On success, returns the connection used to successfully send the data
-    async fn _send_buffer(&self, data: &[u8]) -> Result<Arc<NewConnection>, WriteError> {
-        let connection = {
-            let mut conn_guard = self.connection.lock().await;
-
-            let maybe_conn = (*conn_guard).clone();
-            match maybe_conn {
-                Some(conn) => conn.clone(),
-                None => {
-                    let connecting = self.endpoint.connect(self.addr, "connect").unwrap();
-                    let connection = Arc::new(connecting.await?);
-                    *conn_guard = Some(connection.clone());
-                    connection
-                }
-            }
-        };
-        match Self::_send_buffer_using_conn(data, &connection).await {
-            Ok(()) => Ok(connection),
-            _ => {
-                let connection = {
-                    let connecting = self.endpoint.connect(self.addr, "connect").unwrap();
-                    let connection = Arc::new(connecting.await?);
-                    let mut conn_guard = self.connection.lock().await;
-                    *conn_guard = Some(connection.clone());
-                    connection
-                };
-                Self::_send_buffer_using_conn(data, &connection).await?;
-                Ok(connection)
-            }
-        }
-    }
-
-    pub async fn send_buffer(&self, data: &[u8]) -> Result<(), ClientErrorKind> {
-        self._send_buffer(data).await?;
-        Ok(())
-    }
-
-    pub async fn send_batch(&self, buffers: &[Vec<u8>]) -> Result<(), ClientErrorKind> {
-        // 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][..]).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[..], connection_ref)),
-            )
-        });
-
-        for f in futures {
-            f.await.into_iter().try_for_each(|res| res)?;
-        }
-        Ok(())
-    }
-}

client/src/rpc_config.rs

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

client/src/rpc_custom_error.rs

@@ -3,7 +3,6 @@ use {
     crate::rpc_response::RpcSimulateTransactionResult,
     jsonrpc_core::{Error, ErrorCode},
     solana_sdk::clock::Slot,
-    solana_transaction_status::EncodeError,
     thiserror::Error,
 };
 
@@ -21,7 +20,6 @@ pub const JSON_RPC_SERVER_ERROR_TRANSACTION_HISTORY_NOT_AVAILABLE: i64 = -32011;
 pub const JSON_RPC_SCAN_ERROR: i64 = -32012;
 pub const JSON_RPC_SERVER_ERROR_TRANSACTION_SIGNATURE_LEN_MISMATCH: i64 = -32013;
 pub const JSON_RPC_SERVER_ERROR_BLOCK_STATUS_NOT_AVAILABLE_YET: i64 = -32014;
-pub const JSON_RPC_SERVER_ERROR_UNSUPPORTED_TRANSACTION_VERSION: i64 = -32015;
 
 #[derive(Error, Debug)]
 pub enum RpcCustomError {
@@ -59,8 +57,6 @@ pub enum RpcCustomError {
     TransactionSignatureLenMismatch,
     #[error("BlockStatusNotAvailableYet")]
     BlockStatusNotAvailableYet { slot: Slot },
-    #[error("UnsupportedTransactionVersion")]
-    UnsupportedTransactionVersion(u8),
 }
 
 #[derive(Debug, Serialize, Deserialize)]
@@ -69,16 +65,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,11 +169,6 @@ impl From<RpcCustomError> for Error {
                 message: format!("Block status not yet available for slot {}", slot),
                 data: None,
             },
-            RpcCustomError::UnsupportedTransactionVersion(version) => Self {
-                code: ErrorCode::ServerError(JSON_RPC_SERVER_ERROR_UNSUPPORTED_TRANSACTION_VERSION),
-                message: format!("Transaction version ({}) is not supported", version),
-                data: None,
-            },
         }
     }
 }

client/src/rpc_deprecated_config.rs

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

client/src/rpc_response.rs

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

client/src/rpc_sender.rs

@@ -1,7 +1,7 @@
 //! A transport for RPC calls.
+
 use {
     crate::{client_error::Result, rpc_request::RpcRequest},
-    async_trait::async_trait,
     std::time::Duration,
 };
 
@@ -23,13 +23,13 @@ pub struct RpcTransportStats {
 /// `RpcSender` implements the underlying transport of requests to, and
 /// responses from, a Solana node, and is used primarily by [`RpcClient`].
 ///
+/// It is typically implemented by [`HttpSender`] in production, and
+/// [`MockSender`] in unit tests.
+///
 /// [`RpcClient`]: crate::rpc_client::RpcClient
-#[async_trait]
+/// [`HttpSender`]: crate::http_sender::HttpSender
+/// [`MockSender`]: crate::mock_sender::MockSender
 pub trait RpcSender {
-    async fn send(
-        &self,
-        request: RpcRequest,
-        params: serde_json::Value,
-    ) -> Result<serde_json::Value>;
+    fn send(&self, request: RpcRequest, params: serde_json::Value) -> Result<serde_json::Value>;
     fn get_transport_stats(&self) -> RpcTransportStats;
 }

client/src/thin_client.rs

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

client/src/tpu_connection.rs

@@ -1,19 +0,0 @@
-use {
-    solana_sdk::{transaction::Transaction, transport::Result as TransportResult},
-    std::net::{SocketAddr, UdpSocket},
-};
-
-pub trait TpuConnection {
-    fn new(client_socket: UdpSocket, tpu_addr: SocketAddr) -> Self;
-
-    fn tpu_addr(&self) -> &SocketAddr;
-
-    fn send_transaction(&self, tx: &Transaction) -> TransportResult<()> {
-        let data = bincode::serialize(tx).expect("serialize Transaction in send_transaction");
-        self.send_wire_transaction(data)
-    }
-
-    fn send_wire_transaction(&self, data: Vec<u8>) -> TransportResult<()>;
-
-    fn send_batch(&self, transactions: Vec<Transaction>) -> TransportResult<()>;
-}

client/src/udp_client.rs

@@ -1,42 +0,0 @@
-//! Simple TPU client that communicates with the given UDP port with UDP and provides
-//! an interface for sending transactions
-
-use {
-    crate::tpu_connection::TpuConnection,
-    solana_sdk::{transaction::Transaction, transport::Result as TransportResult},
-    std::net::{SocketAddr, UdpSocket},
-};
-
-pub struct UdpTpuConnection {
-    socket: UdpSocket,
-    addr: SocketAddr,
-}
-
-impl TpuConnection for UdpTpuConnection {
-    fn new(client_socket: UdpSocket, tpu_addr: SocketAddr) -> Self {
-        Self {
-            socket: client_socket,
-            addr: tpu_addr,
-        }
-    }
-
-    fn tpu_addr(&self) -> &SocketAddr {
-        &self.addr
-    }
-
-    fn send_wire_transaction(&self, data: Vec<u8>) -> TransportResult<()> {
-        self.socket.send_to(&data[..], self.addr)?;
-        Ok(())
-    }
-
-    fn send_batch(&self, transactions: Vec<Transaction>) -> TransportResult<()> {
-        transactions
-            .into_iter()
-            .map(|tx| bincode::serialize(&tx).expect("serialize Transaction in send_batch"))
-            .try_for_each(|buff| -> TransportResult<()> {
-                self.socket.send_to(&buff[..], self.addr)?;
-                Ok(())
-            })?;
-        Ok(())
-    }
-}

core/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "solana-core"
 description = "Blockchain, Rebuilt for Scale"
-version = "1.10.1"
+version = "1.9.13"
 homepage = "https://solana.com/"
 documentation = "https://docs.rs/solana-core"
 readme = "../README.md"
@@ -20,65 +20,65 @@ bincode = "1.3.3"
 bs58 = "0.4.0"
 chrono = { version = "0.4.11", features = ["serde"] }
 crossbeam-channel = "0.5"
-dashmap = { version = "5.1.0", features = ["rayon", "raw-api"] }
-etcd-client = { version = "0.8.4", features = ["tls"]}
+dashmap = { version = "4.0.2", features = ["rayon", "raw-api"] }
+etcd-client = { version = "0.8.1", features = ["tls"]}
 fs_extra = "1.2.0"
 histogram = "0.6.9"
-itertools = "0.10.3"
+itertools = "0.10.1"
 log = "0.4.14"
-lru = "0.7.3"
+lru = "0.7.1"
 rand = "0.7.0"
 rand_chacha = "0.2.2"
+raptorq = "1.6.4"
 rayon = "1.5.1"
-retain_mut = "0.1.7"
-serde = "1.0.136"
+retain_mut = "0.1.5"
+serde = "1.0.130"
 serde_derive = "1.0.103"
-solana-address-lookup-table-program = { path = "../programs/address-lookup-table", version = "=1.10.1" }
-solana-bloom = { path = "../bloom", version = "=1.10.1" }
-solana-accountsdb-plugin-manager = { path = "../accountsdb-plugin-manager", version = "=1.10.1" }
-solana-client = { path = "../client", version = "=1.10.1" }
-solana-entry = { path = "../entry", version = "=1.10.1" }
-solana-gossip = { path = "../gossip", version = "=1.10.1" }
-solana-ledger = { path = "../ledger", version = "=1.10.1" }
-solana-measure = { path = "../measure", version = "=1.10.1" }
-solana-metrics = { path = "../metrics", version = "=1.10.1" }
-solana-net-utils = { path = "../net-utils", version = "=1.10.1" }
-solana-perf = { path = "../perf", version = "=1.10.1" }
-solana-poh = { path = "../poh", version = "=1.10.1" }
-solana-program-runtime = { path = "../program-runtime", version = "=1.10.1" }
-solana-rpc = { path = "../rpc", version = "=1.10.1" }
-solana-replica-lib = { path = "../replica-lib", version = "=1.10.1" }
-solana-runtime = { path = "../runtime", version = "=1.10.1" }
-solana-sdk = { path = "../sdk", version = "=1.10.1" }
-solana-frozen-abi = { path = "../frozen-abi", version = "=1.10.1" }
-solana-frozen-abi-macro = { path = "../frozen-abi/macro", version = "=1.10.1" }
-solana-send-transaction-service = { path = "../send-transaction-service", version = "=1.10.1" }
-solana-streamer = { path = "../streamer", version = "=1.10.1" }
-solana-transaction-status = { path = "../transaction-status", version = "=1.10.1" }
-solana-vote-program = { path = "../programs/vote", version = "=1.10.1" }
-tempfile = "3.3.0"
+solana-bloom = { path = "../bloom", version = "=1.9.13" }
+solana-client = { path = "../client", version = "=1.9.13" }
+solana-entry = { path = "../entry", version = "=1.9.13" }
+solana-geyser-plugin-manager = { path = "../geyser-plugin-manager", version = "=1.9.13" }
+solana-gossip = { path = "../gossip", version = "=1.9.13" }
+solana-ledger = { path = "../ledger", version = "=1.9.13" }
+solana-logger = { path = "../logger", version = "=1.9.13" }
+solana-measure = { path = "../measure", version = "=1.9.13" }
+solana-metrics = { path = "../metrics", version = "=1.9.13" }
+solana-net-utils = { path = "../net-utils", version = "=1.9.13" }
+solana-perf = { path = "../perf", version = "=1.9.13" }
+solana-poh = { path = "../poh", version = "=1.9.13" }
+solana-program-runtime = { path = "../program-runtime", version = "=1.9.13" }
+solana-rpc = { path = "../rpc", version = "=1.9.13" }
+solana-replica-lib = { path = "../replica-lib", version = "=1.9.13" }
+solana-runtime = { path = "../runtime", version = "=1.9.13" }
+solana-sdk = { path = "../sdk", version = "=1.9.13" }
+solana-frozen-abi = { path = "../frozen-abi", version = "=1.9.13" }
+solana-frozen-abi-macro = { path = "../frozen-abi/macro", version = "=1.9.13" }
+solana-send-transaction-service = { path = "../send-transaction-service", version = "=1.9.13" }
+solana-streamer = { path = "../streamer", version = "=1.9.13" }
+solana-transaction-status = { path = "../transaction-status", version = "=1.9.13" }
+solana-vote-program = { path = "../programs/vote", version = "=1.9.13" }
+tempfile = "3.2.0"
 thiserror = "1.0"
-solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "=1.10.1" }
+solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "=1.9.13" }
 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.9", 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.1" }
-solana-program-runtime = { path = "../program-runtime", version = "=1.10.1" }
-solana-stake-program = { path = "../programs/stake", version = "=1.10.1" }
-solana-version = { path = "../version", version = "=1.10.1" }
+reqwest = { version = "0.11.6", default-features = false, features = ["blocking", "rustls-tls", "json"] }
+serde_json = "1.0.72"
+serial_test = "0.5.1"
+solana-program-runtime = { path = "../program-runtime", version = "=1.9.13" }
+solana-stake-program = { path = "../programs/stake", version = "=1.9.13" }
+solana-version = { path = "../version", version = "=1.9.13" }
 static_assertions = "1.1.0"
 systemstat = "0.1.10"
 
-[target."cfg(unix)".dependencies]
-sysctl = "0.4.4"
-
 [build-dependencies]
 rustc_version = "0.4"
 

core/benches/banking_stage.rs

@@ -4,7 +4,7 @@
 extern crate test;
 
 use {
-    crossbeam_channel::{unbounded, Receiver},
+    crossbeam_channel::unbounded,
     log::*,
     rand::{thread_rng, Rng},
     rayon::prelude::*,
@@ -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},
@@ -38,7 +37,7 @@ use {
     solana_streamer::socket::SocketAddrSpace,
     std::{
         collections::VecDeque,
-        sync::{atomic::Ordering, Arc, RwLock},
+        sync::{atomic::Ordering, mpsc::Receiver, Arc, RwLock},
         time::{Duration, Instant},
     },
     test::Bencher,
@@ -83,11 +82,7 @@ fn bench_consume_buffered(bencher: &mut Bencher) {
         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.
@@ -103,7 +98,7 @@ fn bench_consume_buffered(bencher: &mut Bencher) {
                 None::<Box<dyn Fn()>>,
                 &BankingStageStats::default(),
                 &recorder,
-                &QosService::new(Arc::new(RwLock::new(CostModel::default())), 1),
+                &Arc::new(QosService::new(Arc::new(RwLock::new(CostModel::default())))),
                 &mut LeaderSlotMetricsTracker::new(0),
             );
         });
@@ -175,8 +170,8 @@ fn bench_banking(bencher: &mut Bencher, tx_type: TransactionType) {
     let (vote_sender, vote_receiver) = unbounded();
     let mut bank = Bank::new_for_benches(&genesis_config);
     // Allow arbitrary transaction processing time for the purposes of this bench
-    bank.ns_per_slot = u128::MAX;
-    let bank = Arc::new(bank);
+    bank.ns_per_slot = std::u128::MAX;
+    let bank = Arc::new(Bank::new_for_benches(&genesis_config));
 
     // set cost tracker limits to MAX so it will not filter out TXs
     bank.write_cost_tracker()

core/benches/cluster_nodes.rs

@@ -1,112 +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_sdk::{clock::Slot, hash::hashv, pubkey::Pubkey, signature::Signature},
-    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>,
-    slot: &Slot,
-    slot_leader: &Pubkey,
-    num_simulated_shreds: usize,
-) {
-    for i in 0..num_simulated_shreds {
-        // see Shred::seed
-        let shred_seed = hashv(&[
-            &slot.to_le_bytes(),
-            &(i as u32).to_le_bytes(),
-            &slot_leader.to_bytes(),
-        ])
-        .to_bytes();
-
-        let (_neighbors, _children) = cluster_nodes.get_retransmit_peers_deterministic(
-            shred_seed,
-            solana_gossip::cluster_info::DATA_PLANE_FANOUT,
-            *slot_leader,
-        );
-    }
-}
-
-fn get_retransmit_peers_compat(
-    cluster_nodes: &ClusterNodes<RetransmitStage>,
-    slot_leader: &Pubkey,
-    signatures: &[Signature],
-) {
-    for signature in signatures.iter() {
-        // see Shred::seed
-        let signature = signature.as_ref();
-        let offset = signature.len().checked_sub(32).unwrap();
-        let shred_seed = signature[offset..].try_into().unwrap();
-
-        let (_neighbors, _children) = cluster_nodes.get_retransmit_peers_compat(
-            shred_seed,
-            solana_gossip::cluster_info::DATA_PLANE_FANOUT,
-            *slot_leader,
-        );
-    }
-}
-
-fn get_retransmit_peers_deterministic_wrapper(b: &mut Bencher, unstaked_ratio: Option<(u32, u32)>) {
-    let mut rng = rand::thread_rng();
-    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>();
-    b.iter(|| {
-        get_retransmit_peers_deterministic(
-            &cluster_nodes,
-            &slot,
-            &slot_leader,
-            NUM_SIMULATED_SHREDS,
-        )
-    });
-}
-
-fn get_retransmit_peers_compat_wrapper(b: &mut Bencher, unstaked_ratio: Option<(u32, u32)>) {
-    let mut rng = rand::thread_rng();
-    let (nodes, cluster_nodes) = make_cluster_nodes(&mut rng, unstaked_ratio);
-    let slot_leader = nodes[1..].choose(&mut rng).unwrap().id;
-    let signatures: Vec<_> = std::iter::repeat_with(Signature::new_unique)
-        .take(NUM_SIMULATED_SHREDS)
-        .collect();
-    b.iter(|| get_retransmit_peers_compat(&cluster_nodes, &slot_leader, &signatures));
-}
-
-#[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_compat_unstaked_ratio_1_2(b: &mut Bencher) {
-    get_retransmit_peers_compat_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)));
-}
-
-#[bench]
-fn bench_get_retransmit_peers_compat_unstaked_ratio_1_32(b: &mut Bencher) {
-    get_retransmit_peers_compat_wrapper(b, Some((1, 32)));
-}

core/benches/retransmit_stage.rs

@@ -4,7 +4,6 @@ extern crate solana_core;
 extern crate test;
 
 use {
-    crossbeam_channel::unbounded,
     log::*,
     solana_core::retransmit_stage::retransmitter,
     solana_entry::entry::Entry,
@@ -31,6 +30,7 @@ use {
         net::UdpSocket,
         sync::{
             atomic::{AtomicUsize, Ordering},
+            mpsc::channel,
             Arc, RwLock,
         },
         thread::{sleep, Builder},
@@ -77,7 +77,7 @@ fn bench_retransmitter(bencher: &mut Bencher) {
     let bank_forks = BankForks::new(bank0);
     let bank = bank_forks.working_bank();
     let bank_forks = Arc::new(RwLock::new(bank_forks));
-    let (shreds_sender, shreds_receiver) = unbounded();
+    let (shreds_sender, shreds_receiver) = channel();
     const NUM_THREADS: usize = 2;
     let sockets = (0..NUM_THREADS)
         .map(|_| UdpSocket::bind("0.0.0.0:0").unwrap())

core/benches/sigverify_stage.rs

@@ -9,17 +9,17 @@ use {
     log::*,
     rand::{thread_rng, Rng},
     solana_core::{sigverify::TransactionSigVerifier, sigverify_stage::SigVerifyStage},
-    solana_perf::{
-        packet::{to_packet_batches, PacketBatch},
-        test_tx::test_tx,
-    },
+    solana_perf::{packet::to_packet_batches, packet::PacketBatch, test_tx::test_tx},
     solana_sdk::{
         hash::Hash,
         signature::{Keypair, Signer},
         system_transaction,
         timing::duration_as_ms,
     },
-    std::time::{Duration, Instant},
+    std::{
+        sync::mpsc::channel,
+        time::{Duration, Instant},
+    },
     test::Bencher,
 };
 
@@ -140,7 +140,7 @@ fn gen_batches(use_same_tx: bool) -> Vec<PacketBatch> {
 fn bench_sigverify_stage(bencher: &mut Bencher) {
     solana_logger::setup();
     trace!("start");
-    let (packet_s, packet_r) = unbounded();
+    let (packet_s, packet_r) = channel();
     let (verified_s, verified_r) = unbounded();
     let verifier = TransactionSigVerifier::default();
     let stage = SigVerifyStage::new(packet_r, verified_s, verifier);

core/src/accounts_hash_verifier.rs

@@ -5,7 +5,6 @@
 // set and halt the node if a mismatch is detected.
 
 use {
-    crossbeam_channel::RecvTimeoutError,
     rayon::ThreadPool,
     solana_gossip::cluster_info::{ClusterInfo, MAX_SNAPSHOT_HASHES},
     solana_measure::measure::Measure,
@@ -25,6 +24,7 @@ use {
         path::{Path, PathBuf},
         sync::{
             atomic::{AtomicBool, Ordering},
+            mpsc::RecvTimeoutError,
             Arc,
         },
         thread::{self, Builder, JoinHandle},

core/src/ancestor_hashes_service.rs

@@ -3,7 +3,6 @@ use {
         cluster_slots::ClusterSlots,
         duplicate_repair_status::{DeadSlotAncestorRequestStatus, DuplicateAncestorDecision},
         outstanding_requests::OutstandingRequests,
-        packet_threshold::DynamicPacketToProcessThreshold,
         repair_response::{self},
         repair_service::{DuplicateSlotsResetSender, RepairInfo, RepairStatsGroup},
         replay_stage::DUPLICATE_THRESHOLD,
@@ -13,6 +12,7 @@ use {
     crossbeam_channel::{unbounded, Receiver, Sender},
     dashmap::{mapref::entry::Entry::Occupied, DashMap},
     solana_ledger::{blockstore::Blockstore, shred::SIZE_OF_NONCE},
+    solana_measure::measure::Measure,
     solana_perf::{
         packet::{limited_deserialize, Packet, PacketBatch},
         recycler::Recycler,
@@ -29,6 +29,7 @@ use {
         net::UdpSocket,
         sync::{
             atomic::{AtomicBool, Ordering},
+            mpsc::channel,
             Arc, RwLock,
         },
         thread::{self, sleep, Builder, JoinHandle},
@@ -146,7 +147,7 @@ impl AncestorHashesService {
     ) -> Self {
         let outstanding_requests: Arc<RwLock<OutstandingAncestorHashesRepairs>> =
             Arc::new(RwLock::new(OutstandingAncestorHashesRepairs::default()));
-        let (response_sender, response_receiver) = unbounded();
+        let (response_sender, response_receiver) = channel();
         let t_receiver = streamer::receiver(
             ancestor_hashes_request_socket.clone(),
             &exit,
@@ -208,7 +209,7 @@ impl AncestorHashesService {
             .spawn(move || {
                 let mut last_stats_report = Instant::now();
                 let mut stats = AncestorHashesResponsesStats::default();
-                let mut packet_threshold = DynamicPacketToProcessThreshold::default();
+                let mut max_packets = 1024;
                 loop {
                     let result = Self::process_new_packets_from_channel(
                         &ancestor_hashes_request_statuses,
@@ -216,13 +217,13 @@ impl AncestorHashesService {
                         &blockstore,
                         &outstanding_requests,
                         &mut stats,
-                        &mut packet_threshold,
+                        &mut max_packets,
                         &duplicate_slots_reset_sender,
                         &retryable_slots_sender,
                     );
                     match result {
                         Err(Error::RecvTimeout(_)) | Ok(_) => {}
-                        Err(err) => info!("ancestors hashes responses listener error: {:?}", err),
+                        Err(err) => info!("ancestors hashes reponses listener error: {:?}", err),
                     };
                     if exit.load(Ordering::Relaxed) {
                         return;
@@ -243,7 +244,7 @@ impl AncestorHashesService {
         blockstore: &Blockstore,
         outstanding_requests: &RwLock<OutstandingAncestorHashesRepairs>,
         stats: &mut AncestorHashesResponsesStats,
-        packet_threshold: &mut DynamicPacketToProcessThreshold,
+        max_packets: &mut usize,
         duplicate_slots_reset_sender: &DuplicateSlotsResetSender,
         retryable_slots_sender: &RetryableSlotsSender,
     ) -> Result<()> {
@@ -254,17 +255,18 @@ impl AncestorHashesService {
         let mut dropped_packets = 0;
         while let Ok(batch) = response_receiver.try_recv() {
             total_packets += batch.packets.len();
-            if packet_threshold.should_drop(total_packets) {
-                dropped_packets += batch.packets.len();
-            } else {
+            if total_packets < *max_packets {
+                // Drop the rest in the channel in case of DOS
                 packet_batches.push(batch);
+            } else {
+                dropped_packets += batch.packets.len();
             }
         }
 
         stats.dropped_packets += dropped_packets;
         stats.total_packets += total_packets;
 
-        let timer = Instant::now();
+        let mut time = Measure::start("ancestor_hashes::handle_packets");
         for packet_batch in packet_batches {
             Self::process_packet_batch(
                 ancestor_hashes_request_statuses,
@@ -276,7 +278,14 @@ impl AncestorHashesService {
                 retryable_slots_sender,
             );
         }
-        packet_threshold.update(total_packets, timer.elapsed());
+        time.stop();
+        if total_packets >= *max_packets {
+            if time.as_ms() > 1000 {
+                *max_packets = (*max_packets * 9) / 10;
+            } else {
+                *max_packets = (*max_packets * 10) / 9;
+            }
+        }
         Ok(())
     }
 
@@ -694,7 +703,7 @@ mod test {
         solana_runtime::{accounts_background_service::AbsRequestSender, bank_forks::BankForks},
         solana_sdk::{hash::Hash, signature::Keypair},
         solana_streamer::socket::SocketAddrSpace,
-        std::collections::HashMap,
+        std::{collections::HashMap, sync::mpsc::channel},
         trees::tr,
     };
 
@@ -887,8 +896,8 @@ mod test {
             // Set up thread to give us responses
             let ledger_path = get_tmp_ledger_path!();
             let exit = Arc::new(AtomicBool::new(false));
-            let (requests_sender, requests_receiver) = unbounded();
-            let (response_sender, response_receiver) = unbounded();
+            let (requests_sender, requests_receiver) = channel();
+            let (response_sender, response_receiver) = channel();
 
             // Set up blockstore for responses
             let blockstore = Arc::new(Blockstore::open(&ledger_path).unwrap());

core/src/broadcast_stage.rs

@@ -12,14 +12,17 @@ use {
         cluster_nodes::{ClusterNodes, ClusterNodesCache},
         result::{Error, Result},
     },
-    crossbeam_channel::{unbounded, Receiver, RecvError, RecvTimeoutError, Sender},
+    crossbeam_channel::{
+        Receiver as CrossbeamReceiver, RecvTimeoutError as CrossbeamRecvTimeoutError,
+        Sender as CrossbeamSender,
+    },
     itertools::Itertools,
     solana_gossip::cluster_info::{ClusterInfo, ClusterInfoError, DATA_PLANE_FANOUT},
     solana_ledger::{blockstore::Blockstore, shred::Shred},
     solana_measure::measure::Measure,
     solana_metrics::{inc_new_counter_error, inc_new_counter_info},
     solana_poh::poh_recorder::WorkingBankEntry,
-    solana_runtime::bank_forks::BankForks,
+    solana_runtime::{bank::Bank, bank_forks::BankForks},
     solana_sdk::{
         clock::Slot,
         pubkey::Pubkey,
@@ -31,11 +34,12 @@ use {
         socket::SocketAddrSpace,
     },
     std::{
-        collections::{HashMap, HashSet},
+        collections::HashMap,
         iter::repeat,
         net::UdpSocket,
         sync::{
             atomic::{AtomicBool, Ordering},
+            mpsc::{channel, Receiver, RecvError, RecvTimeoutError, Sender},
             Arc, Mutex, RwLock,
         },
         thread::{self, Builder, JoinHandle},
@@ -54,8 +58,8 @@ const CLUSTER_NODES_CACHE_NUM_EPOCH_CAP: usize = 8;
 const CLUSTER_NODES_CACHE_TTL: Duration = Duration::from_secs(5);
 
 pub(crate) const NUM_INSERT_THREADS: usize = 2;
-pub(crate) type RetransmitSlotsSender = Sender<Slot>;
-pub(crate) type RetransmitSlotsReceiver = Receiver<Slot>;
+pub(crate) type RetransmitSlotsSender = CrossbeamSender<HashMap<Slot, Arc<Bank>>>;
+pub(crate) type RetransmitSlotsReceiver = CrossbeamReceiver<HashMap<Slot, Arc<Bank>>>;
 pub(crate) type RecordReceiver = Receiver<(Arc<Vec<Shred>>, Option<BroadcastShredBatchInfo>)>;
 pub(crate) type TransmitReceiver = Receiver<(Arc<Vec<Shred>>, Option<BroadcastShredBatchInfo>)>;
 
@@ -207,11 +211,13 @@ impl BroadcastStage {
             match e {
                 Error::RecvTimeout(RecvTimeoutError::Disconnected)
                 | Error::Send
-                | Error::Recv(RecvError) => {
+                | Error::Recv(RecvError)
+                | Error::CrossbeamRecvTimeout(CrossbeamRecvTimeoutError::Disconnected) => {
                     return Some(BroadcastStageReturnType::ChannelDisconnected);
                 }
                 Error::RecvTimeout(RecvTimeoutError::Timeout)
-                | Error::ClusterInfo(ClusterInfoError::NoPeers) => (), // TODO: Why are the unit-tests throwing hundreds of these?
+                | Error::CrossbeamRecvTimeout(CrossbeamRecvTimeoutError::Timeout) => (),
+                Error::ClusterInfo(ClusterInfoError::NoPeers) => (), // TODO: Why are the unit-tests throwing hundreds of these?
                 _ => {
                     inc_new_counter_error!("streamer-broadcaster-error", 1, 1);
                     error!("{} broadcaster error: {:?}", name, e);
@@ -250,8 +256,8 @@ impl BroadcastStage {
     ) -> Self {
         let btree = blockstore.clone();
         let exit = exit_sender.clone();
-        let (socket_sender, socket_receiver) = unbounded();
-        let (blockstore_sender, blockstore_receiver) = unbounded();
+        let (socket_sender, socket_receiver) = channel();
+        let (blockstore_sender, blockstore_receiver) = channel();
         let bs_run = broadcast_stage_run.clone();
 
         let socket_sender_ = socket_sender.clone();
@@ -336,34 +342,33 @@ impl BroadcastStage {
         retransmit_slots_receiver: &RetransmitSlotsReceiver,
         socket_sender: &Sender<(Arc<Vec<Shred>>, Option<BroadcastShredBatchInfo>)>,
     ) -> Result<()> {
-        const RECV_TIMEOUT: Duration = Duration::from_millis(100);
-        let retransmit_slots: HashSet<Slot> =
-            std::iter::once(retransmit_slots_receiver.recv_timeout(RECV_TIMEOUT)?)
-                .chain(retransmit_slots_receiver.try_iter())
-                .collect();
+        let timer = Duration::from_millis(100);
 
-        for new_retransmit_slot in retransmit_slots {
+        // Check for a retransmit signal
+        let mut retransmit_slots = retransmit_slots_receiver.recv_timeout(timer)?;
+        while let Ok(new_retransmit_slots) = retransmit_slots_receiver.try_recv() {
+            retransmit_slots.extend(new_retransmit_slots);
+        }
+
+        for (_, bank) in retransmit_slots.iter() {
+            let slot = bank.slot();
             let data_shreds = Arc::new(
                 blockstore
-                    .get_data_shreds_for_slot(new_retransmit_slot, 0)
+                    .get_data_shreds_for_slot(slot, 0)
                     .expect("My own shreds must be reconstructable"),
             );
-            debug_assert!(data_shreds
-                .iter()
-                .all(|shred| shred.slot() == new_retransmit_slot));
+            debug_assert!(data_shreds.iter().all(|shred| shred.slot() == slot));
             if !data_shreds.is_empty() {
                 socket_sender.send((data_shreds, None))?;
             }
 
             let coding_shreds = Arc::new(
                 blockstore
-                    .get_coding_shreds_for_slot(new_retransmit_slot, 0)
+                    .get_coding_shreds_for_slot(slot, 0)
                     .expect("My own shreds must be reconstructable"),
             );
 
-            debug_assert!(coding_shreds
-                .iter()
-                .all(|shred| shred.slot() == new_retransmit_slot));
+            debug_assert!(coding_shreds.iter().all(|shred| shred.slot() == slot));
             if !coding_shreds.is_empty() {
                 socket_sender.send((coding_shreds, None))?;
             }
@@ -468,7 +473,7 @@ pub mod test {
         },
         std::{
             path::Path,
-            sync::{atomic::AtomicBool, Arc},
+            sync::{atomic::AtomicBool, mpsc::channel, Arc},
             thread::sleep,
         },
     };
@@ -540,8 +545,10 @@ pub mod test {
         // Setup
         let ledger_path = get_tmp_ledger_path!();
         let blockstore = Arc::new(Blockstore::open(&ledger_path).unwrap());
-        let (transmit_sender, transmit_receiver) = unbounded();
+        let (transmit_sender, transmit_receiver) = channel();
         let (retransmit_slots_sender, retransmit_slots_receiver) = unbounded();
+        let GenesisConfigInfo { genesis_config, .. } = create_genesis_config(100_000);
+        let bank0 = Arc::new(Bank::new_for_tests(&genesis_config));
 
         // Make some shreds
         let updated_slot = 0;
@@ -561,8 +568,12 @@ pub mod test {
 
         // Insert duplicate retransmit signal, blocks should
         // only be retransmitted once
-        retransmit_slots_sender.send(updated_slot).unwrap();
-        retransmit_slots_sender.send(updated_slot).unwrap();
+        retransmit_slots_sender
+            .send(vec![(updated_slot, bank0.clone())].into_iter().collect())
+            .unwrap();
+        retransmit_slots_sender
+            .send(vec![(updated_slot, bank0)].into_iter().collect())
+            .unwrap();
         BroadcastStage::check_retransmit_signals(
             &blockstore,
             &retransmit_slots_receiver,
@@ -645,7 +656,7 @@ pub mod test {
             // Create the leader scheduler
             let leader_keypair = Keypair::new();
 
-            let (entry_sender, entry_receiver) = unbounded();
+            let (entry_sender, entry_receiver) = channel();
             let (retransmit_slots_sender, retransmit_slots_receiver) = unbounded();
             let broadcast_service = setup_dummy_broadcast_service(
                 &leader_keypair.pubkey(),

core/src/broadcast_stage/broadcast_duplicates_run.rs

@@ -260,7 +260,7 @@ impl BroadcastRun for BroadcastDuplicatesRun {
             .map(|(node, _)| node)
             .collect();
 
-        // Create cluster partition.
+        // Creat cluster partition.
         let cluster_partition: HashSet<Pubkey> = {
             let mut cumilative_stake = 0;
             let epoch = root_bank.get_leader_schedule_epoch(slot);