Move discard check before generate offsets (#22684 )

(cherry picked from commit 7569f282c6)
Fix typos (#22700 )
2022-01-24 13:00:19 +00:00 · 2022-01-24 03:23:40 +00:00 · 2022-01-23 21:24:58 +00:00 · 2022-01-23 15:34:44 +08:00 · 2022-01-21 23:59:41 -07:00 · 2022-01-22 14:08:15 +08:00
145 changed files with 2070 additions and 1292 deletions
--- a/Cargo.lock
+++ b/Cargo.lock
--- a/account-decoder/Cargo.toml
+++ b/account-decoder/Cargo.toml
@ -1,6 +1,6 @@
 [package]
 name = "solana-account-decoder"
-version = "1.9.5"
+version = "1.9.6"
 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.130"
 serde_derive = "1.0.103"
 serde_json = "1.0.72"
-solana-config-program = { path = "../programs/config", version = "=1.9.5" }
-solana-sdk = { path = "../sdk", version = "=1.9.5" }
-solana-vote-program = { path = "../programs/vote", version = "=1.9.5" }
+solana-config-program = { path = "../programs/config", version = "=1.9.6" }
+solana-sdk = { path = "../sdk", version = "=1.9.6" }
+solana-vote-program = { path = "../programs/vote", version = "=1.9.6" }
 spl-token = { version = "=3.2.0", features = ["no-entrypoint"] }
 thiserror = "1.0"
 zstd = "0.9.0"
--- a/accounts-bench/Cargo.toml
+++ b/accounts-bench/Cargo.toml
@ -2,7 +2,7 @@
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 edition = "2021"
 name = "solana-accounts-bench"
-version = "1.9.5"
+version = "1.9.6"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
@ -11,11 +11,11 @@ publish = false
 [dependencies]
 log = "0.4.14"
 rayon = "1.5.1"
-solana-logger = { path = "../logger", version = "=1.9.5" }
-solana-runtime = { path = "../runtime", version = "=1.9.5" }
-solana-measure = { path = "../measure", version = "=1.9.5" }
-solana-sdk = { path = "../sdk", version = "=1.9.5" }
-solana-version = { path = "../version", version = "=1.9.5" }
+solana-logger = { path = "../logger", version = "=1.9.6" }
+solana-runtime = { path = "../runtime", version = "=1.9.6" }
+solana-measure = { path = "../measure", version = "=1.9.6" }
+solana-sdk = { path = "../sdk", version = "=1.9.6" }
+solana-version = { path = "../version", version = "=1.9.6" }
 clap = "2.33.1"

 [package.metadata.docs.rs]
--- a/accounts-cluster-bench/Cargo.toml
+++ b/accounts-cluster-bench/Cargo.toml
@ -2,7 +2,7 @@
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 edition = "2021"
 name = "solana-accounts-cluster-bench"
-version = "1.9.5"
+version = "1.9.6"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
@ -13,25 +13,25 @@ clap = "2.33.1"
 log = "0.4.14"
 rand = "0.7.0"
 rayon = "1.5.1"
-solana-account-decoder = { path = "../account-decoder", version = "=1.9.5" }
-solana-clap-utils = { path = "../clap-utils", version = "=1.9.5" }
-solana-client = { path = "../client", version = "=1.9.5" }
-solana-core = { path = "../core", version = "=1.9.5" }
-solana-faucet = { path = "../faucet", version = "=1.9.5" }
-solana-gossip = { path = "../gossip", version = "=1.9.5" }
-solana-logger = { path = "../logger", version = "=1.9.5" }
-solana-measure = { path = "../measure", version = "=1.9.5" }
-solana-net-utils = { path = "../net-utils", version = "=1.9.5" }
-solana-runtime = { path = "../runtime", version = "=1.9.5" }
-solana-sdk = { path = "../sdk", version = "=1.9.5" }
-solana-streamer = { path = "../streamer", version = "=1.9.5" }
-solana-test-validator = { path = "../test-validator", version = "=1.9.5" }
-solana-transaction-status = { path = "../transaction-status", version = "=1.9.5" }
-solana-version = { path = "../version", version = "=1.9.5" }
+solana-account-decoder = { path = "../account-decoder", version = "=1.9.6" }
+solana-clap-utils = { path = "../clap-utils", version = "=1.9.6" }
+solana-client = { path = "../client", version = "=1.9.6" }
+solana-core = { path = "../core", version = "=1.9.6" }
+solana-faucet = { path = "../faucet", version = "=1.9.6" }
+solana-gossip = { path = "../gossip", version = "=1.9.6" }
+solana-logger = { path = "../logger", version = "=1.9.6" }
+solana-measure = { path = "../measure", version = "=1.9.6" }
+solana-net-utils = { path = "../net-utils", version = "=1.9.6" }
+solana-runtime = { path = "../runtime", version = "=1.9.6" }
+solana-sdk = { path = "../sdk", version = "=1.9.6" }
+solana-streamer = { path = "../streamer", version = "=1.9.6" }
+solana-test-validator = { path = "../test-validator", version = "=1.9.6" }
+solana-transaction-status = { path = "../transaction-status", version = "=1.9.6" }
+solana-version = { path = "../version", version = "=1.9.6" }
 spl-token = { version = "=3.2.0", features = ["no-entrypoint"] }

 [dev-dependencies]
-solana-local-cluster = { path = "../local-cluster", version = "=1.9.5" }
+solana-local-cluster = { path = "../local-cluster", version = "=1.9.6" }

 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
--- a/accountsdb-plugin-interface/Cargo.toml
+++ b/accountsdb-plugin-interface/Cargo.toml
@ -3,7 +3,7 @@ authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 edition = "2021"
 name = "solana-accountsdb-plugin-interface"
 description = "The Solana AccountsDb plugin interface."
-version = "1.9.5"
+version = "1.9.6"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
@ -12,8 +12,8 @@ documentation = "https://docs.rs/solana-accountsdb-plugin-interface"
 [dependencies]
 log = "0.4.11"
 thiserror = "1.0.30"
-solana-sdk = { path = "../sdk", version = "=1.9.5" }
-solana-transaction-status = { path = "../transaction-status", version = "=1.9.5" }
+solana-sdk = { path = "../sdk", version = "=1.9.6" }
+solana-transaction-status = { path = "../transaction-status", version = "=1.9.6" }

 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
--- a/accountsdb-plugin-manager/Cargo.toml
+++ b/accountsdb-plugin-manager/Cargo.toml
@ -3,7 +3,7 @@ authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 edition = "2021"
 name = "solana-accountsdb-plugin-manager"
 description = "The Solana AccountsDb plugin manager."
-version = "1.9.5"
+version = "1.9.6"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
@ -17,14 +17,14 @@ log = "0.4.11"
 serde = "1.0.130"
 serde_derive = "1.0.103"
 serde_json = "1.0.72"
-solana-accountsdb-plugin-interface = { path = "../accountsdb-plugin-interface", version = "=1.9.5" }
-solana-logger = { path = "../logger", version = "=1.9.5" }
-solana-measure = { path = "../measure", version = "=1.9.5" }
-solana-metrics = { path = "../metrics", version = "=1.9.5" }
-solana-rpc = { path = "../rpc", version = "=1.9.5" }
-solana-runtime = { path = "../runtime", version = "=1.9.5" }
-solana-sdk = { path = "../sdk", version = "=1.9.5" }
-solana-transaction-status = { path = "../transaction-status", version = "=1.9.5" }
+solana-accountsdb-plugin-interface = { path = "../accountsdb-plugin-interface", version = "=1.9.6" }
+solana-logger = { path = "../logger", version = "=1.9.6" }
+solana-measure = { path = "../measure", version = "=1.9.6" }
+solana-metrics = { path = "../metrics", version = "=1.9.6" }
+solana-rpc = { path = "../rpc", version = "=1.9.6" }
+solana-runtime = { path = "../runtime", version = "=1.9.6" }
+solana-sdk = { path = "../sdk", version = "=1.9.6" }
+solana-transaction-status = { path = "../transaction-status", version = "=1.9.6" }
 thiserror = "1.0.30"

 [package.metadata.docs.rs]
--- a/accountsdb-plugin-postgres/Cargo.toml
+++ b/accountsdb-plugin-postgres/Cargo.toml
@ -3,7 +3,7 @@ authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 edition = "2021"
 name = "solana-accountsdb-plugin-postgres"
 description = "The Solana AccountsDb plugin for PostgreSQL database."
-version = "1.9.5"
+version = "1.9.6"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
@ -22,18 +22,18 @@ postgres-types = { version = "0.2.2", features = ["derive"] }
 serde = "1.0.130"
 serde_derive = "1.0.103"
 serde_json = "1.0.72"
-solana-accountsdb-plugin-interface = { path = "../accountsdb-plugin-interface", version = "=1.9.5" }
-solana-logger = { path = "../logger", version = "=1.9.5" }
-solana-measure = { path = "../measure", version = "=1.9.5" }
-solana-metrics = { path = "../metrics", version = "=1.9.5" }
-solana-runtime = { path = "../runtime", version = "=1.9.5" }
-solana-sdk = { path = "../sdk", version = "=1.9.5" }
-solana-transaction-status = { path = "../transaction-status", version = "=1.9.5" }
+solana-accountsdb-plugin-interface = { path = "../accountsdb-plugin-interface", version = "=1.9.6" }
+solana-logger = { path = "../logger", version = "=1.9.6" }
+solana-measure = { path = "../measure", version = "=1.9.6" }
+solana-metrics = { path = "../metrics", version = "=1.9.6" }
+solana-runtime = { path = "../runtime", version = "=1.9.6" }
+solana-sdk = { path = "../sdk", version = "=1.9.6" }
+solana-transaction-status = { path = "../transaction-status", version = "=1.9.6" }
 thiserror = "1.0.30"
 tokio-postgres = "0.7.4"

 [dev-dependencies]
-solana-account-decoder = { path = "../account-decoder", version = "=1.9.5" }
+solana-account-decoder = { path = "../account-decoder", version = "=1.9.6" }

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

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

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

 [lib]
 crate-type = ["lib"]
--- a/banks-interface/Cargo.toml
+++ b/banks-interface/Cargo.toml
@ -1,6 +1,6 @@
 [package]
 name = "solana-banks-interface"
-version = "1.9.5"
+version = "1.9.6"
 description = "Solana banks RPC interface"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@ -11,7 +11,7 @@ edition = "2021"

 [dependencies]
 serde = { version = "1.0.130", features = ["derive"] }
-solana-sdk = { path = "../sdk", version = "=1.9.5" }
+solana-sdk = { path = "../sdk", version = "=1.9.6" }
 tarpc = { version = "0.27.2", features = ["full"] }

 [lib]
--- a/banks-server/Cargo.toml
+++ b/banks-server/Cargo.toml
@ -1,6 +1,6 @@
 [package]
 name = "solana-banks-server"
-version = "1.9.5"
+version = "1.9.6"
 description = "Solana banks server"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@ -12,10 +12,10 @@ edition = "2021"
 [dependencies]
 bincode = "1.3.3"
 futures = "0.3"
-solana-banks-interface = { path = "../banks-interface", version = "=1.9.5" }
-solana-runtime = { path = "../runtime", version = "=1.9.5" }
-solana-sdk = { path = "../sdk", version = "=1.9.5" }
-solana-send-transaction-service = { path = "../send-transaction-service", version = "=1.9.5" }
+solana-banks-interface = { path = "../banks-interface", version = "=1.9.6" }
+solana-runtime = { path = "../runtime", version = "=1.9.6" }
+solana-sdk = { path = "../sdk", version = "=1.9.6" }
+solana-send-transaction-service = { path = "../send-transaction-service", version = "=1.9.6" }
 tarpc = { version = "0.27.2", features = ["full"] }
 tokio = { version = "1", features = ["full"] }
 tokio-serde = { version = "0.8", features = ["bincode"] }
--- a/bench-streamer/Cargo.toml
+++ b/bench-streamer/Cargo.toml
@ -2,7 +2,7 @@
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 edition = "2021"
 name = "solana-bench-streamer"
-version = "1.9.5"
+version = "1.9.6"
 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.9.5" }
-solana-streamer = { path = "../streamer", version = "=1.9.5" }
-solana-logger = { path = "../logger", version = "=1.9.5" }
-solana-net-utils = { path = "../net-utils", version = "=1.9.5" }
-solana-version = { path = "../version", version = "=1.9.5" }
+solana-clap-utils = { path = "../clap-utils", version = "=1.9.6" }
+solana-streamer = { path = "../streamer", version = "=1.9.6" }
+solana-logger = { path = "../logger", version = "=1.9.6" }
+solana-net-utils = { path = "../net-utils", version = "=1.9.6" }
+solana-version = { path = "../version", version = "=1.9.6" }

 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
--- a/bench-tps/Cargo.toml
+++ b/bench-tps/Cargo.toml
@ -2,7 +2,7 @@
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 edition = "2021"
 name = "solana-bench-tps"
-version = "1.9.5"
+version = "1.9.6"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
@ -14,23 +14,23 @@ log = "0.4.14"
 rayon = "1.5.1"
 serde_json = "1.0.72"
 serde_yaml = "0.8.21"
-solana-core = { path = "../core", version = "=1.9.5" }
-solana-genesis = { path = "../genesis", version = "=1.9.5" }
-solana-client = { path = "../client", version = "=1.9.5" }
-solana-faucet = { path = "../faucet", version = "=1.9.5" }
-solana-gossip = { path = "../gossip", version = "=1.9.5" }
-solana-logger = { path = "../logger", version = "=1.9.5" }
-solana-metrics = { path = "../metrics", version = "=1.9.5" }
-solana-measure = { path = "../measure", version = "=1.9.5" }
-solana-net-utils = { path = "../net-utils", version = "=1.9.5" }
-solana-runtime = { path = "../runtime", version = "=1.9.5" }
-solana-sdk = { path = "../sdk", version = "=1.9.5" }
-solana-streamer = { path = "../streamer", version = "=1.9.5" }
-solana-version = { path = "../version", version = "=1.9.5" }
+solana-core = { path = "../core", version = "=1.9.6" }
+solana-genesis = { path = "../genesis", version = "=1.9.6" }
+solana-client = { path = "../client", version = "=1.9.6" }
+solana-faucet = { path = "../faucet", version = "=1.9.6" }
+solana-gossip = { path = "../gossip", version = "=1.9.6" }
+solana-logger = { path = "../logger", version = "=1.9.6" }
+solana-metrics = { path = "../metrics", version = "=1.9.6" }
+solana-measure = { path = "../measure", version = "=1.9.6" }
+solana-net-utils = { path = "../net-utils", version = "=1.9.6" }
+solana-runtime = { path = "../runtime", version = "=1.9.6" }
+solana-sdk = { path = "../sdk", version = "=1.9.6" }
+solana-streamer = { path = "../streamer", version = "=1.9.6" }
+solana-version = { path = "../version", version = "=1.9.6" }

 [dev-dependencies]
 serial_test = "0.5.1"
-solana-local-cluster = { path = "../local-cluster", version = "=1.9.5" }
+solana-local-cluster = { path = "../local-cluster", version = "=1.9.6" }

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

 [lib]
--- a/bucket_map/Cargo.toml
+++ b/bucket_map/Cargo.toml
@ -1,6 +1,6 @@
 [package]
 name = "solana-bucket-map"
-version = "1.9.5"
+version = "1.9.6"
 description = "solana-bucket-map"
 homepage = "https://solana.com/"
 documentation = "https://docs.rs/solana-bucket-map"
@ -12,11 +12,11 @@ edition = "2021"

 [dependencies]
 rayon = "1.5.0"
-solana-logger = { path = "../logger", version = "=1.9.5" }
-solana-sdk = { path = "../sdk", version = "=1.9.5" }
+solana-logger = { path = "../logger", version = "=1.9.6" }
+solana-sdk = { path = "../sdk", version = "=1.9.6" }
 memmap2 = "0.5.0"
 log = { version = "0.4.11" }
-solana-measure = { path = "../measure", version = "=1.9.5" }
+solana-measure = { path = "../measure", version = "=1.9.6" }
 rand = "0.7.0"
 fs_extra = "1.2.0"
 tempfile = "3.2.0"
--- a/clap-utils/Cargo.toml
+++ b/clap-utils/Cargo.toml
@ -1,6 +1,6 @@
 [package]
 name = "solana-clap-utils"
-version = "1.9.5"
+version = "1.9.6"
 description = "Solana utilities for the clap"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@ -12,9 +12,9 @@ edition = "2021"
 [dependencies]
 clap = "2.33.0"
 rpassword = "5.0"
-solana-perf = { path = "../perf", version = "=1.9.5" }
-solana-remote-wallet = { path = "../remote-wallet", version = "=1.9.5" }
-solana-sdk = { path = "../sdk", version = "=1.9.5" }
+solana-perf = { path = "../perf", version = "=1.9.6" }
+solana-remote-wallet = { path = "../remote-wallet", version = "=1.9.6" }
+solana-sdk = { path = "../sdk", version = "=1.9.6" }
 thiserror = "1.0.30"
 tiny-bip39 = "0.8.2"
 uriparse = "0.6.3"
--- a/cli-config/Cargo.toml
+++ b/cli-config/Cargo.toml
@ -3,7 +3,7 @@ authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 edition = "2021"
 name = "solana-cli-config"
 description = "Blockchain, Rebuilt for Scale"
-version = "1.9.5"
+version = "1.9.6"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
--- a/cli-output/Cargo.toml
+++ b/cli-output/Cargo.toml
@ -3,7 +3,7 @@ authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 edition = "2021"
 name = "solana-cli-output"
 description = "Blockchain, Rebuilt for Scale"
-version = "1.9.5"
+version = "1.9.6"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
@ -19,12 +19,12 @@ Inflector = "0.11.4"
 indicatif = "0.16.2"
 serde = "1.0.130"
 serde_json = "1.0.72"
-solana-account-decoder = { path = "../account-decoder", version = "=1.9.5" }
-solana-clap-utils = { path = "../clap-utils", version = "=1.9.5" }
-solana-client = { path = "../client", version = "=1.9.5" }
-solana-sdk = { path = "../sdk", version = "=1.9.5" }
-solana-transaction-status = { path = "../transaction-status", version = "=1.9.5" }
-solana-vote-program = { path = "../programs/vote", version = "=1.9.5" }
+solana-account-decoder = { path = "../account-decoder", version = "=1.9.6" }
+solana-clap-utils = { path = "../clap-utils", version = "=1.9.6" }
+solana-client = { path = "../client", version = "=1.9.6" }
+solana-sdk = { path = "../sdk", version = "=1.9.6" }
+solana-transaction-status = { path = "../transaction-status", version = "=1.9.6" }
+solana-vote-program = { path = "../programs/vote", version = "=1.9.6" }
 spl-memo = { version = "=3.0.1", features = ["no-entrypoint"] }

 [package.metadata.docs.rs]
--- a/cli/Cargo.toml
+++ b/cli/Cargo.toml
@ -3,7 +3,7 @@ authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 edition = "2021"
 name = "solana-cli"
 description = "Blockchain, Rebuilt for Scale"
-version = "1.9.5"
+version = "1.9.6"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
@ -26,29 +26,29 @@ semver = "1.0.4"
 serde = "1.0.130"
 serde_derive = "1.0.103"
 serde_json = "1.0.72"
-solana-account-decoder = { path = "../account-decoder", version = "=1.9.5" }
-solana-bpf-loader-program = { path = "../programs/bpf_loader", version = "=1.9.5" }
-solana-clap-utils = { path = "../clap-utils", version = "=1.9.5" }
-solana-cli-config = { path = "../cli-config", version = "=1.9.5" }
-solana-cli-output = { path = "../cli-output", version = "=1.9.5" }
-solana-client = { path = "../client", version = "=1.9.5" }
-solana-config-program = { path = "../programs/config", version = "=1.9.5" }
-solana-faucet = { path = "../faucet", version = "=1.9.5" }
-solana-logger = { path = "../logger", version = "=1.9.5" }
-solana-program-runtime = { path = "../program-runtime", version = "=1.9.5" }
+solana-account-decoder = { path = "../account-decoder", version = "=1.9.6" }
+solana-bpf-loader-program = { path = "../programs/bpf_loader", version = "=1.9.6" }
+solana-clap-utils = { path = "../clap-utils", version = "=1.9.6" }
+solana-cli-config = { path = "../cli-config", version = "=1.9.6" }
+solana-cli-output = { path = "../cli-output", version = "=1.9.6" }
+solana-client = { path = "../client", version = "=1.9.6" }
+solana-config-program = { path = "../programs/config", version = "=1.9.6" }
+solana-faucet = { path = "../faucet", version = "=1.9.6" }
+solana-logger = { path = "../logger", version = "=1.9.6" }
+solana-program-runtime = { path = "../program-runtime", version = "=1.9.6" }
 solana_rbpf = "=0.2.21"
-solana-remote-wallet = { path = "../remote-wallet", version = "=1.9.5" }
-solana-sdk = { path = "../sdk", version = "=1.9.5" }
-solana-transaction-status = { path = "../transaction-status", version = "=1.9.5" }
-solana-version = { path = "../version", version = "=1.9.5" }
-solana-vote-program = { path = "../programs/vote", version = "=1.9.5" }
+solana-remote-wallet = { path = "../remote-wallet", version = "=1.9.6" }
+solana-sdk = { path = "../sdk", version = "=1.9.6" }
+solana-transaction-status = { path = "../transaction-status", version = "=1.9.6" }
+solana-version = { path = "../version", version = "=1.9.6" }
+solana-vote-program = { path = "../programs/vote", version = "=1.9.6" }
 spl-memo = { version = "=3.0.1", features = ["no-entrypoint"] }
 thiserror = "1.0.30"
 tiny-bip39 = "0.8.2"

 [dev-dependencies]
-solana-streamer = { path = "../streamer", version = "=1.9.5" }
-solana-test-validator = { path = "../test-validator", version = "=1.9.5" }
+solana-streamer = { path = "../streamer", version = "=1.9.6" }
+solana-test-validator = { path = "../test-validator", version = "=1.9.6" }
 tempfile = "3.2.0"

 [[bin]]
--- a/client-test/Cargo.toml
+++ b/client-test/Cargo.toml
@ -1,6 +1,6 @@
 [package]
 name = "solana-client-test"
-version = "1.9.5"
+version = "1.9.6"
 description = "Solana RPC Test"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@ -12,24 +12,24 @@ edition = "2021"
 [dependencies]
 serde_json = "1.0.72"
 serial_test = "0.5.1"
-solana-client = { path = "../client", version = "=1.9.5" }
-solana-ledger = { path = "../ledger", version = "=1.9.5" }
-solana-measure = { path = "../measure", version = "=1.9.5" }
-solana-merkle-tree = { path = "../merkle-tree", version = "=1.9.5" }
-solana-metrics = { path = "../metrics", version = "=1.9.5" }
-solana-perf = { path = "../perf", version = "=1.9.5" }
-solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "=1.9.5" }
-solana-rpc = { path = "../rpc", version = "=1.9.5" }
-solana-runtime = { path = "../runtime", version = "=1.9.5" }
-solana-sdk = { path = "../sdk", version = "=1.9.5" }
-solana-streamer = { path = "../streamer", version = "=1.9.5" }
-solana-test-validator = { path = "../test-validator", version = "=1.9.5" }
-solana-transaction-status = { path = "../transaction-status", version = "=1.9.5" }
-solana-version = { path = "../version", version = "=1.9.5" }
+solana-client = { path = "../client", version = "=1.9.6" }
+solana-ledger = { path = "../ledger", version = "=1.9.6" }
+solana-measure = { path = "../measure", version = "=1.9.6" }
+solana-merkle-tree = { path = "../merkle-tree", version = "=1.9.6" }
+solana-metrics = { path = "../metrics", version = "=1.9.6" }
+solana-perf = { path = "../perf", version = "=1.9.6" }
+solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "=1.9.6" }
+solana-rpc = { path = "../rpc", version = "=1.9.6" }
+solana-runtime = { path = "../runtime", version = "=1.9.6" }
+solana-sdk = { path = "../sdk", version = "=1.9.6" }
+solana-streamer = { path = "../streamer", version = "=1.9.6" }
+solana-test-validator = { path = "../test-validator", version = "=1.9.6" }
+solana-transaction-status = { path = "../transaction-status", version = "=1.9.6" }
+solana-version = { path = "../version", version = "=1.9.6" }
 systemstat = "0.1.10"

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

 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
