chore: bump eslint-plugin-import from 2.25.3 to 2.25.4 in /web3.js

Bumps [eslint-plugin-import](https://github.com/import-js/eslint-plugin-import) from 2.25.3 to 2.25.4. - [Release notes](https://github.com/import-js/eslint-plugin-import/releases) - [Changelog](https://github.com/import-js/eslint-plugin-import/blob/main/CHANGELOG.md) - [Commits](https://github.com/import-js/eslint-plugin-import/compare/v2.25.3...v2.25.4) --- updated-dependencies: - dependency-name: eslint-plugin-import dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
feat: adds getBlockProduction RPC call
2022-03-26 21:35:41 -07:00 · 2022-03-26 18:31:40 -07:00 · 2022-03-26 12:29:13 -05:00 · 2022-03-26 00:05:15 -07:00 · 2022-03-25 21:37:10 -07:00 · 2022-03-25 18:19:03 -06:00
276 changed files with 22037 additions and 12856 deletions
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -93,18 +93,11 @@ pull_request_rules:
      - author=mergify[bot]
      - head~=^mergify/bp/
      - "#status-failure=0"
+      - "-merged"
    actions:
      label:
        add:
          - automerge
-  - name: v1.8 backport
-    conditions:
-      - label=v1.8
-    actions:
-      backport:
-        ignore_conflicts: true
-        branches:
-          - v1.8
  - name: v1.9 backport
    conditions:
      - label=v1.9
@@ -113,6 +106,14 @@ pull_request_rules:
        ignore_conflicts: true
        branches:
          - v1.9
+  - name: v1.10 backport
+    conditions:
+      - label=v1.10
+    actions:
+      backport:
+        ignore_conflicts: true
+        branches:
+          - v1.10

 commands_restrictions:
  # The author of copied PRs is the Mergify user.
--- a/Cargo.lock
+++ b/Cargo.lock
--- a/account-decoder/Cargo.toml
+++ b/account-decoder/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "solana-account-decoder"
-version = "1.10.4"
+version = "1.11.0"
 description = "Solana account decoder"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -19,9 +19,9 @@ lazy_static = "1.4.0"
 serde = "1.0.136"
 serde_derive = "1.0.103"
 serde_json = "1.0.79"
-solana-config-program = { path = "../programs/config", version = "=1.10.4" }
-solana-sdk = { path = "../sdk", version = "=1.10.4" }
-solana-vote-program = { path = "../programs/vote", version = "=1.10.4" }
+solana-config-program = { path = "../programs/config", version = "=1.11.0" }
+solana-sdk = { path = "../sdk", version = "=1.11.0" }
+solana-vote-program = { path = "../programs/vote", version = "=1.11.0" }
 spl-token = { version = "=3.2.0", features = ["no-entrypoint"] }
 thiserror = "1.0"
 zstd = "0.11.1"
--- a/accounts-bench/Cargo.toml
+++ b/accounts-bench/Cargo.toml
@@ -2,7 +2,7 @@
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 edition = "2021"
 name = "solana-accounts-bench"
-version = "1.10.4"
+version = "1.11.0"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
@@ -12,11 +12,11 @@ publish = false
 clap = "2.33.1"
 log = "0.4.14"
 rayon = "1.5.1"
-solana-logger = { path = "../logger", version = "=1.10.4" }
-solana-measure = { path = "../measure", version = "=1.10.4" }
-solana-runtime = { path = "../runtime", version = "=1.10.4" }
-solana-sdk = { path = "../sdk", version = "=1.10.4" }
-solana-version = { path = "../version", version = "=1.10.4" }
+solana-logger = { path = "../logger", version = "=1.11.0" }
+solana-measure = { path = "../measure", version = "=1.11.0" }
+solana-runtime = { path = "../runtime", version = "=1.11.0" }
+solana-sdk = { path = "../sdk", version = "=1.11.0" }
+solana-version = { path = "../version", version = "=1.11.0" }

 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
--- a/accounts-bench/src/main.rs
+++ b/accounts-bench/src/main.rs
@@ -125,6 +125,7 @@ fn main() {
                None,
                false,
                None,
+                None,
                false,
            );
            time_store.stop();
--- a/accounts-cluster-bench/Cargo.toml
+++ b/accounts-cluster-bench/Cargo.toml
@@ -2,7 +2,7 @@
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 edition = "2021"
 name = "solana-accounts-cluster-bench"
-version = "1.10.4"
+version = "1.11.0"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
@@ -13,25 +13,25 @@ clap = "2.33.1"
 log = "0.4.14"
 rand = "0.7.0"
 rayon = "1.5.1"
-solana-account-decoder = { path = "../account-decoder", version = "=1.10.4" }
-solana-clap-utils = { path = "../clap-utils", version = "=1.10.4" }
-solana-client = { path = "../client", version = "=1.10.4" }
-solana-faucet = { path = "../faucet", version = "=1.10.4" }
-solana-gossip = { path = "../gossip", version = "=1.10.4" }
-solana-logger = { path = "../logger", version = "=1.10.4" }
-solana-measure = { path = "../measure", version = "=1.10.4" }
-solana-net-utils = { path = "../net-utils", version = "=1.10.4" }
-solana-runtime = { path = "../runtime", version = "=1.10.4" }
-solana-sdk = { path = "../sdk", version = "=1.10.4" }
-solana-streamer = { path = "../streamer", version = "=1.10.4" }
-solana-transaction-status = { path = "../transaction-status", version = "=1.10.4" }
-solana-version = { path = "../version", version = "=1.10.4" }
+solana-account-decoder = { path = "../account-decoder", version = "=1.11.0" }
+solana-clap-utils = { path = "../clap-utils", version = "=1.11.0" }
+solana-client = { path = "../client", version = "=1.11.0" }
+solana-faucet = { path = "../faucet", version = "=1.11.0" }
+solana-gossip = { path = "../gossip", version = "=1.11.0" }
+solana-logger = { path = "../logger", version = "=1.11.0" }
+solana-measure = { path = "../measure", version = "=1.11.0" }
+solana-net-utils = { path = "../net-utils", version = "=1.11.0" }
+solana-runtime = { path = "../runtime", version = "=1.11.0" }
+solana-sdk = { path = "../sdk", version = "=1.11.0" }
+solana-streamer = { path = "../streamer", version = "=1.11.0" }
+solana-transaction-status = { path = "../transaction-status", version = "=1.11.0" }
+solana-version = { path = "../version", version = "=1.11.0" }
 spl-token = { version = "=3.2.0", features = ["no-entrypoint"] }

 [dev-dependencies]
-solana-core = { path = "../core", version = "=1.10.4" }
-solana-local-cluster = { path = "../local-cluster", version = "=1.10.4" }
-solana-test-validator = { path = "../test-validator", version = "=1.10.4" }
+solana-core = { path = "../core", version = "=1.11.0" }
+solana-local-cluster = { path = "../local-cluster", version = "=1.11.0" }
+solana-test-validator = { path = "../test-validator", version = "=1.11.0" }

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

 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
--- a/banks-client/Cargo.toml
+++ b/banks-client/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "solana-banks-client"
-version = "1.10.4"
+version = "1.11.0"
 description = "Solana banks client"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -12,17 +12,17 @@ edition = "2021"
 [dependencies]
 borsh = "0.9.3"
 futures = "0.3"
-solana-banks-interface = { path = "../banks-interface", version = "=1.10.4" }
-solana-program = { path = "../sdk/program", version = "=1.10.4" }
-solana-sdk = { path = "../sdk", version = "=1.10.4" }
+solana-banks-interface = { path = "../banks-interface", version = "=1.11.0" }
+solana-program = { path = "../sdk/program", version = "=1.11.0" }
+solana-sdk = { path = "../sdk", version = "=1.11.0" }
 tarpc = { version = "0.27.2", features = ["full"] }
 thiserror = "1.0"
 tokio = { version = "1", features = ["full"] }
 tokio-serde = { version = "0.8", features = ["bincode"] }

 [dev-dependencies]
-solana-banks-server = { path = "../banks-server", version = "=1.10.4" }
-solana-runtime = { path = "../runtime", version = "=1.10.4" }
+solana-banks-server = { path = "../banks-server", version = "=1.11.0" }
+solana-runtime = { path = "../runtime", version = "=1.11.0" }

 [lib]
 crate-type = ["lib"]
--- a/banks-client/src/error.rs
+++ b/banks-client/src/error.rs
@@ -1,5 +1,8 @@
 use {
-    solana_sdk::{transaction::TransactionError, transport::TransportError},
+    solana_sdk::{
+        transaction::TransactionError, transaction_context::TransactionReturnData,
+        transport::TransportError,
+    },
    std::io,
    tarpc::client::RpcError,
    thiserror::Error,
@@ -25,6 +28,7 @@ pub enum BanksClientError {
        err: TransactionError,
        logs: Vec<String>,
        units_consumed: u64,
+        return_data: Option<TransactionReturnData>,
    },
 }

--- a/banks-client/src/lib.rs
+++ b/banks-client/src/lib.rs
@@ -247,6 +247,7 @@ impl BanksClient {
                err,
                logs: simulation_details.logs,
                units_consumed: simulation_details.units_consumed,
+                return_data: simulation_details.return_data,
            }),
            BanksTransactionResultWithSimulation {
                result: Some(result),
--- a/banks-interface/Cargo.toml
+++ b/banks-interface/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "solana-banks-interface"
-version = "1.10.4"
+version = "1.11.0"
 description = "Solana banks RPC interface"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -11,7 +11,7 @@ edition = "2021"

 [dependencies]
 serde = { version = "1.0.136", features = ["derive"] }
-solana-sdk = { path = "../sdk", version = "=1.10.4" }
+solana-sdk = { path = "../sdk", version = "=1.11.0" }
 tarpc = { version = "0.27.2", features = ["full"] }

 [lib]
--- a/banks-interface/src/lib.rs
+++ b/banks-interface/src/lib.rs
@@ -12,6 +12,7 @@ use {
        pubkey::Pubkey,
        signature::Signature,
        transaction::{self, Transaction, TransactionError},
+        transaction_context::TransactionReturnData,
    },
 };

@@ -35,6 +36,7 @@ pub struct TransactionStatus {
 pub struct TransactionSimulationDetails {
    pub logs: Vec<String>,
    pub units_consumed: u64,
+    pub return_data: Option<TransactionReturnData>,
 }

 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
--- a/banks-server/Cargo.toml
+++ b/banks-server/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "solana-banks-server"
-version = "1.10.4"
+version = "1.11.0"
 description = "Solana banks server"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -13,10 +13,10 @@ edition = "2021"
 bincode = "1.3.3"
 crossbeam-channel = "0.5"
 futures = "0.3"
-solana-banks-interface = { path = "../banks-interface", version = "=1.10.4" }
-solana-runtime = { path = "../runtime", version = "=1.10.4" }
-solana-sdk = { path = "../sdk", version = "=1.10.4" }
-solana-send-transaction-service = { path = "../send-transaction-service", version = "=1.10.4" }
+solana-banks-interface = { path = "../banks-interface", version = "=1.11.0" }
+solana-runtime = { path = "../runtime", version = "=1.11.0" }
+solana-sdk = { path = "../sdk", version = "=1.11.0" }
+solana-send-transaction-service = { path = "../send-transaction-service", version = "=1.11.0" }
 tarpc = { version = "0.27.2", features = ["full"] }
 tokio = { version = "1", features = ["full"] }
 tokio-serde = { version = "0.8", features = ["bincode"] }
--- a/banks-server/src/banks_server.rs
+++ b/banks-server/src/banks_server.rs
@@ -24,7 +24,7 @@ use {
        transaction::{self, SanitizedTransaction, Transaction},
    },
    solana_send_transaction_service::{
-        send_transaction_service::{SendTransactionService, TransactionInfo},
+        send_transaction_service::{SendTransactionService, TransactionInfo, DEFAULT_TPU_USE_QUIC},
        tpu_info::NullTpuInfo,
    },
    std::{
@@ -266,6 +266,7 @@ impl Banks for BanksServer {
            logs,
            post_simulation_accounts: _,
            units_consumed,
+            return_data,
        } = self
            .bank(commitment)
            .simulate_transaction_unchecked(sanitized_transaction)
@@ -275,6 +276,7 @@ impl Banks for BanksServer {
                simulation_details: Some(TransactionSimulationDetails {
                    logs,
                    units_consumed,
+                    return_data,
                }),
            };
        }
@@ -399,6 +401,7 @@ pub async fn start_tcp_server(
                receiver,
                5_000,
                0,
+                DEFAULT_TPU_USE_QUIC,
            );

            let server = BanksServer::new(
--- a/bench-streamer/Cargo.toml
+++ b/bench-streamer/Cargo.toml
@@ -2,18 +2,18 @@
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 edition = "2021"
 name = "solana-bench-streamer"
-version = "1.10.4"
+version = "1.11.0"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
 publish = false

 [dependencies]
-clap = "2.33.1"
 crossbeam-channel = "0.5"
-solana-net-utils = { path = "../net-utils", version = "=1.10.4" }
-solana-streamer = { path = "../streamer", version = "=1.10.4" }
-solana-version = { path = "../version", version = "=1.10.4" }
+clap = { version = "3.1.5", features = ["cargo"] }
+solana-net-utils = { path = "../net-utils", version = "=1.11.0" }
+solana-streamer = { path = "../streamer", version = "=1.11.0" }
+solana-version = { path = "../version", version = "=1.11.0" }

 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
--- a/bench-streamer/src/main.rs
+++ b/bench-streamer/src/main.rs
@@ -1,6 +1,6 @@
 #![allow(clippy::integer_arithmetic)]
 use {
-    clap::{crate_description, crate_name, value_t, App, Arg},
+    clap::{crate_description, crate_name, Arg, Command},
    crossbeam_channel::unbounded,
    solana_streamer::{
        packet::{Packet, PacketBatch, PacketBatchRecycler, PACKET_DATA_SIZE},
@@ -57,18 +57,18 @@ fn sink(exit: Arc<AtomicBool>, rvs: Arc<AtomicUsize>, r: PacketBatchReceiver) ->
 fn main() -> Result<()> {
    let mut num_sockets = 1usize;

-    let matches = App::new(crate_name!())
+    let matches = Command::new(crate_name!())
        .about(crate_description!())
        .version(solana_version::version!())
        .arg(
-            Arg::with_name("num-recv-sockets")
+            Arg::new("num-recv-sockets")
                .long("num-recv-sockets")
                .value_name("NUM")
                .takes_value(true)
                .help("Use NUM receive sockets"),
        )
        .arg(
-            Arg::with_name("num-producers")
+            Arg::new("num-producers")
                .long("num-producers")
                .value_name("NUM")
                .takes_value(true)
@@ -80,7 +80,7 @@ fn main() -> Result<()> {
        num_sockets = max(num_sockets, n.to_string().parse().expect("integer"));
    }

-    let num_producers = value_t!(matches, "num_producers", u64).unwrap_or(4);
+    let num_producers: u64 = matches.value_of_t("num_producers").unwrap_or(4);

    let port = 0;
    let ip_addr = IpAddr::V4(Ipv4Addr::new(0, 0, 0, 0));
--- a/bench-tps/Cargo.toml
+++ b/bench-tps/Cargo.toml
@@ -2,7 +2,7 @@
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 edition = "2021"
 name = "solana-bench-tps"
-version = "1.10.4"
+version = "1.11.0"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
@@ -15,23 +15,23 @@ log = "0.4.14"
 rayon = "1.5.1"
 serde_json = "1.0.79"
 serde_yaml = "0.8.23"
-solana-client = { path = "../client", version = "=1.10.4" }
-solana-core = { path = "../core", version = "=1.10.4" }
-solana-faucet = { path = "../faucet", version = "=1.10.4" }
-solana-genesis = { path = "../genesis", version = "=1.10.4" }
-solana-gossip = { path = "../gossip", version = "=1.10.4" }
-solana-logger = { path = "../logger", version = "=1.10.4" }
-solana-measure = { path = "../measure", version = "=1.10.4" }
-solana-metrics = { path = "../metrics", version = "=1.10.4" }
-solana-net-utils = { path = "../net-utils", version = "=1.10.4" }
-solana-runtime = { path = "../runtime", version = "=1.10.4" }
-solana-sdk = { path = "../sdk", version = "=1.10.4" }
-solana-streamer = { path = "../streamer", version = "=1.10.4" }
-solana-version = { path = "../version", version = "=1.10.4" }
+solana-client = { path = "../client", version = "=1.11.0" }
+solana-core = { path = "../core", version = "=1.11.0" }
+solana-faucet = { path = "../faucet", version = "=1.11.0" }
+solana-genesis = { path = "../genesis", version = "=1.11.0" }
+solana-gossip = { path = "../gossip", version = "=1.11.0" }
+solana-logger = { path = "../logger", version = "=1.11.0" }
+solana-measure = { path = "../measure", version = "=1.11.0" }
+solana-metrics = { path = "../metrics", version = "=1.11.0" }
+solana-net-utils = { path = "../net-utils", version = "=1.11.0" }
+solana-runtime = { path = "../runtime", version = "=1.11.0" }
+solana-sdk = { path = "../sdk", version = "=1.11.0" }
+solana-streamer = { path = "../streamer", version = "=1.11.0" }
+solana-version = { path = "../version", version = "=1.11.0" }

 [dev-dependencies]
 serial_test = "0.6.0"
-solana-local-cluster = { path = "../local-cluster", version = "=1.10.4" }
+solana-local-cluster = { path = "../local-cluster", version = "=1.11.0" }

 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
--- a/bloom/Cargo.toml
+++ b/bloom/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "solana-bloom"
-version = "1.10.4"
+version = "1.11.0"
 description = "Solana bloom filter"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -17,9 +17,9 @@ rand = "0.7.0"
 rayon = "1.5.1"
 serde = { version = "1.0.136", features = ["rc"] }
 serde_derive = "1.0.103"
-solana-frozen-abi = { path = "../frozen-abi", version = "=1.10.4" }
-solana-frozen-abi-macro = { path = "../frozen-abi/macro", version = "=1.10.4" }
-solana-sdk = { path = "../sdk", version = "=1.10.4" }
+solana-frozen-abi = { path = "../frozen-abi", version = "=1.11.0" }
+solana-frozen-abi-macro = { path = "../frozen-abi/macro", version = "=1.11.0" }
+solana-sdk = { path = "../sdk", version = "=1.11.0" }

 [lib]
 crate-type = ["lib"]
--- a/bucket_map/Cargo.toml
+++ b/bucket_map/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "solana-bucket-map"
-version = "1.10.4"
+version = "1.11.0"
 description = "solana-bucket-map"
 homepage = "https://solana.com/"
 documentation = "https://docs.rs/solana-bucket-map"
@@ -15,14 +15,14 @@ log = { version = "0.4.11" }
 memmap2 = "0.5.3"
 modular-bitfield = "0.11.2"
 rand = "0.7.0"
-solana-measure = { path = "../measure", version = "=1.10.4" }
-solana-sdk = { path = "../sdk", version = "=1.10.4" }
+solana-measure = { path = "../measure", version = "=1.11.0" }
+solana-sdk = { path = "../sdk", version = "=1.11.0" }
 tempfile = "3.3.0"

 [dev-dependencies]
 fs_extra = "1.2.0"
 rayon = "1.5.0"
-solana-logger = { path = "../logger", version = "=1.10.4" }
+solana-logger = { path = "../logger", version = "=1.11.0" }

 [lib]
 crate-type = ["lib"]
--- a/ci/buildkite-pipeline-in-disk.sh
+++ b/ci/buildkite-pipeline-in-disk.sh
@@ -303,7 +303,7 @@ EOF

  command_step "local-cluster-slow" \
    ". ci/rust-version.sh; ci/docker-run.sh \$\$rust_stable_docker_image ci/test-local-cluster-slow.sh" \
-    30
+    40
 }

 pull_or_push_steps() {
--- a/ci/buildkite-pipeline.sh
+++ b/ci/buildkite-pipeline.sh
@@ -295,7 +295,7 @@ EOF

  command_step "local-cluster-slow" \
    ". ci/rust-version.sh; ci/docker-run.sh \$\$rust_stable_docker_image ci/test-local-cluster-slow.sh" \
-    30
+    40
 }

 pull_or_push_steps() {
--- a/clap-utils/Cargo.toml
+++ b/clap-utils/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "solana-clap-utils"
-version = "1.10.4"
+version = "1.11.0"
 description = "Solana utilities for the clap"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -13,9 +13,9 @@ edition = "2021"
 chrono = "0.4"
 clap = "2.33.0"
 rpassword = "6.0"
-solana-perf = { path = "../perf", version = "=1.10.4" }
-solana-remote-wallet = { path = "../remote-wallet", version = "=1.10.4", default-features = false }
-solana-sdk = { path = "../sdk", version = "=1.10.4" }
+solana-perf = { path = "../perf", version = "=1.11.0" }
+solana-remote-wallet = { path = "../remote-wallet", version = "=1.11.0", default-features = false }
+solana-sdk = { path = "../sdk", version = "=1.11.0" }
 thiserror = "1.0.30"
 tiny-bip39 = "0.8.2"
 uriparse = "0.6.3"
--- a/cli-config/Cargo.toml
+++ b/cli-config/Cargo.toml
@@ -3,7 +3,7 @@ authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 edition = "2021"
 name = "solana-cli-config"
 description = "Blockchain, Rebuilt for Scale"
-version = "1.10.4"
+version = "1.11.0"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
--- a/cli-output/Cargo.toml
+++ b/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.4"
+version = "1.11.0"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
@@ -17,14 +17,15 @@ clap = "2.33.0"
 console = "0.15.0"
 humantime = "2.0.1"
 indicatif = "0.16.2"
+pretty-hex = "0.2.1"
 serde = "1.0.136"
 serde_json = "1.0.79"
-solana-account-decoder = { path = "../account-decoder", version = "=1.10.4" }
-solana-clap-utils = { path = "../clap-utils", version = "=1.10.4" }
-solana-client = { path = "../client", version = "=1.10.4" }
-solana-sdk = { path = "../sdk", version = "=1.10.4" }
-solana-transaction-status = { path = "../transaction-status", version = "=1.10.4" }
-solana-vote-program = { path = "../programs/vote", version = "=1.10.4" }
+solana-account-decoder = { path = "../account-decoder", version = "=1.11.0" }
+solana-clap-utils = { path = "../clap-utils", version = "=1.11.0" }
+solana-client = { path = "../client", version = "=1.11.0" }
+solana-sdk = { path = "../sdk", version = "=1.11.0" }
+solana-transaction-status = { path = "../transaction-status", version = "=1.11.0" }
+solana-vote-program = { path = "../programs/vote", version = "=1.11.0" }
 spl-memo = { version = "=3.0.1", features = ["no-entrypoint"] }

 [dev-dependencies]
--- a/cli-output/src/display.rs
+++ b/cli-output/src/display.rs
@@ -14,6 +14,7 @@ use {
        signature::Signature,
        stake,
        transaction::{TransactionError, TransactionVersion, VersionedTransaction},
+        transaction_context::TransactionReturnData,
    },
    solana_transaction_status::{Rewards, UiTransactionStatusMeta},
    spl_memo::{id as spl_memo_id, v1::id as spl_memo_v1_id},
@@ -246,6 +247,7 @@ fn write_transaction<W: io::Write>(
        write_fees(w, transaction_status.fee, prefix)?;
        write_balances(w, transaction_status, prefix)?;
        write_log_messages(w, transaction_status.log_messages.as_ref(), prefix)?;
+        write_return_data(w, transaction_status.return_data.as_ref(), prefix)?;
        write_rewards(w, transaction_status.rewards.as_ref(), prefix)?;
    } else {
        writeln!(w, "{}Status: Unavailable", prefix)?;
@@ -576,6 +578,25 @@ fn write_balances<W: io::Write>(
    Ok(())
 }

+fn write_return_data<W: io::Write>(
+    w: &mut W,
+    return_data: Option<&TransactionReturnData>,
+    prefix: &str,
+) -> io::Result<()> {
+    if let Some(return_data) = return_data {
+        if !return_data.data.is_empty() {
+            use pretty_hex::*;
+            writeln!(
+                w,
+                "{}Return Data from Program {}:",
+                prefix, return_data.program_id
+            )?;
+            writeln!(w, "{}  {:?}", prefix, return_data.data.hex_dump())?;
+        }
+    }
+    Ok(())
+}
+
 fn write_log_messages<W: io::Write>(
    w: &mut W,
    log_messages: Option<&Vec<String>>,
@@ -750,6 +771,10 @@ mod test {
                commission: None,
            }]),
            loaded_addresses: LoadedAddresses::default(),
+            return_data: Some(TransactionReturnData {
+                program_id: Pubkey::new_from_array([2u8; 32]),
+                data: vec![1, 2, 3],
+            }),
        };

        let output = {
@@ -786,6 +811,9 @@ Status: Ok
  Account 1 balance: ◎0.00001 -> ◎0.0000099
 Log Messages:
  Test message
+Return Data from Program 8qbHbw2BbbTHBW1sbeqakYXVKRQM8Ne7pLK7m6CVfeR:
+  Length: 3 (0x3) bytes
+0000:   01 02 03                                             ...
 Rewards:
  Address                                            Type        Amount            New Balance         \0
  4vJ9JU1bJJE96FWSJKvHsmmFADCg4gpZQff4P3bkLKi        rent        -◎0.000000100     ◎0.000009900       \0
@@ -820,6 +848,10 @@ Rewards:
                commission: None,
            }]),
            loaded_addresses,
+            return_data: Some(TransactionReturnData {
+                program_id: Pubkey::new_from_array([2u8; 32]),
+                data: vec![1, 2, 3],
+            }),
        };

        let output = {
@@ -865,6 +897,9 @@ Status: Ok
  Account 3 balance: ◎0.00002
 Log Messages:
  Test message
+Return Data from Program 8qbHbw2BbbTHBW1sbeqakYXVKRQM8Ne7pLK7m6CVfeR:
+  Length: 3 (0x3) bytes
+0000:   01 02 03                                             ...
 Rewards:
  Address                                            Type        Amount            New Balance         \0
  CktRuQ2mttgRGkXJtyksdKHjUdc2C4TgDzyB98oEzy8        rent        -◎0.000000100     ◎0.000014900       \0
--- a/cli/Cargo.toml
+++ b/cli/Cargo.toml
@@ -3,7 +3,7 @@ authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 edition = "2021"
 name = "solana-cli"
 description = "Blockchain, Rebuilt for Scale"
-version = "1.10.4"
+version = "1.11.0"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
@@ -27,29 +27,29 @@ semver = "1.0.6"
 serde = "1.0.136"
 serde_derive = "1.0.103"
 serde_json = "1.0.79"
-solana-account-decoder = { path = "../account-decoder", version = "=1.10.4" }
-solana-bpf-loader-program = { path = "../programs/bpf_loader", version = "=1.10.4" }
-solana-clap-utils = { path = "../clap-utils", version = "=1.10.4" }
-solana-cli-config = { path = "../cli-config", version = "=1.10.4" }
-solana-cli-output = { path = "../cli-output", version = "=1.10.4" }
-solana-client = { path = "../client", version = "=1.10.4" }
-solana-config-program = { path = "../programs/config", version = "=1.10.4" }
-solana-faucet = { path = "../faucet", version = "=1.10.4" }
-solana-logger = { path = "../logger", version = "=1.10.4" }
-solana-program-runtime = { path = "../program-runtime", version = "=1.10.4" }
-solana-remote-wallet = { path = "../remote-wallet", version = "=1.10.4" }
-solana-sdk = { path = "../sdk", version = "=1.10.4" }
-solana-transaction-status = { path = "../transaction-status", version = "=1.10.4" }
-solana-version = { path = "../version", version = "=1.10.4" }
-solana-vote-program = { path = "../programs/vote", version = "=1.10.4" }
+solana-account-decoder = { path = "../account-decoder", version = "=1.11.0" }
+solana-bpf-loader-program = { path = "../programs/bpf_loader", version = "=1.11.0" }
+solana-clap-utils = { path = "../clap-utils", version = "=1.11.0" }
+solana-cli-config = { path = "../cli-config", version = "=1.11.0" }
+solana-cli-output = { path = "../cli-output", version = "=1.11.0" }
+solana-client = { path = "../client", version = "=1.11.0" }
+solana-config-program = { path = "../programs/config", version = "=1.11.0" }
+solana-faucet = { path = "../faucet", version = "=1.11.0" }
+solana-logger = { path = "../logger", version = "=1.11.0" }
+solana-program-runtime = { path = "../program-runtime", version = "=1.11.0" }
+solana-remote-wallet = { path = "../remote-wallet", version = "=1.11.0" }
+solana-sdk = { path = "../sdk", version = "=1.11.0" }
+solana-transaction-status = { path = "../transaction-status", version = "=1.11.0" }
+solana-version = { path = "../version", version = "=1.11.0" }
+solana-vote-program = { path = "../programs/vote", version = "=1.11.0" }
 solana_rbpf = "=0.2.24"
 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.4" }
-solana-test-validator = { path = "../test-validator", version = "=1.10.4" }
+solana-streamer = { path = "../streamer", version = "=1.11.0" }
+solana-test-validator = { path = "../test-validator", version = "=1.11.0" }
 tempfile = "3.3.0"

 [[bin]]
--- a/cli/src/cli.rs
+++ b/cli/src/cli.rs
@@ -162,6 +162,7 @@ pub enum CliCommand {
        address: Option<SignerIndex>,
        use_deprecated_loader: bool,
        allow_excessive_balance: bool,
+        skip_fee_check: bool,
    },
    Program(ProgramCliCommand),
    // Stake Commands
@@ -744,6 +745,7 @@ pub fn parse_command(
                signers.push(signer);
                1
            });
+            let skip_fee_check = matches.is_present("skip_fee_check");

            Ok(CliCommandInfo {
                command: CliCommand::Deploy {
@@ -751,6 +753,7 @@ pub fn parse_command(
                    address,
                    use_deprecated_loader: matches.is_present("use_deprecated_loader"),
                    allow_excessive_balance: matches.is_present("allow_excessive_balance"),
+                    skip_fee_check,
                },
                signers,
            })
@@ -1129,6 +1132,7 @@ pub fn process_command(config: &CliConfig) -> ProcessResult {
            address,
            use_deprecated_loader,
            allow_excessive_balance,
+            skip_fee_check,
        } => process_deploy(
            rpc_client,
            config,
@@ -1136,6 +1140,7 @@ pub fn process_command(config: &CliConfig) -> ProcessResult {
            *address,
            *use_deprecated_loader,
            *allow_excessive_balance,
+            *skip_fee_check,
        ),
        CliCommand::Program(program_subcommand) => {
            process_program_subcommand(rpc_client, config, program_subcommand)
@@ -1967,6 +1972,7 @@ mod tests {
                    address: None,
                    use_deprecated_loader: false,
                    allow_excessive_balance: false,
+                    skip_fee_check: false,
                },
                signers: vec![read_keypair_file(&keypair_file).unwrap().into()],
            }
@@ -1989,6 +1995,7 @@ mod tests {
                    address: Some(1),
                    use_deprecated_loader: false,
                    allow_excessive_balance: false,
+                    skip_fee_check: false,
                },
                signers: vec![
                    read_keypair_file(&keypair_file).unwrap().into(),
@@ -2382,6 +2389,7 @@ mod tests {
            address: None,
            use_deprecated_loader: false,
            allow_excessive_balance: false,
+            skip_fee_check: false,
        };
        config.output_format = OutputFormat::JsonCompact;
        let result = process_command(&config);
@@ -2402,6 +2410,7 @@ mod tests {
            address: None,
            use_deprecated_loader: false,
            allow_excessive_balance: false,
+            skip_fee_check: false,
        };
        assert!(process_command(&config).is_err());
    }
--- a/cli/src/program.rs
+++ b/cli/src/program.rs
@@ -66,6 +66,7 @@ pub enum ProgramCliCommand {
        is_final: bool,
        max_len: Option<usize>,
        allow_excessive_balance: bool,
+        skip_fee_check: bool,
    },
    WriteBuffer {
        program_location: String,
@@ -73,6 +74,7 @@ pub enum ProgramCliCommand {
        buffer_pubkey: Option<Pubkey>,
        buffer_authority_signer_index: Option<SignerIndex>,
        max_len: Option<usize>,
+        skip_fee_check: bool,
    },
    SetBufferAuthority {
        buffer_pubkey: Pubkey,
@@ -114,6 +116,13 @@ impl ProgramSubCommands for App<'_, '_> {
            SubCommand::with_name("program")
                .about("Program management")
                .setting(AppSettings::SubcommandRequiredElseHelp)
+                .arg(
+                    Arg::with_name("skip_fee_check")
+                        .long("skip-fee-check")
+                        .hidden(true)
+                        .takes_value(false)
+                        .global(true)
+                )
                .subcommand(
                    SubCommand::with_name("deploy")
                        .about("Deploy a program")
@@ -406,6 +415,12 @@ impl ProgramSubCommands for App<'_, '_> {
                        .long("allow-excessive-deploy-account-balance")
                        .takes_value(false)
                        .help("Use the designated program id, even if the account already holds a large balance of SOL")
+                )
+                .arg(
+                    Arg::with_name("skip_fee_check")
+                        .long("skip-fee-check")
+                        .hidden(true)
+                        .takes_value(false)
                ),
        )
    }
@@ -416,7 +431,14 @@ pub fn parse_program_subcommand(
    default_signer: &DefaultSigner,
    wallet_manager: &mut Option<Arc<RemoteWalletManager>>,
 ) -> Result<CliCommandInfo, CliError> {
-    let response = match matches.subcommand() {
+    let (subcommand, sub_matches) = matches.subcommand();
+    let matches_skip_fee_check = matches.is_present("skip_fee_check");
+    let sub_matches_skip_fee_check = sub_matches
+        .map(|m| m.is_present("skip_fee_check"))
+        .unwrap_or(false);
+    let skip_fee_check = matches_skip_fee_check || sub_matches_skip_fee_check;
+
+    let response = match (subcommand, sub_matches) {
        ("deploy", Some(matches)) => {
            let mut bulk_signers = vec![Some(
                default_signer.signer_from_path(matches, wallet_manager)?,
@@ -476,6 +498,7 @@ pub fn parse_program_subcommand(
                    is_final: matches.is_present("final"),
                    max_len,
                    allow_excessive_balance: matches.is_present("allow_excessive_balance"),
+                    skip_fee_check,
                }),
                signers: signer_info.signers,
            }
@@ -521,6 +544,7 @@ pub fn parse_program_subcommand(
                    buffer_authority_signer_index: signer_info
                        .index_of_or_none(buffer_authority_pubkey),
                    max_len,
+                    skip_fee_check,
                }),
                signers: signer_info.signers,
            }
@@ -669,6 +693,7 @@ pub fn process_program_subcommand(
            is_final,
            max_len,
            allow_excessive_balance,
+            skip_fee_check,
        } => process_program_deploy(
            rpc_client,
            config,
@@ -681,6 +706,7 @@ pub fn process_program_subcommand(
            *is_final,
            *max_len,
            *allow_excessive_balance,
+            *skip_fee_check,
        ),
        ProgramCliCommand::WriteBuffer {
            program_location,
@@ -688,6 +714,7 @@ pub fn process_program_subcommand(
            buffer_pubkey,
            buffer_authority_signer_index,
            max_len,
+            skip_fee_check,
        } => process_write_buffer(
            rpc_client,
            config,
@@ -696,6 +723,7 @@ pub fn process_program_subcommand(
            *buffer_pubkey,
            *buffer_authority_signer_index,
            *max_len,
+            *skip_fee_check,
        ),
        ProgramCliCommand::SetBufferAuthority {
            buffer_pubkey,
@@ -793,6 +821,7 @@ fn process_program_deploy(
    is_final: bool,
    max_len: Option<usize>,
    allow_excessive_balance: bool,
+    skip_fee_check: bool,
 ) -> ProcessResult {
    let (words, mnemonic, buffer_keypair) = create_ephemeral_keypair()?;
    let (buffer_provided, buffer_signer, buffer_pubkey) = if let Some(i) = buffer_signer_index {
@@ -947,6 +976,7 @@ fn process_program_deploy(
            &buffer_pubkey,
            Some(upgrade_authority_signer),
            allow_excessive_balance,
+            skip_fee_check,
        )
    } else {
        do_process_program_upgrade(
@@ -957,6 +987,7 @@ fn process_program_deploy(
            config.signers[upgrade_authority_signer_index],
            &buffer_pubkey,
            buffer_signer,
+            skip_fee_check,
        )
    };
    if result.is_ok() && is_final {
@@ -983,6 +1014,7 @@ fn process_write_buffer(
    buffer_pubkey: Option<Pubkey>,
    buffer_authority_signer_index: Option<SignerIndex>,
    max_len: Option<usize>,
+    skip_fee_check: bool,
 ) -> ProcessResult {
    // Create ephemeral keypair to use for Buffer account, if not provided
    let (words, mnemonic, buffer_keypair) = create_ephemeral_keypair()?;
@@ -1050,6 +1082,7 @@ fn process_write_buffer(
        &buffer_pubkey,
        Some(buffer_authority),
        true,
+        skip_fee_check,
    );

    if result.is_err() && buffer_signer_index.is_none() && buffer_signer.is_some() {
@@ -1636,6 +1669,7 @@ pub fn process_deploy(
    buffer_signer_index: Option<SignerIndex>,
    use_deprecated_loader: bool,
    allow_excessive_balance: bool,
+    skip_fee_check: bool,
 ) -> ProcessResult {
    // Create ephemeral keypair to use for Buffer account, if not provided
    let (words, mnemonic, buffer_keypair) = create_ephemeral_keypair()?;
@@ -1666,6 +1700,7 @@ pub fn process_deploy(
        &buffer_signer.pubkey(),
        Some(buffer_signer),
        allow_excessive_balance,
+        skip_fee_check,
    );
    if result.is_err() && buffer_signer_index.is_none() {
        report_ephemeral_mnemonic(words, mnemonic);
@@ -1704,6 +1739,7 @@ fn do_process_program_write_and_deploy(
    buffer_pubkey: &Pubkey,
    buffer_authority_signer: Option<&dyn Signer>,
    allow_excessive_balance: bool,
+    skip_fee_check: bool,
 ) -> ProcessResult {
    // Build messages to calculate fees
    let mut messages: Vec<&Message> = Vec::new();
@@ -1834,7 +1870,9 @@ fn do_process_program_write_and_deploy(
        messages.push(message);
    }

-    check_payer(&rpc_client, config, balance_needed, &messages)?;
+    if !skip_fee_check {
+        check_payer(&rpc_client, config, balance_needed, &messages)?;
+    }

    send_deploy_messages(
        rpc_client,
@@ -1868,6 +1906,7 @@ fn do_process_program_upgrade(
    upgrade_authority: &dyn Signer,
    buffer_pubkey: &Pubkey,
    buffer_signer: Option<&dyn Signer>,
+    skip_fee_check: bool,
 ) -> ProcessResult {
    let loader_id = bpf_loader_upgradeable::id();
    let data_len = program_data.len();
@@ -1967,7 +2006,10 @@ fn do_process_program_upgrade(
    );
    messages.push(&final_message);

-    check_payer(&rpc_client, config, balance_needed, &messages)?;
+    if !skip_fee_check {
+        check_payer(&rpc_client, config, balance_needed, &messages)?;
+    }
+
    send_deploy_messages(
        rpc_client,
        config,
@@ -2255,6 +2297,7 @@ mod tests {
                    is_final: false,
                    max_len: None,
                    allow_excessive_balance: false,
+                    skip_fee_check: false,
                }),
                signers: vec![read_keypair_file(&keypair_file).unwrap().into()],
            }
@@ -2281,6 +2324,7 @@ mod tests {
                    is_final: false,
                    max_len: Some(42),
                    allow_excessive_balance: false,
+                    skip_fee_check: false,
                }),
                signers: vec![read_keypair_file(&keypair_file).unwrap().into()],
            }
@@ -2309,6 +2353,7 @@ mod tests {
                    is_final: false,
                    max_len: None,
                    allow_excessive_balance: false,
+                    skip_fee_check: false,
                }),
                signers: vec![
                    read_keypair_file(&keypair_file).unwrap().into(),
@@ -2339,6 +2384,7 @@ mod tests {
                    is_final: false,
                    max_len: None,
                    allow_excessive_balance: false,
+                    skip_fee_check: false,
                }),
                signers: vec![read_keypair_file(&keypair_file).unwrap().into()],
            }
@@ -2368,6 +2414,7 @@ mod tests {
                    is_final: false,
                    max_len: None,
                    allow_excessive_balance: false,
+                    skip_fee_check: false,
                }),
                signers: vec![
                    read_keypair_file(&keypair_file).unwrap().into(),
@@ -2400,6 +2447,7 @@ mod tests {
                    is_final: false,
                    max_len: None,
                    allow_excessive_balance: false,
+                    skip_fee_check: false,
                }),
                signers: vec![
                    read_keypair_file(&keypair_file).unwrap().into(),
@@ -2427,6 +2475,7 @@ mod tests {
                    upgrade_authority_signer_index: 0,
                    is_final: true,
                    max_len: None,
+                    skip_fee_check: false,
                    allow_excessive_balance: false,
                }),
                signers: vec![read_keypair_file(&keypair_file).unwrap().into()],
@@ -2460,6 +2509,7 @@ mod tests {
                    buffer_pubkey: None,
                    buffer_authority_signer_index: Some(0),
                    max_len: None,
+                    skip_fee_check: false,
                }),
                signers: vec![read_keypair_file(&keypair_file).unwrap().into()],
            }
@@ -2483,6 +2533,7 @@ mod tests {
                    buffer_pubkey: None,
                    buffer_authority_signer_index: Some(0),
                    max_len: Some(42),
+                    skip_fee_check: false,
                }),
                signers: vec![read_keypair_file(&keypair_file).unwrap().into()],
            }
@@ -2509,6 +2560,7 @@ mod tests {
                    buffer_pubkey: Some(buffer_keypair.pubkey()),
                    buffer_authority_signer_index: Some(0),
                    max_len: None,
+                    skip_fee_check: false,
                }),
                signers: vec![
                    read_keypair_file(&keypair_file).unwrap().into(),
@@ -2538,6 +2590,7 @@ mod tests {
                    buffer_pubkey: None,
                    buffer_authority_signer_index: Some(1),
                    max_len: None,
+                    skip_fee_check: false,
                }),
                signers: vec![
                    read_keypair_file(&keypair_file).unwrap().into(),
@@ -2572,6 +2625,7 @@ mod tests {
                    buffer_pubkey: Some(buffer_keypair.pubkey()),
                    buffer_authority_signer_index: Some(2),
                    max_len: None,
+                    skip_fee_check: false,
                }),
                signers: vec![
                    read_keypair_file(&keypair_file).unwrap().into(),
@@ -3014,6 +3068,7 @@ mod tests {
                is_final: false,
                max_len: None,
                allow_excessive_balance: false,
+                skip_fee_check: false,
            }),
            signers: vec![&default_keypair],
            output_format: OutputFormat::JsonCompact,
--- a/cli/src/stake.rs
+++ b/cli/src/stake.rs
@@ -1383,17 +1383,12 @@ pub fn process_stake_authorize(
            };
            if let Some(authorized) = authorized {
                match authorization_type {
-                    StakeAuthorize::Staker => {
-                        // first check authorized withdrawer
-                        check_current_authority(&authorized.withdrawer, &authority.pubkey())
-                            .or_else(|_| {
-                                // ...then check authorized staker. If neither matches, error will
-                                // print the stake key as `expected`
-                                check_current_authority(&authorized.staker, &authority.pubkey())
-                            })?;
-                    }
+                    StakeAuthorize::Staker => check_current_authority(
+                        &[authorized.withdrawer, authorized.staker],
+                        &authority.pubkey(),
+                    )?,
                    StakeAuthorize::Withdrawer => {
-                        check_current_authority(&authorized.withdrawer, &authority.pubkey())?;
+                        check_current_authority(&[authorized.withdrawer], &authority.pubkey())?;
                    }
                }
            } else {
@@ -1935,7 +1930,7 @@ pub fn process_stake_set_lockup(
        };
        if let Some(lockup) = lockup {
            if lockup.custodian != Pubkey::default() {
-                check_current_authority(&lockup.custodian, &custodian.pubkey())?;
+                check_current_authority(&[lockup.custodian], &custodian.pubkey())?;
            }
        } else {
            return Err(CliError::RpcRequestError(format!(
@@ -2119,13 +2114,13 @@ fn get_stake_account_state(
 }

 pub(crate) fn check_current_authority(
-    account_current_authority: &Pubkey,
+    permitted_authorities: &[Pubkey],
    provided_current_authority: &Pubkey,
 ) -> Result<(), CliError> {
-    if account_current_authority != provided_current_authority {
+    if !permitted_authorities.contains(provided_current_authority) {
        Err(CliError::RpcRequestError(format!(
-            "Invalid current authority provided: {:?}, expected {:?}",
-            provided_current_authority, account_current_authority
+            "Invalid authority provided: {:?}, expected {:?}",
+            provided_current_authority, permitted_authorities
        )))
    } else {
        Ok(())
--- a/cli/src/vote.rs
+++ b/cli/src/vote.rs
@@ -910,7 +910,10 @@ pub fn process_vote_authorize(
                            "Invalid vote account state; no authorized voters found".to_string(),
                        )
                    })?;
-                check_current_authority(&current_authorized_voter, &authorized.pubkey())?;
+                check_current_authority(
+                    &[current_authorized_voter, vote_state.authorized_withdrawer],
+                    &authorized.pubkey(),
+                )?;
                if let Some(signer) = new_authorized_signer {
                    if signer.is_interactive() {
                        return Err(CliError::BadParameter(format!(
@@ -927,7 +930,7 @@ pub fn process_vote_authorize(
                (new_authorized_pubkey, "new_authorized_pubkey".to_string()),
            )?;
            if let Some(vote_state) = vote_state {
-                check_current_authority(&vote_state.authorized_withdrawer, &authorized.pubkey())?
+                check_current_authority(&[vote_state.authorized_withdrawer], &authorized.pubkey())?
            }
        }
    }
--- a/cli/tests/program.rs
+++ b/cli/tests/program.rs
@@ -62,6 +62,7 @@ fn test_cli_program_deploy_non_upgradeable() {
        address: None,
        use_deprecated_loader: false,
        allow_excessive_balance: false,
+        skip_fee_check: false,
    };
    config.output_format = OutputFormat::JsonCompact;
    let response = process_command(&config);
@@ -91,6 +92,7 @@ fn test_cli_program_deploy_non_upgradeable() {
        address: Some(1),
        use_deprecated_loader: false,
        allow_excessive_balance: false,
+        skip_fee_check: false,
    };
    process_command(&config).unwrap();
    let account1 = rpc_client
@@ -118,6 +120,7 @@ fn test_cli_program_deploy_non_upgradeable() {
        address: Some(1),
        use_deprecated_loader: false,
        allow_excessive_balance: false,
+        skip_fee_check: false,
    };
    process_command(&config).unwrap_err();

@@ -127,6 +130,7 @@ fn test_cli_program_deploy_non_upgradeable() {
        address: Some(1),
        use_deprecated_loader: false,
        allow_excessive_balance: true,
+        skip_fee_check: false,
    };
    process_command(&config).unwrap();
    let account2 = rpc_client
@@ -193,6 +197,7 @@ fn test_cli_program_deploy_no_authority() {
        upgrade_authority_signer_index: 1,
        is_final: true,
        max_len: None,
+        skip_fee_check: false,
    });
    config.output_format = OutputFormat::JsonCompact;
    let response = process_command(&config);
@@ -218,6 +223,7 @@ fn test_cli_program_deploy_no_authority() {
        upgrade_authority_signer_index: 1,
        is_final: false,
        max_len: None,
+        skip_fee_check: false,
    });
    process_command(&config).unwrap_err();
 }
@@ -278,6 +284,7 @@ fn test_cli_program_deploy_with_authority() {
        upgrade_authority_signer_index: 1,
        is_final: false,
        max_len: Some(max_len),
+        skip_fee_check: false,
    });
    config.output_format = OutputFormat::JsonCompact;
    let response = process_command(&config);
@@ -325,6 +332,7 @@ fn test_cli_program_deploy_with_authority() {
        upgrade_authority_signer_index: 1,
        is_final: false,
        max_len: Some(max_len),
+        skip_fee_check: false,
    });
    let response = process_command(&config);
    let json: Value = serde_json::from_str(&response.unwrap()).unwrap();
@@ -366,6 +374,7 @@ fn test_cli_program_deploy_with_authority() {
        upgrade_authority_signer_index: 1,
        is_final: false,
        max_len: Some(max_len),
+        skip_fee_check: false,
    });
    process_command(&config).unwrap();
    let program_account = rpc_client.get_account(&program_pubkey).unwrap();
@@ -420,6 +429,7 @@ fn test_cli_program_deploy_with_authority() {
        upgrade_authority_signer_index: 1,
        is_final: false,
        max_len: None,
+        skip_fee_check: false,
    });
    process_command(&config).unwrap();
    let program_account = rpc_client.get_account(&program_pubkey).unwrap();
@@ -494,6 +504,7 @@ fn test_cli_program_deploy_with_authority() {
        upgrade_authority_signer_index: 1,
        is_final: false,
        max_len: None,
+        skip_fee_check: false,
    });
    process_command(&config).unwrap_err();

@@ -509,6 +520,7 @@ fn test_cli_program_deploy_with_authority() {
        upgrade_authority_signer_index: 1,
        is_final: true,
        max_len: None,
+        skip_fee_check: false,
    });
    let response = process_command(&config);
    let json: Value = serde_json::from_str(&response.unwrap()).unwrap();
@@ -611,6 +623,7 @@ fn test_cli_program_close_program() {
        upgrade_authority_signer_index: 1,
        is_final: false,
        max_len: Some(max_len),
+        skip_fee_check: false,
    });
    config.output_format = OutputFormat::JsonCompact;
    process_command(&config).unwrap();
@@ -695,6 +708,7 @@ fn test_cli_program_write_buffer() {
        buffer_pubkey: None,
        buffer_authority_signer_index: None,
        max_len: None,
+        skip_fee_check: false,
    });
    config.output_format = OutputFormat::JsonCompact;
    let response = process_command(&config);
@@ -729,6 +743,7 @@ fn test_cli_program_write_buffer() {
        buffer_pubkey: Some(buffer_keypair.pubkey()),
        buffer_authority_signer_index: None,
        max_len: Some(max_len),
+        skip_fee_check: false,
    });
    let response = process_command(&config);
    let json: Value = serde_json::from_str(&response.unwrap()).unwrap();
@@ -790,6 +805,7 @@ fn test_cli_program_write_buffer() {
        buffer_pubkey: Some(buffer_keypair.pubkey()),
        buffer_authority_signer_index: Some(2),
        max_len: None,
+        skip_fee_check: false,
    });
    let response = process_command(&config);
    let json: Value = serde_json::from_str(&response.unwrap()).unwrap();
@@ -827,6 +843,7 @@ fn test_cli_program_write_buffer() {
        buffer_pubkey: None,
        buffer_authority_signer_index: Some(2),
        max_len: None,
+        skip_fee_check: false,
    });
    let response = process_command(&config);
    let json: Value = serde_json::from_str(&response.unwrap()).unwrap();
@@ -899,6 +916,7 @@ fn test_cli_program_write_buffer() {
        buffer_pubkey: None,
        buffer_authority_signer_index: None,
        max_len: None,
+        skip_fee_check: false,
    });
    config.output_format = OutputFormat::JsonCompact;
    let response = process_command(&config);
@@ -938,6 +956,7 @@ fn test_cli_program_write_buffer() {
        buffer_pubkey: Some(buffer_keypair.pubkey()),
        buffer_authority_signer_index: None,
        max_len: None, //Some(max_len),
+        skip_fee_check: false,
    });
    process_command(&config).unwrap();
    config.signers = vec![&keypair, &buffer_keypair];
@@ -951,6 +970,7 @@ fn test_cli_program_write_buffer() {
        upgrade_authority_signer_index: 1,
        is_final: true,
        max_len: None,
+        skip_fee_check: false,
    });
    config.output_format = OutputFormat::JsonCompact;
    let error = process_command(&config).unwrap_err();
@@ -1008,6 +1028,7 @@ fn test_cli_program_set_buffer_authority() {
        buffer_pubkey: Some(buffer_keypair.pubkey()),
        buffer_authority_signer_index: None,
        max_len: None,
+        skip_fee_check: false,
    });
    process_command(&config).unwrap();
    let buffer_account = rpc_client.get_account(&buffer_keypair.pubkey()).unwrap();
@@ -1123,6 +1144,7 @@ fn test_cli_program_mismatch_buffer_authority() {
        buffer_pubkey: Some(buffer_keypair.pubkey()),
        buffer_authority_signer_index: Some(2),
        max_len: None,
+        skip_fee_check: false,
    });
    process_command(&config).unwrap();
    let buffer_account = rpc_client.get_account(&buffer_keypair.pubkey()).unwrap();
@@ -1145,6 +1167,7 @@ fn test_cli_program_mismatch_buffer_authority() {
        upgrade_authority_signer_index: 1,
        is_final: true,
        max_len: None,
+        skip_fee_check: false,
    });
    process_command(&config).unwrap_err();

