Restore getProgramAccounts spl-token secondary-index functionality (backport #20993) (#21004)

* Restore getProgramAccounts spl-token secondary-index functionality (#20993)

* Allow get_spl_token_X_filters to match on any encoding, and optimize earlier

* Remove redundant optimize calls

* Compress match statements

* Add method docs, including note to use optimize_filters before spl-token checks

* Add logs

(cherry picked from commit b2f6cfb9ff)

# Conflicts:
#	rpc/src/rpc.rs

* Fix conflict

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

Cargo.toml

@@ -45,9 +45,6 @@ members = [
     "programs/bpf_loader",
     "programs/config",
     "programs/exchange",
-    "programs/failure",
-    "programs/noop",
-    "programs/ownable",
     "programs/secp256k1",
     "programs/stake",
     "programs/vote",

account-decoder/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "solana-account-decoder"
-version = "1.7.15"
+version = "1.7.17"
 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.122"
 serde_derive = "1.0.103"
 serde_json = "1.0.56"
-solana-config-program = { path = "../programs/config", version = "=1.7.15" }
-solana-sdk = { path = "../sdk", version = "=1.7.15" }
-solana-vote-program = { path = "../programs/vote", version = "=1.7.15" }
+solana-config-program = { path = "../programs/config", version = "=1.7.17" }
+solana-sdk = { path = "../sdk", version = "=1.7.17" }
+solana-vote-program = { path = "../programs/vote", version = "=1.7.17" }
 spl-token-v2-0 = { package = "spl-token", version = "=3.2.0", features = ["no-entrypoint"] }
 thiserror = "1.0"
 zstd = "0.5.1"

accounts-bench/Cargo.toml

@@ -2,7 +2,7 @@
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 edition = "2018"
 name = "solana-accounts-bench"
-version = "1.7.15"
+version = "1.7.17"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
@@ -11,11 +11,11 @@ publish = false
 [dependencies]
 log = "0.4.11"
 rayon = "1.5.0"
-solana-logger = { path = "../logger", version = "=1.7.15" }
-solana-runtime = { path = "../runtime", version = "=1.7.15" }
-solana-measure = { path = "../measure", version = "=1.7.15" }
-solana-sdk = { path = "../sdk", version = "=1.7.15" }
-solana-version = { path = "../version", version = "=1.7.15" }
+solana-logger = { path = "../logger", version = "=1.7.17" }
+solana-runtime = { path = "../runtime", version = "=1.7.17" }
+solana-measure = { path = "../measure", version = "=1.7.17" }
+solana-sdk = { path = "../sdk", version = "=1.7.17" }
+solana-version = { path = "../version", version = "=1.7.17" }
 rand = "0.7.0"
 clap = "2.33.1"
 crossbeam-channel = "0.4"

accounts-cluster-bench/Cargo.toml

@@ -2,7 +2,7 @@
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 edition = "2018"
 name = "solana-accounts-cluster-bench"
-version = "1.7.15"
+version = "1.7.17"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
@@ -13,24 +13,24 @@ clap = "2.33.1"
 log = "0.4.11"
 rand = "0.7.0"
 rayon = "1.4.1"
-solana-account-decoder = { path = "../account-decoder", version = "=1.7.15" }
-solana-clap-utils = { path = "../clap-utils", version = "=1.7.15" }
-solana-client = { path = "../client", version = "=1.7.15" }
-solana-core = { path = "../core", version = "=1.7.15" }
-solana-faucet = { path = "../faucet", version = "=1.7.15" }
-solana-gossip = { path = "../gossip", version = "=1.7.15" }
-solana-logger = { path = "../logger", version = "=1.7.15" }
-solana-measure = { path = "../measure", version = "=1.7.15" }
-solana-net-utils = { path = "../net-utils", version = "=1.7.15" }
-solana-runtime = { path = "../runtime", version = "=1.7.15" }
-solana-sdk = { path = "../sdk", version = "=1.7.15" }
-solana-streamer = { path = "../streamer", version = "=1.7.15" }
-solana-transaction-status = { path = "../transaction-status", version = "=1.7.15" }
-solana-version = { path = "../version", version = "=1.7.15" }
+solana-account-decoder = { path = "../account-decoder", version = "=1.7.17" }
+solana-clap-utils = { path = "../clap-utils", version = "=1.7.17" }
+solana-client = { path = "../client", version = "=1.7.17" }
+solana-core = { path = "../core", version = "=1.7.17" }
+solana-faucet = { path = "../faucet", version = "=1.7.17" }
+solana-gossip = { path = "../gossip", version = "=1.7.17" }
+solana-logger = { path = "../logger", version = "=1.7.17" }
+solana-measure = { path = "../measure", version = "=1.7.17" }
+solana-net-utils = { path = "../net-utils", version = "=1.7.17" }
+solana-runtime = { path = "../runtime", version = "=1.7.17" }
+solana-sdk = { path = "../sdk", version = "=1.7.17" }
+solana-streamer = { path = "../streamer", version = "=1.7.17" }
+solana-transaction-status = { path = "../transaction-status", version = "=1.7.17" }
+solana-version = { path = "../version", version = "=1.7.17" }
 spl-token-v2-0 = { package = "spl-token", version = "=3.2.0", features = ["no-entrypoint"] }
 
 [dev-dependencies]
-solana-local-cluster = { path = "../local-cluster", version = "=1.7.15" }
+solana-local-cluster = { path = "../local-cluster", version = "=1.7.17" }
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]

banking-bench/Cargo.toml

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

banks-client/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "solana-banks-client"
-version = "1.7.15"
+version = "1.7.17"
 description = "Solana banks client"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -15,16 +15,16 @@ borsh = "0.9.0"
 borsh-derive = "0.9.0"
 futures = "0.3"
 mio = "0.7.6"
-solana-banks-interface = { path = "../banks-interface", version = "=1.7.15" }
-solana-program = { path = "../sdk/program", version = "=1.7.15" }
-solana-sdk = { path = "../sdk", version = "=1.7.15" }
+solana-banks-interface = { path = "../banks-interface", version = "=1.7.17" }
+solana-program = { path = "../sdk/program", version = "=1.7.17" }
+solana-sdk = { path = "../sdk", version = "=1.7.17" }
 tarpc = { version = "0.24.1", features = ["full"] }
 tokio = { version = "1", features = ["full"] }
 tokio-serde = { version = "0.8", features = ["bincode"] }
 
 [dev-dependencies]
-solana-runtime = { path = "../runtime", version = "=1.7.15" }
-solana-banks-server = { path = "../banks-server", version = "=1.7.15" }
+solana-runtime = { path = "../runtime", version = "=1.7.17" }
+solana-banks-server = { path = "../banks-server", version = "=1.7.17" }
 
 [lib]
 crate-type = ["lib"]

banks-interface/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "solana-banks-interface"
-version = "1.7.15"
+version = "1.7.17"
 description = "Solana banks RPC interface"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -12,7 +12,7 @@ edition = "2018"
 [dependencies]
 mio = "0.7.6"
 serde = { version = "1.0.122", features = ["derive"] }
-solana-sdk = { path = "../sdk", version = "=1.7.15" }
+solana-sdk = { path = "../sdk", version = "=1.7.17" }
 tarpc = { version = "0.24.1", features = ["full"] }
 
 [dev-dependencies]

banks-server/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "solana-banks-server"
-version = "1.7.15"
+version = "1.7.17"
 description = "Solana banks server"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -14,10 +14,10 @@ bincode = "1.3.1"
 futures = "0.3"
 log = "0.4.11"
 mio = "0.7.6"
-solana-banks-interface = { path = "../banks-interface", version = "=1.7.15" }
-solana-runtime = { path = "../runtime", version = "=1.7.15" }
-solana-sdk = { path = "../sdk", version = "=1.7.15" }
-solana-metrics = { path = "../metrics", version = "=1.7.15" }
+solana-banks-interface = { path = "../banks-interface", version = "=1.7.17" }
+solana-runtime = { path = "../runtime", version = "=1.7.17" }
+solana-sdk = { path = "../sdk", version = "=1.7.17" }
+solana-metrics = { path = "../metrics", version = "=1.7.17" }
 tarpc = { version = "0.24.1", features = ["full"] }
 tokio = { version = "1", features = ["full"] }
 tokio-serde = { version = "0.8", features = ["bincode"] }

bench-exchange/Cargo.toml

@@ -2,7 +2,7 @@
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 edition = "2018"
 name = "solana-bench-exchange"
-version = "1.7.15"
+version = "1.7.17"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
@@ -18,23 +18,23 @@ rand = "0.7.0"
 rayon = "1.5.0"
 serde_json = "1.0.56"
 serde_yaml = "0.8.13"
-solana-clap-utils = { path = "../clap-utils", version = "=1.7.15" }
-solana-core = { path = "../core", version = "=1.7.15" }
-solana-genesis = { path = "../genesis", version = "=1.7.15" }
-solana-client = { path = "../client", version = "=1.7.15" }
-solana-exchange-program = { path = "../programs/exchange", version = "=1.7.15" }
-solana-faucet = { path = "../faucet", version = "=1.7.15" }
-solana-gossip = { path = "../gossip", version = "=1.7.15" }
-solana-logger = { path = "../logger", version = "=1.7.15" }
-solana-metrics = { path = "../metrics", version = "=1.7.15" }
-solana-net-utils = { path = "../net-utils", version = "=1.7.15" }
-solana-runtime = { path = "../runtime", version = "=1.7.15" }
-solana-sdk = { path = "../sdk", version = "=1.7.15" }
-solana-streamer = { path = "../streamer", version = "=1.7.15" }
-solana-version = { path = "../version", version = "=1.7.15" }
+solana-clap-utils = { path = "../clap-utils", version = "=1.7.17" }
+solana-core = { path = "../core", version = "=1.7.17" }
+solana-genesis = { path = "../genesis", version = "=1.7.17" }
+solana-client = { path = "../client", version = "=1.7.17" }
+solana-exchange-program = { path = "../programs/exchange", version = "=1.7.17" }
+solana-faucet = { path = "../faucet", version = "=1.7.17" }
+solana-gossip = { path = "../gossip", version = "=1.7.17" }
+solana-logger = { path = "../logger", version = "=1.7.17" }
+solana-metrics = { path = "../metrics", version = "=1.7.17" }
+solana-net-utils = { path = "../net-utils", version = "=1.7.17" }
+solana-runtime = { path = "../runtime", version = "=1.7.17" }
+solana-sdk = { path = "../sdk", version = "=1.7.17" }
+solana-streamer = { path = "../streamer", version = "=1.7.17" }
+solana-version = { path = "../version", version = "=1.7.17" }
 
 [dev-dependencies]
-solana-local-cluster = { path = "../local-cluster", version = "=1.7.15" }
+solana-local-cluster = { path = "../local-cluster", version = "=1.7.17" }
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]

bench-streamer/Cargo.toml

@@ -2,7 +2,7 @@
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 edition = "2018"
 name = "solana-bench-streamer"
-version = "1.7.15"
+version = "1.7.17"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
@@ -10,11 +10,11 @@ publish = false
 
 [dependencies]
 clap = "2.33.1"
-solana-clap-utils = { path = "../clap-utils", version = "=1.7.15" }
-solana-streamer = { path = "../streamer", version = "=1.7.15" }
-solana-logger = { path = "../logger", version = "=1.7.15" }
-solana-net-utils = { path = "../net-utils", version = "=1.7.15" }
-solana-version = { path = "../version", version = "=1.7.15" }
+solana-clap-utils = { path = "../clap-utils", version = "=1.7.17" }
+solana-streamer = { path = "../streamer", version = "=1.7.17" }
+solana-logger = { path = "../logger", version = "=1.7.17" }
+solana-net-utils = { path = "../net-utils", version = "=1.7.17" }
+solana-version = { path = "../version", version = "=1.7.17" }
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]

bench-tps/Cargo.toml

@@ -2,7 +2,7 @@
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 edition = "2018"
 name = "solana-bench-tps"
-version = "1.7.15"
+version = "1.7.17"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
@@ -15,24 +15,24 @@ log = "0.4.11"
 rayon = "1.5.0"
 serde_json = "1.0.56"
 serde_yaml = "0.8.13"
-solana-clap-utils = { path = "../clap-utils", version = "=1.7.15" }
-solana-core = { path = "../core", version = "=1.7.15" }
-solana-genesis = { path = "../genesis", version = "=1.7.15" }
-solana-client = { path = "../client", version = "=1.7.15" }
-solana-faucet = { path = "../faucet", version = "=1.7.15" }
-solana-gossip = { path = "../gossip", version = "=1.7.15" }
-solana-logger = { path = "../logger", version = "=1.7.15" }
-solana-metrics = { path = "../metrics", version = "=1.7.15" }
-solana-measure = { path = "../measure", version = "=1.7.15" }
-solana-net-utils = { path = "../net-utils", version = "=1.7.15" }
-solana-runtime = { path = "../runtime", version = "=1.7.15" }
-solana-sdk = { path = "../sdk", version = "=1.7.15" }
-solana-streamer = { path = "../streamer", version = "=1.7.15" }
-solana-version = { path = "../version", version = "=1.7.15" }
+solana-clap-utils = { path = "../clap-utils", version = "=1.7.17" }
+solana-core = { path = "../core", version = "=1.7.17" }
+solana-genesis = { path = "../genesis", version = "=1.7.17" }
+solana-client = { path = "../client", version = "=1.7.17" }
+solana-faucet = { path = "../faucet", version = "=1.7.17" }
+solana-gossip = { path = "../gossip", version = "=1.7.17" }
+solana-logger = { path = "../logger", version = "=1.7.17" }
+solana-metrics = { path = "../metrics", version = "=1.7.17" }
+solana-measure = { path = "../measure", version = "=1.7.17" }
+solana-net-utils = { path = "../net-utils", version = "=1.7.17" }
+solana-runtime = { path = "../runtime", version = "=1.7.17" }
+solana-sdk = { path = "../sdk", version = "=1.7.17" }
+solana-streamer = { path = "../streamer", version = "=1.7.17" }
+solana-version = { path = "../version", version = "=1.7.17" }
 
 [dev-dependencies]
 serial_test = "0.4.0"
-solana-local-cluster = { path = "../local-cluster", version = "=1.7.15" }
+solana-local-cluster = { path = "../local-cluster", version = "=1.7.17" }
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]

ci/buildkite-pipeline.sh