--- a/client/Cargo.toml
+++ b/client/Cargo.toml
@ -1,6 +1,6 @@
 [package]
 name = "solana-client"
-version = "1.9.5"
+version = "1.9.6"
 description = "Solana Client"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@ -23,15 +23,15 @@ semver = "1.0.4"
 serde = "1.0.130"
 serde_derive = "1.0.103"
 serde_json = "1.0.72"
-solana-account-decoder = { path = "../account-decoder", version = "=1.9.5" }
-solana-clap-utils = { path = "../clap-utils", version = "=1.9.5" }
-solana-faucet = { path = "../faucet", version = "=1.9.5" }
-solana-net-utils = { path = "../net-utils", version = "=1.9.5" }
-solana-measure = { path = "../measure", version = "=1.9.5" }
-solana-sdk = { path = "../sdk", version = "=1.9.5" }
-solana-transaction-status = { path = "../transaction-status", version = "=1.9.5" }
-solana-version = { path = "../version", version = "=1.9.5" }
-solana-vote-program = { path = "../programs/vote", version = "=1.9.5" }
+solana-account-decoder = { path = "../account-decoder", version = "=1.9.6" }
+solana-clap-utils = { path = "../clap-utils", version = "=1.9.6" }
+solana-faucet = { path = "../faucet", version = "=1.9.6" }
+solana-net-utils = { path = "../net-utils", version = "=1.9.6" }
+solana-measure = { path = "../measure", version = "=1.9.6" }
+solana-sdk = { path = "../sdk", version = "=1.9.6" }
+solana-transaction-status = { path = "../transaction-status", version = "=1.9.6" }
+solana-version = { path = "../version", version = "=1.9.6" }
+solana-vote-program = { path = "../programs/vote", version = "=1.9.6" }
 thiserror = "1.0"
 tokio = { version = "1", features = ["full"] }
 tungstenite = { version = "0.16.0", features = ["rustls-tls-webpki-roots"] }
@ -40,7 +40,7 @@ url = "2.2.2"
 [dev-dependencies]
 assert_matches = "1.5.0"
 jsonrpc-http-server = "18.0.0"
-solana-logger = { path = "../logger", version = "=1.9.5" }
+solana-logger = { path = "../logger", version = "=1.9.6" }

 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
--- a/core/Cargo.toml
+++ b/core/Cargo.toml
@ -1,7 +1,7 @@
 [package]
 name = "solana-core"
 description = "Blockchain, Rebuilt for Scale"
-version = "1.9.5"
+version = "1.9.6"
 homepage = "https://solana.com/"
 documentation = "https://docs.rs/solana-core"
 readme = "../README.md"
@ -34,32 +34,32 @@ rayon = "1.5.1"
 retain_mut = "0.1.5"
 serde = "1.0.130"
 serde_derive = "1.0.103"
-solana-accountsdb-plugin-manager = { path = "../accountsdb-plugin-manager", version = "=1.9.5" }
-solana-bloom = { path = "../bloom", version = "=1.9.5" }
-solana-client = { path = "../client", version = "=1.9.5" }
-solana-entry = { path = "../entry", version = "=1.9.5" }
-solana-gossip = { path = "../gossip", version = "=1.9.5" }
-solana-ledger = { path = "../ledger", version = "=1.9.5" }
-solana-logger = { path = "../logger", version = "=1.9.5" }
-solana-measure = { path = "../measure", version = "=1.9.5" }
-solana-metrics = { path = "../metrics", version = "=1.9.5" }
-solana-net-utils = { path = "../net-utils", version = "=1.9.5" }
-solana-perf = { path = "../perf", version = "=1.9.5" }
-solana-poh = { path = "../poh", version = "=1.9.5" }
-solana-program-runtime = { path = "../program-runtime", version = "=1.9.5" }
-solana-rpc = { path = "../rpc", version = "=1.9.5" }
-solana-replica-lib = { path = "../replica-lib", version = "=1.9.5" }
-solana-runtime = { path = "../runtime", version = "=1.9.5" }
-solana-sdk = { path = "../sdk", version = "=1.9.5" }
-solana-frozen-abi = { path = "../frozen-abi", version = "=1.9.5" }
-solana-frozen-abi-macro = { path = "../frozen-abi/macro", version = "=1.9.5" }
-solana-send-transaction-service = { path = "../send-transaction-service", version = "=1.9.5" }
-solana-streamer = { path = "../streamer", version = "=1.9.5" }
-solana-transaction-status = { path = "../transaction-status", version = "=1.9.5" }
-solana-vote-program = { path = "../programs/vote", version = "=1.9.5" }
+solana-accountsdb-plugin-manager = { path = "../accountsdb-plugin-manager", version = "=1.9.6" }
+solana-bloom = { path = "../bloom", version = "=1.9.6" }
+solana-client = { path = "../client", version = "=1.9.6" }
+solana-entry = { path = "../entry", version = "=1.9.6" }
+solana-gossip = { path = "../gossip", version = "=1.9.6" }
+solana-ledger = { path = "../ledger", version = "=1.9.6" }
+solana-logger = { path = "../logger", version = "=1.9.6" }
+solana-measure = { path = "../measure", version = "=1.9.6" }
+solana-metrics = { path = "../metrics", version = "=1.9.6" }
+solana-net-utils = { path = "../net-utils", version = "=1.9.6" }
+solana-perf = { path = "../perf", version = "=1.9.6" }
+solana-poh = { path = "../poh", version = "=1.9.6" }
+solana-program-runtime = { path = "../program-runtime", version = "=1.9.6" }
+solana-rpc = { path = "../rpc", version = "=1.9.6" }
+solana-replica-lib = { path = "../replica-lib", version = "=1.9.6" }
+solana-runtime = { path = "../runtime", version = "=1.9.6" }
+solana-sdk = { path = "../sdk", version = "=1.9.6" }
+solana-frozen-abi = { path = "../frozen-abi", version = "=1.9.6" }
+solana-frozen-abi-macro = { path = "../frozen-abi/macro", version = "=1.9.6" }
+solana-send-transaction-service = { path = "../send-transaction-service", version = "=1.9.6" }
+solana-streamer = { path = "../streamer", version = "=1.9.6" }
+solana-transaction-status = { path = "../transaction-status", version = "=1.9.6" }
+solana-vote-program = { path = "../programs/vote", version = "=1.9.6" }
 tempfile = "3.2.0"
 thiserror = "1.0"
-solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "=1.9.5" }
+solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "=1.9.6" }
 sys-info = "0.9.1"
 tokio = { version = "1", features = ["full"] }
 trees = "0.4.2"
@ -73,9 +73,9 @@ matches = "0.1.9"
 reqwest = { version = "0.11.6", default-features = false, features = ["blocking", "rustls-tls", "json"] }
 serde_json = "1.0.72"
 serial_test = "0.5.1"
-solana-program-runtime = { path = "../program-runtime", version = "=1.9.5" }
-solana-stake-program = { path = "../programs/stake", version = "=1.9.5" }
-solana-version = { path = "../version", version = "=1.9.5" }
+solana-program-runtime = { path = "../program-runtime", version = "=1.9.6" }
+solana-stake-program = { path = "../programs/stake", version = "=1.9.6" }
+solana-version = { path = "../version", version = "=1.9.6" }
 static_assertions = "1.1.0"
 systemstat = "0.1.10"

--- a/core/src/replay_stage.rs
+++ b/core/src/replay_stage.rs
@ -38,7 +38,7 @@ use {
    },
    solana_measure::measure::Measure,
    solana_metrics::inc_new_counter_info,