@@ -1160,6 +1183,7 @@ fn test_cli_program_mismatch_buffer_authority() {
        upgrade_authority_signer_index: 1,
        is_final: true,
        max_len: None,
+        skip_fee_check: false,
    });
    process_command(&config).unwrap();
 }
@@ -1216,6 +1240,7 @@ fn test_cli_program_show() {
        buffer_pubkey: Some(buffer_keypair.pubkey()),
        buffer_authority_signer_index: Some(2),
        max_len: None,
+        skip_fee_check: false,
    });
    process_command(&config).unwrap();

@@ -1275,6 +1300,7 @@ fn test_cli_program_show() {
        upgrade_authority_signer_index: 1,
        is_final: false,
        max_len: Some(max_len),
+        skip_fee_check: false,
    });
    config.output_format = OutputFormat::JsonCompact;
    let min_slot = rpc_client.get_slot().unwrap();
@@ -1401,6 +1427,7 @@ fn test_cli_program_dump() {
        buffer_pubkey: Some(buffer_keypair.pubkey()),
        buffer_authority_signer_index: Some(2),
        max_len: None,
+        skip_fee_check: false,
    });
    process_command(&config).unwrap();

--- a/client-test/Cargo.toml
+++ b/client-test/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "solana-client-test"
-version = "1.10.4"
+version = "1.11.0"
 description = "Solana RPC Test"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -14,25 +14,25 @@ publish = false
 futures-util = "0.3.21"
 serde_json = "1.0.79"
 serial_test = "0.6.0"
-solana-client = { path = "../client", version = "=1.10.4" }
-solana-ledger = { path = "../ledger", version = "=1.10.4" }
-solana-measure = { path = "../measure", version = "=1.10.4" }
-solana-merkle-tree = { path = "../merkle-tree", version = "=1.10.4" }
-solana-metrics = { path = "../metrics", version = "=1.10.4" }
-solana-perf = { path = "../perf", version = "=1.10.4" }
-solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "=1.10.4" }
-solana-rpc = { path = "../rpc", version = "=1.10.4" }
-solana-runtime = { path = "../runtime", version = "=1.10.4" }
-solana-sdk = { path = "../sdk", version = "=1.10.4" }
-solana-streamer = { path = "../streamer", version = "=1.10.4" }
-solana-test-validator = { path = "../test-validator", version = "=1.10.4" }
-solana-transaction-status = { path = "../transaction-status", version = "=1.10.4" }
-solana-version = { path = "../version", version = "=1.10.4" }
+solana-client = { path = "../client", version = "=1.11.0" }
+solana-ledger = { path = "../ledger", version = "=1.11.0" }
+solana-measure = { path = "../measure", version = "=1.11.0" }
+solana-merkle-tree = { path = "../merkle-tree", version = "=1.11.0" }
+solana-metrics = { path = "../metrics", version = "=1.11.0" }
+solana-perf = { path = "../perf", version = "=1.11.0" }
+solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "=1.11.0" }
+solana-rpc = { path = "../rpc", version = "=1.11.0" }
+solana-runtime = { path = "../runtime", version = "=1.11.0" }
+solana-sdk = { path = "../sdk", version = "=1.11.0" }
+solana-streamer = { path = "../streamer", version = "=1.11.0" }
+solana-test-validator = { path = "../test-validator", version = "=1.11.0" }
+solana-transaction-status = { path = "../transaction-status", version = "=1.11.0" }
+solana-version = { path = "../version", version = "=1.11.0" }
 systemstat = "0.1.10"
 tokio = { version = "1", features = ["full"] }

 [dev-dependencies]
-solana-logger = { path = "../logger", version = "=1.10.4" }
+solana-logger = { path = "../logger", version = "=1.11.0" }

 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
--- a/client/Cargo.toml
+++ b/client/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "solana-client"
-version = "1.10.4"
+version = "1.11.0"
 description = "Solana Client"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -35,15 +35,16 @@ semver = "1.0.6"
 serde = "1.0.136"
 serde_derive = "1.0.103"
 serde_json = "1.0.79"
-solana-account-decoder = { path = "../account-decoder", version = "=1.10.4" }
-solana-clap-utils = { path = "../clap-utils", version = "=1.10.4" }
-solana-faucet = { path = "../faucet", version = "=1.10.4" }
-solana-measure = { path = "../measure", version = "=1.10.4" }
-solana-net-utils = { path = "../net-utils", version = "=1.10.4" }
-solana-sdk = { path = "../sdk", version = "=1.10.4" }
-solana-transaction-status = { path = "../transaction-status", version = "=1.10.4" }
-solana-version = { path = "../version", version = "=1.10.4" }
-solana-vote-program = { path = "../programs/vote", version = "=1.10.4" }
+solana-account-decoder = { path = "../account-decoder", version = "=1.11.0" }
+solana-clap-utils = { path = "../clap-utils", version = "=1.11.0" }
+solana-faucet = { path = "../faucet", version = "=1.11.0" }
+solana-measure = { path = "../measure", version = "=1.11.0" }
+solana-net-utils = { path = "../net-utils", version = "=1.11.0" }
+solana-sdk = { path = "../sdk", version = "=1.11.0" }
+solana-streamer = { path = "../streamer", version = "=1.11.0" }
+solana-transaction-status = { path = "../transaction-status", version = "=1.11.0" }
+solana-version = { path = "../version", version = "=1.11.0" }
+solana-vote-program = { path = "../programs/vote", version = "=1.11.0" }
 thiserror = "1.0"
 tokio = { version = "1", features = ["full"] }
 tokio-stream = "0.1.8"
@@ -54,7 +55,7 @@ url = "2.2.2"
 [dev-dependencies]
 assert_matches = "1.5.0"
 jsonrpc-http-server = "18.0.0"
-solana-logger = { path = "../logger", version = "=1.10.4" }
+solana-logger = { path = "../logger", version = "=1.11.0" }

 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