@@ -137,7 +137,7 @@ all_test_steps() {
              ^ci/test-coverage.sh \
              ^scripts/coverage.sh \
       ; then
-    command_step coverage ". ci/rust-version.sh; ci/docker-run.sh \$\$rust_nightly_docker_image ci/test-coverage.sh" 30
+    command_step coverage ". ci/rust-version.sh; ci/docker-run.sh \$\$rust_nightly_docker_image ci/test-coverage.sh" 40
     wait_step
   else
     annotate --style info --context test-coverage \

ci/do-audit.sh

@@ -45,5 +45,12 @@ cargo_audit_ignores=(
   # Blocked on jsonrpc removing dependency on unmaintained `websocket`
   # https://github.com/paritytech/jsonrpc/issues/605
   --ignore RUSTSEC-2021-0079
+
+  # chrono: Potential segfault in `localtime_r` invocations
+  #
+  # Blocked due to no safe upgrade
+  # https://github.com/chronotope/chrono/issues/499
+  --ignore RUSTSEC-2020-0159
+
 )
 scripts/cargo-for-all-lock-files.sh stable audit "${cargo_audit_ignores[@]}"

clap-utils/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "solana-clap-utils"
-version = "1.7.15"
+version = "1.7.17"
 description = "Solana utilities for the clap"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -12,8 +12,8 @@ edition = "2018"
 [dependencies]
 clap = "2.33.0"
 rpassword = "4.0"
-solana-remote-wallet = { path = "../remote-wallet", version = "=1.7.15" }
-solana-sdk = { path = "../sdk", version = "=1.7.15" }
+solana-remote-wallet = { path = "../remote-wallet", version = "=1.7.17" }
+solana-sdk = { path = "../sdk", version = "=1.7.17" }
 thiserror = "1.0.21"
 tiny-bip39 = "0.8.1"
 uriparse = "0.6.3"

clap-utils/src/keypair.rs

@@ -258,6 +258,15 @@ pub(crate) fn parse_signer_source<S: AsRef<str>>(
     let source = {
         #[cfg(target_family = "windows")]
         {
+            // trim matched single-quotes since cmd.exe won't
+            let mut source = source;
+            while let Some(trimmed) = source.strip_prefix('\'') {
+                source = if let Some(trimmed) = trimmed.strip_suffix('\'') {
+                    trimmed
+                } else {
+                    break;
+                }
+            }
             source.replace("\\", "/")
         }
         #[cfg(not(target_family = "windows"))]

cli-config/Cargo.toml

@@ -3,7 +3,7 @@ authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 edition = "2018"
 name = "solana-cli-config"
 description = "Blockchain, Rebuilt for Scale"
-version = "1.7.15"
+version = "1.7.17"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"

cli-output/Cargo.toml

@@ -3,7 +3,7 @@ authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 edition = "2018"
 name = "solana-cli-output"
 description = "Blockchain, Rebuilt for Scale"
-version = "1.7.15"
+version = "1.7.17"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
@@ -20,12 +20,12 @@ indicatif = "0.15.0"
 serde = "1.0.122"
 serde_derive = "1.0.103"
 serde_json = "1.0.56"
-solana-account-decoder = { path = "../account-decoder", version = "=1.7.15" }
-solana-clap-utils = { path = "../clap-utils", version = "=1.7.15" }
-solana-client = { path = "../client", version = "=1.7.15" }
-solana-sdk = { path = "../sdk", version = "=1.7.15" }
-solana-transaction-status = { path = "../transaction-status", version = "=1.7.15" }
-solana-vote-program = { path = "../programs/vote", version = "=1.7.15" }
+solana-account-decoder = { path = "../account-decoder", version = "=1.7.17" }
+solana-clap-utils = { path = "../clap-utils", version = "=1.7.17" }
+solana-client = { path = "../client", version = "=1.7.17" }
+solana-sdk = { path = "../sdk", version = "=1.7.17" }
+solana-transaction-status = { path = "../transaction-status", version = "=1.7.17" }
+solana-vote-program = { path = "../programs/vote", version = "=1.7.17" }
 spl-memo = { version = "=3.0.1", features = ["no-entrypoint"] }
 
 [package.metadata.docs.rs]

cli/Cargo.toml

@@ -3,7 +3,7 @@ authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 edition = "2018"
 name = "solana-cli"
 description = "Blockchain, Rebuilt for Scale"
-version = "1.7.15"
+version = "1.7.17"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
@@ -26,33 +26,34 @@ humantime = "2.0.1"
 num-traits = "0.2"
 pretty-hex = "0.2.1"
 reqwest = { version = "0.11.2", default-features = false, features = ["blocking", "rustls-tls", "json"] }
+semver = "1.0.4"
 serde = "1.0.122"
 serde_derive = "1.0.103"
 serde_json = "1.0.56"
-solana-account-decoder = { path = "../account-decoder", version = "=1.7.15" }
-solana-bpf-loader-program = { path = "../programs/bpf_loader", version = "=1.7.15" }
-solana-clap-utils = { path = "../clap-utils", version = "=1.7.15" }
-solana-cli-config = { path = "../cli-config", version = "=1.7.15" }
-solana-cli-output = { path = "../cli-output", version = "=1.7.15" }
-solana-client = { path = "../client", version = "=1.7.15" }
-solana-config-program = { path = "../programs/config", version = "=1.7.15" }
-solana-faucet = { path = "../faucet", version = "=1.7.15" }
-solana-logger = { path = "../logger", version = "=1.7.15" }
-solana-net-utils = { path = "../net-utils", version = "=1.7.15" }
+solana-account-decoder = { path = "../account-decoder", version = "=1.7.17" }
+solana-bpf-loader-program = { path = "../programs/bpf_loader", version = "=1.7.17" }
+solana-clap-utils = { path = "../clap-utils", version = "=1.7.17" }
+solana-cli-config = { path = "../cli-config", version = "=1.7.17" }
+solana-cli-output = { path = "../cli-output", version = "=1.7.17" }
+solana-client = { path = "../client", version = "=1.7.17" }
+solana-config-program = { path = "../programs/config", version = "=1.7.17" }
+solana-faucet = { path = "../faucet", version = "=1.7.17" }
+solana-logger = { path = "../logger", version = "=1.7.17" }
+solana-net-utils = { path = "../net-utils", version = "=1.7.17" }
 solana_rbpf = "=0.2.11"
-solana-remote-wallet = { path = "../remote-wallet", version = "=1.7.15" }
-solana-sdk = { path = "../sdk", version = "=1.7.15" }
-solana-transaction-status = { path = "../transaction-status", version = "=1.7.15" }
-solana-version = { path = "../version", version = "=1.7.15" }
-solana-vote-program = { path = "../programs/vote", version = "=1.7.15" }
+solana-remote-wallet = { path = "../remote-wallet", version = "=1.7.17" }
+solana-sdk = { path = "../sdk", version = "=1.7.17" }
+solana-transaction-status = { path = "../transaction-status", version = "=1.7.17" }
+solana-version = { path = "../version", version = "=1.7.17" }
+solana-vote-program = { path = "../programs/vote", version = "=1.7.17" }
 spl-memo = { version = "=3.0.1", features = ["no-entrypoint"] }
 thiserror = "1.0.21"
 tiny-bip39 = "0.8.1"
 url = "2.1.1"
 
 [dev-dependencies]
-solana-core = { path = "../core", version = "=1.7.15" }
-solana-streamer = { path = "../streamer", version = "=1.7.15" }
+solana-core = { path = "../core", version = "=1.7.17" }
+solana-streamer = { path = "../streamer", version = "=1.7.17" }
 tempfile = "3.1.0"
 
 [[bin]]

cli/src/cluster_query.rs

@@ -1721,7 +1721,7 @@ pub fn process_show_stakes(
                 // Filter by `StakeState::Stake(_, _)`
                 rpc_filter::RpcFilterType::Memcmp(rpc_filter::Memcmp {
                     offset: 0,
-                    bytes: rpc_filter::MemcmpEncodedBytes::Binary(
+                    bytes: rpc_filter::MemcmpEncodedBytes::Base58(
                         bs58::encode([2, 0, 0, 0]).into_string(),
                     ),
                     encoding: Some(rpc_filter::MemcmpEncoding::Binary),
@@ -1729,7 +1729,7 @@ pub fn process_show_stakes(
                 // Filter by `Delegation::voter_pubkey`, which begins at byte offset 124
                 rpc_filter::RpcFilterType::Memcmp(rpc_filter::Memcmp {
                     offset: 124,
-                    bytes: rpc_filter::MemcmpEncodedBytes::Binary(
+                    bytes: rpc_filter::MemcmpEncodedBytes::Base58(
                         vote_account_pubkeys[0].to_string(),
                     ),
                     encoding: Some(rpc_filter::MemcmpEncoding::Binary),

cli/src/feature.rs

@@ -18,7 +18,12 @@ use solana_sdk::{
     pubkey::Pubkey,
     transaction::Transaction,
 };
-use std::{collections::HashMap, fmt, sync::Arc};
+use std::{
+    cmp::Ordering,
+    collections::{HashMap, HashSet},
+    fmt,
+    sync::Arc,
+};
 
 #[derive(Copy, Clone, Debug, PartialEq)]
 pub enum ForceActivation {
@@ -222,44 +227,103 @@ pub fn process_feature_subcommand(
     }
 }
 
-fn active_stake_by_feature_set(rpc_client: &RpcClient) -> Result<HashMap<u32, f64>, ClientError> {
+#[derive(Debug, Default)]
+struct WorkingFeatureSetStatsEntry {
+    stake: u64,
+    rpc_nodes_count: u32,
+    software_versions: HashSet<Option<semver::Version>>,
+}
+type WorkingFeatureSetStats = HashMap<u32, WorkingFeatureSetStatsEntry>;
+
+#[derive(Debug, Default)]
+struct FeatureSetStatsEntry {
+    stake_percent: f64,
+    rpc_nodes_percent: f32,
+    software_versions: Vec<Option<semver::Version>>,
+}
+type FeatureSetStats = HashMap<u32, FeatureSetStatsEntry>;
+
+fn feature_set_stats(rpc_client: &RpcClient) -> Result<FeatureSetStats, ClientError> {
     // Validator identity -> feature set
-    let feature_set_map = rpc_client
+    let feature_sets = rpc_client
         .get_cluster_nodes()?
         .into_iter()
-        .map(|contact_info| (contact_info.pubkey, contact_info.feature_set))
-        .collect::<HashMap<_, _>>();
+        .map(|contact_info| {
+            (
+                contact_info.pubkey,
+                contact_info.feature_set,
+                contact_info.rpc.is_some(),
+                contact_info
+                    .version
+                    .and_then(|v| semver::Version::parse(&v).ok()),
+            )
+        })
+        .collect::<Vec<_>>();
 
     let vote_accounts = rpc_client.get_vote_accounts()?;
 
-    let total_active_stake: u64 = vote_accounts
-        .current
+    let mut total_active_stake: u64 = vote_accounts
+        .delinquent
         .iter()
-        .chain(vote_accounts.delinquent.iter())
         .map(|vote_account| vote_account.activated_stake)
         .sum();
 
-    // Sum all active stake by feature set
-    let mut active_stake_by_feature_set: HashMap<u32, u64> = HashMap::new();
-    for vote_account in vote_accounts.current {
-        if let Some(Some(feature_set)) = feature_set_map.get(&vote_account.node_pubkey) {
-            *active_stake_by_feature_set.entry(*feature_set).or_default() +=
-                vote_account.activated_stake;
-        } else {
-            *active_stake_by_feature_set
-                .entry(0 /* "unknown" */)
-                .or_default() += vote_account.activated_stake;
+    let vote_stakes = vote_accounts
+        .current
+        .into_iter()
+        .map(|vote_account| {
+            total_active_stake += vote_account.activated_stake;
+            (vote_account.node_pubkey, vote_account.activated_stake)
+        })
+        .collect::<HashMap<_, _>>();
+
+    let mut feature_set_stats: WorkingFeatureSetStats = HashMap::new();
+    let mut total_rpc_nodes = 0;
+    for (node_id, feature_set, is_rpc, version) in feature_sets {
+        let feature_set = feature_set.unwrap_or(0);
+        let feature_set_entry = feature_set_stats.entry(feature_set).or_default();
+
+        feature_set_entry.software_versions.insert(version);
+
+        if let Some(vote_stake) = vote_stakes.get(&node_id) {
+            feature_set_entry.stake += *vote_stake;
+        }
+
+        if is_rpc {
+            feature_set_entry.rpc_nodes_count += 1;
+            total_rpc_nodes += 1;
         }
     }
 
-    Ok(active_stake_by_feature_set
+    Ok(feature_set_stats
         .into_iter()
-        .map(|(feature_set, active_stake)| {
-            (
+        .filter_map(
+            |(
                 feature_set,
-                active_stake as f64 * 100. / total_active_stake as f64,
-            )
-        })
+                WorkingFeatureSetStatsEntry {
+                    stake,
+                    rpc_nodes_count,
+                    software_versions,
+                },
+            )| {
+                let stake_percent = (stake as f64 / total_active_stake as f64) * 100.;
+                let rpc_nodes_percent = (rpc_nodes_count as f32 / total_rpc_nodes as f32) * 100.;
+                let mut software_versions = software_versions.into_iter().collect::<Vec<_>>();
+                software_versions.sort();
+                if stake_percent >= 0.001 || rpc_nodes_percent >= 0.001 {
+                    Some((
+                        feature_set,
+                        FeatureSetStatsEntry {
+                            stake_percent,
+                            rpc_nodes_percent,
+                            software_versions,
+                        },
+                    ))
+                } else {
+                    None
+                }
+            },
+        )
         .collect())
 }
 
@@ -267,50 +331,164 @@ fn active_stake_by_feature_set(rpc_client: &RpcClient) -> Result<HashMap<u32, f6
 fn feature_activation_allowed(rpc_client: &RpcClient, quiet: bool) -> Result<bool, ClientError> {
     let my_feature_set = solana_version::Version::default().feature_set;
 
-    let active_stake_by_feature_set = active_stake_by_feature_set(rpc_client)?;
+    let feature_set_stats = feature_set_stats(rpc_client)?;
 
-    let feature_activation_allowed = active_stake_by_feature_set
+    let (stake_allowed, rpc_allowed) = feature_set_stats
         .get(&my_feature_set)
-        .map(|percentage| *percentage >= 95.)
-        .unwrap_or(false);
+        .map(
+            |FeatureSetStatsEntry {
+                 stake_percent,
+                 rpc_nodes_percent,
+                 ..
+             }| (*stake_percent >= 95., *rpc_nodes_percent >= 95.),
+        )
+        .unwrap_or((false, false));
 
-    if !feature_activation_allowed && !quiet {
-        if active_stake_by_feature_set.get(&my_feature_set).is_none() {
+    if !stake_allowed && !rpc_allowed && !quiet {
+        if feature_set_stats.get(&my_feature_set).is_none() {
             println!(
                 "{}",
                 style("To activate features the tool and cluster feature sets must match, select a tool version that matches the cluster")
                     .bold());
         } else {
-            println!(
-                "{}",
-                style("To activate features the stake must be >= 95%").bold()
-            );
+            if !stake_allowed {
+                print!(
+                    "\n{}",
+                    style("To activate features the stake must be >= 95%")
+                        .bold()
+                        .red()
+                );
+            }
+            if !rpc_allowed {
+                print!(
+                    "\n{}",
+                    style("To activate features the RPC nodes must be >= 95%")
+                        .bold()
+                        .red()
+                );
+            }
+        }
+        println!(
+            "\n\n{}",
+            style(format!("Tool Feature Set: {}", my_feature_set)).bold()
+        );
+
+        let mut feature_set_stats = feature_set_stats.into_iter().collect::<Vec<_>>();
+        feature_set_stats.sort_by(|l, r| {
+            match l.1.software_versions[0]
+                .cmp(&r.1.software_versions[0])
+                .reverse()
+            {
+                Ordering::Equal => {
+                    match l
+                        .1
+                        .stake_percent
+                        .partial_cmp(&r.1.stake_percent)
+                        .unwrap()
+                        .reverse()
+                    {
+                        Ordering::Equal => {
+                            l.1.rpc_nodes_percent
+                                .partial_cmp(&r.1.rpc_nodes_percent)
+                                .unwrap()
+                                .reverse()
+                        }
+                        o => o,
+                    }
+                }
+                o => o,
+            }
+        });
+
+        let software_versions_title = "Software Version";
+        let feature_set_title = "Feature Set";
+        let stake_percent_title = "Stake";
+        let rpc_percent_title = "RPC";
+        let mut stats_output = Vec::new();
+        let mut max_software_versions_len = software_versions_title.len();
+        let mut max_feature_set_len = feature_set_title.len();
+        let mut max_stake_percent_len = stake_percent_title.len();
+        let mut max_rpc_percent_len = rpc_percent_title.len();
+        for (
+            feature_set,
+            FeatureSetStatsEntry {
+                stake_percent,
+                rpc_nodes_percent,
+                software_versions,
+            },
+        ) in feature_set_stats.into_iter()
+        {
+            let me = feature_set == my_feature_set;
+            let feature_set = if feature_set == 0 {
+                "unknown".to_string()
+            } else {
+                feature_set.to_string()
+            };
+            let stake_percent = format!("{:.2}%", stake_percent);
+            let rpc_percent = format!("{:.2}%", rpc_nodes_percent);
+
+            let mut has_unknown = false;
+            let mut software_versions = software_versions
+                .iter()
+                .filter_map(|v| {
+                    if v.is_none() {
+                        has_unknown = true;
+                    }
+                    v.as_ref()
+                })
+                .map(ToString::to_string)
+                .collect::<Vec<_>>();
+            if has_unknown {
+                software_versions.push("unknown".to_string());
+            }
+            let software_versions = software_versions.join(", ");
+            max_software_versions_len = max_software_versions_len.max(software_versions.len());
+
+            max_feature_set_len = max_feature_set_len.max(feature_set.len());
+            max_stake_percent_len = max_stake_percent_len.max(stake_percent.len());
+            max_rpc_percent_len = max_rpc_percent_len.max(rpc_percent.len());
+
+            stats_output.push((
+                software_versions,
+                feature_set,
+                stake_percent,
+                rpc_percent,
+                me,
+            ));
         }
         println!(
             "{}",
-            style(format!("Tool Feature Set: {}", my_feature_set)).bold()
+            style(format!(
+                "{1:<0$}  {3:<2$}  {5:<4$}  {7:<6$}",
+                max_software_versions_len,
+                software_versions_title,
+                max_feature_set_len,
+                feature_set_title,
+                max_stake_percent_len,
+                stake_percent_title,
+                max_rpc_percent_len,
+                rpc_percent_title,
+            ))
+            .bold(),
         );
-        println!("{}", style("Cluster Feature Sets and Stakes:").bold());
-        for (feature_set, percentage) in active_stake_by_feature_set.iter() {
-            if *feature_set == 0 {
-                println!("  unknown    - {:.2}%", percentage);
-            } else {
-                println!(
-                    "  {:<10} - {:.2}% {}",
-                    feature_set,
-                    percentage,
-                    if *feature_set == my_feature_set {
-                        " <-- me"
-                    } else {
-                        ""
-                    }
-                );
-            }
+        for (software_versions, feature_set, stake_percent, rpc_percent, me) in stats_output {
+            println!(
+                "{1:<0$}  {3:>2$}  {5:>4$} {7:>6$}  {8}",
+                max_software_versions_len,
+                software_versions,
+                max_feature_set_len,
+                feature_set,
+                max_stake_percent_len,
+                stake_percent,
+                max_rpc_percent_len,
+                rpc_percent,
+                if me { "<-- me" } else { "" },
+            );
         }
         println!();
     }
 
-    Ok(feature_activation_allowed)
+    Ok(stake_allowed && rpc_allowed)
 }
 
 fn status_from_account(account: Account) -> Option<CliFeatureStatus> {

cli/src/program.rs

@@ -1146,18 +1146,18 @@ fn get_buffers(
 ) -> Result<CliUpgradeableBuffers, Box<dyn std::error::Error>> {
     let mut filters = vec![RpcFilterType::Memcmp(Memcmp {
         offset: 0,
-        bytes: MemcmpEncodedBytes::Binary(bs58::encode(vec![1, 0, 0, 0]).into_string()),
+        bytes: MemcmpEncodedBytes::Base58(bs58::encode(vec![1, 0, 0, 0]).into_string()),
         encoding: None,
     })];
     if let Some(authority_pubkey) = authority_pubkey {
         filters.push(RpcFilterType::Memcmp(Memcmp {
             offset: ACCOUNT_TYPE_SIZE,
-            bytes: MemcmpEncodedBytes::Binary(bs58::encode(vec![1]).into_string()),
+            bytes: MemcmpEncodedBytes::Base58(bs58::encode(vec![1]).into_string()),
             encoding: None,
         }));
         filters.push(RpcFilterType::Memcmp(Memcmp {
             offset: ACCOUNT_TYPE_SIZE + OPTION_SIZE,
-            bytes: MemcmpEncodedBytes::Binary(
+            bytes: MemcmpEncodedBytes::Base58(
                 bs58::encode(authority_pubkey.as_ref()).into_string(),
             ),
             encoding: None,
@@ -1199,18 +1199,18 @@ fn get_programs(
 ) -> Result<CliUpgradeablePrograms, Box<dyn std::error::Error>> {
     let mut filters = vec![RpcFilterType::Memcmp(Memcmp {
         offset: 0,
-        bytes: MemcmpEncodedBytes::Binary(bs58::encode(vec![3, 0, 0, 0]).into_string()),
+        bytes: MemcmpEncodedBytes::Base58(bs58::encode(vec![3, 0, 0, 0]).into_string()),
         encoding: None,
     })];
     if let Some(authority_pubkey) = authority_pubkey {
         filters.push(RpcFilterType::Memcmp(Memcmp {
             offset: ACCOUNT_TYPE_SIZE + SLOT_SIZE,
-            bytes: MemcmpEncodedBytes::Binary(bs58::encode(vec![1]).into_string()),
+            bytes: MemcmpEncodedBytes::Base58(bs58::encode(vec![1]).into_string()),
             encoding: None,
         }));
         filters.push(RpcFilterType::Memcmp(Memcmp {
             offset: ACCOUNT_TYPE_SIZE + SLOT_SIZE + OPTION_SIZE,
-            bytes: MemcmpEncodedBytes::Binary(
+            bytes: MemcmpEncodedBytes::Base58(
                 bs58::encode(authority_pubkey.as_ref()).into_string(),
             ),
             encoding: None,
@@ -1234,7 +1234,7 @@ fn get_programs(
             bytes.extend_from_slice(programdata_address.as_ref());
             let filters = vec![RpcFilterType::Memcmp(Memcmp {
                 offset: 0,
-                bytes: MemcmpEncodedBytes::Binary(bs58::encode(bytes).into_string()),
+                bytes: MemcmpEncodedBytes::Base58(bs58::encode(bytes).into_string()),
                 encoding: None,
             })];
 

client/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "solana-client"
-version = "1.7.15"
+version = "1.7.17"
 description = "Solana Client"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -24,14 +24,14 @@ semver = "0.11.0"
 serde = "1.0.122"
 serde_derive = "1.0.103"
 serde_json = "1.0.56"
-solana-account-decoder = { path = "../account-decoder", version = "=1.7.15" }
-solana-clap-utils = { path = "../clap-utils", version = "=1.7.15" }
-solana-faucet = { path = "../faucet", version = "=1.7.15" }
-solana-net-utils = { path = "../net-utils", version = "=1.7.15" }
-solana-sdk = { path = "../sdk", version = "=1.7.15" }
-solana-transaction-status = { path = "../transaction-status", version = "=1.7.15" }
-solana-version = { path = "../version", version = "=1.7.15" }
-solana-vote-program = { path = "../programs/vote", version = "=1.7.15" }
+solana-account-decoder = { path = "../account-decoder", version = "=1.7.17" }
+solana-clap-utils = { path = "../clap-utils", version = "=1.7.17" }
+solana-faucet = { path = "../faucet", version = "=1.7.17" }
+solana-net-utils = { path = "../net-utils", version = "=1.7.17" }
+solana-sdk = { path = "../sdk", version = "=1.7.17" }
+solana-transaction-status = { path = "../transaction-status", version = "=1.7.17" }
+solana-version = { path = "../version", version = "=1.7.17" }
+solana-vote-program = { path = "../programs/vote", version = "=1.7.17" }
 thiserror = "1.0"
 tokio = { version = "1", features = ["full"] }
 tungstenite = "0.10.1"
@@ -40,7 +40,7 @@ url = "2.1.1"
 [dev-dependencies]
 assert_matches = "1.3.0"
 jsonrpc-http-server = "18.0.0"
-solana-logger = { path = "../logger", version = "=1.7.15" }
+solana-logger = { path = "../logger", version = "=1.7.17" }
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]

client/src/rpc_filter.rs

@@ -1,4 +1,9 @@
-use thiserror::Error;
+#![allow(deprecated)]
+use {std::borrow::Cow, thiserror::Error};
+
+const MAX_DATA_SIZE: usize = 128;
+const MAX_DATA_BASE58_SIZE: usize = 175;
+const MAX_DATA_BASE64_SIZE: usize = 172;
 
 #[derive(Debug, Clone, PartialEq, Eq, Hash, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
@@ -15,15 +20,50 @@ impl RpcFilterType {
                 let encoding = compare.encoding.as_ref().unwrap_or(&MemcmpEncoding::Binary);
                 match encoding {
                     MemcmpEncoding::Binary => {
-                        let MemcmpEncodedBytes::Binary(bytes) = &compare.bytes;
-
-                        if bytes.len() > 128 {
-                            Err(RpcFilterError::Base58DataTooLarge)
-                        } else {
-                            bs58::decode(&bytes)
-                                .into_vec()
-                                .map(|_| ())
-                                .map_err(|e| e.into())
+                        use MemcmpEncodedBytes::*;
+                        match &compare.bytes {
+                            // DEPRECATED
+                            Binary(bytes) => {
+                                if bytes.len() > MAX_DATA_BASE58_SIZE {
+                                    return Err(RpcFilterError::Base58DataTooLarge);
+                                }
+                                let bytes = bs58::decode(&bytes)
+                                    .into_vec()
+                                    .map_err(RpcFilterError::DecodeError)?;
+                                if bytes.len() > MAX_DATA_SIZE {
+                                    Err(RpcFilterError::Base58DataTooLarge)
+                                } else {
+                                    Ok(())
+                                }
+                            }
+                            Base58(bytes) => {
+                                if bytes.len() > MAX_DATA_BASE58_SIZE {
+                                    return Err(RpcFilterError::DataTooLarge);
+                                }
+                                let bytes = bs58::decode(&bytes).into_vec()?;
+                                if bytes.len() > MAX_DATA_SIZE {
+                                    Err(RpcFilterError::DataTooLarge)
+                                } else {
+                                    Ok(())
+                                }
+                            }
+                            Base64(bytes) => {
+                                if bytes.len() > MAX_DATA_BASE64_SIZE {
+                                    return Err(RpcFilterError::DataTooLarge);
+                                }
+                                let bytes = base64::decode(&bytes)?;
+                                if bytes.len() > MAX_DATA_SIZE {
+                                    Err(RpcFilterError::DataTooLarge)
+                                } else {
+                                    Ok(())
+                                }
+                            }
+                            Bytes(bytes) => {
+                                if bytes.len() > MAX_DATA_SIZE {
+                                    return Err(RpcFilterError::DataTooLarge);
+                                }
+                                Ok(())
+                            }
                         }
                     }
                 }
@@ -34,10 +74,24 @@ impl RpcFilterType {
 
 #[derive(Error, PartialEq, Debug)]
 pub enum RpcFilterError {
-    #[error("bs58 decode error")]
-    DecodeError(#[from] bs58::decode::Error),
+    #[error("encoded binary data should be less than 129 bytes")]
+    DataTooLarge,
+    #[deprecated(
+        since = "1.9.0",
+        note = "Error for MemcmpEncodedBytes::Binary which is deprecated"
+    )]
     #[error("encoded binary (base 58) data should be less than 129 bytes")]
     Base58DataTooLarge,
+    #[deprecated(
+        since = "1.9.0",
+        note = "Error for MemcmpEncodedBytes::Binary which is deprecated"
+    )]
+    #[error("bs58 decode error")]
+    DecodeError(bs58::decode::Error),
+    #[error("base58 decode error")]
+    Base58DecodeError(#[from] bs58::decode::Error),
+    #[error("base64 decode error")]
+    Base64DecodeError(#[from] base64::DecodeError),
 }
 
 #[derive(Debug, Clone, PartialEq, Eq, Hash, Serialize, Deserialize)]
@@ -49,7 +103,14 @@ pub enum MemcmpEncoding {
 #[derive(Debug, Clone, PartialEq, Eq, Hash, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase", untagged)]
 pub enum MemcmpEncodedBytes {
+    #[deprecated(
+        since = "1.9.0",
+        note = "Please use MemcmpEncodedBytes::Base58 instead"
+    )]
     Binary(String),
+    Base58(String),
+    Base64(String),
+    Bytes(Vec<u8>),
 }
 
 #[derive(Debug, Clone, PartialEq, Eq, Hash, Serialize, Deserialize)]
@@ -63,14 +124,18 @@ pub struct Memcmp {
 }
 
 impl Memcmp {
-    pub fn bytes_match(&self, data: &[u8]) -> bool {
+    pub fn bytes(&self) -> Option<Cow<Vec<u8>>> {
+        use MemcmpEncodedBytes::*;
         match &self.bytes {
-            MemcmpEncodedBytes::Binary(bytes) => {
-                let bytes = bs58::decode(bytes).into_vec();
-                if bytes.is_err() {
-                    return false;
-                }
-                let bytes = bytes.unwrap();
+            Binary(bytes) | Base58(bytes) => bs58::decode(bytes).into_vec().ok().map(Cow::Owned),
+            Base64(bytes) => base64::decode(bytes).ok().map(Cow::Owned),
+            Bytes(bytes) => Some(Cow::Borrowed(bytes)),
+        }
+    }
+
+    pub fn bytes_match(&self, data: &[u8]) -> bool {
+        match self.bytes() {
+            Some(bytes) => {
                 if self.offset > data.len() {
                     return false;
                 }
@@ -79,6 +144,7 @@ impl Memcmp {
                 }
                 data[self.offset..self.offset + bytes.len()] == bytes[..]
             }
+            None => false,
         }
     }
 }
@@ -87,6 +153,15 @@ impl Memcmp {
 mod tests {
     use super::*;
 
+    #[test]
+    fn test_worst_case_encoded_tx_goldens() {
+        let ff_data = vec![0xffu8; MAX_DATA_SIZE];
+        let data58 = bs58::encode(&ff_data).into_string();
+        assert_eq!(data58.len(), MAX_DATA_BASE58_SIZE);
+        let data64 = base64::encode(&ff_data);
+        assert_eq!(data64.len(), MAX_DATA_BASE64_SIZE);
+    }
+
     #[test]
     fn test_bytes_match() {
         let data = vec![1, 2, 3, 4, 5];
@@ -94,7 +169,7 @@ mod tests {
         // Exact match of data succeeds
         assert!(Memcmp {
             offset: 0,
-            bytes: MemcmpEncodedBytes::Binary(bs58::encode(vec![1, 2, 3, 4, 5]).into_string()),
+            bytes: MemcmpEncodedBytes::Base58(bs58::encode(vec![1, 2, 3, 4, 5]).into_string()),
             encoding: None,
         }
         .bytes_match(&data));
@@ -102,7 +177,7 @@ mod tests {
         // Partial match of data succeeds
         assert!(Memcmp {
             offset: 0,
-            bytes: MemcmpEncodedBytes::Binary(bs58::encode(vec![1, 2]).into_string()),
+            bytes: MemcmpEncodedBytes::Base58(bs58::encode(vec![1, 2]).into_string()),
             encoding: None,
         }
         .bytes_match(&data));
@@ -110,7 +185,7 @@ mod tests {
         // Offset partial match of data succeeds
         assert!(Memcmp {
             offset: 2,
-            bytes: MemcmpEncodedBytes::Binary(bs58::encode(vec![3, 4]).into_string()),
+            bytes: MemcmpEncodedBytes::Base58(bs58::encode(vec![3, 4]).into_string()),
             encoding: None,
         }
         .bytes_match(&data));
@@ -118,7 +193,7 @@ mod tests {
         // Incorrect partial match of data fails
         assert!(!Memcmp {
             offset: 0,
-            bytes: MemcmpEncodedBytes::Binary(bs58::encode(vec![2]).into_string()),
+            bytes: MemcmpEncodedBytes::Base58(bs58::encode(vec![2]).into_string()),
             encoding: None,
         }
         .bytes_match(&data));
@@ -126,7 +201,7 @@ mod tests {
         // Bytes overrun data fails
         assert!(!Memcmp {
             offset: 2,
-            bytes: MemcmpEncodedBytes::Binary(bs58::encode(vec![3, 4, 5, 6]).into_string()),
+            bytes: MemcmpEncodedBytes::Base58(bs58::encode(vec![3, 4, 5, 6]).into_string()),
             encoding: None,
         }
         .bytes_match(&data));
@@ -134,7 +209,7 @@ mod tests {
         // Offset outside data fails
         assert!(!Memcmp {
             offset: 6,
-            bytes: MemcmpEncodedBytes::Binary(bs58::encode(vec![5]).into_string()),
+            bytes: MemcmpEncodedBytes::Base58(bs58::encode(vec![5]).into_string()),
             encoding: None,
         }
         .bytes_match(&data));
@@ -142,7 +217,7 @@ mod tests {
         // Invalid base-58 fails
         assert!(!Memcmp {
             offset: 0,
-            bytes: MemcmpEncodedBytes::Binary("III".to_string()),
+            bytes: MemcmpEncodedBytes::Base58("III".to_string()),
             encoding: None,
         }
         .bytes_match(&data));
@@ -157,7 +232,7 @@ mod tests {
         assert_eq!(
             RpcFilterType::Memcmp(Memcmp {
                 offset: 0,
-                bytes: MemcmpEncodedBytes::Binary(base58_bytes.to_string()),
+                bytes: MemcmpEncodedBytes::Base58(base58_bytes.to_string()),
                 encoding: None,
             })
             .verify(),
@@ -172,11 +247,11 @@ mod tests {
         assert_eq!(
             RpcFilterType::Memcmp(Memcmp {
                 offset: 0,
-                bytes: MemcmpEncodedBytes::Binary(base58_bytes.to_string()),
+                bytes: MemcmpEncodedBytes::Base58(base58_bytes.to_string()),
                 encoding: None,
             })
             .verify(),
-            Err(RpcFilterError::Base58DataTooLarge)
+            Err(RpcFilterError::DataTooLarge)
         );
     }
 }

core/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "solana-core"
 description = "Blockchain, Rebuilt for Scale"
-version = "1.7.15"
+version = "1.7.17"
 homepage = "https://solana.com/"
 documentation = "https://docs.rs/solana-core"
 readme = "../README.md"
@@ -43,33 +43,33 @@ retain_mut = "0.1.2"
 serde = "1.0.122"
 serde_bytes = "0.11"
 serde_derive = "1.0.103"
-solana-account-decoder = { path = "../account-decoder", version = "=1.7.15" }
-solana-banks-server = { path = "../banks-server", version = "=1.7.15" }
-solana-clap-utils = { path = "../clap-utils", version = "=1.7.15" }
-solana-client = { path = "../client", version = "=1.7.15" }
-solana-gossip = { path = "../gossip", version = "=1.7.15" }
-solana-ledger = { path = "../ledger", version = "=1.7.15" }
-solana-logger = { path = "../logger", version = "=1.7.15" }
-solana-merkle-tree = { path = "../merkle-tree", version = "=1.7.15" }
-solana-metrics = { path = "../metrics", version = "=1.7.15" }
-solana-measure = { path = "../measure", version = "=1.7.15" }
-solana-net-utils = { path = "../net-utils", version = "=1.7.15" }
-solana-perf = { path = "../perf", version = "=1.7.15" }
-solana-poh = { path = "../poh", version = "=1.7.15" }
-solana-program-test = { path = "../program-test", version = "=1.7.15" }
-solana-rpc = { path = "../rpc", version = "=1.7.15" }
-solana-runtime = { path = "../runtime", version = "=1.7.15" }
-solana-sdk = { path = "../sdk", version = "=1.7.15" }
-solana-frozen-abi = { path = "../frozen-abi", version = "=1.7.15" }
-solana-frozen-abi-macro = { path = "../frozen-abi/macro", version = "=1.7.15" }
-solana-streamer = { path = "../streamer", version = "=1.7.15" }
-solana-transaction-status = { path = "../transaction-status", version = "=1.7.15" }
-solana-version = { path = "../version", version = "=1.7.15" }
-solana-vote-program = { path = "../programs/vote", version = "=1.7.15" }
+solana-account-decoder = { path = "../account-decoder", version = "=1.7.17" }
+solana-banks-server = { path = "../banks-server", version = "=1.7.17" }
+solana-clap-utils = { path = "../clap-utils", version = "=1.7.17" }
+solana-client = { path = "../client", version = "=1.7.17" }
+solana-gossip = { path = "../gossip", version = "=1.7.17" }
+solana-ledger = { path = "../ledger", version = "=1.7.17" }
+solana-logger = { path = "../logger", version = "=1.7.17" }
+solana-merkle-tree = { path = "../merkle-tree", version = "=1.7.17" }
+solana-metrics = { path = "../metrics", version = "=1.7.17" }
+solana-measure = { path = "../measure", version = "=1.7.17" }
+solana-net-utils = { path = "../net-utils", version = "=1.7.17" }
+solana-perf = { path = "../perf", version = "=1.7.17" }
+solana-poh = { path = "../poh", version = "=1.7.17" }
+solana-program-test = { path = "../program-test", version = "=1.7.17" }
+solana-rpc = { path = "../rpc", version = "=1.7.17" }
+solana-runtime = { path = "../runtime", version = "=1.7.17" }
+solana-sdk = { path = "../sdk", version = "=1.7.17" }
+solana-frozen-abi = { path = "../frozen-abi", version = "=1.7.17" }
+solana-frozen-abi-macro = { path = "../frozen-abi/macro", version = "=1.7.17" }
+solana-streamer = { path = "../streamer", version = "=1.7.17" }
+solana-transaction-status = { path = "../transaction-status", version = "=1.7.17" }
+solana-version = { path = "../version", version = "=1.7.17" }
+solana-vote-program = { path = "../programs/vote", version = "=1.7.17" }
 spl-token-v2-0 = { package = "spl-token", version = "=3.2.0", features = ["no-entrypoint"] }
 tempfile = "3.1.0"
 thiserror = "1.0"
-solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "=1.7.15" }
+solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "=1.7.17" }
 trees = "0.2.1"
 
 [dev-dependencies]
@@ -82,8 +82,8 @@ num_cpus = "1.13.0"
 reqwest = { version = "0.11.2", default-features = false, features = ["blocking", "rustls-tls", "json"] }
 serde_json = "1.0.56"
 serial_test = "0.4.0"
-solana-stake-program = { path = "../programs/stake", version = "=1.7.15" }
-solana-version = { path = "../version", version = "=1.7.15" }
+solana-stake-program = { path = "../programs/stake", version = "=1.7.17" }
+solana-version = { path = "../version", version = "=1.7.17" }
 symlink = "0.1.0"
 systemstat = "0.1.5"
 tokio = { version = "1", features = ["full"] }

core/benches/cluster_info.rs

@@ -75,9 +75,9 @@ fn broadcast_shreds_bench(bencher: &mut Bencher) {
             &cluster_nodes_cache,
             &last_datapoint,
             &mut TransmitShredsStats::default(),
-            &SocketAddrSpace::Unspecified,
             &cluster_info,
             &bank_forks,
+            &SocketAddrSpace::Unspecified,
         )
         .unwrap();
     });

core/src/banking_stage.rs

@@ -88,6 +88,7 @@ pub struct BankingStageStats {
     new_tx_count: AtomicUsize,
     dropped_packet_batches_count: AtomicUsize,
     dropped_packets_count: AtomicUsize,
+    dropped_duplicated_packets_count: AtomicUsize,
     newly_buffered_packets_count: AtomicUsize,
     current_buffered_packets_count: AtomicUsize,
     current_buffered_packet_batches_count: AtomicUsize,
@@ -137,6 +138,12 @@ impl BankingStageStats {
                     self.dropped_packets_count.swap(0, Ordering::Relaxed) as i64,
                     i64
                 ),
+                (
+                    "dropped_duplicated_packets_count",
+                    self.dropped_duplicated_packets_count
+                        .swap(0, Ordering::Relaxed) as i64,
+                    i64
+                ),
                 (
                     "newly_buffered_packets_count",
                     self.newly_buffered_packets_count.swap(0, Ordering::Relaxed) as i64,
@@ -258,8 +265,8 @@ impl BankingStage {
         cluster_info: &Arc<ClusterInfo>,
         poh_recorder: &Arc<Mutex<PohRecorder>>,
         verified_receiver: CrossbeamReceiver<Vec<Packets>>,
-        verified_vote_receiver: CrossbeamReceiver<Vec<Packets>>,
         tpu_verified_vote_receiver: CrossbeamReceiver<Vec<Packets>>,
+        verified_vote_receiver: CrossbeamReceiver<Vec<Packets>>,
         num_threads: u32,
         transaction_status_sender: Option<TransactionStatusSender>,
         gossip_vote_sender: ReplayVoteSender,
@@ -1258,8 +1265,8 @@ impl BankingStage {
                     buffered_packets,
                     msgs,
                     packet_indexes,
-                    &mut dropped_packets_count,
                     &mut dropped_packet_batches_count,
+                    &mut dropped_packets_count,
                     &mut newly_buffered_packets_count,
                     batch_limit,
                     duplicates,
@@ -1353,6 +1360,9 @@ impl BankingStage {
         banking_stage_stats
             .dropped_packet_batches_count
             .fetch_add(dropped_packet_batches_count, Ordering::Relaxed);
+        banking_stage_stats
+            .dropped_packets_count
+            .fetch_add(dropped_packets_count, Ordering::Relaxed);
         banking_stage_stats
             .newly_buffered_packets_count
             .fetch_add(newly_buffered_packets_count, Ordering::Relaxed);
@@ -1379,6 +1389,7 @@ impl BankingStage {
         banking_stage_stats: &BankingStageStats,
     ) {
         {
+            let original_packets_count = packet_indexes.len();
             let mut packet_duplicate_check_time = Measure::start("packet_duplicate_check");
             let mut duplicates = duplicates.lock().unwrap();
             let (cache, hasher) = duplicates.deref_mut();
@@ -1396,6 +1407,12 @@ impl BankingStage {
             banking_stage_stats
                 .packet_duplicate_check_elapsed
                 .fetch_add(packet_duplicate_check_time.as_us(), Ordering::Relaxed);
+            banking_stage_stats
+                .dropped_duplicated_packets_count
+                .fetch_add(
+                    original_packets_count.saturating_sub(packet_indexes.len()),
+                    Ordering::Relaxed,
+                );
         }
         if Self::packet_has_more_unprocessed_transactions(&packet_indexes) {
             if unprocessed_packets.len() >= batch_limit {

core/src/broadcast_stage.rs

@@ -22,8 +22,10 @@ use {
     solana_metrics::{inc_new_counter_error, inc_new_counter_info},
     solana_poh::poh_recorder::WorkingBankEntry,
     solana_runtime::{bank::Bank, bank_forks::BankForks},
-    solana_sdk::timing::{timestamp, AtomicInterval},
-    solana_sdk::{clock::Slot, pubkey::Pubkey},
+    solana_sdk::{
+        timing::{timestamp, AtomicInterval},
+        {clock::Slot, pubkey::Pubkey},
+    },
     solana_streamer::{
         sendmmsg::{batch_send, SendPktsError},
         socket::SocketAddrSpace,
@@ -31,9 +33,11 @@ use {
     std::{
         collections::HashMap,
         net::UdpSocket,
-        sync::atomic::{AtomicBool, Ordering},
-        sync::mpsc::{channel, Receiver, RecvError, RecvTimeoutError, Sender},
-        sync::{Arc, Mutex, RwLock},
+        sync::{
+            atomic::{AtomicBool, Ordering},
+            mpsc::{channel, Receiver, RecvError, RecvTimeoutError, Sender},
+            Arc, Mutex, RwLock,
+        },
         thread::{self, Builder, JoinHandle},
         time::{Duration, Instant},
     },
@@ -399,9 +403,9 @@ pub fn broadcast_shreds(
     cluster_nodes_cache: &ClusterNodesCache<BroadcastStage>,
     last_datapoint_submit: &Arc<AtomicInterval>,
     transmit_stats: &mut TransmitShredsStats,
-    socket_addr_space: &SocketAddrSpace,
     cluster_info: &ClusterInfo,
     bank_forks: &Arc<RwLock<BankForks>>,
+    socket_addr_space: &SocketAddrSpace,
 ) -> Result<()> {
     let mut result = Ok(());
     let mut shred_select = Measure::start("shred_select");

core/src/broadcast_stage/fail_entry_verification_broadcast_run.rs

@@ -145,9 +145,9 @@ impl BroadcastRun for FailEntryVerificationBroadcastRun {
             &self.cluster_nodes_cache,
             &Arc::new(AtomicInterval::default()),
             &mut TransmitShredsStats::default(),
-            cluster_info.socket_addr_space(),
             cluster_info,
             bank_forks,
+            cluster_info.socket_addr_space(),
         )
     }
     fn record(

core/src/broadcast_stage/standard_broadcast_run.rs

@@ -362,9 +362,9 @@ impl StandardBroadcastRun {
             &self.cluster_nodes_cache,
             &self.last_datapoint_submit,
             &mut transmit_stats,
-            cluster_info.socket_addr_space(),
             cluster_info,
             bank_forks,
+            cluster_info.socket_addr_space(),
         )?;
         transmit_time.stop();
 

core/src/progress_map.rs

@@ -63,6 +63,11 @@ impl ReplaySlotStats {
             ("load_us", self.execute_timings.load_us, i64),
             ("execute_us", self.execute_timings.execute_us, i64),
             ("store_us", self.execute_timings.store_us, i64),
+            (
+                "update_stakes_cache_us",
+                self.execute_timings.update_stakes_cache_us,
+                i64
+            ),
             (
                 "total_batches_len",
                 self.execute_timings.total_batches_len,

core/src/validator.rs

@@ -1,5 +1,6 @@
 //! The `validator` module hosts all the validator microservices.
 
+pub use solana_perf::report_target_features;
 use {
     crate::{
         broadcast_stage::BroadcastStageType,
@@ -52,6 +53,7 @@ use {
         rpc_pubsub_service::{PubSubConfig, PubSubService},
         rpc_service::JsonRpcService,
         rpc_subscriptions::RpcSubscriptions,
+        send_transaction_service,
         transaction_status_service::TransactionStatusService,
     },
     solana_runtime::{
@@ -132,8 +134,7 @@ pub struct ValidatorConfig {
     pub contact_debug_interval: u64,
     pub contact_save_interval: u64,
     pub bpf_jit: bool,
-    pub send_transaction_retry_ms: u64,
-    pub send_transaction_leader_forward_count: u64,
+    pub send_transaction_service_config: send_transaction_service::Config,
     pub no_poh_speed_test: bool,
     pub poh_pinned_cpu_core: usize,
     pub poh_hashes_per_batch: u64,
@@ -190,8 +191,7 @@ impl Default for ValidatorConfig {
             contact_debug_interval: DEFAULT_CONTACT_DEBUG_INTERVAL_MILLIS,
             contact_save_interval: DEFAULT_CONTACT_SAVE_INTERVAL_MILLIS,
             bpf_jit: false,
-            send_transaction_retry_ms: 2000,
-            send_transaction_leader_forward_count: 2,
+            send_transaction_service_config: send_transaction_service::Config::default(),
             no_poh_speed_test: true,
             poh_pinned_cpu_core: poh_service::DEFAULT_PINNED_CPU_CORE,
             poh_hashes_per_batch: poh_service::DEFAULT_HASHES_PER_BATCH,
@@ -548,8 +548,7 @@ impl Validator {
                     config.trusted_validators.clone(),
                     rpc_override_health_check.clone(),
                     optimistically_confirmed_bank.clone(),
-                    config.send_transaction_retry_ms,
-                    config.send_transaction_leader_forward_count,
+                    config.send_transaction_service_config.clone(),
                     max_slots.clone(),
                     leader_schedule_cache.clone(),
                     max_complete_transaction_status_slot,
@@ -1448,76 +1447,6 @@ fn wait_for_supermajority(
     Ok(true)
 }
 
-fn is_rosetta_emulated() -> bool {
-    #[cfg(target_os = "macos")]
-    {
-        use std::str::FromStr;
-        std::process::Command::new("sysctl")
-            .args(&["-in", "sysctl.proc_translated"])
-            .output()
-            .map_err(|_| ())
-            .and_then(|output| String::from_utf8(output.stdout).map_err(|_| ()))
-            .and_then(|stdout| u8::from_str(stdout.trim()).map_err(|_| ()))
-            .map(|enabled| enabled == 1)
-            .unwrap_or(false)
-    }
-    #[cfg(not(target_os = "macos"))]
-    {
-        false
-    }
-}
-
-pub fn report_target_features() {
-    warn!(
-        "CUDA is {}abled",
-        if solana_perf::perf_libs::api().is_some() {
-            "en"
-        } else {
-            "dis"
-        }
-    );
-
-    if !is_rosetta_emulated() {
-        unsafe { check_avx() };
-        unsafe { check_avx2() };
-    }
-}
-
-// Validator binaries built on a machine with AVX support will generate invalid opcodes
-// when run on machines without AVX causing a non-obvious process abort.  Instead detect
-// the mismatch and error cleanly.
-#[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
-#[target_feature(enable = "avx")]
-unsafe fn check_avx() {
-    if is_x86_feature_detected!("avx") {
-        info!("AVX detected");
-    } else {
-        error!(
-            "Incompatible CPU detected: missing AVX support. Please build from source on the target"
-        );
-        abort();
-    }
-}
-
-#[cfg(not(any(target_arch = "x86", target_arch = "x86_64")))]
-unsafe fn check_avx() {}
-
-#[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
-#[target_feature(enable = "avx2")]
-unsafe fn check_avx2() {
-    if is_x86_feature_detected!("avx2") {
-        info!("AVX2 detected");
-    } else {
-        error!(
-            "Incompatible CPU detected: missing AVX2 support. Please build from source on the target"
-        );
-        abort();
-    }
-}
-
-#[cfg(not(any(target_arch = "x86", target_arch = "x86_64")))]
-unsafe fn check_avx2() {}
-
 // Get the activated stake percentage (based on the provided bank) that is visible in gossip
 fn get_stake_percent_in_gossip(bank: &Bank, cluster_info: &ClusterInfo, log: bool) -> u64 {
     let mut online_stake = 0;

core/src/window_service.rs

@@ -158,6 +158,9 @@ pub(crate) fn should_retransmit_and_persist(
         } else if shred.index() >= MAX_DATA_SHREDS_PER_SLOT as u32 {
             inc_new_counter_warn!("streamer-recv_window-shred_index_overrun", 1);
             false
+        } else if shred.data_header.size as usize > shred.payload.len() {
+            inc_new_counter_warn!("streamer-recv_window-shred_bad_meta_size", 1);
+            false
         } else {
             true
         }
@@ -729,7 +732,7 @@ mod test {
         ));
         let cache = Arc::new(LeaderScheduleCache::new_from_bank(&bank));
 
-        let mut shreds = local_entries_to_shred(&[Entry::default()], 0, 0, &leader_keypair);
+        let shreds = local_entries_to_shred(&[Entry::default()], 0, 0, &leader_keypair);
 
         // with a Bank for slot 0, shred continues
         assert!(should_retransmit_and_persist(
@@ -781,9 +784,22 @@ mod test {
         ));
 
         // with a Bank and no idea who leader is, shred gets thrown out
-        shreds[0].set_slot(MINIMUM_SLOTS_PER_EPOCH as u64 * 3);
+        let mut bad_slot_shred = shreds[0].clone();
+        bad_slot_shred.set_slot(MINIMUM_SLOTS_PER_EPOCH as u64 * 3);
         assert!(!should_retransmit_and_persist(
-            &shreds[0],
+            &bad_slot_shred,
+            Some(bank.clone()),
+            &cache,
+            &me_id,
+            0,
+            0
+        ));
+
+        // with a bad header size
+        let mut bad_header_shred = shreds[0].clone();
+        bad_header_shred.data_header.size = (bad_header_shred.payload.len() + 1) as u16;
+        assert!(!should_retransmit_and_persist(
+            &bad_header_shred,
             Some(bank.clone()),
             &cache,
             &me_id,

crate-features/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "solana-crate-features"
-version = "1.7.15"
+version = "1.7.17"
 description = "Solana Crate Features"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"

docs/src/developing/clients/jsonrpc-api.md

@@ -3039,7 +3039,7 @@ curl http://localhost:8899 -X POST -H "Content-Type: application/json" -d '
 
 Result:
 ```json
-{"jsonrpc":"2.0","result":{"solana-core": "1.7.15"},"id":1}
+{"jsonrpc":"2.0","result":{"solana-core": "1.7.17"},"id":1}
 ```
 
 ### getVoteAccounts
@@ -4151,7 +4151,7 @@ Response:
 ### getConfirmedBlock
 
 **DEPRECATED: Please use [getBlock](jsonrpc-api.md#getblock) instead**
-This method is expected to be removed in solana-core v1.8
+This method is expected to be removed in solana-core v2.0
 
 Returns identity and transaction information about a confirmed block in the ledger
 
@@ -4345,7 +4345,7 @@ For more details on returned data:
 ### getConfirmedBlocks
 
 **DEPRECATED: Please use [getBlocks](jsonrpc-api.md#getblocks) instead**
-This method is expected to be removed in solana-core v1.8
+This method is expected to be removed in solana-core v2.0
 
 Returns a list of confirmed blocks between two slots
 
@@ -4379,7 +4379,7 @@ Result:
 ### getConfirmedBlocksWithLimit
 
 **DEPRECATED: Please use [getBlocksWithLimit](jsonrpc-api.md#getblockswithlimit) instead**
-This method is expected to be removed in solana-core v1.8
+This method is expected to be removed in solana-core v2.0
 
 Returns a list of confirmed blocks starting at the given slot
 
@@ -4411,7 +4411,7 @@ Result:
 ### getConfirmedSignaturesForAddress2
 
 **DEPRECATED: Please use [getSignaturesForAddress](jsonrpc-api.md#getsignaturesforaddress) instead**
-This method is expected to be removed in solana-core v1.8
+This method is expected to be removed in solana-core v2.0
 
 Returns confirmed signatures for transactions involving an
 address backwards in time from the provided signature or most recent confirmed block
@@ -4473,7 +4473,7 @@ Result:
 ### getConfirmedTransaction
 
 **DEPRECATED: Please use [getTransaction](jsonrpc-api.md#gettransaction) instead**
-This method is expected to be removed in solana-core v1.8
+This method is expected to be removed in solana-core v2.0
 
 Returns transaction details for a confirmed transaction
 

dos/Cargo.toml

@@ -2,7 +2,7 @@
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 edition = "2018"
 name = "solana-dos"
-version = "1.7.15"
+version = "1.7.17"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
@@ -14,18 +14,18 @@ clap = "2.33.1"
 log = "0.4.11"
 rand = "0.7.0"
 rayon = "1.5.0"
-solana-clap-utils = { path = "../clap-utils", version = "=1.7.15" }
-solana-core = { path = "../core", version = "=1.7.15" }
-solana-gossip = { path = "../gossip", version = "=1.7.15" }
-solana-ledger = { path = "../ledger", version = "=1.7.15" }
-solana-logger = { path = "../logger", version = "=1.7.15" }
-solana-net-utils = { path = "../net-utils", version = "=1.7.15" }
-solana-perf = { path = "../perf", version = "=1.7.15" }
-solana-runtime = { path = "../runtime", version = "=1.7.15" }
-solana-sdk = { path = "../sdk", version = "=1.7.15" }
-solana-streamer = { path = "../streamer", version = "=1.7.15" }
-solana-version = { path = "../version", version = "=1.7.15" }
-solana-client = { path = "../client", version = "=1.7.15" }
+solana-clap-utils = { path = "../clap-utils", version = "=1.7.17" }
+solana-core = { path = "../core", version = "=1.7.17" }
+solana-gossip = { path = "../gossip", version = "=1.7.17" }
+solana-ledger = { path = "../ledger", version = "=1.7.17" }
+solana-logger = { path = "../logger", version = "=1.7.17" }
+solana-net-utils = { path = "../net-utils", version = "=1.7.17" }
+solana-perf = { path = "../perf", version = "=1.7.17" }
+solana-runtime = { path = "../runtime", version = "=1.7.17" }
+solana-sdk = { path = "../sdk", version = "=1.7.17" }
+solana-streamer = { path = "../streamer", version = "=1.7.17" }
+solana-version = { path = "../version", version = "=1.7.17" }
+solana-client = { path = "../client", version = "=1.7.17" }
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]

download-utils/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "solana-download-utils"
-version = "1.7.15"
+version = "1.7.17"
 description = "Solana Download Utils"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -15,8 +15,8 @@ console = "0.14.1"
 indicatif = "0.15.0"
 log = "0.4.11"
 reqwest = { version = "0.11.2", default-features = false, features = ["blocking", "rustls-tls", "json"] }
-solana-sdk = { path = "../sdk", version = "=1.7.15" }
-solana-runtime = { path = "../runtime", version = "=1.7.15" }
+solana-sdk = { path = "../sdk", version = "=1.7.17" }
+solana-runtime = { path = "../runtime", version = "=1.7.17" }
 tar = "0.4.37"
 
 [lib]

faucet/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "solana-faucet"
-version = "1.7.15"
+version = "1.7.17"
 description = "Solana Faucet"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -16,12 +16,12 @@ clap = "2.33"
 log = "0.4.11"
 serde = "1.0.122"
 serde_derive = "1.0.103"
-solana-clap-utils = { path = "../clap-utils", version = "=1.7.15" }
-solana-cli-config = { path = "../cli-config", version = "=1.7.15" }
-solana-logger = { path = "../logger", version = "=1.7.15" }
-solana-metrics = { path = "../metrics", version = "=1.7.15" }
-solana-sdk = { path = "../sdk", version = "=1.7.15" }
-solana-version = { path = "../version", version = "=1.7.15" }
+solana-clap-utils = { path = "../clap-utils", version = "=1.7.17" }
+solana-cli-config = { path = "../cli-config", version = "=1.7.17" }
+solana-logger = { path = "../logger", version = "=1.7.17" }
+solana-metrics = { path = "../metrics", version = "=1.7.17" }
+solana-sdk = { path = "../sdk", version = "=1.7.17" }
+solana-version = { path = "../version", version = "=1.7.17" }
 spl-memo = { version = "=3.0.1", features = ["no-entrypoint"] }
 thiserror = "1.0"
 tokio = { version = "1", features = ["full"] }

frozen-abi/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "solana-frozen-abi"
-version = "1.7.15"
+version = "1.7.17"
 description = "Solana Frozen ABI"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -16,11 +16,11 @@ log = "0.4.11"
 serde = "1.0.122"
 serde_derive = "1.0.103"
 sha2 = "0.9.2"
-solana-frozen-abi-macro = { path = "macro", version = "=1.7.15" }
+solana-frozen-abi-macro = { path = "macro", version = "=1.7.17" }
 thiserror = "1.0"
 
 [target.'cfg(not(target_arch = "bpf"))'.dependencies]
-solana-logger = { path = "../logger", version = "=1.7.15" }
+solana-logger = { path = "../logger", version = "=1.7.17" }
 generic-array = { version = "0.14.3", default-features = false, features = ["serde", "more_lengths"]}
 memmap2 = "0.1.0"
 

frozen-abi/macro/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "solana-frozen-abi-macro"
-version = "1.7.15"
+version = "1.7.17"
 description = "Solana Frozen ABI Macro"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"

genesis-utils/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "solana-genesis-utils"
-version = "1.7.15"
+version = "1.7.17"
 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 = "2018"
 
 [dependencies]
-solana-sdk = { path = "../sdk", version = "=1.7.15" }
-solana-download-utils = { path = "../download-utils", version = "=1.7.15" }
-solana-runtime = { path = "../runtime", version = "=1.7.15" }
+solana-sdk = { path = "../sdk", version = "=1.7.17" }
+solana-download-utils = { path = "../download-utils", version = "=1.7.17" }
+solana-runtime = { path = "../runtime", version = "=1.7.17" }
 
 [lib]
 crate-type = ["lib"]

genesis/Cargo.toml

@@ -3,7 +3,7 @@ authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 edition = "2018"
 name = "solana-genesis"
 description = "Blockchain, Rebuilt for Scale"
-version = "1.7.15"
+version = "1.7.17"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
@@ -16,16 +16,16 @@ chrono = "0.4"
 serde = "1.0.122"
 serde_json = "1.0.56"
 serde_yaml = "0.8.13"
-solana-clap-utils = { path = "../clap-utils", version = "=1.7.15" }
-solana-cli-config = { path = "../cli-config", version = "=1.7.15" }
-solana-exchange-program = { path = "../programs/exchange", version = "=1.7.15" }
-solana-ledger = { path = "../ledger", version = "=1.7.15" }
-solana-logger = { path = "../logger", version = "=1.7.15" }
-solana-runtime = { path = "../runtime", version = "=1.7.15" }
-solana-sdk = { path = "../sdk", version = "=1.7.15" }
-solana-stake-program = { path = "../programs/stake", version = "=1.7.15" }
-solana-version = { path = "../version", version = "=1.7.15" }
-solana-vote-program = { path = "../programs/vote", version = "=1.7.15" }
+solana-clap-utils = { path = "../clap-utils", version = "=1.7.17" }
+solana-cli-config = { path = "../cli-config", version = "=1.7.17" }
+solana-exchange-program = { path = "../programs/exchange", version = "=1.7.17" }
+solana-ledger = { path = "../ledger", version = "=1.7.17" }
+solana-logger = { path = "../logger", version = "=1.7.17" }
+solana-runtime = { path = "../runtime", version = "=1.7.17" }
+solana-sdk = { path = "../sdk", version = "=1.7.17" }
+solana-stake-program = { path = "../programs/stake", version = "=1.7.17" }
+solana-version = { path = "../version", version = "=1.7.17" }
+solana-vote-program = { path = "../programs/vote", version = "=1.7.17" }
 tempfile = "3.1.0"
 
 [[bin]]

gossip/Cargo.toml

@@ -3,7 +3,7 @@ authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 edition = "2018"
 name = "solana-gossip"
 description = "Blockchain, Rebuilt for Scale"
-version = "1.7.15"
+version = "1.7.17"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
@@ -26,22 +26,22 @@ rayon = "1.5.0"
 serde = "1.0.122"
 serde_bytes = "0.11"
 serde_derive = "1.0.103"
-solana-clap-utils = { path = "../clap-utils", version = "=1.7.15" }
-solana-client = { path = "../client", version = "=1.7.15" }
-solana-frozen-abi = { path = "../frozen-abi", version = "=1.7.15" }
-solana-frozen-abi-macro = { path = "../frozen-abi/macro", version = "=1.7.15" }
-solana-ledger = { path = "../ledger", version = "=1.7.15" }
-solana-logger = { path = "../logger", version = "=1.7.15" }
-solana-measure = { path = "../measure", version = "=1.7.15" }
-solana-metrics = { path = "../metrics", version = "=1.7.15" }
-solana-net-utils = { path = "../net-utils", version = "=1.7.15" }
-solana-perf = { path = "../perf", version = "=1.7.15" }
-solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "=1.7.15" }
-solana-runtime = { path = "../runtime", version = "=1.7.15" }
-solana-streamer = { path = "../streamer", version = "=1.7.15" }
-solana-sdk = { path = "../sdk", version = "=1.7.15" }
-solana-version = { path = "../version", version = "=1.7.15" }
-solana-vote-program = { path = "../programs/vote", version = "=1.7.15" }
+solana-clap-utils = { path = "../clap-utils", version = "=1.7.17" }
+solana-client = { path = "../client", version = "=1.7.17" }
+solana-frozen-abi = { path = "../frozen-abi", version = "=1.7.17" }
+solana-frozen-abi-macro = { path = "../frozen-abi/macro", version = "=1.7.17" }
+solana-ledger = { path = "../ledger", version = "=1.7.17" }
+solana-logger = { path = "../logger", version = "=1.7.17" }
+solana-measure = { path = "../measure", version = "=1.7.17" }
+solana-metrics = { path = "../metrics", version = "=1.7.17" }
+solana-net-utils = { path = "../net-utils", version = "=1.7.17" }
+solana-perf = { path = "../perf", version = "=1.7.17" }
+solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "=1.7.17" }
+solana-runtime = { path = "../runtime", version = "=1.7.17" }
+solana-streamer = { path = "../streamer", version = "=1.7.17" }
+solana-sdk = { path = "../sdk", version = "=1.7.17" }
+solana-version = { path = "../version", version = "=1.7.17" }
+solana-vote-program = { path = "../programs/vote", version = "=1.7.17" }
 thiserror = "1.0"
 
 [dev-dependencies]

gossip/src/cluster_info.rs

@@ -255,7 +255,7 @@ pub fn make_accounts_hashes_message(
 pub(crate) type Ping = ping_pong::Ping<[u8; GOSSIP_PING_TOKEN_SIZE]>;
 
 // TODO These messages should go through the gpu pipeline for spam filtering
-#[frozen_abi(digest = "3qq56sFGXGbNqr7qKq8x47t144ugdfv5adCkVJUMnMf3")]
+#[frozen_abi(digest = "D2ebKKmm6EQ8JJjYc3xUpzpBTJguqgEzShhj9fiUcP6F")]
 #[derive(Serialize, Deserialize, Debug, AbiEnumVisitor, AbiExample)]
 #[allow(clippy::large_enum_variant)]
 pub(crate) enum Protocol {
@@ -372,7 +372,7 @@ fn retain_staked(values: &mut Vec<CrdsValue>, stakes: &HashMap<Pubkey, u64>) {
             // Unstaked nodes can still help repair.
             CrdsData::EpochSlots(_, _) => true,
             // Unstaked nodes can still serve snapshots.
-            CrdsData::SnapshotHashes(_) => true,
+            CrdsData::SnapshotHashes(_) | CrdsData::IncrementalSnapshotHashes(_) => true,
             // Otherwise unstaked voting nodes will show up with no version in
             // the various dashboards.
             CrdsData::Version(_) => true,

gossip/src/cluster_info_metrics.rs

@@ -163,11 +163,12 @@ pub(crate) fn submit_gossip_stats(
     gossip: &RwLock<CrdsGossip>,
     stakes: &HashMap<Pubkey, u64>,
 ) {
-    let (table_size, num_nodes, purged_values_size, failed_inserts_size) = {
+    let (table_size, num_nodes, num_pubkeys, purged_values_size, failed_inserts_size) = {
         let gossip = gossip.read().unwrap();
         (
             gossip.crds.len(),
             gossip.crds.num_nodes(),
+            gossip.crds.num_pubkeys(),
             gossip.crds.num_purged(),
             gossip.pull.failed_inserts.len(),
         )
@@ -192,6 +193,7 @@ pub(crate) fn submit_gossip_stats(
         ("failed_inserts_size", failed_inserts_size as i64, i64),
         ("num_nodes", num_nodes as i64, i64),
         ("num_nodes_staked", num_nodes_staked as i64, i64),
+        ("num_pubkeys", num_pubkeys, i64),
     );
     datapoint_info!(
         "cluster_info_stats2",

gossip/src/crds.rs

@@ -319,8 +319,13 @@ impl Crds {
             .map(move |i| self.table.index(*i))
     }
 
-    /// Returns number of known pubkeys (network size).
+    /// Returns number of known contact-infos (network size).
     pub(crate) fn num_nodes(&self) -> usize {
+        self.nodes.len()
+    }
+
+    /// Returns number of unique pubkeys.
+    pub(crate) fn num_pubkeys(&self) -> usize {
         self.records.len()
     }
 

gossip/src/crds_value.rs

@@ -91,6 +91,7 @@ pub enum CrdsData {
     Version(Version),
     NodeInstance(NodeInstance),
     DuplicateShred(DuplicateShredIndex, DuplicateShred),
+    IncrementalSnapshotHashes(IncrementalSnapshotHashes),
 }
 
 impl Sanitize for CrdsData {
@@ -127,6 +128,7 @@ impl Sanitize for CrdsData {
                     shred.sanitize()
                 }
             }
+            CrdsData::IncrementalSnapshotHashes(val) => val.sanitize(),
         }
     }
 }
@@ -204,6 +206,33 @@ impl SnapshotHash {
         }
     }
 }
+
+#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, AbiExample)]
+pub struct IncrementalSnapshotHashes {
+    from: Pubkey,
+    base: (Slot, Hash),
+    hashes: Vec<(Slot, Hash)>,
+    wallclock: u64,
+}
+
+impl Sanitize for IncrementalSnapshotHashes {
+    fn sanitize(&self) -> Result<(), SanitizeError> {
+        sanitize_wallclock(self.wallclock)?;
+        if self.base.0 >= MAX_SLOT {
+            return Err(SanitizeError::ValueOutOfBounds);
+        }
+        for (slot, _) in &self.hashes {
+            if *slot >= MAX_SLOT {
+                return Err(SanitizeError::ValueOutOfBounds);
+            }
+            if self.base.0 >= *slot {
+                return Err(SanitizeError::InvalidValue);
+            }
+        }
+        self.from.sanitize()
+    }
+}
+
 #[derive(Serialize, Deserialize, Clone, Debug, PartialEq, AbiExample)]
 pub struct LowestSlot {
     pub from: Pubkey,
@@ -470,6 +499,7 @@ pub enum CrdsValueLabel {
     Version(Pubkey),
     NodeInstance(Pubkey),
     DuplicateShred(DuplicateShredIndex, Pubkey),
+    IncrementalSnapshotHashes(Pubkey),
 }
 
 impl fmt::Display for CrdsValueLabel {
@@ -485,6 +515,9 @@ impl fmt::Display for CrdsValueLabel {
             CrdsValueLabel::Version(_) => write!(f, "Version({})", self.pubkey()),
             CrdsValueLabel::NodeInstance(pk) => write!(f, "NodeInstance({})", pk),
             CrdsValueLabel::DuplicateShred(ix, pk) => write!(f, "DuplicateShred({}, {})", ix, pk),
+            CrdsValueLabel::IncrementalSnapshotHashes(_) => {
+                write!(f, "IncrementalSnapshotHashes({})", self.pubkey())
+            }
         }
     }
 }
@@ -502,6 +535,7 @@ impl CrdsValueLabel {
             CrdsValueLabel::Version(p) => *p,
             CrdsValueLabel::NodeInstance(p) => *p,
             CrdsValueLabel::DuplicateShred(_, p) => *p,
+            CrdsValueLabel::IncrementalSnapshotHashes(p) => *p,
         }
     }
 }
@@ -550,6 +584,7 @@ impl CrdsValue {
             CrdsData::Version(version) => version.wallclock,
             CrdsData::NodeInstance(node) => node.wallclock,
             CrdsData::DuplicateShred(_, shred) => shred.wallclock,
+            CrdsData::IncrementalSnapshotHashes(hash) => hash.wallclock,
         }
     }
     pub fn pubkey(&self) -> Pubkey {
@@ -564,6 +599,7 @@ impl CrdsValue {
             CrdsData::Version(version) => version.from,
             CrdsData::NodeInstance(node) => node.from,
             CrdsData::DuplicateShred(_, shred) => shred.from,
+            CrdsData::IncrementalSnapshotHashes(hash) => hash.from,
         }
     }
     pub fn label(&self) -> CrdsValueLabel {
@@ -578,6 +614,9 @@ impl CrdsValue {
             CrdsData::Version(_) => CrdsValueLabel::Version(self.pubkey()),
             CrdsData::NodeInstance(node) => CrdsValueLabel::NodeInstance(node.from),
             CrdsData::DuplicateShred(ix, shred) => CrdsValueLabel::DuplicateShred(*ix, shred.from),
+            CrdsData::IncrementalSnapshotHashes(_) => {
+                CrdsValueLabel::IncrementalSnapshotHashes(self.pubkey())
+            }
         }
     }
     pub fn contact_info(&self) -> Option<&ContactInfo> {

install/Cargo.toml

@@ -3,7 +3,7 @@ authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 edition = "2018"
 name = "solana-install"
 description = "The solana cluster software installer"
-version = "1.7.15"
+version = "1.7.17"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
@@ -16,21 +16,21 @@ bzip2 = "0.3.3"
 chrono = { version = "0.4.11", features = ["serde"] }
 clap = { version = "2.33.1" }
 console = "0.14.1"
-ctrlc = { version = "3.1.5", features = ["termination"] }
+ctrlc = { version = "3.1.9", features = ["termination"] }
 dirs-next = "2.0.0"
 indicatif = "0.15.0"
 lazy_static = "1.4.0"
-nix = "0.19.0"
+nix = "0.20.0"
 reqwest = { version = "0.11.2", default-features = false, features = ["blocking", "rustls-tls", "json"] }
 serde = { version = "1.0.122", features = ["derive"] }
 serde_json = "1.0.62"
 serde_yaml = "0.8.13"
-solana-clap-utils = { path = "../clap-utils", version = "=1.7.15" }
-solana-client = { path = "../client", version = "=1.7.15" }
-solana-config-program = { path = "../programs/config", version = "=1.7.15" }
-solana-logger = { path = "../logger", version = "=1.7.15" }
-solana-sdk = { path = "../sdk", version = "=1.7.15" }
-solana-version = { path = "../version", version = "=1.7.15" }
+solana-clap-utils = { path = "../clap-utils", version = "=1.7.17" }
+solana-client = { path = "../client", version = "=1.7.17" }
+solana-config-program = { path = "../programs/config", version = "=1.7.17" }
+solana-logger = { path = "../logger", version = "=1.7.17" }
+solana-sdk = { path = "../sdk", version = "=1.7.17" }
+solana-version = { path = "../version", version = "=1.7.17" }
 semver = "0.9.0"
 tar = "0.4.37"
 tempfile = "3.1.0"

keygen/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "solana-keygen"
-version = "1.7.15"
+version = "1.7.17"
 description = "Solana key generation utility"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -14,11 +14,11 @@ bs58 = "0.3.1"
 clap = "2.33"
 dirs-next = "2.0.0"
 num_cpus = "1.13.0"
-solana-clap-utils = { path = "../clap-utils", version = "=1.7.15" }
-solana-cli-config = { path = "../cli-config", version = "=1.7.15" }
-solana-remote-wallet = { path = "../remote-wallet", version = "=1.7.15" }
-solana-sdk = { path = "../sdk", version = "=1.7.15" }
-solana-version = { path = "../version", version = "=1.7.15" }
+solana-clap-utils = { path = "../clap-utils", version = "=1.7.17" }
+solana-cli-config = { path = "../cli-config", version = "=1.7.17" }
+solana-remote-wallet = { path = "../remote-wallet", version = "=1.7.17" }
+solana-sdk = { path = "../sdk", version = "=1.7.17" }
+solana-version = { path = "../version", version = "=1.7.17" }
 tiny-bip39 = "0.8.1"
 
 [[bin]]

ledger-tool/Cargo.toml

@@ -3,7 +3,7 @@ authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 edition = "2018"
 name = "solana-ledger-tool"
 description = "Blockchain, Rebuilt for Scale"
-version = "1.7.15"
+version = "1.7.17"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
@@ -24,18 +24,18 @@ regex = "1"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0.56"
 serde_yaml = "0.8.13"
-solana-clap-utils = { path = "../clap-utils", version = "=1.7.15" }
-solana-cli-output = { path = "../cli-output", version = "=1.7.15" }
-solana-ledger = { path = "../ledger", version = "=1.7.15" }
-solana-logger = { path = "../logger", version = "=1.7.15" }
-solana-measure = { path = "../measure", version = "=1.7.15" }
-solana-runtime = { path = "../runtime", version = "=1.7.15" }
-solana-sdk = { path = "../sdk", version = "=1.7.15" }
-solana-stake-program = { path = "../programs/stake", version = "=1.7.15" }
-solana-storage-bigtable = { path = "../storage-bigtable", version = "=1.7.15" }
-solana-transaction-status = { path = "../transaction-status", version = "=1.7.15" }
-solana-version = { path = "../version", version = "=1.7.15" }
-solana-vote-program = { path = "../programs/vote", version = "=1.7.15" }
+solana-clap-utils = { path = "../clap-utils", version = "=1.7.17" }
+solana-cli-output = { path = "../cli-output", version = "=1.7.17" }
+solana-ledger = { path = "../ledger", version = "=1.7.17" }
+solana-logger = { path = "../logger", version = "=1.7.17" }
+solana-measure = { path = "../measure", version = "=1.7.17" }
+solana-runtime = { path = "../runtime", version = "=1.7.17" }
+solana-sdk = { path = "../sdk", version = "=1.7.17" }
+solana-stake-program = { path = "../programs/stake", version = "=1.7.17" }
+solana-storage-bigtable = { path = "../storage-bigtable", version = "=1.7.17" }
+solana-transaction-status = { path = "../transaction-status", version = "=1.7.17" }
+solana-version = { path = "../version", version = "=1.7.17" }
+solana-vote-program = { path = "../programs/vote", version = "=1.7.17" }
 tempfile = "3.1.0"
 tokio = { version = "1", features = ["full"] }
 

ledger/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "solana-ledger"
-version = "1.7.15"
+version = "1.7.17"
 description = "Solana ledger"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -33,21 +33,21 @@ rayon = "1.5.0"
 serde = "1.0.122"
 serde_bytes = "0.11.5"
 sha2 = "0.9.2"
-solana-bpf-loader-program = { path = "../programs/bpf_loader", version = "=1.7.15" }
-solana-frozen-abi = { path = "../frozen-abi", version = "=1.7.15" }
-solana-frozen-abi-macro = { path = "../frozen-abi/macro", version = "=1.7.15" }
-solana-transaction-status = { path = "../transaction-status", version = "=1.7.15" }
-solana-logger = { path = "../logger", version = "=1.7.15" }
-solana-measure = { path = "../measure", version = "=1.7.15" }
-solana-merkle-tree = { path = "../merkle-tree", version = "=1.7.15" }
-solana-metrics = { path = "../metrics", version = "=1.7.15" }
-solana-perf = { path = "../perf", version = "=1.7.15" }
-solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "=1.7.15" }
-solana-runtime = { path = "../runtime", version = "=1.7.15" }
-solana-sdk = { path = "../sdk", version = "=1.7.15" }
-solana-storage-bigtable = { path = "../storage-bigtable", version = "=1.7.15" }
-solana-storage-proto = { path = "../storage-proto", version = "=1.7.15" }
-solana-vote-program = { path = "../programs/vote", version = "=1.7.15" }
+solana-bpf-loader-program = { path = "../programs/bpf_loader", version = "=1.7.17" }
+solana-frozen-abi = { path = "../frozen-abi", version = "=1.7.17" }
+solana-frozen-abi-macro = { path = "../frozen-abi/macro", version = "=1.7.17" }
+solana-transaction-status = { path = "../transaction-status", version = "=1.7.17" }
+solana-logger = { path = "../logger", version = "=1.7.17" }
+solana-measure = { path = "../measure", version = "=1.7.17" }
+solana-merkle-tree = { path = "../merkle-tree", version = "=1.7.17" }
+solana-metrics = { path = "../metrics", version = "=1.7.17" }
+solana-perf = { path = "../perf", version = "=1.7.17" }
+solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "=1.7.17" }
+solana-runtime = { path = "../runtime", version = "=1.7.17" }
+solana-sdk = { path = "../sdk", version = "=1.7.17" }
+solana-storage-bigtable = { path = "../storage-bigtable", version = "=1.7.17" }
+solana-storage-proto = { path = "../storage-proto", version = "=1.7.17" }
+solana-vote-program = { path = "../programs/vote", version = "=1.7.17" }
 tempfile = "3.1.0"
 thiserror = "1.0"
 tokio = { version = "1", features = ["full"] }
@@ -72,7 +72,7 @@ features = ["lz4"]
 [dev-dependencies]
 assert_matches = "1.3.0"
 matches = "0.1.6"
-solana-account-decoder = { path = "../account-decoder", version = "=1.7.15" }
+solana-account-decoder = { path = "../account-decoder", version = "=1.7.17" }
 
 [build-dependencies]
 rustc_version = "0.2"

ledger/src/blockstore.rs

@@ -8387,6 +8387,7 @@ pub mod tests {
                         amount: "11".to_string(),
                         ui_amount_string: "1.1".to_string(),
                     },
+                    owner: Pubkey::new_unique().to_string(),
                 }]),
                 post_token_balances: Some(vec![TransactionTokenBalance {
                     account_index: 0,
@@ -8397,6 +8398,7 @@ pub mod tests {
                         amount: "11".to_string(),
                         ui_amount_string: "1.1".to_string(),
                     },
+                    owner: Pubkey::new_unique().to_string(),
                 }]),
                 rewards: Some(vec![Reward {
                     pubkey: "My11111111111111111111111111111111111111111".to_string(),

local-cluster/Cargo.toml

@@ -3,7 +3,7 @@ authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 edition = "2018"
 name = "solana-local-cluster"
 description = "Blockchain, Rebuilt for Scale"
-version = "1.7.15"
+version = "1.7.17"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
@@ -17,22 +17,22 @@ fs_extra = "1.2.0"
 log = "0.4.11"
 rand = "0.7.0"
 rayon = "1.5.0"
-solana-config-program = { path = "../programs/config", version = "=1.7.15" }
-solana-core = { path = "../core", version = "=1.7.15" }
-solana-client = { path = "../client", version = "=1.7.15" }
-solana-download-utils = { path = "../download-utils", version = "=1.7.15" }
-solana-exchange-program = { path = "../programs/exchange", version = "=1.7.15" }
-solana-faucet = { path = "../faucet", version = "=1.7.15" }
-solana-gossip = { path = "../gossip", version = "=1.7.15" }
-solana-ledger = { path = "../ledger", version = "=1.7.15" }
-solana-logger = { path = "../logger", version = "=1.7.15" }
-solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "=1.7.15" }
-solana-rpc = { path = "../rpc", version = "=1.7.15" }
-solana-runtime = { path = "../runtime", version = "=1.7.15" }
-solana-sdk = { path = "../sdk", version = "=1.7.15" }
-solana-stake-program = { path = "../programs/stake", version = "=1.7.15" }
-solana-streamer = { path = "../streamer", version = "=1.7.15" }
-solana-vote-program = { path = "../programs/vote", version = "=1.7.15" }
+solana-config-program = { path = "../programs/config", version = "=1.7.17" }
+solana-core = { path = "../core", version = "=1.7.17" }
+solana-client = { path = "../client", version = "=1.7.17" }
+solana-download-utils = { path = "../download-utils", version = "=1.7.17" }
+solana-exchange-program = { path = "../programs/exchange", version = "=1.7.17" }
+solana-faucet = { path = "../faucet", version = "=1.7.17" }
+solana-gossip = { path = "../gossip", version = "=1.7.17" }
+solana-ledger = { path = "../ledger", version = "=1.7.17" }
+solana-logger = { path = "../logger", version = "=1.7.17" }
+solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "=1.7.17" }
+solana-rpc = { path = "../rpc", version = "=1.7.17" }
+solana-runtime = { path = "../runtime", version = "=1.7.17" }
+solana-sdk = { path = "../sdk", version = "=1.7.17" }
+solana-stake-program = { path = "../programs/stake", version = "=1.7.17" }
+solana-streamer = { path = "../streamer", version = "=1.7.17" }
+solana-vote-program = { path = "../programs/vote", version = "=1.7.17" }
 tempfile = "3.1.0"
 
 [dev-dependencies]

local-cluster/src/validator_configs.rs

@@ -42,8 +42,7 @@ pub fn safe_clone_config(config: &ValidatorConfig) -> ValidatorConfig {
         contact_debug_interval: config.contact_debug_interval,
         contact_save_interval: config.contact_save_interval,
         bpf_jit: config.bpf_jit,
-        send_transaction_retry_ms: config.send_transaction_retry_ms,
-        send_transaction_leader_forward_count: config.send_transaction_leader_forward_count,
+        send_transaction_service_config: config.send_transaction_service_config.clone(),
         no_poh_speed_test: config.no_poh_speed_test,
         poh_pinned_cpu_core: config.poh_pinned_cpu_core,
         account_indexes: config.account_indexes.clone(),

log-analyzer/Cargo.toml

@@ -3,7 +3,7 @@ authors = ["Solana Maintainers <maintainers@solana.com>"]
 edition = "2018"
 name = "solana-log-analyzer"
 description = "The solana cluster network analysis tool"
-version = "1.7.15"
+version = "1.7.17"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
@@ -14,9 +14,9 @@ byte-unit = "4.0.9"
 clap = "2.33.1"
 serde = "1.0.122"
 serde_json = "1.0.56"
-solana-clap-utils = { path = "../clap-utils", version = "=1.7.15" }
-solana-logger = { path = "../logger", version = "=1.7.15" }
-solana-version = { path = "../version", version = "=1.7.15" }
+solana-clap-utils = { path = "../clap-utils", version = "=1.7.17" }
+solana-logger = { path = "../logger", version = "=1.7.17" }
+solana-version = { path = "../version", version = "=1.7.17" }
 
 [[bin]]
 name = "solana-log-analyzer"

logger/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "solana-logger"
-version = "1.7.15"
+version = "1.7.17"
 description = "Solana Logger"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"

measure/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "solana-measure"
 description = "Blockchain, Rebuilt for Scale"
-version = "1.7.15"
+version = "1.7.17"
 homepage = "https://solana.com/"
 documentation = "https://docs.rs/solana-measure"
 readme = "../README.md"
@@ -12,8 +12,8 @@ edition = "2018"
 
 [dependencies]
 log = "0.4.11"
-solana-sdk = { path = "../sdk", version = "=1.7.15" }
-solana-metrics = { path = "../metrics", version = "=1.7.15" }
+solana-sdk = { path = "../sdk", version = "=1.7.17" }
+solana-metrics = { path = "../metrics", version = "=1.7.17" }
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]

merkle-root-bench/Cargo.toml

@@ -2,7 +2,7 @@
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 edition = "2018"
 name = "solana-merkle-root-bench"
-version = "1.7.15"
+version = "1.7.17"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
@@ -10,11 +10,11 @@ publish = false
 
 [dependencies]
 log = "0.4.11"
-solana-logger = { path = "../logger", version = "=1.7.15" }
-solana-runtime = { path = "../runtime", version = "=1.7.15" }
-solana-measure = { path = "../measure", version = "=1.7.15" }
-solana-sdk = { path = "../sdk", version = "=1.7.15" }
-solana-version = { path = "../version", version = "=1.7.15" }
+solana-logger = { path = "../logger", version = "=1.7.17" }
+solana-runtime = { path = "../runtime", version = "=1.7.17" }
+solana-measure = { path = "../measure", version = "=1.7.17" }
+solana-sdk = { path = "../sdk", version = "=1.7.17" }
+solana-version = { path = "../version", version = "=1.7.17" }
 clap = "2.33.1"
 
 [package.metadata.docs.rs]

merkle-tree/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "solana-merkle-tree"
-version = "1.7.15"
+version = "1.7.17"
 description = "Solana Merkle Tree"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -10,7 +10,7 @@ documentation = "https://docs.rs/solana-merkle-tree"
 edition = "2018"
 
 [dependencies]
-solana-program = { path = "../sdk/program", version = "=1.7.15" }
+solana-program = { path = "../sdk/program", version = "=1.7.17" }
 fast-math = "0.1"
 
 # This can go once the BPF toolchain target Rust 1.42.0+

metrics/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "solana-metrics"
-version = "1.7.15"
+version = "1.7.17"
 description = "Solana Metrics"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -15,7 +15,7 @@ gethostname = "0.2.1"
 lazy_static = "1.4.0"
 log = "0.4.11"
 reqwest = { version = "0.11.2", default-features = false, features = ["blocking", "rustls-tls", "json"] }
-solana-sdk = { path = "../sdk", version = "=1.7.15" }
+solana-sdk = { path = "../sdk", version = "=1.7.17" }
 
 [dev-dependencies]
 rand = "0.7.0"

net-shaper/Cargo.toml

@@ -3,7 +3,7 @@ authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 edition = "2018"
 name = "solana-net-shaper"
 description = "The solana cluster network shaping tool"
-version = "1.7.15"
+version = "1.7.17"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
@@ -13,8 +13,8 @@ publish = false
 clap = "2.33.1"
 serde = "1.0.122"
 serde_json = "1.0.56"
-solana-clap-utils = { path = "../clap-utils", version = "=1.7.15" }
-solana-logger = { path = "../logger", version = "=1.7.15" }
+solana-clap-utils = { path = "../clap-utils", version = "=1.7.17" }
+solana-logger = { path = "../logger", version = "=1.7.17" }
 rand = "0.7.0"
 
 [[bin]]

net-utils/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "solana-net-utils"
-version = "1.7.15"
+version = "1.7.17"
 description = "Solana Network Utilities"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -13,15 +13,15 @@ edition = "2018"
 bincode = "1.3.1"
 clap = "2.33.1"
 log = "0.4.11"
-nix = "0.19.0"
+nix = "0.20.0"
 rand = "0.7.0"
 serde = "1.0.122"
 serde_derive = "1.0.103"
 socket2 = "0.3.17"
-solana-clap-utils = { path = "../clap-utils", version = "=1.7.15" }
-solana-logger = { path = "../logger", version = "=1.7.15" }
-solana-sdk = { path = "../sdk", version = "=1.7.15" }
-solana-version = { path = "../version", version = "=1.7.15" }
+solana-clap-utils = { path = "../clap-utils", version = "=1.7.17" }
+solana-logger = { path = "../logger", version = "=1.7.17" }
+solana-sdk = { path = "../sdk", version = "=1.7.17" }
+solana-version = { path = "../version", version = "=1.7.17" }
 tokio = { version = "1", features = ["full"] }
 url = "2.1.1"
 

net/net.sh

@@ -106,6 +106,8 @@ Operate a configured testnet
                                       - Override the number of slots in an epoch
    --warp-slot WARP_SLOT
                                       - Boot from a snapshot that has warped ahead to WARP_SLOT rather than a slot 0 genesis.
+   --full-rpc
+                                      - Support full RPC services on all nodes
  sanity/start-specific options:
    -F                   - Discard validator nodes that didn't bootup successfully
    -o noInstallCheck    - Skip solana-install sanity
@@ -312,6 +314,7 @@ startBootstrapLeader() {
          \"$maybeNoSnapshot $maybeSkipLedgerVerify $maybeLimitLedgerSize $maybeWaitForSupermajority $maybeAllowPrivateAddr $maybeAccountsDbSkipShrink $maybeSkipRequireTower\" \
          \"$gpuMode\" \
          \"$maybeWarpSlot\" \
+         \"$maybeFullRpc\" \
          \"$waitForNodeInit\" \
          \"$extraPrimordialStakes\" \
          \"$TMPFS_ACCOUNTS\" \
@@ -384,6 +387,7 @@ startNode() {
          \"$maybeNoSnapshot $maybeSkipLedgerVerify $maybeLimitLedgerSize $maybeWaitForSupermajority $maybeAllowPrivateAddr $maybeAccountsDbSkipShrink $maybeSkipRequireTower\" \
          \"$gpuMode\" \
          \"$maybeWarpSlot\" \
+         \"$maybeFullRpc\" \
          \"$waitForNodeInit\" \
          \"$extraPrimordialStakes\" \
          \"$TMPFS_ACCOUNTS\" \
@@ -795,6 +799,7 @@ netemCommand="add"
 clientDelayStart=0
 netLogDir=
 maybeWarpSlot=
+maybeFullRpc=false
 waitForNodeInit=true
 extraPrimordialStakes=0
 
@@ -903,6 +908,9 @@ while [[ -n $1 ]]; do
     elif [[ $1 == --warp-slot ]]; then
       maybeWarpSlot="$1 $2"
       shift 2
+    elif [[ $1 == --full-rpc ]]; then
+      maybeFullRpc=true
+      shift 1
     elif [[ $1 == --async-node-init ]]; then
       waitForNodeInit=false
       shift 1

net/remote/remote-node.sh

@@ -26,9 +26,10 @@ genesisOptions="${17}"
 extraNodeArgs="${18}"
 gpuMode="${19:-auto}"
 maybeWarpSlot="${20}"
-waitForNodeInit="${21}"
-extraPrimordialStakes="${22:=0}"
-tmpfsAccounts="${23:false}"
+maybeFullRpc="${21}"
+waitForNodeInit="${22}"
+extraPrimordialStakes="${23:=0}"
+tmpfsAccounts="${24:false}"
 set +x
 
 missing() {
@@ -286,6 +287,11 @@ EOF
       args+=(--accounts /mnt/solana-accounts)
     fi
 
+    if $maybeFullRpc; then
+      args+=(--enable-rpc-transaction-history)
+      args+=(--enable-cpi-and-log-storage)
+    fi
+
     if [[ $airdropsEnabled = true ]]; then
 cat >> ~/solana/on-reboot <<EOF
       ./multinode-demo/faucet.sh > faucet.log 2>&1 &
@@ -409,6 +415,11 @@ EOF
       args+=(--accounts /mnt/solana-accounts)
     fi
 
+    if $maybeFullRpc; then
+      args+=(--enable-rpc-transaction-history)
+      args+=(--enable-cpi-and-log-storage)
+    fi
+
 cat >> ~/solana/on-reboot <<EOF
     $maybeSkipAccountsCreation
     nohup multinode-demo/validator.sh ${args[@]} > validator.log.\$now 2>&1 &

notifier/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "solana-notifier"
-version = "1.7.15"
+version = "1.7.17"
 description = "Solana Notifier"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"

perf/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "solana-perf"
-version = "1.7.15"
+version = "1.7.17"
 description = "Solana Performance APIs"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -19,11 +19,11 @@ log = "0.4.11"
 rand = "0.7.0"
 rayon = "1.5.0"
 serde = "1.0.126"
-solana-logger = { path = "../logger", version = "=1.7.15" }
-solana-metrics = { path = "../metrics", version = "=1.7.15" }
-solana-sdk = { path = "../sdk", version = "=1.7.15" }
-solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "=1.7.15" }
-solana-vote-program = { path = "../programs/vote", version = "=1.7.15" }
+solana-logger = { path = "../logger", version = "=1.7.17" }
+solana-metrics = { path = "../metrics", version = "=1.7.17" }
+solana-sdk = { path = "../sdk", version = "=1.7.17" }
+solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "=1.7.17" }
+solana-vote-program = { path = "../programs/vote", version = "=1.7.17" }
 
 [lib]
 name = "solana_perf"

perf/build.rs

@@ -0,0 +1,11 @@
+fn main() {
+    #[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
+    {
+        if is_x86_feature_detected!("avx") {
+            println!("cargo:rustc-cfg=build_target_feature_avx");
+        }
+        if is_x86_feature_detected!("avx2") {
+            println!("cargo:rustc-cfg=build_target_feature_avx2");
+        }
+    }
+}

perf/src/lib.rs

@@ -19,3 +19,62 @@ extern crate matches;
 
 #[macro_use]
 extern crate solana_metrics;
+
+fn is_rosetta_emulated() -> bool {
+    #[cfg(target_os = "macos")]
+    {
+        use std::str::FromStr;
+        std::process::Command::new("sysctl")
+            .args(&["-in", "sysctl.proc_translated"])
+            .output()
+            .map_err(|_| ())
+            .and_then(|output| String::from_utf8(output.stdout).map_err(|_| ()))
+            .and_then(|stdout| u8::from_str(stdout.trim()).map_err(|_| ()))
+            .map(|enabled| enabled == 1)
+            .unwrap_or(false)
+    }
+    #[cfg(not(target_os = "macos"))]
+    {
+        false
+    }
+}
+
+pub fn report_target_features() {
+    warn!(
+        "CUDA is {}abled",
+        if crate::perf_libs::api().is_some() {
+            "en"
+        } else {
+            "dis"
+        }
+    );
+
+    // Validator binaries built on a machine with AVX support will generate invalid opcodes
+    // when run on machines without AVX causing a non-obvious process abort.  Instead detect
+    // the mismatch and error cleanly.
+    if !is_rosetta_emulated() {
+        #[cfg(build_target_feature_avx)]
+        {
+            if is_x86_feature_detected!("avx") {
+                info!("AVX detected");
+            } else {
+                error!(
+                "Incompatible CPU detected: missing AVX support. Please build from source on the target"
+            );
+                std::process::abort();
+            }
+        }
+
+        #[cfg(build_target_feature_avx2)]
+        {
+            if is_x86_feature_detected!("avx2") {
+                info!("AVX2 detected");
+            } else {
+                error!(
+                    "Incompatible CPU detected: missing AVX2 support. Please build from source on the target"
+                );
+                std::process::abort();
+            }
+        }
+    }
+}

poh-bench/Cargo.toml

@@ -2,7 +2,7 @@
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 edition = "2018"
 name = "solana-poh-bench"
-version = "1.7.15"
+version = "1.7.17"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
@@ -13,13 +13,13 @@ clap = "2.33.1"
 log = "0.4.11"
 rand = "0.7.0"
 rayon = "1.5.0"
-solana-logger = { path = "../logger", version = "=1.7.15" }
-solana-ledger = { path = "../ledger", version = "=1.7.15" }
-solana-sdk = { path = "../sdk", version = "=1.7.15" }
-solana-clap-utils = { path = "../clap-utils", version = "=1.7.15" }
-solana-measure = { path = "../measure", version = "=1.7.15" }
-solana-version = { path = "../version", version = "=1.7.15" }
-solana-perf = { path = "../perf", version = "=1.7.15" }
+solana-logger = { path = "../logger", version = "=1.7.17" }
+solana-ledger = { path = "../ledger", version = "=1.7.17" }
+solana-sdk = { path = "../sdk", version = "=1.7.17" }
+solana-clap-utils = { path = "../clap-utils", version = "=1.7.17" }
+solana-measure = { path = "../measure", version = "=1.7.17" }
+solana-version = { path = "../version", version = "=1.7.17" }
+solana-perf = { path = "../perf", version = "=1.7.17" }
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]

poh/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "solana-poh"
-version = "1.7.15"
+version = "1.7.17"
 description = "Solana PoH"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -13,20 +13,20 @@ edition = "2018"
 core_affinity = "0.5.10"
 crossbeam-channel = "0.4"
 log = "0.4.11"
-solana-ledger = { path = "../ledger", version = "=1.7.15" }
-solana-measure = { path = "../measure", version = "=1.7.15" }
-solana-metrics = { path = "../metrics", version = "=1.7.15" }
-solana-runtime = { path = "../runtime", version = "=1.7.15" }
-solana-sdk = { path = "../sdk", version = "=1.7.15" }
-solana-sys-tuner = { path = "../sys-tuner", version = "=1.7.15" }
+solana-ledger = { path = "../ledger", version = "=1.7.17" }
+solana-measure = { path = "../measure", version = "=1.7.17" }
+solana-metrics = { path = "../metrics", version = "=1.7.17" }
+solana-runtime = { path = "../runtime", version = "=1.7.17" }
+solana-sdk = { path = "../sdk", version = "=1.7.17" }
+solana-sys-tuner = { path = "../sys-tuner", version = "=1.7.17" }
 thiserror = "1.0"
 
 [dev-dependencies]
 bincode = "1.3.1"
 matches = "0.1.6"
 rand = "0.7.0"
-solana-logger = { path = "../logger", version = "=1.7.15" }
-solana-perf = { path = "../perf", version = "=1.7.15" }
+solana-logger = { path = "../logger", version = "=1.7.17" }
+solana-perf = { path = "../perf", version = "=1.7.17" }
 
 [lib]
 crate-type = ["lib"]

program-test/Cargo.toml

@@ -5,7 +5,7 @@ edition = "2018"
 license = "Apache-2.0"
 name = "solana-program-test"
 repository = "https://github.com/solana-labs/solana"
-version = "1.7.15"
+version = "1.7.17"
 
 [dependencies]
 async-trait = "0.1.42"
@@ -17,13 +17,13 @@ log = "0.4.11"
 mio = "0.7.6"
 serde = "1.0.112"
 serde_derive = "1.0.103"
-solana-banks-client = { path = "../banks-client", version = "=1.7.15" }
-solana-banks-server = { path = "../banks-server", version = "=1.7.15" }
-solana-bpf-loader-program = { path = "../programs/bpf_loader", version = "=1.7.15" }
-solana-logger = { path = "../logger", version = "=1.7.15" }
-solana-runtime = { path = "../runtime", version = "=1.7.15" }
-solana-sdk = { path = "../sdk", version = "=1.7.15" }
-solana-vote-program = { path = "../programs/vote", version = "=1.7.15" }
+solana-banks-client = { path = "../banks-client", version = "=1.7.17" }
+solana-banks-server = { path = "../banks-server", version = "=1.7.17" }
+solana-bpf-loader-program = { path = "../programs/bpf_loader", version = "=1.7.17" }
+solana-logger = { path = "../logger", version = "=1.7.17" }
+solana-runtime = { path = "../runtime", version = "=1.7.17" }
+solana-sdk = { path = "../sdk", version = "=1.7.17" }
+solana-vote-program = { path = "../programs/vote", version = "=1.7.17" }
 thiserror = "1.0"
 tokio = { version = "1", features = ["full"] }
 

programs/bpf/Cargo.lock

@@ -294,6 +294,26 @@ version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7"
 
+[[package]]
+name = "bytemuck"
+version = "1.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72957246c41db82b8ef88a5486143830adeb8227ef9837740bdec67724cf2c5b"
+dependencies = [
+ "bytemuck_derive",
+]
+
+[[package]]
+name = "bytemuck_derive"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e215f8c2f9f79cb53c8335e687ffd07d5bfcb6fe5fc80723762d0be46e7cc54"
+dependencies = [
+ "proc-macro2 1.0.24",
+ "quote 1.0.6",
+ "syn 1.0.67",
+]
+
 [[package]]
 name = "byteorder"
 version = "0.5.3"
@@ -1423,9 +1443,9 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.98"
+version = "0.2.103"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "320cfe77175da3a483efed4bc0adc1968ca050b098ce4f2f1c13a56626128790"
+checksum = "dd8f7255a17a627354f321ef0055d63b898c6fb27eff628af4d1b66b7331edf6"
 
 [[package]]
 name = "libloading"
@@ -1546,9 +1566,9 @@ dependencies = [
 
 [[package]]
 name = "memoffset"
-version = "0.6.1"
+version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "157b4208e3059a8f9e78d559edc658e13df41410cb3ae03979c83130067fdd87"
+checksum = "59accc507f1338036a0477ef61afdae33cde60840f4dfe481319ce3ad116ddf9"
 dependencies = [
  "autocfg",
 ]
@@ -1634,14 +1654,15 @@ dependencies = [
 
 [[package]]
 name = "nix"
-version = "0.19.1"
+version = "0.20.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2ccba0cfe4fdf15982d1674c69b1fd80bad427d293849982668dfe454bd61f2"
+checksum = "f5e06129fb611568ef4e868c14b326274959aa70ff7776e9d55323531c374945"
 dependencies = [
  "bitflags",
  "cc",
  "cfg-if 1.0.0",
  "libc",
+ "memoffset",
 ]
 
 [[package]]
@@ -2592,7 +2613,7 @@ dependencies = [
 
 [[package]]
 name = "solana-account-decoder"
-version = "1.7.15"
+version = "1.7.17"
 dependencies = [
  "Inflector",
  "base64 0.12.3",
@@ -2613,7 +2634,7 @@ dependencies = [
 
 [[package]]
 name = "solana-banks-client"
-version = "1.7.15"
+version = "1.7.17"
 dependencies = [
  "bincode",
  "borsh",
@@ -2621,7 +2642,7 @@ dependencies = [
  "futures",
  "mio",
  "solana-banks-interface",
- "solana-program 1.7.15",
+ "solana-program 1.7.17",
  "solana-sdk",
  "tarpc",
  "tokio",
@@ -2630,7 +2651,7 @@ dependencies = [
 
 [[package]]
 name = "solana-banks-interface"
-version = "1.7.15"
+version = "1.7.17"
 dependencies = [
  "mio",
  "serde",
@@ -2640,7 +2661,7 @@ dependencies = [
 
 [[package]]
 name = "solana-banks-server"
-version = "1.7.15"
+version = "1.7.17"
 dependencies = [
  "bincode",
  "futures",
@@ -2658,7 +2679,7 @@ dependencies = [
 
 [[package]]
 name = "solana-bpf-loader-program"
-version = "1.7.15"
+version = "1.7.17"
 dependencies = [
  "bincode",
  "byteorder 1.3.4",
@@ -2677,7 +2698,7 @@ dependencies = [
 
 [[package]]
 name = "solana-bpf-programs"
-version = "1.7.15"
+version = "1.7.17"
 dependencies = [
  "bincode",
  "byteorder 1.3.4",
@@ -2689,7 +2710,7 @@ dependencies = [
  "solana-account-decoder",
  "solana-bpf-loader-program",
  "solana-cli-output",
- "solana-logger 1.7.15",
+ "solana-logger 1.7.17",
  "solana-measure",
  "solana-runtime",
  "solana-sdk",
@@ -2700,288 +2721,288 @@ dependencies = [
 
 [[package]]
 name = "solana-bpf-rust-128bit"
-version = "1.7.15"
+version = "1.7.17"
 dependencies = [
  "solana-bpf-rust-128bit-dep",
- "solana-program 1.7.15",
+ "solana-program 1.7.17",
 ]
 
 [[package]]
 name = "solana-bpf-rust-128bit-dep"
-version = "1.7.15"
+version = "1.7.17"
 dependencies = [
- "solana-program 1.7.15",
+ "solana-program 1.7.17",
 ]
 
 [[package]]
 name = "solana-bpf-rust-alloc"
-version = "1.7.15"
+version = "1.7.17"
 dependencies = [
- "solana-program 1.7.15",
+ "solana-program 1.7.17",
 ]
 
 [[package]]
 name = "solana-bpf-rust-call-depth"
-version = "1.7.15"
+version = "1.7.17"
 dependencies = [
- "solana-program 1.7.15",
+ "solana-program 1.7.17",
 ]
 
 [[package]]
 name = "solana-bpf-rust-caller-access"
-version = "1.7.15"
+version = "1.7.17"
 dependencies = [
- "solana-program 1.7.15",
+ "solana-program 1.7.17",
 ]
 
 [[package]]
 name = "solana-bpf-rust-custom-heap"
-version = "1.7.15"
+version = "1.7.17"
 dependencies = [
- "solana-program 1.7.15",
+ "solana-program 1.7.17",
 ]
 
 [[package]]
 name = "solana-bpf-rust-dep-crate"
-version = "1.7.15"
+version = "1.7.17"
 dependencies = [
  "byteorder 1.3.4",
- "solana-program 1.7.15",
+ "solana-program 1.7.17",
 ]
 
 [[package]]
 name = "solana-bpf-rust-deprecated-loader"
-version = "1.7.15"
+version = "1.7.17"
 dependencies = [
- "solana-program 1.7.15",
+ "solana-program 1.7.17",
 ]
 
 [[package]]
 name = "solana-bpf-rust-dup-accounts"
-version = "1.7.15"
+version = "1.7.17"
 dependencies = [
- "solana-program 1.7.15",
+ "solana-program 1.7.17",
 ]
 
 [[package]]
 name = "solana-bpf-rust-error-handling"
-version = "1.7.15"
+version = "1.7.17"
 dependencies = [
  "num-derive 0.2.5",
  "num-traits",
- "solana-program 1.7.15",
+ "solana-program 1.7.17",
  "thiserror",
 ]
 
 [[package]]
 name = "solana-bpf-rust-external-spend"
-version = "1.7.15"
+version = "1.7.17"
 dependencies = [
- "solana-program 1.7.15",
+ "solana-program 1.7.17",
 ]
 
 [[package]]
 name = "solana-bpf-rust-finalize"
-version = "1.7.15"
+version = "1.7.17"
 dependencies = [
- "solana-program 1.7.15",
+ "solana-program 1.7.17",
 ]
 
 [[package]]
 name = "solana-bpf-rust-instruction-introspection"
-version = "1.7.15"
+version = "1.7.17"
 dependencies = [
- "solana-program 1.7.15",
+ "solana-program 1.7.17",
 ]
 
 [[package]]
 name = "solana-bpf-rust-invoke"
-version = "1.7.15"
+version = "1.7.17"
 dependencies = [
  "solana-bpf-rust-invoked",
- "solana-program 1.7.15",
+ "solana-program 1.7.17",
 ]
 
 [[package]]
 name = "solana-bpf-rust-invoke-and-error"
-version = "1.7.15"
+version = "1.7.17"
 dependencies = [
- "solana-program 1.7.15",
+ "solana-program 1.7.17",
 ]
 
 [[package]]
 name = "solana-bpf-rust-invoke-and-ok"
-version = "1.7.15"
+version = "1.7.17"
 dependencies = [
- "solana-program 1.7.15",
+ "solana-program 1.7.17",
 ]
 
 [[package]]
 name = "solana-bpf-rust-invoke-and-return"
-version = "1.7.15"
+version = "1.7.17"
 dependencies = [
- "solana-program 1.7.15",
+ "solana-program 1.7.17",
 ]
 
 [[package]]
 name = "solana-bpf-rust-invoked"
-version = "1.7.15"
+version = "1.7.17"
 dependencies = [
- "solana-program 1.7.15",
+ "solana-program 1.7.17",
 ]
 
 [[package]]
 name = "solana-bpf-rust-iter"
-version = "1.7.15"
+version = "1.7.17"
 dependencies = [
- "solana-program 1.7.15",
+ "solana-program 1.7.17",
 ]
 
 [[package]]
 name = "solana-bpf-rust-many-args"
-version = "1.7.15"
+version = "1.7.17"
 dependencies = [
  "solana-bpf-rust-many-args-dep",
- "solana-program 1.7.15",
+ "solana-program 1.7.17",
 ]
 
 [[package]]
 name = "solana-bpf-rust-many-args-dep"
-version = "1.7.15"
+version = "1.7.17"
 dependencies = [
- "solana-program 1.7.15",
+ "solana-program 1.7.17",
 ]
 
 [[package]]
 name = "solana-bpf-rust-mem"
-version = "1.7.15"
+version = "1.7.17"
 dependencies = [
- "solana-program 1.7.15",
+ "solana-program 1.7.17",
  "solana-program-test",
  "solana-sdk",
 ]
 
 [[package]]
 name = "solana-bpf-rust-membuiltins"
-version = "1.7.15"
+version = "1.7.17"
 dependencies = [
  "solana-bpf-rust-mem",
- "solana-program 1.7.15",
+ "solana-program 1.7.17",
 ]
 
 [[package]]
 name = "solana-bpf-rust-noop"
-version = "1.7.15"
+version = "1.7.17"
 dependencies = [
- "solana-program 1.7.15",
+ "solana-program 1.7.17",
 ]
 
 [[package]]
 name = "solana-bpf-rust-panic"
-version = "1.7.15"
+version = "1.7.17"
 dependencies = [
- "solana-program 1.7.15",
+ "solana-program 1.7.17",
 ]
 
 [[package]]
 name = "solana-bpf-rust-param-passing"
-version = "1.7.15"
+version = "1.7.17"
 dependencies = [
  "solana-bpf-rust-param-passing-dep",
- "solana-program 1.7.15",
+ "solana-program 1.7.17",
 ]
 
 [[package]]
 name = "solana-bpf-rust-param-passing-dep"
-version = "1.7.15"
+version = "1.7.17"
 dependencies = [
- "solana-program 1.7.15",
+ "solana-program 1.7.17",
 ]
 
 [[package]]
 name = "solana-bpf-rust-rand"
-version = "1.7.15"
+version = "1.7.17"
 dependencies = [
  "getrandom 0.1.14",
  "rand 0.7.3",
- "solana-program 1.7.15",
+ "solana-program 1.7.17",
 ]
 
 [[package]]
 name = "solana-bpf-rust-ro-account_modify"
-version = "1.7.15"
+version = "1.7.17"
 dependencies = [
- "solana-program 1.7.15",
+ "solana-program 1.7.17",
 ]
 
 [[package]]
 name = "solana-bpf-rust-ro-modify"
-version = "1.7.15"
+version = "1.7.17"
 dependencies = [
- "solana-program 1.7.15",
+ "solana-program 1.7.17",
 ]
 
 [[package]]
 name = "solana-bpf-rust-sanity"
-version = "1.7.15"
+version = "1.7.17"
 dependencies = [
- "solana-program 1.7.15",
+ "solana-program 1.7.17",
 ]
 
 [[package]]
 name = "solana-bpf-rust-secp256k1-recover"
-version = "1.7.15"
+version = "1.7.17"
 dependencies = [
- "solana-program 1.7.15",
+ "solana-program 1.7.17",
 ]
 
 [[package]]
 name = "solana-bpf-rust-sha"
-version = "1.7.15"
+version = "1.7.17"
 dependencies = [
- "solana-program 1.7.15",
+ "solana-program 1.7.17",
 ]
 
 [[package]]
 name = "solana-bpf-rust-spoof1"
-version = "1.7.15"
+version = "1.7.17"
 dependencies = [
- "solana-program 1.7.15",
+ "solana-program 1.7.17",
 ]
 
 [[package]]
 name = "solana-bpf-rust-spoof1-system"
-version = "1.7.15"
+version = "1.7.17"
 dependencies = [
- "solana-program 1.7.15",
+ "solana-program 1.7.17",
 ]
 
 [[package]]
 name = "solana-bpf-rust-sysvar"
-version = "1.7.15"
+version = "1.7.17"
 dependencies = [
- "solana-program 1.7.15",
+ "solana-program 1.7.17",
  "solana-program-test",
  "solana-sdk",
 ]
 
 [[package]]
 name = "solana-bpf-rust-upgradeable"
-version = "1.7.15"
+version = "1.7.17"
 dependencies = [
- "solana-program 1.7.15",
+ "solana-program 1.7.17",
 ]
 
 [[package]]
 name = "solana-bpf-rust-upgraded"
-version = "1.7.15"
+version = "1.7.17"
 dependencies = [
- "solana-program 1.7.15",
+ "solana-program 1.7.17",
 ]
 
 [[package]]
 name = "solana-clap-utils"
-version = "1.7.15"
+version = "1.7.17"
 dependencies = [
  "chrono",
  "clap",
@@ -2996,7 +3017,7 @@ dependencies = [
 
 [[package]]
 name = "solana-cli-config"
-version = "1.7.15"
+version = "1.7.17"
 dependencies = [
  "dirs-next",
  "lazy_static",
@@ -3008,7 +3029,7 @@ dependencies = [
 
 [[package]]
 name = "solana-cli-output"
-version = "1.7.15"
+version = "1.7.17"
 dependencies = [
  "Inflector",
  "base64 0.13.0",
@@ -3031,7 +3052,7 @@ dependencies = [
 
 [[package]]
 name = "solana-client"
-version = "1.7.15"
+version = "1.7.17"
 dependencies = [
  "base64 0.13.0",
  "bincode",
@@ -3063,7 +3084,7 @@ dependencies = [
 
 [[package]]
 name = "solana-config-program"
-version = "1.7.15"
+version = "1.7.17"
 dependencies = [
  "bincode",
  "chrono",
@@ -3076,7 +3097,7 @@ dependencies = [
 
 [[package]]
 name = "solana-crate-features"
-version = "1.7.15"
+version = "1.7.17"
 dependencies = [
  "backtrace",
  "bytes 0.4.12",
@@ -3098,7 +3119,7 @@ dependencies = [
 
 [[package]]
 name = "solana-faucet"
-version = "1.7.15"
+version = "1.7.17"
 dependencies = [
  "bincode",
  "byteorder 1.3.4",
@@ -3108,7 +3129,7 @@ dependencies = [
  "serde_derive",
  "solana-clap-utils",
  "solana-cli-config",
- "solana-logger 1.7.15",
+ "solana-logger 1.7.17",
  "solana-metrics",
  "solana-sdk",
  "solana-version",
@@ -3139,7 +3160,7 @@ dependencies = [
 
 [[package]]
 name = "solana-frozen-abi"
-version = "1.7.15"
+version = "1.7.17"
 dependencies = [
  "bs58",
  "bv",
@@ -3150,8 +3171,8 @@ dependencies = [
  "serde",
  "serde_derive",
  "sha2",
- "solana-frozen-abi-macro 1.7.15",
- "solana-logger 1.7.15",
+ "solana-frozen-abi-macro 1.7.17",
+ "solana-logger 1.7.17",
  "thiserror",
 ]
 
@@ -3169,7 +3190,7 @@ dependencies = [
 
 [[package]]
 name = "solana-frozen-abi-macro"
-version = "1.7.15"
+version = "1.7.17"
 dependencies = [
  "proc-macro2 1.0.24",
  "quote 1.0.6",
@@ -3190,7 +3211,7 @@ dependencies = [
 
 [[package]]
 name = "solana-logger"
-version = "1.7.15"
+version = "1.7.17"
 dependencies = [
  "env_logger",
  "lazy_static",
@@ -3199,7 +3220,7 @@ dependencies = [
 
 [[package]]
 name = "solana-measure"
-version = "1.7.15"
+version = "1.7.17"
 dependencies = [
  "log",
  "solana-metrics",
@@ -3208,7 +3229,7 @@ dependencies = [
 
 [[package]]
 name = "solana-metrics"
-version = "1.7.15"
+version = "1.7.17"
 dependencies = [
  "env_logger",
  "gethostname",
@@ -3220,7 +3241,7 @@ dependencies = [
 
 [[package]]
 name = "solana-net-utils"
-version = "1.7.15"
+version = "1.7.17"
 dependencies = [
  "bincode",
  "clap",
@@ -3231,7 +3252,7 @@ dependencies = [
  "serde_derive",
  "socket2 0.3.17",
  "solana-clap-utils",
- "solana-logger 1.7.15",
+ "solana-logger 1.7.17",
  "solana-sdk",
  "solana-version",
  "tokio",
@@ -3275,7 +3296,7 @@ dependencies = [
 
 [[package]]
 name = "solana-program"
-version = "1.7.15"
+version = "1.7.17"
 dependencies = [
  "bincode",
  "blake3",
@@ -3283,6 +3304,7 @@ dependencies = [
  "borsh-derive",
  "bs58",
  "bv",
+ "bytemuck",
  "curve25519-dalek 2.1.0",
  "hex",
  "itertools 0.9.0",
@@ -3299,16 +3321,16 @@ dependencies = [
  "serde_derive",
  "sha2",
  "sha3",
- "solana-frozen-abi 1.7.15",
- "solana-frozen-abi-macro 1.7.15",
- "solana-logger 1.7.15",
- "solana-sdk-macro 1.7.15",
+ "solana-frozen-abi 1.7.17",
+ "solana-frozen-abi-macro 1.7.17",
+ "solana-logger 1.7.17",
+ "solana-sdk-macro 1.7.17",
  "thiserror",
 ]
 
 [[package]]
 name = "solana-program-test"
-version = "1.7.15"
+version = "1.7.17"
 dependencies = [
  "async-trait",
  "base64 0.12.3",
@@ -3322,7 +3344,7 @@ dependencies = [
  "solana-banks-client",
  "solana-banks-server",
  "solana-bpf-loader-program",
- "solana-logger 1.7.15",
+ "solana-logger 1.7.17",
  "solana-runtime",
  "solana-sdk",
  "solana-vote-program",
@@ -3332,7 +3354,7 @@ dependencies = [
 
 [[package]]
 name = "solana-rayon-threadlimit"
-version = "1.7.15"
+version = "1.7.17"
 dependencies = [
  "lazy_static",
  "num_cpus",
@@ -3340,7 +3362,7 @@ dependencies = [
 
 [[package]]
 name = "solana-remote-wallet"
-version = "1.7.15"
+version = "1.7.17"
 dependencies = [
  "base32",
  "console 0.14.1",
@@ -3359,7 +3381,7 @@ dependencies = [
 
 [[package]]
 name = "solana-runtime"
-version = "1.7.15"
+version = "1.7.17"
 dependencies = [
  "arrayref",
  "bincode",
@@ -3389,9 +3411,9 @@ dependencies = [
  "serde",
  "serde_derive",
  "solana-config-program",
- "solana-frozen-abi 1.7.15",
- "solana-frozen-abi-macro 1.7.15",
- "solana-logger 1.7.15",
+ "solana-frozen-abi 1.7.17",
+ "solana-frozen-abi-macro 1.7.17",
+ "solana-logger 1.7.17",
  "solana-measure",
  "solana-metrics",
  "solana-rayon-threadlimit",
@@ -3408,7 +3430,7 @@ dependencies = [
 
 [[package]]
 name = "solana-sdk"
-version = "1.7.15"
+version = "1.7.17"
 dependencies = [
  "assert_matches",
  "bincode",
@@ -3444,11 +3466,11 @@ dependencies = [
  "sha2",
  "sha3",
  "solana-crate-features",
- "solana-frozen-abi 1.7.15",
- "solana-frozen-abi-macro 1.7.15",
- "solana-logger 1.7.15",
- "solana-program 1.7.15",
- "solana-sdk-macro 1.7.15",
+ "solana-frozen-abi 1.7.17",
+ "solana-frozen-abi-macro 1.7.17",
+ "solana-logger 1.7.17",
+ "solana-program 1.7.17",
+ "solana-sdk-macro 1.7.17",
  "thiserror",
  "uriparse",
 ]
@@ -3468,7 +3490,7 @@ dependencies = [
 
 [[package]]
 name = "solana-sdk-macro"
-version = "1.7.15"
+version = "1.7.17"
 dependencies = [
  "bs58",
  "proc-macro2 1.0.24",
@@ -3479,14 +3501,14 @@ dependencies = [
 
 [[package]]
 name = "solana-secp256k1-program"
-version = "1.7.15"
+version = "1.7.17"
 dependencies = [
  "solana-sdk",
 ]
 
 [[package]]
 name = "solana-stake-program"
-version = "1.7.15"
+version = "1.7.17"
 dependencies = [
  "bincode",
  "log",
@@ -3496,8 +3518,8 @@ dependencies = [
  "serde",
  "serde_derive",
  "solana-config-program",
- "solana-frozen-abi 1.7.15",
- "solana-frozen-abi-macro 1.7.15",
+ "solana-frozen-abi 1.7.17",
+ "solana-frozen-abi-macro 1.7.17",
  "solana-metrics",
  "solana-sdk",
  "solana-vote-program",
@@ -3506,17 +3528,20 @@ dependencies = [
 
 [[package]]
 name = "solana-transaction-status"
-version = "1.7.15"
+version = "1.7.17"
 dependencies = [
  "Inflector",
  "base64 0.12.3",
  "bincode",
  "bs58",
  "lazy_static",
+ "log",
  "serde",
  "serde_derive",
  "serde_json",
  "solana-account-decoder",
+ "solana-measure",
+ "solana-metrics",
  "solana-runtime",
  "solana-sdk",
  "solana-vote-program",
@@ -3528,21 +3553,21 @@ dependencies = [
 
 [[package]]
 name = "solana-version"
-version = "1.7.15"
+version = "1.7.17"
 dependencies = [
  "log",
  "rustc_version",
  "serde",
  "serde_derive",
- "solana-frozen-abi 1.7.15",
- "solana-frozen-abi-macro 1.7.15",
- "solana-logger 1.7.15",
+ "solana-frozen-abi 1.7.17",
+ "solana-frozen-abi-macro 1.7.17",
+ "solana-logger 1.7.17",
  "solana-sdk",
 ]
 
 [[package]]
 name = "solana-vote-program"
-version = "1.7.15"
+version = "1.7.17"
 dependencies = [
  "bincode",
  "log",
@@ -3551,9 +3576,9 @@ dependencies = [
  "rustc_version",
  "serde",
  "serde_derive",
- "solana-frozen-abi 1.7.15",
- "solana-frozen-abi-macro 1.7.15",
- "solana-logger 1.7.15",
+ "solana-frozen-abi 1.7.17",
+ "solana-frozen-abi-macro 1.7.17",
+ "solana-logger 1.7.17",
  "solana-metrics",
  "solana-sdk",
  "thiserror",

programs/bpf/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "solana-bpf-programs"
 description = "Blockchain, Rebuilt for Scale"
-version = "1.7.15"
+version = "1.7.17"
 documentation = "https://docs.rs/solana"
 homepage = "https://solana.com/"
 readme = "README.md"
@@ -26,15 +26,15 @@ itertools = "0.10.0"
 log = "0.4.11"
 miow = "0.2.2"
 net2 = "0.2.37"
-solana-bpf-loader-program = { path = "../bpf_loader", version = "=1.7.15" }
-solana-cli-output = { path = "../../cli-output", version = "=1.7.15" }
-solana-logger = { path = "../../logger", version = "=1.7.15" }
-solana-measure = { path = "../../measure", version = "=1.7.15" }
+solana-bpf-loader-program = { path = "../bpf_loader", version = "=1.7.17" }
+solana-cli-output = { path = "../../cli-output", version = "=1.7.17" }
+solana-logger = { path = "../../logger", version = "=1.7.17" }
+solana-measure = { path = "../../measure", version = "=1.7.17" }
 solana_rbpf = "=0.2.11"
-solana-runtime = { path = "../../runtime", version = "=1.7.15" }
-solana-sdk = { path = "../../sdk", version = "=1.7.15" }
-solana-transaction-status = { path = "../../transaction-status", version = "=1.7.15" }
-solana-account-decoder = { path = "../../account-decoder", version = "=1.7.15" }
+solana-runtime = { path = "../../runtime", version = "=1.7.17" }
+solana-sdk = { path = "../../sdk", version = "=1.7.17" }
+solana-transaction-status = { path = "../../transaction-status", version = "=1.7.17" }
+solana-account-decoder = { path = "../../account-decoder", version = "=1.7.17" }
 
 
 [[bench]]

programs/bpf/rust/128bit/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "solana-bpf-rust-128bit"
-version = "1.7.15"
+version = "1.7.17"
 description = "Solana BPF test program written in Rust"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -10,8 +10,8 @@ documentation = "https://docs.rs/solana-bpf-rust-128bit"
 edition = "2018"
 
 [dependencies]
-solana-program = { path = "../../../../sdk/program", version = "=1.7.15" }
-solana-bpf-rust-128bit-dep = { path = "../128bit_dep", version = "=1.7.15" }
+solana-program = { path = "../../../../sdk/program", version = "=1.7.17" }
+solana-bpf-rust-128bit-dep = { path = "../128bit_dep", version = "=1.7.17" }
 
 [lib]
 crate-type = ["cdylib"]

programs/bpf/rust/128bit_dep/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "solana-bpf-rust-128bit-dep"
-version = "1.7.15"
+version = "1.7.17"
 description = "Solana BPF test program written in Rust"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -10,7 +10,7 @@ documentation = "https://docs.rs/solana-bpf-rust-128bit-dep"
 edition = "2018"
 
 [dependencies]
-solana-program = { path = "../../../../sdk/program", version = "=1.7.15" }
+solana-program = { path = "../../../../sdk/program", version = "=1.7.17" }
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]

programs/bpf/rust/alloc/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "solana-bpf-rust-alloc"
-version = "1.7.15"
+version = "1.7.17"
 description = "Solana BPF test program written in Rust"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -10,7 +10,7 @@ documentation = "https://docs.rs/solana-bpf-rust-alloc"
 edition = "2018"
 
 [dependencies]
-solana-program = { path = "../../../../sdk/program", version = "=1.7.15" }
+solana-program = { path = "../../../../sdk/program", version = "=1.7.17" }
 
 [lib]
 crate-type = ["cdylib"]

programs/bpf/rust/call_depth/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "solana-bpf-rust-call-depth"
-version = "1.7.15"
+version = "1.7.17"
 description = "Solana BPF test program written in Rust"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -10,7 +10,7 @@ documentation = "https://docs.rs/solana-bpf-rust-call-depth"
 edition = "2018"
 
 [dependencies]
-solana-program = { path = "../../../../sdk/program", version = "=1.7.15" }
+solana-program = { path = "../../../../sdk/program", version = "=1.7.17" }
 
 [lib]
 crate-type = ["cdylib"]

programs/bpf/rust/caller_access/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "solana-bpf-rust-caller-access"
-version = "1.7.15"
+version = "1.7.17"
 description = "Solana BPF test program written in Rust"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -10,7 +10,7 @@ documentation = "https://docs.rs/solana-bpf-rust-caller-access"
 edition = "2018"
 
 [dependencies]
-solana-program = { path = "../../../../sdk/program", version = "=1.7.15" }
+solana-program = { path = "../../../../sdk/program", version = "=1.7.17" }
 
 [lib]
 crate-type = ["cdylib"]

programs/bpf/rust/custom_heap/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "solana-bpf-rust-custom-heap"
-version = "1.7.15"
+version = "1.7.17"
 description = "Solana BPF test program written in Rust"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -10,7 +10,7 @@ documentation = "https://docs.rs/solana-bpf-rust-custom-heap"
 edition = "2018"
 
 [dependencies]
-solana-program = { path = "../../../../sdk/program", version = "=1.7.15" }
+solana-program = { path = "../../../../sdk/program", version = "=1.7.17" }
 
 [features]
 default = ["custom-heap"]

programs/bpf/rust/dep_crate/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "solana-bpf-rust-dep-crate"
-version = "1.7.15"
+version = "1.7.17"
 description = "Solana BPF test program written in Rust"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -11,7 +11,7 @@ edition = "2018"
 
 [dependencies]
 byteorder = { version = "1", default-features = false }
-solana-program = { path = "../../../../sdk/program", version = "=1.7.15" }
+solana-program = { path = "../../../../sdk/program", version = "=1.7.17" }
 
 [lib]
 crate-type = ["cdylib"]

programs/bpf/rust/deprecated_loader/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "solana-bpf-rust-deprecated-loader"
-version = "1.7.15"
+version = "1.7.17"
 description = "Solana BPF test program written in Rust"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -10,7 +10,7 @@ documentation = "https://docs.rs/solana-bpf-rust-deprecated-loader"
 edition = "2018"
 
 [dependencies]
-solana-program = { path = "../../../../sdk/program", version = "=1.7.15" }
+solana-program = { path = "../../../../sdk/program", version = "=1.7.17" }
 
 [lib]
 crate-type = ["cdylib"]

programs/bpf/rust/dup_accounts/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "solana-bpf-rust-dup-accounts"
-version = "1.7.15"
+version = "1.7.17"
 description = "Solana BPF test program written in Rust"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -10,7 +10,7 @@ documentation = "https://docs.rs/solana-bpf-rust-dup-accounts"
 edition = "2018"
 
 [dependencies]
-solana-program = { path = "../../../../sdk/program", version = "=1.7.15" }
+solana-program = { path = "../../../../sdk/program", version = "=1.7.17" }
 
 [lib]
 crate-type = ["cdylib"]

programs/bpf/rust/error_handling/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "solana-bpf-rust-error-handling"
-version = "1.7.15"
+version = "1.7.17"
 description = "Solana BPF test program written in Rust"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -12,7 +12,7 @@ edition = "2018"
 [dependencies]
 num-derive = "0.2"
 num-traits = "0.2"
-solana-program = { path = "../../../../sdk/program", version = "=1.7.15" }
+solana-program = { path = "../../../../sdk/program", version = "=1.7.17" }
 thiserror = "1.0"
 
 [lib]

programs/bpf/rust/external_spend/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "solana-bpf-rust-external-spend"
-version = "1.7.15"
+version = "1.7.17"
 description = "Solana BPF test program written in Rust"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -10,7 +10,7 @@ documentation = "https://docs.rs/solana-bpf-rust-external-spend"
 edition = "2018"
 
 [dependencies]
-solana-program = { path = "../../../../sdk/program", version = "=1.7.15" }
+solana-program = { path = "../../../../sdk/program", version = "=1.7.17" }
 
 [lib]
 crate-type = ["cdylib"]

programs/bpf/rust/finalize/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "solana-bpf-rust-finalize"
-version = "1.7.15"
+version = "1.7.17"
 description = "Solana BPF test program written in Rust"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -10,7 +10,7 @@ documentation = "https://docs.rs/solana-bpf-rust-finalize"
 edition = "2018"
 
 [dependencies]
-solana-program = { path = "../../../../sdk/program", version = "=1.7.15" }
+solana-program = { path = "../../../../sdk/program", version = "=1.7.17" }
 
 [lib]
 crate-type = ["cdylib"]

programs/bpf/rust/instruction_introspection/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "solana-bpf-rust-instruction-introspection"
-version = "1.7.15"
+version = "1.7.17"
 description = "Solana BPF test program written in Rust"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -10,7 +10,7 @@ documentation = "https://docs.rs/solana-bpf-rust-instruction-introspection"
 edition = "2018"
 
 [dependencies]
-solana-program = { path = "../../../../sdk/program", version = "=1.7.15" }
+solana-program = { path = "../../../../sdk/program", version = "=1.7.17" }
 
 [lib]
 crate-type = ["cdylib"]

programs/bpf/rust/invoke/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "solana-bpf-rust-invoke"
-version = "1.7.15"
+version = "1.7.17"
 description = "Solana BPF test program written in Rust"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -11,7 +11,7 @@ edition = "2018"
 
 [dependencies]
 solana-bpf-rust-invoked = { path = "../invoked", default-features = false }
-solana-program = { path = "../../../../sdk/program", version = "=1.7.15" }
+solana-program = { path = "../../../../sdk/program", version = "=1.7.17" }
 
 [lib]
 crate-type = ["cdylib"]

programs/bpf/rust/invoke_and_error/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "solana-bpf-rust-invoke-and-error"
-version = "1.7.15"
+version = "1.7.17"
 description = "Solana BPF test program written in Rust"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -10,7 +10,7 @@ documentation = "https://docs.rs/solana-bpf-rust-invoke-and-error"
 edition = "2018"
 
 [dependencies]
-solana-program = { path = "../../../../sdk/program", version = "=1.7.15" }
+solana-program = { path = "../../../../sdk/program", version = "=1.7.17" }
 
 [lib]
 crate-type = ["cdylib"]

programs/bpf/rust/invoke_and_ok/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "solana-bpf-rust-invoke-and-ok"
-version = "1.7.15"
+version = "1.7.17"
 description = "Solana BPF test program written in Rust"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -10,7 +10,7 @@ documentation = "https://docs.rs/solana-bpf-rust-invoke-and-ok"
 edition = "2018"
 
 [dependencies]
-solana-program = { path = "../../../../sdk/program", version = "=1.7.15" }
+solana-program = { path = "../../../../sdk/program", version = "=1.7.17" }
 
 [lib]
 crate-type = ["cdylib"]

programs/bpf/rust/invoke_and_return/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "solana-bpf-rust-invoke-and-return"
-version = "1.7.15"
+version = "1.7.17"
 description = "Solana BPF test program written in Rust"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -10,7 +10,7 @@ documentation = "https://docs.rs/solana-bpf-rust-invoke-and-return"
 edition = "2018"
 
 [dependencies]
-solana-program = { path = "../../../../sdk/program", version = "=1.7.15" }
+solana-program = { path = "../../../../sdk/program", version = "=1.7.17" }
 
 [lib]
 crate-type = ["cdylib"]

programs/bpf/rust/invoked/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "solana-bpf-rust-invoked"
-version = "1.7.15"
+version = "1.7.17"
 description = "Solana BPF test program written in Rust"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -10,7 +10,7 @@ documentation = "https://docs.rs/solana-bpf-rust-invoked"
 edition = "2018"
 
 [dependencies]
-solana-program = { path = "../../../../sdk/program", version = "=1.7.15" }
+solana-program = { path = "../../../../sdk/program", version = "=1.7.17" }
 
 [features]
 default = ["program"]

programs/bpf/rust/iter/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "solana-bpf-rust-iter"
-version = "1.7.15"
+version = "1.7.17"
 description = "Solana BPF test program written in Rust"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -10,7 +10,7 @@ documentation = "https://docs.rs/solana-bpf-rust-iter"
 edition = "2018"
 
 [dependencies]
-solana-program = { path = "../../../../sdk/program", version = "=1.7.15" }
+solana-program = { path = "../../../../sdk/program", version = "=1.7.17" }
 
 [lib]
 crate-type = ["cdylib"]

programs/bpf/rust/many_args/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "solana-bpf-rust-many-args"
-version = "1.7.15"
+version = "1.7.17"
 description = "Solana BPF test program written in Rust"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -10,8 +10,8 @@ documentation = "https://docs.rs/solana-bpf-rust-many-args"
 edition = "2018"
 
 [dependencies]
-solana-program = { path = "../../../../sdk/program", version = "=1.7.15" }
-solana-bpf-rust-many-args-dep = { path = "../many_args_dep", version = "=1.7.15" }
+solana-program = { path = "../../../../sdk/program", version = "=1.7.17" }
+solana-bpf-rust-many-args-dep = { path = "../many_args_dep", version = "=1.7.17" }
 
 [lib]
 crate-type = ["cdylib"]

programs/bpf/rust/many_args_dep/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "solana-bpf-rust-many-args-dep"
-version = "1.7.15"
+version = "1.7.17"
 description = "Solana BPF test program written in Rust"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -10,7 +10,7 @@ documentation = "https://docs.rs/solana-bpf-rust-many-args-dep"
 edition = "2018"
 
 [dependencies]
-solana-program = { path = "../../../../sdk/program", version = "=1.7.15" }
+solana-program = { path = "../../../../sdk/program", version = "=1.7.17" }
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]

programs/bpf/rust/mem/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "solana-bpf-rust-mem"
-version = "1.7.15"
+version = "1.7.17"
 description = "Solana BPF test program written in Rust"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -13,11 +13,11 @@ edition = "2018"
 no-entrypoint = []
 
 [dependencies]
-solana-program = { path = "../../../../sdk/program", version = "=1.7.15" }
+solana-program = { path = "../../../../sdk/program", version = "=1.7.17" }
 
 [dev-dependencies]
-solana-program-test = { path = "../../../../program-test", version = "=1.7.15" }
-solana-sdk = { path = "../../../../sdk", version = "=1.7.15" }
+solana-program-test = { path = "../../../../program-test", version = "=1.7.17" }
+solana-sdk = { path = "../../../../sdk", version = "=1.7.17" }
 
 [lib]
 crate-type = ["cdylib", "lib"]

programs/bpf/rust/membuiltins/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "solana-bpf-rust-membuiltins"
-version = "1.7.15"
+version = "1.7.17"
 description = "Solana BPF test program written in Rust"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -10,8 +10,8 @@ documentation = "https://docs.rs/solana-bpf-rust-mem"
 edition = "2018"
 
 [dependencies]
-solana-bpf-rust-mem = { path = "../mem", version = "=1.7.15", features = [ "no-entrypoint" ] }
-solana-program = { path = "../../../../sdk/program", version = "=1.7.15" }
+solana-bpf-rust-mem = { path = "../mem", version = "=1.7.17", features = [ "no-entrypoint" ] }
+solana-program = { path = "../../../../sdk/program", version = "=1.7.17" }
 
 [lib]
 crate-type = ["cdylib"]

programs/bpf/rust/noop/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "solana-bpf-rust-noop"
-version = "1.7.15"
+version = "1.7.17"
 description = "Solana BPF test program written in Rust"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -10,7 +10,7 @@ documentation = "https://docs.rs/solana-bpf-rust-noop"
 edition = "2018"
 
 [dependencies]
-solana-program = { path = "../../../../sdk/program", version = "=1.7.15" }
+solana-program = { path = "../../../../sdk/program", version = "=1.7.17" }
 
 [lib]
 crate-type = ["cdylib"]

programs/bpf/rust/panic/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "solana-bpf-rust-panic"
-version = "1.7.15"
+version = "1.7.17"
 description = "Solana BPF test program written in Rust"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -10,7 +10,7 @@ documentation = "https://docs.rs/solana-bpf-rust-panic"
 edition = "2018"
 
 [dependencies]
-solana-program = { path = "../../../../sdk/program", version = "=1.7.15" }
+solana-program = { path = "../../../../sdk/program", version = "=1.7.17" }
 
 [features]
 default = ["custom-panic"]

programs/bpf/rust/param_passing/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "solana-bpf-rust-param-passing"
-version = "1.7.15"
+version = "1.7.17"
 description = "Solana BPF test program written in Rust"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -10,8 +10,8 @@ documentation = "https://docs.rs/solana-bpf-rust-param-passing"
 edition = "2018"
 
 [dependencies]
-solana-program = { path = "../../../../sdk/program", version = "=1.7.15" }
-solana-bpf-rust-param-passing-dep = { path = "../param_passing_dep", version = "=1.7.15" }
+solana-program = { path = "../../../../sdk/program", version = "=1.7.17" }
+solana-bpf-rust-param-passing-dep = { path = "../param_passing_dep", version = "=1.7.17" }
 
 [lib]
 crate-type = ["cdylib"]

programs/bpf/rust/param_passing_dep/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "solana-bpf-rust-param-passing-dep"
-version = "1.7.15"
+version = "1.7.17"
 description = "Solana BPF program written in Rust"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -10,7 +10,7 @@ documentation = "https://docs.rs/solana-bpf-rust-param-passing-dep"
 edition = "2018"
 
 [dependencies]
-solana-program = { path = "../../../../sdk/program", version = "=1.7.15" }
+solana-program = { path = "../../../../sdk/program", version = "=1.7.17" }
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]