-    solana_poh::poh_recorder::{PohRecorder, GRACE_TICKS_FACTOR, MAX_GRACE_SLOTS},
+    solana_poh::poh_recorder::{PohLeaderStatus, PohRecorder, GRACE_TICKS_FACTOR, MAX_GRACE_SLOTS},
    solana_program_runtime::timings::ExecuteTimings,
    solana_rpc::{
        optimistically_confirmed_bank_tracker::{BankNotification, BankNotificationSender},
@ -1395,13 +1395,17 @@ impl ReplayStage {

        assert!(!poh_recorder.lock().unwrap().has_bank());

-        let (reached_leader_slot, _grace_ticks, poh_slot, parent_slot) =
-            poh_recorder.lock().unwrap().reached_leader_slot();
+        let (poh_slot, parent_slot) = match poh_recorder.lock().unwrap().reached_leader_slot() {
+            PohLeaderStatus::Reached {
+                poh_slot,
+                parent_slot,
+            } => (poh_slot, parent_slot),
+            PohLeaderStatus::NotReached => {
+                trace!("{} poh_recorder hasn't reached_leader_slot", my_pubkey);
+                return;
+            }
+        };

-        if !reached_leader_slot {
-            trace!("{} poh_recorder hasn't reached_leader_slot", my_pubkey);
-            return;
-        }
        trace!("{} reached_leader_slot", my_pubkey);

        let parent = bank_forks
--- a/core/src/sigverify_stage.rs
+++ b/core/src/sigverify_stage.rs
@ -7,6 +7,7 @@

 use {
    crate::sigverify,
+    core::time::Duration,
    crossbeam_channel::{SendError, Sender as CrossbeamSender},
    itertools::Itertools,
    solana_measure::measure::Measure,
@ -288,12 +289,12 @@ impl SigVerifyStage {
        let verifier = verifier.clone();
        let mut stats = SigVerifierStats::default();
        let mut last_print = Instant::now();
-        const MAX_DEDUPER_AGE_MS: u64 = 2_000;
+        const MAX_DEDUPER_AGE: Duration = Duration::from_secs(2);
        const MAX_DEDUPER_ITEMS: u32 = 1_000_000;
        Builder::new()
            .name("solana-verifier".to_string())
            .spawn(move || {
-                let mut deduper = Deduper::new(MAX_DEDUPER_ITEMS, MAX_DEDUPER_AGE_MS);
+                let mut deduper = Deduper::new(MAX_DEDUPER_ITEMS, MAX_DEDUPER_AGE);
                loop {
                    deduper.reset();
                    if let Err(e) = Self::verifier(
--- a/docs/src/developing/clients/jsonrpc-api.md
+++ b/docs/src/developing/clients/jsonrpc-api.md
@ -2949,7 +2949,7 @@ curl http://localhost:8899 -X POST -H "Content-Type: application/json" -d '

 Result:
 ```json
-{"jsonrpc":"2.0","result":{"solana-core": "1.9.5"},"id":1}
+{"jsonrpc":"2.0","result":{"solana-core": "1.9.6"},"id":1}
 ```

 ### getVoteAccounts
--- a/docs/src/developing/on-chain-programs/overview.md
+++ b/docs/src/developing/on-chain-programs/overview.md
@ -81,7 +81,7 @@ Programs have access to a runtime heap either directly in C or via the Rust
 utilized. The heap does not support `free` or `realloc` so use it wisely.

 Internally, programs have access to the 32KB memory region starting at virtual
-address 0x300000000 and may implement a custom heap based on the the program's
+address 0x300000000 and may implement a custom heap based on the program's
 specific needs.

 - [Rust program heap usage](developing-rust.md#heap)
@ -194,7 +194,7 @@ For language specific information about serialization see:
 The latest loader serializes the program input parameters as follows (all
 encoding is little endian):

- 8 byte unsigned number of accounts
+- 8 bytes unsigned number of accounts
 - For each account
  - 1 byte indicating if this is a duplicate account, if not a duplicate then
    the value is 0xff, otherwise the value is the index of the account it is a
@ -207,7 +207,7 @@ encoding is little endian):
    - 4 bytes of padding
    - 32 bytes of the account public key
    - 32 bytes of the account's owner public key
-    - 8 byte unsigned number of lamports owned by the account
+    - 8 bytes unsigned number of lamports owned by the account
    - 8 bytes unsigned number of bytes of account data
    - x bytes of account data
    - 10k bytes of padding, used for realloc
--- a/docs/src/running-validator/validator-start.md
+++ b/docs/src/running-validator/validator-start.md
@ -272,7 +272,7 @@ Read more about [creating and managing a vote account](vote-accounts.md).
 If you know and respect other validator operators, you can specify this on the command line with the `--known-validator <PUBKEY>`
 argument to `solana-validator`. You can specify multiple ones by repeating the argument `--known-validator <PUBKEY1> --known-validator <PUBKEY2>`.
 This has two effects, one is when the validator is booting with `--only-known-rpc`, it will only ask that set of
-known nodes for downloading genesis and snapshot data. Another is that in combination with the `--halt-on-known-validator-hash-mismatch` option,
+known nodes for downloading genesis and snapshot data. Another is that in combination with the `--halt-on-known-validators-accounts-hash-mismatch` option,
 it will monitor the merkle root hash of the entire accounts state of other known nodes on gossip and if the hashes produce any mismatch,
 the validator will halt the node to prevent the validator from voting or processing potentially incorrect state values. At the moment, the slot that
 the validator publishes the hash on is tied to the snapshot interval. For the feature to be effective, all validators in the known
--- a/dos/Cargo.toml
+++ b/dos/Cargo.toml
@ -2,7 +2,7 @@
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 edition = "2021"
 name = "solana-dos"
-version = "1.9.5"
+version = "1.9.6"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
@ -13,15 +13,15 @@ bincode = "1.3.3"
 clap = "2.33.1"
 log = "0.4.14"
 rand = "0.7.0"
-solana-core = { path = "../core", version = "=1.9.5" }
-solana-gossip = { path = "../gossip", version = "=1.9.5" }
-solana-logger = { path = "../logger", version = "=1.9.5" }
-solana-net-utils = { path = "../net-utils", version = "=1.9.5" }
-solana-perf = { path = "../perf", version = "=1.9.5" }
-solana-sdk = { path = "../sdk", version = "=1.9.5" }
-solana-streamer = { path = "../streamer", version = "=1.9.5" }
-solana-version = { path = "../version", version = "=1.9.5" }
-solana-client = { path = "../client", version = "=1.9.5" }
+solana-core = { path = "../core", version = "=1.9.6" }
+solana-gossip = { path = "../gossip", version = "=1.9.6" }
+solana-logger = { path = "../logger", version = "=1.9.6" }
+solana-net-utils = { path = "../net-utils", version = "=1.9.6" }
+solana-perf = { path = "../perf", version = "=1.9.6" }
+solana-sdk = { path = "../sdk", version = "=1.9.6" }
+solana-streamer = { path = "../streamer", version = "=1.9.6" }
+solana-version = { path = "../version", version = "=1.9.6" }
+solana-client = { path = "../client", version = "=1.9.6" }

 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
--- a/download-utils/Cargo.toml
+++ b/download-utils/Cargo.toml
@ -1,6 +1,6 @@
 [package]
 name = "solana-download-utils"
-version = "1.9.5"
+version = "1.9.6"
 description = "Solana Download Utils"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@ -14,8 +14,8 @@ console = "0.15.0"
 indicatif = "0.16.2"
 log = "0.4.14"
 reqwest = { version = "0.11.6", default-features = false, features = ["blocking", "rustls-tls", "json"] }
-solana-sdk = { path = "../sdk", version = "=1.9.5" }
-solana-runtime = { path = "../runtime", version = "=1.9.5" }
+solana-sdk = { path = "../sdk", version = "=1.9.6" }
+solana-runtime = { path = "../runtime", version = "=1.9.6" }

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

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

 [lib]
 crate-type = ["lib"]
--- a/faucet/Cargo.toml
+++ b/faucet/Cargo.toml
@ -1,6 +1,6 @@
 [package]
 name = "solana-faucet"
-version = "1.9.5"
+version = "1.9.6"
 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.14"
 serde = "1.0.130"
 serde_derive = "1.0.103"
-solana-clap-utils = { path = "../clap-utils", version = "=1.9.5" }
-solana-cli-config = { path = "../cli-config", version = "=1.9.5" }
-solana-logger = { path = "../logger", version = "=1.9.5" }
-solana-metrics = { path = "../metrics", version = "=1.9.5" }
-solana-sdk = { path = "../sdk", version = "=1.9.5" }
-solana-version = { path = "../version", version = "=1.9.5" }
+solana-clap-utils = { path = "../clap-utils", version = "=1.9.6" }
+solana-cli-config = { path = "../cli-config", version = "=1.9.6" }
+solana-logger = { path = "../logger", version = "=1.9.6" }
+solana-metrics = { path = "../metrics", version = "=1.9.6" }
+solana-sdk = { path = "../sdk", version = "=1.9.6" }
+solana-version = { path = "../version", version = "=1.9.6" }
 spl-memo = { version = "=3.0.1", features = ["no-entrypoint"] }
 thiserror = "1.0"
 tokio = { version = "1", features = ["full"] }
--- a/frozen-abi/Cargo.toml
+++ b/frozen-abi/Cargo.toml
@ -1,6 +1,6 @@
 [package]
 name = "solana-frozen-abi"
-version = "1.9.5"
+version = "1.9.6"
 description = "Solana Frozen ABI"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@ -16,11 +16,11 @@ log = "0.4.14"
 serde = "1.0.130"
 serde_derive = "1.0.103"
 sha2 = "0.9.8"
-solana-frozen-abi-macro = { path = "macro", version = "=1.9.5" }
+solana-frozen-abi-macro = { path = "macro", version = "=1.9.6" }
 thiserror = "1.0"

 [target.'cfg(not(target_arch = "bpf"))'.dependencies]
-solana-logger = { path = "../logger", version = "=1.9.5" }
+solana-logger = { path = "../logger", version = "=1.9.6" }
 generic-array = { version = "0.14.4", default-features = false, features = ["serde", "more_lengths"]}
 memmap2 = "0.5.0"

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

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

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

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

 [dev-dependencies]
--- a/install/Cargo.toml
+++ b/install/Cargo.toml
@ -3,7 +3,7 @@ authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 edition = "2021"
 name = "solana-install"
 description = "The solana cluster software installer"
-version = "1.9.5"
+version = "1.9.6"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
@ -24,12 +24,12 @@ nix = "0.23.0"
 reqwest = { version = "0.11.6", default-features = false, features = ["blocking", "rustls-tls", "json"] }
 serde = { version = "1.0.130", features = ["derive"] }
 serde_yaml = "0.8.21"
-solana-clap-utils = { path = "../clap-utils", version = "=1.9.5" }
-solana-client = { path = "../client", version = "=1.9.5" }
-solana-config-program = { path = "../programs/config", version = "=1.9.5" }
-solana-logger = { path = "../logger", version = "=1.9.5" }
-solana-sdk = { path = "../sdk", version = "=1.9.5" }
-solana-version = { path = "../version", version = "=1.9.5" }
+solana-clap-utils = { path = "../clap-utils", version = "=1.9.6" }
+solana-client = { path = "../client", version = "=1.9.6" }
+solana-config-program = { path = "../programs/config", version = "=1.9.6" }
+solana-logger = { path = "../logger", version = "=1.9.6" }
+solana-sdk = { path = "../sdk", version = "=1.9.6" }
+solana-version = { path = "../version", version = "=1.9.6" }
 semver = "1.0.4"
 tar = "0.4.37"
 tempfile = "3.2.0"
--- a/keygen/Cargo.toml
+++ b/keygen/Cargo.toml
@ -1,6 +1,6 @@
 [package]
 name = "solana-keygen"
-version = "1.9.5"
+version = "1.9.6"
 description = "Solana key generation utility"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@ -14,11 +14,11 @@ bs58 = "0.4.0"
 clap = "2.33"
 dirs-next = "2.0.0"
 num_cpus = "1.13.0"
-solana-clap-utils = { path = "../clap-utils", version = "=1.9.5" }
-solana-cli-config = { path = "../cli-config", version = "=1.9.5" }
-solana-remote-wallet = { path = "../remote-wallet", version = "=1.9.5" }
-solana-sdk = { path = "../sdk", version = "=1.9.5" }
-solana-version = { path = "../version", version = "=1.9.5" }
+solana-clap-utils = { path = "../clap-utils", version = "=1.9.6" }
+solana-cli-config = { path = "../cli-config", version = "=1.9.6" }
+solana-remote-wallet = { path = "../remote-wallet", version = "=1.9.6" }
+solana-sdk = { path = "../sdk", version = "=1.9.6" }
+solana-version = { path = "../version", version = "=1.9.6" }
 tiny-bip39 = "0.8.2"

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

 [target.'cfg(not(target_env = "msvc"))'.dependencies]
--- a/ledger/Cargo.toml
+++ b/ledger/Cargo.toml
@ -1,6 +1,6 @@
 [package]
 name = "solana-ledger"
-version = "1.9.5"
+version = "1.9.6"
 description = "Solana ledger"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@ -31,22 +31,22 @@ rayon = "1.5.1"
 serde = "1.0.130"
 serde_bytes = "0.11.5"
 sha2 = "0.9.8"
-solana-bpf-loader-program = { path = "../programs/bpf_loader", version = "=1.9.5" }
-solana-entry = { path = "../entry", version = "=1.9.5" }
-solana-frozen-abi = { path = "../frozen-abi", version = "=1.9.5" }
-solana-frozen-abi-macro = { path = "../frozen-abi/macro", version = "=1.9.5" }
-solana-transaction-status = { path = "../transaction-status", version = "=1.9.5" }
-solana-logger = { path = "../logger", version = "=1.9.5" }
-solana-measure = { path = "../measure", version = "=1.9.5" }
-solana-metrics = { path = "../metrics", version = "=1.9.5" }
-solana-perf = { path = "../perf", version = "=1.9.5" }
-solana-program-runtime = { path = "../program-runtime", version = "=1.9.5" }
-solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "=1.9.5" }
-solana-runtime = { path = "../runtime", version = "=1.9.5" }
-solana-sdk = { path = "../sdk", version = "=1.9.5" }
-solana-storage-bigtable = { path = "../storage-bigtable", version = "=1.9.5" }
-solana-storage-proto = { path = "../storage-proto", version = "=1.9.5" }
-solana-vote-program = { path = "../programs/vote", version = "=1.9.5" }
+solana-bpf-loader-program = { path = "../programs/bpf_loader", version = "=1.9.6" }
+solana-entry = { path = "../entry", version = "=1.9.6" }
+solana-frozen-abi = { path = "../frozen-abi", version = "=1.9.6" }
+solana-frozen-abi-macro = { path = "../frozen-abi/macro", version = "=1.9.6" }
+solana-transaction-status = { path = "../transaction-status", version = "=1.9.6" }
+solana-logger = { path = "../logger", version = "=1.9.6" }
+solana-measure = { path = "../measure", version = "=1.9.6" }
+solana-metrics = { path = "../metrics", version = "=1.9.6" }
+solana-perf = { path = "../perf", version = "=1.9.6" }
+solana-program-runtime = { path = "../program-runtime", version = "=1.9.6" }
+solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "=1.9.6" }
+solana-runtime = { path = "../runtime", version = "=1.9.6" }
+solana-sdk = { path = "../sdk", version = "=1.9.6" }
+solana-storage-bigtable = { path = "../storage-bigtable", version = "=1.9.6" }
+solana-storage-proto = { path = "../storage-proto", version = "=1.9.6" }
+solana-vote-program = { path = "../programs/vote", version = "=1.9.6" }
 tempfile = "3.2.0"
 thiserror = "1.0"
 tokio = { version = "1", features = ["full"] }
@ -64,7 +64,7 @@ features = ["lz4"]
 [dev-dependencies]
 assert_matches = "1.5.0"
 matches = "0.1.9"
-solana-account-decoder = { path = "../account-decoder", version = "=1.9.5" }
+solana-account-decoder = { path = "../account-decoder", version = "=1.9.6" }

 [build-dependencies]
 rustc_version = "0.4"
--- a/local-cluster/Cargo.toml
+++ b/local-cluster/Cargo.toml
@ -3,7 +3,7 @@ authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 edition = "2021"
 name = "solana-local-cluster"
 description = "Blockchain, Rebuilt for Scale"
-version = "1.9.5"
+version = "1.9.6"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
@ -17,19 +17,19 @@ fs_extra = "1.2.0"
 log = "0.4.14"
 rand = "0.7.0"
 rayon = "1.5.1"
-solana-config-program = { path = "../programs/config", version = "=1.9.5" }
-solana-core = { path = "../core", version = "=1.9.5" }
-solana-client = { path = "../client", version = "=1.9.5" }
-solana-download-utils = { path = "../download-utils", version = "=1.9.5" }
-solana-entry = { path = "../entry", version = "=1.9.5" }
-solana-gossip = { path = "../gossip", version = "=1.9.5" }
-solana-ledger = { path = "../ledger", version = "=1.9.5" }
-solana-logger = { path = "../logger", version = "=1.9.5" }
-solana-runtime = { path = "../runtime", version = "=1.9.5" }
-solana-sdk = { path = "../sdk", version = "=1.9.5" }
-solana-stake-program = { path = "../programs/stake", version = "=1.9.5" }
-solana-streamer = { path = "../streamer", version = "=1.9.5" }
-solana-vote-program = { path = "../programs/vote", version = "=1.9.5" }
+solana-config-program = { path = "../programs/config", version = "=1.9.6" }
+solana-core = { path = "../core", version = "=1.9.6" }
+solana-client = { path = "../client", version = "=1.9.6" }
+solana-download-utils = { path = "../download-utils", version = "=1.9.6" }
+solana-entry = { path = "../entry", version = "=1.9.6" }
+solana-gossip = { path = "../gossip", version = "=1.9.6" }
+solana-ledger = { path = "../ledger", version = "=1.9.6" }
+solana-logger = { path = "../logger", version = "=1.9.6" }
+solana-runtime = { path = "../runtime", version = "=1.9.6" }
+solana-sdk = { path = "../sdk", version = "=1.9.6" }
+solana-stake-program = { path = "../programs/stake", version = "=1.9.6" }
+solana-streamer = { path = "../streamer", version = "=1.9.6" }
+solana-vote-program = { path = "../programs/vote", version = "=1.9.6" }
 tempfile = "3.2.0"

 [dev-dependencies]
--- a/log-analyzer/Cargo.toml
+++ b/log-analyzer/Cargo.toml
@ -3,7 +3,7 @@ authors = ["Solana Maintainers <maintainers@solana.com>"]
 edition = "2021"
 name = "solana-log-analyzer"
 description = "The solana cluster network analysis tool"
-version = "1.9.5"
+version = "1.9.6"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
@ -14,8 +14,8 @@ byte-unit = "4.0.13"
 clap = "2.33.1"
 serde = "1.0.130"
 serde_json = "1.0.72"
-solana-logger = { path = "../logger", version = "=1.9.5" }
-solana-version = { path = "../version", version = "=1.9.5" }
+solana-logger = { path = "../logger", version = "=1.9.6" }
+solana-version = { path = "../version", version = "=1.9.6" }

 [[bin]]
 name = "solana-log-analyzer"
--- a/logger/Cargo.toml
+++ b/logger/Cargo.toml
@ -1,6 +1,6 @@
 [package]
 name = "solana-logger"
-version = "1.9.5"
+version = "1.9.6"
 description = "Solana Logger"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
--- a/measure/Cargo.toml
+++ b/measure/Cargo.toml
@ -1,7 +1,7 @@
 [package]
 name = "solana-measure"
 description = "Blockchain, Rebuilt for Scale"
-version = "1.9.5"
+version = "1.9.6"
 homepage = "https://solana.com/"
 documentation = "https://docs.rs/solana-measure"
 readme = "../README.md"
@ -12,7 +12,7 @@ edition = "2021"

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

 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
--- a/merkle-root-bench/Cargo.toml
+++ b/merkle-root-bench/Cargo.toml
@ -2,7 +2,7 @@
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 edition = "2021"
 name = "solana-merkle-root-bench"
-version = "1.9.5"
+version = "1.9.6"
 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.14"
-solana-logger = { path = "../logger", version = "=1.9.5" }
-solana-runtime = { path = "../runtime", version = "=1.9.5" }
-solana-measure = { path = "../measure", version = "=1.9.5" }
-solana-sdk = { path = "../sdk", version = "=1.9.5" }
-solana-version = { path = "../version", version = "=1.9.5" }
+solana-logger = { path = "../logger", version = "=1.9.6" }
+solana-runtime = { path = "../runtime", version = "=1.9.6" }
+solana-measure = { path = "../measure", version = "=1.9.6" }
+solana-sdk = { path = "../sdk", version = "=1.9.6" }
+solana-version = { path = "../version", version = "=1.9.6" }
 clap = "2.33.1"

 [package.metadata.docs.rs]
--- a/merkle-tree/Cargo.toml
+++ b/merkle-tree/Cargo.toml
@ -1,6 +1,6 @@
 [package]
 name = "solana-merkle-tree"
-version = "1.9.5"
+version = "1.9.6"
 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 = "2021"

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

 # This can go once the BPF toolchain target Rust 1.42.0+
--- a/metrics/Cargo.toml
+++ b/metrics/Cargo.toml
@ -1,6 +1,6 @@
 [package]
 name = "solana-metrics"
-version = "1.9.5"
+version = "1.9.6"
 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.14"
 reqwest = { version = "0.11.6", default-features = false, features = ["blocking", "rustls-tls", "json"] }
-solana-sdk = { path = "../sdk", version = "=1.9.5" }
+solana-sdk = { path = "../sdk", version = "=1.9.6" }

 [dev-dependencies]
 rand = "0.7.0"
--- a/net-shaper/Cargo.toml
+++ b/net-shaper/Cargo.toml
@ -3,7 +3,7 @@ authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 edition = "2021"
 name = "solana-net-shaper"
 description = "The solana cluster network shaping tool"
-version = "1.9.5"
+version = "1.9.6"
 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.130"
 serde_json = "1.0.72"
-solana-clap-utils = { path = "../clap-utils", version = "=1.9.5" }
-solana-logger = { path = "../logger", version = "=1.9.5" }
+solana-clap-utils = { path = "../clap-utils", version = "=1.9.6" }
+solana-logger = { path = "../logger", version = "=1.9.6" }
 rand = "0.7.0"

 [[bin]]
--- a/net-utils/Cargo.toml
+++ b/net-utils/Cargo.toml
@ -1,6 +1,6 @@
 [package]
 name = "solana-net-utils"
-version = "1.9.5"
+version = "1.9.6"
 description = "Solana Network Utilities"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@ -18,9 +18,9 @@ rand = "0.7.0"
 serde = "1.0.130"
 serde_derive = "1.0.103"
 socket2 = "0.4.2"
-solana-logger = { path = "../logger", version = "=1.9.5" }
-solana-sdk = { path = "../sdk", version = "=1.9.5" }
-solana-version = { path = "../version", version = "=1.9.5" }
+solana-logger = { path = "../logger", version = "=1.9.6" }
+solana-sdk = { path = "../sdk", version = "=1.9.6" }
+solana-version = { path = "../version", version = "=1.9.6" }
 tokio = { version = "1", features = ["full"] }
 url = "2.2.2"

--- a/notifier/Cargo.toml
+++ b/notifier/Cargo.toml
@ -1,6 +1,6 @@
 [package]
 name = "solana-notifier"
-version = "1.9.5"
+version = "1.9.6"
 description = "Solana Notifier"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
--- a/perf/Cargo.toml
+++ b/perf/Cargo.toml
@ -1,6 +1,6 @@
 [package]
 name = "solana-perf"
-version = "1.9.5"
+version = "1.9.6"
 description = "Solana Performance APIs"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@ -22,12 +22,12 @@ log = "0.4.14"
 rand = "0.7.0"
 rayon = "1.5.1"
 serde = "1.0.130"
-solana-bloom = { path = "../bloom", version = "=1.9.5" }
-solana-logger = { path = "../logger", version = "=1.9.5" }
-solana-metrics = { path = "../metrics", version = "=1.9.5" }
-solana-sdk = { path = "../sdk", version = "=1.9.5" }
-solana-vote-program = { path = "../programs/vote", version = "=1.9.5" }
-solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "=1.9.5" }
+solana-bloom = { path = "../bloom", version = "=1.9.6" }
+solana-logger = { path = "../logger", version = "=1.9.6" }
+solana-metrics = { path = "../metrics", version = "=1.9.6" }
+solana-sdk = { path = "../sdk", version = "=1.9.6" }
+solana-vote-program = { path = "../programs/vote", version = "=1.9.6" }
+solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "=1.9.6" }

 [target."cfg(target_os = \"linux\")".dependencies]
 caps = "0.5.3"
--- a/perf/benches/dedup.rs
+++ b/perf/benches/dedup.rs
@ -9,6 +9,7 @@ use {
        packet::{to_packet_batches, PacketBatch},
        sigverify,
    },
+    std::time::Duration,
    test::Bencher,
 };

@ -23,7 +24,7 @@ fn test_packet_with_size(size: usize, rng: &mut ThreadRng) -> Vec<u8> {

 fn do_bench_dedup_packets(bencher: &mut Bencher, mut batches: Vec<PacketBatch>) {
    // verify packets
-    let mut deduper = sigverify::Deduper::new(1_000_000, 2_000);
+    let mut deduper = sigverify::Deduper::new(1_000_000, Duration::from_millis(2_000));
    bencher.iter(|| {
        let _ans = deduper.dedup_packets(&mut batches);
        deduper.reset();
@ -111,7 +112,7 @@ fn bench_dedup_baseline(bencher: &mut Bencher) {
 #[bench]
 #[ignore]
 fn bench_dedup_reset(bencher: &mut Bencher) {
-    let mut deduper = sigverify::Deduper::new(1_000_000, 0);
+    let mut deduper = sigverify::Deduper::new(1_000_000, Duration::from_millis(0));
    bencher.iter(|| {
        deduper.reset();
    });
--- a/perf/src/sigverify.rs
+++ b/perf/src/sigverify.rs
@ -113,16 +113,16 @@ pub fn init() {
 }

 fn verify_packet(packet: &mut Packet, reject_non_vote: bool) {
-    let packet_offsets = get_packet_offsets(packet, 0, reject_non_vote);
-    let mut sig_start = packet_offsets.sig_start as usize;
-    let mut pubkey_start = packet_offsets.pubkey_start as usize;
-    let msg_start = packet_offsets.msg_start as usize;
-
    // If this packet was already marked as discard, drop it
    if packet.meta.discard() {
        return;
    }

+    let packet_offsets = get_packet_offsets(packet, 0, reject_non_vote);
+    let mut sig_start = packet_offsets.sig_start as usize;
+    let mut pubkey_start = packet_offsets.pubkey_start as usize;
+    let msg_start = packet_offsets.msg_start as usize;
+
    if packet_offsets.sig_len == 0 {
        packet.meta.set_discard(true);
        return;
@ -432,7 +432,7 @@ pub struct Deduper {
 }

 impl Deduper {
-    pub fn new(size: u32, max_age_ms: u64) -> Self {
+    pub fn new(size: u32, max_age: Duration) -> Self {
        let mut filter: Vec<AtomicU64> = Vec::with_capacity(size as usize);
        filter.resize_with(size as usize, Default::default);
        let seed = thread_rng().gen();
@ -440,7 +440,7 @@ impl Deduper {
            filter,
            seed,
            age: Instant::now(),
-            max_age: Duration::from_millis(max_age_ms),
+            max_age,
            saturated: AtomicBool::new(false),
        }
    }
@ -460,10 +460,10 @@ impl Deduper {
        }
    }

-    fn dedup_packet(&self, count: &AtomicU64, packet: &mut Packet) {
+    fn dedup_packet(&self, packet: &mut Packet) -> u64 {
        // If this packet was already marked as discard, drop it
        if packet.meta.discard() {
-            return;
+            return 0;
        }
        let mut hasher = AHasher::new_with_keys(self.seed.0, self.seed.1);
        hasher.write(&packet.data[0..packet.meta.size]);
@ -479,19 +479,16 @@ impl Deduper {
        }
        if hash == prev & hash {
            packet.meta.set_discard(true);
-            count.fetch_add(1, Ordering::Relaxed);
+            return 1;
        }
+        0
    }

    pub fn dedup_packets(&self, batches: &mut [PacketBatch]) -> u64 {
-        let count = AtomicU64::new(0);
-        batches.iter_mut().for_each(|batch| {
-            batch
-                .packets
-                .iter_mut()
-                .for_each(|p| self.dedup_packet(&count, p))
-        });
-        count.load(Ordering::Relaxed)
+        batches
+            .iter_mut()
+            .flat_map(|batch| batch.packets.iter_mut().map(|p| self.dedup_packet(p)))
+            .sum()
    }
 }

@ -1346,14 +1343,14 @@ mod tests {
        let mut batches =
            to_packet_batches(&std::iter::repeat(tx).take(1024).collect::<Vec<_>>(), 128);
        let packet_count = sigverify::count_packets_in_batches(&batches);
-        let filter = Deduper::new(1_000_000, 0);
+        let filter = Deduper::new(1_000_000, Duration::from_millis(0));
        let discard = filter.dedup_packets(&mut batches) as usize;
        assert_eq!(packet_count, discard + 1);
    }

    #[test]
    fn test_dedup_diff() {
-        let mut filter = Deduper::new(1_000_000, 0);
+        let mut filter = Deduper::new(1_000_000, Duration::from_millis(0));
        let mut batches = to_packet_batches(&(0..1024).map(|_| test_tx()).collect::<Vec<_>>(), 128);

        let discard = filter.dedup_packets(&mut batches) as usize;
@ -1368,7 +1365,7 @@ mod tests {
    #[test]
    #[ignore]
    fn test_dedup_saturated() {
-        let filter = Deduper::new(1_000_000, 0);
+        let filter = Deduper::new(1_000_000, Duration::from_millis(0));
        let mut discard = 0;
        assert!(!filter.saturated.load(Ordering::Relaxed));
        for i in 0..1000 {
@ -1385,7 +1382,7 @@ mod tests {

    #[test]
    fn test_dedup_false_positive() {
-        let filter = Deduper::new(1_000_000, 0);
+        let filter = Deduper::new(1_000_000, Duration::from_millis(0));
        let mut discard = 0;
        for i in 0..10 {
            let mut batches =
--- a/poh-bench/Cargo.toml
+++ b/poh-bench/Cargo.toml
@ -2,7 +2,7 @@
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 edition = "2021"
 name = "solana-poh-bench"
-version = "1.9.5"
+version = "1.9.6"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
@ -14,12 +14,12 @@ clap = "2.33.1"
 log = "0.4.14"
 rand = "0.7.0"
 rayon = "1.5.1"
-solana-logger = { path = "../logger", version = "=1.9.5" }
-solana-entry = { path = "../entry", version = "=1.9.5" }
-solana-sdk = { path = "../sdk", version = "=1.9.5" }
-solana-measure = { path = "../measure", version = "=1.9.5" }
-solana-version = { path = "../version", version = "=1.9.5" }
-solana-perf = { path = "../perf", version = "=1.9.5" }
+solana-logger = { path = "../logger", version = "=1.9.6" }
+solana-entry = { path = "../entry", version = "=1.9.6" }
+solana-sdk = { path = "../sdk", version = "=1.9.6" }
+solana-measure = { path = "../measure", version = "=1.9.6" }
+solana-version = { path = "../version", version = "=1.9.6" }
+solana-perf = { path = "../perf", version = "=1.9.6" }

 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
--- a/poh/Cargo.toml
+++ b/poh/Cargo.toml
@ -1,6 +1,6 @@
 [package]
 name = "solana-poh"
-version = "1.9.5"
+version = "1.9.6"
 description = "Solana PoH"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@ -13,21 +13,21 @@ edition = "2021"
 core_affinity = "0.5.10"
 crossbeam-channel = "0.5"
 log = "0.4.14"
-solana-entry = { path = "../entry", version = "=1.9.5" }
-solana-ledger = { path = "../ledger", version = "=1.9.5" }
-solana-measure = { path = "../measure", version = "=1.9.5" }
-solana-metrics = { path = "../metrics", version = "=1.9.5" }
-solana-runtime = { path = "../runtime", version = "=1.9.5" }
-solana-sdk = { path = "../sdk", version = "=1.9.5" }
-solana-sys-tuner = { path = "../sys-tuner", version = "=1.9.5" }
+solana-entry = { path = "../entry", version = "=1.9.6" }
+solana-ledger = { path = "../ledger", version = "=1.9.6" }
+solana-measure = { path = "../measure", version = "=1.9.6" }
+solana-metrics = { path = "../metrics", version = "=1.9.6" }
+solana-runtime = { path = "../runtime", version = "=1.9.6" }
+solana-sdk = { path = "../sdk", version = "=1.9.6" }
+solana-sys-tuner = { path = "../sys-tuner", version = "=1.9.6" }
 thiserror = "1.0"

 [dev-dependencies]
 bincode = "1.3.3"
 matches = "0.1.9"
 rand = "0.7.0"
-solana-logger = { path = "../logger", version = "=1.9.5" }
-solana-perf = { path = "../perf", version = "=1.9.5" }
+solana-logger = { path = "../logger", version = "=1.9.6" }
+solana-perf = { path = "../perf", version = "=1.9.6" }

 [lib]
 crate-type = ["lib"]
--- a/poh/src/poh_recorder.rs
+++ b/poh/src/poh_recorder.rs
@ -193,6 +193,12 @@ pub struct WorkingBank {
    pub max_tick_height: u64,
 }

+#[derive(Debug, PartialEq)]
+pub enum PohLeaderStatus {
+    NotReached,
+    Reached { poh_slot: Slot, parent_slot: Slot },
+}
+
 pub struct PohRecorder {
    pub poh: Arc<Mutex<Poh>>,
    tick_height: u64,
@ -202,7 +208,7 @@ pub struct PohRecorder {
    tick_cache: Vec<(Entry, u64)>, // cache of entry and its tick_height
    working_bank: Option<WorkingBank>,
    sender: Sender<WorkingBankEntry>,
-    leader_first_tick_height: Option<u64>,
+    leader_first_tick_height_including_grace_ticks: Option<u64>,
    leader_last_tick_height: u64, // zero if none
    grace_ticks: u64,
    id: Pubkey,
@ -238,10 +244,14 @@ impl PohRecorder {
                GRACE_TICKS_FACTOR * MAX_GRACE_SLOTS,
            );
            assert_eq!(self.ticks_per_slot, bank.ticks_per_slot());
-            let (leader_first_tick_height, leader_last_tick_height, grace_ticks) =
-                Self::compute_leader_slot_tick_heights(next_leader_slot, self.ticks_per_slot);
+            let (
+                leader_first_tick_height_including_grace_ticks,
+                leader_last_tick_height,
+                grace_ticks,
+            ) = Self::compute_leader_slot_tick_heights(next_leader_slot, self.ticks_per_slot);
            self.grace_ticks = grace_ticks;
-            self.leader_first_tick_height = leader_first_tick_height;
+            self.leader_first_tick_height_including_grace_ticks =
+                leader_first_tick_height_including_grace_ticks;
            self.leader_last_tick_height = leader_last_tick_height;

            datapoint_info!(
@ -258,18 +268,27 @@ impl PohRecorder {

    pub fn would_be_leader(&self, within_next_n_ticks: u64) -> bool {
        self.has_bank()
-            || self
-                .leader_first_tick_height
-                .map_or(false, |leader_first_tick_height| {
-                    let ideal_leader_tick_height =
-                        leader_first_tick_height.saturating_sub(self.grace_ticks);
+            || self.leader_first_tick_height_including_grace_ticks.map_or(
+                false,
+                |leader_first_tick_height_including_grace_ticks| {
+                    let ideal_leader_tick_height = leader_first_tick_height_including_grace_ticks
+                        .saturating_sub(self.grace_ticks);
                    self.tick_height + within_next_n_ticks >= ideal_leader_tick_height
                        && self.tick_height <= self.leader_last_tick_height
-                })
+                },
+            )
+    }
+
+    // Return the slot for a given tick height
+    fn slot_for_tick_height(&self, tick_height: u64) -> Slot {
+        // We need to subtract by one here because, assuming ticks per slot is 64,
+        // tick heights [1..64] correspond to slot 0. The last tick height of a slot
+        // is always a multiple of 64.
+        tick_height.saturating_sub(1) / self.ticks_per_slot
    }

    pub fn leader_after_n_slots(&self, slots: u64) -> Option<Pubkey> {
-        let current_slot = self.tick_height.saturating_sub(1) / self.ticks_per_slot;
+        let current_slot = self.slot_for_tick_height(self.tick_height);
        self.leader_schedule_cache
            .slot_leader_at(current_slot + slots, None)
    }
@ -326,56 +345,57 @@ impl PohRecorder {
        }
    }

-    fn reached_leader_tick(&self, leader_first_tick_height: u64) -> bool {
-        let target_tick_height = leader_first_tick_height.saturating_sub(1);
+    fn reached_leader_tick(&self, leader_first_tick_height_including_grace_ticks: u64) -> bool {
+        let target_tick_height = leader_first_tick_height_including_grace_ticks.saturating_sub(1);
        let ideal_target_tick_height = target_tick_height.saturating_sub(self.grace_ticks);
-        let current_slot = self.tick_height / self.ticks_per_slot;
+        let next_tick_height = self.tick_height.saturating_add(1);
+        let next_slot = self.slot_for_tick_height(next_tick_height);
        // We've approached target_tick_height OR poh was reset to run immediately
        // Or, previous leader didn't transmit in any of its leader slots, so ignore grace ticks
        self.tick_height >= target_tick_height
-            || self.start_tick_height + self.grace_ticks == leader_first_tick_height
+            || self.start_tick_height + self.grace_ticks
+                == leader_first_tick_height_including_grace_ticks
            || (self.tick_height >= ideal_target_tick_height
-                && (self.prev_slot_was_mine(current_slot)
-                    || !self.is_same_fork_as_previous_leader(current_slot)))
+                && (self.prev_slot_was_mine(next_slot)
+                    || !self.is_same_fork_as_previous_leader(next_slot)))
    }

    pub fn start_slot(&self) -> Slot {
        self.start_bank.slot()
    }

-    /// returns if leader slot has been reached, how many grace ticks were afforded,
-    ///   imputed leader_slot and self.start_slot()
-    /// reached_leader_slot() == true means "ready for a bank"
-    pub fn reached_leader_slot(&self) -> (bool, u64, Slot, Slot) {
+    /// Returns if the leader slot has been reached along with the current poh
+    /// slot and the parent slot (could be a few slots ago if any previous
+    /// leaders needed to be skipped).
+    pub fn reached_leader_slot(&self) -> PohLeaderStatus {
        trace!(
-            "tick_height {}, start_tick_height {}, leader_first_tick_height {:?}, grace_ticks {}, has_bank {}",
+            "tick_height {}, start_tick_height {}, leader_first_tick_height_including_grace_ticks {:?}, grace_ticks {}, has_bank {}",
            self.tick_height,
            self.start_tick_height,
-            self.leader_first_tick_height,
+            self.leader_first_tick_height_including_grace_ticks,
            self.grace_ticks,
            self.has_bank()
        );

        let next_tick_height = self.tick_height + 1;
-        let next_leader_slot = (next_tick_height - 1) / self.ticks_per_slot;
-        if let Some(leader_first_tick_height) = self.leader_first_tick_height {
-            let target_tick_height = leader_first_tick_height.saturating_sub(1);
-            if self.reached_leader_tick(leader_first_tick_height) {
+        let next_poh_slot = self.slot_for_tick_height(next_tick_height);
+        if let Some(leader_first_tick_height_including_grace_ticks) =
+            self.leader_first_tick_height_including_grace_ticks
+        {
+            if self.reached_leader_tick(leader_first_tick_height_including_grace_ticks) {
                assert!(next_tick_height >= self.start_tick_height);
-                let ideal_target_tick_height = target_tick_height.saturating_sub(self.grace_ticks);
-
-                return (
-                    true,
-                    self.tick_height.saturating_sub(ideal_target_tick_height),
-                    next_leader_slot,
-                    self.start_slot(),
-                );
+                let poh_slot = next_poh_slot;
+                let parent_slot = self.start_slot();
+                return PohLeaderStatus::Reached {
+                    poh_slot,
+                    parent_slot,
+                };
            }
        }
-        (false, 0, next_leader_slot, self.start_slot())
+        PohLeaderStatus::NotReached
    }

-    // returns (leader_first_tick_height, leader_last_tick_height, grace_ticks) given the next
+    // returns (leader_first_tick_height_including_grace_ticks, leader_last_tick_height, grace_ticks) given the next
    //  slot this recorder will lead
    fn compute_leader_slot_tick_heights(
        next_leader_slot: Option<(Slot, Slot)>,
@ -390,8 +410,10 @@ impl PohRecorder {
                    ticks_per_slot * MAX_GRACE_SLOTS,
                    ticks_per_slot * num_slots / GRACE_TICKS_FACTOR,
                );
+                let leader_first_tick_height_including_grace_ticks =
+                    leader_first_tick_height + grace_ticks;
                (
-                    Some(leader_first_tick_height + grace_ticks),
+                    Some(leader_first_tick_height_including_grace_ticks),
                    last_tick_height,
                    grace_ticks,
                )
@ -431,10 +453,11 @@ impl PohRecorder {
        self.tick_height = (self.start_slot() + 1) * self.ticks_per_slot;
        self.start_tick_height = self.tick_height + 1;

-        let (leader_first_tick_height, leader_last_tick_height, grace_ticks) =
+        let (leader_first_tick_height_including_grace_ticks, leader_last_tick_height, grace_ticks) =
            Self::compute_leader_slot_tick_heights(next_leader_slot, self.ticks_per_slot);
        self.grace_ticks = grace_ticks;
-        self.leader_first_tick_height = leader_first_tick_height;
+        self.leader_first_tick_height_including_grace_ticks =
+            leader_first_tick_height_including_grace_ticks;
        self.leader_last_tick_height = leader_last_tick_height;
    }

@ -537,7 +560,10 @@ impl PohRecorder {
            self.tick_height += 1;
            trace!("tick_height {}", self.tick_height);

-            if self.leader_first_tick_height.is_none() {
+            if self
+                .leader_first_tick_height_including_grace_ticks
+                .is_none()
+            {
                self.tick_overhead_us += timing::duration_as_us(&now.elapsed());
                return;
            }
@ -682,7 +708,7 @@ impl PohRecorder {
        );
        let (sender, receiver) = channel();
        let (record_sender, record_receiver) = unbounded();
-        let (leader_first_tick_height, leader_last_tick_height, grace_ticks) =
+        let (leader_first_tick_height_including_grace_ticks, leader_last_tick_height, grace_ticks) =
            Self::compute_leader_slot_tick_heights(next_leader_slot, ticks_per_slot);
        (
            Self {
@ -694,7 +720,7 @@ impl PohRecorder {
                clear_bank_signal,
                start_bank,
                start_tick_height: tick_height + 1,
-                leader_first_tick_height,
+                leader_first_tick_height_including_grace_ticks,
                leader_last_tick_height,
                grace_ticks,
                id: *id,
@ -1593,12 +1619,18 @@ mod tests {
            );

            // Test that with no next leader slot, we don't reach the leader slot
-            assert!(!poh_recorder.reached_leader_slot().0);
+            assert_eq!(
+                poh_recorder.reached_leader_slot(),
+                PohLeaderStatus::NotReached
+            );

            // Test that with no next leader slot in reset(), we don't reach the leader slot
            assert_eq!(bank0.slot(), 0);
            poh_recorder.reset(bank0.clone(), None);
-            assert!(!poh_recorder.reached_leader_slot().0);
+            assert_eq!(
+                poh_recorder.reached_leader_slot(),
+                PohLeaderStatus::NotReached
+            );

            // Provide a leader slot one slot down
            poh_recorder.reset(bank0.clone(), Some((2, 2)));
@ -1626,17 +1658,22 @@ mod tests {
                .unwrap();

            // Test that we don't reach the leader slot because of grace ticks
-            assert!(!poh_recorder.reached_leader_slot().0);
+            assert_eq!(
+                poh_recorder.reached_leader_slot(),
+                PohLeaderStatus::NotReached
+            );

            // reset poh now. we should immediately be leader
            let bank1 = Arc::new(Bank::new_from_parent(&bank0, &Pubkey::default(), 1));
            assert_eq!(bank1.slot(), 1);
            poh_recorder.reset(bank1.clone(), Some((2, 2)));
-            let (reached_leader_slot, grace_ticks, leader_slot, ..) =
-                poh_recorder.reached_leader_slot();
-            assert!(reached_leader_slot);
-            assert_eq!(grace_ticks, 0);
-            assert_eq!(leader_slot, 2);
+            assert_eq!(
+                poh_recorder.reached_leader_slot(),
+                PohLeaderStatus::Reached {
+                    poh_slot: 2,
+                    parent_slot: 1,
+                }
+            );

            // Now test that with grace ticks we can reach leader slot
            // Set the leader slot one slot down
@ -1648,7 +1685,10 @@ mod tests {
            }

            // We are not the leader yet, as expected
-            assert!(!poh_recorder.reached_leader_slot().0);
+            assert_eq!(
+                poh_recorder.reached_leader_slot(),
+                PohLeaderStatus::NotReached
+            );

            // Send the grace ticks
            for _ in 0..bank1.ticks_per_slot() / GRACE_TICKS_FACTOR {
@ -1656,11 +1696,14 @@ mod tests {
            }

            // We should be the leader now
-            let (reached_leader_slot, grace_ticks, leader_slot, ..) =
-                poh_recorder.reached_leader_slot();
-            assert!(reached_leader_slot);
-            assert_eq!(grace_ticks, bank1.ticks_per_slot() / GRACE_TICKS_FACTOR);
-            assert_eq!(leader_slot, 3);
+            // without sending more ticks, we should be leader now
+            assert_eq!(
+                poh_recorder.reached_leader_slot(),
+                PohLeaderStatus::Reached {
+                    poh_slot: 3,
+                    parent_slot: 1,
+                }
+            );

            // Let's test that correct grace ticks are reported
            // Set the leader slot one slot down
@ -1673,17 +1716,22 @@ mod tests {
            }

            // We are not the leader yet, as expected
-            assert!(!poh_recorder.reached_leader_slot().0);
+            assert_eq!(
+                poh_recorder.reached_leader_slot(),
+                PohLeaderStatus::NotReached
+            );
            let bank3 = Arc::new(Bank::new_from_parent(&bank2, &Pubkey::default(), 3));
            assert_eq!(bank3.slot(), 3);
            poh_recorder.reset(bank3.clone(), Some((4, 4)));

            // without sending more ticks, we should be leader now
-            let (reached_leader_slot, grace_ticks, leader_slot, ..) =
-                poh_recorder.reached_leader_slot();
-            assert!(reached_leader_slot);
-            assert_eq!(grace_ticks, 0);
-            assert_eq!(leader_slot, 4);
+            assert_eq!(
+                poh_recorder.reached_leader_slot(),
+                PohLeaderStatus::Reached {
+                    poh_slot: 4,
+                    parent_slot: 3,
+                }
+            );

            // Let's test that if a node overshoots the ticks for its target
            // leader slot, reached_leader_slot() will return true, because it's overdue
@ -1698,11 +1746,13 @@ mod tests {
            }

            // We are overdue to lead
-            let (reached_leader_slot, grace_ticks, leader_slot, ..) =
-                poh_recorder.reached_leader_slot();
-            assert!(reached_leader_slot);
-            assert_eq!(grace_ticks, overshoot_factor * bank4.ticks_per_slot());
-            assert_eq!(leader_slot, 9);
+            assert_eq!(
+                poh_recorder.reached_leader_slot(),
+                PohLeaderStatus::Reached {
+                    poh_slot: 9,
+                    parent_slot: 4,
+                }
+            );
        }
        Blockstore::destroy(&ledger_path).unwrap();
    }
--- a/program-runtime/Cargo.toml
+++ b/program-runtime/Cargo.toml
@ -1,6 +1,6 @@
 [package]
 name = "solana-program-runtime"
-version = "1.9.5"
+version = "1.9.6"
 description = "Solana program runtime"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@ -19,11 +19,11 @@ log = "0.4.14"
 num-derive = { version = "0.3" }
 num-traits = { version = "0.2" }
 serde = { version = "1.0.129", features = ["derive", "rc"] }
-solana-frozen-abi = { path = "../frozen-abi", version = "=1.9.5" }
-solana-frozen-abi-macro = { path = "../frozen-abi/macro", version = "=1.9.5" }
-solana-logger = { path = "../logger", version = "=1.9.5" }
-solana-measure = { path = "../measure", version = "=1.9.5" }
-solana-sdk = { path = "../sdk", version = "=1.9.5" }
+solana-frozen-abi = { path = "../frozen-abi", version = "=1.9.6" }
+solana-frozen-abi-macro = { path = "../frozen-abi/macro", version = "=1.9.6" }
+solana-logger = { path = "../logger", version = "=1.9.6" }
+solana-measure = { path = "../measure", version = "=1.9.6" }
+solana-sdk = { path = "../sdk", version = "=1.9.6" }
 thiserror = "1.0"

 [lib]
--- a/program-test/Cargo.toml
+++ b/program-test/Cargo.toml
@ -5,7 +5,7 @@ edition = "2021"
 license = "Apache-2.0"
 name = "solana-program-test"
 repository = "https://github.com/solana-labs/solana"
-version = "1.9.5"
+version = "1.9.6"

 [dependencies]
 async-trait = "0.1.51"
@ -14,14 +14,14 @@ bincode = "1.3.3"
 chrono-humanize = "0.2.1"
 log = "0.4.14"
 serde = "1.0.130"
-solana-banks-client = { path = "../banks-client", version = "=1.9.5" }
-solana-banks-server = { path = "../banks-server", version = "=1.9.5" }
-solana-bpf-loader-program = { path = "../programs/bpf_loader", version = "=1.9.5" }
-solana-logger = { path = "../logger", version = "=1.9.5" }
-solana-program-runtime = { path = "../program-runtime", version = "=1.9.5" }
-solana-runtime = { path = "../runtime", version = "=1.9.5" }
-solana-sdk = { path = "../sdk", version = "=1.9.5" }
-solana-vote-program = { path = "../programs/vote", version = "=1.9.5" }
+solana-banks-client = { path = "../banks-client", version = "=1.9.6" }
+solana-banks-server = { path = "../banks-server", version = "=1.9.6" }
+solana-bpf-loader-program = { path = "../programs/bpf_loader", version = "=1.9.6" }
+solana-logger = { path = "../logger", version = "=1.9.6" }
+solana-program-runtime = { path = "../program-runtime", version = "=1.9.6" }
+solana-runtime = { path = "../runtime", version = "=1.9.6" }
+solana-sdk = { path = "../sdk", version = "=1.9.6" }
+solana-vote-program = { path = "../programs/vote", version = "=1.9.6" }
 thiserror = "1.0"
 tokio = { version = "1", features = ["full"] }

--- a/programs/address-lookup-table-tests/Cargo.toml
+++ b/programs/address-lookup-table-tests/Cargo.toml
@ -3,7 +3,7 @@

 [package]
 name = "solana-address-lookup-table-program-tests"
-version = "1.9.5"
+version = "1.9.6"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
@ -14,9 +14,9 @@ publish = false
 [dev-dependencies]
 assert_matches = "1.5.0"
 bincode = "1.3.3"
-solana-address-lookup-table-program = { path = "../address-lookup-table", version = "=1.9.5" }
-solana-program-test = { path = "../../program-test", version = "=1.9.5" }
-solana-sdk = { path = "../../sdk", version = "=1.9.5" }
+solana-address-lookup-table-program = { path = "../address-lookup-table", version = "=1.9.6" }
+solana-program-test = { path = "../../program-test", version = "=1.9.6" }
+solana-sdk = { path = "../../sdk", version = "=1.9.6" }

 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
--- a/programs/address-lookup-table/Cargo.toml
+++ b/programs/address-lookup-table/Cargo.toml
@ -1,6 +1,6 @@
 [package]
 name = "solana-address-lookup-table-program"
-version = "1.9.5"
+version = "1.9.6"
 description = "Solana address lookup table program"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@ -16,10 +16,10 @@ log = "0.4.14"
 num-derive = "0.3"
 num-traits = "0.2"
 serde = { version = "1.0.127", features = ["derive"] }
-solana-frozen-abi = { path = "../../frozen-abi", version = "=1.9.5" }
-solana-frozen-abi-macro = { path = "../../frozen-abi/macro", version = "=1.9.5" }
-solana-program-runtime = { path = "../../program-runtime", version = "=1.9.5" }
-solana-sdk = { path = "../../sdk", version = "=1.9.5" }
+solana-frozen-abi = { path = "../../frozen-abi", version = "=1.9.6" }
+solana-frozen-abi-macro = { path = "../../frozen-abi/macro", version = "=1.9.6" }
+solana-program-runtime = { path = "../../program-runtime", version = "=1.9.6" }
+solana-sdk = { path = "../../sdk", version = "=1.9.6" }
 thiserror = "1.0"

 [build-dependencies]
--- a/programs/bpf/Cargo.lock
+++ b/programs/bpf/Cargo.lock
@ -2364,7 +2364,7 @@ dependencies = [

 [[package]]
 name = "solana-account-decoder"
-version = "1.9.5"
+version = "1.9.6"
 dependencies = [
 "Inflector",
 "base64 0.12.3",
@ -2385,7 +2385,7 @@ dependencies = [

 [[package]]
 name = "solana-address-lookup-table-program"
-version = "1.9.5"
+version = "1.9.6"
 dependencies = [
 "bincode",
 "bytemuck",
@ -2394,8 +2394,8 @@ dependencies = [
 "num-traits",
 "rustc_version",
 "serde",
- "solana-frozen-abi 1.9.5",
- "solana-frozen-abi-macro 1.9.5",
+ "solana-frozen-abi 1.9.6",
+ "solana-frozen-abi-macro 1.9.6",
 "solana-program-runtime",
 "solana-sdk",
 "thiserror",
@ -2403,12 +2403,12 @@ dependencies = [

 [[package]]
 name = "solana-banks-client"
-version = "1.9.5"
+version = "1.9.6"
 dependencies = [
 "borsh",
 "futures",
 "solana-banks-interface",
- "solana-program 1.9.5",
+ "solana-program 1.9.6",
 "solana-sdk",
 "tarpc",
 "thiserror",
@ -2418,7 +2418,7 @@ dependencies = [

 [[package]]
 name = "solana-banks-interface"
-version = "1.9.5"
+version = "1.9.6"
 dependencies = [
 "serde",
 "solana-sdk",
@ -2427,7 +2427,7 @@ dependencies = [

 [[package]]
 name = "solana-banks-server"
-version = "1.9.5"
+version = "1.9.6"
 dependencies = [
 "bincode",
 "futures",
@ -2443,7 +2443,7 @@ dependencies = [

 [[package]]
 name = "solana-bloom"
-version = "1.9.5"
+version = "1.9.6"
 dependencies = [
 "bv",
 "fnv",
@ -2453,14 +2453,14 @@ dependencies = [
 "rustc_version",
 "serde",
 "serde_derive",
- "solana-frozen-abi 1.9.5",
- "solana-frozen-abi-macro 1.9.5",
+ "solana-frozen-abi 1.9.6",
+ "solana-frozen-abi-macro 1.9.6",
 "solana-sdk",
 ]

 [[package]]
 name = "solana-bpf-loader-program"
-version = "1.9.5"
+version = "1.9.6"
 dependencies = [
 "bincode",
 "byteorder 1.4.3",
@ -2476,7 +2476,7 @@ dependencies = [

 [[package]]
 name = "solana-bpf-programs"
-version = "1.9.5"
+version = "1.9.6"
 dependencies = [
 "bincode",
 "byteorder 1.4.3",
@ -2491,7 +2491,7 @@ dependencies = [
 "solana-bpf-rust-realloc",
 "solana-bpf-rust-realloc-invoke",
 "solana-cli-output",
- "solana-logger 1.9.5",
+ "solana-logger 1.9.6",
 "solana-measure",
 "solana-program-runtime",
 "solana-runtime",
@ -2503,170 +2503,170 @@ dependencies = [

 [[package]]
 name = "solana-bpf-rust-128bit"
-version = "1.9.5"
+version = "1.9.6"
 dependencies = [
 "solana-bpf-rust-128bit-dep",
- "solana-program 1.9.5",
+ "solana-program 1.9.6",
 ]

 [[package]]
 name = "solana-bpf-rust-128bit-dep"
-version = "1.9.5"
+version = "1.9.6"
 dependencies = [
- "solana-program 1.9.5",
+ "solana-program 1.9.6",
 ]

 [[package]]
 name = "solana-bpf-rust-alloc"
-version = "1.9.5"
+version = "1.9.6"
 dependencies = [
- "solana-program 1.9.5",
+ "solana-program 1.9.6",
 ]

 [[package]]
 name = "solana-bpf-rust-call-depth"
-version = "1.9.5"
+version = "1.9.6"
 dependencies = [
- "solana-program 1.9.5",
+ "solana-program 1.9.6",
 ]

 [[package]]
 name = "solana-bpf-rust-caller-access"
-version = "1.9.5"
+version = "1.9.6"
 dependencies = [
- "solana-program 1.9.5",
+ "solana-program 1.9.6",
 ]

 [[package]]
 name = "solana-bpf-rust-custom-heap"
-version = "1.9.5"
+version = "1.9.6"
 dependencies = [
- "solana-program 1.9.5",
+ "solana-program 1.9.6",
 ]

 [[package]]
 name = "solana-bpf-rust-dep-crate"
-version = "1.9.5"
+version = "1.9.6"
 dependencies = [
 "byteorder 1.4.3",
- "solana-program 1.9.5",
+ "solana-program 1.9.6",
 ]

 [[package]]
 name = "solana-bpf-rust-deprecated-loader"
-version = "1.9.5"
+version = "1.9.6"
 dependencies = [
- "solana-program 1.9.5",
+ "solana-program 1.9.6",
 ]

 [[package]]
 name = "solana-bpf-rust-dup-accounts"
-version = "1.9.5"
+version = "1.9.6"
 dependencies = [
- "solana-program 1.9.5",
+ "solana-program 1.9.6",
 ]

 [[package]]
 name = "solana-bpf-rust-error-handling"
-version = "1.9.5"
+version = "1.9.6"
 dependencies = [
 "num-derive",
 "num-traits",
- "solana-program 1.9.5",
+ "solana-program 1.9.6",
 "thiserror",
 ]

 [[package]]
 name = "solana-bpf-rust-external-spend"
-version = "1.9.5"
+version = "1.9.6"
 dependencies = [
- "solana-program 1.9.5",
+ "solana-program 1.9.6",
 ]

 [[package]]
 name = "solana-bpf-rust-finalize"
-version = "1.9.5"
+version = "1.9.6"
 dependencies = [
- "solana-program 1.9.5",
+ "solana-program 1.9.6",
 ]

 [[package]]
 name = "solana-bpf-rust-instruction-introspection"
-version = "1.9.5"
+version = "1.9.6"
 dependencies = [
- "solana-program 1.9.5",
+ "solana-program 1.9.6",
 ]

 [[package]]
 name = "solana-bpf-rust-invoke"
-version = "1.9.5"
+version = "1.9.6"
 dependencies = [
 "solana-bpf-rust-invoked",
- "solana-program 1.9.5",
+ "solana-program 1.9.6",
 ]

 [[package]]
 name = "solana-bpf-rust-invoke-and-error"
-version = "1.9.5"
+version = "1.9.6"
 dependencies = [
- "solana-program 1.9.5",
+ "solana-program 1.9.6",
 ]

 [[package]]
 name = "solana-bpf-rust-invoke-and-ok"
-version = "1.9.5"
+version = "1.9.6"
 dependencies = [
- "solana-program 1.9.5",
+ "solana-program 1.9.6",
 ]

 [[package]]
 name = "solana-bpf-rust-invoke-and-return"
-version = "1.9.5"
+version = "1.9.6"
 dependencies = [
- "solana-program 1.9.5",
+ "solana-program 1.9.6",
 ]

 [[package]]
 name = "solana-bpf-rust-invoked"
-version = "1.9.5"
+version = "1.9.6"
 dependencies = [
- "solana-program 1.9.5",
+ "solana-program 1.9.6",
 ]

 [[package]]
 name = "solana-bpf-rust-iter"
-version = "1.9.5"
+version = "1.9.6"
 dependencies = [
- "solana-program 1.9.5",
+ "solana-program 1.9.6",
 ]

 [[package]]
 name = "solana-bpf-rust-log-data"
-version = "1.9.5"
+version = "1.9.6"
 dependencies = [
- "solana-program 1.9.5",
+ "solana-program 1.9.6",
 ]

 [[package]]
 name = "solana-bpf-rust-many-args"
-version = "1.9.5"
+version = "1.9.6"
 dependencies = [
 "solana-bpf-rust-many-args-dep",
- "solana-program 1.9.5",
+ "solana-program 1.9.6",
 ]

 [[package]]
 name = "solana-bpf-rust-many-args-dep"
-version = "1.9.5"
+version = "1.9.6"
 dependencies = [
- "solana-program 1.9.5",
+ "solana-program 1.9.6",
 ]

 [[package]]
 name = "solana-bpf-rust-mem"
-version = "1.9.5"
+version = "1.9.6"
 dependencies = [
- "solana-program 1.9.5",
+ "solana-program 1.9.6",
 "solana-program-runtime",
 "solana-program-test",
 "solana-sdk",
@ -2674,84 +2674,84 @@ dependencies = [

 [[package]]
 name = "solana-bpf-rust-membuiltins"
-version = "1.9.5"
+version = "1.9.6"
 dependencies = [
 "solana-bpf-rust-mem",
- "solana-program 1.9.5",
+ "solana-program 1.9.6",
 ]

 [[package]]
 name = "solana-bpf-rust-noop"
-version = "1.9.5"
+version = "1.9.6"
 dependencies = [
- "solana-program 1.9.5",
+ "solana-program 1.9.6",
 ]

 [[package]]
 name = "solana-bpf-rust-panic"
-version = "1.9.5"
+version = "1.9.6"
 dependencies = [
- "solana-program 1.9.5",
+ "solana-program 1.9.6",
 ]

 [[package]]
 name = "solana-bpf-rust-param-passing"
-version = "1.9.5"
+version = "1.9.6"
 dependencies = [
 "solana-bpf-rust-param-passing-dep",
- "solana-program 1.9.5",
+ "solana-program 1.9.6",
 ]

 [[package]]
 name = "solana-bpf-rust-param-passing-dep"
-version = "1.9.5"
+version = "1.9.6"
 dependencies = [
- "solana-program 1.9.5",
+ "solana-program 1.9.6",
 ]

 [[package]]
 name = "solana-bpf-rust-rand"
-version = "1.9.5"
+version = "1.9.6"
 dependencies = [
 "getrandom 0.1.16",
 "rand 0.7.3",
- "solana-program 1.9.5",
+ "solana-program 1.9.6",
 ]

 [[package]]
 name = "solana-bpf-rust-realloc"
-version = "1.9.5"
+version = "1.9.6"
 dependencies = [
- "solana-program 1.9.5",
+ "solana-program 1.9.6",
 ]

 [[package]]
 name = "solana-bpf-rust-realloc-invoke"
-version = "1.9.5"
+version = "1.9.6"
 dependencies = [
 "solana-bpf-rust-realloc",
- "solana-program 1.9.5",
+ "solana-program 1.9.6",
 ]

 [[package]]
 name = "solana-bpf-rust-ro-account_modify"
-version = "1.9.5"
+version = "1.9.6"
 dependencies = [
- "solana-program 1.9.5",
+ "solana-program 1.9.6",
 ]

 [[package]]
 name = "solana-bpf-rust-ro-modify"
-version = "1.9.5"
+version = "1.9.6"
 dependencies = [
- "solana-program 1.9.5",
+ "solana-program 1.9.6",
 ]

 [[package]]
 name = "solana-bpf-rust-sanity"
-version = "1.9.5"
+version = "1.9.6"
 dependencies = [
- "solana-program 1.9.5",
+ "solana-program 1.9.6",
 "solana-program-runtime",
 "solana-program-test",
 "solana-sdk",
@ -2759,38 +2759,38 @@ dependencies = [

 [[package]]
 name = "solana-bpf-rust-secp256k1-recover"
-version = "1.9.5"
+version = "1.9.6"
 dependencies = [
- "solana-program 1.9.5",
+ "solana-program 1.9.6",
 ]

 [[package]]
 name = "solana-bpf-rust-sha"
-version = "1.9.5"
+version = "1.9.6"
 dependencies = [
 "blake3",
- "solana-program 1.9.5",
+ "solana-program 1.9.6",
 ]

 [[package]]
 name = "solana-bpf-rust-spoof1"
-version = "1.9.5"
+version = "1.9.6"
 dependencies = [
- "solana-program 1.9.5",
+ "solana-program 1.9.6",
 ]

 [[package]]
 name = "solana-bpf-rust-spoof1-system"
-version = "1.9.5"
+version = "1.9.6"
 dependencies = [
- "solana-program 1.9.5",
+ "solana-program 1.9.6",
 ]

 [[package]]
 name = "solana-bpf-rust-sysvar"
-version = "1.9.5"
+version = "1.9.6"
 dependencies = [
- "solana-program 1.9.5",
+ "solana-program 1.9.6",
 "solana-program-runtime",
 "solana-program-test",
 "solana-sdk",
@ -2798,28 +2798,28 @@ dependencies = [

 [[package]]
 name = "solana-bpf-rust-upgradeable"
-version = "1.9.5"
+version = "1.9.6"
 dependencies = [
- "solana-program 1.9.5",
+ "solana-program 1.9.6",
 ]

 [[package]]
 name = "solana-bpf-rust-upgraded"
-version = "1.9.5"
+version = "1.9.6"
 dependencies = [
- "solana-program 1.9.5",
+ "solana-program 1.9.6",
 ]

 [[package]]
 name = "solana-bucket-map"
-version = "1.9.5"
+version = "1.9.6"
 dependencies = [
 "fs_extra",
 "log",
 "memmap2",
 "rand 0.7.3",
 "rayon",
- "solana-logger 1.9.5",
+ "solana-logger 1.9.6",
 "solana-measure",
 "solana-sdk",
 "tempfile",
@ -2827,7 +2827,7 @@ dependencies = [

 [[package]]
 name = "solana-clap-utils"
-version = "1.9.5"
+version = "1.9.6"
 dependencies = [
 "chrono",
 "clap",
@ -2843,7 +2843,7 @@ dependencies = [

 [[package]]
 name = "solana-cli-config"
-version = "1.9.5"
+version = "1.9.6"
 dependencies = [
 "dirs-next",
 "lazy_static",
@ -2855,7 +2855,7 @@ dependencies = [

 [[package]]
 name = "solana-cli-output"
-version = "1.9.5"
+version = "1.9.6"
 dependencies = [
 "Inflector",
 "base64 0.13.0",
@ -2877,7 +2877,7 @@ dependencies = [

 [[package]]
 name = "solana-client"
-version = "1.9.5"
+version = "1.9.6"
 dependencies = [
 "base64 0.13.0",
 "bincode",
@ -2909,7 +2909,7 @@ dependencies = [

 [[package]]
 name = "solana-compute-budget-program"
-version = "1.9.5"
+version = "1.9.6"
 dependencies = [
 "solana-program-runtime",
 "solana-sdk",
@ -2917,7 +2917,7 @@ dependencies = [

 [[package]]
 name = "solana-config-program"
-version = "1.9.5"
+version = "1.9.6"
 dependencies = [
 "bincode",
 "chrono",
@ -2929,7 +2929,7 @@ dependencies = [

 [[package]]
 name = "solana-faucet"
-version = "1.9.5"
+version = "1.9.6"
 dependencies = [
 "bincode",
 "byteorder 1.4.3",
@ -2939,7 +2939,7 @@ dependencies = [
 "serde_derive",
 "solana-clap-utils",
 "solana-cli-config",
- "solana-logger 1.9.5",
+ "solana-logger 1.9.6",
 "solana-metrics",
 "solana-sdk",
 "solana-version",
@ -2970,7 +2970,7 @@ dependencies = [

 [[package]]
 name = "solana-frozen-abi"
-version = "1.9.5"
+version = "1.9.6"
 dependencies = [
 "bs58",
 "bv",
@ -2981,8 +2981,8 @@ dependencies = [
 "serde",
 "serde_derive",
 "sha2",
- "solana-frozen-abi-macro 1.9.5",
- "solana-logger 1.9.5",
+ "solana-frozen-abi-macro 1.9.6",
+ "solana-logger 1.9.6",
 "thiserror",
 ]

@ -3000,7 +3000,7 @@ dependencies = [

 [[package]]
 name = "solana-frozen-abi-macro"
-version = "1.9.5"
+version = "1.9.6"
 dependencies = [
 "proc-macro2 1.0.36",
 "quote 1.0.14",
@ -3021,7 +3021,7 @@ dependencies = [

 [[package]]
 name = "solana-logger"
-version = "1.9.5"
+version = "1.9.6"
 dependencies = [
 "env_logger",
 "lazy_static",
@ -3030,7 +3030,7 @@ dependencies = [

 [[package]]
 name = "solana-measure"
-version = "1.9.5"
+version = "1.9.6"
 dependencies = [
 "log",
 "solana-sdk",
@ -3038,7 +3038,7 @@ dependencies = [

 [[package]]
 name = "solana-metrics"
-version = "1.9.5"
+version = "1.9.6"
 dependencies = [
 "env_logger",
 "gethostname",
@ -3050,7 +3050,7 @@ dependencies = [

 [[package]]
 name = "solana-net-utils"
-version = "1.9.5"
+version = "1.9.6"
 dependencies = [
 "bincode",
 "clap",
@ -3060,7 +3060,7 @@ dependencies = [
 "serde",
 "serde_derive",
 "socket2",
- "solana-logger 1.9.5",
+ "solana-logger 1.9.6",
 "solana-sdk",
 "solana-version",
 "tokio",
@ -3069,7 +3069,7 @@ dependencies = [

 [[package]]
 name = "solana-perf"
-version = "1.9.5"
+version = "1.9.6"
 dependencies = [
 "ahash 0.7.6",
 "bincode",
@ -3087,7 +3087,7 @@ dependencies = [
 "rayon",
 "serde",
 "solana-bloom",
- "solana-logger 1.9.5",
+ "solana-logger 1.9.6",
 "solana-metrics",
 "solana-rayon-threadlimit",
 "solana-sdk",
@ -3139,7 +3139,7 @@ dependencies = [

 [[package]]
 name = "solana-program"
-version = "1.9.5"
+version = "1.9.6"
 dependencies = [
 "base64 0.13.0",
 "bincode",
@ -3170,17 +3170,17 @@ dependencies = [
 "serde_derive",
 "sha2",
 "sha3",
- "solana-frozen-abi 1.9.5",
- "solana-frozen-abi-macro 1.9.5",
- "solana-logger 1.9.5",
- "solana-sdk-macro 1.9.5",
+ "solana-frozen-abi 1.9.6",
+ "solana-frozen-abi-macro 1.9.6",
+ "solana-logger 1.9.6",
+ "solana-sdk-macro 1.9.6",
 "thiserror",
 "wasm-bindgen",
 ]

 [[package]]
 name = "solana-program-runtime"
-version = "1.9.5"
+version = "1.9.6"
 dependencies = [
 "base64 0.13.0",
 "bincode",
@ -3192,9 +3192,9 @@ dependencies = [
 "num-traits",
 "rustc_version",
 "serde",
- "solana-frozen-abi 1.9.5",
- "solana-frozen-abi-macro 1.9.5",
- "solana-logger 1.9.5",
+ "solana-frozen-abi 1.9.6",
+ "solana-frozen-abi-macro 1.9.6",
+ "solana-logger 1.9.6",
 "solana-measure",
 "solana-sdk",
 "thiserror",
@ -3202,7 +3202,7 @@ dependencies = [

 [[package]]
 name = "solana-program-test"
-version = "1.9.5"
+version = "1.9.6"
 dependencies = [
 "async-trait",
 "base64 0.12.3",
@ -3213,7 +3213,7 @@ dependencies = [
 "solana-banks-client",
 "solana-banks-server",
 "solana-bpf-loader-program",
- "solana-logger 1.9.5",
+ "solana-logger 1.9.6",
 "solana-program-runtime",
 "solana-runtime",
 "solana-sdk",
@ -3224,7 +3224,7 @@ dependencies = [

 [[package]]
 name = "solana-rayon-threadlimit"
-version = "1.9.5"
+version = "1.9.6"
 dependencies = [
 "lazy_static",
 "num_cpus",
@ -3232,7 +3232,7 @@ dependencies = [

 [[package]]
 name = "solana-remote-wallet"
-version = "1.9.5"
+version = "1.9.6"
 dependencies = [
 "base32",
 "console",
@ -3251,7 +3251,7 @@ dependencies = [

 [[package]]
 name = "solana-runtime"
-version = "1.9.5"
+version = "1.9.6"
 dependencies = [
 "arrayref",
 "bincode",
@ -3285,9 +3285,9 @@ dependencies = [
 "solana-bucket-map",
 "solana-compute-budget-program",
 "solana-config-program",
- "solana-frozen-abi 1.9.5",
- "solana-frozen-abi-macro 1.9.5",
- "solana-logger 1.9.5",
+ "solana-frozen-abi 1.9.6",
+ "solana-frozen-abi-macro 1.9.6",
+ "solana-logger 1.9.6",
 "solana-measure",
 "solana-metrics",
 "solana-program-runtime",
@ -3304,7 +3304,7 @@ dependencies = [

 [[package]]
 name = "solana-sdk"
-version = "1.9.5"
+version = "1.9.6"
 dependencies = [
 "assert_matches",
 "base64 0.13.0",
@ -3341,11 +3341,11 @@ dependencies = [
 "serde_json",
 "sha2",
 "sha3",
- "solana-frozen-abi 1.9.5",
- "solana-frozen-abi-macro 1.9.5",
- "solana-logger 1.9.5",
- "solana-program 1.9.5",
- "solana-sdk-macro 1.9.5",
+ "solana-frozen-abi 1.9.6",
+ "solana-frozen-abi-macro 1.9.6",
+ "solana-logger 1.9.6",
+ "solana-program 1.9.6",
+ "solana-sdk-macro 1.9.6",
 "thiserror",
 "uriparse",
 "wasm-bindgen",
@ -3366,7 +3366,7 @@ dependencies = [

 [[package]]
 name = "solana-sdk-macro"
-version = "1.9.5"
+version = "1.9.6"
 dependencies = [
 "bs58",
 "proc-macro2 1.0.36",
@ -3377,10 +3377,10 @@ dependencies = [

 [[package]]
 name = "solana-send-transaction-service"
-version = "1.9.5"
+version = "1.9.6"
 dependencies = [
 "log",
- "solana-logger 1.9.5",
+ "solana-logger 1.9.6",
 "solana-metrics",
 "solana-runtime",
 "solana-sdk",
@ -3388,7 +3388,7 @@ dependencies = [

 [[package]]
 name = "solana-stake-program"
-version = "1.9.5"
+version = "1.9.6"
 dependencies = [
 "bincode",
 "log",
@ -3398,8 +3398,8 @@ dependencies = [
 "serde",
 "serde_derive",
 "solana-config-program",
- "solana-frozen-abi 1.9.5",
- "solana-frozen-abi-macro 1.9.5",
+ "solana-frozen-abi 1.9.6",
+ "solana-frozen-abi-macro 1.9.6",
 "solana-metrics",
 "solana-program-runtime",
 "solana-sdk",
@ -3409,7 +3409,7 @@ dependencies = [

 [[package]]
 name = "solana-transaction-status"
-version = "1.9.5"
+version = "1.9.6"
 dependencies = [
 "Inflector",
 "base64 0.12.3",
@ -3434,20 +3434,20 @@ dependencies = [

 [[package]]
 name = "solana-version"
-version = "1.9.5"
+version = "1.9.6"
 dependencies = [
 "log",
 "rustc_version",
 "serde",
 "serde_derive",
- "solana-frozen-abi 1.9.5",
- "solana-frozen-abi-macro 1.9.5",
+ "solana-frozen-abi 1.9.6",
+ "solana-frozen-abi-macro 1.9.6",
 "solana-sdk",
 ]

 [[package]]
 name = "solana-vote-program"
-version = "1.9.5"
+version = "1.9.6"
 dependencies = [
 "bincode",
 "log",
@ -3456,9 +3456,9 @@ dependencies = [
 "rustc_version",
 "serde",
 "serde_derive",
- "solana-frozen-abi 1.9.5",
- "solana-frozen-abi-macro 1.9.5",
- "solana-logger 1.9.5",
+ "solana-frozen-abi 1.9.6",
+ "solana-frozen-abi-macro 1.9.6",
+ "solana-logger 1.9.6",
 "solana-metrics",
 "solana-program-runtime",
 "solana-sdk",
--- a/programs/bpf/Cargo.toml
+++ b/programs/bpf/Cargo.toml
@ -1,7 +1,7 @@
 [package]
 name = "solana-bpf-programs"
 description = "Blockchain, Rebuilt for Scale"
-version = "1.9.5"
+version = "1.9.6"
 documentation = "https://docs.rs/solana"
 homepage = "https://solana.com/"
 readme = "README.md"
@ -26,19 +26,19 @@ itertools = "0.10.1"
 log = "0.4.11"
 miow = "0.3.6"
 net2 = "0.2.37"
-solana-bpf-rust-invoke = { path = "rust/invoke", version = "=1.9.5"}
-solana-bpf-loader-program = { path = "../bpf_loader", version = "=1.9.5"}
-solana-bpf-rust-realloc = { path = "rust/realloc", version = "=1.9.5"}
-solana-bpf-rust-realloc-invoke = { path = "rust/realloc_invoke", version = "=1.9.5"}
-solana-cli-output = { path = "../../cli-output", version = "=1.9.5" }
-solana-logger = { path = "../../logger", version = "=1.9.5" }
-solana-measure = { path = "../../measure", version = "=1.9.5" }
+solana-bpf-rust-invoke = { path = "rust/invoke", version = "=1.9.6"}
+solana-bpf-loader-program = { path = "../bpf_loader", version = "=1.9.6"}
+solana-bpf-rust-realloc = { path = "rust/realloc", version = "=1.9.6"}
+solana-bpf-rust-realloc-invoke = { path = "rust/realloc_invoke", version = "=1.9.6"}
+solana-cli-output = { path = "../../cli-output", version = "=1.9.6" }
+solana-logger = { path = "../../logger", version = "=1.9.6" }
+solana-measure = { path = "../../measure", version = "=1.9.6" }
 solana_rbpf = "=0.2.21"
-solana-runtime = { path = "../../runtime", version = "=1.9.5" }
-solana-program-runtime = { path = "../../program-runtime", version = "=1.9.5" }
-solana-sdk = { path = "../../sdk", version = "=1.9.5" }
-solana-transaction-status = { path = "../../transaction-status", version = "=1.9.5" }
-solana-account-decoder = { path = "../../account-decoder", version = "=1.9.5" }
+solana-runtime = { path = "../../runtime", version = "=1.9.6" }
+solana-program-runtime = { path = "../../program-runtime", version = "=1.9.6" }
+solana-sdk = { path = "../../sdk", version = "=1.9.6" }
+solana-transaction-status = { path = "../../transaction-status", version = "=1.9.6" }
+solana-account-decoder = { path = "../../account-decoder", version = "=1.9.6" }

 [[bench]]
 name = "bpf_loader"
--- a/programs/bpf/rust/128bit/Cargo.toml
+++ b/programs/bpf/rust/128bit/Cargo.toml
@ -1,6 +1,6 @@
 [package]
 name = "solana-bpf-rust-128bit"
-version = "1.9.5"
+version = "1.9.6"
 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 = "2021"

 [dependencies]
-solana-program = { path = "../../../../sdk/program", version = "=1.9.5" }
-solana-bpf-rust-128bit-dep = { path = "../128bit_dep", version = "=1.9.5" }
+solana-program = { path = "../../../../sdk/program", version = "=1.9.6" }
+solana-bpf-rust-128bit-dep = { path = "../128bit_dep", version = "=1.9.6" }

 [lib]
 crate-type = ["cdylib"]
--- a/programs/bpf/rust/128bit_dep/Cargo.toml
+++ b/programs/bpf/rust/128bit_dep/Cargo.toml
@ -1,6 +1,6 @@
 [package]
 name = "solana-bpf-rust-128bit-dep"
-version = "1.9.5"
+version = "1.9.6"
 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 = "2021"

 [dependencies]
-solana-program = { path = "../../../../sdk/program", version = "=1.9.5" }
+solana-program = { path = "../../../../sdk/program", version = "=1.9.6" }

 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
--- a/programs/bpf/rust/alloc/Cargo.toml
+++ b/programs/bpf/rust/alloc/Cargo.toml
@ -1,6 +1,6 @@
 [package]
 name = "solana-bpf-rust-alloc"
-version = "1.9.5"
+version = "1.9.6"
 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 = "2021"

 [dependencies]
-solana-program = { path = "../../../../sdk/program", version = "=1.9.5" }
+solana-program = { path = "../../../../sdk/program", version = "=1.9.6" }

 [lib]
 crate-type = ["cdylib"]
--- a/programs/bpf/rust/call_depth/Cargo.toml
+++ b/programs/bpf/rust/call_depth/Cargo.toml
@ -1,6 +1,6 @@
 [package]
 name = "solana-bpf-rust-call-depth"
-version = "1.9.5"
+version = "1.9.6"
 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 = "2021"

 [dependencies]
-solana-program = { path = "../../../../sdk/program", version = "=1.9.5" }
+solana-program = { path = "../../../../sdk/program", version = "=1.9.6" }

 [lib]
 crate-type = ["cdylib"]
--- a/programs/bpf/rust/caller_access/Cargo.toml
+++ b/programs/bpf/rust/caller_access/Cargo.toml
@ -1,6 +1,6 @@
 [package]
 name = "solana-bpf-rust-caller-access"
-version = "1.9.5"
+version = "1.9.6"
 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 = "2021"

 [dependencies]
-solana-program = { path = "../../../../sdk/program", version = "=1.9.5" }
+solana-program = { path = "../../../../sdk/program", version = "=1.9.6" }

 [lib]
 crate-type = ["cdylib"]
--- a/programs/bpf/rust/custom_heap/Cargo.toml
+++ b/programs/bpf/rust/custom_heap/Cargo.toml
@ -1,6 +1,6 @@
 [package]
 name = "solana-bpf-rust-custom-heap"
-version = "1.9.5"
+version = "1.9.6"
 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 = "2021"

 [dependencies]
-solana-program = { path = "../../../../sdk/program", version = "=1.9.5" }
+solana-program = { path = "../../../../sdk/program", version = "=1.9.6" }

 [features]
 default = ["custom-heap"]
--- a/programs/bpf/rust/dep_crate/Cargo.toml
+++ b/programs/bpf/rust/dep_crate/Cargo.toml
@ -1,6 +1,6 @@
 [package]
 name = "solana-bpf-rust-dep-crate"
-version = "1.9.5"
+version = "1.9.6"
 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 = "2021"

 [dependencies]
 byteorder = { version = "1", default-features = false }
-solana-program = { path = "../../../../sdk/program", version = "=1.9.5" }
+solana-program = { path = "../../../../sdk/program", version = "=1.9.6" }

 [lib]
 crate-type = ["cdylib"]
--- a/programs/bpf/rust/deprecated_loader/Cargo.toml
+++ b/programs/bpf/rust/deprecated_loader/Cargo.toml
@ -1,6 +1,6 @@
 [package]
 name = "solana-bpf-rust-deprecated-loader"
-version = "1.9.5"
+version = "1.9.6"
 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 = "2021"

 [dependencies]
-solana-program = { path = "../../../../sdk/program", version = "=1.9.5" }
+solana-program = { path = "../../../../sdk/program", version = "=1.9.6" }

 [lib]
 crate-type = ["cdylib"]
--- a/programs/bpf/rust/dup_accounts/Cargo.toml
+++ b/programs/bpf/rust/dup_accounts/Cargo.toml
@ -1,6 +1,6 @@
 [package]
 name = "solana-bpf-rust-dup-accounts"
-version = "1.9.5"
+version = "1.9.6"
 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 = "2021"

 [dependencies]
-solana-program = { path = "../../../../sdk/program", version = "=1.9.5" }
+solana-program = { path = "../../../../sdk/program", version = "=1.9.6" }

 [lib]
 crate-type = ["cdylib"]
--- a/programs/bpf/rust/error_handling/Cargo.toml
+++ b/programs/bpf/rust/error_handling/Cargo.toml
@ -1,6 +1,6 @@
 [package]
 name = "solana-bpf-rust-error-handling"
-version = "1.9.5"
+version = "1.9.6"
 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 = "2021"
 [dependencies]
 num-derive = "0.3"
 num-traits = "0.2"
-solana-program = { path = "../../../../sdk/program", version = "=1.9.5" }
+solana-program = { path = "../../../../sdk/program", version = "=1.9.6" }
 thiserror = "1.0"

 [lib]
--- a/programs/bpf/rust/external_spend/Cargo.toml
+++ b/programs/bpf/rust/external_spend/Cargo.toml
@ -1,6 +1,6 @@
 [package]
 name = "solana-bpf-rust-external-spend"
-version = "1.9.5"
+version = "1.9.6"
 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 = "2021"

 [dependencies]
-solana-program = { path = "../../../../sdk/program", version = "=1.9.5" }
+solana-program = { path = "../../../../sdk/program", version = "=1.9.6" }

 [lib]
 crate-type = ["cdylib"]
--- a/programs/bpf/rust/finalize/Cargo.toml
+++ b/programs/bpf/rust/finalize/Cargo.toml
@ -1,6 +1,6 @@
 [package]
 name = "solana-bpf-rust-finalize"
-version = "1.9.5"
+version = "1.9.6"
 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 = "2021"

 [dependencies]
-solana-program = { path = "../../../../sdk/program", version = "=1.9.5" }
+solana-program = { path = "../../../../sdk/program", version = "=1.9.6" }

 [lib]
 crate-type = ["cdylib"]
--- a/programs/bpf/rust/instruction_introspection/Cargo.toml
+++ b/programs/bpf/rust/instruction_introspection/Cargo.toml
@ -1,6 +1,6 @@
 [package]
 name = "solana-bpf-rust-instruction-introspection"
-version = "1.9.5"
+version = "1.9.6"
 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 = "2021"

 [dependencies]
-solana-program = { path = "../../../../sdk/program", version = "=1.9.5" }
+solana-program = { path = "../../../../sdk/program", version = "=1.9.6" }

 [lib]
 crate-type = ["cdylib"]
--- a/programs/bpf/rust/invoke/Cargo.toml
+++ b/programs/bpf/rust/invoke/Cargo.toml
@ -1,6 +1,6 @@
 [package]
 name = "solana-bpf-rust-invoke"
-version = "1.9.5"
+version = "1.9.6"
 description = "Solana BPF test program written in Rust"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@ -15,7 +15,7 @@ program = []

 [dependencies]
 solana-bpf-rust-invoked = { path = "../invoked", default-features = false }
-solana-program = { path = "../../../../sdk/program", version = "=1.9.5" }
+solana-program = { path = "../../../../sdk/program", version = "=1.9.6" }

 [lib]
 crate-type = ["lib", "cdylib"]
--- a/programs/bpf/rust/invoke_and_error/Cargo.toml
+++ b/programs/bpf/rust/invoke_and_error/Cargo.toml
@ -1,6 +1,6 @@
 [package]
 name = "solana-bpf-rust-invoke-and-error"
-version = "1.9.5"
+version = "1.9.6"
 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 = "2021"

 [dependencies]
-solana-program = { path = "../../../../sdk/program", version = "=1.9.5" }
+solana-program = { path = "../../../../sdk/program", version = "=1.9.6" }

 [lib]
 crate-type = ["cdylib"]
--- a/programs/bpf/rust/invoke_and_ok/Cargo.toml
+++ b/programs/bpf/rust/invoke_and_ok/Cargo.toml
@ -1,6 +1,6 @@
 [package]
 name = "solana-bpf-rust-invoke-and-ok"
-version = "1.9.5"
+version = "1.9.6"
 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 = "2021"

 [dependencies]
-solana-program = { path = "../../../../sdk/program", version = "=1.9.5" }
+solana-program = { path = "../../../../sdk/program", version = "=1.9.6" }

 [lib]
 crate-type = ["cdylib"]
--- a/programs/bpf/rust/invoke_and_return/Cargo.toml
+++ b/programs/bpf/rust/invoke_and_return/Cargo.toml
@ -1,6 +1,6 @@
 [package]
 name = "solana-bpf-rust-invoke-and-return"
-version = "1.9.5"
+version = "1.9.6"
 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 = "2021"

 [dependencies]
-solana-program = { path = "../../../../sdk/program", version = "=1.9.5" }
+solana-program = { path = "../../../../sdk/program", version = "=1.9.6" }

 [lib]
 crate-type = ["cdylib"]
--- a/programs/bpf/rust/invoked/Cargo.toml
+++ b/programs/bpf/rust/invoked/Cargo.toml
@ -1,6 +1,6 @@
 [package]
 name = "solana-bpf-rust-invoked"
-version = "1.9.5"
+version = "1.9.6"
 description = "Solana BPF test program written in Rust"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@ -14,7 +14,7 @@ default = ["program"]
 program = []

 [dependencies]
-solana-program = { path = "../../../../sdk/program", version = "=1.9.5" }
+solana-program = { path = "../../../../sdk/program", version = "=1.9.6" }

 [lib]
 crate-type = ["lib", "cdylib"]
--- a/programs/bpf/rust/iter/Cargo.toml
+++ b/programs/bpf/rust/iter/Cargo.toml
@ -1,6 +1,6 @@
 [package]
 name = "solana-bpf-rust-iter"
-version = "1.9.5"
+version = "1.9.6"
 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 = "2021"

 [dependencies]
-solana-program = { path = "../../../../sdk/program", version = "=1.9.5" }
+solana-program = { path = "../../../../sdk/program", version = "=1.9.6" }

 [lib]
 crate-type = ["cdylib"]
--- a/programs/bpf/rust/log_data/Cargo.toml
+++ b/programs/bpf/rust/log_data/Cargo.toml
@ -1,6 +1,6 @@
 [package]
 name = "solana-bpf-rust-log-data"
-version = "1.9.5"
+version = "1.9.6"
 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-log-data"
 edition = "2021"

 [dependencies]
-solana-program = { path = "../../../../sdk/program", version = "=1.9.5" }
+solana-program = { path = "../../../../sdk/program", version = "=1.9.6" }

 [features]
 default = ["program"]
--- a/programs/bpf/rust/many_args/Cargo.toml
+++ b/programs/bpf/rust/many_args/Cargo.toml
@ -1,6 +1,6 @@
 [package]
 name = "solana-bpf-rust-many-args"
-version = "1.9.5"
+version = "1.9.6"
 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 = "2021"

 [dependencies]
-solana-program = { path = "../../../../sdk/program", version = "=1.9.5" }
-solana-bpf-rust-many-args-dep = { path = "../many_args_dep", version = "=1.9.5" }
+solana-program = { path = "../../../../sdk/program", version = "=1.9.6" }
+solana-bpf-rust-many-args-dep = { path = "../many_args_dep", version = "=1.9.6" }

 [lib]
 crate-type = ["cdylib"]
--- a/programs/bpf/rust/many_args_dep/Cargo.toml
+++ b/programs/bpf/rust/many_args_dep/Cargo.toml
@ -1,6 +1,6 @@
 [package]
 name = "solana-bpf-rust-many-args-dep"
-version = "1.9.5"
+version = "1.9.6"
 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 = "2021"

 [dependencies]
-solana-program = { path = "../../../../sdk/program", version = "=1.9.5" }
+solana-program = { path = "../../../../sdk/program", version = "=1.9.6" }

 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
--- a/programs/bpf/rust/mem/Cargo.toml
+++ b/programs/bpf/rust/mem/Cargo.toml
@ -1,6 +1,6 @@
 [package]
 name = "solana-bpf-rust-mem"
-version = "1.9.5"
+version = "1.9.6"
 description = "Solana BPF test program written in Rust"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@ -13,12 +13,12 @@ edition = "2021"
 no-entrypoint = []

 [dependencies]
-solana-program = { path = "../../../../sdk/program", version = "=1.9.5" }
+solana-program = { path = "../../../../sdk/program", version = "=1.9.6" }

 [dev-dependencies]
-solana-program-runtime = { path = "../../../../program-runtime", version = "=1.9.5" }
-solana-program-test = { path = "../../../../program-test", version = "=1.9.5" }
-solana-sdk = { path = "../../../../sdk", version = "=1.9.5" }
+solana-program-runtime = { path = "../../../../program-runtime", version = "=1.9.6" }
+solana-program-test = { path = "../../../../program-test", version = "=1.9.6" }
+solana-sdk = { path = "../../../../sdk", version = "=1.9.6" }

 [lib]
 crate-type = ["cdylib", "lib"]
--- a/programs/bpf/rust/membuiltins/Cargo.toml
+++ b/programs/bpf/rust/membuiltins/Cargo.toml
@ -1,6 +1,6 @@
 [package]
 name = "solana-bpf-rust-membuiltins"
-version = "1.9.5"
+version = "1.9.6"
 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 = "2021"

 [dependencies]
-solana-bpf-rust-mem = { path = "../mem", version = "=1.9.5", features = [ "no-entrypoint" ] }
-solana-program = { path = "../../../../sdk/program", version = "=1.9.5" }
+solana-bpf-rust-mem = { path = "../mem", version = "=1.9.6", features = [ "no-entrypoint" ] }
+solana-program = { path = "../../../../sdk/program", version = "=1.9.6" }

 [lib]
 crate-type = ["cdylib"]
--- a/programs/bpf/rust/noop/Cargo.toml
+++ b/programs/bpf/rust/noop/Cargo.toml
@ -1,6 +1,6 @@
 [package]
 name = "solana-bpf-rust-noop"
-version = "1.9.5"
+version = "1.9.6"
 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 = "2021"

 [dependencies]
-solana-program = { path = "../../../../sdk/program", version = "=1.9.5" }
+solana-program = { path = "../../../../sdk/program", version = "=1.9.6" }

 [lib]
 crate-type = ["cdylib"]
--- a/programs/bpf/rust/panic/Cargo.toml
+++ b/programs/bpf/rust/panic/Cargo.toml
@ -1,6 +1,6 @@
 [package]
 name = "solana-bpf-rust-panic"
-version = "1.9.5"
+version = "1.9.6"
 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 = "2021"

 [dependencies]
-solana-program = { path = "../../../../sdk/program", version = "=1.9.5" }
+solana-program = { path = "../../../../sdk/program", version = "=1.9.6" }

 [features]
 default = ["custom-panic"]
--- a/programs/bpf/rust/param_passing/Cargo.toml
+++ b/programs/bpf/rust/param_passing/Cargo.toml
@ -1,6 +1,6 @@
 [package]
 name = "solana-bpf-rust-param-passing"
-version = "1.9.5"
+version = "1.9.6"
 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 = "2021"

 [dependencies]
-solana-program = { path = "../../../../sdk/program", version = "=1.9.5" }
-solana-bpf-rust-param-passing-dep = { path = "../param_passing_dep", version = "=1.9.5" }
+solana-program = { path = "../../../../sdk/program", version = "=1.9.6" }
+solana-bpf-rust-param-passing-dep = { path = "../param_passing_dep", version = "=1.9.6" }

 [lib]
 crate-type = ["cdylib"]
--- a/programs/bpf/rust/param_passing_dep/Cargo.toml
+++ b/programs/bpf/rust/param_passing_dep/Cargo.toml
@ -1,6 +1,6 @@
 [package]
 name = "solana-bpf-rust-param-passing-dep"
-version = "1.9.5"
+version = "1.9.6"
 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 = "2021"

 [dependencies]
-solana-program = { path = "../../../../sdk/program", version = "=1.9.5" }
+solana-program = { path = "../../../../sdk/program", version = "=1.9.6" }

 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
--- a/programs/bpf/rust/rand/Cargo.toml
+++ b/programs/bpf/rust/rand/Cargo.toml
@ -1,6 +1,6 @@
 [package]
 name = "solana-bpf-rust-rand"
-version = "1.9.5"
+version = "1.9.6"
 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 = "2021"
 [dependencies]
 getrandom = { version = "0.1.14", features = ["dummy"] }
 rand = "0.7"
-solana-program = { path = "../../../../sdk/program", version = "=1.9.5" }
+solana-program = { path = "../../../../sdk/program", version = "=1.9.6" }

 [lib]
 crate-type = ["cdylib"]
--- a/programs/bpf/rust/realloc/Cargo.toml
+++ b/programs/bpf/rust/realloc/Cargo.toml
@ -1,6 +1,6 @@
 [package]
 name = "solana-bpf-rust-realloc"
-version = "1.9.5"
+version = "1.9.6"
 description = "Solana BPF test program written in Rust"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@ -14,7 +14,7 @@ default = ["program"]
 program = []

 [dependencies]
-solana-program = { path = "../../../../sdk/program", version = "=1.9.5" }
+solana-program = { path = "../../../../sdk/program", version = "=1.9.6" }

 [lib]
 crate-type = ["lib", "cdylib"]
--- a/programs/bpf/rust/realloc_invoke/Cargo.toml
+++ b/programs/bpf/rust/realloc_invoke/Cargo.toml
@ -1,6 +1,6 @@
 [package]
 name = "solana-bpf-rust-realloc-invoke"
-version = "1.9.5"
+version = "1.9.6"
 description = "Solana BPF test program written in Rust"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@ -14,8 +14,8 @@ default = ["program"]
 program = []

 [dependencies]
-solana-program = { path = "../../../../sdk/program", version = "=1.9.5" }
-solana-bpf-rust-realloc = { path = "../realloc", version = "=1.9.5", default-features = false }
+solana-program = { path = "../../../../sdk/program", version = "=1.9.6" }
+solana-bpf-rust-realloc = { path = "../realloc", version = "=1.9.6", default-features = false }

 [lib]
 crate-type = ["lib", "cdylib"]
--- a/programs/bpf/rust/ro_account_modify/Cargo.toml
+++ b/programs/bpf/rust/ro_account_modify/Cargo.toml
@ -1,6 +1,6 @@
 [package]
 name = "solana-bpf-rust-ro-account_modify"
-version = "1.9.5"
+version = "1.9.6"
 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-ro-modify"
 edition = "2021"

 [dependencies]
-solana-program = { path = "../../../../sdk/program", version = "=1.9.5" }
+solana-program = { path = "../../../../sdk/program", version = "=1.9.6" }

 [lib]
 crate-type = ["cdylib"]
--- a/programs/bpf/rust/ro_modify/Cargo.toml
+++ b/programs/bpf/rust/ro_modify/Cargo.toml
@ -1,6 +1,6 @@
 [package]
 name = "solana-bpf-rust-ro-modify"
-version = "1.9.5"
+version = "1.9.6"
 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-ro-modify"
 edition = "2021"

 [dependencies]
-solana-program = { path = "../../../../sdk/program", version = "=1.9.5" }
+solana-program = { path = "../../../../sdk/program", version = "=1.9.6" }

 [lib]
 crate-type = ["cdylib"]
--- a/programs/bpf/rust/sanity/Cargo.toml
+++ b/programs/bpf/rust/sanity/Cargo.toml
@ -1,6 +1,6 @@
 [package]
 name = "solana-bpf-rust-sanity"
-version = "1.9.5"
+version = "1.9.6"
 description = "Solana BPF test program written in Rust"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@ -13,12 +13,12 @@ edition = "2021"
 test-bpf = []

 [dependencies]
-solana-program = { path = "../../../../sdk/program", version = "=1.9.5" }
+solana-program = { path = "../../../../sdk/program", version = "=1.9.6" }

 [dev-dependencies]
-solana-program-runtime = { path = "../../../../program-runtime", version = "=1.9.5" }
-solana-program-test = { path = "../../../../program-test", version = "=1.9.5" }
-solana-sdk = { path = "../../../../sdk", version = "=1.9.5" }
+solana-program-runtime = { path = "../../../../program-runtime", version = "=1.9.6" }
+solana-program-test = { path = "../../../../program-test", version = "=1.9.6" }
+solana-sdk = { path = "../../../../sdk", version = "=1.9.6" }

 [lib]
 crate-type = ["cdylib", "lib"]
--- a/programs/bpf/rust/secp256k1_recover/Cargo.toml
+++ b/programs/bpf/rust/secp256k1_recover/Cargo.toml
@ -1,6 +1,6 @@
 [package]
 name = "solana-bpf-rust-secp256k1-recover"
-version = "1.9.5"
+version = "1.9.6"
 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-secp256k1-recover"
 edition = "2021"

 [dependencies]
-solana-program = { path = "../../../../sdk/program", version = "=1.9.5" }
+solana-program = { path = "../../../../sdk/program", version = "=1.9.6" }

 [lib]
 crate-type = ["cdylib"]
--- a/programs/bpf/rust/sha/Cargo.toml
+++ b/programs/bpf/rust/sha/Cargo.toml
@ -1,6 +1,6 @@
 [package]
 name = "solana-bpf-rust-sha"
-version = "1.9.5"
+version = "1.9.6"
 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 = "2021"

 [dependencies]
 blake3 = "1.0.0"
-solana-program = { path = "../../../../sdk/program", version = "=1.9.5" }
+solana-program = { path = "../../../../sdk/program", version = "=1.9.6" }

 [lib]
 crate-type = ["cdylib"]
--- a/programs/bpf/rust/spoof1/Cargo.toml
+++ b/programs/bpf/rust/spoof1/Cargo.toml
@ -1,6 +1,6 @@
 [package]
 name = "solana-bpf-rust-spoof1"
-version = "1.9.5"
+version = "1.9.6"
 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-spoof1"
 edition = "2021"

 [dependencies]
-solana-program = { path = "../../../../sdk/program", version = "=1.9.5" }
+solana-program = { path = "../../../../sdk/program", version = "=1.9.6" }

 [lib]
 crate-type = ["cdylib"]
--- a/programs/bpf/rust/spoof1_system/Cargo.toml
+++ b/programs/bpf/rust/spoof1_system/Cargo.toml
@ -1,6 +1,6 @@
 [package]
 name = "solana-bpf-rust-spoof1-system"
-version = "1.9.5"
+version = "1.9.6"
 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-spoof1-system"
 edition = "2021"

 [dependencies]
-solana-program = { path = "../../../../sdk/program", version = "=1.9.5" }
+solana-program = { path = "../../../../sdk/program", version = "=1.9.6" }

 [lib]
 crate-type = ["cdylib"]
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
sakridge	49c78e51e1	Move discard check before generate offsets (#22684 ) (cherry picked from commit `7569f282c6`)	2022-01-24 13:00:19 +00:00
mergify[bot]	fb54991901	Fix typos (#22700 ) Fix typos (cherry picked from commit `fd0f5e4d12`) Co-authored-by: tanliwei <tanliwei@users.noreply.github.com>	2022-01-24 03:23:40 +00:00
mergify[bot]	9995a54be7	fix: flag was incorrect in doc (#22698 ) (cherry picked from commit `714a344937`) Co-authored-by: Arash <arash@backbone.link>	2022-01-23 21:24:58 +00:00
mergify[bot]	d9a5f714e1	Refactor: Rename variables and helper method to `PohRecorder` (#22676 ) (#22688 ) * Refactor: Rename leader_first_tick_height field * Refactor: add `PohRecorder::slot_for_tick_height` helper * Refactor: Add type for poh leader status (cherry picked from commit `1240217a73`) Co-authored-by: Justin Starry <justin@solana.com>	2022-01-23 15:34:44 +08:00
Anatoly Yakovenko	620a80b581	sigverify -- dedupe bloom filter too slow followups	2022-01-21 23:59:41 -07:00
mergify[bot]	b354dae249	Perf: Only check executors cache for executable bpf program ids (backport #22624 ) (#22629 ) * Perf: Only check executors cache for executable bpf program ids (#22624) * Only check executors cache for executable bpf program ids * switch to native loader check * clean up tests * fix tests * clippy (cherry picked from commit `7d34a7acac`) # Conflicts: # runtime/src/bank.rs * resolve conflicts Co-authored-by: Justin Starry <justin@solana.com>	2022-01-22 14:08:15 +08:00
mergify[bot]	af7ed83285	Document transaction module (backport #22440 ) (#22664 ) * Document transaction module (#22440) * Document transaction module * example_mocks is only for feature = full (cherry picked from commit `8dd62854fa`) # Conflicts: # sdk/src/transaction/mod.rs * Fix conflicts Co-authored-by: Brian Anderson <andersrb@gmail.com> Co-authored-by: Tyera Eulberg <tyera@solana.com>	2022-01-21 22:58:44 -07:00
Trent Nelson	8bc4cc90d2	Bump version to 1.9.6	2022-01-21 20:15:43 -07:00