--- a/client/src/connection_cache.rs
+++ b/client/src/connection_cache.rs
@@ -1,6 +1,9 @@
 use {
-    crate::{tpu_connection::TpuConnection, udp_client::UdpTpuConnection},
+    crate::{
+        quic_client::QuicTpuConnection, tpu_connection::TpuConnection, udp_client::UdpTpuConnection,
+    },
    lazy_static::lazy_static,
+    solana_sdk::{transaction::VersionedTransaction, transport::TransportError},
    std::{
        collections::{hash_map::Entry, BTreeMap, HashMap},
        net::{SocketAddr, UdpSocket},
@@ -11,9 +14,15 @@ use {
 // Should be non-zero
 static MAX_CONNECTIONS: usize = 64;

+#[derive(Clone)]
+enum Connection {
+    Udp(Arc<UdpTpuConnection>),
+    Quic(Arc<QuicTpuConnection>),
+}
+
 struct ConnMap {
    // Keeps track of the connection associated with an addr and the last time it was used
-    map: HashMap<SocketAddr, (Arc<dyn TpuConnection + 'static + Sync + Send>, u64)>,
+    map: HashMap<SocketAddr, (Connection, u64)>,
    // Helps to find the least recently used connection. The search and inserts are O(log(n))
    // but since we're bounding the size of the collections, this should be constant
    // (and hopefully negligible) time. In theory, we can do this in constant time
@@ -23,6 +32,7 @@ struct ConnMap {
    // that seems non-"Rust-y" and low bang/buck. This is still pretty terrible though...
    last_used_times: BTreeMap<u64, SocketAddr>,
    ticks: u64,
+    use_quic: bool,
 }

 impl ConnMap {
@@ -31,21 +41,31 @@ impl ConnMap {
            map: HashMap::new(),
            last_used_times: BTreeMap::new(),
            ticks: 0,
+            use_quic: false,
        }
    }
+
+    pub fn set_use_quic(&mut self, use_quic: bool) {
+        self.use_quic = use_quic;
+    }
 }

 lazy_static! {
    static ref CONNECTION_MAP: Mutex<ConnMap> = Mutex::new(ConnMap::new());
 }

+pub fn set_use_quic(use_quic: bool) {
+    let mut map = (*CONNECTION_MAP).lock().unwrap();
+    map.set_use_quic(use_quic);
+}
+
 #[allow(dead_code)]
 // TODO: see https://github.com/solana-labs/solana/issues/23661
 // remove lazy_static and optimize and refactor this
-pub fn get_connection(addr: &SocketAddr) -> Arc<dyn TpuConnection + 'static + Sync + Send> {
+fn get_connection(addr: &SocketAddr) -> Connection {
    let mut map = (*CONNECTION_MAP).lock().unwrap();
    let ticks = map.ticks;
-
+    let use_quic = map.use_quic;
    let (conn, target_ticks) = match map.map.entry(*addr) {
        Entry::Occupied(mut entry) => {
            let mut pair = entry.get_mut();
@@ -57,12 +77,15 @@ pub fn get_connection(addr: &SocketAddr) -> Arc<dyn TpuConnection + 'static + Sy
            let send_socket = UdpSocket::bind("0.0.0.0:0").unwrap();
            // TODO: see https://github.com/solana-labs/solana/issues/23659
            // make it configurable (e.g. via the command line) whether to use UDP or Quic
-            let conn = Arc::new(UdpTpuConnection::new(send_socket, *addr));
+
+            let conn = if use_quic {
+                Connection::Quic(Arc::new(QuicTpuConnection::new(send_socket, *addr)))
+            } else {
+                Connection::Udp(Arc::new(UdpTpuConnection::new(send_socket, *addr)))
+            };
+
            entry.insert((conn.clone(), ticks));
-            (
-                conn as Arc<dyn TpuConnection + 'static + Sync + Send>,
-                ticks,
-            )
+            (conn, ticks)
        }
    };

@@ -85,13 +108,69 @@ pub fn get_connection(addr: &SocketAddr) -> Arc<dyn TpuConnection + 'static + Sy
    conn
 }

+// TODO: see https://github.com/solana-labs/solana/issues/23851
+// use enum_dispatch and get rid of this tedious code.
+// The main blocker to using enum_dispatch right now is that
+// the it doesn't work with static methods like TpuConnection::new
+// which is used by thin_client. This will be eliminated soon
+// once thin_client is moved to using this connection cache.
+// Once that is done, we will migrate to using enum_dispatch
+// This will be done in a followup to
+// https://github.com/solana-labs/solana/pull/23817
+pub fn send_wire_transaction_batch(
+    packets: &[&[u8]],
+    addr: &SocketAddr,
+) -> Result<(), TransportError> {
+    let conn = get_connection(addr);
+    match conn {
+        Connection::Udp(conn) => conn.send_wire_transaction_batch(packets),
+        Connection::Quic(conn) => conn.send_wire_transaction_batch(packets),
+    }
+}
+
+pub fn send_wire_transaction(
+    wire_transaction: &[u8],
+    addr: &SocketAddr,
+) -> Result<(), TransportError> {
+    let conn = get_connection(addr);
+    match conn {
+        Connection::Udp(conn) => conn.send_wire_transaction(wire_transaction),
+        Connection::Quic(conn) => conn.send_wire_transaction(wire_transaction),
+    }
+}
+
+pub fn serialize_and_send_transaction(
+    transaction: &VersionedTransaction,
+    addr: &SocketAddr,
+) -> Result<(), TransportError> {
+    let conn = get_connection(addr);
+    match conn {
+        Connection::Udp(conn) => conn.serialize_and_send_transaction(transaction),
+        Connection::Quic(conn) => conn.serialize_and_send_transaction(transaction),
+    }
+}
+
+pub fn par_serialize_and_send_transaction_batch(
+    transactions: &[VersionedTransaction],
+    addr: &SocketAddr,
+) -> Result<(), TransportError> {
+    let conn = get_connection(addr);
+    match conn {
+        Connection::Udp(conn) => conn.par_serialize_and_send_transaction_batch(transactions),
+        Connection::Quic(conn) => conn.par_serialize_and_send_transaction_batch(transactions),
+    }
+}
+
 #[cfg(test)]
 mod tests {
    use {
-        crate::connection_cache::{get_connection, CONNECTION_MAP, MAX_CONNECTIONS},
+        crate::{
+            connection_cache::{get_connection, Connection, CONNECTION_MAP, MAX_CONNECTIONS},
+            tpu_connection::TpuConnection,
+        },
        rand::{Rng, SeedableRng},
        rand_chacha::ChaChaRng,
-        std::net::SocketAddr,
+        std::net::{IpAddr, SocketAddr},
    };

    fn get_addr(rng: &mut ChaChaRng) -> SocketAddr {
@@ -105,6 +184,13 @@ mod tests {
        addr_str.parse().expect("Invalid address")
    }

+    fn ip(conn: Connection) -> IpAddr {
+        match conn {
+            Connection::Udp(conn) => conn.tpu_addr().ip(),
+            Connection::Quic(conn) => conn.tpu_addr().ip(),
+        }
+    }
+
    #[test]
    fn test_connection_cache() {
        // Allow the test to run deterministically
@@ -120,7 +206,7 @@ mod tests {
        // be lazy and not connect until first use or handle connection errors somehow
        // (without crashing, as would be required in a real practical validator)
        let first_addr = get_addr(&mut rng);
-        assert!(get_connection(&first_addr).tpu_addr().ip() == first_addr.ip());
+        assert!(ip(get_connection(&first_addr)) == first_addr.ip());
        let addrs = (0..MAX_CONNECTIONS)
            .into_iter()
            .map(|_| {
@@ -133,7 +219,7 @@ mod tests {
            let map = (*CONNECTION_MAP).lock().unwrap();
            addrs.iter().for_each(|a| {
                let conn = map.map.get(a).expect("Address not found");
-                assert!(a.ip() == conn.0.tpu_addr().ip());
+                assert!(a.ip() == ip(conn.0.clone()));
            });

            assert!(map.map.get(&first_addr).is_none());
--- a/client/src/mock_sender.rs
+++ b/client/src/mock_sender.rs
@@ -229,6 +229,7 @@ impl RpcSender for MockSender {
                            post_token_balances: None,
                            rewards: None,
                            loaded_addresses: None,
+                            return_data: None,
                        }),
                },
                block_time: Some(1628633791),
@@ -340,6 +341,7 @@ impl RpcSender for MockSender {
                    logs: None,
                    accounts: None,
                    units_consumed: None,
+                    return_data: None,
                },
            })?,
            "getMinimumBalanceForRentExemption" => json![20],
--- a/client/src/quic_client.rs
+++ b/client/src/quic_client.rs
@@ -7,10 +7,8 @@ use {
    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::{
@@ -65,21 +63,22 @@ impl TpuConnection for QuicTpuConnection {
        &self.client.addr
    }

-    fn send_wire_transaction(&self, data: &[u8]) -> TransportResult<()> {
+    fn send_wire_transaction<T>(&self, wire_transaction: T) -> TransportResult<()>
+    where
+        T: AsRef<[u8]>,
+    {
        let _guard = self.client.runtime.enter();
-        let send_buffer = self.client.send_buffer(data);
+        let send_buffer = self.client.send_buffer(wire_transaction);
        self.client.runtime.block_on(send_buffer)?;
        Ok(())
    }

-    fn send_batch(&self, transactions: &[Transaction]) -> TransportResult<()> {
-        let buffers = transactions
-            .into_par_iter()
-            .map(|tx| bincode::serialize(&tx).expect("serialize Transaction in send_batch"))
-            .collect::<Vec<_>>();
-
+    fn send_wire_transaction_batch<T>(&self, buffers: &[T]) -> TransportResult<()>
+    where
+        T: AsRef<[u8]>,
+    {
        let _guard = self.client.runtime.enter();
-        let send_batch = self.client.send_batch(&buffers);
+        let send_batch = self.client.send_batch(buffers);
        self.client.runtime.block_on(send_batch)?;
        Ok(())
    }
@@ -162,12 +161,18 @@ impl QuicClient {
        }
    }

-    pub async fn send_buffer(&self, data: &[u8]) -> Result<(), ClientErrorKind> {
-        self._send_buffer(data).await?;
+    pub async fn send_buffer<T>(&self, data: T) -> Result<(), ClientErrorKind>
+    where
+        T: AsRef<[u8]>,
+    {
+        self._send_buffer(data.as_ref()).await?;
        Ok(())
    }

-    pub async fn send_batch(&self, buffers: &[Vec<u8>]) -> Result<(), ClientErrorKind> {
+    pub async fn send_batch<T>(&self, buffers: &[T]) -> Result<(), ClientErrorKind>
+    where
+        T: AsRef<[u8]>,
+    {
        // Start off by "testing" the connection by sending the first transaction
        // This will also connect to the server if not already connected
        // and reconnect and retry if the first send attempt failed
@@ -182,7 +187,7 @@ impl QuicClient {
        if buffers.is_empty() {
            return Ok(());
        }
-        let connection = self._send_buffer(&buffers[0]).await?;
+        let connection = self._send_buffer(buffers[0].as_ref()).await?;

        // Used to avoid dereferencing the Arc multiple times below
        // by just getting a reference to the NewConnection once
@@ -196,7 +201,7 @@ impl QuicClient {
            join_all(
                buffs
                    .into_iter()
-                    .map(|buf| Self::_send_buffer_using_conn(buf, connection_ref)),
+                    .map(|buf| Self::_send_buffer_using_conn(buf.as_ref(), connection_ref)),
            )
        });

--- a/client/src/rpc_response.rs
+++ b/client/src/rpc_response.rs
@@ -7,6 +7,7 @@ use {
        hash::Hash,
        inflation::Inflation,
        transaction::{Result, TransactionError},
+        transaction_context::TransactionReturnData,
    },
    solana_transaction_status::{
        ConfirmedTransactionStatusWithSignature, TransactionConfirmationStatus, UiConfirmedBlock,
@@ -347,6 +348,7 @@ pub struct RpcSimulateTransactionResult {
    pub logs: Option<Vec<String>>,
    pub accounts: Option<Vec<Option<UiAccount>>>,
    pub units_consumed: Option<u64>,
+    pub return_data: Option<TransactionReturnData>,
 }

 #[derive(Serialize, Deserialize, Clone, Debug)]
--- a/client/src/thin_client.rs
+++ b/client/src/thin_client.rs
@@ -24,7 +24,7 @@ use {
        signers::Signers,
        system_instruction,
        timing::duration_as_ms,
-        transaction::{self, Transaction},
+        transaction::{self, Transaction, VersionedTransaction},
        transport::Result as TransportResult,
    },
    std::{
@@ -215,10 +215,13 @@ impl<C: 'static + TpuConnection> ThinClient<C> {
            let mut num_confirmed = 0;
            let mut wait_time = MAX_PROCESSING_AGE;
            // resend the same transaction until the transaction has no chance of succeeding
+            let wire_transaction =
+                bincode::serialize(&transaction).expect("transaction serialization failed");
            while now.elapsed().as_secs() < wait_time as u64 {
                if num_confirmed == 0 {
                    // Send the transaction if there has been no confirmation (e.g. the first time)
-                    self.tpu_connection().send_transaction(transaction)?;
+                    self.tpu_connection()
+                        .send_wire_transaction(&wire_transaction)?;
                }

                if let Ok(confirmed_blocks) = self.poll_for_signature_confirmation(
@@ -601,12 +604,17 @@ impl<C: 'static + TpuConnection> SyncClient for ThinClient<C> {

 impl<C: 'static + TpuConnection> AsyncClient for ThinClient<C> {
    fn async_send_transaction(&self, transaction: Transaction) -> TransportResult<Signature> {
-        self.tpu_connection().send_transaction(&transaction)?;
+        let transaction = VersionedTransaction::from(transaction);
+        self.tpu_connection()
+            .serialize_and_send_transaction(&transaction)?;
        Ok(transaction.signatures[0])
    }

    fn async_send_batch(&self, transactions: Vec<Transaction>) -> TransportResult<()> {
-        self.tpu_connection().send_batch(&transactions)
+        let batch: Vec<VersionedTransaction> = transactions.into_iter().map(Into::into).collect();
+        self.tpu_connection()
+            .par_serialize_and_send_transaction_batch(&batch[..])?;
+        Ok(())
    }

    fn async_send_message<T: Signers>(
--- a/client/src/tpu_connection.rs
+++ b/client/src/tpu_connection.rs
@@ -1,21 +1,40 @@
 use {
-    solana_sdk::{transaction::Transaction, transport::Result as TransportResult},
+    rayon::iter::{IntoParallelIterator, ParallelIterator},
+    solana_sdk::{transaction::VersionedTransaction, transport::Result as TransportResult},
    std::net::{SocketAddr, UdpSocket},
 };

 pub trait TpuConnection {
-    fn new(client_socket: UdpSocket, tpu_addr: SocketAddr) -> Self
-    where
-        Self: Sized;
+    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 serialize_and_send_transaction(
+        &self,
+        transaction: &VersionedTransaction,
+    ) -> TransportResult<()> {
+        let wire_transaction =
+            bincode::serialize(transaction).expect("serialize Transaction in send_batch");
+        self.send_wire_transaction(&wire_transaction)
    }

-    fn send_wire_transaction(&self, data: &[u8]) -> TransportResult<()>;
+    fn send_wire_transaction<T>(&self, wire_transaction: T) -> TransportResult<()>
+    where
+        T: AsRef<[u8]>;

-    fn send_batch(&self, transactions: &[Transaction]) -> TransportResult<()>;
+    fn par_serialize_and_send_transaction_batch(
+        &self,
+        transactions: &[VersionedTransaction],
+    ) -> TransportResult<()> {
+        let buffers = transactions
+            .into_par_iter()
+            .map(|tx| bincode::serialize(&tx).expect("serialize Transaction in send_batch"))
+            .collect::<Vec<_>>();
+
+        self.send_wire_transaction_batch(&buffers)
+    }
+
+    fn send_wire_transaction_batch<T>(&self, buffers: &[T]) -> TransportResult<()>
+    where
+        T: AsRef<[u8]>;
 }
--- a/client/src/udp_client.rs
+++ b/client/src/udp_client.rs
@@ -3,7 +3,9 @@

 use {
    crate::tpu_connection::TpuConnection,
-    solana_sdk::{transaction::Transaction, transport::Result as TransportResult},
+    core::iter::repeat,
+    solana_sdk::transport::Result as TransportResult,
+    solana_streamer::sendmmsg::batch_send,
    std::net::{SocketAddr, UdpSocket},
 };

@@ -24,19 +26,20 @@ impl TpuConnection for UdpTpuConnection {
        &self.addr
    }

-    fn send_wire_transaction(&self, data: &[u8]) -> TransportResult<()> {
-        self.socket.send_to(data, self.addr)?;
+    fn send_wire_transaction<T>(&self, wire_transaction: T) -> TransportResult<()>
+    where
+        T: AsRef<[u8]>,
+    {
+        self.socket.send_to(wire_transaction.as_ref(), self.addr)?;
        Ok(())
    }

-    fn send_batch(&self, transactions: &[Transaction]) -> TransportResult<()> {
-        transactions
-            .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(())
-            })?;
+    fn send_wire_transaction_batch<T>(&self, buffers: &[T]) -> TransportResult<()>
+    where
+        T: AsRef<[u8]>,
+    {
+        let pkts: Vec<_> = buffers.iter().zip(repeat(self.tpu_addr())).collect();
+        batch_send(&self.socket, &pkts)?;
        Ok(())
    }
 }
--- a/core/Cargo.toml
+++ b/core/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "solana-core"
 description = "Blockchain, Rebuilt for Scale"
-version = "1.10.4"
+version = "1.11.0"
 homepage = "https://solana.com/"
 documentation = "https://docs.rs/solana-core"
 readme = "../README.md"
@@ -33,30 +33,30 @@ rayon = "1.5.1"
 retain_mut = "0.1.7"
 serde = "1.0.136"
 serde_derive = "1.0.103"
-solana-address-lookup-table-program = { path = "../programs/address-lookup-table", version = "=1.10.4" }
-solana-bloom = { path = "../bloom", version = "=1.10.4" }
-solana-client = { path = "../client", version = "=1.10.4" }
-solana-entry = { path = "../entry", version = "=1.10.4" }
-solana-frozen-abi = { path = "../frozen-abi", version = "=1.10.4" }
-solana-frozen-abi-macro = { path = "../frozen-abi/macro", version = "=1.10.4" }
-solana-geyser-plugin-manager = { path = "../geyser-plugin-manager", version = "=1.10.4" }
-solana-gossip = { path = "../gossip", version = "=1.10.4" }
-solana-ledger = { path = "../ledger", version = "=1.10.4" }
-solana-measure = { path = "../measure", version = "=1.10.4" }
-solana-metrics = { path = "../metrics", version = "=1.10.4" }
-solana-net-utils = { path = "../net-utils", version = "=1.10.4" }
-solana-perf = { path = "../perf", version = "=1.10.4" }
-solana-poh = { path = "../poh", version = "=1.10.4" }
-solana-program-runtime = { path = "../program-runtime", version = "=1.10.4" }
-solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "=1.10.4" }
-solana-replica-lib = { path = "../replica-lib", version = "=1.10.4" }
-solana-rpc = { path = "../rpc", version = "=1.10.4" }
-solana-runtime = { path = "../runtime", version = "=1.10.4" }
-solana-sdk = { path = "../sdk", version = "=1.10.4" }
-solana-send-transaction-service = { path = "../send-transaction-service", version = "=1.10.4" }
-solana-streamer = { path = "../streamer", version = "=1.10.4" }
-solana-transaction-status = { path = "../transaction-status", version = "=1.10.4" }
-solana-vote-program = { path = "../programs/vote", version = "=1.10.4" }
+solana-address-lookup-table-program = { path = "../programs/address-lookup-table", version = "=1.11.0" }
+solana-bloom = { path = "../bloom", version = "=1.11.0" }
+solana-client = { path = "../client", version = "=1.11.0" }
+solana-entry = { path = "../entry", version = "=1.11.0" }
+solana-frozen-abi = { path = "../frozen-abi", version = "=1.11.0" }
+solana-frozen-abi-macro = { path = "../frozen-abi/macro", version = "=1.11.0" }
+solana-geyser-plugin-manager = { path = "../geyser-plugin-manager", version = "=1.11.0" }
+solana-gossip = { path = "../gossip", version = "=1.11.0" }
+solana-ledger = { path = "../ledger", version = "=1.11.0" }
+solana-measure = { path = "../measure", version = "=1.11.0" }
+solana-metrics = { path = "../metrics", version = "=1.11.0" }
+solana-net-utils = { path = "../net-utils", version = "=1.11.0" }
+solana-perf = { path = "../perf", version = "=1.11.0" }
+solana-poh = { path = "../poh", version = "=1.11.0" }
+solana-program-runtime = { path = "../program-runtime", version = "=1.11.0" }
+solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "=1.11.0" }
+solana-replica-lib = { path = "../replica-lib", version = "=1.11.0" }
+solana-rpc = { path = "../rpc", version = "=1.11.0" }
+solana-runtime = { path = "../runtime", version = "=1.11.0" }
+solana-sdk = { path = "../sdk", version = "=1.11.0" }
+solana-send-transaction-service = { path = "../send-transaction-service", version = "=1.11.0" }
+solana-streamer = { path = "../streamer", version = "=1.11.0" }
+solana-transaction-status = { path = "../transaction-status", version = "=1.11.0" }
+solana-vote-program = { path = "../programs/vote", version = "=1.11.0" }
 sys-info = "0.9.1"
 tempfile = "3.3.0"
 thiserror = "1.0"
@@ -69,10 +69,10 @@ raptorq = "1.6.5"
 reqwest = { version = "0.11.10", default-features = false, features = ["blocking", "rustls-tls", "json"] }
 serde_json = "1.0.79"
 serial_test = "0.6.0"
-solana-logger = { path = "../logger", version = "=1.10.4" }
-solana-program-runtime = { path = "../program-runtime", version = "=1.10.4" }
-solana-stake-program = { path = "../programs/stake", version = "=1.10.4" }
-solana-version = { path = "../version", version = "=1.10.4" }
+solana-logger = { path = "../logger", version = "=1.11.0" }
+solana-program-runtime = { path = "../program-runtime", version = "=1.11.0" }
+solana-stake-program = { path = "../programs/stake", version = "=1.11.0" }
+solana-version = { path = "../version", version = "=1.11.0" }
 static_assertions = "1.1.0"
 systemstat = "0.1.10"

--- a/core/src/accounts_hash_verifier.rs
+++ b/core/src/accounts_hash_verifier.rs
@@ -6,12 +6,10 @@

 use {
    crossbeam_channel::RecvTimeoutError,
-    rayon::ThreadPool,
    solana_gossip::cluster_info::{ClusterInfo, MAX_SNAPSHOT_HASHES},
    solana_measure::measure::Measure,
    solana_runtime::{
-        accounts_db::{self, AccountsDb},
-        accounts_hash::HashStats,
+        accounts_hash::{CalcAccountsHashConfig, HashStats},
        snapshot_config::SnapshotConfig,
        snapshot_package::{
            AccountsPackage, AccountsPackageReceiver, PendingSnapshotPackage, SnapshotPackage,
@@ -22,7 +20,6 @@ use {
    solana_sdk::{clock::Slot, hash::Hash, pubkey::Pubkey},
    std::{
        collections::{HashMap, HashSet},
-        path::{Path, PathBuf},
        sync::{
            atomic::{AtomicBool, Ordering},
            Arc,
@@ -46,7 +43,6 @@ impl AccountsHashVerifier {
        halt_on_known_validators_accounts_hash_mismatch: bool,
        fault_injection_rate_slots: u64,
        snapshot_config: Option<SnapshotConfig>,
-        ledger_path: PathBuf,
    ) -> Self {
        let exit = exit.clone();
        let cluster_info = cluster_info.clone();
@@ -54,7 +50,6 @@ impl AccountsHashVerifier {
            .name("solana-hash-accounts".to_string())
            .spawn(move || {
                let mut hashes = vec![];
-                let mut thread_pool = None;
                loop {
                    if exit.load(Ordering::Relaxed) {
                        break;
@@ -62,11 +57,6 @@ impl AccountsHashVerifier {

                    match accounts_package_receiver.recv_timeout(Duration::from_secs(1)) {
                        Ok(accounts_package) => {
-                            if accounts_package.hash_for_testing.is_some() && thread_pool.is_none()
-                            {
-                                thread_pool = Some(accounts_db::make_min_priority_thread_pool());
-                            }
-
                            Self::process_accounts_package(
                                accounts_package,
                                &cluster_info,
@@ -77,8 +67,6 @@ impl AccountsHashVerifier {
                                &exit,
                                fault_injection_rate_slots,
                                snapshot_config.as_ref(),
-                                thread_pool.as_ref(),
-                                &ledger_path,
                            );
                        }
                        Err(RecvTimeoutError::Disconnected) => break,
@@ -103,10 +91,8 @@ impl AccountsHashVerifier {
        exit: &Arc<AtomicBool>,
        fault_injection_rate_slots: u64,
        snapshot_config: Option<&SnapshotConfig>,
-        thread_pool: Option<&ThreadPool>,
-        ledger_path: &Path,
    ) {
-        Self::verify_accounts_package_hash(&accounts_package, thread_pool, ledger_path);
+        Self::verify_accounts_package_hash(&accounts_package);

        Self::push_accounts_hashes_to_cluster(
            &accounts_package,
@@ -121,25 +107,32 @@ impl AccountsHashVerifier {
        Self::submit_for_packaging(accounts_package, pending_snapshot_package, snapshot_config);
    }

-    fn verify_accounts_package_hash(
-        accounts_package: &AccountsPackage,
-        thread_pool: Option<&ThreadPool>,
-        ledger_path: &Path,
-    ) {
+    fn verify_accounts_package_hash(accounts_package: &AccountsPackage) {
        let mut measure_hash = Measure::start("hash");
-        if let Some(expected_hash) = accounts_package.hash_for_testing {
+        if let Some(expected_hash) = accounts_package.accounts_hash_for_testing {
+            let mut sort_time = Measure::start("sort_storages");
            let sorted_storages = SortedStorages::new(&accounts_package.snapshot_storages);
-            let (hash, lamports) = AccountsDb::calculate_accounts_hash_without_index(
-                ledger_path,
-                &sorted_storages,
-                thread_pool,
-                HashStats::default(),
-                false,
-                None,
-                None, // this will fail with filler accounts
-                None, // this code path is only for testing, so use default # passes here
-            )
-            .unwrap();
+            sort_time.stop();
+
+            let mut timings = HashStats {
+                storage_sort_us: sort_time.as_us(),
+                ..HashStats::default()
+            };
+            timings.calc_storage_size_quartiles(&accounts_package.snapshot_storages);
+
+            let (hash, lamports) = accounts_package
+                .accounts
+                .accounts_db
+                .calculate_accounts_hash_without_index(
+                    &CalcAccountsHashConfig {
+                        storages: &sorted_storages,
+                        use_bg_thread_pool: true,
+                        check_hash: false,
+                        ancestors: None,
+                    },
+                    timings,
+                )
+                .unwrap();

            assert_eq!(accounts_package.expected_capitalization, lamports);
            assert_eq!(expected_hash, hash);
@@ -160,7 +153,7 @@ impl AccountsHashVerifier {
        exit: &Arc<AtomicBool>,
        fault_injection_rate_slots: u64,
    ) {
-        let hash = accounts_package.hash;
+        let hash = accounts_package.accounts_hash;
        if fault_injection_rate_slots != 0
            && accounts_package.slot % fault_injection_rate_slots == 0
        {
@@ -353,6 +346,7 @@ mod tests {
            incremental_snapshot_archive_interval_slots: Slot::MAX,
            ..SnapshotConfig::default()
        };
+        let accounts = Arc::new(solana_runtime::accounts::Accounts::default_for_tests());
        for i in 0..MAX_SNAPSHOT_HASHES + 1 {
            let accounts_package = AccountsPackage {
                slot: full_snapshot_archive_interval_slots + i as u64,
@@ -360,18 +354,17 @@ mod tests {
                slot_deltas: vec![],
                snapshot_links: TempDir::new().unwrap(),
                snapshot_storages: vec![],
-                hash: hash(&[i as u8]),
+                accounts_hash: hash(&[i as u8]),
                archive_format: ArchiveFormat::TarBzip2,
                snapshot_version: SnapshotVersion::default(),
                snapshot_archives_dir: PathBuf::default(),
                expected_capitalization: 0,
-                hash_for_testing: None,
+                accounts_hash_for_testing: None,
                cluster_type: ClusterType::MainnetBeta,
                snapshot_type: None,
+                accounts: Arc::clone(&accounts),
            };

-            let ledger_path = TempDir::new().unwrap();
-
            AccountsHashVerifier::process_accounts_package(
                accounts_package,
                &cluster_info,
@@ -382,8 +375,6 @@ mod tests {
                &exit,
                0,
                Some(&snapshot_config),
-                None,
-                ledger_path.path(),
            );

            // sleep for 1ms to create a newer timestmap for gossip entry
--- a/core/src/banking_stage.rs
+++ b/core/src/banking_stage.rs
@@ -1,5 +1,5 @@
 //! The `banking_stage` processes Transaction messages. It is intended to be used
-//! to contruct a software pipeline. The stage uses all available CPU cores and
+//! to construct a software pipeline. The stage uses all available CPU cores and
 //! can do its processing in parallel with signature verification on the GPU.
 use {
    crate::{
@@ -14,6 +14,7 @@ use {
    histogram::Histogram,
    itertools::Itertools,
    retain_mut::RetainMut,
+    solana_client::connection_cache::send_wire_transaction_batch,
    solana_entry::entry::hash_transactions,
    solana_gossip::{cluster_info::ClusterInfo, contact_info::ContactInfo},
    solana_ledger::blockstore_processor::TransactionStatusSender,
@@ -51,8 +52,8 @@ use {
        transaction::{
            self, AddressLoader, SanitizedTransaction, TransactionError, VersionedTransaction,
        },
+        transport::TransportError,
    },
-    solana_streamer::sendmmsg::{batch_send, SendPktsError},
    solana_transaction_status::token_balances::{
        collect_token_balances, TransactionTokenBalancesSet,
    },
@@ -60,7 +61,7 @@ use {
        cmp,
        collections::HashMap,
        env,
-        net::{SocketAddr, UdpSocket},
+        net::SocketAddr,
        sync::{
            atomic::{AtomicU64, AtomicUsize, Ordering},
            Arc, Mutex, RwLock,
@@ -194,7 +195,7 @@ impl BankingStageStats {
    }

    fn report(&mut self, report_interval_ms: u64) {
-        // skip repoting metrics if stats is empty
+        // skip reporting metrics if stats is empty
        if self.is_empty() {
            return;
        }
@@ -482,11 +483,10 @@ impl BankingStage {
    /// Forwards all valid, unprocessed packets in the buffer, up to a rate limit. Returns
    /// the number of successfully forwarded packets in second part of tuple
    fn forward_buffered_packets(
-        socket: &std::net::UdpSocket,
        tpu_forwards: &std::net::SocketAddr,
        packets: Vec<&Packet>,
        data_budget: &DataBudget,
-    ) -> (std::io::Result<()>, usize) {
+    ) -> (std::result::Result<(), TransportError>, usize) {
        const INTERVAL_MS: u64 = 100;
        const MAX_BYTES_PER_SECOND: usize = 10_000 * 1200;
        const MAX_BYTES_PER_INTERVAL: usize = MAX_BYTES_PER_SECOND * INTERVAL_MS as usize / 1000;
@@ -502,18 +502,35 @@ impl BankingStage {
            .iter()
            .filter_map(|p| {
                if !p.meta.forwarded() && data_budget.take(p.meta.size) {
-                    Some((&p.data[..p.meta.size], tpu_forwards))
+                    Some(&p.data[..p.meta.size])
                } else {
                    None
                }
            })
            .collect();

+        // TODO: see https://github.com/solana-labs/solana/issues/23819
+        // fix this so returns the correct number of succeeded packets
+        // when there's an error sending the batch. This was left as-is for now
+        // in favor of shipping Quic support, which was considered higher-priority
        if !packet_vec.is_empty() {
            inc_new_counter_info!("banking_stage-forwarded_packets", packet_vec.len());
-            if let Err(SendPktsError::IoError(ioerr, num_failed)) = batch_send(socket, &packet_vec)
-            {
-                return (Err(ioerr), packet_vec.len().saturating_sub(num_failed));
+
+            let mut measure = Measure::start("banking_stage-forward-us");
+
+            let res = send_wire_transaction_batch(&packet_vec, tpu_forwards);
+
+            measure.stop();
+            inc_new_counter_info!(
+                "banking_stage-forward-us",
+                measure.as_us() as usize,
+                1000,
+                1000
+            );
+
+            if let Err(err) = res {
+                inc_new_counter_info!("banking_stage-forward_packets-failed-batches", 1);
+                return (Err(err), 0);
            }
        }

@@ -700,14 +717,11 @@ impl BankingStage {

                    // `original_unprocessed_indexes` must have remaining packets to process
                    // if not yet processed.
-                    assert!(Self::packet_has_more_unprocessed_transactions(
-                        &original_unprocessed_indexes
-                    ));
+                    assert!(!original_unprocessed_indexes.is_empty());
                    true
                }
            }
        });
-
        proc_start.stop();

        debug!(
@@ -766,7 +780,6 @@ impl BankingStage {
    #[allow(clippy::too_many_arguments)]
    fn process_buffered_packets(
        my_pubkey: &Pubkey,
-        socket: &std::net::UdpSocket,
        poh_recorder: &Arc<Mutex<PohRecorder>>,
        cluster_info: &ClusterInfo,
        buffered_packet_batches: &mut UnprocessedPacketBatches,
@@ -846,7 +859,6 @@ impl BankingStage {
                            cluster_info,
                            buffered_packet_batches,
                            poh_recorder,
-                            socket,
                            false,
                            data_budget,
                            slot_metrics_tracker,
@@ -865,7 +877,6 @@ impl BankingStage {
                            cluster_info,
                            buffered_packet_batches,
                            poh_recorder,
-                            socket,
                            true,
                            data_budget,
                            slot_metrics_tracker,
@@ -887,7 +898,6 @@ impl BankingStage {
        cluster_info: &ClusterInfo,
        buffered_packet_batches: &mut UnprocessedPacketBatches,
        poh_recorder: &Arc<Mutex<PohRecorder>>,
-        socket: &UdpSocket,
        hold: bool,
        data_budget: &DataBudget,
        slot_metrics_tracker: &mut LeaderSlotMetricsTracker,
@@ -913,7 +923,7 @@ impl BankingStage {
            Self::filter_valid_packets_for_forwarding(buffered_packet_batches.iter());
        let forwardable_packets_len = forwardable_packets.len();
        let (_forward_result, sucessful_forwarded_packets_count) =
-            Self::forward_buffered_packets(socket, &addr, forwardable_packets, data_budget);
+            Self::forward_buffered_packets(&addr, forwardable_packets, data_budget);
        let failed_forwarded_packets_count =
            forwardable_packets_len.saturating_sub(sucessful_forwarded_packets_count);

@@ -958,7 +968,6 @@ impl BankingStage {
        cost_model: Arc<RwLock<CostModel>>,
    ) {
        let recorder = poh_recorder.lock().unwrap().recorder();
-        let socket = UdpSocket::bind("0.0.0.0:0").unwrap();
        let mut buffered_packet_batches = UnprocessedPacketBatches::with_capacity(batch_limit);
        let mut banking_stage_stats = BankingStageStats::new(id);
        let qos_service = QosService::new(cost_model, id);
@@ -970,7 +979,6 @@ impl BankingStage {
                    |_| {
                        Self::process_buffered_packets(
                            &my_pubkey,
-                            &socket,
                            poh_recorder,
                            cluster_info,
                            &mut buffered_packet_batches,
@@ -1183,6 +1191,7 @@ impl BankingStage {
                    MAX_PROCESSING_AGE,
                    transaction_status_sender.is_some(),
                    transaction_status_sender.is_some(),
+                    transaction_status_sender.is_some(),
                    &mut execute_and_commit_timings.execute_timings,
                )
            },
@@ -2015,7 +2024,7 @@ impl BankingStage {
        banking_stage_stats: &mut BankingStageStats,
        slot_metrics_tracker: &mut LeaderSlotMetricsTracker,
    ) {
-        if Self::packet_has_more_unprocessed_transactions(&packet_indexes) {
+        if !packet_indexes.is_empty() {
            if unprocessed_packet_batches.len() >= batch_limit {
                *dropped_packet_batches_count += 1;
                if let Some(dropped_batch) = unprocessed_packet_batches.pop_front() {
@@ -2041,10 +2050,6 @@ impl BankingStage {
        }
    }

-    fn packet_has_more_unprocessed_transactions(packet_indexes: &[usize]) -> bool {
-        !packet_indexes.is_empty()
-    }
-
    pub fn join(self) -> thread::Result<()> {
        for bank_thread_hdl in self.bank_thread_hdls {
            bank_thread_hdl.join()?;
@@ -2156,6 +2161,7 @@ mod tests {
            log_messages: None,
            inner_instructions: None,
            durable_nonce_fee: None,
+            return_data: None,
        })
    }

@@ -3835,7 +3841,6 @@ mod tests {

            let local_node = Node::new_localhost_with_pubkey(validator_pubkey);
            let cluster_info = new_test_cluster_info(local_node.info);
-            let send_socket = UdpSocket::bind("0.0.0.0:0").unwrap();
            let recv_socket = &local_node.sockets.tpu_forwards[0];

            let test_cases = vec![
@@ -3857,7 +3862,6 @@ mod tests {
                    &cluster_info,
                    &mut unprocessed_packet_batches,
                    &poh_recorder,
-                    &send_socket,
                    true,
                    &data_budget,
                    &mut LeaderSlotMetricsTracker::new(0),
@@ -3935,7 +3939,6 @@ mod tests {

            let local_node = Node::new_localhost_with_pubkey(validator_pubkey);
            let cluster_info = new_test_cluster_info(local_node.info);
-            let send_socket = UdpSocket::bind("0.0.0.0:0").unwrap();
            let recv_socket = &local_node.sockets.tpu_forwards[0];

            let test_cases = vec![
@@ -3969,7 +3972,6 @@ mod tests {
                    &cluster_info,
                    &mut unprocessed_packet_batches,
                    &poh_recorder,
-                    &send_socket,
                    hold,
                    &DataBudget::default(),
                    &mut LeaderSlotMetricsTracker::new(0),
--- a/core/src/consensus.rs
+++ b/core/src/consensus.rs
@@ -10,7 +10,7 @@ use {
    solana_ledger::{ancestor_iterator::AncestorIterator, blockstore::Blockstore, blockstore_db},
    solana_runtime::{
        bank::Bank, bank_forks::BankForks, commitment::VOTE_THRESHOLD_SIZE,
-        vote_account::VoteAccount,
+        vote_account::VoteAccountsHashMap,
    },
    solana_sdk::{
        clock::{Slot, UnixTimestamp},
@@ -253,7 +253,7 @@ impl Tower {
    pub(crate) fn collect_vote_lockouts(
        vote_account_pubkey: &Pubkey,
        bank_slot: Slot,
-        vote_accounts: &HashMap<Pubkey, (/*stake:*/ u64, VoteAccount)>,
+        vote_accounts: &VoteAccountsHashMap,
        ancestors: &HashMap<Slot, HashSet<Slot>>,
        get_frozen_hash: impl Fn(Slot) -> Option<Hash>,
        latest_validator_votes_for_frozen_banks: &mut LatestValidatorVotesForFrozenBanks,
@@ -636,7 +636,7 @@ impl Tower {
        descendants: &HashMap<Slot, HashSet<u64>>,
        progress: &ProgressMap,
        total_stake: u64,
-        epoch_vote_accounts: &HashMap<Pubkey, (u64, VoteAccount)>,
+        epoch_vote_accounts: &VoteAccountsHashMap,
        latest_validator_votes_for_frozen_banks: &LatestValidatorVotesForFrozenBanks,
        heaviest_subtree_fork_choice: &HeaviestSubtreeForkChoice,
    ) -> SwitchForkDecision {
@@ -929,7 +929,7 @@ impl Tower {
        descendants: &HashMap<Slot, HashSet<u64>>,
        progress: &ProgressMap,
        total_stake: u64,
-        epoch_vote_accounts: &HashMap<Pubkey, (u64, VoteAccount)>,
+        epoch_vote_accounts: &VoteAccountsHashMap,
        latest_validator_votes_for_frozen_banks: &LatestValidatorVotesForFrozenBanks,
        heaviest_subtree_fork_choice: &HeaviestSubtreeForkChoice,
    ) -> SwitchForkDecision {
@@ -1377,7 +1377,7 @@ pub mod test {
        },
        itertools::Itertools,
        solana_ledger::{blockstore::make_slot_entries, get_tmp_ledger_path},
-        solana_runtime::bank::Bank,
+        solana_runtime::{bank::Bank, vote_account::VoteAccount},
        solana_sdk::{
            account::{Account, AccountSharedData, ReadableAccount, WritableAccount},
            clock::Slot,
@@ -1398,7 +1398,7 @@ pub mod test {
        trees::tr,
    };

-    fn gen_stakes(stake_votes: &[(u64, &[u64])]) -> HashMap<Pubkey, (u64, VoteAccount)> {
+    fn gen_stakes(stake_votes: &[(u64, &[u64])]) -> VoteAccountsHashMap {
        stake_votes
            .iter()
            .map(|(lamports, votes)| {
--- a/core/src/progress_map.rs
+++ b/core/src/progress_map.rs
@@ -7,7 +7,7 @@ use {
    },
    solana_ledger::blockstore_processor::{ConfirmationProgress, ConfirmationTiming},
    solana_program_runtime::timings::ExecuteTimingType,
-    solana_runtime::{bank::Bank, bank_forks::BankForks, vote_account::VoteAccount},
+    solana_runtime::{bank::Bank, bank_forks::BankForks, vote_account::VoteAccountsHashMap},
    solana_sdk::{clock::Slot, hash::Hash, pubkey::Pubkey},
    std::{
        collections::{BTreeMap, HashMap, HashSet},
@@ -516,7 +516,7 @@ impl PropagatedStats {
        &mut self,
        node_pubkey: &Pubkey,
        vote_account_pubkeys: &[Pubkey],
-        epoch_vote_accounts: &HashMap<Pubkey, (u64, VoteAccount)>,
+        epoch_vote_accounts: &VoteAccountsHashMap,
    ) {
        self.propagated_node_ids.insert(*node_pubkey);
        for vote_account_pubkey in vote_account_pubkeys.iter() {
@@ -695,7 +695,7 @@ impl ProgressMap {

 #[cfg(test)]
 mod test {
-    use super::*;
+    use {super::*, solana_runtime::vote_account::VoteAccount};

    #[test]
    fn test_add_vote_pubkey() {
--- a/core/src/replay_stage.rs
+++ b/core/src/replay_stage.rs
@@ -2301,7 +2301,7 @@ impl ReplayStage {
            }
        }

-        // send accumulated excute-timings to cost_update_service
+        // send accumulated execute-timings to cost_update_service
        if !execute_timings.details.per_program_timings.is_empty() {
            cost_update_sender
                .send(CostUpdate::ExecuteTiming {
@@ -2589,7 +2589,7 @@ impl ReplayStage {
                    */

                    // Imagine 90% of validators voted on slot 4, but only 9% landed. If everybody that fails
-                    // the switch theshold abandons slot 4 to build on slot 8 (because it's *currently* heavier),
+                    // the switch threshold abandons slot 4 to build on slot 8 (because it's *currently* heavier),
                    // then there will be no blocks to include the votes for slot 4, and the network halts
                    // because 90% of validators can't vote
                    info!(
--- a/core/src/retransmit_stage.rs
+++ b/core/src/retransmit_stage.rs
@@ -240,7 +240,7 @@ fn retransmit(
    epoch_fetch.stop();
    stats.epoch_fetch += epoch_fetch.as_us();

-    let mut epoch_cache_update = Measure::start("retransmit_epoch_cach_update");
+    let mut epoch_cache_update = Measure::start("retransmit_epoch_cache_update");
    maybe_reset_shreds_received_cache(shreds_received, hasher_reset_ts);
    epoch_cache_update.stop();
    stats.epoch_cache_update += epoch_cache_update.as_us();
--- a/core/src/tvu.rs
+++ b/core/src/tvu.rs
@@ -98,7 +98,6 @@ pub struct TvuConfig {
    pub accounts_hash_fault_injection_slots: u64,
    pub accounts_db_caching_enabled: bool,
    pub test_hash_calculation: bool,
-    pub use_index_hash_calculation: bool,
    pub rocksdb_compaction_interval: Option<u64>,
    pub rocksdb_max_compaction_jitter: Option<u64>,
    pub wait_for_vote_to_start_leader: bool,
@@ -230,7 +229,6 @@ impl Tvu {
            tvu_config.halt_on_known_validators_accounts_hash_mismatch,
            tvu_config.accounts_hash_fault_injection_slots,
            snapshot_config.clone(),
-            blockstore.ledger_path().to_path_buf(),
        );

        let (snapshot_request_sender, snapshot_request_handler) = match snapshot_config {
@@ -359,7 +357,6 @@ impl Tvu {
            accounts_background_request_handler,
            tvu_config.accounts_db_caching_enabled,
            tvu_config.test_hash_calculation,
-            tvu_config.use_index_hash_calculation,
            last_full_snapshot_slot,
        );

--- a/core/src/validator.rs
+++ b/core/src/validator.rs
@@ -162,7 +162,6 @@ pub struct ValidatorConfig {
    pub warp_slot: Option<Slot>,
    pub accounts_db_test_hash_calculation: bool,
    pub accounts_db_skip_shrink: bool,
-    pub accounts_db_use_index_hash_calculation: bool,
    pub tpu_coalesce_ms: u64,
    pub validator_exit: Arc<RwLock<Exit>>,
    pub no_wait_for_vote_to_start_leader: bool,
@@ -223,7 +222,6 @@ impl Default for ValidatorConfig {
            warp_slot: None,
            accounts_db_test_hash_calculation: false,
            accounts_db_skip_shrink: false,
-            accounts_db_use_index_hash_calculation: true,
            tpu_coalesce_ms: DEFAULT_TPU_COALESCE_MS,
            validator_exit: Arc::new(RwLock::new(Exit::default())),
            no_wait_for_vote_to_start_leader: true,
@@ -915,7 +913,6 @@ impl Validator {
                accounts_hash_fault_injection_slots: config.accounts_hash_fault_injection_slots,
                accounts_db_caching_enabled: config.accounts_db_caching_enabled,
                test_hash_calculation: config.accounts_db_test_hash_calculation,
-                use_index_hash_calculation: config.accounts_db_use_index_hash_calculation,
                rocksdb_compaction_interval: config.rocksdb_compaction_interval,
                rocksdb_max_compaction_jitter: config.rocksdb_compaction_interval,
                wait_for_vote_to_start_leader,
@@ -1298,6 +1295,7 @@ fn load_blockstore(
        BlockstoreOptions {
            recovery_mode: config.wal_recovery_mode.clone(),
            column_options: config.ledger_column_options.clone(),
+            enforce_ulimit_nofile: config.enforce_ulimit_nofile,
            ..BlockstoreOptions::default()
        },
    )
@@ -1331,7 +1329,7 @@ fn load_blockstore(
                blockstore.clone(),
                exit,
                enable_rpc_transaction_history,
-                config.rpc_config.enable_cpi_and_log_storage,
+                config.rpc_config.enable_extended_tx_metadata_storage,
                transaction_notifier,
            )
        } else {
@@ -1538,7 +1536,7 @@ fn initialize_rpc_transaction_history_services(
    blockstore: Arc<Blockstore>,
    exit: &Arc<AtomicBool>,
    enable_rpc_transaction_history: bool,
-    enable_cpi_and_log_storage: bool,
+    enable_extended_tx_metadata_storage: bool,
    transaction_notifier: Option<TransactionNotifierLock>,
 ) -> TransactionHistoryServices {
    let max_complete_transaction_status_slot = Arc::new(AtomicU64::new(blockstore.max_root()));
@@ -1552,7 +1550,7 @@ fn initialize_rpc_transaction_history_services(
        enable_rpc_transaction_history,
        transaction_notifier.clone(),
        blockstore.clone(),
-        enable_cpi_and_log_storage,
+        enable_extended_tx_metadata_storage,
        exit,
    ));

@@ -1799,7 +1797,6 @@ mod tests {
        std::fs::remove_dir_all,
    };

-    #[test]
    fn validator_exit() {
        solana_logger::setup();
        let leader_keypair = Keypair::new();
@@ -1879,7 +1876,6 @@ mod tests {
        }
    }

-    #[test]
    fn validator_parallel_exit() {
        let leader_keypair = Keypair::new();
        let leader_node = Node::new_localhost_with_pubkey(&leader_keypair.pubkey());
@@ -1927,6 +1923,12 @@ mod tests {
        }
    }

+    #[test]
+    fn test_validator_exit() {
+        validator_exit();
+        validator_parallel_exit();
+    }
+
    #[test]
    fn test_wait_for_supermajority() {
        solana_logger::setup();
--- a/core/src/voting_service.rs
+++ b/core/src/voting_service.rs
@@ -1,6 +1,7 @@
 use {
    crate::tower_storage::{SavedTowerVersions, TowerStorage},
    crossbeam_channel::Receiver,
+    solana_client::connection_cache::send_wire_transaction,
    solana_gossip::cluster_info::ClusterInfo,
    solana_measure::measure::Measure,
    solana_poh::poh_recorder::PohRecorder,
@@ -86,7 +87,13 @@ impl VotingService {
        } else {
            crate::banking_stage::next_leader_tpu(cluster_info, poh_recorder)
        };
-        let _ = cluster_info.send_transaction(vote_op.tx(), target_address);
+
+        let mut measure = Measure::start("vote_tx_send-ms");
+        let target_address = target_address.unwrap_or_else(|| cluster_info.my_contact_info().tpu);
+        let wire_vote_tx = bincode::serialize(vote_op.tx()).expect("vote serialization failure");
+        let _ = send_wire_transaction(&wire_vote_tx, &target_address);
+        measure.stop();
+        inc_new_counter_info!("vote_tx_send-ms", measure.as_ms() as usize);

        match vote_op {
            VoteOp::PushVote {
--- a/core/src/window_service.rs
+++ b/core/src/window_service.rs
@@ -604,7 +604,7 @@ impl WindowService {
                    }

                    if last_print.elapsed().as_secs() > 2 {
-                        metrics.report_metrics("recv-window-insert-shreds");
+                        metrics.report_metrics("blockstore-insert-shreds");
                        metrics = BlockstoreInsertionMetrics::default();
                        ws_metrics.report_metrics("recv-window-insert-shreds");
                        ws_metrics = WindowServiceMetrics::default();
--- a/core/tests/ledger_cleanup.rs
+++ b/core/tests/ledger_cleanup.rs
@@ -358,6 +358,7 @@ mod tests {
                                ..BlockstoreRocksFifoOptions::default()
                            },
                        ),
+                        ..LedgerColumnOptions::default()
                    },
                    ..BlockstoreOptions::default()
                }
--- a/core/tests/snapshots.rs
+++ b/core/tests/snapshots.rs
@@ -265,8 +265,7 @@ mod tests {
                // set_root should send a snapshot request
                bank_forks.set_root(bank.slot(), &request_sender, None);
                bank.update_accounts_hash();
-                snapshot_request_handler
-                    .handle_snapshot_requests(false, false, false, 0, &mut None);
+                snapshot_request_handler.handle_snapshot_requests(false, false, 0, &mut None);
            }
        }

@@ -707,7 +706,6 @@ mod tests {
                bank_forks.set_root(bank.slot(), &request_sender, None);
                bank.update_accounts_hash();
                snapshot_request_handler.handle_snapshot_requests(
-                    false,
                    false,
                    false,
                    0,
@@ -931,7 +929,6 @@ mod tests {
            true,
        );

-        let tmpdir = TempDir::new().unwrap();
        let accounts_hash_verifier = AccountsHashVerifier::new(
            accounts_package_receiver,
            Some(pending_snapshot_package),
@@ -941,7 +938,6 @@ mod tests {
            false,
            0,
            Some(snapshot_test_config.snapshot_config.clone()),
-            tmpdir.path().to_path_buf(),
        );

        let accounts_background_service = AccountsBackgroundService::new(
@@ -949,7 +945,6 @@ mod tests {
            &exit,
            abs_request_handler,
            false,
-            false,
            true,
            None,
        );
--- a/docs/src/developing/clients/jsonrpc-api.md
+++ b/docs/src/developing/clients/jsonrpc-api.md
@@ -1531,7 +1531,7 @@ Returns the latest blockhash

 - `RpcResponse<object>` - RpcResponse JSON object with `value` field set to a JSON object including:
 - `blockhash: <string>` - a Hash as base-58 encoded string
- `lastValidBlockHeight: u64` - Slot
+- `lastValidBlockHeight: <u64>` - last [block height](../../terminology.md#block-height) at which the blockhash will be valid

 #### Example:

@@ -3059,7 +3059,7 @@ curl http://localhost:8899 -X POST -H "Content-Type: application/json" -d '
 Result:

 ```json
-{ "jsonrpc": "2.0", "result": { "solana-core": "1.10.4" }, "id": 1 }
+{ "jsonrpc": "2.0", "result": { "solana-core": "1.11.0" }, "id": 1 }
 ```

 ### getVoteAccounts
@@ -5147,7 +5147,7 @@ The result will be an RpcResponse JSON object with `value` set to a JSON object
 - `blockhash: <string>` - a Hash as base-58 encoded string
 - `feeCalculator: <object>` - FeeCalculator object, the fee schedule for this block hash
 - `lastValidSlot: <u64>` - DEPRECATED - this value is inaccurate and should not be relied upon
- `lastValidBlockHeight: <u64>` - last [block height](../../terminology.md#block-height) at which a blockhash will be valid
+- `lastValidBlockHeight: <u64>` - last [block height](../../terminology.md#block-height) at which the blockhash will be valid

 #### Example:

--- a/dos/Cargo.toml
+++ b/dos/Cargo.toml
@@ -2,7 +2,7 @@
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 edition = "2021"
 name = "solana-dos"
-version = "1.10.4"
+version = "1.11.0"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
@@ -15,18 +15,18 @@ clap = {version = "3.1.5", features = ["derive", "cargo"]}
 log = "0.4.14"
 rand = "0.7.0"
 serde = "1.0.136"
-solana-client = { path = "../client", version = "=1.10.4" }
-solana-core = { path = "../core", version = "=1.10.4" }
-solana-gossip = { path = "../gossip", version = "=1.10.4" }
-solana-logger = { path = "../logger", version = "=1.10.4" }
-solana-net-utils = { path = "../net-utils", version = "=1.10.4" }
-solana-perf = { path = "../perf", version = "=1.10.4" }
-solana-sdk = { path = "../sdk", version = "=1.10.4" }
-solana-streamer = { path = "../streamer", version = "=1.10.4" }
-solana-version = { path = "../version", version = "=1.10.4" }
+solana-client = { path = "../client", version = "=1.11.0" }
+solana-core = { path = "../core", version = "=1.11.0" }
+solana-gossip = { path = "../gossip", version = "=1.11.0" }
+solana-logger = { path = "../logger", version = "=1.11.0" }
+solana-net-utils = { path = "../net-utils", version = "=1.11.0" }
+solana-perf = { path = "../perf", version = "=1.11.0" }
+solana-sdk = { path = "../sdk", version = "=1.11.0" }
+solana-streamer = { path = "../streamer", version = "=1.11.0" }
+solana-version = { path = "../version", version = "=1.11.0" }

 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]

 [dev-dependencies]
-solana-local-cluster = { path = "../local-cluster", version = "=1.10.4" }
+solana-local-cluster = { path = "../local-cluster", version = "=1.11.0" }
--- a/dos/src/main.rs
+++ b/dos/src/main.rs
@@ -542,6 +542,7 @@ pub mod test {
    }

    #[test]
+    #[ignore]
    fn test_dos_local_cluster_transactions() {
        let num_nodes = 1;
        let cluster =
--- a/download-utils/Cargo.toml
+++ b/download-utils/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "solana-download-utils"
-version = "1.10.4"
+version = "1.11.0"
 description = "Solana Download Utils"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -14,8 +14,8 @@ console = "0.15.0"
 indicatif = "0.16.2"
 log = "0.4.14"
 reqwest = { version = "0.11.10", default-features = false, features = ["blocking", "rustls-tls", "json"] }
-solana-runtime = { path = "../runtime", version = "=1.10.4" }
-solana-sdk = { path = "../sdk", version = "=1.10.4" }
+solana-runtime = { path = "../runtime", version = "=1.11.0" }
+solana-sdk = { path = "../sdk", version = "=1.11.0" }

 [lib]
 crate-type = ["lib"]
--- a/entry/Cargo.toml
+++ b/entry/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "solana-entry"
-version = "1.10.4"
+version = "1.11.0"
 description = "Solana Entry"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -18,16 +18,16 @@ log = "0.4.11"
 rand = "0.7.0"
 rayon = "1.5.1"
 serde = "1.0.136"
-solana-measure = { path = "../measure", version = "=1.10.4" }
-solana-merkle-tree = { path = "../merkle-tree", version = "=1.10.4" }
-solana-metrics = { path = "../metrics", version = "=1.10.4" }
-solana-perf = { path = "../perf", version = "=1.10.4" }
-solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "=1.10.4" }
-solana-sdk = { path = "../sdk", version = "=1.10.4" }
+solana-measure = { path = "../measure", version = "=1.11.0" }
+solana-merkle-tree = { path = "../merkle-tree", version = "=1.11.0" }
+solana-metrics = { path = "../metrics", version = "=1.11.0" }
+solana-perf = { path = "../perf", version = "=1.11.0" }
+solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "=1.11.0" }
+solana-sdk = { path = "../sdk", version = "=1.11.0" }

 [dev-dependencies]
 matches = "0.1.9"
-solana-logger = { path = "../logger", version = "=1.10.4" }
+solana-logger = { path = "../logger", version = "=1.11.0" }

 [lib]
 crate-type = ["lib"]
--- a/explorer/package-lock.json
+++ b/explorer/package-lock.json
@@ -14,6 +14,7 @@
        "@cloudflare/stream-react": "^1.2.0",
        "@metamask/jazzicon": "^2.0.0",
        "@metaplex/js": "4.12.0",
+        "@project-serum/anchor": "^0.22.1",
        "@project-serum/serum": "^0.13.61",
        "@react-hook/debounce": "^4.0.0",
        "@sentry/react": "^6.16.1",
@@ -4489,17 +4490,18 @@
      }
    },
    "node_modules/@project-serum/anchor": {
-      "version": "0.11.1",
-      "resolved": "https://registry.npmjs.org/@project-serum/anchor/-/anchor-0.11.1.tgz",
-      "integrity": "sha512-oIdm4vTJkUy6GmE6JgqDAuQPKI7XM4TPJkjtoIzp69RZe0iAD9JP2XHx7lV1jLdYXeYHqDXfBt3zcq7W91K6PA==",
+      "version": "0.22.1",
+      "resolved": "https://registry.npmjs.org/@project-serum/anchor/-/anchor-0.22.1.tgz",
+      "integrity": "sha512-5pHeyvQhzLahIQ8aZymmDMZJAJFklN0joZdI+YIqFkK2uU/mlKr6rBLQjxysf/j1mLLiNG00tdyLfUtTAdQz7w==",
      "dependencies": {
-        "@project-serum/borsh": "^0.2.2",
+        "@project-serum/borsh": "^0.2.5",
        "@solana/web3.js": "^1.17.0",
        "base64-js": "^1.5.1",
        "bn.js": "^5.1.2",
        "bs58": "^4.0.1",
-        "buffer-layout": "^1.2.0",
+        "buffer-layout": "^1.2.2",
        "camelcase": "^5.3.1",
+        "cross-fetch": "^3.1.5",
        "crypto-hash": "^1.3.0",
        "eventemitter3": "^4.0.7",
        "find": "^0.3.0",
@@ -4547,6 +4549,30 @@
        "node": ">=10"
      }
    },
+    "node_modules/@project-serum/serum/node_modules/@project-serum/anchor": {
+      "version": "0.11.1",
+      "resolved": "https://registry.npmjs.org/@project-serum/anchor/-/anchor-0.11.1.tgz",
+      "integrity": "sha512-oIdm4vTJkUy6GmE6JgqDAuQPKI7XM4TPJkjtoIzp69RZe0iAD9JP2XHx7lV1jLdYXeYHqDXfBt3zcq7W91K6PA==",
+      "dependencies": {
+        "@project-serum/borsh": "^0.2.2",
+        "@solana/web3.js": "^1.17.0",
+        "base64-js": "^1.5.1",
+        "bn.js": "^5.1.2",
+        "bs58": "^4.0.1",
+        "buffer-layout": "^1.2.0",
+        "camelcase": "^5.3.1",
+        "crypto-hash": "^1.3.0",
+        "eventemitter3": "^4.0.7",
+        "find": "^0.3.0",
+        "js-sha256": "^0.9.0",
+        "pako": "^2.0.3",
+        "snake-case": "^3.0.4",
+        "toml": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=11"
+      }
+    },
    "node_modules/@project-serum/serum/node_modules/@solana/spl-token": {
      "version": "0.1.6",
      "resolved": "https://registry.npmjs.org/@solana/spl-token/-/spl-token-0.1.6.tgz",
@@ -4594,6 +4620,11 @@
        "node": ">=10"
      }
    },
+    "node_modules/@project-serum/serum/node_modules/pako": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/pako/-/pako-2.0.4.tgz",
+      "integrity": "sha512-v8tweI900AUkZN6heMU/4Uy4cXRc2AYNRggVmTR+dEncawDJgCdLMximOVA2p4qO57WMynangsfGRb5WD6L1Bg=="
+    },
    "node_modules/@project-serum/sol-wallet-adapter": {
      "version": "0.1.8",
      "resolved": "https://registry.npmjs.org/@project-serum/sol-wallet-adapter/-/sol-wallet-adapter-0.1.8.tgz",
@@ -18534,9 +18565,9 @@
      }
    },
    "node_modules/minimist": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
-      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
+      "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q=="
    },
    "node_modules/minipass": {
      "version": "3.1.3",
@@ -18707,9 +18738,9 @@
      "integrity": "sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ=="
    },
    "node_modules/nanoid": {
-      "version": "3.1.23",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.23.tgz",
-      "integrity": "sha512-FiB0kzdP0FFVGDKlRLEQ1BgDzU87dy5NnzjeW9YZNt+/c3+q82EQDUwniSAUxp/F0gFNI1ZhKU1FqYsMuqZVnw==",
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.1.tgz",
+      "integrity": "sha512-n6Vs/3KGyxPQd6uO0eH4Bv0ojGSUvuLlIHtC3Y0kEO23YRge8H9x1GCzLn28YX0H66pMkxuaeESFq4tKISKwdw==",
      "bin": {
        "nanoid": "bin/nanoid.cjs"
      },
@@ -30606,17 +30637,18 @@
      "peer": true
    },
    "@project-serum/anchor": {
-      "version": "0.11.1",
-      "resolved": "https://registry.npmjs.org/@project-serum/anchor/-/anchor-0.11.1.tgz",
-      "integrity": "sha512-oIdm4vTJkUy6GmE6JgqDAuQPKI7XM4TPJkjtoIzp69RZe0iAD9JP2XHx7lV1jLdYXeYHqDXfBt3zcq7W91K6PA==",
+      "version": "0.22.1",
+      "resolved": "https://registry.npmjs.org/@project-serum/anchor/-/anchor-0.22.1.tgz",
+      "integrity": "sha512-5pHeyvQhzLahIQ8aZymmDMZJAJFklN0joZdI+YIqFkK2uU/mlKr6rBLQjxysf/j1mLLiNG00tdyLfUtTAdQz7w==",
      "requires": {
-        "@project-serum/borsh": "^0.2.2",
+        "@project-serum/borsh": "^0.2.5",
        "@solana/web3.js": "^1.17.0",
        "base64-js": "^1.5.1",
        "bn.js": "^5.1.2",
        "bs58": "^4.0.1",
-        "buffer-layout": "^1.2.0",
+        "buffer-layout": "^1.2.2",
        "camelcase": "^5.3.1",
+        "cross-fetch": "^3.1.5",
        "crypto-hash": "^1.3.0",
        "eventemitter3": "^4.0.7",
        "find": "^0.3.0",
@@ -30654,6 +30686,27 @@
        "buffer-layout": "^1.2.0"
      },
      "dependencies": {
+        "@project-serum/anchor": {
+          "version": "0.11.1",
+          "resolved": "https://registry.npmjs.org/@project-serum/anchor/-/anchor-0.11.1.tgz",
+          "integrity": "sha512-oIdm4vTJkUy6GmE6JgqDAuQPKI7XM4TPJkjtoIzp69RZe0iAD9JP2XHx7lV1jLdYXeYHqDXfBt3zcq7W91K6PA==",
+          "requires": {
+            "@project-serum/borsh": "^0.2.2",
+            "@solana/web3.js": "^1.17.0",
+            "base64-js": "^1.5.1",
+            "bn.js": "^5.1.2",
+            "bs58": "^4.0.1",
+            "buffer-layout": "^1.2.0",
+            "camelcase": "^5.3.1",
+            "crypto-hash": "^1.3.0",
+            "eventemitter3": "^4.0.7",
+            "find": "^0.3.0",
+            "js-sha256": "^0.9.0",
+            "pako": "^2.0.3",
+            "snake-case": "^3.0.4",
+            "toml": "^3.0.0"
+          }
+        },
        "@solana/spl-token": {
          "version": "0.1.6",
          "resolved": "https://registry.npmjs.org/@solana/spl-token/-/spl-token-0.1.6.tgz",
@@ -30680,6 +30733,11 @@
          "version": "10.0.0",
          "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-10.0.0.tgz",
          "integrity": "sha512-rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q=="
+        },
+        "pako": {
+          "version": "2.0.4",
+          "resolved": "https://registry.npmjs.org/pako/-/pako-2.0.4.tgz",
+          "integrity": "sha512-v8tweI900AUkZN6heMU/4Uy4cXRc2AYNRggVmTR+dEncawDJgCdLMximOVA2p4qO57WMynangsfGRb5WD6L1Bg=="
        }
      }
    },
@@ -41480,9 +41538,9 @@
      }
    },
    "minimist": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
-      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
+      "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q=="
    },
    "minipass": {
      "version": "3.1.3",
@@ -41622,9 +41680,9 @@
      "integrity": "sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ=="
    },
    "nanoid": {
-      "version": "3.1.23",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.23.tgz",
-      "integrity": "sha512-FiB0kzdP0FFVGDKlRLEQ1BgDzU87dy5NnzjeW9YZNt+/c3+q82EQDUwniSAUxp/F0gFNI1ZhKU1FqYsMuqZVnw=="
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.1.tgz",
+      "integrity": "sha512-n6Vs/3KGyxPQd6uO0eH4Bv0ojGSUvuLlIHtC3Y0kEO23YRge8H9x1GCzLn28YX0H66pMkxuaeESFq4tKISKwdw=="
    },
    "nanomatch": {
      "version": "1.2.13",
--- a/explorer/package.json
+++ b/explorer/package.json
@@ -9,6 +9,7 @@
    "@cloudflare/stream-react": "^1.2.0",
    "@metamask/jazzicon": "^2.0.0",
    "@metaplex/js": "4.12.0",
+    "@project-serum/anchor": "^0.22.1",
    "@project-serum/serum": "^0.13.61",
    "@react-hook/debounce": "^4.0.0",
    "@sentry/react": "^6.16.1",
--- a/explorer/src/components/SearchBar.tsx
+++ b/explorer/src/components/SearchBar.tsx
@@ -42,6 +42,7 @@ export function SearchBar() {
      <div className="row align-items-center">
        <div className="col">
          <Select
+            autoFocus
            ref={(ref) => (selectRef.current = ref)}
            options={buildOptions(
              search,
--- a/explorer/src/components/SolanaPingCard.tsx
+++ b/explorer/src/components/SolanaPingCard.tsx
@@ -1,6 +1,7 @@
 import React from "react";
 import classNames from "classnames";
 import {
+  PingInfo,
  PingRollupInfo,
  PingStatus,
  useSolanaPingInfo,
@@ -107,12 +108,10 @@ const CUSTOM_TOOLTIP = function (this: any, tooltipModel: ChartTooltipModel) {

  // Set Text
  if (tooltipModel.body) {
-    const { label, value } = tooltipModel.dataPoints[0];
+    const { label } = tooltipModel.dataPoints[0];
    const tooltipContent = tooltipEl.querySelector("div");
    if (tooltipContent) {
-      let innerHtml = `<div class="value">${value} ms</div>`;
-      innerHtml += `<div class="label">${label}</div>`;
-      tooltipContent.innerHTML = innerHtml;
+      tooltipContent.innerHTML = `${label}`;
    }
  }

@@ -173,33 +172,56 @@ const CHART_OPTION: ChartOptions = {
 function PingBarChart({ pingInfo }: { pingInfo: PingRollupInfo }) {
  const [series, setSeries] = React.useState<Series>("short");
  const seriesData = pingInfo[series] || [];
-
+  const maxMean = seriesData.reduce((a, b) => {
+    return Math.max(a, b.mean);
+  }, 0);
  const seriesLength = seriesData.length;
+  const backgroundColor = (val: PingInfo) => {
+    if (val.submitted === 0) {
+      return "#08a274";
+    }
+    return val.loss > 0.5 ? "#f00" : "#00D192";
+  };
  const chartData: Chart.ChartData = {
    labels: seriesData.map((val, i) => {
-      return `
-      <p class="mb-0">${val.confirmed} of ${val.submitted} confirmed</p>
-      ${
-        val.loss
-          ? `<p class="mb-0">${val.loss.toLocaleString(undefined, {
-              style: "percent",
-              minimumFractionDigits: 2,
-            })} loss</p>`
-          : ""
+      if (val.submitted === 0) {
+        return `
+        <div class="label">
+          <p class="mb-0">Ping statistics unavailable</p>
+          ${SERIES_INFO[series].label(seriesLength - i)}min ago
+        </div>
+        `;
      }
-      ${SERIES_INFO[series].label(seriesLength - i)}min ago
+
+      return `
+        <div class="value">${val.mean} ms</div>
+        <div class="label">
+          <p class="mb-0">${val.confirmed} of ${val.submitted} confirmed</p>
+        ${
+          val.loss
+            ? `<p class="mb-0">${val.loss.toLocaleString(undefined, {
+                style: "percent",
+                minimumFractionDigits: 2,
+              })} loss</p>`
+            : ""
+        }
+        ${SERIES_INFO[series].label(seriesLength - i)}min ago
+        </div>
      `;
    }),
    datasets: [
      {
-        backgroundColor: seriesData.map((val) =>
-          val.loss > 0.5 ? "#f00" : "#00D192"
-        ),
-        hoverBackgroundColor: seriesData.map((val) =>
-          val.loss > 0.5 ? "#f00" : "#00D192"
-        ),
+        minBarLength: 2,
+        backgroundColor: seriesData.map(backgroundColor),
+        hoverBackgroundColor: seriesData.map(backgroundColor),
        borderWidth: 0,
-        data: seriesData.map((val) => val.mean || 0),
+        data: seriesData.map((val) => {
+          if (val.submitted === 0) {
+            return maxMean * 0.5;
+          }
+
+          return val.mean || 0;
+        }),
      },
    ],
  };
--- a/explorer/src/components/account/StakeAccountSection.tsx
+++ b/explorer/src/components/account/StakeAccountSection.tsx
@@ -296,11 +296,11 @@ function isFullyInactivated(
    return false;
  }

-  const delegatedStake = stake.delegation.stake.toNumber();
-  const inactiveStake = activation.inactive;
+  const delegatedStake = stake.delegation.stake;
+  const inactiveStake = new BN(activation.inactive);

  return (
    !stake.delegation.deactivationEpoch.eq(MAX_EPOCH) &&
-    delegatedStake === inactiveStake
+    delegatedStake.eq(inactiveStake)
  );
 }
--- a/explorer/src/components/instruction/GenericAnchorDetails.tsx
+++ b/explorer/src/components/instruction/GenericAnchorDetails.tsx
@@ -0,0 +1,167 @@
+import {
+  Connection,
+  SignatureResult,
+  TransactionInstruction,
+} from "@solana/web3.js";
+import { InstructionCard } from "./InstructionCard";
+import {
+  BorshInstructionCoder,
+  Idl,
+  Program,
+  Provider,
+} from "@project-serum/anchor";
+import React, { useEffect, useState } from "react";
+import { useCluster } from "../../providers/cluster";
+import { Address } from "../common/Address";
+import { snakeCase } from "snake-case";
+
+export function GenericAnchorDetailsCard(props: {
+  ix: TransactionInstruction;
+  index: number;
+  result: SignatureResult;
+  signature: string;
+  innerCards?: JSX.Element[];
+  childIndex?: number;
+}) {
+  const { ix, index, result, innerCards, childIndex } = props;
+
+  const cluster = useCluster();
+
+  const [idl, setIdl] = useState<Idl | null>();
+  useEffect(() => {
+    async function fetchIdl() {
+      if (idl) {
+        return;
+      }
+
+      // fetch on chain idl
+      const idl_: Idl | null = await Program.fetchIdl(ix.programId, {
+        connection: new Connection(cluster.url),
+      } as Provider);
+      setIdl(idl_);
+    }
+
+    fetchIdl();
+  }, [ix.programId, cluster.url, idl]);
+
+  const [programName, setProgramName] = useState<string | null>(null);
+  const [ixTitle, setIxTitle] = useState<string | null>(null);
+  const [ixAccounts, setIxAccounts] = useState<
+    { name: string; isMut: boolean; isSigner: boolean; pda?: Object }[] | null
+  >(null);
+
+  useEffect(() => {
+    async function parseIxDetailsUsingCoder() {
+      if (!idl || (programName && ixTitle && ixAccounts)) {
+        return;
+      }
+
+      // e.g. voter_stake_registry -> voter stake registry
+      var _programName = idl.name.replaceAll("_", " ").trim();
+      // e.g. voter stake registry -> Voter Stake Registry
+      _programName = _programName
+        .toLowerCase()
+        .split(" ")
+        .map((word) => word.charAt(0).toUpperCase() + word.substring(1))
+        .join(" ");
+      setProgramName(_programName);
+
+      const coder = new BorshInstructionCoder(idl);
+      const decodedIx = coder.decode(ix.data);
+      if (!decodedIx) {
+        return;
+      }
+
+      // get ix title, pascal case it
+      var _ixTitle = decodedIx.name;
+      _ixTitle = _ixTitle.charAt(0).toUpperCase() + _ixTitle.slice(1);
+      setIxTitle(_ixTitle);
+
+      // get ix accounts
+      const idlInstructions = idl.instructions.filter(
+        (ix) => ix.name === decodedIx.name
+      );
+      if (idlInstructions.length === 0) {
+        return;
+      }
+      setIxAccounts(
+        idlInstructions[0].accounts as {
+          // type coercing since anchor doesn't export the underlying type
+          name: string;
+          isMut: boolean;
+          isSigner: boolean;
+          pda?: Object;
+        }[]
+      );
+    }
+
+    parseIxDetailsUsingCoder();
+  }, [
+    ix.programId,
+    ix.keys,
+    ix.data,
+    idl,
+    cluster,
+    programName,
+    ixTitle,
+    ixAccounts,
+  ]);
+
+  return (
+    <div>
+      {idl && (
+        <InstructionCard
+          ix={ix}
+          index={index}
+          result={result}
+          title={`${programName || "Unknown"}: ${ixTitle || "Unknown"}`}
+          innerCards={innerCards}
+          childIndex={childIndex}
+        >
+          <tr key={ix.programId.toBase58()}>
+            <td>Program</td>
+            <td className="text-lg-end">
+              <Address pubkey={ix.programId} alignRight link />
+            </td>
+          </tr>
+
+          {ixAccounts != null &&
+            ix.keys.map((am, keyIndex) => (
+              <tr key={keyIndex}>
+                <td>
+                  <div className="me-2 d-md-inline">
+                    {/* remaining accounts would not have a name */}
+                    {ixAccounts[keyIndex] &&
+                      snakeCase(ixAccounts[keyIndex].name)}
+                    {!ixAccounts[keyIndex] &&
+                      "remaining account #" +
+                        (keyIndex - ixAccounts.length + 1)}
+                  </div>
+                  {am.isWritable && (
+                    <span className="badge bg-info-soft me-1">Writable</span>
+                  )}
+                  {am.isSigner && (
+                    <span className="badge bg-info-soft me-1">Signer</span>
+                  )}
+                </td>
+                <td>
+                  <Address pubkey={am.pubkey} alignRight link />
+                </td>
+              </tr>
+            ))}
+        </InstructionCard>
+      )}
+      {!idl && (
+        <InstructionCard
+          ix={ix}
+          index={index}
+          result={result}
+          title={`Unknown Program: Unknown Instruction`}
+          innerCards={innerCards}
+          childIndex={childIndex}
+          defaultRaw
+        />
+      )}
+    </div>
+  );
+}
--- a/explorer/src/components/instruction/anchor/types.ts
+++ b/explorer/src/components/instruction/anchor/types.ts
@@ -0,0 +1,16 @@
+import { TransactionInstruction } from "@solana/web3.js";
+
+// list of programs written in anchor
+// - should have idl on-chain for GenericAnchorDetailsCard to work out of the box
+// - before adding another program to this list, please make sure that the ix
+// are decoding without any errors
+const knownAnchorPrograms = [
+  // https://github.com/blockworks-foundation/voter-stake-registry
+  "4Q6WW2ouZ6V3iaNm56MTd5n2tnTm4C5fiH8miFHnAFHo",
+];
+
+export const isInstructionFromAnAnchorProgram = (
+  instruction: TransactionInstruction
+) => {
+  return knownAnchorPrograms.includes(instruction.programId.toBase58());
+};
--- a/explorer/src/components/instruction/serum/types.ts
+++ b/explorer/src/components/instruction/serum/types.ts
@@ -500,7 +500,7 @@ export function decodeInitOpenOrders(
      openOrders: ix.keys[0].pubkey,
      openOrdersOwner: ix.keys[1].pubkey,
      market: ix.keys[2].pubkey,
-      openOrdersMarketAuthority: ix.keys[4].pubkey,
+      openOrdersMarketAuthority: ix.keys[4]?.pubkey,
    },
  };
 }
--- a/explorer/src/components/instruction/token/types.ts
+++ b/explorer/src/components/instruction/token/types.ts
@@ -166,6 +166,10 @@ const BurnChecked = type({
  tokenAmount: TokenAmountUi,
 });

+const SyncNative = type({
+  account: PublicKeyFromString,
+});
+
 export type TokenInstructionType = Infer<typeof TokenInstructionType>;
 export const TokenInstructionType = enums([
  "initializeMint",
@@ -188,6 +192,7 @@ export const TokenInstructionType = enums([
  "approveChecked",
  "mintToChecked",
  "burnChecked",
+  "syncNative",
 ]);

 export const IX_STRUCTS = {
@@ -211,6 +216,7 @@ export const IX_STRUCTS = {
  approveChecked: ApproveChecked,
  mintToChecked: MintToChecked,
  burnChecked: BurnChecked,
+  syncNative: SyncNative,
 };

 export const IX_TITLES = {
@@ -234,4 +240,5 @@ export const IX_TITLES = {
  approveChecked: "Approve (Checked)",
  mintToChecked: "Mint To (Checked)",
  burnChecked: "Burn (Checked)",
+  syncNative: "Sync Native",
 };
--- a/explorer/src/components/transaction/InstructionsSection.tsx
+++ b/explorer/src/components/transaction/InstructionsSection.tsx
@@ -21,8 +21,8 @@ import { WormholeDetailsCard } from "components/instruction/WormholeDetailsCard"
 import { UnknownDetailsCard } from "components/instruction/UnknownDetailsCard";
 import { BonfidaBotDetailsCard } from "components/instruction/BonfidaBotDetails";
 import {
-  SignatureProps,
  INNER_INSTRUCTIONS_START_SLOT,
+  SignatureProps,
 } from "pages/TransactionDetailsPage";
 import { intoTransactionInstruction } from "utils/tx";
 import { isSerumInstruction } from "components/instruction/serum/types";
@@ -39,10 +39,12 @@ import { BpfUpgradeableLoaderDetailsCard } from "components/instruction/bpf-upgr
 import { VoteDetailsCard } from "components/instruction/vote/VoteDetailsCard";
 import { isWormholeInstruction } from "components/instruction/wormhole/types";
 import { AssociatedTokenDetailsCard } from "components/instruction/AssociatedTokenDetailsCard";
-import { isMangoInstruction } from "components/instruction/mango/types";
 import { MangoDetailsCard } from "components/instruction/MangoDetails";
 import { isPythInstruction } from "components/instruction/pyth/types";
 import { PythDetailsCard } from "components/instruction/pyth/PythDetailsCard";
+import { isInstructionFromAnAnchorProgram } from "../instruction/anchor/types";
+import { GenericAnchorDetailsCard } from "../instruction/GenericAnchorDetails";
+import { isMangoInstruction } from "../instruction/mango/types";

 export type InstructionDetailsProps = {
  tx: ParsedTransaction;
@@ -214,6 +216,8 @@ function renderInstructionCard({

  if (isBonfidaBotInstruction(transactionIx)) {
    return <BonfidaBotDetailsCard key={key} {...props} />;
+  } else if (isInstructionFromAnAnchorProgram(transactionIx)) {
+    return <GenericAnchorDetailsCard key={key} {...props} />;
  } else if (isMangoInstruction(transactionIx)) {
    return <MangoDetailsCard key={key} {...props} />;
  } else if (isSerumInstruction(transactionIx)) {
--- a/faucet/Cargo.toml
+++ b/faucet/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "solana-faucet"
-version = "1.10.4"
+version = "1.11.0"
 description = "Solana Faucet"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -17,12 +17,12 @@ crossbeam-channel = "0.5"
 log = "0.4.14"
 serde = "1.0.136"
 serde_derive = "1.0.103"
-solana-clap-utils = { path = "../clap-utils", version = "=1.10.4" }
-solana-cli-config = { path = "../cli-config", version = "=1.10.4" }
-solana-logger = { path = "../logger", version = "=1.10.4" }
-solana-metrics = { path = "../metrics", version = "=1.10.4" }
-solana-sdk = { path = "../sdk", version = "=1.10.4" }
-solana-version = { path = "../version", version = "=1.10.4" }
+solana-clap-utils = { path = "../clap-utils", version = "=1.11.0" }
+solana-cli-config = { path = "../cli-config", version = "=1.11.0" }
+solana-logger = { path = "../logger", version = "=1.11.0" }
+solana-metrics = { path = "../metrics", version = "=1.11.0" }
+solana-sdk = { path = "../sdk", version = "=1.11.0" }
+solana-version = { path = "../version", version = "=1.11.0" }
 spl-memo = { version = "=3.0.1", features = ["no-entrypoint"] }
 thiserror = "1.0"
 tokio = { version = "1", features = ["full"] }
--- a/frozen-abi/Cargo.toml
+++ b/frozen-abi/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "solana-frozen-abi"
-version = "1.10.4"
+version = "1.11.0"
 description = "Solana Frozen ABI"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -18,7 +18,7 @@ serde = "1.0.136"
 serde_derive = "1.0.103"
 serde_bytes = "0.11"
 sha2 = "0.10.2"
-solana-frozen-abi-macro = { path = "macro", version = "=1.10.4" }
+solana-frozen-abi-macro = { path = "macro", version = "=1.11.0" }
 thiserror = "1.0"

 [target.'cfg(not(target_arch = "bpf"))'.dependencies]
@@ -27,7 +27,7 @@ im = { version = "15.0.0", features = ["rayon", "serde"] }
 memmap2 = "0.5.3"

 [target.'cfg(not(target_arch = "bpf"))'.dev-dependencies]
-solana-logger = { path = "../logger", version = "=1.10.4" }
+solana-logger = { path = "../logger", version = "=1.11.0" }

 [build-dependencies]
 rustc_version = "0.4"
--- a/frozen-abi/macro/Cargo.toml
+++ b/frozen-abi/macro/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "solana-frozen-abi-macro"
-version = "1.10.4"
+version = "1.11.0"
 description = "Solana Frozen ABI Macro"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
--- a/genesis-utils/Cargo.toml
+++ b/genesis-utils/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "solana-genesis-utils"
-version = "1.10.4"
+version = "1.11.0"
 description = "Solana Genesis Utils"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -10,9 +10,9 @@ documentation = "https://docs.rs/solana-download-utils"
 edition = "2021"

 [dependencies]
-solana-download-utils = { path = "../download-utils", version = "=1.10.4" }
-solana-runtime = { path = "../runtime", version = "=1.10.4" }
-solana-sdk = { path = "../sdk", version = "=1.10.4" }
+solana-download-utils = { path = "../download-utils", version = "=1.11.0" }
+solana-runtime = { path = "../runtime", version = "=1.11.0" }
+solana-sdk = { path = "../sdk", version = "=1.11.0" }

 [lib]
 crate-type = ["lib"]
--- a/genesis/Cargo.toml
+++ b/genesis/Cargo.toml
@@ -3,7 +3,7 @@ authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 edition = "2021"
 name = "solana-genesis"
 description = "Blockchain, Rebuilt for Scale"
-version = "1.10.4"
+version = "1.11.0"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
@@ -15,16 +15,16 @@ clap = "2.33.1"
 serde = "1.0.136"
 serde_json = "1.0.79"
 serde_yaml = "0.8.23"
-solana-clap-utils = { path = "../clap-utils", version = "=1.10.4" }
-solana-cli-config = { path = "../cli-config", version = "=1.10.4" }
-solana-entry = { path = "../entry", version = "=1.10.4" }
-solana-ledger = { path = "../ledger", version = "=1.10.4" }
-solana-logger = { path = "../logger", version = "=1.10.4" }
-solana-runtime = { path = "../runtime", version = "=1.10.4" }
-solana-sdk = { path = "../sdk", version = "=1.10.4" }
-solana-stake-program = { path = "../programs/stake", version = "=1.10.4" }
-solana-version = { path = "../version", version = "=1.10.4" }
-solana-vote-program = { path = "../programs/vote", version = "=1.10.4" }
+solana-clap-utils = { path = "../clap-utils", version = "=1.11.0" }
+solana-cli-config = { path = "../cli-config", version = "=1.11.0" }
+solana-entry = { path = "../entry", version = "=1.11.0" }
+solana-ledger = { path = "../ledger", version = "=1.11.0" }
+solana-logger = { path = "../logger", version = "=1.11.0" }
+solana-runtime = { path = "../runtime", version = "=1.11.0" }
+solana-sdk = { path = "../sdk", version = "=1.11.0" }
+solana-stake-program = { path = "../programs/stake", version = "=1.11.0" }
+solana-version = { path = "../version", version = "=1.11.0" }
+solana-vote-program = { path = "../programs/vote", version = "=1.11.0" }
 tempfile = "3.3.0"

 [[bin]]
--- a/geyser-plugin-interface/Cargo.toml
+++ b/geyser-plugin-interface/Cargo.toml
@@ -3,7 +3,7 @@ authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 edition = "2021"
 name = "solana-geyser-plugin-interface"
 description = "The Solana Geyser plugin interface."
-version = "1.10.4"
+version = "1.11.0"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
@@ -11,8 +11,8 @@ documentation = "https://docs.rs/solana-geyser-plugin-interface"

 [dependencies]
 log = "0.4.11"
-solana-sdk = { path = "../sdk", version = "=1.10.4" }
-solana-transaction-status = { path = "../transaction-status", version = "=1.10.4" }
+solana-sdk = { path = "../sdk", version = "=1.11.0" }
+solana-transaction-status = { path = "../transaction-status", version = "=1.11.0" }
 thiserror = "1.0.30"

 [package.metadata.docs.rs]
--- a/geyser-plugin-manager/Cargo.toml
+++ b/geyser-plugin-manager/Cargo.toml
@@ -3,7 +3,7 @@ authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 edition = "2021"
 name = "solana-geyser-plugin-manager"
 description = "The Solana Geyser plugin manager."
-version = "1.10.4"
+version = "1.11.0"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
@@ -16,13 +16,13 @@ json5 = "0.4.1"
 libloading = "0.7.3"
 log = "0.4.11"
 serde_json = "1.0.79"
-solana-geyser-plugin-interface = { path = "../geyser-plugin-interface", version = "=1.10.4" }
-solana-measure = { path = "../measure", version = "=1.10.4" }
-solana-metrics = { path = "../metrics", version = "=1.10.4" }
-solana-rpc = { path = "../rpc", version = "=1.10.4" }
-solana-runtime = { path = "../runtime", version = "=1.10.4" }
-solana-sdk = { path = "../sdk", version = "=1.10.4" }
-solana-transaction-status = { path = "../transaction-status", version = "=1.10.4" }
+solana-geyser-plugin-interface = { path = "../geyser-plugin-interface", version = "=1.11.0" }
+solana-measure = { path = "../measure", version = "=1.11.0" }
+solana-metrics = { path = "../metrics", version = "=1.11.0" }
+solana-rpc = { path = "../rpc", version = "=1.11.0" }
+solana-runtime = { path = "../runtime", version = "=1.11.0" }
+solana-sdk = { path = "../sdk", version = "=1.11.0" }
+solana-transaction-status = { path = "../transaction-status", version = "=1.11.0" }
 thiserror = "1.0.30"

 [package.metadata.docs.rs]
--- a/gossip/Cargo.toml
+++ b/gossip/Cargo.toml
@@ -3,7 +3,7 @@ authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 edition = "2021"
 name = "solana-gossip"
 description = "Blockchain, Rebuilt for Scale"
-version = "1.10.4"
+version = "1.11.0"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
@@ -27,24 +27,24 @@ rayon = "1.5.1"
 serde = "1.0.136"
 serde_bytes = "0.11"
 serde_derive = "1.0.103"
-solana-bloom = { path = "../bloom", version = "=1.10.4" }
-solana-clap-utils = { path = "../clap-utils", version = "=1.10.4" }
-solana-client = { path = "../client", version = "=1.10.4" }
-solana-entry = { path = "../entry", version = "=1.10.4" }
-solana-frozen-abi = { path = "../frozen-abi", version = "=1.10.4" }
-solana-frozen-abi-macro = { path = "../frozen-abi/macro", version = "=1.10.4" }
-solana-ledger = { path = "../ledger", version = "=1.10.4" }
-solana-logger = { path = "../logger", version = "=1.10.4" }
-solana-measure = { path = "../measure", version = "=1.10.4" }
-solana-metrics = { path = "../metrics", version = "=1.10.4" }
-solana-net-utils = { path = "../net-utils", version = "=1.10.4" }
-solana-perf = { path = "../perf", version = "=1.10.4" }
-solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "=1.10.4" }
-solana-runtime = { path = "../runtime", version = "=1.10.4" }
-solana-sdk = { path = "../sdk", version = "=1.10.4" }
-solana-streamer = { path = "../streamer", version = "=1.10.4" }
-solana-version = { path = "../version", version = "=1.10.4" }
-solana-vote-program = { path = "../programs/vote", version = "=1.10.4" }
+solana-bloom = { path = "../bloom", version = "=1.11.0" }
+solana-clap-utils = { path = "../clap-utils", version = "=1.11.0" }
+solana-client = { path = "../client", version = "=1.11.0" }
+solana-entry = { path = "../entry", version = "=1.11.0" }
+solana-frozen-abi = { path = "../frozen-abi", version = "=1.11.0" }
+solana-frozen-abi-macro = { path = "../frozen-abi/macro", version = "=1.11.0" }
+solana-ledger = { path = "../ledger", version = "=1.11.0" }
+solana-logger = { path = "../logger", version = "=1.11.0" }
+solana-measure = { path = "../measure", version = "=1.11.0" }
+solana-metrics = { path = "../metrics", version = "=1.11.0" }
+solana-net-utils = { path = "../net-utils", version = "=1.11.0" }
+solana-perf = { path = "../perf", version = "=1.11.0" }
+solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "=1.11.0" }
+solana-runtime = { path = "../runtime", version = "=1.11.0" }
+solana-sdk = { path = "../sdk", version = "=1.11.0" }
+solana-streamer = { path = "../streamer", version = "=1.11.0" }
+solana-version = { path = "../version", version = "=1.11.0" }
+solana-vote-program = { path = "../programs/vote", version = "=1.11.0" }
 thiserror = "1.0"

 [dev-dependencies]
--- a/install/Cargo.toml
+++ b/install/Cargo.toml
@@ -3,7 +3,7 @@ authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 edition = "2021"
 name = "solana-install"
 description = "The solana cluster software installer"
-version = "1.10.4"
+version = "1.11.0"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
@@ -26,12 +26,12 @@ reqwest = { version = "0.11.10", default-features = false, features = ["blocking
 semver = "1.0.6"
 serde = { version = "1.0.136", features = ["derive"] }
 serde_yaml = "0.8.23"
-solana-clap-utils = { path = "../clap-utils", version = "=1.10.4" }
-solana-client = { path = "../client", version = "=1.10.4" }
-solana-config-program = { path = "../programs/config", version = "=1.10.4" }
-solana-logger = { path = "../logger", version = "=1.10.4" }
-solana-sdk = { path = "../sdk", version = "=1.10.4" }
-solana-version = { path = "../version", version = "=1.10.4" }
+solana-clap-utils = { path = "../clap-utils", version = "=1.11.0" }
+solana-client = { path = "../client", version = "=1.11.0" }
+solana-config-program = { path = "../programs/config", version = "=1.11.0" }
+solana-logger = { path = "../logger", version = "=1.11.0" }
+solana-sdk = { path = "../sdk", version = "=1.11.0" }
+solana-version = { path = "../version", version = "=1.11.0" }
 tar = "0.4.38"
 tempfile = "3.3.0"
 url = "2.2.2"
--- a/keygen/Cargo.toml
+++ b/keygen/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "solana-keygen"
-version = "1.10.4"
+version = "1.11.0"
 description = "Solana key generation utility"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -14,11 +14,11 @@ bs58 = "0.4.0"
 clap = "2.33"
 dirs-next = "2.0.0"
 num_cpus = "1.13.1"
-solana-clap-utils = { path = "../clap-utils", version = "=1.10.4" }
-solana-cli-config = { path = "../cli-config", version = "=1.10.4" }
-solana-remote-wallet = { path = "../remote-wallet", version = "=1.10.4" }
-solana-sdk = { path = "../sdk", version = "=1.10.4" }
-solana-version = { path = "../version", version = "=1.10.4" }
+solana-clap-utils = { path = "../clap-utils", version = "=1.11.0" }
+solana-cli-config = { path = "../cli-config", version = "=1.11.0" }
+solana-remote-wallet = { path = "../remote-wallet", version = "=1.11.0" }
+solana-sdk = { path = "../sdk", version = "=1.11.0" }
+solana-version = { path = "../version", version = "=1.11.0" }
 tiny-bip39 = "0.8.2"

 [[bin]]
--- a/ledger-tool/Cargo.toml
+++ b/ledger-tool/Cargo.toml
@@ -3,7 +3,7 @@ authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 edition = "2021"
 name = "solana-ledger-tool"
 description = "Blockchain, Rebuilt for Scale"
-version = "1.10.4"
+version = "1.11.0"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
@@ -21,20 +21,20 @@ log = { version = "0.4.14" }
 regex = "1"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0.79"
-solana-clap-utils = { path = "../clap-utils", version = "=1.10.4" }
-solana-cli-output = { path = "../cli-output", version = "=1.10.4" }
-solana-core = { path = "../core", version = "=1.10.4" }
-solana-entry = { path = "../entry", version = "=1.10.4" }
-solana-ledger = { path = "../ledger", version = "=1.10.4" }
-solana-logger = { path = "../logger", version = "=1.10.4" }
-solana-measure = { path = "../measure", version = "=1.10.4" }
-solana-runtime = { path = "../runtime", version = "=1.10.4" }
-solana-sdk = { path = "../sdk", version = "=1.10.4" }
-solana-stake-program = { path = "../programs/stake", version = "=1.10.4" }
-solana-storage-bigtable = { path = "../storage-bigtable", version = "=1.10.4" }
-solana-transaction-status = { path = "../transaction-status", version = "=1.10.4" }
-solana-version = { path = "../version", version = "=1.10.4" }
-solana-vote-program = { path = "../programs/vote", version = "=1.10.4" }
+solana-clap-utils = { path = "../clap-utils", version = "=1.11.0" }
+solana-cli-output = { path = "../cli-output", version = "=1.11.0" }
+solana-core = { path = "../core", version = "=1.11.0" }
+solana-entry = { path = "../entry", version = "=1.11.0" }
+solana-ledger = { path = "../ledger", version = "=1.11.0" }
+solana-logger = { path = "../logger", version = "=1.11.0" }
+solana-measure = { path = "../measure", version = "=1.11.0" }
+solana-runtime = { path = "../runtime", version = "=1.11.0" }
+solana-sdk = { path = "../sdk", version = "=1.11.0" }
+solana-stake-program = { path = "../programs/stake", version = "=1.11.0" }
+solana-storage-bigtable = { path = "../storage-bigtable", version = "=1.11.0" }
+solana-transaction-status = { path = "../transaction-status", version = "=1.11.0" }
+solana-version = { path = "../version", version = "=1.11.0" }
+solana-vote-program = { path = "../programs/vote", version = "=1.11.0" }
 tokio = { version = "1", features = ["full"] }

 [target.'cfg(not(target_env = "msvc"))'.dependencies]
--- a/ledger-tool/src/bigtable.rs
+++ b/ledger-tool/src/bigtable.rs
@@ -34,8 +34,9 @@ async fn upload(
    starting_slot: Slot,
    ending_slot: Option<Slot>,
    force_reupload: bool,
+    config: solana_storage_bigtable::LedgerStorageConfig,
 ) -> Result<(), Box<dyn std::error::Error>> {
-    let bigtable = solana_storage_bigtable::LedgerStorage::new(false, None, None)
+    let bigtable = solana_storage_bigtable::LedgerStorage::new_with_config(config)
        .await
        .map_err(|err| format!("Failed to connect to storage: {:?}", err))?;

@@ -50,17 +51,22 @@ async fn upload(
    .await
 }

-async fn delete_slots(slots: Vec<Slot>, dry_run: bool) -> Result<(), Box<dyn std::error::Error>> {
-    let read_only = dry_run;
-    let bigtable = solana_storage_bigtable::LedgerStorage::new(read_only, None, None)
+async fn delete_slots(
+    slots: Vec<Slot>,
+    config: solana_storage_bigtable::LedgerStorageConfig,
+) -> Result<(), Box<dyn std::error::Error>> {
+    let dry_run = config.read_only;
+    let bigtable = solana_storage_bigtable::LedgerStorage::new_with_config(config)
        .await
        .map_err(|err| format!("Failed to connect to storage: {:?}", err))?;

    solana_ledger::bigtable_delete::delete_confirmed_blocks(bigtable, slots, dry_run).await
 }

-async fn first_available_block() -> Result<(), Box<dyn std::error::Error>> {
-    let bigtable = solana_storage_bigtable::LedgerStorage::new(true, None, None).await?;
+async fn first_available_block(
+    config: solana_storage_bigtable::LedgerStorageConfig,
+) -> Result<(), Box<dyn std::error::Error>> {
+    let bigtable = solana_storage_bigtable::LedgerStorage::new_with_config(config).await?;
    match bigtable.get_first_available_block().await? {
        Some(block) => println!("{}", block),
        None => println!("No blocks available"),
@@ -69,8 +75,12 @@ async fn first_available_block() -> Result<(), Box<dyn std::error::Error>> {
    Ok(())
 }

-async fn block(slot: Slot, output_format: OutputFormat) -> Result<(), Box<dyn std::error::Error>> {
-    let bigtable = solana_storage_bigtable::LedgerStorage::new(false, None, None)
+async fn block(
+    slot: Slot,
+    output_format: OutputFormat,
+    config: solana_storage_bigtable::LedgerStorageConfig,
+) -> Result<(), Box<dyn std::error::Error>> {
+    let bigtable = solana_storage_bigtable::LedgerStorage::new_with_config(config)
        .await
        .map_err(|err| format!("Failed to connect to storage: {:?}", err))?;

@@ -101,8 +111,12 @@ async fn block(slot: Slot, output_format: OutputFormat) -> Result<(), Box<dyn st
    Ok(())
 }

-async fn blocks(starting_slot: Slot, limit: usize) -> Result<(), Box<dyn std::error::Error>> {
-    let bigtable = solana_storage_bigtable::LedgerStorage::new(false, None, None)
+async fn blocks(
+    starting_slot: Slot,
+    limit: usize,
+    config: solana_storage_bigtable::LedgerStorageConfig,
+) -> Result<(), Box<dyn std::error::Error>> {
+    let bigtable = solana_storage_bigtable::LedgerStorage::new_with_config(config)
        .await
        .map_err(|err| format!("Failed to connect to storage: {:?}", err))?;

@@ -116,11 +130,10 @@ async fn blocks(starting_slot: Slot, limit: usize) -> Result<(), Box<dyn std::er
 async fn compare_blocks(
    starting_slot: Slot,
    limit: usize,
-    credential_path: String,
+    config: solana_storage_bigtable::LedgerStorageConfig,
+    ref_config: solana_storage_bigtable::LedgerStorageConfig,
 ) -> Result<(), Box<dyn std::error::Error>> {
-    assert!(!credential_path.is_empty());
-
-    let owned_bigtable = solana_storage_bigtable::LedgerStorage::new(false, None, None)
+    let owned_bigtable = solana_storage_bigtable::LedgerStorage::new_with_config(config)
        .await
        .map_err(|err| format!("failed to connect to owned bigtable: {:?}", err))?;
    let owned_bigtable_slots = owned_bigtable
@@ -130,10 +143,9 @@ async fn compare_blocks(
        "owned bigtable {} blocks found ",
        owned_bigtable_slots.len()
    );
-    let reference_bigtable =
-        solana_storage_bigtable::LedgerStorage::new(false, None, Some(credential_path))
-            .await
-            .map_err(|err| format!("failed to connect to reference bigtable: {:?}", err))?;
+    let reference_bigtable = solana_storage_bigtable::LedgerStorage::new_with_config(ref_config)
+        .await
+        .map_err(|err| format!("failed to connect to reference bigtable: {:?}", err))?;

    let reference_bigtable_slots = reference_bigtable
        .get_confirmed_blocks(starting_slot, limit)
@@ -160,8 +172,9 @@ async fn confirm(
    signature: &Signature,
    verbose: bool,
    output_format: OutputFormat,
+    config: solana_storage_bigtable::LedgerStorageConfig,
 ) -> Result<(), Box<dyn std::error::Error>> {
-    let bigtable = solana_storage_bigtable::LedgerStorage::new(false, None, None)
+    let bigtable = solana_storage_bigtable::LedgerStorage::new_with_config(config)
        .await
        .map_err(|err| format!("Failed to connect to storage: {:?}", err))?;

@@ -211,8 +224,9 @@ pub async fn transaction_history(
    verbose: bool,
    show_transactions: bool,
    query_chunk_size: usize,
+    config: solana_storage_bigtable::LedgerStorageConfig,
 ) -> Result<(), Box<dyn std::error::Error>> {
-    let bigtable = solana_storage_bigtable::LedgerStorage::new(true, None, None).await?;
+    let bigtable = solana_storage_bigtable::LedgerStorage::new_with_config(config).await?;

    let mut loaded_block: Option<(Slot, ConfirmedBlock)> = None;
    while limit > 0 {
@@ -308,6 +322,15 @@ impl BigTableSubCommand for App<'_, '_> {
                .about("Ledger data on a BigTable instance")
                .setting(AppSettings::InferSubcommands)
                .setting(AppSettings::SubcommandRequiredElseHelp)
+                .arg(
+                    Arg::with_name("rpc_bigtable_instance_name")
+                        .global(true)
+                        .long("rpc-bigtable-instance-name")
+                        .takes_value(true)
+                        .value_name("INSTANCE_NAME")
+                        .default_value(solana_storage_bigtable::DEFAULT_INSTANCE_NAME)
+                        .help("Name of the target Bigtable instance")
+                )
                .subcommand(
                    SubCommand::with_name("upload")
                        .about("Upload the ledger to BigTable")
@@ -417,7 +440,8 @@ impl BigTableSubCommand for App<'_, '_> {
                                .required(true)
                                .default_value("1000")
                                .help("Maximum number of slots to check"),
-                        ).arg(
+                        )
+                        .arg(
                            Arg::with_name("reference_credential")
                                .long("reference-credential")
                                .short("c")
@@ -425,6 +449,14 @@ impl BigTableSubCommand for App<'_, '_> {
                                .takes_value(true)
                                .required(true)
                                .help("File path for a credential to a reference bigtable"),
+                        )
+                        .arg(
+                            Arg::with_name("reference_instance_name")
+                                .long("reference-instance-name")
+                                .takes_value(true)
+                                .value_name("INSTANCE_NAME")
+                                .default_value(solana_storage_bigtable::DEFAULT_INSTANCE_NAME)
+                                .help("Name of the reference Bigtable instance to compare to")
                        ),
                )
                .subcommand(
@@ -521,7 +553,28 @@ pub fn bigtable_process_command(ledger_path: &Path, matches: &ArgMatches<'_>) {
    let verbose = matches.is_present("verbose");
    let output_format = OutputFormat::from_matches(matches, "output_format", verbose);

-    let future = match matches.subcommand() {
+    // this is kinda stupid, but there seems to be a bug in clap when a subcommand
+    // arg is marked both `global(true)` and `default_value("default_value")`.
+    // despite the "global", when the arg is specified on the subcommand, its value
+    // is not propagated down to the (sub)subcommand args, resulting in the default
+    // value when queried there. similarly, if the arg is specified on the
+    // (sub)subcommand, the value is not propagated back up to the subcommand args,
+    // again resulting in the default value. the arg having declared a
+    // `default_value()` obviates `is_present(...)` tests since they will always
+    // return true. so we consede and compare against the expected default. :/
+    let (subcommand, sub_matches) = matches.subcommand();
+    let on_command = matches
+        .value_of("rpc_bigtable_instance_name")
+        .map(|v| v != solana_storage_bigtable::DEFAULT_INSTANCE_NAME)
+        .unwrap_or(false);
+    let instance_name = if on_command {
+        value_t_or_exit!(matches, "rpc_bigtable_instance_name", String)
+    } else {
+        let sub_matches = sub_matches.as_ref().unwrap();
+        value_t_or_exit!(sub_matches, "rpc_bigtable_instance_name", String)
+    };
+
+    let future = match (subcommand, sub_matches) {
        ("upload", Some(arg_matches)) => {
            let starting_slot = value_t!(arg_matches, "starting_slot", Slot).unwrap_or(0);
            let ending_slot = value_t!(arg_matches, "ending_slot", Slot).ok();
@@ -531,41 +584,79 @@ pub fn bigtable_process_command(ledger_path: &Path, matches: &ArgMatches<'_>) {
                AccessType::TryPrimaryThenSecondary,
                None,
            );
-
+            let config = solana_storage_bigtable::LedgerStorageConfig {
+                read_only: false,
+                instance_name,
+                ..solana_storage_bigtable::LedgerStorageConfig::default()
+            };
            runtime.block_on(upload(
                blockstore,
                starting_slot,
                ending_slot,
                force_reupload,
+                config,
            ))
        }
        ("delete-slots", Some(arg_matches)) => {
            let slots = values_t_or_exit!(arg_matches, "slots", Slot);
-            let dry_run = !arg_matches.is_present("force");
-            runtime.block_on(delete_slots(slots, dry_run))
+            let config = solana_storage_bigtable::LedgerStorageConfig {
+                read_only: !arg_matches.is_present("force"),
+                instance_name,
+                ..solana_storage_bigtable::LedgerStorageConfig::default()
+            };
+            runtime.block_on(delete_slots(slots, config))
+        }
+        ("first-available-block", Some(_arg_matches)) => {
+            let config = solana_storage_bigtable::LedgerStorageConfig {
+                read_only: true,
+                instance_name,
+                ..solana_storage_bigtable::LedgerStorageConfig::default()
+            };
+            runtime.block_on(first_available_block(config))
        }
-        ("first-available-block", Some(_arg_matches)) => runtime.block_on(first_available_block()),
        ("block", Some(arg_matches)) => {
            let slot = value_t_or_exit!(arg_matches, "slot", Slot);
-            runtime.block_on(block(slot, output_format))
+            let config = solana_storage_bigtable::LedgerStorageConfig {
+                read_only: false,
+                instance_name,
+                ..solana_storage_bigtable::LedgerStorageConfig::default()
+            };
+            runtime.block_on(block(slot, output_format, config))
        }
        ("blocks", Some(arg_matches)) => {
            let starting_slot = value_t_or_exit!(arg_matches, "starting_slot", Slot);
            let limit = value_t_or_exit!(arg_matches, "limit", usize);
+            let config = solana_storage_bigtable::LedgerStorageConfig {
+                read_only: false,
+                instance_name,
+                ..solana_storage_bigtable::LedgerStorageConfig::default()
+            };

-            runtime.block_on(blocks(starting_slot, limit))
+            runtime.block_on(blocks(starting_slot, limit, config))
        }
        ("compare-blocks", Some(arg_matches)) => {
            let starting_slot = value_t_or_exit!(arg_matches, "starting_slot", Slot);
            let limit = value_t_or_exit!(arg_matches, "limit", usize);
-            let reference_credential_filepath =
-                value_t_or_exit!(arg_matches, "reference_credential", String);
+            let config = solana_storage_bigtable::LedgerStorageConfig {
+                read_only: false,
+                instance_name,
+                ..solana_storage_bigtable::LedgerStorageConfig::default()
+            };
+            let credential_path = Some(value_t_or_exit!(
+                arg_matches,
+                "reference_credential",
+                String
+            ));
+            let ref_instance_name =
+                value_t_or_exit!(arg_matches, "reference_instance_name", String);
+            let ref_config = solana_storage_bigtable::LedgerStorageConfig {
+                read_only: false,
+                credential_path,
+                instance_name: ref_instance_name,
+                ..solana_storage_bigtable::LedgerStorageConfig::default()
+            };

-            runtime.block_on(compare_blocks(
-                starting_slot,
-                limit,
-                reference_credential_filepath,
-            ))
+            runtime.block_on(compare_blocks(starting_slot, limit, config, ref_config))
        }
        ("confirm", Some(arg_matches)) => {
            let signature = arg_matches
@@ -573,8 +664,13 @@ pub fn bigtable_process_command(ledger_path: &Path, matches: &ArgMatches<'_>) {
                .unwrap()
                .parse()
                .expect("Invalid signature");
+            let config = solana_storage_bigtable::LedgerStorageConfig {
+                read_only: false,
+                instance_name,
+                ..solana_storage_bigtable::LedgerStorageConfig::default()
+            };

-            runtime.block_on(confirm(&signature, verbose, output_format))
+            runtime.block_on(confirm(&signature, verbose, output_format, config))
        }
        ("transaction-history", Some(arg_matches)) => {
            let address = pubkey_of(arg_matches, "address").unwrap();
@@ -587,6 +683,11 @@ pub fn bigtable_process_command(ledger_path: &Path, matches: &ArgMatches<'_>) {
                .value_of("until")
                .map(|signature| signature.parse().expect("Invalid signature"));
            let show_transactions = arg_matches.is_present("show_transactions");
+            let config = solana_storage_bigtable::LedgerStorageConfig {
+                read_only: true,
+                instance_name,
+                ..solana_storage_bigtable::LedgerStorageConfig::default()
+            };

            runtime.block_on(transaction_history(
                &address,
@@ -596,6 +697,7 @@ pub fn bigtable_process_command(ledger_path: &Path, matches: &ArgMatches<'_>) {
                verbose,
                show_transactions,
                query_chunk_size,
+                config,
            ))
        }
        _ => unreachable!(),
--- a/ledger-tool/src/main.rs
+++ b/ledger-tool/src/main.rs
@@ -326,6 +326,26 @@ fn output_ledger(
    }
 }

+fn output_account(
+    pubkey: &Pubkey,
+    account: &AccountSharedData,
+    modified_slot: Option<Slot>,
+    print_account_data: bool,
+) {
+    println!("{}", pubkey);
+    println!("  balance: {} SOL", lamports_to_sol(account.lamports()));
+    println!("  owner: '{}'", account.owner());
+    println!("  executable: {}", account.executable());
+    if let Some(slot) = modified_slot {
+        println!("  slot: {}", slot);
+    }
+    println!("  rent_epoch: {}", account.rent_epoch());
+    println!("  data_len: {}", account.data().len());
+    if print_account_data {
+        println!("  data: '{}'", bs58::encode(account.data()).into_string());
+    }
+}
+
 fn render_dot(dot: String, output_file: &str, output_format: &str) -> io::Result<()> {
    let mut child = Command::new("dot")
        .arg(format!("-T{}", output_format))
@@ -1162,6 +1182,24 @@ fn main() {
            SubCommand::with_name("genesis")
            .about("Prints the ledger's genesis config")
            .arg(&max_genesis_archive_unpacked_size_arg)
+            .arg(
+                Arg::with_name("accounts")
+                    .long("accounts")
+                    .takes_value(false)
+                    .help("Print the ledger's genesis accounts"),
+            )
+            .arg(
+                Arg::with_name("no_account_data")
+                    .long("no-account-data")
+                    .takes_value(false)
+                    .requires("accounts")
+                    .help("Do not print account data when printing account contents."),
+            )
+        )
+        .subcommand(
+            SubCommand::with_name("genesis-hash")
+            .about("Prints the ledger's genesis hash")
+            .arg(&max_genesis_archive_unpacked_size_arg)
        )
        .subcommand(
            SubCommand::with_name("parse_full_frozen")
@@ -1177,11 +1215,6 @@ fn main() {
                    .help("path to log file to parse"),
            )
        )
-        .subcommand(
-            SubCommand::with_name("genesis-hash")
-            .about("Prints the ledger's genesis hash")
-            .arg(&max_genesis_archive_unpacked_size_arg)
-        )
        .subcommand(
            SubCommand::with_name("modify-genesis")
            .about("Modifies genesis parameters")
@@ -1457,11 +1490,10 @@ fn main() {
                    .takes_value(false)
                    .help("Do not print contents of each account, which is very slow with lots of accounts."),
            )
-            .arg(
-                Arg::with_name("no_account_data")
-                    .long("no-account-data")
-                    .takes_value(false)
-                    .help("Do not print account data when printing account contents."),
+            .arg(Arg::with_name("no_account_data")
+                .long("no-account-data")
+                .takes_value(false)
+                .help("Do not print account data when printing account contents."),
            )
            .arg(&max_genesis_archive_unpacked_size_arg)
        ).subcommand(
@@ -1690,7 +1722,21 @@ fn main() {
                }
            }
            ("genesis", Some(arg_matches)) => {
-                println!("{}", open_genesis_config_by(&ledger_path, arg_matches));
+                let genesis_config = open_genesis_config_by(&ledger_path, arg_matches);
+                let print_accouunts = arg_matches.is_present("accounts");
+                if print_accouunts {
+                    let print_account_data = !arg_matches.is_present("no_account_data");
+                    for (pubkey, account) in genesis_config.accounts {
+                        output_account(
+                            &pubkey,
+                            &AccountSharedData::from(account),
+                            None,
+                            print_account_data,
+                        );
+                    }
+                } else {
+                    println!("{}", genesis_config);
+                }
            }
            ("genesis-hash", Some(arg_matches)) => {
                println!(
@@ -2560,17 +2606,7 @@ fn main() {
                    let print_account_data = !arg_matches.is_present("no_account_data");
                    let mut measure = Measure::start("printing account contents");
                    for (pubkey, (account, slot)) in accounts.into_iter() {
-                        let data_len = account.data().len();
-                        println!("{}:", pubkey);
-                        println!("  - balance: {} SOL", lamports_to_sol(account.lamports()));
-                        println!("  - owner: '{}'", account.owner());
-                        println!("  - executable: {}", account.executable());
-                        println!("  - slot: {}", slot);
-                        println!("  - rent_epoch: {}", account.rent_epoch());
-                        if print_account_data {
-                            println!("  - data: '{}'", bs58::encode(account.data()).into_string());
-                        }
-                        println!("  - data_len: {}", data_len);
+                        output_account(&pubkey, &account, Some(slot), print_account_data);
                    }
                    measure.stop();
                    info!("{}", measure);
--- a/ledger/Cargo.toml
+++ b/ledger/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "solana-ledger"
-version = "1.10.4"
+version = "1.11.0"
 description = "Solana ledger"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -11,6 +11,7 @@ edition = "2021"

 [dependencies]
 bincode = "1.3.3"
+bitflags = "1.3.1"
 byteorder = "1.4.3"
 chrono = { version = "0.4.11", features = ["serde"] }
 chrono-humanize = "0.2.1"
@@ -21,6 +22,7 @@ itertools = "0.10.3"
 lazy_static = "1.4.0"
 libc = "0.2.120"
 log = { version = "0.4.14" }
+lru = "0.7.3"
 num-derive = "0.3"
 num-traits = "0.2"
 num_cpus = "1.13.1"
@@ -32,21 +34,21 @@ reed-solomon-erasure = { version = "5.0.1", features = ["simd-accel"] }
 serde = "1.0.136"
 serde_bytes = "0.11.5"
 sha2 = "0.10.2"
-solana-bpf-loader-program = { path = "../programs/bpf_loader", version = "=1.10.4" }
-solana-entry = { path = "../entry", version = "=1.10.4" }
-solana-frozen-abi = { path = "../frozen-abi", version = "=1.10.4" }
-solana-frozen-abi-macro = { path = "../frozen-abi/macro", version = "=1.10.4" }
-solana-measure = { path = "../measure", version = "=1.10.4" }
-solana-metrics = { path = "../metrics", version = "=1.10.4" }
-solana-perf = { path = "../perf", version = "=1.10.4" }
-solana-program-runtime = { path = "../program-runtime", version = "=1.10.4" }
-solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "=1.10.4" }
-solana-runtime = { path = "../runtime", version = "=1.10.4" }
-solana-sdk = { path = "../sdk", version = "=1.10.4" }
-solana-storage-bigtable = { path = "../storage-bigtable", version = "=1.10.4" }
-solana-storage-proto = { path = "../storage-proto", version = "=1.10.4" }
-solana-transaction-status = { path = "../transaction-status", version = "=1.10.4" }
-solana-vote-program = { path = "../programs/vote", version = "=1.10.4" }
+solana-bpf-loader-program = { path = "../programs/bpf_loader", version = "=1.11.0" }
+solana-entry = { path = "../entry", version = "=1.11.0" }
+solana-frozen-abi = { path = "../frozen-abi", version = "=1.11.0" }
+solana-frozen-abi-macro = { path = "../frozen-abi/macro", version = "=1.11.0" }
+solana-measure = { path = "../measure", version = "=1.11.0" }
+solana-metrics = { path = "../metrics", version = "=1.11.0" }
+solana-perf = { path = "../perf", version = "=1.11.0" }
+solana-program-runtime = { path = "../program-runtime", version = "=1.11.0" }
+solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "=1.11.0" }
+solana-runtime = { path = "../runtime", version = "=1.11.0" }
+solana-sdk = { path = "../sdk", version = "=1.11.0" }
+solana-storage-bigtable = { path = "../storage-bigtable", version = "=1.11.0" }
+solana-storage-proto = { path = "../storage-proto", version = "=1.11.0" }
+solana-transaction-status = { path = "../transaction-status", version = "=1.11.0" }
+solana-vote-program = { path = "../programs/vote", version = "=1.11.0" }
 tempfile = "3.3.0"
 thiserror = "1.0"
 tokio = { version = "1", features = ["full"] }
@@ -63,8 +65,8 @@ features = ["lz4"]
 [dev-dependencies]
 assert_matches = "1.5.0"
 matches = "0.1.9"
-solana-account-decoder = { path = "../account-decoder", version = "=1.10.4" }
-solana-logger = { path = "../logger", version = "=1.10.4" }
+solana-account-decoder = { path = "../account-decoder", version = "=1.11.0" }
+solana-logger = { path = "../logger", version = "=1.11.0" }

 [build-dependencies]
 rustc_version = "0.4"
--- a/ledger/src/blockstore.rs
+++ b/ledger/src/blockstore.rs
@@ -5,9 +5,8 @@ use {
    crate::{
        ancestor_iterator::AncestorIterator,
        blockstore_db::{
-            columns as cf, AccessType, BlockstoreOptions, Column, ColumnName, Database,
-            IteratorDirection, IteratorMode, LedgerColumn, LedgerColumnOptions, Result,
-            ShredStorageType, WriteBatch,
+            columns as cf, AccessType, BlockstoreOptions, Column, Database, IteratorDirection,
+            IteratorMode, LedgerColumn, LedgerColumnOptions, Result, ShredStorageType, WriteBatch,
        },
        blockstore_meta::*,
        leader_schedule_cache::LeaderScheduleCache,
@@ -16,6 +15,7 @@ use {
            max_ticks_per_n_shreds, ErasureSetId, Result as ShredResult, Shred, ShredId, ShredType,
            Shredder, SHRED_PAYLOAD_SIZE,
        },
+        slot_stats::{ShredSource, SlotsStats},
    },
    bincode::deserialize,
    crossbeam_channel::{bounded, Receiver, Sender, TrySendError},
@@ -50,7 +50,7 @@ use {
        borrow::Cow,
        cell::RefCell,
        cmp,
-        collections::{hash_map::Entry as HashMapEntry, BTreeMap, BTreeSet, HashMap, HashSet},
+        collections::{hash_map::Entry as HashMapEntry, BTreeSet, HashMap, HashSet},
        convert::TryInto,
        fs,
        io::{Error as IoError, ErrorKind},
@@ -60,7 +60,6 @@ use {
            atomic::{AtomicBool, Ordering},
            Arc, Mutex, RwLock, RwLockWriteGuard,
        },
-        time::Instant,
    },
    tempfile::{Builder, TempDir},
    thiserror::Error,
@@ -75,7 +74,6 @@ pub mod blockstore_purge;

 pub const BLOCKSTORE_DIRECTORY_ROCKS_LEVEL: &str = "rocksdb";
 pub const BLOCKSTORE_DIRECTORY_ROCKS_FIFO: &str = "rocksdb_fifo";
-pub const BLOCKSTORE_METRICS_ERROR: i64 = -1;

 thread_local!(static PAR_THREAD_POOL: RefCell<ThreadPool> = RefCell::new(rayon::ThreadPoolBuilder::new()
                    .num_threads(get_thread_count())
@@ -178,27 +176,6 @@ pub struct Blockstore {
    pub lowest_cleanup_slot: RwLock<Slot>,
    no_compaction: bool,
    slots_stats: Mutex<SlotsStats>,
-    column_options: LedgerColumnOptions,
-}
-
-struct SlotsStats {
-    last_cleanup_ts: Instant,
-    stats: BTreeMap<Slot, SlotStats>,
-}
-
-impl Default for SlotsStats {
-    fn default() -> Self {
-        SlotsStats {
-            last_cleanup_ts: Instant::now(),
-            stats: BTreeMap::new(),
-        }
-    }
-}
-
-#[derive(Default)]
-struct SlotStats {
-    num_repaired: usize,
-    num_recovered: usize,
 }

 pub struct IndexMetaWorkingSetEntry {
@@ -223,13 +200,6 @@ pub struct SlotMetaWorkingSetEntry {
    did_insert_occur: bool,
 }

-#[derive(PartialEq, Debug, Clone)]
-enum ShredSource {
-    Turbine,
-    Repaired,
-    Recovered,
-}
-
 #[derive(Default)]
 pub struct BlockstoreInsertionMetrics {
    pub num_shreds: usize,
@@ -258,101 +228,6 @@ pub struct BlockstoreInsertionMetrics {
    num_coding_shreds_inserted: usize,
 }

-#[derive(Default)]
-/// A metrics struct that exposes RocksDB's column family properties.
-///
-/// Here we only expose a subset of all the internal properties which are
-/// relevant to the ledger store performance.
-///
-/// The list of completed RocksDB internal properties can be found
-/// [here](https://github.com/facebook/rocksdb/blob/08809f5e6cd9cc4bc3958dd4d59457ae78c76660/include/rocksdb/db.h#L654-L689).
-pub struct BlockstoreRocksDbColumnFamilyMetrics {
-    // Size related
-
-    // The storage size occupied by the column family.
-    // RocksDB's internal property key: "rocksdb.total-sst-files-size"
-    pub total_sst_files_size: i64,
-    // The memory size occupied by the column family's in-memory buffer.
-    // RocksDB's internal property key: "rocksdb.size-all-mem-tables"
-    pub size_all_mem_tables: i64,
-
-    // Snapshot related
-
-    // Number of snapshots hold for the column family.
-    // RocksDB's internal property key: "rocksdb.num-snapshots"
-    pub num_snapshots: i64,
-    // Unit timestamp of the oldest unreleased snapshot.
-    // RocksDB's internal property key: "rocksdb.oldest-snapshot-time"
-    pub oldest_snapshot_time: i64,
-
-    // Write related
-
-    // The current actual delayed write rate. 0 means no delay.
-    // RocksDB's internal property key: "rocksdb.actual-delayed-write-rate"
-    pub actual_delayed_write_rate: i64,
-    // A flag indicating whether writes are stopped on this column family.
-    // 1 indicates writes have been stopped.
-    // RocksDB's internal property key: "rocksdb.is-write-stopped"
-    pub is_write_stopped: i64,
-
-    // Memory / block cache related
-
-    // The block cache capacity of the column family.
-    // RocksDB's internal property key: "rocksdb.block-cache-capacity"
-    pub block_cache_capacity: i64,
-    // The memory size used by the column family in the block cache.
-    // RocksDB's internal property key: "rocksdb.block-cache-usage"
-    pub block_cache_usage: i64,
-    // The memory size used by the column family in the block cache where
-    // entries are pinned.
-    // RocksDB's internal property key: "rocksdb.block-cache-pinned-usage"
-    pub block_cache_pinned_usage: i64,
-
-    // The estimated memory size used for reading SST tables in this column
-    // family such as filters and index blocks. Note that this number does not
-    // include the memory used in block cache.
-    // RocksDB's internal property key: "rocksdb.estimate-table-readers-mem"
-    pub estimate_table_readers_mem: i64,
-
-    // Flush and compaction
-
-    // A 1 or 0 flag indicating whether a memtable flush is pending.
-    // If this number is 1, it means a memtable is waiting for being flushed,
-    // but there might be too many L0 files that prevents it from being flushed.
-    // RocksDB's internal property key: "rocksdb.mem-table-flush-pending"
-    pub mem_table_flush_pending: i64,
-
-    // A 1 or 0 flag indicating whether a compaction job is pending.
-    // If this number is 1, it means some part of the column family requires
-    // compaction in order to maintain shape of LSM tree, but the compaction
-    // is pending because the desired compaction job is either waiting for
-    // other dependnent compactions to be finished or waiting for an available
-    // compaction thread.
-    // RocksDB's internal property key: "rocksdb.compaction-pending"
-    pub compaction_pending: i64,
-
-    // The number of compactions that are currently running for the column family.
-    // RocksDB's internal property key: "rocksdb.num-running-compactions"
-    pub num_running_compactions: i64,
-
-    // The number of flushes that are currently running for the column family.
-    // RocksDB's internal property key: "rocksdb.num-running-flushes"
-    pub num_running_flushes: i64,
-
-    // FIFO Compaction related
-
-    // returns an estimation of the oldest key timestamp in the DB. Only vailable
-    // for FIFO compaction with compaction_options_fifo.allow_compaction = false.
-    // RocksDB's internal property key: "rocksdb.estimate-oldest-key-time"
-    pub estimate_oldest_key_time: i64,
-
-    // Misc
-
-    // The accumulated number of RocksDB background errors.
-    // RocksDB's internal property key: "rocksdb.background-errors"
-    pub background_errors: i64,
-}
-
 impl SlotMetaWorkingSetEntry {
    /// Construct a new SlotMetaWorkingSetEntry with the specified `new_slot_meta`
    /// and `old_slot_meta`.  `did_insert_occur` is set to false.
@@ -448,97 +323,6 @@ impl BlockstoreInsertionMetrics {
    }
 }

-impl BlockstoreRocksDbColumnFamilyMetrics {
-    /// Report metrics with the specified metric name and column family tag.
-    /// The metric name and the column family tag is embeded in the parameter
-    /// `metric_name_and_cf_tag` with the following format.
-    ///
-    /// For example, "blockstore_rocksdb_cfs,cf_name=shred_data".
-    pub fn report_metrics(&self, metric_name_and_cf_tag: &'static str) {
-        datapoint_info!(
-            metric_name_and_cf_tag,
-            // Size related
-            (
-                "total_sst_files_size",
-                self.total_sst_files_size as i64,
-                i64
-            ),
-            ("size_all_mem_tables", self.size_all_mem_tables as i64, i64),
-            // Snapshot related
-            ("num_snapshots", self.num_snapshots as i64, i64),
-            (
-                "oldest_snapshot_time",
-                self.oldest_snapshot_time as i64,
-                i64
-            ),
-            // Write related
-            (
-                "actual_delayed_write_rate",
-                self.actual_delayed_write_rate as i64,
-                i64
-            ),
-            ("is_write_stopped", self.is_write_stopped as i64, i64),
-            // Memory / block cache related
-            (
-                "block_cache_capacity",
-                self.block_cache_capacity as i64,
-                i64
-            ),
-            ("block_cache_usage", self.block_cache_usage as i64, i64),
-            (
-                "block_cache_pinned_usage",
-                self.block_cache_pinned_usage as i64,
-                i64
-            ),
-            (
-                "estimate_table_readers_mem",
-                self.estimate_table_readers_mem as i64,
-                i64
-            ),
-            // Flush and compaction
-            (
-                "mem_table_flush_pending",
-                self.mem_table_flush_pending as i64,
-                i64
-            ),
-            ("compaction_pending", self.compaction_pending as i64, i64),
-            (
-                "num_running_compactions",
-                self.num_running_compactions as i64,
-                i64
-            ),
-            ("num_running_flushes", self.num_running_flushes as i64, i64),
-            // FIFO Compaction related
-            (
-                "estimate_oldest_key_time",
-                self.estimate_oldest_key_time as i64,
-                i64
-            ),
-            // Misc
-            ("background_errors", self.background_errors as i64, i64),
-        );
-    }
-}
-
-macro_rules! rocksdb_metric_header {
-    ($metric_name:literal, $cf_name:literal, $column_options:expr) => {
-        match $column_options.shred_storage_type {
-            ShredStorageType::RocksLevel =>
-                rocksdb_metric_header!(@all_fields $metric_name, $cf_name, "rocks_level"),
-            ShredStorageType::RocksFifo(_) =>
-                rocksdb_metric_header!(@all_fields $metric_name, $cf_name, "rocks_fifo"),
-        }
-    };
-
-    (@all_fields $metric_name:literal, $cf_name:literal, $storage_type:literal) => {
-        concat!($metric_name,
-            ",cf_name=", $cf_name,
-            ",storage=", $storage_type,
-        )
-    };
-}
-use rocksdb_metric_header;
-
 impl Blockstore {
    pub fn db(self) -> Arc<Database> {
        self.db
@@ -571,7 +355,6 @@ impl Blockstore {
        let blockstore_path = ledger_path.join(Self::blockstore_directory(
            &options.column_options.shred_storage_type,
        ));
-        let column_options = options.column_options.clone();

        adjust_ulimit_nofile(options.enforce_ulimit_nofile)?;

@@ -664,7 +447,6 @@ impl Blockstore {
            lowest_cleanup_slot: RwLock::<Slot>::default(),
            no_compaction: false,
            slots_stats: Mutex::<SlotsStats>::default(),
-            column_options,
        };
        if initialize_transaction_status_index {
            blockstore.initialize_transaction_status_index()?;
@@ -961,162 +743,24 @@ impl Blockstore {
    /// Collects and reports [`BlockstoreRocksDbColumnFamilyMetrics`] for the
    /// all the column families.
    pub fn submit_rocksdb_cf_metrics_for_all_cfs(&self) {
-        let column_options = &self.column_options;
-        self.submit_rocksdb_cf_metrics::<cf::SlotMeta>(rocksdb_metric_header!(
-            "blockstore_rocksdb_cfs",
-            "slot_meta",
-            column_options
-        ));
-        self.submit_rocksdb_cf_metrics::<cf::DeadSlots>(rocksdb_metric_header!(
-            "blockstore_rocksdb_cfs",
-            "dead_slots",
-            column_options
-        ));
-        self.submit_rocksdb_cf_metrics::<cf::DuplicateSlots>(rocksdb_metric_header!(
-            "blockstore_rocksdb_cfs",
-            "duplicate_slots",
-            column_options
-        ));
-        self.submit_rocksdb_cf_metrics::<cf::ErasureMeta>(rocksdb_metric_header!(
-            "blockstore_rocksdb_cfs",
-            "erasure_meta",
-            column_options
-        ));
-        self.submit_rocksdb_cf_metrics::<cf::Orphans>(rocksdb_metric_header!(
-            "blockstore_rocksdb_cfs",
-            "orphans",
-            column_options
-        ));
-        self.submit_rocksdb_cf_metrics::<cf::BankHash>(rocksdb_metric_header!(
-            "blockstore_rocksdb_cfs",
-            "bank_hash",
-            column_options
-        ));
-        self.submit_rocksdb_cf_metrics::<cf::Root>(rocksdb_metric_header!(
-            "blockstore_rocksdb_cfs",
-            "root",
-            column_options
-        ));
-        self.submit_rocksdb_cf_metrics::<cf::Index>(rocksdb_metric_header!(
-            "blockstore_rocksdb_cfs",
-            "index",
-            column_options
-        ));
-        self.submit_rocksdb_cf_metrics::<cf::ShredData>(rocksdb_metric_header!(
-            "blockstore_rocksdb_cfs",
-            "shred_data",
-            column_options
-        ));
-        self.submit_rocksdb_cf_metrics::<cf::ShredCode>(rocksdb_metric_header!(
-            "blockstore_rocksdb_cfs",
-            "shred_code",
-            column_options
-        ));
-        self.submit_rocksdb_cf_metrics::<cf::TransactionStatus>(rocksdb_metric_header!(
-            "blockstore_rocksdb_cfs",
-            "transaction_status",
-            column_options
-        ));
-        self.submit_rocksdb_cf_metrics::<cf::AddressSignatures>(rocksdb_metric_header!(
-            "blockstore_rocksdb_cfs",
-            "address_signature",
-            column_options
-        ));
-        self.submit_rocksdb_cf_metrics::<cf::TransactionMemos>(rocksdb_metric_header!(
-            "blockstore_rocksdb_cfs",
-            "transaction_memos",
-            column_options
-        ));
-        self.submit_rocksdb_cf_metrics::<cf::TransactionStatusIndex>(rocksdb_metric_header!(
-            "blockstore_rocksdb_cfs",
-            "transaction_status_index",
-            column_options
-        ));
-        self.submit_rocksdb_cf_metrics::<cf::Rewards>(rocksdb_metric_header!(
-            "blockstore_rocksdb_cfs",
-            "rewards",
-            column_options
-        ));
-        self.submit_rocksdb_cf_metrics::<cf::Blocktime>(rocksdb_metric_header!(
-            "blockstore_rocksdb_cfs",
-            "blocktime",
-            column_options
-        ));
-        self.submit_rocksdb_cf_metrics::<cf::PerfSamples>(rocksdb_metric_header!(
-            "blockstore_rocksdb_cfs",
-            "perf_sample",
-            column_options
-        ));
-        self.submit_rocksdb_cf_metrics::<cf::BlockHeight>(rocksdb_metric_header!(
-            "blockstore_rocksdb_cfs",
-            "block_height",
-            column_options
-        ));
-        self.submit_rocksdb_cf_metrics::<cf::ProgramCosts>(rocksdb_metric_header!(
-            "blockstore_rocksdb_cfs",
-            "program_costs",
-            column_options
-        ));
-    }
-
-    /// Collects and reports [`BlockstoreRocksDbColumnFamilyMetrics`] for the
-    /// given column family.
-    fn submit_rocksdb_cf_metrics<C: 'static + Column + ColumnName>(
-        &self,
-        metric_name_and_cf_tag: &'static str,
-    ) {
-        let cf = self.db.column::<C>();
-        let cf_rocksdb_metrics = BlockstoreRocksDbColumnFamilyMetrics {
-            total_sst_files_size: cf
-                .get_int_property(RocksProperties::TOTAL_SST_FILES_SIZE)
-                .unwrap_or(BLOCKSTORE_METRICS_ERROR),
-            size_all_mem_tables: cf
-                .get_int_property(RocksProperties::SIZE_ALL_MEM_TABLES)
-                .unwrap_or(BLOCKSTORE_METRICS_ERROR),
-            num_snapshots: cf
-                .get_int_property(RocksProperties::NUM_SNAPSHOTS)
-                .unwrap_or(BLOCKSTORE_METRICS_ERROR),
-            oldest_snapshot_time: cf
-                .get_int_property(RocksProperties::OLDEST_SNAPSHOT_TIME)
-                .unwrap_or(BLOCKSTORE_METRICS_ERROR),
-            actual_delayed_write_rate: cf
-                .get_int_property(RocksProperties::ACTUAL_DELAYED_WRITE_RATE)
-                .unwrap_or(BLOCKSTORE_METRICS_ERROR),
-            is_write_stopped: cf
-                .get_int_property(RocksProperties::IS_WRITE_STOPPED)
-                .unwrap_or(BLOCKSTORE_METRICS_ERROR),
-            block_cache_capacity: cf
-                .get_int_property(RocksProperties::BLOCK_CACHE_CAPACITY)
-                .unwrap_or(BLOCKSTORE_METRICS_ERROR),
-            block_cache_usage: cf
-                .get_int_property(RocksProperties::BLOCK_CACHE_USAGE)
-                .unwrap_or(BLOCKSTORE_METRICS_ERROR),
-            block_cache_pinned_usage: cf
-                .get_int_property(RocksProperties::BLOCK_CACHE_PINNED_USAGE)
-                .unwrap_or(BLOCKSTORE_METRICS_ERROR),
-            estimate_table_readers_mem: cf
-                .get_int_property(RocksProperties::ESTIMATE_TABLE_READERS_MEM)
-                .unwrap_or(BLOCKSTORE_METRICS_ERROR),
-            mem_table_flush_pending: cf
-                .get_int_property(RocksProperties::MEM_TABLE_FLUSH_PENDING)
-                .unwrap_or(BLOCKSTORE_METRICS_ERROR),
-            compaction_pending: cf
-                .get_int_property(RocksProperties::COMPACTION_PENDING)
-                .unwrap_or(BLOCKSTORE_METRICS_ERROR),
-            num_running_compactions: cf
-                .get_int_property(RocksProperties::NUM_RUNNING_COMPACTIONS)
-                .unwrap_or(BLOCKSTORE_METRICS_ERROR),
-            num_running_flushes: cf
-                .get_int_property(RocksProperties::NUM_RUNNING_FLUSHES)
-                .unwrap_or(BLOCKSTORE_METRICS_ERROR),
-            estimate_oldest_key_time: cf
-                .get_int_property(RocksProperties::ESTIMATE_OLDEST_KEY_TIME)
-                .unwrap_or(BLOCKSTORE_METRICS_ERROR),
-            background_errors: cf
-                .get_int_property(RocksProperties::BACKGROUND_ERRORS)
-                .unwrap_or(BLOCKSTORE_METRICS_ERROR),
-        };
-        cf_rocksdb_metrics.report_metrics(metric_name_and_cf_tag);
+        self.meta_cf.submit_rocksdb_cf_metrics();
+        self.dead_slots_cf.submit_rocksdb_cf_metrics();
+        self.duplicate_slots_cf.submit_rocksdb_cf_metrics();
+        self.erasure_meta_cf.submit_rocksdb_cf_metrics();
+        self.orphans_cf.submit_rocksdb_cf_metrics();
+        self.index_cf.submit_rocksdb_cf_metrics();
+        self.data_shred_cf.submit_rocksdb_cf_metrics();
+        self.code_shred_cf.submit_rocksdb_cf_metrics();
+        self.transaction_status_cf.submit_rocksdb_cf_metrics();
+        self.address_signatures_cf.submit_rocksdb_cf_metrics();
+        self.transaction_memos_cf.submit_rocksdb_cf_metrics();
+        self.transaction_status_index_cf.submit_rocksdb_cf_metrics();
+        self.rewards_cf.submit_rocksdb_cf_metrics();
+        self.blocktime_cf.submit_rocksdb_cf_metrics();
+        self.perf_samples_cf.submit_rocksdb_cf_metrics();
+        self.block_height_cf.submit_rocksdb_cf_metrics();
+        self.program_costs_cf.submit_rocksdb_cf_metrics();
+        self.bank_hash_cf.submit_rocksdb_cf_metrics();
    }

    fn try_shred_recovery(
@@ -1250,13 +894,13 @@ impl Blockstore {
        let mut newly_completed_data_sets: Vec<CompletedDataSetInfo> = vec![];
        let mut inserted_indices = Vec::new();
        for (i, (shred, is_repaired)) in shreds.into_iter().zip(is_repaired).enumerate() {
+            let shred_source = if is_repaired {
+                ShredSource::Repaired
+            } else {
+                ShredSource::Turbine
+            };
            match shred.shred_type() {
                ShredType::Data => {
-                    let shred_source = if is_repaired {
-                        ShredSource::Repaired
-                    } else {
-                        ShredSource::Turbine
-                    };
                    match self.check_insert_data_shred(
                        shred,
                        &mut erasure_metas,
@@ -1295,7 +939,7 @@ impl Blockstore {
                        &mut index_meta_time,
                        handle_duplicate,
                        is_trusted,
-                        is_repaired,
+                        shred_source,
                        metrics,
                    );
                }
@@ -1481,7 +1125,7 @@ impl Blockstore {
        index_meta_time: &mut u64,
        handle_duplicate: &F,
        is_trusted: bool,
-        is_repaired: bool,
+        shred_source: ShredSource,
        metrics: &mut BlockstoreInsertionMetrics,
    ) -> bool
    where
@@ -1548,13 +1192,10 @@ impl Blockstore {

            return false;
        }
-
-        if is_repaired {
-            let mut slots_stats = self.slots_stats.lock().unwrap();
-            let mut e = slots_stats.stats.entry(slot).or_default();
-            e.num_repaired += 1;
-        }
-
+        self.slots_stats
+            .lock()
+            .unwrap()
+            .add_shred(slot, shred_source);
        // insert coding shred into rocks
        let result = self
            .insert_coding_shred(index_meta, &shred, write_batch)
@@ -1700,7 +1341,7 @@ impl Blockstore {
                just_inserted_shreds,
                &self.last_root,
                leader_schedule,
-                shred_source.clone(),
+                shred_source,
            ) {
                return Err(InsertDataShredError::InvalidShred);
            }
@@ -1972,49 +1613,12 @@ impl Blockstore {
            end_index,
        })
        .collect();
-        if shred_source == ShredSource::Repaired || shred_source == ShredSource::Recovered {
+        {
            let mut slots_stats = self.slots_stats.lock().unwrap();
-            let mut e = slots_stats.stats.entry(slot_meta.slot).or_default();
-            if shred_source == ShredSource::Repaired {
-                e.num_repaired += 1;
+            slots_stats.add_shred(slot_meta.slot, shred_source);
+            if slot_meta.is_full() {
+                slots_stats.set_full(slot_meta);
            }
-            if shred_source == ShredSource::Recovered {
-                e.num_recovered += 1;
-            }
-        }
-        if slot_meta.is_full() {
-            let (num_repaired, num_recovered) = {
-                let mut slots_stats = self.slots_stats.lock().unwrap();
-                if let Some(e) = slots_stats.stats.remove(&slot_meta.slot) {
-                    if slots_stats.last_cleanup_ts.elapsed().as_secs() > 30 {
-                        let root = self.last_root();
-                        slots_stats.stats = slots_stats.stats.split_off(&root);
-                        slots_stats.last_cleanup_ts = Instant::now();
-                    }
-                    (e.num_repaired, e.num_recovered)
-                } else {
-                    (0, 0)
-                }
-            };
-            datapoint_info!(
-                "shred_insert_is_full",
-                (
-                    "total_time_ms",
-                    solana_sdk::timing::timestamp() - slot_meta.first_shred_timestamp,
-                    i64
-                ),
-                ("slot", slot_meta.slot, i64),
-                (
-                    "last_index",
-                    slot_meta
-                        .last_index
-                        .and_then(|ix| i64::try_from(ix).ok())
-                        .unwrap_or(-1),
-                    i64
-                ),
-                ("num_repaired", num_repaired, i64),
-                ("num_recovered", num_recovered, i64),
-            );
        }
        trace!("inserted shred into slot {:?} and index {:?}", slot, index);
        Ok(newly_completed_data_sets)
@@ -4358,6 +3962,7 @@ macro_rules! create_new_tmp_ledger_fifo_auto_delete {
                shred_storage_type: $crate::blockstore_db::ShredStorageType::RocksFifo(
                    $crate::blockstore_db::BlockstoreRocksFifoOptions::default(),
                ),
+                ..$crate::blockstore_db::LedgerColumnOptions::default()
            },
        )
    };
@@ -4666,6 +4271,7 @@ pub mod tests {
            pubkey::Pubkey,
            signature::Signature,
            transaction::{Transaction, TransactionError},
+            transaction_context::TransactionReturnData,
        },
        solana_storage_proto::convert::generated,
        solana_transaction_status::{InnerInstructions, Reward, Rewards, TransactionTokenBalance},
@@ -4722,6 +4328,7 @@ pub mod tests {
                    shred_storage_type: ShredStorageType::RocksFifo(
                        BlockstoreRocksFifoOptions::default(),
                    ),
+                    ..LedgerColumnOptions::default()
                },
                ..BlockstoreOptions::default()
            },
@@ -6355,7 +5962,7 @@ pub mod tests {
                panic!("no dupes");
            },
            false,
-            false,
+            ShredSource::Turbine,
            &mut BlockstoreInsertionMetrics::default(),
        ));

@@ -6373,7 +5980,7 @@ pub mod tests {
                counter.fetch_add(1, Ordering::Relaxed);
            },
            false,
-            false,
+            ShredSource::Turbine,
            &mut BlockstoreInsertionMetrics::default(),
        ));
        assert_eq!(counter.load(Ordering::Relaxed), 1);
@@ -6826,6 +6433,7 @@ pub mod tests {
                    post_token_balances: Some(vec![]),
                    rewards: Some(vec![]),
                    loaded_addresses: LoadedAddresses::default(),
+                    return_data: Some(TransactionReturnData::default()),
                }
                .into();
                blockstore
@@ -6843,6 +6451,7 @@ pub mod tests {
                    post_token_balances: Some(vec![]),
                    rewards: Some(vec![]),
                    loaded_addresses: LoadedAddresses::default(),
+                    return_data: Some(TransactionReturnData::default()),
                }
                .into();
                blockstore
@@ -6860,6 +6469,7 @@ pub mod tests {
                    post_token_balances: Some(vec![]),
                    rewards: Some(vec![]),
                    loaded_addresses: LoadedAddresses::default(),
+                    return_data: Some(TransactionReturnData::default()),
                }
                .into();
                blockstore
@@ -6879,6 +6489,7 @@ pub mod tests {
                        post_token_balances: Some(vec![]),
                        rewards: Some(vec![]),
                        loaded_addresses: LoadedAddresses::default(),
+                        return_data: Some(TransactionReturnData::default()),
                    },
                }
            })
@@ -6991,6 +6602,10 @@ pub mod tests {
            writable: vec![Pubkey::new_unique()],
            readonly: vec![Pubkey::new_unique()],
        };
+        let test_return_data = TransactionReturnData {
+            program_id: Pubkey::new_unique(),
+            data: vec![1, 2, 3],
+        };

        // result not found
        assert!(transaction_status_cf
@@ -7010,6 +6625,7 @@ pub mod tests {
            post_token_balances: Some(post_token_balances_vec.clone()),
            rewards: Some(rewards_vec.clone()),
            loaded_addresses: test_loaded_addresses.clone(),
+            return_data: Some(test_return_data.clone()),
        }
        .into();
        assert!(transaction_status_cf
@@ -7028,6 +6644,7 @@ pub mod tests {
            post_token_balances,
            rewards,
            loaded_addresses,
+            return_data,
        } = transaction_status_cf
            .get_protobuf_or_bincode::<StoredTransactionStatusMeta>((0, Signature::default(), 0))
            .unwrap()
@@ -7044,6 +6661,7 @@ pub mod tests {
        assert_eq!(post_token_balances.unwrap(), post_token_balances_vec);
        assert_eq!(rewards.unwrap(), rewards_vec);
        assert_eq!(loaded_addresses, test_loaded_addresses);
+        assert_eq!(return_data.unwrap(), test_return_data);

        // insert value
        let status = TransactionStatusMeta {
@@ -7057,6 +6675,7 @@ pub mod tests {
            post_token_balances: Some(post_token_balances_vec.clone()),
            rewards: Some(rewards_vec.clone()),
            loaded_addresses: test_loaded_addresses.clone(),
+            return_data: Some(test_return_data.clone()),
        }
        .into();
        assert!(transaction_status_cf
@@ -7075,6 +6694,7 @@ pub mod tests {
            post_token_balances,
            rewards,
            loaded_addresses,
+            return_data,
        } = transaction_status_cf
            .get_protobuf_or_bincode::<StoredTransactionStatusMeta>((
                0,
@@ -7097,6 +6717,7 @@ pub mod tests {
        assert_eq!(post_token_balances.unwrap(), post_token_balances_vec);
        assert_eq!(rewards.unwrap(), rewards_vec);
        assert_eq!(loaded_addresses, test_loaded_addresses);
+        assert_eq!(return_data.unwrap(), test_return_data);
    }

    #[test]
@@ -7325,6 +6946,7 @@ pub mod tests {
            post_token_balances: Some(vec![]),
            rewards: Some(vec![]),
            loaded_addresses: LoadedAddresses::default(),
+            return_data: Some(TransactionReturnData::default()),
        }
        .into();

@@ -7520,6 +7142,7 @@ pub mod tests {
            post_token_balances: Some(vec![]),
            rewards: Some(vec![]),
            loaded_addresses: LoadedAddresses::default(),
+            return_data: Some(TransactionReturnData::default()),
        }
        .into();

@@ -7691,6 +7314,10 @@ pub mod tests {
                let post_token_balances = Some(vec![]);
                let rewards = Some(vec![]);
                let signature = transaction.signatures[0];
+                let return_data = Some(TransactionReturnData {
+                    program_id: Pubkey::new_unique(),
+                    data: vec![1, 2, 3],
+                });
                let status = TransactionStatusMeta {
                    status: Ok(()),
                    fee: 42,
@@ -7702,6 +7329,7 @@ pub mod tests {
                    post_token_balances: post_token_balances.clone(),
                    rewards: rewards.clone(),
                    loaded_addresses: LoadedAddresses::default(),
+                    return_data: return_data.clone(),
                }
                .into();
                blockstore
@@ -7721,6 +7349,7 @@ pub mod tests {
                        post_token_balances,
                        rewards,
                        loaded_addresses: LoadedAddresses::default(),
+                        return_data,
                    },
                }
            })
@@ -7792,6 +7421,10 @@ pub mod tests {
                let pre_token_balances = Some(vec![]);
                let post_token_balances = Some(vec![]);
                let rewards = Some(vec![]);
+                let return_data = Some(TransactionReturnData {
+                    program_id: Pubkey::new_unique(),
+                    data: vec![1, 2, 3],
+                });
                let signature = transaction.signatures[0];
                let status = TransactionStatusMeta {
                    status: Ok(()),
@@ -7804,6 +7437,7 @@ pub mod tests {
                    post_token_balances: post_token_balances.clone(),
                    rewards: rewards.clone(),
                    loaded_addresses: LoadedAddresses::default(),
+                    return_data: return_data.clone(),
                }
                .into();
                blockstore
@@ -7823,6 +7457,7 @@ pub mod tests {
                        post_token_balances,
                        rewards,
                        loaded_addresses: LoadedAddresses::default(),
+                        return_data,
                    },
                }
            })
@@ -8582,6 +8217,7 @@ pub mod tests {
                post_token_balances: Some(vec![]),
                rewards: Some(vec![]),
                loaded_addresses: LoadedAddresses::default(),
+                return_data: Some(TransactionReturnData::default()),
            }
            .into();
            transaction_status_cf
@@ -9139,6 +8775,10 @@ pub mod tests {
                commission: None,
            }]),
            loaded_addresses: LoadedAddresses::default(),
+            return_data: Some(TransactionReturnData {
+                program_id: Pubkey::new_unique(),
+                data: vec![1, 2, 3],
+            }),
        };
        let deprecated_status: StoredTransactionStatusMeta = status.clone().try_into().unwrap();
        let protobuf_status: generated::TransactionStatusMeta = status.into();
--- a/ledger/src/blockstore_db.rs
+++ b/ledger/src/blockstore_db.rs
@@ -9,9 +9,10 @@ use {
        self,
        compaction_filter::CompactionFilter,
        compaction_filter_factory::{CompactionFilterContext, CompactionFilterFactory},
-        ColumnFamily, ColumnFamilyDescriptor, CompactionDecision, DBCompactionStyle, DBIterator,
-        DBRawIterator, DBRecoveryMode, FifoCompactOptions, IteratorMode as RocksIteratorMode,
-        Options, WriteBatch as RWriteBatch, DB,
+        properties as RocksProperties, ColumnFamily, ColumnFamilyDescriptor, CompactionDecision,
+        DBCompactionStyle, DBCompressionType as RocksCompressionType, DBIterator, DBRawIterator,
+        DBRecoveryMode, FifoCompactOptions, IteratorMode as RocksIteratorMode, Options,
+        WriteBatch as RWriteBatch, DB,
    },
    serde::{de::DeserializeOwned, Serialize},
    solana_runtime::hardened_unpack::UnpackError,
@@ -35,6 +36,8 @@ use {
    thiserror::Error,
 };

+const BLOCKSTORE_METRICS_ERROR: i64 = -1;
+
 // The default storage size for storing shreds when `rocksdb-shred-compaction`
 // is set to `fifo` in the validator arguments.  This amount of storage size
 // in bytes will equally allocated to both data shreds and coding shreds.
@@ -98,6 +101,222 @@ const PROGRAM_COSTS_CF: &str = "program_costs";
 // 1 day is chosen for the same reasoning of DEFAULT_COMPACTION_SLOT_INTERVAL
 const PERIODIC_COMPACTION_SECONDS: u64 = 60 * 60 * 24;

+#[derive(Default)]
+/// A metrics struct that exposes RocksDB's column family properties.
+///
+/// Here we only expose a subset of all the internal properties which are
+/// relevant to the ledger store performance.
+///
+/// The list of completed RocksDB internal properties can be found
+/// [here](https://github.com/facebook/rocksdb/blob/08809f5e6cd9cc4bc3958dd4d59457ae78c76660/include/rocksdb/db.h#L654-L689).
+pub struct BlockstoreRocksDbColumnFamilyMetrics {
+    // Size related
+
+    // The storage size occupied by the column family.
+    // RocksDB's internal property key: "rocksdb.total-sst-files-size"
+    pub total_sst_files_size: i64,
+    // The memory size occupied by the column family's in-memory buffer.
+    // RocksDB's internal property key: "rocksdb.size-all-mem-tables"
+    pub size_all_mem_tables: i64,
+
+    // Snapshot related
+
+    // Number of snapshots hold for the column family.
+    // RocksDB's internal property key: "rocksdb.num-snapshots"
+    pub num_snapshots: i64,
+    // Unit timestamp of the oldest unreleased snapshot.
+    // RocksDB's internal property key: "rocksdb.oldest-snapshot-time"
+    pub oldest_snapshot_time: i64,
+
+    // Write related
+
+    // The current actual delayed write rate. 0 means no delay.
+    // RocksDB's internal property key: "rocksdb.actual-delayed-write-rate"
+    pub actual_delayed_write_rate: i64,
+    // A flag indicating whether writes are stopped on this column family.
+    // 1 indicates writes have been stopped.
+    // RocksDB's internal property key: "rocksdb.is-write-stopped"
+    pub is_write_stopped: i64,
+
+    // Memory / block cache related
+
+    // The block cache capacity of the column family.
+    // RocksDB's internal property key: "rocksdb.block-cache-capacity"
+    pub block_cache_capacity: i64,
+    // The memory size used by the column family in the block cache.
+    // RocksDB's internal property key: "rocksdb.block-cache-usage"
+    pub block_cache_usage: i64,
+    // The memory size used by the column family in the block cache where
+    // entries are pinned.
+    // RocksDB's internal property key: "rocksdb.block-cache-pinned-usage"
+    pub block_cache_pinned_usage: i64,
+
+    // The estimated memory size used for reading SST tables in this column
+    // family such as filters and index blocks. Note that this number does not
+    // include the memory used in block cache.
+    // RocksDB's internal property key: "rocksdb.estimate-table-readers-mem"
+    pub estimate_table_readers_mem: i64,
+
+    // Flush and compaction
+
+    // A 1 or 0 flag indicating whether a memtable flush is pending.
+    // If this number is 1, it means a memtable is waiting for being flushed,
+    // but there might be too many L0 files that prevents it from being flushed.
+    // RocksDB's internal property key: "rocksdb.mem-table-flush-pending"
+    pub mem_table_flush_pending: i64,
+
+    // A 1 or 0 flag indicating whether a compaction job is pending.
+    // If this number is 1, it means some part of the column family requires
+    // compaction in order to maintain shape of LSM tree, but the compaction
+    // is pending because the desired compaction job is either waiting for
+    // other dependnent compactions to be finished or waiting for an available
+    // compaction thread.
+    // RocksDB's internal property key: "rocksdb.compaction-pending"
+    pub compaction_pending: i64,
+
+    // The number of compactions that are currently running for the column family.
+    // RocksDB's internal property key: "rocksdb.num-running-compactions"
+    pub num_running_compactions: i64,
+
+    // The number of flushes that are currently running for the column family.
+    // RocksDB's internal property key: "rocksdb.num-running-flushes"
+    pub num_running_flushes: i64,
+
+    // FIFO Compaction related
+
+    // returns an estimation of the oldest key timestamp in the DB. Only vailable
+    // for FIFO compaction with compaction_options_fifo.allow_compaction = false.
+    // RocksDB's internal property key: "rocksdb.estimate-oldest-key-time"
+    pub estimate_oldest_key_time: i64,
+
+    // Misc
+
+    // The accumulated number of RocksDB background errors.
+    // RocksDB's internal property key: "rocksdb.background-errors"
+    pub background_errors: i64,
+}
+
+impl BlockstoreRocksDbColumnFamilyMetrics {
+    /// Report metrics with the specified metric name and column family tag.
+    /// The metric name and the column family tag is embeded in the parameter
+    /// `metric_name_and_cf_tag` with the following format.
+    ///
+    /// For example, "blockstore_rocksdb_cfs,cf_name=shred_data".
+    pub fn report_metrics(&self, metric_name_and_cf_tag: &'static str) {
+        datapoint_info!(
+            metric_name_and_cf_tag,
+            // Size related
+            (
+                "total_sst_files_size",
+                self.total_sst_files_size as i64,
+                i64
+            ),
+            ("size_all_mem_tables", self.size_all_mem_tables as i64, i64),
+            // Snapshot related
+            ("num_snapshots", self.num_snapshots as i64, i64),
+            (
+                "oldest_snapshot_time",
+                self.oldest_snapshot_time as i64,
+                i64
+            ),
+            // Write related
+            (
+                "actual_delayed_write_rate",
+                self.actual_delayed_write_rate as i64,
+                i64
+            ),
+            ("is_write_stopped", self.is_write_stopped as i64, i64),
+            // Memory / block cache related
+            (
+                "block_cache_capacity",
+                self.block_cache_capacity as i64,
+                i64
+            ),
+            ("block_cache_usage", self.block_cache_usage as i64, i64),
+            (
+                "block_cache_pinned_usage",
+                self.block_cache_pinned_usage as i64,
+                i64
+            ),
+            (
+                "estimate_table_readers_mem",
+                self.estimate_table_readers_mem as i64,
+                i64
+            ),
+            // Flush and compaction
+            (
+                "mem_table_flush_pending",
+                self.mem_table_flush_pending as i64,
+                i64
+            ),
+            ("compaction_pending", self.compaction_pending as i64, i64),
+            (
+                "num_running_compactions",
+                self.num_running_compactions as i64,
+                i64
+            ),
+            ("num_running_flushes", self.num_running_flushes as i64, i64),
+            // FIFO Compaction related
+            (
+                "estimate_oldest_key_time",
+                self.estimate_oldest_key_time as i64,
+                i64
+            ),
+            // Misc
+            ("background_errors", self.background_errors as i64, i64),
+        );
+    }
+}
+
+macro_rules! rocksdb_metric_header {
+    ($metric_name:literal, $cf_name:literal, $column_options:expr) => {
+        match $column_options.shred_storage_type {
+            ShredStorageType::RocksLevel =>
+                rocksdb_metric_header!(@compression_type $metric_name, $cf_name, $column_options, "rocks_level"),
+            ShredStorageType::RocksFifo(_) =>
+                rocksdb_metric_header!(@compression_type $metric_name, $cf_name, $column_options, "rocks_fifo"),
+        }
+    };
+
+    (@compression_type $metric_name:literal, $cf_name:literal, $column_options:expr, $storage_type:literal) => {
+        match $column_options.compression_type {
+            BlockstoreCompressionType::None => rocksdb_metric_header!(@all_fields
+                $metric_name,
+                $cf_name,
+                $storage_type,
+                "None"
+            ),
+            BlockstoreCompressionType::Snappy => rocksdb_metric_header!(@all_fields
+                $metric_name,
+                $cf_name,
+                $storage_type,
+                "Snappy"
+            ),
+            BlockstoreCompressionType::Lz4 => rocksdb_metric_header!(@all_fields
+                $metric_name,
+                $cf_name,
+                $storage_type,
+                "Lz4"
+            ),
+            BlockstoreCompressionType::Zlib => rocksdb_metric_header!(@all_fields
+                $metric_name,
+                $cf_name,
+                $storage_type,
+                "Zlib"
+            ),
+        }
+    };
+
+    (@all_fields $metric_name:literal, $cf_name:literal, $storage_type:literal, $compression_type:literal) => {
+        concat!($metric_name,
+            ",cf_name=", $cf_name,
+            ",storage=", $storage_type,
+            ",compression=", $compression_type,
+        )
+    };
+}
+use rocksdb_metric_header;
+
 #[derive(Error, Debug)]
 pub enum BlockstoreError {
    ShredForIndexExists,
@@ -554,6 +773,13 @@ pub trait Column {
    }
 }

+pub trait ColumnMetrics {
+    fn report_cf_metrics(
+        cf_metrics: BlockstoreRocksDbColumnFamilyMetrics,
+        column_options: &Arc<LedgerColumnOptions>,
+    );
+}
+
 pub trait ColumnName {
    const NAME: &'static str;
 }
@@ -638,7 +864,18 @@ impl Column for columns::TransactionStatus {
        (index, Signature::default(), 0)
    }
 }
-
+impl ColumnMetrics for columns::TransactionStatus {
+    fn report_cf_metrics(
+        cf_metrics: BlockstoreRocksDbColumnFamilyMetrics,
+        column_options: &Arc<LedgerColumnOptions>,
+    ) {
+        cf_metrics.report_metrics(rocksdb_metric_header!(
+            "blockstore_rocksdb_cfs",
+            "transaction_status",
+            column_options
+        ));
+    }
+}
 impl ColumnName for columns::TransactionStatus {
    const NAME: &'static str = TRANSACTION_STATUS_CF;
 }
@@ -679,7 +916,18 @@ impl Column for columns::AddressSignatures {
        (index, Pubkey::default(), 0, Signature::default())
    }
 }
-
+impl ColumnMetrics for columns::AddressSignatures {
+    fn report_cf_metrics(
+        cf_metrics: BlockstoreRocksDbColumnFamilyMetrics,
+        column_options: &Arc<LedgerColumnOptions>,
+    ) {
+        cf_metrics.report_metrics(rocksdb_metric_header!(
+            "blockstore_rocksdb_cfs",
+            "address_signatures",
+            column_options
+        ));
+    }
+}
 impl ColumnName for columns::AddressSignatures {
    const NAME: &'static str = ADDRESS_SIGNATURES_CF;
 }
@@ -710,7 +958,18 @@ impl Column for columns::TransactionMemos {
        Signature::default()
    }
 }
-
+impl ColumnMetrics for columns::TransactionMemos {
+    fn report_cf_metrics(
+        cf_metrics: BlockstoreRocksDbColumnFamilyMetrics,
+        column_options: &Arc<LedgerColumnOptions>,
+    ) {
+        cf_metrics.report_metrics(rocksdb_metric_header!(
+            "blockstore_rocksdb_cfs",
+            "transaction_memos",
+            column_options
+        ));
+    }
+}
 impl ColumnName for columns::TransactionMemos {
    const NAME: &'static str = TRANSACTION_MEMOS_CF;
 }
@@ -741,12 +1000,35 @@ impl Column for columns::TransactionStatusIndex {
        slot
    }
 }
-
+impl ColumnMetrics for columns::TransactionStatusIndex {
+    fn report_cf_metrics(
+        cf_metrics: BlockstoreRocksDbColumnFamilyMetrics,
+        column_options: &Arc<LedgerColumnOptions>,
+    ) {
+        cf_metrics.report_metrics(rocksdb_metric_header!(
+            "blockstore_rocksdb_cfs",
+            "transaction_status_index",
+            column_options
+        ));
+    }
+}
 impl ColumnName for columns::TransactionStatusIndex {
    const NAME: &'static str = TRANSACTION_STATUS_INDEX_CF;
 }

 impl SlotColumn for columns::Rewards {}
+impl ColumnMetrics for columns::Rewards {
+    fn report_cf_metrics(
+        cf_metrics: BlockstoreRocksDbColumnFamilyMetrics,
+        column_options: &Arc<LedgerColumnOptions>,
+    ) {
+        cf_metrics.report_metrics(rocksdb_metric_header!(
+            "blockstore_rocksdb_cfs",
+            "rewards",
+            column_options
+        ));
+    }
+}
 impl ColumnName for columns::Rewards {
    const NAME: &'static str = REWARDS_CF;
 }
@@ -755,6 +1037,18 @@ impl ProtobufColumn for columns::Rewards {
 }

 impl SlotColumn for columns::Blocktime {}
+impl ColumnMetrics for columns::Blocktime {
+    fn report_cf_metrics(
+        cf_metrics: BlockstoreRocksDbColumnFamilyMetrics,
+        column_options: &Arc<LedgerColumnOptions>,
+    ) {
+        cf_metrics.report_metrics(rocksdb_metric_header!(
+            "blockstore_rocksdb_cfs",
+            "blocktime",
+            column_options
+        ));
+    }
+}
 impl ColumnName for columns::Blocktime {
    const NAME: &'static str = BLOCKTIME_CF;
 }
@@ -763,6 +1057,18 @@ impl TypedColumn for columns::Blocktime {
 }

 impl SlotColumn for columns::PerfSamples {}
+impl ColumnMetrics for columns::PerfSamples {
+    fn report_cf_metrics(
+        cf_metrics: BlockstoreRocksDbColumnFamilyMetrics,
+        column_options: &Arc<LedgerColumnOptions>,
+    ) {
+        cf_metrics.report_metrics(rocksdb_metric_header!(
+            "blockstore_rocksdb_cfs",
+            "perf_samples",
+            column_options
+        ));
+    }
+}
 impl ColumnName for columns::PerfSamples {
    const NAME: &'static str = PERF_SAMPLES_CF;
 }
@@ -771,6 +1077,18 @@ impl TypedColumn for columns::PerfSamples {
 }

 impl SlotColumn for columns::BlockHeight {}
+impl ColumnMetrics for columns::BlockHeight {
+    fn report_cf_metrics(
+        cf_metrics: BlockstoreRocksDbColumnFamilyMetrics,
+        column_options: &Arc<LedgerColumnOptions>,
+    ) {
+        cf_metrics.report_metrics(rocksdb_metric_header!(
+            "blockstore_rocksdb_cfs",
+            "block_height",
+            column_options
+        ));
+    }
+}
 impl ColumnName for columns::BlockHeight {
    const NAME: &'static str = BLOCK_HEIGHT_CF;
 }
@@ -778,6 +1096,19 @@ impl TypedColumn for columns::BlockHeight {
    type Type = u64;
 }

+impl ColumnMetrics for columns::ProgramCosts {
+    fn report_cf_metrics(
+        cf_metrics: BlockstoreRocksDbColumnFamilyMetrics,
+        column_options: &Arc<LedgerColumnOptions>,
+    ) {
+        cf_metrics.report_metrics(rocksdb_metric_header!(
+            "blockstore_rocksdb_cfs",
+            "program_costs",
+            column_options
+        ));
+    }
+}
+
 impl ColumnName for columns::ProgramCosts {
    const NAME: &'static str = PROGRAM_COSTS_CF;
 }
@@ -831,7 +1162,18 @@ impl Column for columns::ShredCode {
        (slot, 0)
    }
 }
-
+impl ColumnMetrics for columns::ShredCode {
+    fn report_cf_metrics(
+        cf_metrics: BlockstoreRocksDbColumnFamilyMetrics,
+        column_options: &Arc<LedgerColumnOptions>,
+    ) {
+        cf_metrics.report_metrics(rocksdb_metric_header!(
+            "blockstore_rocksdb_cfs",
+            "shred_code",
+            column_options
+        ));
+    }
+}
 impl ColumnName for columns::ShredCode {
    const NAME: &'static str = CODE_SHRED_CF;
 }
@@ -861,12 +1203,35 @@ impl Column for columns::ShredData {
        (slot, 0)
    }
 }
-
+impl ColumnMetrics for columns::ShredData {
+    fn report_cf_metrics(
+        cf_metrics: BlockstoreRocksDbColumnFamilyMetrics,
+        column_options: &Arc<LedgerColumnOptions>,
+    ) {
+        cf_metrics.report_metrics(rocksdb_metric_header!(
+            "blockstore_rocksdb_cfs",
+            "shred_data",
+            column_options
+        ));
+    }
+}
 impl ColumnName for columns::ShredData {
    const NAME: &'static str = DATA_SHRED_CF;
 }

 impl SlotColumn for columns::Index {}
+impl ColumnMetrics for columns::Index {
+    fn report_cf_metrics(
+        cf_metrics: BlockstoreRocksDbColumnFamilyMetrics,
+        column_options: &Arc<LedgerColumnOptions>,
+    ) {
+        cf_metrics.report_metrics(rocksdb_metric_header!(
+            "blockstore_rocksdb_cfs",
+            "index",
+            column_options
+        ));
+    }
+}
 impl ColumnName for columns::Index {
    const NAME: &'static str = INDEX_CF;
 }
@@ -875,6 +1240,18 @@ impl TypedColumn for columns::Index {
 }

 impl SlotColumn for columns::DeadSlots {}
+impl ColumnMetrics for columns::DeadSlots {
+    fn report_cf_metrics(
+        cf_metrics: BlockstoreRocksDbColumnFamilyMetrics,
+        column_options: &Arc<LedgerColumnOptions>,
+    ) {
+        cf_metrics.report_metrics(rocksdb_metric_header!(
+            "blockstore_rocksdb_cfs",
+            "dead_slots",
+            column_options
+        ));
+    }
+}
 impl ColumnName for columns::DeadSlots {
    const NAME: &'static str = DEAD_SLOTS_CF;
 }
@@ -883,6 +1260,18 @@ impl TypedColumn for columns::DeadSlots {
 }

 impl SlotColumn for columns::DuplicateSlots {}
+impl ColumnMetrics for columns::DuplicateSlots {
+    fn report_cf_metrics(
+        cf_metrics: BlockstoreRocksDbColumnFamilyMetrics,
+        column_options: &Arc<LedgerColumnOptions>,
+    ) {
+        cf_metrics.report_metrics(rocksdb_metric_header!(
+            "blockstore_rocksdb_cfs",
+            "duplicate_slots",
+            column_options
+        ));
+    }
+}
 impl ColumnName for columns::DuplicateSlots {
    const NAME: &'static str = DUPLICATE_SLOTS_CF;
 }
@@ -891,6 +1280,18 @@ impl TypedColumn for columns::DuplicateSlots {
 }

 impl SlotColumn for columns::Orphans {}
+impl ColumnMetrics for columns::Orphans {
+    fn report_cf_metrics(
+        cf_metrics: BlockstoreRocksDbColumnFamilyMetrics,
+        column_options: &Arc<LedgerColumnOptions>,
+    ) {
+        cf_metrics.report_metrics(rocksdb_metric_header!(
+            "blockstore_rocksdb_cfs",
+            "orphans",
+            column_options
+        ));
+    }
+}
 impl ColumnName for columns::Orphans {
    const NAME: &'static str = ORPHANS_CF;
 }
@@ -899,6 +1300,18 @@ impl TypedColumn for columns::Orphans {
 }

 impl SlotColumn for columns::BankHash {}
+impl ColumnMetrics for columns::BankHash {
+    fn report_cf_metrics(
+        cf_metrics: BlockstoreRocksDbColumnFamilyMetrics,
+        column_options: &Arc<LedgerColumnOptions>,
+    ) {
+        cf_metrics.report_metrics(rocksdb_metric_header!(
+            "blockstore_rocksdb_cfs",
+            "bank_hash",
+            column_options
+        ));
+    }
+}
 impl ColumnName for columns::BankHash {
    const NAME: &'static str = BANK_HASH_CF;
 }
@@ -907,6 +1320,18 @@ impl TypedColumn for columns::BankHash {
 }

 impl SlotColumn for columns::Root {}
+impl ColumnMetrics for columns::Root {
+    fn report_cf_metrics(
+        cf_metrics: BlockstoreRocksDbColumnFamilyMetrics,
+        column_options: &Arc<LedgerColumnOptions>,
+    ) {
+        cf_metrics.report_metrics(rocksdb_metric_header!(
+            "blockstore_rocksdb_cfs",
+            "root",
+            column_options
+        ));
+    }
+}
 impl ColumnName for columns::Root {
    const NAME: &'static str = ROOT_CF;
 }
@@ -915,6 +1340,18 @@ impl TypedColumn for columns::Root {
 }

 impl SlotColumn for columns::SlotMeta {}
+impl ColumnMetrics for columns::SlotMeta {
+    fn report_cf_metrics(
+        cf_metrics: BlockstoreRocksDbColumnFamilyMetrics,
+        column_options: &Arc<LedgerColumnOptions>,
+    ) {
+        cf_metrics.report_metrics(rocksdb_metric_header!(
+            "blockstore_rocksdb_cfs",
+            "slot_meta",
+            column_options
+        ));
+    }
+}
 impl ColumnName for columns::SlotMeta {
    const NAME: &'static str = META_CF;
 }
@@ -948,6 +1385,18 @@ impl Column for columns::ErasureMeta {
        (slot, 0)
    }
 }
+impl ColumnMetrics for columns::ErasureMeta {
+    fn report_cf_metrics(
+        cf_metrics: BlockstoreRocksDbColumnFamilyMetrics,
+        column_options: &Arc<LedgerColumnOptions>,
+    ) {
+        cf_metrics.report_metrics(rocksdb_metric_header!(
+            "blockstore_rocksdb_cfs",
+            "erasure_meta",
+            column_options
+        ));
+    }
+}
 impl ColumnName for columns::ErasureMeta {
    const NAME: &'static str = ERASURE_META_CF;
 }
@@ -959,15 +1408,73 @@ impl TypedColumn for columns::ErasureMeta {
 pub struct Database {
    backend: Arc<Rocks>,
    path: Arc<Path>,
+    column_options: Arc<LedgerColumnOptions>,
 }

 #[derive(Debug, Clone)]
 pub struct LedgerColumn<C>
 where
-    C: Column,
+    C: Column + ColumnName + ColumnMetrics,
 {
    backend: Arc<Rocks>,
    column: PhantomData<C>,
+    pub column_options: Arc<LedgerColumnOptions>,
+}
+
+impl<C: Column + ColumnName + ColumnMetrics> LedgerColumn<C> {
+    pub fn submit_rocksdb_cf_metrics(&self) {
+        let cf_rocksdb_metrics = BlockstoreRocksDbColumnFamilyMetrics {
+            total_sst_files_size: self
+                .get_int_property(RocksProperties::TOTAL_SST_FILES_SIZE)
+                .unwrap_or(BLOCKSTORE_METRICS_ERROR),
+            size_all_mem_tables: self
+                .get_int_property(RocksProperties::SIZE_ALL_MEM_TABLES)
+                .unwrap_or(BLOCKSTORE_METRICS_ERROR),
+            num_snapshots: self
+                .get_int_property(RocksProperties::NUM_SNAPSHOTS)
+                .unwrap_or(BLOCKSTORE_METRICS_ERROR),
+            oldest_snapshot_time: self
+                .get_int_property(RocksProperties::OLDEST_SNAPSHOT_TIME)
+                .unwrap_or(BLOCKSTORE_METRICS_ERROR),
+            actual_delayed_write_rate: self
+                .get_int_property(RocksProperties::ACTUAL_DELAYED_WRITE_RATE)
+                .unwrap_or(BLOCKSTORE_METRICS_ERROR),
+            is_write_stopped: self
+                .get_int_property(RocksProperties::IS_WRITE_STOPPED)
+                .unwrap_or(BLOCKSTORE_METRICS_ERROR),
+            block_cache_capacity: self
+                .get_int_property(RocksProperties::BLOCK_CACHE_CAPACITY)
+                .unwrap_or(BLOCKSTORE_METRICS_ERROR),
+            block_cache_usage: self
+                .get_int_property(RocksProperties::BLOCK_CACHE_USAGE)
+                .unwrap_or(BLOCKSTORE_METRICS_ERROR),
+            block_cache_pinned_usage: self
+                .get_int_property(RocksProperties::BLOCK_CACHE_PINNED_USAGE)
+                .unwrap_or(BLOCKSTORE_METRICS_ERROR),
+            estimate_table_readers_mem: self
+                .get_int_property(RocksProperties::ESTIMATE_TABLE_READERS_MEM)
+                .unwrap_or(BLOCKSTORE_METRICS_ERROR),
+            mem_table_flush_pending: self
+                .get_int_property(RocksProperties::MEM_TABLE_FLUSH_PENDING)
+                .unwrap_or(BLOCKSTORE_METRICS_ERROR),
+            compaction_pending: self
+                .get_int_property(RocksProperties::COMPACTION_PENDING)
+                .unwrap_or(BLOCKSTORE_METRICS_ERROR),
+            num_running_compactions: self
+                .get_int_property(RocksProperties::NUM_RUNNING_COMPACTIONS)
+                .unwrap_or(BLOCKSTORE_METRICS_ERROR),
+            num_running_flushes: self
+                .get_int_property(RocksProperties::NUM_RUNNING_FLUSHES)
+                .unwrap_or(BLOCKSTORE_METRICS_ERROR),
+            estimate_oldest_key_time: self
+                .get_int_property(RocksProperties::ESTIMATE_OLDEST_KEY_TIME)
+                .unwrap_or(BLOCKSTORE_METRICS_ERROR),
+            background_errors: self
+                .get_int_property(RocksProperties::BACKGROUND_ERRORS)
+                .unwrap_or(BLOCKSTORE_METRICS_ERROR),
+        };
+        C::report_cf_metrics(cf_rocksdb_metrics, &self.column_options);
+    }
 }

 pub struct WriteBatch<'a> {
@@ -975,7 +1482,7 @@ pub struct WriteBatch<'a> {
    map: HashMap<&'static str, &'a ColumnFamily>,
 }

-#[derive(Clone)]
+#[derive(Debug, Clone)]
 pub enum ShredStorageType {
    // Stores shreds under RocksDB's default compaction (level).
    RocksLevel,
@@ -991,19 +1498,49 @@ impl Default for ShredStorageType {
    }
 }

+#[derive(Debug, Clone)]
+pub enum BlockstoreCompressionType {
+    None,
+    Snappy,
+    Lz4,
+    Zlib,
+}
+
+impl Default for BlockstoreCompressionType {
+    fn default() -> Self {
+        Self::None
+    }
+}
+
+impl BlockstoreCompressionType {
+    fn to_rocksdb_compression_type(&self) -> RocksCompressionType {
+        match self {
+            Self::None => RocksCompressionType::None,
+            Self::Snappy => RocksCompressionType::Snappy,
+            Self::Lz4 => RocksCompressionType::Lz4,
+            Self::Zlib => RocksCompressionType::Zlib,
+        }
+    }
+}
+
 /// Options for LedgerColumn.
 /// Each field might also be used as a tag that supports group-by operation when
 /// reporting metrics.
-#[derive(Clone)]
+#[derive(Debug, Clone)]
 pub struct LedgerColumnOptions {
    // Determine how to store both data and coding shreds. Default: RocksLevel.
    pub shred_storage_type: ShredStorageType,
+
+    // Determine the way to compress column families which are eligible for
+    // compression.
+    pub compression_type: BlockstoreCompressionType,
 }

 impl Default for LedgerColumnOptions {
    fn default() -> Self {
        Self {
            shred_storage_type: ShredStorageType::RocksLevel,
+            compression_type: BlockstoreCompressionType::default(),
        }
    }
 }
@@ -1030,7 +1567,7 @@ impl Default for BlockstoreOptions {
    }
 }

-#[derive(Clone)]
+#[derive(Debug, Clone)]
 pub struct BlockstoreRocksFifoOptions {
    // The maximum storage size for storing data shreds in column family
    // [`cf::DataShred`].  Typically, data shreds contribute around 25% of the
@@ -1065,11 +1602,13 @@ impl Default for BlockstoreRocksFifoOptions {

 impl Database {
    pub fn open(path: &Path, options: BlockstoreOptions) -> Result<Self> {
+        let column_options = Arc::new(options.column_options.clone());
        let backend = Arc::new(Rocks::open(path, options)?);

        Ok(Database {
            backend,
            path: Arc::from(path),
+            column_options,
        })
    }

@@ -1114,11 +1653,12 @@ impl Database {

    pub fn column<C>(&self) -> LedgerColumn<C>
    where
-        C: Column + ColumnName,
+        C: Column + ColumnName + ColumnMetrics,
    {
        LedgerColumn {
            backend: Arc::clone(&self.backend),
            column: PhantomData,
+            column_options: Arc::clone(&self.column_options),
        }
    }

@@ -1167,7 +1707,7 @@ impl Database {

 impl<C> LedgerColumn<C>
 where
-    C: Column + ColumnName,
+    C: Column + ColumnName + ColumnMetrics,
 {
    pub fn get_bytes(&self, key: C::Index) -> Result<Option<Vec<u8>>> {
        self.backend.get_cf(self.handle(), &C::key(key))
@@ -1255,7 +1795,7 @@ where

 impl<C> LedgerColumn<C>
 where
-    C: TypedColumn + ColumnName,
+    C: TypedColumn + ColumnName + ColumnMetrics,
 {
    pub fn get(&self, key: C::Index) -> Result<Option<C::Type>> {
        if let Some(serialized_value) = self.backend.get_cf(self.handle(), &C::key(key))? {
@@ -1281,7 +1821,7 @@ where

 impl<C> LedgerColumn<C>
 where
-    C: ProtobufColumn + ColumnName,
+    C: ProtobufColumn + ColumnName + ColumnMetrics,
 {
    pub fn get_protobuf_or_bincode<T: DeserializeOwned + Into<C::Type>>(
        &self,
@@ -1444,9 +1984,24 @@ fn get_cf_options<C: 'static + Column + ColumnName>(
        });
    }

+    process_cf_options_advanced::<C>(&mut cf_options, &options.column_options);
+
    cf_options
 }

+fn process_cf_options_advanced<C: 'static + Column + ColumnName>(
+    cf_options: &mut Options,
+    column_options: &LedgerColumnOptions,
+) {
+    if should_enable_compression::<C>() {
+        cf_options.set_compression_type(
+            column_options
+                .compression_type
+                .to_rocksdb_compression_type(),
+        );
+    }
+}
+
 /// Creates and returns the column family descriptors for both data shreds and
 /// coding shreds column families.
 ///
@@ -1465,17 +2020,21 @@ fn new_cf_descriptor_pair_shreds<
            new_cf_descriptor::<C>(options, oldest_slot),
        ),
        ShredStorageType::RocksFifo(fifo_options) => (
-            new_cf_descriptor_fifo::<D>(&fifo_options.shred_data_cf_size),
-            new_cf_descriptor_fifo::<C>(&fifo_options.shred_code_cf_size),
+            new_cf_descriptor_fifo::<D>(&fifo_options.shred_data_cf_size, &options.column_options),
+            new_cf_descriptor_fifo::<C>(&fifo_options.shred_code_cf_size, &options.column_options),
        ),
    }
 }

 fn new_cf_descriptor_fifo<C: 'static + Column + ColumnName>(
    max_cf_size: &u64,
+    column_options: &LedgerColumnOptions,
 ) -> ColumnFamilyDescriptor {
    if *max_cf_size > FIFO_WRITE_BUFFER_SIZE {
-        ColumnFamilyDescriptor::new(C::NAME, get_cf_options_fifo::<C>(max_cf_size))
+        ColumnFamilyDescriptor::new(
+            C::NAME,
+            get_cf_options_fifo::<C>(max_cf_size, column_options),
+        )
    } else {
        panic!(
            "{} cf_size must be greater than write buffer size {} when using ShredStorageType::RocksFifo.",
@@ -1495,7 +2054,10 @@ fn new_cf_descriptor_fifo<C: 'static + Column + ColumnName>(
 /// rocksdb will start deleting the oldest SST file when the column family
 /// size reaches `max_cf_size` - `FIFO_WRITE_BUFFER_SIZE` to strictly
 /// maintain the size limit.
-fn get_cf_options_fifo<C: 'static + Column + ColumnName>(max_cf_size: &u64) -> Options {
+fn get_cf_options_fifo<C: 'static + Column + ColumnName>(
+    max_cf_size: &u64,
+    column_options: &LedgerColumnOptions,
+) -> Options {
    let mut options = Options::default();

    options.set_max_write_buffer_number(8);
@@ -1520,6 +2082,8 @@ fn get_cf_options_fifo<C: 'static + Column + ColumnName>(max_cf_size: &u64) -> O
    options.set_compaction_style(DBCompactionStyle::Fifo);
    options.set_fifo_compaction_options(&fifo_compact_options);

+    process_cf_options_advanced::<C>(&mut options, column_options);
+
    options
 }

@@ -1576,6 +2140,11 @@ fn should_exclude_from_compaction(cf_name: &str) -> bool {
    no_compaction_cfs.get(cf_name).is_some()
 }

+// Returns true if the column family enables compression.
+fn should_enable_compression<C: 'static + Column + ColumnName>() -> bool {
+    C::NAME == columns::TransactionStatus::NAME
+}
+
 #[cfg(test)]
 pub mod tests {
    use {super::*, crate::blockstore_db::columns::ShredData};
--- a/ledger/src/blockstore_processor.rs
+++ b/ledger/src/blockstore_processor.rs
@@ -34,7 +34,7 @@ use {
        snapshot_utils,
        transaction_batch::TransactionBatch,
        transaction_cost_metrics_sender::TransactionCostMetricsSender,
-        vote_account::VoteAccount,
+        vote_account::VoteAccountsHashMap,
        vote_sender_types::ReplayVoteSender,
    },
    solana_sdk::{
@@ -181,6 +181,7 @@ fn execute_batch(
        transaction_status_sender.is_some(),
        transaction_status_sender.is_some(),
        transaction_status_sender.is_some(),
+        transaction_status_sender.is_some(),
        timings,
    );

@@ -1259,7 +1260,7 @@ fn load_frozen_forks(
                        new_root_bank.exhaustively_free_unused_resource(*last_full_snapshot_slot);
                        last_free = Instant::now();
                        new_root_bank.update_accounts_hash_with_index_option(
-                            snapshot_config.accounts_hash_use_index,
+                            false,
                            snapshot_config.accounts_hash_debug_verify,
                            false,
                        );
@@ -1348,7 +1349,7 @@ fn supermajority_root(roots: &[(Slot, u64)], total_epoch_stake: u64) -> Option<S
 fn supermajority_root_from_vote_accounts(
    bank_slot: Slot,
    total_epoch_stake: u64,
-    vote_accounts: &HashMap<Pubkey, (/*stake:*/ u64, VoteAccount)>,
+    vote_accounts: &VoteAccountsHashMap,
 ) -> Option<Slot> {
    let mut roots_stakes: Vec<(Slot, u64)> = vote_accounts
        .iter()
@@ -1550,8 +1551,11 @@ pub mod tests {
        matches::assert_matches,
        rand::{thread_rng, Rng},
        solana_entry::entry::{create_ticks, next_entry, next_entry_mut},
-        solana_runtime::genesis_utils::{
-            self, create_genesis_config_with_vote_accounts, ValidatorVoteKeypairs,
+        solana_runtime::{
+            genesis_utils::{
+                self, create_genesis_config_with_vote_accounts, ValidatorVoteKeypairs,
+            },
+            vote_account::VoteAccount,
        },
        solana_sdk::{
            account::{AccountSharedData, WritableAccount},
@@ -3510,6 +3514,7 @@ pub mod tests {
            false,
            false,
            false,
+            false,
            &mut ExecuteTimings::default(),
        );
        let (err, signature) = get_first_error(&batch, fee_collection_results).unwrap();
@@ -3797,27 +3802,23 @@ pub mod tests {
    #[test]
    #[allow(clippy::field_reassign_with_default)]
    fn test_supermajority_root_from_vote_accounts() {
-        let convert_to_vote_accounts =
-            |roots_stakes: Vec<(Slot, u64)>| -> HashMap<Pubkey, (u64, VoteAccount)> {
-                roots_stakes
-                    .into_iter()
-                    .map(|(root, stake)| {
-                        let mut vote_state = VoteState::default();
-                        vote_state.root_slot = Some(root);
-                        let mut vote_account = AccountSharedData::new(
-                            1,
-                            VoteState::size_of(),
-                            &solana_vote_program::id(),
-                        );
-                        let versioned = VoteStateVersions::new_current(vote_state);
-                        VoteState::serialize(&versioned, vote_account.data_as_mut_slice()).unwrap();
-                        (
-                            solana_sdk::pubkey::new_rand(),
-                            (stake, VoteAccount::from(vote_account)),
-                        )
-                    })
-                    .collect()
-            };
+        let convert_to_vote_accounts = |roots_stakes: Vec<(Slot, u64)>| -> VoteAccountsHashMap {
+            roots_stakes
+                .into_iter()
+                .map(|(root, stake)| {
+                    let mut vote_state = VoteState::default();
+                    vote_state.root_slot = Some(root);
+                    let mut vote_account =
+                        AccountSharedData::new(1, VoteState::size_of(), &solana_vote_program::id());
+                    let versioned = VoteStateVersions::new_current(vote_state);
+                    VoteState::serialize(&versioned, vote_account.data_as_mut_slice()).unwrap();
+                    (
+                        solana_sdk::pubkey::new_rand(),
+                        (stake, VoteAccount::from(vote_account)),
+                    )
+                })
+                .collect()
+        };

        let total_stake = 10;
        let slot = 100;
--- a/ledger/src/lib.rs
+++ b/ledger/src/lib.rs
@@ -8,6 +8,7 @@ pub mod bigtable_delete;
 pub mod bigtable_upload;
 pub mod bigtable_upload_service;
 pub mod block_error;
+mod slot_stats;
 #[macro_use]
 pub mod blockstore;
 pub mod ancestor_iterator;
--- a/ledger/src/slot_stats.rs
+++ b/ledger/src/slot_stats.rs
@@ -0,0 +1,90 @@
+use {
+    crate::blockstore_meta::SlotMeta, bitflags::bitflags, lru::LruCache, solana_sdk::clock::Slot,
+};
+
+const SLOTS_STATS_CACHE_CAPACITY: usize = 300;
+
+macro_rules! get_mut_entry (
+    ($cache:expr, $key:expr) => (
+        match $cache.get_mut(&$key) {
+            Some(entry) => entry,
+            None => {
+                $cache.put($key, SlotStats::default());
+                $cache.get_mut(&$key).unwrap()
+            }
+        }
+    );
+);
+
+#[derive(Copy, Clone, Debug)]
+pub(crate) enum ShredSource {
+    Turbine,
+    Repaired,
+    Recovered,
+}
+
+bitflags! {
+    #[derive(Default)]
+    struct SlotFlags: u8 {
+        const DEAD   = 0b00000001;
+        const FULL   = 0b00000010;
+        const ROOTED = 0b00000100;
+    }
+}
+
+#[derive(Default)]
+struct SlotStats {
+    flags: SlotFlags,
+    num_repaired: usize,
+    num_recovered: usize,
+}
+
+pub(crate) struct SlotsStats(LruCache<Slot, SlotStats>);
+
+impl Default for SlotsStats {
+    fn default() -> Self {
+        // LruCache::unbounded because capacity is enforced manually.
+        Self(LruCache::unbounded())
+    }
+}
+
+impl SlotsStats {
+    pub(crate) fn add_shred(&mut self, slot: Slot, source: ShredSource) {
+        let entry = get_mut_entry!(self.0, slot);
+        match source {
+            ShredSource::Turbine => (),
+            ShredSource::Repaired => entry.num_repaired += 1,
+            ShredSource::Recovered => entry.num_recovered += 1,
+        }
+        self.maybe_evict_cache();
+    }
+
+    pub(crate) fn set_full(&mut self, slot_meta: &SlotMeta) {
+        let total_time_ms =
+            solana_sdk::timing::timestamp().saturating_sub(slot_meta.first_shred_timestamp);
+        let last_index = slot_meta
+            .last_index
+            .and_then(|ix| i64::try_from(ix).ok())
+            .unwrap_or(-1);
+        let entry = get_mut_entry!(self.0, slot_meta.slot);
+        if !entry.flags.contains(SlotFlags::FULL) {
+            datapoint_info!(
+                "shred_insert_is_full",
+                ("total_time_ms", total_time_ms, i64),
+                ("slot", slot_meta.slot, i64),
+                ("last_index", last_index, i64),
+                ("num_repaired", entry.num_repaired, i64),
+                ("num_recovered", entry.num_recovered, i64),
+            );
+        }
+        entry.flags |= SlotFlags::FULL;
+        self.maybe_evict_cache();
+    }
+
+    fn maybe_evict_cache(&mut self) {
+        while self.0.len() > SLOTS_STATS_CACHE_CAPACITY {
+            let (_slot, _entry) = self.0.pop_lru().unwrap();
+            // TODO: submit metrics for (slot, entry).
+        }
+    }
+}
--- a/local-cluster/Cargo.toml
+++ b/local-cluster/Cargo.toml
@@ -3,7 +3,7 @@ authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 edition = "2021"
 name = "solana-local-cluster"
 description = "Blockchain, Rebuilt for Scale"
-version = "1.10.4"
+version = "1.11.0"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
@@ -16,25 +16,25 @@ itertools = "0.10.3"
 log = "0.4.14"
 rand = "0.7.0"
 rayon = "1.5.1"
-solana-client = { path = "../client", version = "=1.10.4" }
-solana-config-program = { path = "../programs/config", version = "=1.10.4" }
-solana-core = { path = "../core", version = "=1.10.4" }
-solana-entry = { path = "../entry", version = "=1.10.4" }
-solana-gossip = { path = "../gossip", version = "=1.10.4" }
-solana-ledger = { path = "../ledger", version = "=1.10.4" }
-solana-runtime = { path = "../runtime", version = "=1.10.4" }
-solana-sdk = { path = "../sdk", version = "=1.10.4" }
-solana-stake-program = { path = "../programs/stake", version = "=1.10.4" }
-solana-streamer = { path = "../streamer", version = "=1.10.4" }
-solana-vote-program = { path = "../programs/vote", version = "=1.10.4" }
+solana-client = { path = "../client", version = "=1.11.0" }
+solana-config-program = { path = "../programs/config", version = "=1.11.0" }
+solana-core = { path = "../core", version = "=1.11.0" }
+solana-entry = { path = "../entry", version = "=1.11.0" }
+solana-gossip = { path = "../gossip", version = "=1.11.0" }
+solana-ledger = { path = "../ledger", version = "=1.11.0" }
+solana-runtime = { path = "../runtime", version = "=1.11.0" }
+solana-sdk = { path = "../sdk", version = "=1.11.0" }
+solana-stake-program = { path = "../programs/stake", version = "=1.11.0" }
+solana-streamer = { path = "../streamer", version = "=1.11.0" }
+solana-vote-program = { path = "../programs/vote", version = "=1.11.0" }
 tempfile = "3.3.0"

 [dev-dependencies]
 assert_matches = "1.5.0"
 gag = "1.0.0"
 serial_test = "0.6.0"
-solana-download-utils = { path = "../download-utils", version = "=1.10.4" }
-solana-logger = { path = "../logger", version = "=1.10.4" }
+solana-download-utils = { path = "../download-utils", version = "=1.11.0" }
+solana-logger = { path = "../logger", version = "=1.11.0" }

 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
--- a/local-cluster/src/validator_configs.rs
+++ b/local-cluster/src/validator_configs.rs
@@ -55,7 +55,6 @@ pub fn safe_clone_config(config: &ValidatorConfig) -> ValidatorConfig {
        warp_slot: config.warp_slot,
        accounts_db_test_hash_calculation: config.accounts_db_test_hash_calculation,
        accounts_db_skip_shrink: config.accounts_db_skip_shrink,
-        accounts_db_use_index_hash_calculation: config.accounts_db_use_index_hash_calculation,
        tpu_coalesce_ms: config.tpu_coalesce_ms,
        validator_exit: Arc::new(RwLock::new(Exit::default())),
        poh_hashes_per_batch: config.poh_hashes_per_batch,
--- a/log-analyzer/Cargo.toml
+++ b/log-analyzer/Cargo.toml
@@ -3,7 +3,7 @@ authors = ["Solana Maintainers <maintainers@solana.com>"]
 edition = "2021"
 name = "solana-log-analyzer"
 description = "The solana cluster network analysis tool"
-version = "1.10.4"
+version = "1.11.0"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
@@ -11,11 +11,11 @@ publish = false

 [dependencies]
 byte-unit = "4.0.14"
-clap = "2.33.1"
+clap = { version = "3.1.5", features = ["cargo"] }
 serde = "1.0.136"
 serde_json = "1.0.79"
-solana-logger = { path = "../logger", version = "=1.10.4" }
-solana-version = { path = "../version", version = "=1.10.4" }
+solana-logger = { path = "../logger", version = "=1.11.0" }
+solana-version = { path = "../version", version = "=1.11.0" }

 [[bin]]
 name = "solana-log-analyzer"
--- a/log-analyzer/src/main.rs
+++ b/log-analyzer/src/main.rs
@@ -3,7 +3,7 @@ extern crate byte_unit;

 use {
    byte_unit::Byte,
-    clap::{crate_description, crate_name, value_t_or_exit, App, Arg, ArgMatches, SubCommand},
+    clap::{crate_description, crate_name, Arg, ArgMatches, Command},
    serde::{Deserialize, Serialize},
    std::{collections::HashMap, fs, ops::Sub, path::PathBuf},
 };
@@ -97,7 +97,7 @@ fn map_ip_address(mappings: &[IpAddrMapping], target: String) -> String {

 fn process_iftop_logs(matches: &ArgMatches) {
    let mut map_list: Vec<IpAddrMapping> = vec![];
-    if let ("map-IP", Some(args_matches)) = matches.subcommand() {
+    if let Some(("map-IP", args_matches)) = matches.subcommand() {
        let mut list = args_matches
            .value_of("list")
            .expect("Missing list of IP address mappings")
@@ -112,7 +112,7 @@ fn process_iftop_logs(matches: &ArgMatches) {
        map_list = serde_json::from_str(&list).expect("Failed to parse IP address mapping list");
    };

-    let log_path = PathBuf::from(value_t_or_exit!(matches, "file", String));
+    let log_path = PathBuf::from(matches.value_of_t_or_exit::<String>("file"));
    let mut log = fs::read_to_string(&log_path).expect("Unable to read log file");
    log.insert(0, '[');
    let terminate_at = log.rfind('}').expect("Didn't find a terminating '}'") + 1;
@@ -148,7 +148,7 @@ fn process_iftop_logs(matches: &ArgMatches) {
 }

 fn analyze_logs(matches: &ArgMatches) {
-    let dir_path = PathBuf::from(value_t_or_exit!(matches, "folder", String));
+    let dir_path = PathBuf::from(matches.value_of_t_or_exit::<String>("folder"));
    assert!(
        dir_path.is_dir(),
        "Need a folder that contains all log files"
@@ -196,26 +196,26 @@ fn analyze_logs(matches: &ArgMatches) {
 fn main() {
    solana_logger::setup();

-    let matches = App::new(crate_name!())
+    let matches = Command::new(crate_name!())
        .about(crate_description!())
        .version(solana_version::version!())
        .subcommand(
-            SubCommand::with_name("iftop")
+            Command::new("iftop")
                .about("Process iftop log file")
                .arg(
-                    Arg::with_name("file")
-                        .short("f")
+                    Arg::new("file")
+                        .short('f')
                        .long("file")
                        .value_name("iftop log file")
                        .takes_value(true)
                        .help("Location of the log file generated by iftop"),
                )
                .subcommand(
-                    SubCommand::with_name("map-IP")
+                    Command::new("map-IP")
                        .about("Map private IP to public IP Address")
                        .arg(
-                            Arg::with_name("list")
-                                .short("l")
+                            Arg::new("list")
+                                .short('l')
                                .long("list")
                                .value_name("JSON string")
                                .takes_value(true)
@@ -225,19 +225,19 @@ fn main() {
                ),
        )
        .subcommand(
-            SubCommand::with_name("analyze")
+            Command::new("analyze")
                .about("Compare processed network log files")
                .arg(
-                    Arg::with_name("folder")
-                        .short("f")
+                    Arg::new("folder")
+                        .short('f')
                        .long("folder")
                        .value_name("DIR")
                        .takes_value(true)
                        .help("Location of processed log files"),
                )
                .arg(
-                    Arg::with_name("all")
-                        .short("a")
+                    Arg::new("all")
+                        .short('a')
                        .long("all")
                        .takes_value(false)
                        .help("List all differences"),
@@ -246,8 +246,8 @@ fn main() {
        .get_matches();

    match matches.subcommand() {
-        ("iftop", Some(args_matches)) => process_iftop_logs(args_matches),
-        ("analyze", Some(args_matches)) => analyze_logs(args_matches),
+        Some(("iftop", args_matches)) => process_iftop_logs(args_matches),
+        Some(("analyze", args_matches)) => analyze_logs(args_matches),
        _ => {}
    };
 }
--- a/logger/Cargo.toml
+++ b/logger/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "solana-logger"
-version = "1.10.4"
+version = "1.11.0"
 description = "Solana Logger"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
--- a/measure/Cargo.toml
+++ b/measure/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "solana-measure"
 description = "Blockchain, Rebuilt for Scale"
-version = "1.10.4"
+version = "1.11.0"
 homepage = "https://solana.com/"
 documentation = "https://docs.rs/solana-measure"
 readme = "../README.md"
@@ -12,7 +12,7 @@ edition = "2021"

 [dependencies]
 log = "0.4.14"
-solana-sdk = { path = "../sdk", version = "=1.10.4" }
+solana-sdk = { path = "../sdk", version = "=1.11.0" }

 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
--- a/merkle-root-bench/Cargo.toml
+++ b/merkle-root-bench/Cargo.toml
@@ -2,7 +2,7 @@
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 edition = "2021"
 name = "solana-merkle-root-bench"
-version = "1.10.4"
+version = "1.11.0"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
@@ -11,11 +11,11 @@ publish = false
 [dependencies]
 clap = "2.33.1"
 log = "0.4.14"
-solana-logger = { path = "../logger", version = "=1.10.4" }
-solana-measure = { path = "../measure", version = "=1.10.4" }
-solana-runtime = { path = "../runtime", version = "=1.10.4" }
-solana-sdk = { path = "../sdk", version = "=1.10.4" }
-solana-version = { path = "../version", version = "=1.10.4" }
+solana-logger = { path = "../logger", version = "=1.11.0" }
+solana-measure = { path = "../measure", version = "=1.11.0" }
+solana-runtime = { path = "../runtime", version = "=1.11.0" }
+solana-sdk = { path = "../sdk", version = "=1.11.0" }
+solana-version = { path = "../version", version = "=1.11.0" }

 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
--- a/merkle-tree/Cargo.toml
+++ b/merkle-tree/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "solana-merkle-tree"
-version = "1.10.4"
+version = "1.11.0"
 description = "Solana Merkle Tree"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -11,7 +11,7 @@ edition = "2021"

 [dependencies]
 fast-math = "0.1"
-solana-program = { path = "../sdk/program", version = "=1.10.4" }
+solana-program = { path = "../sdk/program", version = "=1.11.0" }

 # This can go once the BPF toolchain target Rust 1.42.0+
 [target.bpfel-unknown-unknown.dependencies]
--- a/metrics/Cargo.toml
+++ b/metrics/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "solana-metrics"
-version = "1.10.4"
+version = "1.11.0"
 description = "Solana Metrics"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -15,7 +15,7 @@ gethostname = "0.2.3"
 lazy_static = "1.4.0"
 log = "0.4.14"
 reqwest = { version = "0.11.10", default-features = false, features = ["blocking", "rustls-tls", "json"] }
-solana-sdk = { path = "../sdk", version = "=1.10.4" }
+solana-sdk = { path = "../sdk", version = "=1.11.0" }

 [dev-dependencies]
 env_logger = "0.9.0"
--- a/multinode-demo/bootstrap-validator.sh
+++ b/multinode-demo/bootstrap-validator.sh
@@ -55,6 +55,9 @@ while [[ -n $1 ]]; do
    elif [[ $1 = --enable-cpi-and-log-storage ]]; then
      args+=("$1")
      shift
+    elif [[ $1 = --enable-extended-tx-metadata-storage ]]; then
+      args+=("$1")
+      shift
    elif [[ $1 = --enable-rpc-bigtable-ledger-storage ]]; then
      args+=("$1")
      shift
--- a/multinode-demo/validator.sh
+++ b/multinode-demo/validator.sh
@@ -141,6 +141,9 @@ while [[ -n $1 ]]; do
    elif [[ $1 = --enable-cpi-and-log-storage ]]; then
      args+=("$1")
      shift
+    elif [[ $1 = --enable-extended-tx-metadata-storage ]]; then
+      args+=("$1")
+      shift
    elif [[ $1 = --skip-poh-verify ]]; then
      args+=("$1")
      shift
--- a/net-shaper/Cargo.toml
+++ b/net-shaper/Cargo.toml
@@ -3,18 +3,18 @@ authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 edition = "2021"
 name = "solana-net-shaper"
 description = "The solana cluster network shaping tool"
-version = "1.10.4"
+version = "1.11.0"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
 publish = false

 [dependencies]
-clap = "2.33.1"
 rand = "0.7.0"
-serde = "1.0.136"
+clap = { version = "3.1.5", features = ["cargo"] }
+serde = { version = "1.0.136", features = ["derive"] }
 serde_json = "1.0.79"
-solana-logger = { path = "../logger", version = "=1.10.4" }
+solana-logger = { path = "../logger", version = "=1.11.0" }

 [[bin]]
 name = "solana-net-shaper"
--- a/net-shaper/src/main.rs
+++ b/net-shaper/src/main.rs
@@ -1,9 +1,6 @@
 #![allow(clippy::integer_arithmetic)]
 use {
-    clap::{
-        crate_description, crate_name, crate_version, value_t, value_t_or_exit, App, Arg,
-        ArgMatches, SubCommand,
-    },
+    clap::{crate_description, crate_name, crate_version, Arg, ArgMatches, Command},
    rand::{thread_rng, Rng},
    serde::{Deserialize, Serialize},
    std::{fs, io, path::PathBuf},
@@ -369,13 +366,13 @@ fn partition_id_to_tos(partition: usize) -> u8 {
 }

 fn shape_network(matches: &ArgMatches) {
-    let config_path = PathBuf::from(value_t_or_exit!(matches, "file", String));
+    let config_path = PathBuf::from(matches.value_of_t_or_exit::<String>("file"));
    let config = fs::read_to_string(&config_path).expect("Unable to read config file");
    let topology: NetworkTopology =
        serde_json::from_str(&config).expect("Failed to parse log as JSON");
-    let interface = value_t_or_exit!(matches, "iface", String);
-    let network_size = value_t_or_exit!(matches, "size", u64);
-    let my_index = value_t_or_exit!(matches, "position", u64);
+    let interface: String = matches.value_of_t_or_exit("iface");
+    let network_size: u64 = matches.value_of_t_or_exit("size");
+    let my_index: u64 = matches.value_of_t_or_exit("position");
    if !shape_network_steps(&topology, &interface, network_size, my_index) {
        delete_ifb(interface.as_str());
        flush_iptables_rule();
@@ -471,9 +468,9 @@ fn configure(matches: &ArgMatches) {
    let config = if !matches.is_present("random") {
        NetworkTopology::new_from_stdin()
    } else {
-        let max_partitions = value_t!(matches, "max-partitions", usize).unwrap_or(4);
-        let max_drop = value_t!(matches, "max-drop", u8).unwrap_or(100);
-        let max_delay = value_t!(matches, "max-delay", u32).unwrap_or(50);
+        let max_partitions: usize = matches.value_of_t("max-partitions").unwrap_or(4);
+        let max_drop: u8 = matches.value_of_t("max-drop").unwrap_or(100);
+        let max_delay: u32 = matches.value_of_t("max-delay").unwrap_or(50);
        NetworkTopology::new_random(max_partitions, max_drop, max_delay)
    };

@@ -487,15 +484,15 @@ fn configure(matches: &ArgMatches) {
 fn main() {
    solana_logger::setup();

-    let matches = App::new(crate_name!())
+    let matches = Command::new(crate_name!())
        .about(crate_description!())
        .version(crate_version!())
        .subcommand(
-            SubCommand::with_name("shape")
+            Command::new("shape")
                .about("Shape the network using config file")
                .arg(
-                    Arg::with_name("file")
-                        .short("f")
+                    Arg::new("file")
+                        .short('f')
                        .long("file")
                        .value_name("config file")
                        .takes_value(true)
@@ -503,8 +500,8 @@ fn main() {
                        .help("Location of the network config file"),
                )
                .arg(
-                    Arg::with_name("size")
-                        .short("s")
+                    Arg::new("size")
+                        .short('s')
                        .long("size")
                        .value_name("network size")
                        .takes_value(true)
@@ -512,8 +509,8 @@ fn main() {
                        .help("Number of nodes in the network"),
                )
                .arg(
-                    Arg::with_name("iface")
-                        .short("i")
+                    Arg::new("iface")
+                        .short('i')
                        .long("iface")
                        .value_name("network interface name")
                        .takes_value(true)
@@ -521,8 +518,8 @@ fn main() {
                        .help("Name of network interface"),
                )
                .arg(
-                    Arg::with_name("position")
-                        .short("p")
+                    Arg::new("position")
+                        .short('p')
                        .long("position")
                        .value_name("position of node")
                        .takes_value(true)
@@ -531,11 +528,11 @@ fn main() {
                ),
        )
        .subcommand(
-            SubCommand::with_name("cleanup")
+            Command::new("cleanup")
                .about("Remove the network filters using config file")
                .arg(
-                    Arg::with_name("file")
-                        .short("f")
+                    Arg::new("file")
+                        .short('f')
                        .long("file")
                        .value_name("config file")
                        .takes_value(true)
@@ -543,8 +540,8 @@ fn main() {
                        .help("Location of the network config file"),
                )
                .arg(
-                    Arg::with_name("size")
-                        .short("s")
+                    Arg::new("size")
+                        .short('s')
                        .long("size")
                        .value_name("network size")
                        .takes_value(true)
@@ -552,8 +549,8 @@ fn main() {
                        .help("Number of nodes in the network"),
                )
                .arg(
-                    Arg::with_name("iface")
-                        .short("i")
+                    Arg::new("iface")
+                        .short('i')
                        .long("iface")
                        .value_name("network interface name")
                        .takes_value(true)
@@ -561,8 +558,8 @@ fn main() {
                        .help("Name of network interface"),
                )
                .arg(
-                    Arg::with_name("position")
-                        .short("p")
+                    Arg::new("position")
+                        .short('p')
                        .long("position")
                        .value_name("position of node")
                        .takes_value(true)
@@ -571,18 +568,18 @@ fn main() {
                ),
        )
        .subcommand(
-            SubCommand::with_name("configure")
+            Command::new("configure")
                .about("Generate a config file")
                .arg(
-                    Arg::with_name("random")
-                        .short("r")
+                    Arg::new("random")
+                        .short('r')
                        .long("random")
                        .required(false)
                        .help("Generate a random config file"),
                )
                .arg(
-                    Arg::with_name("max-partitions")
-                        .short("p")
+                    Arg::new("max-partitions")
+                        .short('p')
                        .long("max-partitions")
                        .value_name("count")
                        .takes_value(true)
@@ -590,8 +587,8 @@ fn main() {
                        .help("Maximum number of partitions. Used only with random configuration generation"),
                )
                .arg(
-                    Arg::with_name("max-drop")
-                        .short("d")
+                    Arg::new("max-drop")
+                        .short('d')
                        .long("max-drop")
                        .value_name("percentage")
                        .takes_value(true)
@@ -599,8 +596,8 @@ fn main() {
                        .help("Maximum amount of packet drop. Used only with random configuration generation"),
                )
                .arg(
-                    Arg::with_name("max-delay")
-                        .short("y")
+                    Arg::new("max-delay")
+                        .short('y')
                        .long("max-delay")
                        .value_name("ms")
                        .takes_value(true)
@@ -611,13 +608,13 @@ fn main() {
        .get_matches();

    match matches.subcommand() {
-        ("shape", Some(args_matches)) => shape_network(args_matches),
-        ("cleanup", Some(args_matches)) => {
-            let interfaces = value_t_or_exit!(args_matches, "iface", String);
+        Some(("shape", args_matches)) => shape_network(args_matches),
+        Some(("cleanup", args_matches)) => {
+            let interfaces: String = args_matches.value_of_t_or_exit("iface");
            let iface = parse_interface(&interfaces);
            cleanup_network(iface)
        }
-        ("configure", Some(args_matches)) => configure(args_matches),
+        Some(("configure", args_matches)) => configure(args_matches),
        _ => {}
    };
 }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
dependabot[bot]	d1c06a25e7	chore: bump eslint-plugin-import from 2.25.3 to 2.25.4 in /web3.js Bumps [eslint-plugin-import](https://github.com/import-js/eslint-plugin-import) from 2.25.3 to 2.25.4. - [Release notes](https://github.com/import-js/eslint-plugin-import/releases) - [Changelog](https://github.com/import-js/eslint-plugin-import/blob/main/CHANGELOG.md) - [Commits](https://github.com/import-js/eslint-plugin-import/compare/v2.25.3...v2.25.4) --- updated-dependencies: - dependency-name: eslint-plugin-import dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2022-03-26 21:35:41 -07:00
stellaw1	c08cfafd6c	feat: adds getBlockProduction RPC call	2022-03-26 18:31:40 -07:00
Brooks Prumo	31b707b625	Specify if archive size datapoint is for full or incremental snapshots (#23941 )	2022-03-26 12:29:13 -05:00
steveluscher	5e08701189	feat: the search bar now auto-focuses when you first visit the site	2022-03-26 00:05:15 -07:00
Michael Vines	87e0aa1b74	improve arg documentation	2022-03-25 21:37:10 -07:00
Trent Nelson	bd27eedd15	cli: allow skipping fee-checks when writing program buffers (hidden)	2022-03-25 18:19:03 -06:00
Jeff Washington (jwash)	c24de17278	remove index hash calculation as an option (#23928 )	2022-03-25 15:32:53 -05:00
Jeff Washington (jwash)	ec78702bc8	RollingBitField::get_all_less_than (#23919 )	2022-03-25 15:20:22 -05:00
HaoranYi	01af40d6b6	Fix intermittent validator_exit test failure (#23594 ) * run validator_exit_test sequentially * limit validator exit run to its own serial run subset add 10ms delay in the validator exit tests * fix intermittent validator exit failure * no sleep * undo the code move	2022-03-25 14:38:19 -05:00
behzad nouri	1f9c89c1e8	expands lifetime of SlotStats (#23872 ) Current slot stats are removed when the slot is full or every 30 seconds if the slot is before root: https://github.com/solana-labs/solana/blob/493a8e234/ledger/src/blockstore.rs#L2017-L2027 In order to track if the slot is ultimately marked as dead or rooted and emit more metrics, this commit expands lifetime of SlotStats while bounding total size of cache using an LRU eviction policy.	2022-03-25 19:32:22 +00:00
Will Hickey	c6dda3b324	Add solana-faucet to the list of dependencies referenced by downstream projects (#23935 )	2022-03-25 13:27:31 -05:00
Trent Nelson	e34c52934c	ci: don't allow mergify to add automerge label to merged PRs	2022-03-25 16:19:11 +00:00
Jeff Washington (jwash)	acfd22712b	RollingBitFIeld to its own file (#23917 )	2022-03-25 10:37:00 -05:00
ryleung-solana	6b85c2104c	Implement forwarding via TpuConnection (#23817 )	2022-03-25 11:31:40 -04:00
Steven Luscher	f44c8f296f	fix: thread `enforce_ulimit_nofile` config down when opening blockstore (#23925 )	2022-03-25 03:13:33 -05:00
steveluscher	9cf7720922	fix: when there is no instruction index, default to the current instruction by supplying u16:MAX	2022-03-24 22:55:52 -07:00
steveluscher	c73cdfd6ce	fix: add TypeScript buffer type to nonce-account.ts	2022-03-24 22:55:52 -07:00
steveluscher	477355df3b	fix: add TypeScript buffer type to stake-program.ts	2022-03-24 22:55:52 -07:00
steveluscher	6686b7c534	fix: add TypeScript buffer type to message.ts	2022-03-24 22:55:52 -07:00
steveluscher	741c85ca7c	fix: add TypeScript buffer type to loader.ts	2022-03-24 22:55:52 -07:00
steveluscher	6bb02cdcc1	fix: add TypeScript buffer type to secp256k1-program.ts	2022-03-24 22:55:52 -07:00
steveluscher	96361295aa	fix: add TypeScript buffer type to ed25519-program.ts	2022-03-24 22:55:52 -07:00
steveluscher	3333f37e88	fix: add TypeScript buffer type to vote-account.ts	2022-03-24 22:55:52 -07:00
steveluscher	b2f2a68b86	fix: fix spelling of timestamp in BlockTimestamp type	2022-03-24 22:55:52 -07:00
steveluscher	c227b8ca4d	fix: add TypeScript buffer type to vote-program.ts	2022-03-24 22:55:52 -07:00
steveluscher	607a5c05de	fix: add TypeScript buffer type to system-program.ts	2022-03-24 22:55:52 -07:00
steveluscher	807f88e547	fix: add TypeScript types to the rustString buffer layout helper	2022-03-24 22:55:52 -07:00
steveluscher	d34fe3dba3	fix: add TypeScript buffer type to layout.ts	2022-03-24 22:55:52 -07:00
steveluscher	b516a25132	fix: add TypeScript buffer type to instruction.ts	2022-03-24 22:55:52 -07:00
steveluscher	023fc028bc	chore: Upgrade buffer-layout to v4.0.0	2022-03-24 22:55:52 -07:00
Steven Luscher	412d9be445	fix: repair web3 connection tests by making fewer assumptions about the existence of particular blocks (#23921 ) * fix: repair 'get confirmed signatures for address' test in web3.js * fix: repair 'get signatures for address' test in web3.js * fix: repair 'get parsed confirmed transactions' test in web3.js * fix: repair 'get transaction' test in web3.js * fix: repair 'get confirmed transaction' test in web3.js * fix: repair 'get block' test in web3.js * fix: repair 'get confirmed block' test in web3.js * fix: repair 'get block signatures' test in web3.js * fix: repair 'get block time' test in web3.js Co-authored-by: steveluscher <github@steveluscher.com>	2022-03-24 22:21:14 -07:00
Michael Vines	c8c3c4359f	`vote-authorize-voter` now accepts either the vote or withdraw authority	2022-03-24 16:46:41 -07:00
Jeff Washington (jwash)	51f5524e2f	make verify_accounts_package_hash like other hash calc (#23906 )	2022-03-24 17:49:48 -05:00
Brian Anderson	492c54a28f	Fix example mock Signer API in solana-program (#23911 )	2022-03-24 17:58:51 -04:00
Jeff Washington (jwash)	55d61023f7	document 'accounts' hash (#23907 )	2022-03-24 15:58:52 -05:00
HaoranYi	fedf4e984f	typo (#23910 )	2022-03-24 15:21:59 -05:00
Josh	9dbb950a25	feat(explorer): show ping server metrics unavailable (#23914 ) * feat: show ping server metrics unavailable * fix: formatting	2022-03-24 13:54:51 -06:00
steviez	b61c0a4a21	Add accounts arg to genesis command to dump genesis account info (#23879 )	2022-03-24 14:26:08 -05:00
Alexander Meißner	140c8dd01f	Refactor: Replaces KeyedAccount in_get_sysvar_with_account_check (#23905 ) * Replaces all use sites of get_sysvar_with_account_check by get_sysvar_with_account_check2. * Removes get_sysvar_with_account_check. * Renames get_sysvar_with_account_check2 to get_sysvar_with_account_check.	2022-03-24 19:30:42 +01:00
Jeff Washington (jwash)	37c36ce3fa	pass stats separately from CalcAccountsHashConfig (#23892 )	2022-03-24 12:48:47 -05:00
Jeff Washington (jwash)	82328fd9d8	move max_clean_root deeper in flush cache (#23869 )	2022-03-24 12:45:49 -05:00
steviez	c31db81ac4	Use VoteAccountsHashMap type alias in all applicable spots (#23904 )	2022-03-24 12:09:48 -05:00
Jeff Washington (jwash)	a22a2384bf	fix ci test error (#23908 )	2022-03-24 11:30:20 -05:00
ryleung-solana	82945ba973	Optimize TpuConnection and its implementations and refactor connection-cache to not use dyn in order to enable those changes (#23877 )	2022-03-24 11:40:26 -04:00
Jeff Washington (jwash)	5b916961b5	HashCalc uses self.accounts_cache (#23890 )	2022-03-24 10:34:28 -05:00
Jeff Washington (jwash)	f2aea3b7c7	flush_slot_cache takes [Slot] (#23865 )	2022-03-24 10:24:36 -05:00
Jeff Washington (jwash)	9d3b17c635	HashCalc uses self.accounts_index (#23888 )	2022-03-24 10:06:32 -05:00
Jeff Washington (jwash)	396b49a7c1	Start saving/loading prior_roots(_with_hash) to snapshot (#23844 ) * Start saving/loading prior_roots(_with_hash) to snapshot * Update runtime/src/accounts_index.rs Co-authored-by: Michael Vines <mvines@gmail.com> * Update runtime/src/accounts_index.rs Co-authored-by: Michael Vines <mvines@gmail.com> * update comment Co-authored-by: Michael Vines <mvines@gmail.com>	2022-03-24 10:06:24 -05:00
Jeff Washington (jwash)	b22165ad69	hash calc uses self.filler_account_suffix (#23887 )	2022-03-24 09:58:06 -05:00
Jeff Washington (jwash)	9022931689	calc hash uses self.num_hash_scan_passes (#23883 )	2022-03-24 09:44:42 -05:00
Jeff Washington (jwash)	e3eb002f66	Log storage size stats at hash calc (#23843 )	2022-03-24 09:40:35 -05:00
Jeff Washington (jwash)	f1a411c897	add epoch_schedule and rent_collector to hash calc (#23857 )	2022-03-24 09:39:22 -05:00
Jeff Washington (jwash)	db5d68f01f	HashCalc uses self.accounts_hash_cache_path (#23882 )	2022-03-24 09:31:55 -05:00
HaoranYi	90009f330b	small refactor to shorten the lock on slot_under_contention hashset (#23891 ) * small refactor to shorten the lock on slot_under_contention hashset * adding comments * comments	2022-03-24 08:20:56 -05:00
Alexander Meißner	91c2729856	Replaces keyed_account get_signers() by InstructionContext::get_signers(). (#23863 )	2022-03-24 12:57:51 +01:00
Yueh-Hsuan Chiang	c83c95b56b	(LedgerStore) Create ColumnMetrics trait for CF metric reporting (#23763 ) This PR does a refactoring on column family-related metrics reporting. As the metric reporting is per column family basis, the PR creates ColumnMetrics trait and move the metric reporting logic into it. This refactoring will make future column metric reporting (such as read PerfContext) much cleaner.	2022-03-23 20:51:49 -07:00
Jeff Washington (jwash)	5a892af2fe	disable 'check_hash' on accounts hash calc (#23873 )	2022-03-23 21:03:31 -05:00
Jeff Washington (jwash)	3e22d4b286	calc hash uses self.thread_pool_clean (#23881 )	2022-03-23 20:52:38 -05:00
Brian Anderson	6428602cd9	Make find_program_address client example runnable (#23492 )	2022-03-23 19:37:12 -06:00
steveluscher	260fdf7ba3	Revert "chore: Upgrade buffer-layout package in web3.js (#23897 )" Fixing up the types is going to take me a bit longer than I anticipated, so I'll back this out for now.	2022-03-23 18:34:01 -07:00
Jack May	486f7b7673	use array access function (#23895 )	2022-03-23 17:03:01 -07:00
Steven Luscher	0c0db9308b	chore: Upgrade buffer-layout package in web3.js (#23897 )	2022-03-23 14:56:13 -07:00
Trent Nelson	9dae5551a1	Revert transient dependency bumps from `c4ecfa5`	2022-03-23 21:08:26 +00:00
Josh	100fd03f3e	feat(explorer): solana ping set minBarHeight (#23894 )	2022-03-23 20:35:59 +00:00
dependabot[bot]	7af7c15802	chore:(deps): bump minimist from 1.2.5 to 1.2.6 in /explorer (#23886 ) Bumps [minimist](https://github.com/substack/minimist) from 1.2.5 to 1.2.6. - [Release notes](https://github.com/substack/minimist/releases) - [Commits](https://github.com/substack/minimist/compare/1.2.5...1.2.6) --- updated-dependencies: - dependency-name: minimist dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2022-03-23 20:00:24 +00:00
dependabot[bot]	154b828287	chore:(deps): bump nanoid from 3.1.23 to 3.3.1 in /explorer (#23884 ) Bumps [nanoid](https://github.com/ai/nanoid) from 3.1.23 to 3.3.1. - [Release notes](https://github.com/ai/nanoid/releases) - [Changelog](https://github.com/ai/nanoid/blob/main/CHANGELOG.md) - [Commits](https://github.com/ai/nanoid/compare/3.1.23...3.3.1) --- updated-dependencies: - dependency-name: nanoid dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2022-03-23 19:59:16 +00:00
Andrey Frolov	59290c08aa	fix: add type-check script to web3.js package (#23109 )	2022-03-23 12:58:42 -07:00
microwavedcola1	1b7b261460	feat(explorer): render program name, ix name, and account names from on chain idl for specific anchor programs (#23499 ) * show titles of ix, from idl Signed-off-by: microwavedcola1 <microwavedcola@gmail.com> * remove unused Signed-off-by: microwavedcola1 <microwavedcola@gmail.com> * remaining accounts Signed-off-by: microwavedcola1 <microwavedcola@gmail.com> * fallback Signed-off-by: microwavedcola1 <microwavedcola@gmail.com> * fix from code review: remove default for the non fallback case Signed-off-by: microwavedcola1 <microwavedcola@gmail.com> * keep camelcase Signed-off-by: microwavedcola1 <microwavedcola@gmail.com> * formatting Signed-off-by: microwavedcola1 <microwavedcola@gmail.com>	2022-03-23 12:14:26 -07:00
Jeff Washington (jwash)	dc3863ef14	flush_slot_cache_with_clean (#23868 )	2022-03-23 14:09:56 -05:00
Jeff Washington (jwash)	260f899eda	write cache: hashmap to set (#23866 )	2022-03-23 14:05:45 -05:00
Jeff Washington (jwash)	9e61fe7583	add AccountsHashConfig to manage parameters (#23850 )	2022-03-23 13:44:23 -05:00
HaoranYi	db49b826f0	seperate blockstore metrics from window service metrics (#23871 )	2022-03-23 13:38:17 -05:00
HaoranYi	7ff8ed869c	typos (#23870 )	2022-03-23 13:36:55 -05:00
Sammy	26da64184a	feat(web3.js): expose rpcEndpoint in client for web3.js (#23719 ) Adds a getter to the commitment class to expose the rpcEndpoint property.	2022-03-23 11:05:37 -07:00
Will Hickey	a573cfa39d	Revert "Remove unneeded unit expression" This reverts commit `e8e0097046`.	2022-03-23 10:22:18 -07:00
Jeff Washington (jwash)	b1280b670a	calculate_accounts_hash_without_index takes &self (#23846 ) * calculate_accounts_hash_without_index takes &self * Update runtime/src/snapshot_package.rs Co-authored-by: Brooks Prumo <brooks@prumo.org> Co-authored-by: Brooks Prumo <brooks@prumo.org>	2022-03-23 11:57:32 -05:00
Jeff Washington (jwash)	7b89222fde	don't start extra threads for shrink/clean/hash (#23858 )	2022-03-23 11:53:37 -05:00
Josh	911aa5bad3	fix(explorer): can't convert too large of stake to number (#23876 )	2022-03-23 09:34:43 -07:00
Josh	5541a5873b	fix(explorer): serum init open orders has optional openOrdersMarketAuthority (#23875 )	2022-03-23 09:32:24 -07:00
Josh	6b76391ed2	fix(explorer): add sync native to token program decode (#23874 )	2022-03-23 09:31:58 -07:00
Jack May	6962a667e5	add-u8-align-check (#23860 )	2022-03-23 09:16:29 -07:00
Jack May	27b66db88d	Use sat math for ptr calcs (#23861 )	2022-03-23 09:16:03 -07:00
Jeff Washington (jwash)	493a8e2348	remove random flushing of write cache (#23845 )	2022-03-23 08:45:44 -05:00
klykov	9859eb83b5	upd Cargo.lock for bpf	2022-03-23 09:25:36 +01:00
klykov	36807d5fa3	update clap to v3: poh-bench	2022-03-23 09:25:36 +01:00
klykov	22404ca1fc	update clap to v3: bench-streamer	2022-03-23 09:25:36 +01:00
klykov	01317395e9	update Cargo.lock	2022-03-23 09:25:36 +01:00
klykov	3f2971692d	update clap to v3: net-utils	2022-03-23 09:25:36 +01:00
klykov	300c50798f	update clap to v3: log-analyzer	2022-03-23 09:25:36 +01:00
klykov	12e24a90a0	update clap to v3: net-sharper	2022-03-23 09:25:36 +01:00
Edgar Xi	d8be0d9430	make get_protobuf_or_bincode_cells accept IntoIter on row_keys, make get_confirmed_blocks_with_data return an Iterator	2022-03-22 22:47:25 -06:00
Edgar Xi	f717fda9a3	modify get_protobuf_or_bincode_cells to accept and return an iterator	2022-03-22 22:47:25 -06:00
Edgar Xi	fbcf6a0802	use &[T] instead of Vec<T> where appropriate clippy	2022-03-22 22:47:25 -06:00
Edgar Xi	5533e9393c	appease clippy	2022-03-22 22:47:25 -06:00
Edgar Xi	f3219fb695	add get_confirmed_blocks_with_data and get_protobuf_or_bincode_cells	2022-03-22 22:47:25 -06:00
Jeff Washington (jwash)	bc35e1c5f5	snapshot code needs all storages for hash calc (#23840 )	2022-03-22 21:27:54 -05:00
Justin Starry	92462ae031	Manually serialize and use `send_wire_transaction` for votes (#23826 ) * Revert "core: partial versioned transaction support for voting service" This reverts commit `eb3df4c20e`. * Manually serialize vote tx before sending to TPU	2022-03-23 09:47:55 +08:00
Alexander Meißner	9f0ca6d88a	Refactor: Remove `trait` from nonce keyed account (#23811 ) * Removes the trait `NonceKeyedAccount`.	2022-03-23 02:09:30 +01:00
Jack May	3d7c8442c7	add size check for from_raw_parts (#23781 )	2022-03-22 15:20:39 -07:00
Jon Cinque	7af48465fa	transaction-status: Add return data to meta (#23688 ) * transaction-status: Add return data to meta * Add return data to simulation results * Use pretty-hex for printing return data * Update arg name, make TransactionRecord struct * Rename TransactionRecord -> ExecutionRecord	2022-03-22 23:17:05 +01:00
Kirill Lykov	359e2de090	ignore heavy tests in dos	2022-03-22 20:19:28 +01:00
Jeff Washington (jwash)	1089a38aaf	AcctIdx: rework scan and write to disk (#23794 )	2022-03-22 11:54:12 -05:00
Jeff Washington (jwash)	89ba3ff139	log fail to evict (#23815 )	2022-03-22 09:19:38 -05:00
axleiro	16b73a998b	Increasing timeout in local-cluster-slow by 10 min	2022-03-22 17:52:06 +05:30
axleiro	9347d57973	increasing timeout of local-cluster-slow test by 10 min	2022-03-22 17:51:13 +05:30
Yueh-Hsuan Chiang	ae75b1a25f	(LedgerStore) Add compression type (#23578 ) This PR adds `--rocksdb-ledger-compression` as a hidden argument to the validator for specifying the compression algorithm for TransactionStatus. Available compression algorithms include `lz4`, `snappy`, `zlib`. The default value is `none`. Experimental results show that with lz4 compression, we can achieve ~37% size-reduction on the TransactionStatus column family, or ~8% size-reduction of the ledger store size.	2022-03-22 02:27:09 -07:00
Lijun Wang	49228573f4	Use connection cache in send transaction (#23712 ) Use connection cache in send transaction (#23712)	2022-03-21 23:24:21 -07:00
Trent Nelson	eb3df4c20e	core: partial versioned transaction support for voting service	2022-03-21 22:59:05 -06:00
Justin Starry	016d3c450a	Update TpuConnection interface to be compatible with versioned txs (#23760 ) * Update TpuConnection interface to be compatible with versioned txs * Add convenience method for sending txs * use parallel iterator to serialize transactions	2022-03-22 09:45:22 +08:00
HaoranYi	45a7c6edfb	Fix typos and a small refactor (#23805 ) * fix typo * remove packet_has_more_unprocessed_transactions function	2022-03-21 18:35:31 -05:00
Will Hickey	c4ecfa5716	Bump version to v1.11 (#23807 ) * Revert crossbeam_epoch to stable. 0.9.8 only works with nightly * Remove unneeded unit expression	2022-03-21 17:40:50 -05:00
Jeff Washington (jwash)	24f6855f86	AcctIdx: only remove a fixed number of items per write lock (#23795 )	2022-03-21 16:55:04 -05:00
samkim-crypto	10eeafd3d6	zk-token-sdk: handle edge cases for transfer with fee (#23804 ) * zk-token-sdk: handle edge cases for transfer with fee * zk-token-sdk: clippy * zk-token-sdk: clippy * zk-token-sdk: cargo fmt	2022-03-21 16:10:33 -04:00
Brooks Prumo	cb06126388	Set accounts_data_len on feature activation (#23730 )	2022-03-21 12:28:26 -05:00
Tyera Eulberg	9c60991cd3	Add ability to query bigtable via solana-test-validator, with hidden params	2022-03-21 11:26:49 -06:00
Trent Nelson	9b32b72990	bigtable: allow custom instance names	2022-03-21 11:26:49 -06:00
Trent Nelson	f513195468	bigtable: add a config ctor for `LedgerStorage`	2022-03-21 11:26:49 -06:00
Tyera Eulberg	63ee00e647	Refactor validator bigtable config	2022-03-21 11:26:49 -06:00
Michael Vines	99f1a43262	Add v1.10 backport label, remove v1.8 backport label	2022-03-21 09:50:55 -07:00
DimAn	739e43ba58	Add ability to get the latest incremental snapshot via RPC (#23788 )	2022-03-21 11:48:49 -05:00
Lijun Wang	ae76fe2bd7	Made connection cache configurable. (#23783 ) Added command-line argument tpu-use-quic argument. Changed connection cache to return different connections based on the config.	2022-03-21 09:31:37 -07:00
Pankaj Garg	5d03b188c8	Use QUIC client in voting service (#23713 ) * Use QUIC client in voting service * guard quic-client usage with a flag * add measure to time the quic client * move time measure outside if block * remove quic vs UDP flag from voting service	2022-03-21 09:10:16 -07:00
Jeff Washington (jwash)	965ab9186d	AcctIdx: fix infinite loop (#23806 )	2022-03-21 10:58:36 -05:00