diff --git a/.travis.yml b/.travis.yml
index 04a5221c546ea0..e476388278dc9f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -38,6 +38,7 @@ jobs:
         - readlink -f .
       script:
         - source ci/env.sh
+        - rustup set profile default
         - ci/publish-tarball.sh
       deploy:
         - provider: s3
diff --git a/Cargo.lock b/Cargo.lock
index ef5f624cbb4791..68912493dc6254 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -50,16 +50,22 @@ version = "0.7.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8716408b8bc624ed7f65d223ddb9ac2d044c0547b6fa4b0d554f3a9540496ada"
 dependencies = [
- "memchr 2.3.3",
+ "memchr 2.4.0",
 ]
 
+[[package]]
+name = "aliasable"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "250f629c0161ad8107cf89319e990051fae62832fd343083bea452d93e2205fd"
+
 [[package]]
 name = "ansi_term"
 version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b"
 dependencies = [
- "winapi 0.3.8",
+ "winapi 0.3.9",
 ]
 
 [[package]]
@@ -100,10 +106,11 @@ checksum = "eab1c04a571841102f5345a8fc0f6bb3d31c315dec879b5c6e42e40ce7ffa34e"
 
 [[package]]
 name = "assert_cmd"
-version = "1.0.2"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3dc1679af9a1ab4bea16f228b05d18f8363f8327b1fa8db00d2760cfafc6b61e"
+checksum = "54f002ce7d0c5e809ebb02be78fd503aeed4a511fd0fcaff6e6914cbdabbfa33"
 dependencies = [
+ "bstr",
  "doc-comment",
  "predicates",
  "predicates-core",
@@ -134,7 +141,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a3548b8efc9f8e8a5a0a2808c5bd8451a9031b9e5b879a79590304ae928b0a70"
 dependencies = [
  "proc-macro2 1.0.24",
- "quote 1.0.6",
+ "quote 1.0.9",
  "syn 1.0.60",
 ]
 
@@ -145,7 +152,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8d3a45e77e34375a7923b1e8febb049bb011f064714a8e17a1a616fef01da13d"
 dependencies = [
  "proc-macro2 1.0.24",
- "quote 1.0.6",
+ "quote 1.0.9",
  "syn 1.0.60",
 ]
 
@@ -157,7 +164,7 @@ checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
 dependencies = [
  "hermit-abi",
  "libc",
- "winapi 0.3.8",
+ "winapi 0.3.9",
 ]
 
 [[package]]
@@ -183,7 +190,7 @@ dependencies = [
  "instant",
  "pin-project 1.0.1",
  "rand 0.8.3",
- "tokio 1.1.1",
+ "tokio 1.8.1",
 ]
 
 [[package]]
@@ -251,38 +258,47 @@ checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd"
 
 [[package]]
 name = "bincode"
-version = "1.3.1"
+version = "1.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f30d3a39baa26f9651f17b375061f3233dde33424a8b72b0dbe93a68a0bc896d"
+checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad"
 dependencies = [
- "byteorder",
  "serde",
 ]
 
 [[package]]
 name = "bindgen"
-version = "0.54.0"
+version = "0.57.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "66c0bb6167449588ff70803f4127f0684f9063097eca5016f37eb52b92c2cf36"
+checksum = "fd4865004a46a0aafb2a0a5eb19d3c9fc46ee5f063a6cfc605c69ac9ecf5263d"
 dependencies = [
  "bitflags",
  "cexpr",
- "cfg-if 0.1.10",
  "clang-sys",
- "clap",
- "env_logger 0.7.1",
  "lazy_static",
  "lazycell",
- "log 0.4.11",
  "peeking_take_while",
  "proc-macro2 1.0.24",
- "quote 1.0.6",
+ "quote 1.0.9",
  "regex",
  "rustc-hash",
  "shlex",
- "which",
 ]
 
+[[package]]
+name = "bit-set"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6e11e16035ea35e4e5997b393eacbf6f63983188f7a2ad25bfb13465f5ad59de"
+dependencies = [
+ "bit-vec",
+]
+
+[[package]]
+name = "bit-vec"
+version = "0.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb"
+
 [[package]]
 name = "bitflags"
 version = "1.2.1"
@@ -354,9 +370,9 @@ checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae"
 
 [[package]]
 name = "borsh"
-version = "0.8.1"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5a26c53ddf60281f18e7a29b20db7ba3db82a9d81b9650bfaa02d646f50d364"
+checksum = "4fcabb02816fdadf90866dc9a7824491ccb63d69f55375a266dc03509ac68d36"
 dependencies = [
  "borsh-derive",
  "hashbrown 0.9.1",
@@ -364,9 +380,9 @@ dependencies = [
 
 [[package]]
 name = "borsh-derive"
-version = "0.8.1"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b637a47728b78a78cd7f4b85bf06d71ef4221840e059a38f048be2422bf673b2"
+checksum = "4bd16f0729b89f0a212b0e2e1d19cc6593df63f771161a11863967780e2d033d"
 dependencies = [
  "borsh-derive-internal",
  "borsh-schema-derive-internal",
@@ -377,23 +393,23 @@ dependencies = [
 
 [[package]]
 name = "borsh-derive-internal"
-version = "0.8.1"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d813fa25eb0bed78c36492cff4415f38c760d6de833d255ba9095bd8ebb7d725"
+checksum = "1e321a130a3ac4b88eb59a6d670bde11eec9721a397b77e0f2079060e2a1b785"
 dependencies = [
  "proc-macro2 1.0.24",
- "quote 1.0.6",
+ "quote 1.0.9",
  "syn 1.0.60",
 ]
 
 [[package]]
 name = "borsh-schema-derive-internal"
-version = "0.8.1"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcf78ee4a98c8cb9eba1bac3d3e2a1ea3d7673c719ce691e67b5cbafc472d3b7"
+checksum = "15151a485164b319cc7a5160fe4316dc469a27993f71b73d7617dc9032ff0fd7"
 dependencies = [
  "proc-macro2 1.0.24",
- "quote 1.0.6",
+ "quote 1.0.9",
  "syn 1.0.60",
 ]
 
@@ -405,12 +421,12 @@ checksum = "476e9cd489f9e121e02ffa6014a8ef220ecb15c05ed23fc34cca13925dc283fb"
 
 [[package]]
 name = "bstr"
-version = "0.2.13"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31accafdb70df7871592c058eca3985b71104e15ac32f64706022c58867da931"
+checksum = "90682c8d613ad3373e66de8c6411e0ae2ab2571e879d2efbf73558cc66f21279"
 dependencies = [
  "lazy_static",
- "memchr 2.3.3",
+ "memchr 2.4.0",
  "regex-automata",
  "serde",
 ]
@@ -569,27 +585,27 @@ dependencies = [
  "num-traits",
  "serde",
  "time 0.1.43",
- "winapi 0.3.8",
+ "winapi 0.3.9",
 ]
 
 [[package]]
 name = "chrono-humanize"
-version = "0.1.1"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0a4c32145b4db85fe1c4f2b125a4f9493769df424f5f84baf6b04ea8eaf33c9"
+checksum = "2eddc119501d583fd930cb92144e605f44e0252c38dd89d9247fffa1993375cb"
 dependencies = [
  "chrono",
 ]
 
 [[package]]
 name = "clang-sys"
-version = "0.29.3"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe6837df1d5cba2397b835c8530f51723267e16abbf83892e9e5af4f0e5dd10a"
+checksum = "853eda514c284c2287f4bf20ae614f8781f40a81d32ecda6e91449304dfe077c"
 dependencies = [
  "glob",
  "libc",
- "libloading 0.5.2",
+ "libloading 0.7.0",
 ]
 
 [[package]]
@@ -634,7 +650,7 @@ dependencies = [
  "ascii",
  "byteorder",
  "either",
- "memchr 2.3.3",
+ "memchr 2.4.0",
  "unreachable",
 ]
 
@@ -651,16 +667,51 @@ dependencies = [
  "terminal_size",
  "termios",
  "unicode-width",
- "winapi 0.3.8",
+ "winapi 0.3.9",
  "winapi-util",
 ]
 
+[[package]]
+name = "console"
+version = "0.14.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3993e6445baa160675931ec041a5e03ca84b9c6e32a056150d3aa2bdda0a1f45"
+dependencies = [
+ "encode_unicode",
+ "lazy_static",
+ "libc",
+ "regex",
+ "terminal_size",
+ "unicode-width",
+ "winapi 0.3.9",
+]
+
 [[package]]
 name = "const_fn"
 version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "28b9d6de7f49e22cf97ad17fc4036ece69300032f45f78f30b4a4482cdc3f4a6"
 
+[[package]]
+name = "const_format"
+version = "0.2.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c75ea7d6aeb2ebd1ee24f7b7e1b23242ef5a56b3a693733b99bfbe5ef31d0306"
+dependencies = [
+ "const_format_proc_macros",
+]
+
+[[package]]
+name = "const_format_proc_macros"
+version = "0.2.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "29c36c619c422113552db4eb28cddba8faa757e33f758cc3415bd2885977b591"
+dependencies = [
+ "proc-macro2 1.0.24",
+ "quote 1.0.9",
+ "unicode-xid 0.2.0",
+]
+
 [[package]]
 name = "constant_time_eq"
 version = "0.1.5"
@@ -745,9 +796,9 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-deque"
-version = "0.7.3"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f02af974daeee82218205558e51ec8768b48cf524bd01d550abe5573a608285"
+checksum = "c20ff29ded3204c5106278a81a38f4b482636ed4fa1e6cfbeef193291beb29ed"
 dependencies = [
  "crossbeam-epoch 0.8.2",
  "crossbeam-utils 0.7.2",
@@ -756,9 +807,9 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-deque"
-version = "0.8.0"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94af6efb46fef72616855b036a624cf27ba656ffc9be1b9a3c931cfc7749a9a9"
+checksum = "6455c0ca19f0d2fbf751b908d5c55c1f5cbc65e03c4225427254b46890bdde1e"
 dependencies = [
  "cfg-if 1.0.0",
  "crossbeam-epoch 0.9.1",
@@ -892,7 +943,7 @@ version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2b2466559f260f48ad25fe6317b3c8dac77b5bdb5763ac7d9d6103530663bc90"
 dependencies = [
- "memchr 2.3.3",
+ "memchr 2.4.0",
 ]
 
 [[package]]
@@ -902,7 +953,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "54dedab740bc412d514cfbc4a1d9d5d16fed02c4b14a7be129003c07fdc33b9b"
 dependencies = [
  "nix 0.17.0",
- "winapi 0.3.8",
+ "winapi 0.3.9",
 ]
 
 [[package]]
@@ -958,7 +1009,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cb582b60359da160a9477ee80f15c8d784c477e69c217ef2cdd4169c24ea380f"
 dependencies = [
  "proc-macro2 1.0.24",
- "quote 1.0.6",
+ "quote 1.0.9",
  "syn 1.0.60",
 ]
 
@@ -969,7 +1020,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "41cb0e6161ad61ed084a36ba71fbba9e3ac5aee3606fb607fe08da6acbcf3d8c"
 dependencies = [
  "proc-macro2 1.0.24",
- "quote 1.0.6",
+ "quote 1.0.9",
  "syn 1.0.60",
 ]
 
@@ -979,16 +1030,16 @@ version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f4aa86af7b19b40ef9cbef761ed411a49f0afa06b7b6dcd3dfe2f96a3c546138"
 dependencies = [
- "console",
+ "console 0.11.3",
  "lazy_static",
  "tempfile",
 ]
 
 [[package]]
-name = "difference"
-version = "2.0.0"
+name = "difflib"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "524cbf6897b527295dff137cec09ecf3a05f4fddffd7dfcd1585403449e74198"
+checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8"
 
 [[package]]
 name = "digest"
@@ -1035,7 +1086,7 @@ checksum = "99de365f605554ae33f115102a02057d4fc18b01f3284d6870be0938743cfe7d"
 dependencies = [
  "libc",
  "redox_users",
- "winapi 0.3.8",
+ "winapi 0.3.9",
 ]
 
 [[package]]
@@ -1053,7 +1104,7 @@ dependencies = [
  "dlopen_derive",
  "lazy_static",
  "libc",
- "winapi 0.3.8",
+ "winapi 0.3.9",
 ]
 
 [[package]]
@@ -1125,7 +1176,7 @@ checksum = "7260c7e6e656fc7702a1aa8d5b498a1a69aa84ac4ffcd5501b7d26939f368a93"
 dependencies = [
  "enum-ordinalize",
  "proc-macro2 1.0.24",
- "quote 1.0.6",
+ "quote 1.0.9",
  "syn 1.0.60",
 ]
 
@@ -1166,7 +1217,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1e94aa31f7c0dc764f57896dc615ddd76fc13b0d5dca7eb6cc5e018a5a09ec06"
 dependencies = [
  "proc-macro2 1.0.24",
- "quote 1.0.6",
+ "quote 1.0.9",
  "syn 1.0.60",
 ]
 
@@ -1179,23 +1230,10 @@ dependencies = [
  "num-bigint",
  "num-traits",
  "proc-macro2 1.0.24",
- "quote 1.0.6",
+ "quote 1.0.9",
  "syn 1.0.60",
 ]
 
-[[package]]
-name = "env_logger"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36"
-dependencies = [
- "atty",
- "humantime 1.3.0",
- "log 0.4.11",
- "regex",
- "termcolor",
-]
-
 [[package]]
 name = "env_logger"
 version = "0.8.3"
@@ -1203,7 +1241,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "17392a012ea30ef05a610aa97dfb49496e71c9f676b27879922ea5bdf60d9d3f"
 dependencies = [
  "atty",
- "humantime 2.0.1",
+ "humantime",
  "log 0.4.11",
  "regex",
  "termcolor",
@@ -1226,7 +1264,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4"
 dependencies = [
  "proc-macro2 1.0.24",
- "quote 1.0.6",
+ "quote 1.0.9",
  "syn 1.0.60",
  "synstructure",
 ]
@@ -1253,7 +1291,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0010f02effd88c702318c5dde0463206be67495d0b4d906ba7c0a8f166cc7f06"
 dependencies = [
  "libc",
- "winapi 0.3.8",
+ "winapi 0.3.9",
 ]
 
 [[package]]
@@ -1262,6 +1300,17 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "835a3dc7d1ec9e75e2b5fb4ba75396837112d2060b03f7d43bc1897c7f7211da"
 
+[[package]]
+name = "filedescriptor"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a71e83755e51aa52b9034f1986173783789e8e7d79c3c774adbbb63fb554f2cb"
+dependencies = [
+ "libc",
+ "thiserror",
+ "winapi 0.3.9",
+]
+
 [[package]]
 name = "filetime"
 version = "0.2.10"
@@ -1271,9 +1320,15 @@ dependencies = [
  "cfg-if 0.1.10",
  "libc",
  "redox_syscall",
- "winapi 0.3.8",
+ "winapi 0.3.9",
 ]
 
+[[package]]
+name = "fixedbitset"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "37ab347416e802de484e4d03c7316c48f1ecb56574dfd4a46a80f173ce1de04d"
+
 [[package]]
 name = "flate2"
 version = "1.0.14"
@@ -1408,7 +1463,7 @@ checksum = "77408a692f1f97bcc61dc001d752e00643408fbc922e4d634c655df50d595556"
 dependencies = [
  "proc-macro-hack",
  "proc-macro2 1.0.24",
- "quote 1.0.6",
+ "quote 1.0.9",
  "syn 1.0.60",
 ]
 
@@ -1440,7 +1495,7 @@ dependencies = [
  "futures-macro",
  "futures-sink",
  "futures-task",
- "memchr 2.3.3",
+ "memchr 2.4.0",
  "pin-project 1.0.1",
  "pin-utils",
  "proc-macro-hack",
@@ -1450,11 +1505,11 @@ dependencies = [
 
 [[package]]
 name = "gag"
-version = "0.1.10"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8cc0b9f53275dc5fada808f1d2f82e3688a6c14d735633d1590b7be8eb2307b5"
+checksum = "a713bee13966e9fbffdf7193af71d54a6b35a0bb34997cd6c9519ebeb5005972"
 dependencies = [
- "libc",
+ "filedescriptor",
  "tempfile",
 ]
 
@@ -1485,7 +1540,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e692e296bfac1d2533ef168d0b60ff5897b8b70a4009276834014dd8924cc028"
 dependencies = [
  "libc",
- "winapi 0.3.8",
+ "winapi 0.3.9",
 ]
 
 [[package]]
@@ -1551,7 +1606,7 @@ dependencies = [
  "simpl",
  "smpl_jwt",
  "time 0.2.25",
- "tokio 1.1.1",
+ "tokio 1.8.1",
 ]
 
 [[package]]
@@ -1586,9 +1641,9 @@ dependencies = [
 
 [[package]]
 name = "h2"
-version = "0.3.0"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b67e66362108efccd8ac053abafc8b7a8d86a37e6e48fc4f6f7485eb5e9e6a5"
+checksum = "825343c4eef0b63f541f8903f395dc5beb362a979b5799a84062527ef1e37726"
 dependencies = [
  "bytes 1.0.1",
  "fnv",
@@ -1598,10 +1653,9 @@ dependencies = [
  "http",
  "indexmap",
  "slab",
- "tokio 1.1.1",
+ "tokio 1.8.1",
  "tokio-util 0.6.3",
  "tracing",
- "tracing-futures",
 ]
 
 [[package]]
@@ -1621,20 +1675,26 @@ dependencies = [
 
 [[package]]
 name = "hashbrown"
-version = "0.8.2"
+version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e91b62f79061a0bc2e046024cb7ba44b08419ed238ecbd9adbd787434b9e8c25"
+checksum = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04"
 dependencies = [
- "autocfg 1.0.0",
+ "ahash 0.4.6",
 ]
 
 [[package]]
 name = "hashbrown"
-version = "0.9.1"
+version = "0.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04"
+checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e"
+
+[[package]]
+name = "heck"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c"
 dependencies = [
- "ahash 0.4.6",
+ "unicode-segmentation",
 ]
 
 [[package]]
@@ -1711,13 +1771,13 @@ dependencies = [
 
 [[package]]
 name = "hmac-drbg"
-version = "0.2.0"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6e570451493f10f6581b48cdd530413b63ea9e780f544bfd3bdcaa0d89d1a7b"
+checksum = "17ea0a1394df5b6574da6e0c1ade9e78868c9fb0a4e5ef4428e32da4676b85b1"
 dependencies = [
- "digest 0.8.1",
- "generic-array 0.12.3",
- "hmac 0.7.1",
+ "digest 0.9.0",
+ "generic-array 0.14.3",
+ "hmac 0.8.1",
 ]
 
 [[package]]
@@ -1743,19 +1803,20 @@ dependencies = [
 
 [[package]]
 name = "http-body"
-version = "0.4.0"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2861bd27ee074e5ee891e8b539837a9430012e249d7f0ca2d795650f579c1994"
+checksum = "60daa14be0e0786db0f03a9e57cb404c9d756eed2b6c62b9ea98ec5743ec75a9"
 dependencies = [
  "bytes 1.0.1",
  "http",
+ "pin-project-lite 0.2.7",
 ]
 
 [[package]]
 name = "httparse"
-version = "1.3.4"
+version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd179ae861f0c2e53da70d892f5f3029f9594be0c41dc5269cd371691b1dc2f9"
+checksum = "f3a87b616e37e93c22fb19bcd386f02f3af5ea98a25670ad0fce773de23c5e68"
 
 [[package]]
 name = "httpdate"
@@ -1764,13 +1825,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "494b4d60369511e7dea41cf646832512a94e542f68bb9c49e54518e0f468eb47"
 
 [[package]]
-name = "humantime"
-version = "1.3.0"
+name = "httpdate"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f"
-dependencies = [
- "quick-error",
-]
+checksum = "6456b8a6c8f33fee7d958fcd1b60d55b11940a79e63ae87013e6d22e26034440"
 
 [[package]]
 name = "humantime"
@@ -1811,10 +1869,10 @@ dependencies = [
  "http",
  "http-body 0.3.1",
  "httparse",
- "httpdate",
+ "httpdate 0.3.2",
  "itoa",
  "pin-project 1.0.1",
- "socket2",
+ "socket2 0.3.17",
  "tokio 0.2.22",
  "tower-service",
  "tracing",
@@ -1823,23 +1881,23 @@ dependencies = [
 
 [[package]]
 name = "hyper"
-version = "0.14.3"
+version = "0.14.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ee5fc98172988e4394a3094002a75125e8fb864a88318732e8b613ec5adbda3"
+checksum = "0b61cf2d1aebcf6e6352c97b81dc2244ca29194be1b276f5d8ad5c6330fffb11"
 dependencies = [
  "bytes 1.0.1",
  "futures-channel",
  "futures-core",
  "futures-util",
- "h2 0.3.0",
+ "h2 0.3.3",
  "http",
- "http-body 0.4.0",
+ "http-body 0.4.2",
  "httparse",
- "httpdate",
+ "httpdate 1.0.1",
  "itoa",
- "pin-project-lite 0.2.4",
- "socket2",
- "tokio 1.1.1",
+ "pin-project-lite 0.2.7",
+ "socket2 0.4.1",
+ "tokio 1.8.1",
  "tower-service",
  "tracing",
  "want",
@@ -1852,14 +1910,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5f9f7a97316d44c0af9b0301e65010573a853a9fc97046d7331d7f6bc0fd5a64"
 dependencies = [
  "futures-util",
- "hyper 0.14.3",
+ "hyper 0.14.11",
  "log 0.4.11",
  "rustls",
- "tokio 1.1.1",
+ "tokio 1.8.1",
  "tokio-rustls",
  "webpki",
 ]
 
+[[package]]
+name = "hyper-timeout"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1"
+dependencies = [
+ "hyper 0.14.11",
+ "pin-project-lite 0.2.7",
+ "tokio 1.8.1",
+ "tokio-io-timeout",
+]
+
 [[package]]
 name = "hyper-tls"
 version = "0.5.0"
@@ -1867,9 +1937,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905"
 dependencies = [
  "bytes 1.0.1",
- "hyper 0.14.3",
+ "hyper 0.14.11",
  "native-tls",
- "tokio 1.1.1",
+ "tokio 1.8.1",
  "tokio-native-tls",
 ]
 
@@ -1909,12 +1979,12 @@ checksum = "d480125acf340d6a6e59dab69ae19d6fca3a906e1eade277671272cc8f73794b"
 
 [[package]]
 name = "indexmap"
-version = "1.5.1"
+version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86b45e59b16c76b11bf9738fd5d38879d3bd28ad292d7b313608becb17ae2df9"
+checksum = "bc633605454125dec4b66843673f01c7df2b89479b32e0ed634e43a91cff62a5"
 dependencies = [
  "autocfg 1.0.0",
- "hashbrown 0.8.2",
+ "hashbrown 0.11.2",
  "rayon",
 ]
 
@@ -1924,7 +1994,7 @@ version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7baab56125e25686df467fe470785512329883aab42696d661247aca2a2896e4"
 dependencies = [
- "console",
+ "console 0.14.1",
  "lazy_static",
  "number_prefix",
  "regex",
@@ -1969,6 +2039,15 @@ dependencies = [
  "either",
 ]
 
+[[package]]
+name = "itertools"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "69ddb889f9d0d08a67338271fa9b62996bc788c7796a5c18cf057420aaed5eaf"
+dependencies = [
+ "either",
+]
+
 [[package]]
 name = "itoa"
 version = "0.4.5"
@@ -1995,9 +2074,9 @@ dependencies = [
 
 [[package]]
 name = "jsonrpc-client-transports"
-version = "17.0.0"
+version = "17.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15b6c6ad01c7354d60de493148c30ac8a82b759e22ae678c8705e9b8e0c566a4"
+checksum = "a2f81014e2706fde057e9dcb1036cf6bbf9418d972c597be5c7158c984656722"
 dependencies = [
  "derive_more",
  "futures 0.3.8",
@@ -2015,11 +2094,13 @@ dependencies = [
 
 [[package]]
 name = "jsonrpc-core"
-version = "17.0.0"
+version = "17.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07569945133257ff557eb37b015497104cea61a2c9edaf126c1cbd6e8332397f"
+checksum = "d4467ab6dfa369b69e52bd0692e480c4d117410538526a57a304a0f2250fd95e"
 dependencies = [
  "futures 0.3.8",
+ "futures-executor",
+ "futures-util",
  "log 0.4.11",
  "serde",
  "serde_derive",
@@ -2028,9 +2109,9 @@ dependencies = [
 
 [[package]]
 name = "jsonrpc-core-client"
-version = "17.0.0"
+version = "17.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ac9d56dc729912796637c30f475bbf834594607b27740dfea6e5fa7ba40d1f1"
+checksum = "5c366c092d6bccc6e7ab44dd635a0f22ab2f201215339915fb7ff9508404f431"
 dependencies = [
  "futures 0.3.8",
  "jsonrpc-client-transports",
@@ -2038,21 +2119,21 @@ dependencies = [
 
 [[package]]
 name = "jsonrpc-derive"
-version = "17.0.0"
+version = "17.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b68ba7e76e5c7796cfa4d2a30e83986550c34404c6d40551c902ca6f7bd4a137"
+checksum = "34f6326966ebac440db89eba788f5a0e5ac2614b4b4bfbdc049a971e71040f32"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2 1.0.24",
- "quote 1.0.6",
+ "quote 1.0.9",
  "syn 1.0.60",
 ]
 
 [[package]]
 name = "jsonrpc-http-server"
-version = "17.0.0"
+version = "17.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eff2303c4f0562afcbd2dae75e3e21815095f8994749a80fbcd365877e44ed64"
+checksum = "522a047cac0958097ee71d047dd71cb84979fd2fa21c7a68fbe12736bef870a2"
 dependencies = [
  "futures 0.3.8",
  "hyper 0.13.10",
@@ -2066,9 +2147,9 @@ dependencies = [
 
 [[package]]
 name = "jsonrpc-ipc-server"
-version = "17.0.1"
+version = "17.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14c4cd89e5ea7e7f0884e828fc35bb83591a371b92439675eae28efa66c24a97"
+checksum = "0b1d782052ef17051d12681bcc2fa2e9e1aabf3f634588125493d63ddcca6fe1"
 dependencies = [
  "futures 0.3.8",
  "jsonrpc-core",
@@ -2081,9 +2162,9 @@ dependencies = [
 
 [[package]]
 name = "jsonrpc-pubsub"
-version = "17.0.0"
+version = "17.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c48dbebce7a9c88ab272a4db7d6478aa4c6d9596e6c086366e89efc4e9ed89e"
+checksum = "14739e5523a40739882cc34a44ab2dd9356bce5ce102513f5984a9efbe342f3d"
 dependencies = [
  "futures 0.3.8",
  "jsonrpc-core",
@@ -2096,9 +2177,9 @@ dependencies = [
 
 [[package]]
 name = "jsonrpc-server-utils"
-version = "17.0.0"
+version = "17.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4207cce738bf713a82525065b750a008f28351324f438f56b33d698ada95bb4"
+checksum = "bce68fa279a2822b3619369cd024f8a4f8e5ce485468834f8679a3c7919aae2d"
 dependencies = [
  "bytes 0.5.4",
  "futures 0.3.8",
@@ -2113,9 +2194,9 @@ dependencies = [
 
 [[package]]
 name = "jsonrpc-ws-server"
-version = "17.0.0"
+version = "17.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "abe06e1385e4a912711703123ba44f735627d666f87e5fec764ad1338ec617dc"
+checksum = "b1d267a8649ec37e4452dd7b3f48827c9cdf36de3a3539cf73242c222ba2eb50"
 dependencies = [
  "futures 0.3.8",
  "jsonrpc-core",
@@ -2165,34 +2246,34 @@ checksum = "b294d6fa9ee409a054354afc4352b0b9ef7ca222c69b8812cbea9e7d2bf3783f"
 
 [[package]]
 name = "libc"
-version = "0.2.81"
+version = "0.2.98"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1482821306169ec4d07f6aca392a4681f66c75c9918aa49641a2595db64053cb"
+checksum = "320cfe77175da3a483efed4bc0adc1968ca050b098ce4f2f1c13a56626128790"
 
 [[package]]
 name = "libloading"
-version = "0.5.2"
+version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2b111a074963af1d37a139918ac6d49ad1d0d5e47f72fd55388619691a7d753"
+checksum = "2cadb8e769f070c45df05c78c7520eb4cd17061d4ab262e43cfc68b4d00ac71c"
 dependencies = [
- "cc",
- "winapi 0.3.8",
+ "winapi 0.3.9",
 ]
 
 [[package]]
 name = "libloading"
-version = "0.6.2"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2cadb8e769f070c45df05c78c7520eb4cd17061d4ab262e43cfc68b4d00ac71c"
+checksum = "6f84d96438c15fcd6c3f244c8fce01d1e2b9c6b5623e9c711dc9286d8fc92d6a"
 dependencies = [
- "winapi 0.3.8",
+ "cfg-if 1.0.0",
+ "winapi 0.3.9",
 ]
 
 [[package]]
 name = "librocksdb-sys"
-version = "6.11.4"
+version = "6.17.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb5b56f651c204634b936be2f92dbb42c36867e00ff7fe2405591f3b9fa66f09"
+checksum = "5da125e1c0f22c7cae785982115523a0738728498547f415c9054cb17c7e89f9"
 dependencies = [
  "bindgen",
  "cc",
@@ -2202,20 +2283,52 @@ dependencies = [
 
 [[package]]
 name = "libsecp256k1"
-version = "0.3.5"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fc1e2c808481a63dc6da2074752fdd4336a3c8fcc68b83db6f1fd5224ae7962"
+checksum = "bd1137239ab33b41aa9637a88a28249e5e70c40a42ccc92db7f12cc356c1fcd7"
 dependencies = [
  "arrayref",
- "crunchy",
- "digest 0.8.1",
+ "base64 0.12.3",
+ "digest 0.9.0",
  "hmac-drbg",
+ "libsecp256k1-core",
+ "libsecp256k1-gen-ecmult",
+ "libsecp256k1-gen-genmult",
  "rand 0.7.3",
- "sha2 0.8.2",
- "subtle 2.2.2",
+ "serde",
+ "sha2 0.9.2",
  "typenum",
 ]
 
+[[package]]
+name = "libsecp256k1-core"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ee11012b293ea30093c129173cac4335513064094619f4639a25b310fd33c11"
+dependencies = [
+ "crunchy",
+ "digest 0.9.0",
+ "subtle 2.2.2",
+]
+
+[[package]]
+name = "libsecp256k1-gen-ecmult"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32239626ffbb6a095b83b37a02ceb3672b2443a87a000a884fc3c4d16925c9c0"
+dependencies = [
+ "libsecp256k1-core",
+]
+
+[[package]]
+name = "libsecp256k1-gen-genmult"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "76acb433e21d10f5f9892b1962c2856c58c7f39a9e4bd68ac82b9436a0ffd5b9"
+dependencies = [
+ "libsecp256k1-core",
+]
+
 [[package]]
 name = "linked-hash-map"
 version = "0.5.3"
@@ -2290,9 +2403,9 @@ dependencies = [
 
 [[package]]
 name = "memchr"
-version = "2.3.3"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400"
+checksum = "b16bd47d9e329435e309c58469fe0791c2d0d1ba96ec0954152a5ae2b04387dc"
 
 [[package]]
 name = "memmap2"
@@ -2374,7 +2487,7 @@ dependencies = [
  "log 0.4.11",
  "miow 0.3.6",
  "ntapi",
- "winapi 0.3.8",
+ "winapi 0.3.9",
 ]
 
 [[package]]
@@ -2398,7 +2511,7 @@ dependencies = [
  "log 0.4.11",
  "mio 0.6.22",
  "miow 0.3.6",
- "winapi 0.3.8",
+ "winapi 0.3.9",
 ]
 
 [[package]]
@@ -2430,10 +2543,16 @@ version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5a33c1b55807fbed163481b5ba66db4b2fa6cde694a5027be10fb724206c5897"
 dependencies = [
- "socket2",
- "winapi 0.3.8",
+ "socket2 0.3.17",
+ "winapi 0.3.9",
 ]
 
+[[package]]
+name = "multimap"
+version = "0.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a"
+
 [[package]]
 name = "native-tls"
 version = "0.2.7"
@@ -2460,7 +2579,7 @@ checksum = "391630d12b68002ae1e25e8f974306474966550ad82dac6886fb8910c19568ae"
 dependencies = [
  "cfg-if 0.1.10",
  "libc",
- "winapi 0.3.8",
+ "winapi 0.3.9",
 ]
 
 [[package]]
@@ -2503,7 +2622,7 @@ version = "5.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0b471253da97532da4b61552249c521e01e736071f71c1a4f7ebbfbf0a06aad6"
 dependencies = [
- "memchr 2.3.3",
+ "memchr 2.4.0",
  "version_check 0.9.2",
 ]
 
@@ -2513,7 +2632,7 @@ version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7a31937dea023539c72ddae0e3571deadc1414b300483fa7aaec176168cfa9d2"
 dependencies = [
- "winapi 0.3.8",
+ "winapi 0.3.9",
 ]
 
 [[package]]
@@ -2534,7 +2653,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6f09b9841adb6b5e1f89ef7087ea636e0fd94b2851f887c1e3eb5d5f8228fab3"
 dependencies = [
  "proc-macro2 1.0.24",
- "quote 1.0.6",
+ "quote 1.0.9",
  "syn 1.0.60",
 ]
 
@@ -2585,7 +2704,7 @@ checksum = "1c0fd9eba1d5db0994a239e09c1be402d35622277e35468ba891aa5e3188ce7e"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2 1.0.24",
- "quote 1.0.6",
+ "quote 1.0.9",
  "syn 1.0.60",
 ]
 
@@ -2657,23 +2776,25 @@ dependencies = [
 
 [[package]]
 name = "ouroboros"
-version = "0.5.1"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc04551635026d3ac7bc646698ea1836a85ed2a26b7094fe1d15d8b14854c4a2"
+checksum = "f0e3827c8742f21283e9374adf7905984e7b85731ad94a203137b56955d818b3"
 dependencies = [
+ "aliasable",
  "ouroboros_macro",
  "stable_deref_trait",
 ]
 
 [[package]]
 name = "ouroboros_macro"
-version = "0.5.1"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cec33dfceabec83cd0e95a5ce9d20e76ab3a5cbfef59659b8c927f69b93ed8ae"
+checksum = "1ef06077e08eac7e2aeaacfbd113a25fcb1b9b903437bd89d2bd513da6e04112"
 dependencies = [
  "Inflector",
+ "proc-macro-error",
  "proc-macro2 1.0.24",
- "quote 1.0.6",
+ "quote 1.0.9",
  "syn 1.0.60",
 ]
 
@@ -2690,7 +2811,7 @@ dependencies = [
  "miow 0.3.6",
  "rand 0.7.3",
  "tokio 0.2.22",
- "winapi 0.3.8",
+ "winapi 0.3.9",
 ]
 
 [[package]]
@@ -2755,7 +2876,7 @@ dependencies = [
  "redox_syscall",
  "rustc_version",
  "smallvec 0.6.14",
- "winapi 0.3.8",
+ "winapi 0.3.9",
 ]
 
 [[package]]
@@ -2769,7 +2890,7 @@ dependencies = [
  "libc",
  "redox_syscall",
  "smallvec 1.6.1",
- "winapi 0.3.8",
+ "winapi 0.3.9",
 ]
 
 [[package]]
@@ -2784,7 +2905,7 @@ dependencies = [
  "libc",
  "redox_syscall",
  "smallvec 1.6.1",
- "winapi 0.3.8",
+ "winapi 0.3.9",
 ]
 
 [[package]]
@@ -2842,6 +2963,16 @@ dependencies = [
  "ucd-trie",
 ]
 
+[[package]]
+name = "petgraph"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "467d164a6de56270bd7c4d070df81d07beace25012d5103ced4e9ff08d6afdb7"
+dependencies = [
+ "fixedbitset",
+ "indexmap",
+]
+
 [[package]]
 name = "pickledb"
 version = "0.4.1"
@@ -2880,7 +3011,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2c0e815c3ee9a031fdf5af21c10aa17c573c9c6a566328d99e3936c34e36461f"
 dependencies = [
  "proc-macro2 1.0.24",
- "quote 1.0.6",
+ "quote 1.0.9",
  "syn 1.0.60",
 ]
 
@@ -2891,7 +3022,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "81a4ffa594b66bff340084d4081df649a7dc049ac8d7fc458d8e628bfbbb2f86"
 dependencies = [
  "proc-macro2 1.0.24",
- "quote 1.0.6",
+ "quote 1.0.9",
  "syn 1.0.60",
 ]
 
@@ -2903,9 +3034,9 @@ checksum = "f7505eeebd78492e0f6108f7171c4948dbb120ee8119d9d77d0afa5469bef67f"
 
 [[package]]
 name = "pin-project-lite"
-version = "0.2.4"
+version = "0.2.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "439697af366c49a6d0a010c56a0d97685bc140ce0d377b13a2ea2aa42d64a827"
+checksum = "8d31d11c69a6b52a174b42bdc0c30e5e11670f90788b2c471c31c1d17d449443"
 
 [[package]]
 name = "pin-utils"
@@ -2933,11 +3064,12 @@ checksum = "237a5ed80e274dbc66f86bd59c1e25edc039660be53194b5fe0a482e0f2612ea"
 
 [[package]]
 name = "predicates"
-version = "1.0.4"
+version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "347a1b6f0b21e636bc9872fb60b83b8e185f6f5516298b8238699f7f9a531030"
+checksum = "bc3d91237f5de3bcd9d927e24d03b495adb6135097b001cea7403e2d573d00a9"
 dependencies = [
- "difference",
+ "difflib",
+ "itertools 0.10.1",
  "predicates-core",
 ]
 
@@ -2972,6 +3104,30 @@ dependencies = [
  "toml",
 ]
 
+[[package]]
+name = "proc-macro-error"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
+dependencies = [
+ "proc-macro-error-attr",
+ "proc-macro2 1.0.24",
+ "quote 1.0.9",
+ "syn 1.0.60",
+ "version_check 0.9.2",
+]
+
+[[package]]
+name = "proc-macro-error-attr"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
+dependencies = [
+ "proc-macro2 1.0.24",
+ "quote 1.0.9",
+ "version_check 0.9.2",
+]
+
 [[package]]
 name = "proc-macro-hack"
 version = "0.5.19"
@@ -3002,34 +3158,72 @@ dependencies = [
  "unicode-xid 0.2.0",
 ]
 
+[[package]]
+name = "proptest"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e0d9cc07f18492d879586c92b485def06bc850da3118075cd45d50e9c95b0e5"
+dependencies = [
+ "bit-set",
+ "bitflags",
+ "byteorder",
+ "lazy_static",
+ "num-traits",
+ "quick-error 2.0.1",
+ "rand 0.8.3",
+ "rand_chacha 0.3.0",
+ "rand_xorshift 0.3.0",
+ "regex-syntax",
+ "rusty-fork",
+ "tempfile",
+]
+
 [[package]]
 name = "prost"
-version = "0.7.0"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e6984d2f1a23009bd270b8bb56d0926810a3d483f59c987d77969e9d8e840b2"
+checksum = "de5e2533f59d08fcf364fd374ebda0692a70bd6d7e66ef97f306f45c6c5d8020"
 dependencies = [
  "bytes 1.0.1",
  "prost-derive",
 ]
 
+[[package]]
+name = "prost-build"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "355f634b43cdd80724ee7848f95770e7e70eefa6dcf14fea676216573b8fd603"
+dependencies = [
+ "bytes 1.0.1",
+ "heck",
+ "itertools 0.10.1",
+ "log 0.4.11",
+ "multimap",
+ "petgraph",
+ "prost",
+ "prost-types",
+ "tempfile",
+ "which",
+]
+
 [[package]]
 name = "prost-derive"
-version = "0.7.0"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "169a15f3008ecb5160cba7d37bcd690a7601b6d30cfb87a117d45e59d52af5d4"
+checksum = "600d2f334aa05acb02a755e217ef1ab6dea4d51b58b7846588b747edec04efba"
 dependencies = [
  "anyhow",
- "itertools",
+ "itertools 0.10.1",
  "proc-macro2 1.0.24",
- "quote 1.0.6",
+ "quote 1.0.9",
  "syn 1.0.60",
 ]
 
 [[package]]
 name = "prost-types"
-version = "0.7.0"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b518d7cdd93dab1d1122cf07fa9a60771836c668dde9d9e2a139f957f0d9f1bb"
+checksum = "603bbd6394701d13f3f25aada59c7de9d35a6a5887cfc156181234a44002771b"
 dependencies = [
  "bytes 1.0.1",
  "prost",
@@ -3050,6 +3244,12 @@ version = "1.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
 
+[[package]]
+name = "quick-error"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3"
+
 [[package]]
 name = "quote"
 version = "0.6.13"
@@ -3061,9 +3261,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.6"
+version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54a21852a652ad6f610c9510194f398ff6f8692e334fd1145fed931f7fbe44ea"
+checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7"
 dependencies = [
  "proc-macro2 1.0.24",
 ]
@@ -3078,7 +3278,7 @@ dependencies = [
  "libc",
  "rand_core 0.3.1",
  "rdrand",
- "winapi 0.3.8",
+ "winapi 0.3.9",
 ]
 
 [[package]]
@@ -3096,8 +3296,8 @@ dependencies = [
  "rand_jitter",
  "rand_os",
  "rand_pcg 0.1.2",
- "rand_xorshift",
- "winapi 0.3.8",
+ "rand_xorshift 0.1.1",
+ "winapi 0.3.9",
 ]
 
 [[package]]
@@ -3233,7 +3433,7 @@ checksum = "1166d5c91dc97b88d1decc3285bb0a99ed84b05cfd0bc2341bdf2d43fc41e39b"
 dependencies = [
  "libc",
  "rand_core 0.4.2",
- "winapi 0.3.8",
+ "winapi 0.3.9",
 ]
 
 [[package]]
@@ -3247,7 +3447,7 @@ dependencies = [
  "libc",
  "rand_core 0.4.2",
  "rdrand",
- "winapi 0.3.8",
+ "winapi 0.3.9",
 ]
 
 [[package]]
@@ -3278,6 +3478,15 @@ dependencies = [
  "rand_core 0.3.1",
 ]
 
+[[package]]
+name = "rand_xorshift"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d25bf25ec5ae4a3f1b92f929810509a2f53d7dca2f50b794ff57e3face536c8f"
+dependencies = [
+ "rand_core 0.6.2",
+]
+
 [[package]]
 name = "raptorq"
 version = "1.4.2"
@@ -3294,7 +3503,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8b0d8e0819fadc20c74ea8373106ead0600e3a67ef1fe8da56e39b9ae7275674"
 dependencies = [
  "autocfg 1.0.0",
- "crossbeam-deque 0.8.0",
+ "crossbeam-deque 0.8.1",
  "either",
  "rayon-core",
 ]
@@ -3306,7 +3515,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9ab346ac5921dc62ffa9f89b7a773907511cdfa5490c572ae9be1be33e8afa4a"
 dependencies = [
  "crossbeam-channel 0.5.0",
- "crossbeam-deque 0.8.0",
+ "crossbeam-deque 0.8.1",
  "crossbeam-utils 0.8.1",
  "lazy_static",
  "num_cpus",
@@ -3356,7 +3565,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "957056ecddbeba1b26965114e191d2e8589ce74db242b6ea25fc4062427a5c19"
 dependencies = [
  "aho-corasick",
- "memchr 2.3.3",
+ "memchr 2.4.0",
  "regex-syntax",
 ]
 
@@ -3381,7 +3590,7 @@ version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dfc5b3ce5d5ea144bb04ebd093a9e14e9765bcfec866aecda9b6dec43b3d1e24"
 dependencies = [
- "winapi 0.3.8",
+ "winapi 0.3.9",
 ]
 
 [[package]]
@@ -3396,8 +3605,8 @@ dependencies = [
  "futures-core",
  "futures-util",
  "http",
- "http-body 0.4.0",
- "hyper 0.14.3",
+ "http-body 0.4.2",
+ "hyper 0.14.11",
  "hyper-rustls",
  "hyper-tls",
  "ipnet",
@@ -3407,12 +3616,12 @@ dependencies = [
  "mime 0.3.16",
  "native-tls",
  "percent-encoding 2.1.0",
- "pin-project-lite 0.2.4",
+ "pin-project-lite 0.2.7",
  "rustls",
  "serde",
  "serde_json",
  "serde_urlencoded",
- "tokio 1.1.1",
+ "tokio 1.8.1",
  "tokio-native-tls",
  "tokio-rustls",
  "url 2.2.0",
@@ -3441,14 +3650,14 @@ dependencies = [
  "spin",
  "untrusted",
  "web-sys",
- "winapi 0.3.8",
+ "winapi 0.3.9",
 ]
 
 [[package]]
 name = "rocksdb"
-version = "0.15.0"
+version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23d83c02c429044d58474eaf5ae31e062d0de894e21125b47437ec0edc1397e6"
+checksum = "c749134fda8bfc90d0de643d59bfc841dcb3ac8a1062e12b6754bd60235c48b3"
 dependencies = [
  "libc",
  "librocksdb-sys",
@@ -3461,7 +3670,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "99371657d3c8e4d816fb6221db98fa408242b0b53bac08f8676a41f8554fe99f"
 dependencies = [
  "libc",
- "winapi 0.3.8",
+ "winapi 0.3.9",
 ]
 
 [[package]]
@@ -3516,6 +3725,18 @@ version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cb5d2a036dc6d2d8fd16fde3498b04306e29bd193bf306a57427019b823d5acd"
 
+[[package]]
+name = "rusty-fork"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cb3dcc6e454c328bb824492db107ab7c0ae8fcffe4ad210136ef014458c1bc4f"
+dependencies = [
+ "fnv",
+ "quick-error 1.2.3",
+ "tempfile",
+ "wait-timeout",
+]
+
 [[package]]
 name = "ryu"
 version = "1.0.4"
@@ -3544,7 +3765,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8f05ba609c234e60bee0d547fe94a4c7e9da733d1c962cf6e59efa4cd9c8bc75"
 dependencies = [
  "lazy_static",
- "winapi 0.3.8",
+ "winapi 0.3.9",
 ]
 
 [[package]]
@@ -3569,7 +3790,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e367622f934864ffa1c704ba2b82280aab856e3d8213c84c5720257eb34b15b9"
 dependencies = [
  "proc-macro2 1.0.24",
- "quote 1.0.6",
+ "quote 1.0.9",
  "syn 1.0.60",
 ]
 
@@ -3642,18 +3863,18 @@ dependencies = [
 
 [[package]]
 name = "serde"
-version = "1.0.122"
+version = "1.0.126"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "974ef1bd2ad8a507599b336595454081ff68a9599b4890af7643c0c0ed73a62c"
+checksum = "ec7505abeacaec74ae4778d9d9328fe5a5d04253220a85c4ee022239fc996d03"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_bytes"
-version = "0.11.4"
+version = "0.11.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3bf487fbf5c6239d7ea2ff8b10cb6b811cd4b5080d1c2aeed1dec18753c06e10"
+checksum = "16ae07dd2f88a366f15bd0632ba725227018c69a1c8550a927324f8eb8368bb9"
 dependencies = [
  "serde",
 ]
@@ -3670,12 +3891,12 @@ dependencies = [
 
 [[package]]
 name = "serde_derive"
-version = "1.0.122"
+version = "1.0.126"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8dee1f300f838c8ac340ecb0112b3ac472464fa67e87292bdb3dfc9c49128e17"
+checksum = "963a7dbc9895aeac7ac90e74f34a5d5261828f79df35cbed41e10189d3804d43"
 dependencies = [
  "proc-macro2 1.0.24",
- "quote 1.0.6",
+ "quote 1.0.9",
  "syn 1.0.60",
 ]
 
@@ -3732,7 +3953,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d08338d8024b227c62bd68a12c7c9883f5c66780abaef15c550dc56f46ee6515"
 dependencies = [
  "proc-macro2 1.0.24",
- "quote 1.0.6",
+ "quote 1.0.9",
  "syn 1.0.60",
 ]
 
@@ -3875,12 +4096,22 @@ dependencies = [
  "cfg-if 1.0.0",
  "libc",
  "redox_syscall",
- "winapi 0.3.8",
+ "winapi 0.3.9",
+]
+
+[[package]]
+name = "socket2"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "765f090f0e423d2b55843402a07915add955e7d60657db13707a159727326cad"
+dependencies = [
+ "libc",
+ "winapi 0.3.9",
 ]
 
 [[package]]
 name = "solana-account-decoder"
-version = "1.7.0"
+version = "1.7.11"
 dependencies = [
  "Inflector",
  "base64 0.12.3",
@@ -3893,7 +4124,6 @@ dependencies = [
  "serde_json",
  "solana-config-program",
  "solana-sdk",
- "solana-stake-program",
  "solana-vote-program",
  "spl-token",
  "thiserror",
@@ -3902,14 +4132,14 @@ dependencies = [
 
 [[package]]
 name = "solana-accounts-bench"
-version = "1.7.0"
+version = "1.7.11"
 dependencies = [
  "clap",
  "crossbeam-channel 0.4.4",
  "log 0.4.11",
  "rand 0.7.3",
  "rayon",
- "solana-logger 1.7.0",
+ "solana-logger 1.7.11",
  "solana-measure",
  "solana-runtime",
  "solana-sdk",
@@ -3918,7 +4148,7 @@ dependencies = [
 
 [[package]]
 name = "solana-accounts-cluster-bench"
-version = "1.7.0"
+version = "1.7.11"
 dependencies = [
  "clap",
  "log 0.4.11",
@@ -3931,11 +4161,12 @@ dependencies = [
  "solana-faucet",
  "solana-gossip",
  "solana-local-cluster",
- "solana-logger 1.7.0",
+ "solana-logger 1.7.11",
  "solana-measure",
  "solana-net-utils",
  "solana-runtime",
  "solana-sdk",
+ "solana-streamer",
  "solana-transaction-status",
  "solana-version",
  "spl-token",
@@ -3943,7 +4174,7 @@ dependencies = [
 
 [[package]]
 name = "solana-banking-bench"
-version = "1.7.0"
+version = "1.7.11"
 dependencies = [
  "clap",
  "crossbeam-channel 0.4.4",
@@ -3954,9 +4185,10 @@ dependencies = [
  "solana-core",
  "solana-gossip",
  "solana-ledger",
- "solana-logger 1.7.0",
+ "solana-logger 1.7.11",
  "solana-measure",
  "solana-perf",
+ "solana-poh",
  "solana-runtime",
  "solana-sdk",
  "solana-streamer",
@@ -3965,7 +4197,7 @@ dependencies = [
 
 [[package]]
 name = "solana-banks-client"
-version = "1.7.0"
+version = "1.7.11"
 dependencies = [
  "bincode",
  "borsh",
@@ -3974,28 +4206,28 @@ dependencies = [
  "mio 0.7.6",
  "solana-banks-interface",
  "solana-banks-server",
- "solana-program 1.7.0",
+ "solana-program 1.7.11",
  "solana-runtime",
  "solana-sdk",
  "tarpc",
- "tokio 1.1.1",
+ "tokio 1.8.1",
  "tokio-serde",
 ]
 
 [[package]]
 name = "solana-banks-interface"
-version = "1.7.0"
+version = "1.7.11"
 dependencies = [
  "mio 0.7.6",
  "serde",
  "solana-sdk",
  "tarpc",
- "tokio 1.1.1",
+ "tokio 1.8.1",
 ]
 
 [[package]]
 name = "solana-banks-server"
-version = "1.7.0"
+version = "1.7.11"
 dependencies = [
  "bincode",
  "futures 0.3.8",
@@ -4006,17 +4238,17 @@ dependencies = [
  "solana-runtime",
  "solana-sdk",
  "tarpc",
- "tokio 1.1.1",
+ "tokio 1.8.1",
  "tokio-serde",
  "tokio-stream",
 ]
 
 [[package]]
 name = "solana-bench-exchange"
-version = "1.7.0"
+version = "1.7.11"
 dependencies = [
  "clap",
- "itertools",
+ "itertools 0.9.0",
  "log 0.4.11",
  "num-derive",
  "num-traits",
@@ -4032,21 +4264,22 @@ dependencies = [
  "solana-genesis",
  "solana-gossip",
  "solana-local-cluster",
- "solana-logger 1.7.0",
+ "solana-logger 1.7.11",
  "solana-metrics",
  "solana-net-utils",
  "solana-runtime",
  "solana-sdk",
+ "solana-streamer",
  "solana-version",
 ]
 
 [[package]]
 name = "solana-bench-streamer"
-version = "1.7.0"
+version = "1.7.11"
 dependencies = [
  "clap",
  "solana-clap-utils",
- "solana-logger 1.7.0",
+ "solana-logger 1.7.11",
  "solana-net-utils",
  "solana-streamer",
  "solana-version",
@@ -4054,7 +4287,7 @@ dependencies = [
 
 [[package]]
 name = "solana-bench-tps"
-version = "1.7.0"
+version = "1.7.11"
 dependencies = [
  "bincode",
  "clap",
@@ -4070,21 +4303,23 @@ dependencies = [
  "solana-genesis",
  "solana-gossip",
  "solana-local-cluster",
- "solana-logger 1.7.0",
+ "solana-logger 1.7.11",
  "solana-measure",
  "solana-metrics",
  "solana-net-utils",
  "solana-runtime",
  "solana-sdk",
+ "solana-streamer",
  "solana-version",
 ]
 
 [[package]]
 name = "solana-bpf-loader-program"
-version = "1.7.0"
+version = "1.7.11"
 dependencies = [
  "bincode",
  "byteorder",
+ "libsecp256k1",
  "log 0.4.11",
  "num-derive",
  "num-traits",
@@ -4099,25 +4334,9 @@ dependencies = [
  "thiserror",
 ]
 
-[[package]]
-name = "solana-budget-program"
-version = "1.7.0"
-dependencies = [
- "bincode",
- "chrono",
- "log 0.4.11",
- "num-derive",
- "num-traits",
- "serde",
- "serde_derive",
- "solana-runtime",
- "solana-sdk",
- "thiserror",
-]
-
 [[package]]
 name = "solana-cargo-build-bpf"
-version = "1.7.0"
+version = "1.7.11"
 dependencies = [
  "bzip2",
  "cargo_metadata",
@@ -4130,7 +4349,7 @@ dependencies = [
 
 [[package]]
 name = "solana-cargo-test-bpf"
-version = "1.7.0"
+version = "1.7.11"
 dependencies = [
  "cargo_metadata",
  "clap",
@@ -4138,7 +4357,7 @@ dependencies = [
 
 [[package]]
 name = "solana-clap-utils"
-version = "1.7.0"
+version = "1.7.11"
 dependencies = [
  "chrono",
  "clap",
@@ -4154,18 +4373,19 @@ dependencies = [
 
 [[package]]
 name = "solana-cli"
-version = "1.7.0"
+version = "1.7.11"
 dependencies = [
  "Inflector",
  "bincode",
  "bs58",
  "chrono",
  "clap",
- "console",
+ "console 0.14.1",
+ "const_format",
  "criterion-stats",
  "ctrlc",
  "dirs-next",
- "humantime 2.0.1",
+ "humantime",
  "indicatif",
  "log 0.4.11",
  "num-traits",
@@ -4183,11 +4403,11 @@ dependencies = [
  "solana-config-program",
  "solana-core",
  "solana-faucet",
- "solana-logger 1.7.0",
+ "solana-logger 1.7.11",
  "solana-net-utils",
  "solana-remote-wallet",
  "solana-sdk",
- "solana-stake-program",
+ "solana-streamer",
  "solana-transaction-status",
  "solana-version",
  "solana-vote-program",
@@ -4201,7 +4421,7 @@ dependencies = [
 
 [[package]]
 name = "solana-cli-config"
-version = "1.7.0"
+version = "1.7.11"
 dependencies = [
  "dirs-next",
  "lazy_static",
@@ -4213,13 +4433,14 @@ dependencies = [
 
 [[package]]
 name = "solana-cli-output"
-version = "1.7.0"
+version = "1.7.11"
 dependencies = [
  "Inflector",
  "base64 0.13.0",
  "chrono",
- "console",
- "humantime 2.0.1",
+ "clap",
+ "console 0.14.1",
+ "humantime",
  "indicatif",
  "serde",
  "serde_derive",
@@ -4228,7 +4449,6 @@ dependencies = [
  "solana-clap-utils",
  "solana-client",
  "solana-sdk",
- "solana-stake-program",
  "solana-transaction-status",
  "solana-vote-program",
  "spl-memo",
@@ -4236,7 +4456,7 @@ dependencies = [
 
 [[package]]
 name = "solana-client"
-version = "1.7.0"
+version = "1.7.11"
 dependencies = [
  "assert_matches",
  "base64 0.13.0",
@@ -4257,21 +4477,21 @@ dependencies = [
  "solana-account-decoder",
  "solana-clap-utils",
  "solana-faucet",
- "solana-logger 1.7.0",
+ "solana-logger 1.7.11",
  "solana-net-utils",
  "solana-sdk",
  "solana-transaction-status",
  "solana-version",
  "solana-vote-program",
  "thiserror",
- "tokio 1.1.1",
+ "tokio 1.8.1",
  "tungstenite",
  "url 2.2.0",
 ]
 
 [[package]]
 name = "solana-config-program"
-version = "1.7.0"
+version = "1.7.11"
 dependencies = [
  "bincode",
  "chrono",
@@ -4279,13 +4499,13 @@ dependencies = [
  "rand_core 0.6.2",
  "serde",
  "serde_derive",
- "solana-logger 1.7.0",
+ "solana-logger 1.7.11",
  "solana-sdk",
 ]
 
 [[package]]
 name = "solana-core"
-version = "1.7.0"
+version = "1.7.11"
 dependencies = [
  "ahash 0.6.1",
  "base64 0.12.3",
@@ -4295,17 +4515,14 @@ dependencies = [
  "bv",
  "byteorder",
  "chrono",
- "core_affinity",
  "crossbeam-channel 0.4.4",
  "ed25519-dalek",
  "flate2",
  "fs_extra",
  "indexmap",
- "itertools",
+ "itertools 0.9.0",
  "jsonrpc-core",
  "jsonrpc-core-client",
- "jsonrpc-derive",
- "jsonrpc-http-server",
  "libc",
  "log 0.4.11",
  "lru",
@@ -4319,7 +4536,6 @@ dependencies = [
  "rand_core 0.6.2",
  "raptorq",
  "rayon",
- "regex",
  "reqwest",
  "retain_mut",
  "rustc_version",
@@ -4332,26 +4548,24 @@ dependencies = [
  "solana-banks-server",
  "solana-clap-utils",
  "solana-client",
- "solana-faucet",
- "solana-frozen-abi 1.7.0",
- "solana-frozen-abi-macro 1.7.0",
+ "solana-frozen-abi 1.7.11",
+ "solana-frozen-abi-macro 1.7.11",
  "solana-gossip",
  "solana-ledger",
- "solana-logger 1.7.0",
+ "solana-logger 1.7.11",
  "solana-measure",
  "solana-merkle-tree",
  "solana-metrics",
  "solana-net-utils",
  "solana-perf",
+ "solana-poh",
  "solana-program-test",
  "solana-rayon-threadlimit",
  "solana-rpc",
  "solana-runtime",
  "solana-sdk",
  "solana-stake-program",
- "solana-storage-bigtable",
  "solana-streamer",
- "solana-sys-tuner",
  "solana-transaction-status",
  "solana-version",
  "solana-vote-program",
@@ -4361,14 +4575,12 @@ dependencies = [
  "tempfile",
  "thiserror",
  "tokio 0.2.22",
- "tokio 1.1.1",
- "tokio-util 0.3.1",
  "trees",
 ]
 
 [[package]]
 name = "solana-crate-features"
-version = "1.7.0"
+version = "1.7.11"
 dependencies = [
  "backtrace",
  "bytes 0.4.12",
@@ -4386,12 +4598,12 @@ dependencies = [
  "syn 0.15.44",
  "syn 1.0.60",
  "tokio 0.1.22",
- "winapi 0.3.8",
+ "winapi 0.3.9",
 ]
 
 [[package]]
 name = "solana-dos"
-version = "1.7.0"
+version = "1.7.11"
 dependencies = [
  "bincode",
  "clap",
@@ -4403,19 +4615,20 @@ dependencies = [
  "solana-core",
  "solana-gossip",
  "solana-ledger",
- "solana-logger 1.7.0",
+ "solana-logger 1.7.11",
  "solana-net-utils",
  "solana-runtime",
  "solana-sdk",
+ "solana-streamer",
  "solana-version",
 ]
 
 [[package]]
 name = "solana-download-utils"
-version = "1.7.0"
+version = "1.7.11"
 dependencies = [
  "bzip2",
- "console",
+ "console 0.14.1",
  "indicatif",
  "log 0.4.11",
  "reqwest",
@@ -4426,7 +4639,7 @@ dependencies = [
 
 [[package]]
 name = "solana-exchange-program"
-version = "1.7.0"
+version = "1.7.11"
 dependencies = [
  "bincode",
  "log 0.4.11",
@@ -4434,7 +4647,7 @@ dependencies = [
  "num-traits",
  "serde",
  "serde_derive",
- "solana-logger 1.7.0",
+ "solana-logger 1.7.11",
  "solana-metrics",
  "solana-runtime",
  "solana-sdk",
@@ -4443,7 +4656,7 @@ dependencies = [
 
 [[package]]
 name = "solana-failure-program"
-version = "1.7.0"
+version = "1.7.11"
 dependencies = [
  "solana-runtime",
  "solana-sdk",
@@ -4451,7 +4664,7 @@ dependencies = [
 
 [[package]]
 name = "solana-faucet"
-version = "1.7.0"
+version = "1.7.11"
 dependencies = [
  "bincode",
  "byteorder",
@@ -4461,20 +4674,20 @@ dependencies = [
  "serde_derive",
  "solana-clap-utils",
  "solana-cli-config",
- "solana-logger 1.7.0",
+ "solana-logger 1.7.11",
  "solana-metrics",
  "solana-sdk",
  "solana-version",
  "spl-memo",
  "thiserror",
- "tokio 1.1.1",
+ "tokio 1.8.1",
 ]
 
 [[package]]
 name = "solana-frozen-abi"
-version = "1.6.4"
+version = "1.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f81ac3925c8995d935d3af27390cf7b748a81837a29feb75a00e115f40dae6dc"
+checksum = "b0b98d31e0662fedf3a1ee30919c655713874d578e19e65affe46109b1b927f9"
 dependencies = [
  "bs58",
  "bv",
@@ -4485,14 +4698,14 @@ dependencies = [
  "serde",
  "serde_derive",
  "sha2 0.9.2",
- "solana-frozen-abi-macro 1.6.4",
- "solana-logger 1.6.4",
+ "solana-frozen-abi-macro 1.7.6",
+ "solana-logger 1.7.6",
  "thiserror",
 ]
 
 [[package]]
 name = "solana-frozen-abi"
-version = "1.7.0"
+version = "1.7.11"
 dependencies = [
  "bs58",
  "bv",
@@ -4503,37 +4716,36 @@ dependencies = [
  "serde",
  "serde_derive",
  "sha2 0.9.2",
- "solana-frozen-abi-macro 1.7.0",
- "solana-logger 1.7.0",
+ "solana-frozen-abi-macro 1.7.11",
+ "solana-logger 1.7.11",
  "thiserror",
 ]
 
 [[package]]
 name = "solana-frozen-abi-macro"
-version = "1.6.4"
+version = "1.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae448159038e470f3b2dd1ab0d219246211f940a10bf1e656a02cb5c2d897437"
+checksum = "ceac6e8ad1a784c92ff5f3d6ad68a8d664d389b08055b674c38b2b9abb69e6d4"
 dependencies = [
- "lazy_static",
  "proc-macro2 1.0.24",
- "quote 1.0.6",
+ "quote 1.0.9",
  "rustc_version",
  "syn 1.0.60",
 ]
 
 [[package]]
 name = "solana-frozen-abi-macro"
-version = "1.7.0"
+version = "1.7.11"
 dependencies = [
  "proc-macro2 1.0.24",
- "quote 1.0.6",
+ "quote 1.0.9",
  "rustc_version",
  "syn 1.0.60",
 ]
 
 [[package]]
 name = "solana-genesis"
-version = "1.7.0"
+version = "1.7.11"
 dependencies = [
  "base64 0.12.3",
  "chrono",
@@ -4541,12 +4753,11 @@ dependencies = [
  "serde",
  "serde_json",
  "serde_yaml",
- "solana-budget-program",
  "solana-clap-utils",
  "solana-cli-config",
  "solana-exchange-program",
  "solana-ledger",
- "solana-logger 1.7.0",
+ "solana-logger 1.7.11",
  "solana-runtime",
  "solana-sdk",
  "solana-stake-program",
@@ -4557,7 +4768,7 @@ dependencies = [
 
 [[package]]
 name = "solana-genesis-utils"
-version = "1.7.0"
+version = "1.7.11"
 dependencies = [
  "solana-download-utils",
  "solana-runtime",
@@ -4566,14 +4777,14 @@ dependencies = [
 
 [[package]]
 name = "solana-gossip"
-version = "1.7.0"
+version = "1.7.11"
 dependencies = [
  "bincode",
  "bv",
  "clap",
  "flate2",
  "indexmap",
- "itertools",
+ "itertools 0.9.0",
  "log 0.4.11",
  "lru",
  "matches",
@@ -4589,10 +4800,10 @@ dependencies = [
  "serial_test",
  "solana-clap-utils",
  "solana-client",
- "solana-frozen-abi 1.7.0",
- "solana-frozen-abi-macro 1.7.0",
+ "solana-frozen-abi 1.7.11",
+ "solana-frozen-abi-macro 1.7.11",
  "solana-ledger",
- "solana-logger 1.7.0",
+ "solana-logger 1.7.11",
  "solana-measure",
  "solana-metrics",
  "solana-net-utils",
@@ -4608,14 +4819,14 @@ dependencies = [
 
 [[package]]
 name = "solana-install"
-version = "1.7.0"
+version = "1.7.11"
 dependencies = [
  "atty",
  "bincode",
  "bzip2",
  "chrono",
  "clap",
- "console",
+ "console 0.14.1",
  "ctrlc",
  "dirs-next",
  "indicatif",
@@ -4629,19 +4840,19 @@ dependencies = [
  "solana-clap-utils",
  "solana-client",
  "solana-config-program",
- "solana-logger 1.7.0",
+ "solana-logger 1.7.11",
  "solana-sdk",
  "solana-version",
  "tar",
  "tempfile",
  "url 2.2.0",
- "winapi 0.3.8",
+ "winapi 0.3.9",
  "winreg",
 ]
 
 [[package]]
 name = "solana-keygen"
-version = "1.7.0"
+version = "1.7.11"
 dependencies = [
  "bs58",
  "clap",
@@ -4657,7 +4868,7 @@ dependencies = [
 
 [[package]]
 name = "solana-ledger"
-version = "1.7.0"
+version = "1.7.11"
 dependencies = [
  "assert_matches",
  "bincode",
@@ -4671,7 +4882,7 @@ dependencies = [
  "fs_extra",
  "futures 0.3.8",
  "futures-util",
- "itertools",
+ "itertools 0.9.0",
  "lazy_static",
  "libc",
  "log 0.4.11",
@@ -4689,10 +4900,9 @@ dependencies = [
  "sha2 0.9.2",
  "solana-account-decoder",
  "solana-bpf-loader-program",
- "solana-budget-program",
- "solana-frozen-abi 1.7.0",
- "solana-frozen-abi-macro 1.7.0",
- "solana-logger 1.7.0",
+ "solana-frozen-abi 1.7.11",
+ "solana-frozen-abi-macro 1.7.11",
+ "solana-logger 1.7.11",
  "solana-measure",
  "solana-merkle-tree",
  "solana-metrics",
@@ -4700,21 +4910,20 @@ dependencies = [
  "solana-rayon-threadlimit",
  "solana-runtime",
  "solana-sdk",
- "solana-stake-program",
  "solana-storage-bigtable",
  "solana-storage-proto",
  "solana-transaction-status",
  "solana-vote-program",
  "tempfile",
  "thiserror",
- "tokio 1.1.1",
+ "tokio 1.8.1",
  "tokio-stream",
  "trees",
 ]
 
 [[package]]
 name = "solana-ledger-tool"
-version = "1.7.0"
+version = "1.7.11"
 dependencies = [
  "assert_cmd",
  "bs58",
@@ -4724,7 +4933,7 @@ dependencies = [
  "futures 0.3.8",
  "futures-util",
  "histogram",
- "itertools",
+ "itertools 0.9.0",
  "log 0.4.11",
  "regex",
  "serde",
@@ -4734,7 +4943,7 @@ dependencies = [
  "solana-clap-utils",
  "solana-cli-output",
  "solana-ledger",
- "solana-logger 1.7.0",
+ "solana-logger 1.7.11",
  "solana-measure",
  "solana-runtime",
  "solana-sdk",
@@ -4744,18 +4953,18 @@ dependencies = [
  "solana-version",
  "solana-vote-program",
  "tempfile",
- "tokio 1.1.1",
+ "tokio 1.8.1",
 ]
 
 [[package]]
 name = "solana-local-cluster"
-version = "1.7.0"
+version = "1.7.11"
 dependencies = [
  "assert_matches",
  "crossbeam-channel 0.4.4",
  "fs_extra",
  "gag",
- "itertools",
+ "itertools 0.9.0",
  "log 0.4.11",
  "rand 0.7.3",
  "rayon",
@@ -4768,51 +4977,53 @@ dependencies = [
  "solana-faucet",
  "solana-gossip",
  "solana-ledger",
- "solana-logger 1.7.0",
+ "solana-logger 1.7.11",
  "solana-rayon-threadlimit",
+ "solana-rpc",
  "solana-runtime",
  "solana-sdk",
  "solana-stake-program",
+ "solana-streamer",
  "solana-vote-program",
  "tempfile",
 ]
 
 [[package]]
 name = "solana-log-analyzer"
-version = "1.7.0"
+version = "1.7.11"
 dependencies = [
  "byte-unit",
  "clap",
  "serde",
  "serde_json",
  "solana-clap-utils",
- "solana-logger 1.7.0",
+ "solana-logger 1.7.11",
  "solana-version",
 ]
 
 [[package]]
 name = "solana-logger"
-version = "1.6.4"
+version = "1.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fa7bddd7b89c26c6e3ef4af9b47d6bc8d60888559affb5160f5ade18c0cd058"
+checksum = "ec7c514fe57f8c5042fa88c19f5711c67f264db723d9d79379fcb78dd1f09bbf"
 dependencies = [
- "env_logger 0.8.3",
+ "env_logger",
  "lazy_static",
  "log 0.4.11",
 ]
 
 [[package]]
 name = "solana-logger"
-version = "1.7.0"
+version = "1.7.11"
 dependencies = [
- "env_logger 0.8.3",
+ "env_logger",
  "lazy_static",
  "log 0.4.11",
 ]
 
 [[package]]
 name = "solana-measure"
-version = "1.7.0"
+version = "1.7.11"
 dependencies = [
  "log 0.4.11",
  "solana-metrics",
@@ -4821,11 +5032,11 @@ dependencies = [
 
 [[package]]
 name = "solana-merkle-root-bench"
-version = "1.7.0"
+version = "1.7.11"
 dependencies = [
  "clap",
  "log 0.4.11",
- "solana-logger 1.7.0",
+ "solana-logger 1.7.11",
  "solana-measure",
  "solana-runtime",
  "solana-sdk",
@@ -4834,19 +5045,19 @@ dependencies = [
 
 [[package]]
 name = "solana-merkle-tree"
-version = "1.7.0"
+version = "1.7.11"
 dependencies = [
  "fast-math",
  "hex",
  "matches",
- "solana-program 1.7.0",
+ "solana-program 1.7.11",
 ]
 
 [[package]]
 name = "solana-metrics"
-version = "1.7.0"
+version = "1.7.11"
 dependencies = [
- "env_logger 0.8.3",
+ "env_logger",
  "gethostname",
  "lazy_static",
  "log 0.4.11",
@@ -4858,19 +5069,19 @@ dependencies = [
 
 [[package]]
 name = "solana-net-shaper"
-version = "1.7.0"
+version = "1.7.11"
 dependencies = [
  "clap",
  "rand 0.7.3",
  "serde",
  "serde_json",
  "solana-clap-utils",
- "solana-logger 1.7.0",
+ "solana-logger 1.7.11",
 ]
 
 [[package]]
 name = "solana-net-utils"
-version = "1.7.0"
+version = "1.7.11"
 dependencies = [
  "bincode",
  "clap",
@@ -4879,26 +5090,27 @@ dependencies = [
  "rand 0.7.3",
  "serde",
  "serde_derive",
- "socket2",
+ "socket2 0.3.17",
  "solana-clap-utils",
- "solana-logger 1.7.0",
+ "solana-logger 1.7.11",
+ "solana-sdk",
  "solana-version",
- "tokio 1.1.1",
+ "tokio 1.8.1",
  "url 2.2.0",
 ]
 
 [[package]]
 name = "solana-noop-program"
-version = "1.7.0"
+version = "1.7.11"
 dependencies = [
  "log 0.4.11",
- "solana-logger 1.7.0",
+ "solana-logger 1.7.11",
  "solana-sdk",
 ]
 
 [[package]]
 name = "solana-notifier"
-version = "1.7.0"
+version = "1.7.11"
 dependencies = [
  "log 0.4.11",
  "reqwest",
@@ -4907,7 +5119,7 @@ dependencies = [
 
 [[package]]
 name = "solana-ownable"
-version = "1.7.0"
+version = "1.7.11"
 dependencies = [
  "bincode",
  "num-derive",
@@ -4919,7 +5131,7 @@ dependencies = [
 
 [[package]]
 name = "solana-perf"
-version = "1.7.0"
+version = "1.7.11"
 dependencies = [
  "bincode",
  "curve25519-dalek 2.1.0",
@@ -4931,16 +5143,36 @@ dependencies = [
  "rand 0.7.3",
  "rayon",
  "serde",
- "solana-budget-program",
- "solana-logger 1.7.0",
+ "solana-logger 1.7.11",
  "solana-metrics",
  "solana-rayon-threadlimit",
  "solana-sdk",
 ]
 
+[[package]]
+name = "solana-poh"
+version = "1.7.11"
+dependencies = [
+ "bincode",
+ "core_affinity",
+ "crossbeam-channel 0.4.4",
+ "log 0.4.11",
+ "matches",
+ "rand 0.7.3",
+ "solana-ledger",
+ "solana-logger 1.7.11",
+ "solana-measure",
+ "solana-metrics",
+ "solana-perf",
+ "solana-runtime",
+ "solana-sdk",
+ "solana-sys-tuner",
+ "thiserror",
+]
+
 [[package]]
 name = "solana-poh-bench"
-version = "1.7.0"
+version = "1.7.11"
 dependencies = [
  "clap",
  "log 0.4.11",
@@ -4948,7 +5180,7 @@ dependencies = [
  "rayon",
  "solana-clap-utils",
  "solana-ledger",
- "solana-logger 1.7.0",
+ "solana-logger 1.7.11",
  "solana-measure",
  "solana-perf",
  "solana-sdk",
@@ -4957,19 +5189,21 @@ dependencies = [
 
 [[package]]
 name = "solana-program"
-version = "1.6.4"
+version = "1.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "231bf4cd42997b6f34e7c74a1449e8a1e8816fd83662fc3a5a0922da48fc667b"
+checksum = "3bfe6a5dfc5372c0a946018ecdd8115e38af78cea8275bac48cf3d105c6b1fb3"
 dependencies = [
  "bincode",
+ "blake3",
  "borsh",
  "borsh-derive",
  "bs58",
  "bv",
  "curve25519-dalek 2.1.0",
  "hex",
- "itertools",
+ "itertools 0.9.0",
  "lazy_static",
+ "libsecp256k1",
  "log 0.4.11",
  "num-derive",
  "num-traits",
@@ -4980,16 +5214,17 @@ dependencies = [
  "serde_bytes",
  "serde_derive",
  "sha2 0.9.2",
- "solana-frozen-abi 1.6.4",
- "solana-frozen-abi-macro 1.6.4",
- "solana-logger 1.6.4",
- "solana-sdk-macro 1.6.4",
+ "sha3",
+ "solana-frozen-abi 1.7.6",
+ "solana-frozen-abi-macro 1.7.6",
+ "solana-logger 1.7.6",
+ "solana-sdk-macro 1.7.6",
  "thiserror",
 ]
 
 [[package]]
 name = "solana-program"
-version = "1.7.0"
+version = "1.7.11"
 dependencies = [
  "assert_matches",
  "bincode",
@@ -5000,8 +5235,9 @@ dependencies = [
  "bv",
  "curve25519-dalek 2.1.0",
  "hex",
- "itertools",
+ "itertools 0.9.0",
  "lazy_static",
+ "libsecp256k1",
  "log 0.4.11",
  "num-derive",
  "num-traits",
@@ -5014,17 +5250,17 @@ dependencies = [
  "serde_json",
  "sha2 0.9.2",
  "sha3",
- "solana-frozen-abi 1.7.0",
- "solana-frozen-abi-macro 1.7.0",
- "solana-logger 1.7.0",
- "solana-sdk-macro 1.7.0",
+ "solana-frozen-abi 1.7.11",
+ "solana-frozen-abi-macro 1.7.11",
+ "solana-logger 1.7.11",
+ "solana-sdk-macro 1.7.11",
  "static_assertions",
  "thiserror",
 ]
 
 [[package]]
 name = "solana-program-test"
-version = "1.7.0"
+version = "1.7.11"
 dependencies = [
  "assert_matches",
  "async-trait",
@@ -5039,18 +5275,17 @@ dependencies = [
  "solana-banks-client",
  "solana-banks-server",
  "solana-bpf-loader-program",
- "solana-logger 1.7.0",
+ "solana-logger 1.7.11",
  "solana-runtime",
  "solana-sdk",
- "solana-stake-program",
  "solana-vote-program",
  "thiserror",
- "tokio 1.1.1",
+ "tokio 1.8.1",
 ]
 
 [[package]]
 name = "solana-rayon-threadlimit"
-version = "1.7.0"
+version = "1.7.11"
 dependencies = [
  "lazy_static",
  "num_cpus",
@@ -5058,10 +5293,10 @@ dependencies = [
 
 [[package]]
 name = "solana-remote-wallet"
-version = "1.7.0"
+version = "1.7.11"
 dependencies = [
  "base32",
- "console",
+ "console 0.14.1",
  "dialoguer",
  "hidapi",
  "log 0.4.11",
@@ -5077,36 +5312,55 @@ dependencies = [
 
 [[package]]
 name = "solana-rpc"
-version = "1.7.0"
+version = "1.7.11"
 dependencies = [
+ "base64 0.12.3",
+ "bincode",
  "bs58",
  "crossbeam-channel 0.4.4",
+ "itertools 0.9.0",
  "jsonrpc-core",
  "jsonrpc-core-client",
  "jsonrpc-derive",
+ "jsonrpc-http-server",
  "jsonrpc-pubsub",
  "jsonrpc-ws-server",
+ "libc",
  "log 0.4.11",
+ "regex",
  "serde",
  "serde_derive",
  "serde_json",
  "serial_test",
  "solana-account-decoder",
  "solana-client",
+ "solana-faucet",
+ "solana-gossip",
  "solana-ledger",
+ "solana-logger 1.7.11",
  "solana-measure",
  "solana-metrics",
+ "solana-net-utils",
+ "solana-perf",
+ "solana-poh",
  "solana-runtime",
  "solana-sdk",
  "solana-stake-program",
+ "solana-storage-bigtable",
+ "solana-streamer",
+ "solana-transaction-status",
+ "solana-version",
  "solana-vote-program",
  "spl-token",
- "tokio 1.1.1",
+ "symlink",
+ "tokio 0.2.22",
+ "tokio 1.8.1",
+ "tokio-util 0.3.1",
 ]
 
 [[package]]
 name = "solana-runtime"
-version = "1.7.0"
+version = "1.7.11"
 dependencies = [
  "arrayref",
  "assert_matches",
@@ -5120,7 +5374,7 @@ dependencies = [
  "dir-diff",
  "flate2",
  "fnv",
- "itertools",
+ "itertools 0.9.0",
  "lazy_static",
  "libc",
  "libloading 0.6.2",
@@ -5137,9 +5391,9 @@ dependencies = [
  "serde",
  "serde_derive",
  "solana-config-program",
- "solana-frozen-abi 1.7.0",
- "solana-frozen-abi-macro 1.7.0",
- "solana-logger 1.7.0",
+ "solana-frozen-abi 1.7.11",
+ "solana-frozen-abi-macro 1.7.11",
+ "solana-logger 1.7.11",
  "solana-measure",
  "solana-metrics",
  "solana-noop-program",
@@ -5157,7 +5411,7 @@ dependencies = [
 
 [[package]]
 name = "solana-scripts"
-version = "1.7.0"
+version = "1.7.11"
 dependencies = [
  "csv",
  "serde",
@@ -5165,7 +5419,7 @@ dependencies = [
 
 [[package]]
 name = "solana-sdk"
-version = "1.7.0"
+version = "1.7.11"
 dependencies = [
  "assert_matches",
  "bincode",
@@ -5181,7 +5435,7 @@ dependencies = [
  "generic-array 0.14.3",
  "hex",
  "hmac 0.10.1",
- "itertools",
+ "itertools 0.9.0",
  "lazy_static",
  "libsecp256k1",
  "log 0.4.11",
@@ -5202,11 +5456,11 @@ dependencies = [
  "sha2 0.9.2",
  "sha3",
  "solana-crate-features",
- "solana-frozen-abi 1.7.0",
- "solana-frozen-abi-macro 1.7.0",
- "solana-logger 1.7.0",
- "solana-program 1.7.0",
- "solana-sdk-macro 1.7.0",
+ "solana-frozen-abi 1.7.11",
+ "solana-frozen-abi-macro 1.7.11",
+ "solana-logger 1.7.11",
+ "solana-program 1.7.11",
+ "solana-sdk-macro 1.7.11",
  "thiserror",
  "tiny-bip39 0.7.3",
  "uriparse",
@@ -5214,44 +5468,42 @@ dependencies = [
 
 [[package]]
 name = "solana-sdk-macro"
-version = "1.6.4"
+version = "1.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c805f1e32677f8ec0cc0b2f470833a0d5ab0922f068e52be3a4a93b468c9c70"
+checksum = "84710ce45a21cccd9f2b09d8e9aad529080bb2540f27b1253874b6e732b465b9"
 dependencies = [
  "bs58",
  "proc-macro2 1.0.24",
- "quote 1.0.6",
+ "quote 1.0.9",
  "rustversion",
  "syn 1.0.60",
 ]
 
 [[package]]
 name = "solana-sdk-macro"
-version = "1.7.0"
+version = "1.7.11"
 dependencies = [
  "bs58",
  "proc-macro2 1.0.24",
- "quote 1.0.6",
+ "quote 1.0.9",
  "rustversion",
  "syn 1.0.60",
 ]
 
 [[package]]
 name = "solana-secp256k1-program"
-version = "1.7.0"
+version = "1.7.11"
 dependencies = [
  "bincode",
- "digest 0.9.0",
  "libsecp256k1",
  "rand 0.7.3",
- "sha3",
- "solana-logger 1.7.0",
+ "solana-logger 1.7.11",
  "solana-sdk",
 ]
 
 [[package]]
 name = "solana-stake-accounts"
-version = "1.7.0"
+version = "1.7.11"
 dependencies = [
  "clap",
  "solana-clap-utils",
@@ -5263,45 +5515,22 @@ dependencies = [
  "solana-stake-program",
 ]
 
-[[package]]
-name = "solana-stake-monitor"
-version = "1.7.0"
-dependencies = [
- "clap",
- "console",
- "log 0.4.11",
- "serde",
- "serde_yaml",
- "serial_test",
- "solana-clap-utils",
- "solana-cli-config",
- "solana-client",
- "solana-core",
- "solana-local-cluster",
- "solana-logger 1.7.0",
- "solana-metrics",
- "solana-sdk",
- "solana-stake-program",
- "solana-transaction-status",
- "solana-version",
- "tempfile",
-]
-
 [[package]]
 name = "solana-stake-program"
-version = "1.7.0"
+version = "1.7.11"
 dependencies = [
  "bincode",
  "log 0.4.11",
  "num-derive",
  "num-traits",
+ "proptest",
  "rustc_version",
  "serde",
  "serde_derive",
  "solana-config-program",
- "solana-frozen-abi 1.7.0",
- "solana-frozen-abi-macro 1.7.0",
- "solana-logger 1.7.0",
+ "solana-frozen-abi 1.7.11",
+ "solana-frozen-abi-macro 1.7.11",
+ "solana-logger 1.7.11",
  "solana-metrics",
  "solana-sdk",
  "solana-vote-program",
@@ -5310,7 +5539,7 @@ dependencies = [
 
 [[package]]
 name = "solana-storage-bigtable"
-version = "1.7.0"
+version = "1.7.11"
 dependencies = [
  "arc-swap 0.4.8",
  "backoff",
@@ -5337,7 +5566,7 @@ dependencies = [
 
 [[package]]
 name = "solana-storage-proto"
-version = "1.7.0"
+version = "1.7.11"
 dependencies = [
  "bincode",
  "bs58",
@@ -5347,15 +5576,16 @@ dependencies = [
  "solana-account-decoder",
  "solana-sdk",
  "solana-transaction-status",
+ "tonic-build",
 ]
 
 [[package]]
 name = "solana-store-tool"
-version = "1.7.0"
+version = "1.7.11"
 dependencies = [
  "clap",
  "log 0.4.11",
- "solana-logger 1.7.0",
+ "solana-logger 1.7.11",
  "solana-measure",
  "solana-runtime",
  "solana-sdk",
@@ -5364,12 +5594,12 @@ dependencies = [
 
 [[package]]
 name = "solana-streamer"
-version = "1.7.0"
+version = "1.7.11"
 dependencies = [
  "libc",
  "log 0.4.11",
  "nix 0.19.0",
- "solana-logger 1.7.0",
+ "solana-logger 1.7.11",
  "solana-measure",
  "solana-metrics",
  "solana-perf",
@@ -5379,14 +5609,14 @@ dependencies = [
 
 [[package]]
 name = "solana-sys-tuner"
-version = "1.7.0"
+version = "1.7.11"
 dependencies = [
  "clap",
  "libc",
  "log 0.4.11",
  "nix 0.19.0",
  "solana-clap-utils",
- "solana-logger 1.7.0",
+ "solana-logger 1.7.11",
  "solana-version",
  "sysctl",
  "unix_socket2",
@@ -5395,12 +5625,12 @@ dependencies = [
 
 [[package]]
 name = "solana-tokens"
-version = "1.7.0"
+version = "1.7.11"
 dependencies = [
  "bincode",
  "chrono",
  "clap",
- "console",
+ "console 0.14.1",
  "csv",
  "ctrlc",
  "dirs-next",
@@ -5413,12 +5643,12 @@ dependencies = [
  "solana-cli-config",
  "solana-client",
  "solana-core",
- "solana-logger 1.7.0",
+ "solana-logger 1.7.11",
  "solana-program-test",
  "solana-remote-wallet",
  "solana-runtime",
  "solana-sdk",
- "solana-stake-program",
+ "solana-streamer",
  "solana-transaction-status",
  "solana-version",
  "spl-associated-token-account",
@@ -5429,7 +5659,7 @@ dependencies = [
 
 [[package]]
 name = "solana-transaction-status"
-version = "1.7.0"
+version = "1.7.11"
 dependencies = [
  "Inflector",
  "base64 0.12.3",
@@ -5442,7 +5672,6 @@ dependencies = [
  "solana-account-decoder",
  "solana-runtime",
  "solana-sdk",
- "solana-stake-program",
  "solana-vote-program",
  "spl-associated-token-account",
  "spl-memo",
@@ -5452,7 +5681,7 @@ dependencies = [
 
 [[package]]
 name = "solana-upload-perf"
-version = "1.7.0"
+version = "1.7.11"
 dependencies = [
  "serde_json",
  "solana-metrics",
@@ -5460,13 +5689,13 @@ dependencies = [
 
 [[package]]
 name = "solana-validator"
-version = "1.7.0"
+version = "1.7.11"
 dependencies = [
  "base64 0.12.3",
  "bincode",
  "chrono",
  "clap",
- "console",
+ "console 0.14.1",
  "core_affinity",
  "fd-lock",
  "indicatif",
@@ -5490,13 +5719,15 @@ dependencies = [
  "solana-genesis-utils",
  "solana-gossip",
  "solana-ledger",
- "solana-logger 1.7.0",
+ "solana-logger 1.7.11",
  "solana-metrics",
  "solana-net-utils",
  "solana-perf",
+ "solana-poh",
  "solana-rpc",
  "solana-runtime",
  "solana-sdk",
+ "solana-streamer",
  "solana-version",
  "solana-vote-program",
  "symlink",
@@ -5504,21 +5735,21 @@ dependencies = [
 
 [[package]]
 name = "solana-version"
-version = "1.7.0"
+version = "1.7.11"
 dependencies = [
  "log 0.4.11",
  "rustc_version",
  "serde",
  "serde_derive",
- "solana-frozen-abi 1.7.0",
- "solana-frozen-abi-macro 1.7.0",
- "solana-logger 1.7.0",
+ "solana-frozen-abi 1.7.11",
+ "solana-frozen-abi-macro 1.7.11",
+ "solana-logger 1.7.11",
  "solana-sdk",
 ]
 
 [[package]]
 name = "solana-vote-program"
-version = "1.7.0"
+version = "1.7.11"
 dependencies = [
  "bincode",
  "log 0.4.11",
@@ -5527,9 +5758,9 @@ dependencies = [
  "rustc_version",
  "serde",
  "serde_derive",
- "solana-frozen-abi 1.7.0",
- "solana-frozen-abi-macro 1.7.0",
- "solana-logger 1.7.0",
+ "solana-frozen-abi 1.7.11",
+ "solana-frozen-abi-macro 1.7.11",
+ "solana-logger 1.7.11",
  "solana-metrics",
  "solana-sdk",
  "thiserror",
@@ -5537,16 +5768,16 @@ dependencies = [
 
 [[package]]
 name = "solana-watchtower"
-version = "1.7.0"
+version = "1.7.11"
 dependencies = [
  "clap",
- "humantime 2.0.1",
+ "humantime",
  "log 0.4.11",
  "solana-clap-utils",
  "solana-cli-config",
  "solana-cli-output",
  "solana-client",
- "solana-logger 1.7.0",
+ "solana-logger 1.7.11",
  "solana-metrics",
  "solana-notifier",
  "solana-sdk",
@@ -5580,11 +5811,11 @@ checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
 
 [[package]]
 name = "spl-associated-token-account"
-version = "1.0.2"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4adc47eebe5d2b662cbaaba1843719c28a67e5ec5d0460bc3ca60900a51f74e2"
+checksum = "393e2240d521c3dd770806bff25c2c00d761ac962be106e14e22dd912007f428"
 dependencies = [
- "solana-program 1.6.4",
+ "solana-program 1.7.6",
  "spl-token",
 ]
 
@@ -5594,20 +5825,20 @@ version = "3.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bd0dc6f70db6bacea7ff25870b016a65ba1d1b6013536f08e4fd79a8f9005325"
 dependencies = [
- "solana-program 1.6.4",
+ "solana-program 1.7.6",
 ]
 
 [[package]]
 name = "spl-token"
-version = "3.1.0"
+version = "3.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b795e50d15dfd35aa5460b80a16414503a322be115a417a43db987c5824c6798"
+checksum = "93bfdd5bd7c869cb565c7d7635c4fafe189b988a0bdef81063cd9585c6b8dc01"
 dependencies = [
  "arrayref",
  "num-derive",
  "num-traits",
  "num_enum",
- "solana-program 1.6.4",
+ "solana-program 1.7.6",
  "thiserror",
 ]
 
@@ -5653,7 +5884,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c87a60a40fccc84bef0652345bbbbbe20a605bf5d0ce81719fc476f5c03b50ef"
 dependencies = [
  "proc-macro2 1.0.24",
- "quote 1.0.6",
+ "quote 1.0.9",
  "serde",
  "serde_derive",
  "syn 1.0.60",
@@ -5667,7 +5898,7 @@ checksum = "58fa5ff6ad0d98d1ffa8cb115892b6e69d67799f6763e162a1c9db421dc22e11"
 dependencies = [
  "base-x",
  "proc-macro2 1.0.24",
- "quote 1.0.6",
+ "quote 1.0.9",
  "serde",
  "serde_derive",
  "serde_json",
@@ -5723,7 +5954,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c700597eca8a5a762beb35753ef6b94df201c81cca676604f547495a0d7f0081"
 dependencies = [
  "proc-macro2 1.0.24",
- "quote 1.0.6",
+ "quote 1.0.9",
  "unicode-xid 0.2.0",
 ]
 
@@ -5734,7 +5965,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "67656ea1dc1b41b1451851562ea232ec2e5a80242139f7e679ceccfb5d61f545"
 dependencies = [
  "proc-macro2 1.0.24",
- "quote 1.0.6",
+ "quote 1.0.9",
  "syn 1.0.60",
  "unicode-xid 0.2.0",
 ]
@@ -5764,18 +5995,17 @@ dependencies = [
  "libc",
  "nom 3.2.1",
  "time 0.1.43",
- "winapi 0.3.8",
+ "winapi 0.3.9",
 ]
 
 [[package]]
 name = "tar"
-version = "0.4.28"
+version = "0.4.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c058ad0bd6ccb84faa24cc44d4fc99bee8a5d7ba9ff33aa4d993122d1aeeac2"
+checksum = "d6f5515d3add52e0bbdcad7b83c388bb36ba7b754dda3b5f5bc2d38640cdba5c"
 dependencies = [
  "filetime",
  "libc",
- "redox_syscall",
  "xattr",
 ]
 
@@ -5788,14 +6018,14 @@ dependencies = [
  "anyhow",
  "fnv",
  "futures 0.3.8",
- "humantime 2.0.1",
+ "humantime",
  "log 0.4.11",
  "pin-project 1.0.1",
  "rand 0.7.3",
  "serde",
  "static_assertions",
  "tarpc-plugins",
- "tokio 1.1.1",
+ "tokio 1.8.1",
  "tokio-serde",
  "tokio-util 0.6.3",
 ]
@@ -5807,7 +6037,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f3240378a22b1195734e085ba71d1d4188d50f034aea82635acc430b7005afb5"
 dependencies = [
  "proc-macro2 1.0.24",
- "quote 1.0.6",
+ "quote 1.0.9",
  "syn 1.0.60",
 ]
 
@@ -5822,7 +6052,7 @@ dependencies = [
  "rand 0.7.3",
  "redox_syscall",
  "remove_dir_all",
- "winapi 0.3.8",
+ "winapi 0.3.9",
 ]
 
 [[package]]
@@ -5836,12 +6066,12 @@ dependencies = [
 
 [[package]]
 name = "terminal_size"
-version = "0.1.12"
+version = "0.1.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8038f95fc7a6f351163f4b964af631bd26c9e828f7db085f2a84aca56f70d13b"
+checksum = "86ca8ced750734db02076f44132d802af0b33b09942331f4459dde8636fd2406"
 dependencies = [
  "libc",
- "winapi 0.3.8",
+ "winapi 0.3.9",
 ]
 
 [[package]]
@@ -5878,7 +6108,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9be73a2caec27583d0046ef3796c3794f868a5bc813db689eed00c7631275cd1"
 dependencies = [
  "proc-macro2 1.0.24",
- "quote 1.0.6",
+ "quote 1.0.9",
  "syn 1.0.60",
 ]
 
@@ -5895,7 +6125,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438"
 dependencies = [
  "libc",
- "winapi 0.3.8",
+ "winapi 0.3.9",
 ]
 
 [[package]]
@@ -5910,7 +6140,7 @@ dependencies = [
  "stdweb",
  "time-macros",
  "version_check 0.9.2",
- "winapi 0.3.8",
+ "winapi 0.3.9",
 ]
 
 [[package]]
@@ -5931,7 +6161,7 @@ checksum = "e5c3be1edfad6027c69f5491cf4cb310d1a71ecd6af742788c6ff8bced86b8fa"
 dependencies = [
  "proc-macro-hack",
  "proc-macro2 1.0.24",
- "quote 1.0.6",
+ "quote 1.0.9",
  "standback",
  "syn 1.0.60",
 ]
@@ -6021,7 +6251,7 @@ dependencies = [
  "iovec",
  "lazy_static",
  "libc",
- "memchr 2.3.3",
+ "memchr 2.4.0",
  "mio 0.6.22",
  "mio-named-pipes",
  "mio-uds",
@@ -6030,27 +6260,27 @@ dependencies = [
  "signal-hook-registry",
  "slab",
  "tokio-macros 0.2.6",
- "winapi 0.3.8",
+ "winapi 0.3.9",
 ]
 
 [[package]]
 name = "tokio"
-version = "1.1.1"
+version = "1.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6714d663090b6b0acb0fa85841c6d66233d150cdb2602c8f9b8abb03370beb3f"
+checksum = "98c8b05dc14c75ea83d63dd391100353789f5f24b8b3866542a5e85c8be8e985"
 dependencies = [
  "autocfg 1.0.0",
  "bytes 1.0.1",
  "libc",
- "memchr 2.3.3",
+ "memchr 2.4.0",
  "mio 0.7.6",
  "num_cpus",
  "once_cell",
  "parking_lot 0.11.0",
- "pin-project-lite 0.2.4",
+ "pin-project-lite 0.2.7",
  "signal-hook-registry",
- "tokio-macros 1.0.0",
- "winapi 0.3.8",
+ "tokio-macros 1.3.0",
+ "winapi 0.3.9",
 ]
 
 [[package]]
@@ -6106,6 +6336,16 @@ dependencies = [
  "log 0.4.11",
 ]
 
+[[package]]
+name = "tokio-io-timeout"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "90c49f106be240de154571dd31fbe48acb10ba6c6dd6f6517ad603abffa42de9"
+dependencies = [
+ "pin-project-lite 0.2.7",
+ "tokio 1.8.1",
+]
+
 [[package]]
 name = "tokio-macros"
 version = "0.2.6"
@@ -6113,18 +6353,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e44da00bfc73a25f814cd8d7e57a68a5c31b74b3152a0a1d1f590c97ed06265a"
 dependencies = [
  "proc-macro2 1.0.24",
- "quote 1.0.6",
+ "quote 1.0.9",
  "syn 1.0.60",
 ]
 
 [[package]]
 name = "tokio-macros"
-version = "1.0.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42517d2975ca3114b22a16192634e8241dc5cc1f130be194645970cc1c371494"
+checksum = "54473be61f4ebe4efd09cec9bd5d16fa51d70ea0192213d754d2d500457db110"
 dependencies = [
  "proc-macro2 1.0.24",
- "quote 1.0.6",
+ "quote 1.0.9",
  "syn 1.0.60",
 ]
 
@@ -6135,7 +6375,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f7d995660bd2b7f8c1568414c1126076c13fbb725c40112dc0120b78eb9b717b"
 dependencies = [
  "native-tls",
- "tokio 1.1.1",
+ "tokio 1.8.1",
 ]
 
 [[package]]
@@ -6164,7 +6404,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bc6844de72e57df1980054b38be3a9f4702aba4858be64dd700181a8a6d0e1b6"
 dependencies = [
  "rustls",
- "tokio 1.1.1",
+ "tokio 1.8.1",
  "webpki",
 ]
 
@@ -6191,8 +6431,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "76066865172052eb8796c686f0b441a93df8b08d40a950b062ffb9a426f00edd"
 dependencies = [
  "futures-core",
- "pin-project-lite 0.2.4",
- "tokio 1.1.1",
+ "pin-project-lite 0.2.7",
+ "tokio 1.8.1",
 ]
 
 [[package]]
@@ -6225,7 +6465,7 @@ version = "0.1.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "df720b6581784c118f0eb4310796b12b1d242a7eb95f716a8367855325c25f89"
 dependencies = [
- "crossbeam-deque 0.7.3",
+ "crossbeam-deque 0.7.4",
  "crossbeam-queue",
  "crossbeam-utils 0.7.2",
  "futures 0.1.29",
@@ -6316,8 +6556,8 @@ dependencies = [
  "futures-core",
  "futures-sink",
  "log 0.4.11",
- "pin-project-lite 0.2.4",
- "tokio 1.1.1",
+ "pin-project-lite 0.2.7",
+ "tokio 1.8.1",
 ]
 
 [[package]]
@@ -6331,9 +6571,9 @@ dependencies = [
 
 [[package]]
 name = "tonic"
-version = "0.4.0"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ba8f479158947373b6df40cf48f4779bb25c99ca3c661bd95e0ab1963ad8b0e"
+checksum = "b584f064fdfc50017ec39162d5aebce49912f1eb16fd128e04b7f4ce4907c7e5"
 dependencies = [
  "async-stream",
  "async-trait",
@@ -6341,29 +6581,43 @@ dependencies = [
  "bytes 1.0.1",
  "futures-core",
  "futures-util",
- "h2 0.3.0",
+ "h2 0.3.3",
  "http",
- "http-body 0.4.0",
- "hyper 0.14.3",
+ "http-body 0.4.2",
+ "hyper 0.14.11",
+ "hyper-timeout",
  "percent-encoding 2.1.0",
  "pin-project 1.0.1",
  "prost",
  "prost-derive",
- "tokio 1.1.1",
+ "tokio 1.8.1",
  "tokio-rustls",
  "tokio-stream",
  "tokio-util 0.6.3",
  "tower",
+ "tower-layer",
  "tower-service",
  "tracing",
  "tracing-futures",
 ]
 
+[[package]]
+name = "tonic-build"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "25db9a497663a9a779693ef67b6e6aef8345b3d3ff8d50ef92eae6c88cb1e386"
+dependencies = [
+ "proc-macro2 1.0.24",
+ "prost-build",
+ "quote 1.0.9",
+ "syn 1.0.60",
+]
+
 [[package]]
 name = "tower"
-version = "0.4.4"
+version = "0.4.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5fd7b451959622e21de79261673d658a0944b835012c58c51878ea55957fb51a"
+checksum = "f60422bc7fefa2f3ec70359b8ff1caff59d785877eb70595904605bcc412470f"
 dependencies = [
  "futures-core",
  "futures-util",
@@ -6371,8 +6625,9 @@ dependencies = [
  "pin-project 1.0.1",
  "rand 0.8.3",
  "slab",
- "tokio 1.1.1",
+ "tokio 1.8.1",
  "tokio-stream",
+ "tokio-util 0.6.3",
  "tower-layer",
  "tower-service",
  "tracing",
@@ -6392,32 +6647,33 @@ checksum = "e987b6bf443f4b5b3b6f38704195592cca41c5bb7aedd3c3693c7081f8289860"
 
 [[package]]
 name = "tracing"
-version = "0.1.18"
+version = "0.1.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0aae59226cf195d8e74d4b34beae1859257efb4e5fed3f147d2dc2c7d372178"
+checksum = "09adeb8c97449311ccd28a427f96fb563e7fd31aabf994189879d9da2394b89d"
 dependencies = [
- "cfg-if 0.1.10",
+ "cfg-if 1.0.0",
  "log 0.4.11",
+ "pin-project-lite 0.2.7",
  "tracing-attributes",
  "tracing-core",
 ]
 
 [[package]]
 name = "tracing-attributes"
-version = "0.1.9"
+version = "0.1.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0693bf8d6f2bf22c690fc61a9d21ac69efdbb894a17ed596b9af0f01e64b84b"
+checksum = "c42e6fa53307c8a17e4ccd4dc81cf5ec38db9209f59b222210375b54ee40d1e2"
 dependencies = [
  "proc-macro2 1.0.24",
- "quote 1.0.6",
+ "quote 1.0.9",
  "syn 1.0.60",
 ]
 
 [[package]]
 name = "tracing-core"
-version = "0.1.13"
+version = "0.1.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d593f98af59ebc017c0648f0117525db358745a8894a8d684e185ba3f45954f9"
+checksum = "a9ff14f98b1a4b289c6248a023c1c2fa1491062964e9fed67ab29c4e4da4a052"
 dependencies = [
  "lazy_static",
 ]
@@ -6533,6 +6789,12 @@ dependencies = [
  "tinyvec",
 ]
 
+[[package]]
+name = "unicode-segmentation"
+version = "1.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8895849a949e7845e06bd6dc1aa51731a103c42707010a5b591c0038fb73385b"
+
 [[package]]
 name = "unicode-width"
 version = "0.1.7"
@@ -6676,7 +6938,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "777182bc735b6424e1a57516d35ed72cb8019d85c8c9bf536dccb3445c1a2f7d"
 dependencies = [
  "same-file",
- "winapi 0.3.8",
+ "winapi 0.3.9",
  "winapi-util",
 ]
 
@@ -6718,7 +6980,7 @@ dependencies = [
  "lazy_static",
  "log 0.4.11",
  "proc-macro2 1.0.24",
- "quote 1.0.6",
+ "quote 1.0.9",
  "syn 1.0.60",
  "wasm-bindgen-shared",
 ]
@@ -6741,7 +7003,7 @@ version = "0.2.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3b8853882eef39593ad4174dd26fc9865a64e84026d223f63bb2c42affcbba2c"
 dependencies = [
- "quote 1.0.6",
+ "quote 1.0.9",
  "wasm-bindgen-macro-support",
 ]
 
@@ -6752,7 +7014,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4133b5e7f2a531fa413b3a1695e925038a05a71cf67e87dafa295cb645a01385"
 dependencies = [
  "proc-macro2 1.0.24",
- "quote 1.0.6",
+ "quote 1.0.9",
  "syn 1.0.60",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
@@ -6836,11 +7098,12 @@ dependencies = [
 
 [[package]]
 name = "which"
-version = "3.1.1"
+version = "4.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d011071ae14a2f6671d0b74080ae0cd8ebf3a6f8c9589a2cd45f23126fe29724"
+checksum = "87c14ef7e1b8b8ecfc75d5eca37949410046e66f15d185c01d70824f1f8111ef"
 dependencies = [
  "libc",
+ "thiserror",
 ]
 
 [[package]]
@@ -6851,9 +7114,9 @@ checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a"
 
 [[package]]
 name = "winapi"
-version = "0.3.8"
+version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6"
+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
 dependencies = [
  "winapi-i686-pc-windows-gnu",
  "winapi-x86_64-pc-windows-gnu",
@@ -6877,7 +7140,7 @@ version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
 dependencies = [
- "winapi 0.3.8",
+ "winapi 0.3.9",
 ]
 
 [[package]]
@@ -6892,7 +7155,7 @@ version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0120db82e8a1e0b9fb3345a539c478767c0048d842860994d96113d5b667bd69"
 dependencies = [
- "winapi 0.3.8",
+ "winapi 0.3.9",
 ]
 
 [[package]]
@@ -6939,7 +7202,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "de251eec69fc7c1bc3923403d18ececb929380e016afe103da75f396704f8ca2"
 dependencies = [
  "proc-macro2 1.0.24",
- "quote 1.0.6",
+ "quote 1.0.9",
  "syn 1.0.60",
  "synstructure",
 ]
@@ -6971,6 +7234,6 @@ checksum = "b89249644df056b522696b1bb9e7c18c87e8ffa3e2f0dc3b0155875d6498f01b"
 dependencies = [
  "cc",
  "glob",
- "itertools",
+ "itertools 0.9.0",
  "libc",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index 28a13a393e835d..4d3e377cbbb9f8 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -39,19 +39,20 @@ members = [
     "metrics",
     "net-shaper",
     "notifier",
+    "poh",
     "poh-bench",
     "program-test",
-    "programs/secp256k1",
     "programs/bpf_loader",
-    "programs/budget",
     "programs/config",
     "programs/exchange",
     "programs/failure",
     "programs/noop",
     "programs/ownable",
+    "programs/secp256k1",
     "programs/stake",
     "programs/vote",
     "remote-wallet",
+    "rpc",
     "runtime",
     "runtime/store-tool",
     "sdk",
@@ -59,7 +60,6 @@ members = [
     "sdk/cargo-test-bpf",
     "scripts",
     "stake-accounts",
-    "stake-monitor",
     "sys-tuner",
     "tokens",
     "transaction-status",
@@ -76,5 +76,10 @@ exclude = [
     "programs/bpf",
 ]
 
+# TODO: Remove once the "simd-accel" feature from the reed-solomon-erasure
+# dependency is supported on Apple M1. v2 of the feature resolver is needed to
+# specify arch-specific features.
+resolver = "2"
+
 [profile.dev]
 split-debuginfo = "unpacked"
diff --git a/README.md b/README.md
index f6f12bd0ea7dcc..4d75a8573b20a3 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ $ source $HOME/.cargo/env
 $ rustup component add rustfmt
 ```
 
-Please sure you are always using the latest stable rust version by running:
+Please make sure you are always using the latest stable rust version by running:
 
 ```bash
 $ rustup update
diff --git a/account-decoder/Cargo.toml b/account-decoder/Cargo.toml
index e847b72e1c219a..478f26fd86ec6f 100644
--- a/account-decoder/Cargo.toml
+++ b/account-decoder/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "solana-account-decoder"
-version = "1.7.0"
+version = "1.7.11"
 description = "Solana account decoder"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -19,11 +19,10 @@ lazy_static = "1.4.0"
 serde = "1.0.122"
 serde_derive = "1.0.103"
 serde_json = "1.0.56"
-solana-config-program = { path = "../programs/config", version = "=1.7.0" }
-solana-sdk = { path = "../sdk", version = "=1.7.0" }
-solana-stake-program = { path = "../programs/stake", version = "=1.7.0" }
-solana-vote-program = { path = "../programs/vote", version = "=1.7.0" }
-spl-token-v2-0 = { package = "spl-token", version = "=3.1.0", features = ["no-entrypoint"] }
+solana-config-program = { path = "../programs/config", version = "=1.7.11" }
+solana-sdk = { path = "../sdk", version = "=1.7.11" }
+solana-vote-program = { path = "../programs/vote", version = "=1.7.11" }
+spl-token-v2-0 = { package = "spl-token", version = "=3.2.0", features = ["no-entrypoint"] }
 thiserror = "1.0"
 zstd = "0.5.1"
 
diff --git a/account-decoder/src/lib.rs b/account-decoder/src/lib.rs
index 7f1e7c40c70c20..31cf56e374d834 100644
--- a/account-decoder/src/lib.rs
+++ b/account-decoder/src/lib.rs
@@ -28,6 +28,7 @@ use {
 
 pub type StringAmount = String;
 pub type StringDecimals = String;
+pub const MAX_BASE58_BYTES: usize = 128;
 
 /// A duplicate representation of an Account for pretty JSON serialization
 #[derive(Serialize, Deserialize, Clone, Debug)]
@@ -60,6 +61,17 @@ pub enum UiAccountEncoding {
 }
 
 impl UiAccount {
+    fn encode_bs58<T: ReadableAccount>(
+        account: &T,
+        data_slice_config: Option<UiDataSliceConfig>,
+    ) -> String {
+        if account.data().len() <= MAX_BASE58_BYTES {
+            bs58::encode(slice_data(account.data(), data_slice_config)).into_string()
+        } else {
+            "error: data too large for bs58 encoding".to_string()
+        }
+    }
+
     pub fn encode<T: ReadableAccount>(
         pubkey: &Pubkey,
         account: &T,
@@ -68,33 +80,34 @@ impl UiAccount {
         data_slice_config: Option<UiDataSliceConfig>,
     ) -> Self {
         let data = match encoding {
-            UiAccountEncoding::Binary => UiAccountData::LegacyBinary(
-                bs58::encode(slice_data(&account.data(), data_slice_config)).into_string(),
-            ),
-            UiAccountEncoding::Base58 => UiAccountData::Binary(
-                bs58::encode(slice_data(&account.data(), data_slice_config)).into_string(),
-                encoding,
-            ),
+            UiAccountEncoding::Binary => {
+                let data = Self::encode_bs58(account, data_slice_config);
+                UiAccountData::LegacyBinary(data)
+            }
+            UiAccountEncoding::Base58 => {
+                let data = Self::encode_bs58(account, data_slice_config);
+                UiAccountData::Binary(data, encoding)
+            }
             UiAccountEncoding::Base64 => UiAccountData::Binary(
-                base64::encode(slice_data(&account.data(), data_slice_config)),
+                base64::encode(slice_data(account.data(), data_slice_config)),
                 encoding,
             ),
             UiAccountEncoding::Base64Zstd => {
                 let mut encoder = zstd::stream::write::Encoder::new(Vec::new(), 0).unwrap();
                 match encoder
-                    .write_all(slice_data(&account.data(), data_slice_config))
+                    .write_all(slice_data(account.data(), data_slice_config))
                     .and_then(|()| encoder.finish())
                 {
                     Ok(zstd_data) => UiAccountData::Binary(base64::encode(zstd_data), encoding),
                     Err(_) => UiAccountData::Binary(
-                        base64::encode(slice_data(&account.data(), data_slice_config)),
+                        base64::encode(slice_data(account.data(), data_slice_config)),
                         UiAccountEncoding::Base64,
                     ),
                 }
             }
             UiAccountEncoding::JsonParsed => {
                 if let Ok(parsed_data) =
-                    parse_account_data(pubkey, &account.owner(), &account.data(), additional_data)
+                    parse_account_data(pubkey, account.owner(), account.data(), additional_data)
                 {
                     UiAccountData::Json(parsed_data)
                 } else {
diff --git a/account-decoder/src/parse_account_data.rs b/account-decoder/src/parse_account_data.rs
index 9b649dc8fec4ed..0c26b4003ea8f9 100644
--- a/account-decoder/src/parse_account_data.rs
+++ b/account-decoder/src/parse_account_data.rs
@@ -9,14 +9,14 @@ use crate::{
 };
 use inflector::Inflector;
 use serde_json::Value;
-use solana_sdk::{instruction::InstructionError, pubkey::Pubkey, system_program, sysvar};
+use solana_sdk::{instruction::InstructionError, pubkey::Pubkey, stake, system_program, sysvar};
 use std::collections::HashMap;
 use thiserror::Error;
 
 lazy_static! {
     static ref BPF_UPGRADEABLE_LOADER_PROGRAM_ID: Pubkey = solana_sdk::bpf_loader_upgradeable::id();
     static ref CONFIG_PROGRAM_ID: Pubkey = solana_config_program::id();
-    static ref STAKE_PROGRAM_ID: Pubkey = solana_stake_program::id();
+    static ref STAKE_PROGRAM_ID: Pubkey = stake::program::id();
     static ref SYSTEM_PROGRAM_ID: Pubkey = system_program::id();
     static ref SYSVAR_PROGRAM_ID: Pubkey = sysvar::id();
     static ref TOKEN_PROGRAM_ID: Pubkey = spl_token_id_v2_0();
diff --git a/account-decoder/src/parse_config.rs b/account-decoder/src/parse_config.rs
index 3a9d6151b5eac7..e4cdf2457ef0d4 100644
--- a/account-decoder/src/parse_config.rs
+++ b/account-decoder/src/parse_config.rs
@@ -6,10 +6,10 @@ use bincode::deserialize;
 use serde_json::Value;
 use solana_config_program::{get_config_data, ConfigKeys};
 use solana_sdk::pubkey::Pubkey;
-use solana_stake_program::config::Config as StakeConfig;
+use solana_sdk::stake::config::{self as stake_config, Config as StakeConfig};
 
 pub fn parse_config(data: &[u8], pubkey: &Pubkey) -> Result<ConfigAccountType, ParseAccountError> {
-    let parsed_account = if pubkey == &solana_stake_program::config::id() {
+    let parsed_account = if pubkey == &stake_config::id() {
         get_config_data(data)
             .ok()
             .and_then(|data| deserialize::<StakeConfig>(data).ok())
@@ -37,7 +37,7 @@ fn parse_config_data<T>(data: &[u8], keys: Vec<(Pubkey, bool)>) -> Option<UiConf
 where
     T: serde::de::DeserializeOwned,
 {
-    let config_data: T = deserialize(&get_config_data(data).ok()?).ok()?;
+    let config_data: T = deserialize(get_config_data(data).ok()?).ok()?;
     let keys = keys
         .iter()
         .map(|key| UiConfigKey {
@@ -101,11 +101,7 @@ mod test {
         };
         let stake_config_account = create_config_account(vec![], &stake_config, 10);
         assert_eq!(
-            parse_config(
-                &stake_config_account.data(),
-                &solana_stake_program::config::id()
-            )
-            .unwrap(),
+            parse_config(stake_config_account.data(), &stake_config::id()).unwrap(),
             ConfigAccountType::StakeConfig(UiStakeConfig {
                 warmup_cooldown_rate: 0.25,
                 slash_penalty: 50,
@@ -125,7 +121,7 @@ mod test {
             10,
         );
         assert_eq!(
-            parse_config(&validator_info_config_account.data(), &info_pubkey).unwrap(),
+            parse_config(validator_info_config_account.data(), &info_pubkey).unwrap(),
             ConfigAccountType::ValidatorInfo(UiConfig {
                 keys: vec![
                     UiConfigKey {
diff --git a/account-decoder/src/parse_stake.rs b/account-decoder/src/parse_stake.rs
index 86dc88e80a1031..fa3d3def6a25da 100644
--- a/account-decoder/src/parse_stake.rs
+++ b/account-decoder/src/parse_stake.rs
@@ -4,7 +4,7 @@ use crate::{
 };
 use bincode::deserialize;
 use solana_sdk::clock::{Epoch, UnixTimestamp};
-use solana_stake_program::stake_state::{Authorized, Delegation, Lockup, Meta, Stake, StakeState};
+use solana_sdk::stake::state::{Authorized, Delegation, Lockup, Meta, Stake, StakeState};
 
 pub fn parse_stake(data: &[u8]) -> Result<StakeAccountType, ParseAccountError> {
     let stake_state: StakeState = deserialize(data)
diff --git a/accounts-bench/Cargo.toml b/accounts-bench/Cargo.toml
index a8cd49907130fa..14cf041a9fb2be 100644
--- a/accounts-bench/Cargo.toml
+++ b/accounts-bench/Cargo.toml
@@ -2,7 +2,7 @@
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 edition = "2018"
 name = "solana-accounts-bench"
-version = "1.7.0"
+version = "1.7.11"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
@@ -11,11 +11,11 @@ publish = false
 [dependencies]
 log = "0.4.11"
 rayon = "1.5.0"
-solana-logger = { path = "../logger", version = "=1.7.0" }
-solana-runtime = { path = "../runtime", version = "=1.7.0" }
-solana-measure = { path = "../measure", version = "=1.7.0" }
-solana-sdk = { path = "../sdk", version = "=1.7.0" }
-solana-version = { path = "../version", version = "=1.7.0" }
+solana-logger = { path = "../logger", version = "=1.7.11" }
+solana-runtime = { path = "../runtime", version = "=1.7.11" }
+solana-measure = { path = "../measure", version = "=1.7.11" }
+solana-sdk = { path = "../sdk", version = "=1.7.11" }
+solana-version = { path = "../version", version = "=1.7.11" }
 rand = "0.7.0"
 clap = "2.33.1"
 crossbeam-channel = "0.4"
diff --git a/accounts-bench/src/main.rs b/accounts-bench/src/main.rs
index 3aebc466aaf2e4..e32c01f1d821a5 100644
--- a/accounts-bench/src/main.rs
+++ b/accounts-bench/src/main.rs
@@ -6,6 +6,7 @@ use rayon::prelude::*;
 use solana_measure::measure::Measure;
 use solana_runtime::{
     accounts::{create_test_accounts, update_accounts_bench, Accounts},
+    accounts_db::AccountShrinkThreshold,
     accounts_index::AccountSecondaryIndexes,
     ancestors::Ancestors,
 };
@@ -64,6 +65,7 @@ fn main() {
         &ClusterType::Testnet,
         AccountSecondaryIndexes::default(),
         false,
+        AccountShrinkThreshold::default(),
     );
     println!("Creating {} accounts", num_accounts);
     let mut create_time = Measure::start("create accounts");
@@ -119,6 +121,7 @@ fn main() {
                 solana_sdk::clock::Slot::default(),
                 &ancestors,
                 None,
+                false,
             );
             time_store.stop();
             if results != results_store {
diff --git a/accounts-cluster-bench/Cargo.toml b/accounts-cluster-bench/Cargo.toml
index 94d0dc062689ac..4a57ab7a4020b6 100644
--- a/accounts-cluster-bench/Cargo.toml
+++ b/accounts-cluster-bench/Cargo.toml
@@ -2,7 +2,7 @@
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 edition = "2018"
 name = "solana-accounts-cluster-bench"
-version = "1.7.0"
+version = "1.7.11"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
@@ -13,23 +13,24 @@ clap = "2.33.1"
 log = "0.4.11"
 rand = "0.7.0"
 rayon = "1.4.1"
-solana-account-decoder = { path = "../account-decoder", version = "=1.7.0" }
-solana-clap-utils = { path = "../clap-utils", version = "=1.7.0" }
-solana-client = { path = "../client", version = "=1.7.0" }
-solana-core = { path = "../core", version = "=1.7.0" }
-solana-faucet = { path = "../faucet", version = "=1.7.0" }
-solana-gossip = { path = "../gossip", version = "=1.7.0" }
-solana-logger = { path = "../logger", version = "=1.7.0" }
-solana-measure = { path = "../measure", version = "=1.7.0" }
-solana-net-utils = { path = "../net-utils", version = "=1.7.0" }
-solana-runtime = { path = "../runtime", version = "=1.7.0" }
-solana-sdk = { path = "../sdk", version = "=1.7.0" }
-solana-transaction-status = { path = "../transaction-status", version = "=1.7.0" }
-solana-version = { path = "../version", version = "=1.7.0" }
-spl-token-v2-0 = { package = "spl-token", version = "=3.1.0", features = ["no-entrypoint"] }
+solana-account-decoder = { path = "../account-decoder", version = "=1.7.11" }
+solana-clap-utils = { path = "../clap-utils", version = "=1.7.11" }
+solana-client = { path = "../client", version = "=1.7.11" }
+solana-core = { path = "../core", version = "=1.7.11" }
+solana-faucet = { path = "../faucet", version = "=1.7.11" }
+solana-gossip = { path = "../gossip", version = "=1.7.11" }
+solana-logger = { path = "../logger", version = "=1.7.11" }
+solana-measure = { path = "../measure", version = "=1.7.11" }
+solana-net-utils = { path = "../net-utils", version = "=1.7.11" }
+solana-runtime = { path = "../runtime", version = "=1.7.11" }
+solana-sdk = { path = "../sdk", version = "=1.7.11" }
+solana-streamer = { path = "../streamer", version = "=1.7.11" }
+solana-transaction-status = { path = "../transaction-status", version = "=1.7.11" }
+solana-version = { path = "../version", version = "=1.7.11" }
+spl-token-v2-0 = { package = "spl-token", version = "=3.2.0", features = ["no-entrypoint"] }
 
 [dev-dependencies]
-solana-local-cluster = { path = "../local-cluster", version = "=1.7.0" }
+solana-local-cluster = { path = "../local-cluster", version = "=1.7.11" }
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
diff --git a/accounts-cluster-bench/src/main.rs b/accounts-cluster-bench/src/main.rs
index e8c8a8633c7851..58b5fa2a155938 100644
--- a/accounts-cluster-bench/src/main.rs
+++ b/accounts-cluster-bench/src/main.rs
@@ -20,6 +20,7 @@ use solana_sdk::{
     timing::timestamp,
     transaction::Transaction,
 };
+use solana_streamer::socket::SocketAddrSpace;
 use solana_transaction_status::parse_token::spl_token_v2_0_instruction;
 use std::{
     net::SocketAddr,
@@ -55,7 +56,7 @@ pub fn airdrop_lamports(
         );
 
         let (blockhash, _fee_calculator) = client.get_recent_blockhash().unwrap();
-        match request_airdrop_transaction(&faucet_addr, &id.pubkey(), airdrop_amount, blockhash) {
+        match request_airdrop_transaction(faucet_addr, &id.pubkey(), airdrop_amount, blockhash) {
             Ok(transaction) => {
                 let mut tries = 0;
                 loop {
@@ -363,7 +364,7 @@ fn run_accounts_bench(
     iterations: usize,
     maybe_space: Option<u64>,
     batch_size: usize,
-    close_nth: u64,
+    close_nth_batch: u64,
     maybe_lamports: Option<u64>,
     num_instructions: usize,
     mint: Option<Pubkey>,
@@ -431,7 +432,7 @@ fn run_accounts_bench(
                     if !airdrop_lamports(
                         &client,
                         &faucet_addr,
-                        &payer_keypairs[i],
+                        payer_keypairs[i],
                         lamports * 100_000,
                     ) {
                         warn!("failed airdrop, exiting");
@@ -441,6 +442,7 @@ fn run_accounts_bench(
             }
         }
 
+        // Create accounts
         let sigs_len = executor.num_outstanding();
         if sigs_len < batch_size {
             let num_to_create = batch_size - sigs_len;
@@ -475,21 +477,25 @@ fn run_accounts_bench(
                 }
             }
 
-            if close_nth > 0 {
-                let expected_closed = total_accounts_created as u64 / close_nth;
-                if expected_closed > total_accounts_closed {
-                    let txs: Vec<_> = (0..expected_closed - total_accounts_closed)
+            if close_nth_batch > 0 {
+                let num_batches_to_close =
+                    total_accounts_created as u64 / (close_nth_batch * batch_size as u64);
+                let expected_closed = num_batches_to_close * batch_size as u64;
+                let max_closed_seed = seed_tracker.max_closed.load(Ordering::Relaxed);
+                // Close every account we've created with seed between max_closed_seed..expected_closed
+                if max_closed_seed < expected_closed {
+                    let txs: Vec<_> = (0..expected_closed - max_closed_seed)
                         .into_par_iter()
                         .map(|_| {
                             let message = make_close_message(
-                                &payer_keypairs[0],
+                                payer_keypairs[0],
                                 &base_keypair,
                                 seed_tracker.max_closed.clone(),
                                 1,
                                 min_balance,
                                 mint.is_some(),
                             );
-                            let signers: Vec<&Keypair> = vec![&payer_keypairs[0], &base_keypair];
+                            let signers: Vec<&Keypair> = vec![payer_keypairs[0], &base_keypair];
                             Transaction::new(&signers, message, recent_blockhash.0)
                         })
                         .collect();
@@ -572,14 +578,14 @@ fn main() {
                 .help("Number of transactions to send per batch"),
         )
         .arg(
-            Arg::with_name("close_nth")
+            Arg::with_name("close_nth_batch")
                 .long("close-frequency")
                 .takes_value(true)
                 .value_name("BYTES")
                 .help(
-                    "Send close transactions after this many accounts created. \
-                    Note: a `close-frequency` value near or below `batch-size` \
-                    may result in transaction-simulation errors, as the close \
+                    "Every `n` batches, create a batch of close transactions for
+                    the earliest remaining batch of accounts created.
+                    Note: Should be > 1 to avoid situations where the close \
                     transactions will be submitted before the corresponding \
                     create transactions have been confirmed",
                 ),
@@ -632,7 +638,7 @@ fn main() {
     let space = value_t!(matches, "space", u64).ok();
     let lamports = value_t!(matches, "lamports", u64).ok();
     let batch_size = value_t!(matches, "batch_size", usize).unwrap_or(4);
-    let close_nth = value_t!(matches, "close_nth", u64).unwrap_or(0);
+    let close_nth_batch = value_t!(matches, "close_nth_batch", u64).unwrap_or(0);
     let iterations = value_t!(matches, "iterations", usize).unwrap_or(10);
     let num_instructions = value_t!(matches, "num_instructions", usize).unwrap_or(1);
     if num_instructions == 0 || num_instructions > 500 {
@@ -665,6 +671,7 @@ fn main() {
             Some(&entrypoint_addr),  // find_node_by_gossip_addr
             None,                    // my_gossip_addr
             0,                       // my_shred_version
+            SocketAddrSpace::Unspecified,
         )
         .unwrap_or_else(|err| {
             eprintln!("Failed to discover {} node: {:?}", entrypoint_addr, err);
@@ -685,7 +692,7 @@ fn main() {
         iterations,
         space,
         batch_size,
-        close_nth,
+        close_nth_batch,
         lamports,
         num_instructions,
         mint,
@@ -716,11 +723,11 @@ pub mod test {
         };
 
         let faucet_addr = SocketAddr::from(([127, 0, 0, 1], 9900));
-        let cluster = LocalCluster::new(&mut config);
+        let cluster = LocalCluster::new(&mut config, SocketAddrSpace::Unspecified);
         let iterations = 10;
         let maybe_space = None;
         let batch_size = 100;
-        let close_nth = 100;
+        let close_nth_batch = 100;
         let maybe_lamports = None;
         let num_instructions = 2;
         let mut start = Measure::start("total accounts run");
@@ -731,7 +738,7 @@ pub mod test {
             iterations,
             maybe_space,
             batch_size,
-            close_nth,
+            close_nth_batch,
             maybe_lamports,
             num_instructions,
             None,
diff --git a/banking-bench/Cargo.toml b/banking-bench/Cargo.toml
index d3aff28a9c1972..efbb3187094f8e 100644
--- a/banking-bench/Cargo.toml
+++ b/banking-bench/Cargo.toml
@@ -2,7 +2,7 @@
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 edition = "2018"
 name = "solana-banking-bench"
-version = "1.7.0"
+version = "1.7.11"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
@@ -14,17 +14,18 @@ crossbeam-channel = "0.4"
 log = "0.4.11"
 rand = "0.7.0"
 rayon = "1.5.0"
-solana-core = { path = "../core", version = "=1.7.0" }
-solana-clap-utils = { path = "../clap-utils", version = "=1.7.0" }
-solana-gossip = { path = "../gossip", version = "=1.7.0" }
-solana-ledger = { path = "../ledger", version = "=1.7.0" }
-solana-logger = { path = "../logger", version = "=1.7.0" }
-solana-measure = { path = "../measure", version = "=1.7.0" }
-solana-perf = { path = "../perf", version = "=1.7.0" }
-solana-runtime = { path = "../runtime", version = "=1.7.0" }
-solana-streamer = { path = "../streamer", version = "=1.7.0" }
-solana-sdk = { path = "../sdk", version = "=1.7.0" }
-solana-version = { path = "../version", version = "=1.7.0" }
+solana-core = { path = "../core", version = "=1.7.11" }
+solana-clap-utils = { path = "../clap-utils", version = "=1.7.11" }
+solana-gossip = { path = "../gossip", version = "=1.7.11" }
+solana-ledger = { path = "../ledger", version = "=1.7.11" }
+solana-logger = { path = "../logger", version = "=1.7.11" }
+solana-measure = { path = "../measure", version = "=1.7.11" }
+solana-perf = { path = "../perf", version = "=1.7.11" }
+solana-poh = { path = "../poh", version = "=1.7.11" }
+solana-runtime = { path = "../runtime", version = "=1.7.11" }
+solana-streamer = { path = "../streamer", version = "=1.7.11" }
+solana-sdk = { path = "../sdk", version = "=1.7.11" }
+solana-version = { path = "../version", version = "=1.7.11" }
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
diff --git a/banking-bench/src/main.rs b/banking-bench/src/main.rs
index 3c5527312b5649..b2bd5c35fda441 100644
--- a/banking-bench/src/main.rs
+++ b/banking-bench/src/main.rs
@@ -4,11 +4,7 @@ use crossbeam_channel::unbounded;
 use log::*;
 use rand::{thread_rng, Rng};
 use rayon::prelude::*;
-use solana_core::{
-    banking_stage::{create_test_recorder, BankingStage},
-    poh_recorder::PohRecorder,
-    poh_recorder::WorkingBankEntry,
-};
+use solana_core::banking_stage::BankingStage;
 use solana_gossip::{cluster_info::ClusterInfo, cluster_info::Node};
 use solana_ledger::{
     blockstore::Blockstore,
@@ -17,6 +13,7 @@ use solana_ledger::{
 };
 use solana_measure::measure::Measure;
 use solana_perf::packet::to_packets_chunked;
+use solana_poh::poh_recorder::{create_test_recorder, PohRecorder, WorkingBankEntry};
 use solana_runtime::{
     accounts_background_service::AbsRequestSender, bank::Bank, bank_forks::BankForks,
 };
@@ -28,6 +25,7 @@ use solana_sdk::{
     timing::{duration_as_us, timestamp},
     transaction::Transaction,
 };
+use solana_streamer::socket::SocketAddrSpace;
 use std::{
     sync::{atomic::Ordering, mpsc::Receiver, Arc, Mutex},
     thread::sleep,
@@ -77,7 +75,7 @@ fn make_accounts_txs(
         .into_par_iter()
         .map(|_| {
             let mut new = dummy.clone();
-            let sig: Vec<u8> = (0..64).map(|_| thread_rng().gen()).collect();
+            let sig: Vec<u8> = (0..64).map(|_| thread_rng().gen::<u8>()).collect();
             if !same_payer {
                 new.message.account_keys[0] = solana_sdk::pubkey::new_rand();
             }
@@ -188,7 +186,7 @@ fn main() {
             genesis_config.hash(),
         );
         // Ignore any pesky duplicate signature errors in the case we are using single-payer
-        let sig: Vec<u8> = (0..64).map(|_| thread_rng().gen()).collect();
+        let sig: Vec<u8> = (0..64).map(|_| thread_rng().gen::<u8>()).collect();
         fund.signatures = vec![Signature::new(&sig[0..64])];
         let x = bank.process_transaction(&fund);
         x.unwrap();
@@ -198,7 +196,7 @@ fn main() {
     if !skip_sanity {
         //sanity check, make sure all the transactions can execute sequentially
         transactions.iter().for_each(|tx| {
-            let res = bank.process_transaction(&tx);
+            let res = bank.process_transaction(tx);
             assert!(res.is_ok(), "sanity test transactions error: {:?}", res);
         });
         bank.clear_signatures();
@@ -218,7 +216,11 @@ fn main() {
         );
         let (exit, poh_recorder, poh_service, signal_receiver) =
             create_test_recorder(&bank, &blockstore, None);
-        let cluster_info = ClusterInfo::new_with_invalid_keypair(Node::new_localhost().info);
+        let cluster_info = ClusterInfo::new(
+            Node::new_localhost().info,
+            Arc::new(Keypair::new()),
+            SocketAddrSpace::Unspecified,
+        );
         let cluster_info = Arc::new(cluster_info);
         let banking_stage = BankingStage::new(
             &cluster_info,
@@ -354,7 +356,7 @@ fn main() {
             if bank.slot() > 0 && bank.slot() % 16 == 0 {
                 for tx in transactions.iter_mut() {
                     tx.message.recent_blockhash = bank.last_blockhash();
-                    let sig: Vec<u8> = (0..64).map(|_| thread_rng().gen()).collect();
+                    let sig: Vec<u8> = (0..64).map(|_| thread_rng().gen::<u8>()).collect();
                     tx.signatures[0] = Signature::new(&sig[0..64]);
                 }
                 verified = to_packets_chunked(&transactions.clone(), packets_per_chunk);
diff --git a/banks-client/Cargo.toml b/banks-client/Cargo.toml
index af80931fb97e4f..582c56a0f43910 100644
--- a/banks-client/Cargo.toml
+++ b/banks-client/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "solana-banks-client"
-version = "1.7.0"
+version = "1.7.11"
 description = "Solana banks client"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -11,20 +11,20 @@ edition = "2018"
 
 [dependencies]
 bincode = "1.3.1"
-borsh = "0.8.1"
-borsh-derive = "0.8.1"
+borsh = "0.9.0"
+borsh-derive = "0.9.0"
 futures = "0.3"
 mio = "0.7.6"
-solana-banks-interface = { path = "../banks-interface", version = "=1.7.0" }
-solana-program = { path = "../sdk/program", version = "=1.7.0" }
-solana-sdk = { path = "../sdk", version = "=1.7.0" }
+solana-banks-interface = { path = "../banks-interface", version = "=1.7.11" }
+solana-program = { path = "../sdk/program", version = "=1.7.11" }
+solana-sdk = { path = "../sdk", version = "=1.7.11" }
 tarpc = { version = "0.24.1", features = ["full"] }
 tokio = { version = "1", features = ["full"] }
 tokio-serde = { version = "0.8", features = ["bincode"] }
 
 [dev-dependencies]
-solana-runtime = { path = "../runtime", version = "=1.7.0" }
-solana-banks-server = { path = "../banks-server", version = "=1.7.0" }
+solana-runtime = { path = "../runtime", version = "=1.7.11" }
+solana-banks-server = { path = "../banks-server", version = "=1.7.11" }
 
 [lib]
 crate-type = ["lib"]
diff --git a/banks-client/src/lib.rs b/banks-client/src/lib.rs
index 5a4d36580e77b4..2c954175bc628b 100644
--- a/banks-client/src/lib.rs
+++ b/banks-client/src/lib.rs
@@ -10,8 +10,14 @@ use futures::{future::join_all, Future, FutureExt};
 pub use solana_banks_interface::{BanksClient as TarpcClient, TransactionStatus};
 use solana_banks_interface::{BanksRequest, BanksResponse};
 use solana_program::{
-    clock::Slot, fee_calculator::FeeCalculator, hash::Hash, program_pack::Pack, pubkey::Pubkey,
-    rent::Rent, sysvar,
+    clock::Clock,
+    clock::Slot,
+    fee_calculator::FeeCalculator,
+    hash::Hash,
+    program_pack::Pack,
+    pubkey::Pubkey,
+    rent::Rent,
+    sysvar::{self, Sysvar},
 };
 use solana_sdk::{
     account::{from_account, Account},
@@ -63,7 +69,7 @@ impl BanksClient {
         &mut self,
         ctx: Context,
         commitment: CommitmentLevel,
-    ) -> impl Future<Output = io::Result<(FeeCalculator, Hash, Slot)>> + '_ {
+    ) -> impl Future<Output = io::Result<(FeeCalculator, Hash, u64)>> + '_ {
         self.inner
             .get_fees_with_commitment_and_context(ctx, commitment)
     }
@@ -85,6 +91,14 @@ impl BanksClient {
         self.inner.get_slot_with_context(ctx, commitment)
     }
 
+    pub fn get_block_height_with_context(
+        &mut self,
+        ctx: Context,
+        commitment: CommitmentLevel,
+    ) -> impl Future<Output = io::Result<Slot>> + '_ {
+        self.inner.get_block_height_with_context(ctx, commitment)
+    }
+
     pub fn process_transaction_with_commitment_and_context(
         &mut self,
         ctx: Context,
@@ -115,24 +129,39 @@ impl BanksClient {
         self.send_transaction_with_context(context::current(), transaction)
     }
 
+    /// Return the cluster clock
+    pub fn get_clock(&mut self) -> impl Future<Output = io::Result<Clock>> + '_ {
+        self.get_account(sysvar::clock::id()).map(|result| {
+            let clock_sysvar = result?
+                .ok_or_else(|| io::Error::new(io::ErrorKind::Other, "Clock sysvar not present"))?;
+            from_account::<Clock, _>(&clock_sysvar).ok_or_else(|| {
+                io::Error::new(io::ErrorKind::Other, "Failed to deserialize Clock sysvar")
+            })
+        })
+    }
+
     /// Return the fee parameters associated with a recent, rooted blockhash. The cluster
     /// will use the transaction's blockhash to look up these same fee parameters and
     /// use them to calculate the transaction fee.
     pub fn get_fees(
         &mut self,
-    ) -> impl Future<Output = io::Result<(FeeCalculator, Hash, Slot)>> + '_ {
+    ) -> impl Future<Output = io::Result<(FeeCalculator, Hash, u64)>> + '_ {
         self.get_fees_with_commitment_and_context(context::current(), CommitmentLevel::default())
     }
 
+    /// Return the cluster Sysvar
+    pub fn get_sysvar<T: Sysvar>(&mut self) -> impl Future<Output = io::Result<T>> + '_ {
+        self.get_account(T::id()).map(|result| {
+            let sysvar = result?
+                .ok_or_else(|| io::Error::new(io::ErrorKind::Other, "Sysvar not present"))?;
+            from_account::<T, _>(&sysvar)
+                .ok_or_else(|| io::Error::new(io::ErrorKind::Other, "Failed to deserialize sysvar"))
+        })
+    }
+
     /// Return the cluster rent
     pub fn get_rent(&mut self) -> impl Future<Output = io::Result<Rent>> + '_ {
-        self.get_account(sysvar::rent::id()).map(|result| {
-            let rent_sysvar = result?
-                .ok_or_else(|| io::Error::new(io::ErrorKind::Other, "Rent sysvar not present"))?;
-            from_account::<Rent, _>(&rent_sysvar).ok_or_else(|| {
-                io::Error::new(io::ErrorKind::Other, "Failed to deserialize Rent sysvar")
-            })
-        })
+        self.get_sysvar::<Rent>()
     }
 
     /// Return a recent, rooted blockhash from the server. The cluster will only accept
@@ -192,12 +221,18 @@ impl BanksClient {
         self.process_transactions_with_commitment(transactions, CommitmentLevel::default())
     }
 
-    /// Return the most recent rooted slot height. All transactions at or below this height
-    /// are said to be finalized. The cluster will not fork to a higher slot height.
+    /// Return the most recent rooted slot. All transactions at or below this slot
+    /// are said to be finalized. The cluster will not fork to a higher slot.
     pub fn get_root_slot(&mut self) -> impl Future<Output = io::Result<Slot>> + '_ {
         self.get_slot_with_context(context::current(), CommitmentLevel::default())
     }
 
+    /// Return the most recent rooted block height. All transactions at or below this height
+    /// are said to be finalized. The cluster will not fork to a higher block height.
+    pub fn get_root_block_height(&mut self) -> impl Future<Output = io::Result<Slot>> + '_ {
+        self.get_block_height_with_context(context::current(), CommitmentLevel::default())
+    }
+
     /// Return the account at the given address at the slot corresponding to the given
     /// commitment level. If the account is not found, None is returned.
     pub fn get_account_with_commitment(
@@ -377,13 +412,13 @@ mod tests {
 
         let mint_pubkey = &genesis.mint_keypair.pubkey();
         let bob_pubkey = solana_sdk::pubkey::new_rand();
-        let instruction = system_instruction::transfer(&mint_pubkey, &bob_pubkey, 1);
-        let message = Message::new(&[instruction], Some(&mint_pubkey));
+        let instruction = system_instruction::transfer(mint_pubkey, &bob_pubkey, 1);
+        let message = Message::new(&[instruction], Some(mint_pubkey));
 
         Runtime::new()?.block_on(async {
             let client_transport = start_local_server(bank_forks, block_commitment_cache).await;
             let mut banks_client = start_client(client_transport).await?;
-            let (_, recent_blockhash, last_valid_slot) = banks_client.get_fees().await?;
+            let (_, recent_blockhash, last_valid_block_height) = banks_client.get_fees().await?;
             let transaction = Transaction::new(&[&genesis.mint_keypair], message, recent_blockhash);
             let signature = transaction.signatures[0];
             banks_client.send_transaction(transaction).await?;
@@ -391,8 +426,8 @@ mod tests {
             let mut status = banks_client.get_transaction_status(signature).await?;
 
             while status.is_none() {
-                let root_slot = banks_client.get_root_slot().await?;
-                if root_slot > last_valid_slot {
+                let root_block_height = banks_client.get_root_block_height().await?;
+                if root_block_height > last_valid_block_height {
                     break;
                 }
                 sleep(Duration::from_millis(100)).await;
diff --git a/banks-interface/Cargo.toml b/banks-interface/Cargo.toml
index 90aa3afea9a4f0..f50e993454558e 100644
--- a/banks-interface/Cargo.toml
+++ b/banks-interface/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "solana-banks-interface"
-version = "1.7.0"
+version = "1.7.11"
 description = "Solana banks RPC interface"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -12,7 +12,7 @@ edition = "2018"
 [dependencies]
 mio = "0.7.6"
 serde = { version = "1.0.122", features = ["derive"] }
-solana-sdk = { path = "../sdk", version = "=1.7.0" }
+solana-sdk = { path = "../sdk", version = "=1.7.11" }
 tarpc = { version = "0.24.1", features = ["full"] }
 
 [dev-dependencies]
diff --git a/banks-interface/src/lib.rs b/banks-interface/src/lib.rs
index 5c03e97382a78e..0ee4fddabb13ee 100644
--- a/banks-interface/src/lib.rs
+++ b/banks-interface/src/lib.rs
@@ -34,6 +34,7 @@ pub trait Banks {
     async fn get_transaction_status_with_context(signature: Signature)
         -> Option<TransactionStatus>;
     async fn get_slot_with_context(commitment: CommitmentLevel) -> Slot;
+    async fn get_block_height_with_context(commitment: CommitmentLevel) -> u64;
     async fn process_transaction_with_commitment_and_context(
         transaction: Transaction,
         commitment: CommitmentLevel,
diff --git a/banks-server/Cargo.toml b/banks-server/Cargo.toml
index b7d84f2cd1613a..ed4af13c0a78f0 100644
--- a/banks-server/Cargo.toml
+++ b/banks-server/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "solana-banks-server"
-version = "1.7.0"
+version = "1.7.11"
 description = "Solana banks server"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -14,10 +14,10 @@ bincode = "1.3.1"
 futures = "0.3"
 log = "0.4.11"
 mio = "0.7.6"
-solana-banks-interface = { path = "../banks-interface", version = "=1.7.0" }
-solana-runtime = { path = "../runtime", version = "=1.7.0" }
-solana-sdk = { path = "../sdk", version = "=1.7.0" }
-solana-metrics = { path = "../metrics", version = "=1.7.0" }
+solana-banks-interface = { path = "../banks-interface", version = "=1.7.11" }
+solana-runtime = { path = "../runtime", version = "=1.7.11" }
+solana-sdk = { path = "../sdk", version = "=1.7.11" }
+solana-metrics = { path = "../metrics", version = "=1.7.11" }
 tarpc = { version = "0.24.1", features = ["full"] }
 tokio = { version = "1", features = ["full"] }
 tokio-serde = { version = "0.8", features = ["bincode"] }
diff --git a/banks-server/src/banks_server.rs b/banks-server/src/banks_server.rs
index 1f1a303ac2da81..17d26746105b85 100644
--- a/banks-server/src/banks_server.rs
+++ b/banks-server/src/banks_server.rs
@@ -113,7 +113,7 @@ impl BanksServer {
         self,
         signature: &Signature,
         blockhash: &Hash,
-        last_valid_slot: Slot,
+        last_valid_block_height: u64,
         commitment: CommitmentLevel,
     ) -> Option<transaction::Result<()>> {
         let mut status = self
@@ -122,7 +122,7 @@ impl BanksServer {
         while status.is_none() {
             sleep(Duration::from_millis(200)).await;
             let bank = self.bank(commitment);
-            if bank.slot() > last_valid_slot {
+            if bank.block_height() > last_valid_block_height {
                 break;
             }
             status = bank.get_signature_status_with_blockhash(signature, blockhash);
@@ -131,10 +131,13 @@ impl BanksServer {
     }
 }
 
-fn verify_transaction(transaction: &Transaction) -> transaction::Result<()> {
+fn verify_transaction(
+    transaction: &Transaction,
+    libsecp256k1_0_5_upgrade_enabled: bool,
+) -> transaction::Result<()> {
     if let Err(err) = transaction.verify() {
         Err(err)
-    } else if let Err(err) = transaction.verify_precompiles() {
+    } else if let Err(err) = transaction.verify_precompiles(libsecp256k1_0_5_upgrade_enabled) {
         Err(err)
     } else {
         Ok(())
@@ -145,16 +148,19 @@ fn verify_transaction(transaction: &Transaction) -> transaction::Result<()> {
 impl Banks for BanksServer {
     async fn send_transaction_with_context(self, _: Context, transaction: Transaction) {
         let blockhash = &transaction.message.recent_blockhash;
-        let last_valid_slot = self
+        let last_valid_block_height = self
             .bank_forks
             .read()
             .unwrap()
             .root_bank()
-            .get_blockhash_last_valid_slot(&blockhash)
+            .get_blockhash_last_valid_block_height(blockhash)
             .unwrap();
         let signature = transaction.signatures.get(0).cloned().unwrap_or_default();
-        let info =
-            TransactionInfo::new(signature, serialize(&transaction).unwrap(), last_valid_slot);
+        let info = TransactionInfo::new(
+            signature,
+            serialize(&transaction).unwrap(),
+            last_valid_block_height,
+        );
         self.transaction_sender.send(info).unwrap();
     }
 
@@ -162,11 +168,13 @@ impl Banks for BanksServer {
         self,
         _: Context,
         commitment: CommitmentLevel,
-    ) -> (FeeCalculator, Hash, Slot) {
+    ) -> (FeeCalculator, Hash, u64) {
         let bank = self.bank(commitment);
         let (blockhash, fee_calculator) = bank.last_blockhash_with_fee_calculator();
-        let last_valid_slot = bank.get_blockhash_last_valid_slot(&blockhash).unwrap();
-        (fee_calculator, blockhash, last_valid_slot)
+        let last_valid_block_height = bank
+            .get_blockhash_last_valid_block_height(&blockhash)
+            .unwrap();
+        (fee_calculator, blockhash, last_valid_block_height)
     }
 
     async fn get_transaction_status_with_context(
@@ -209,29 +217,39 @@ impl Banks for BanksServer {
         self.slot(commitment)
     }
 
+    async fn get_block_height_with_context(self, _: Context, commitment: CommitmentLevel) -> u64 {
+        self.bank(commitment).block_height()
+    }
+
     async fn process_transaction_with_commitment_and_context(
         self,
         _: Context,
         transaction: Transaction,
         commitment: CommitmentLevel,
     ) -> Option<transaction::Result<()>> {
-        if let Err(err) = verify_transaction(&transaction) {
+        if let Err(err) = verify_transaction(
+            &transaction,
+            self.bank(commitment).libsecp256k1_0_5_upgrade_enabled(),
+        ) {
             return Some(Err(err));
         }
 
         let blockhash = &transaction.message.recent_blockhash;
-        let last_valid_slot = self
+        let last_valid_block_height = self
             .bank_forks
             .read()
             .unwrap()
             .root_bank()
-            .get_blockhash_last_valid_slot(blockhash)
+            .get_blockhash_last_valid_block_height(blockhash)
             .unwrap();
         let signature = transaction.signatures.get(0).cloned().unwrap_or_default();
-        let info =
-            TransactionInfo::new(signature, serialize(&transaction).unwrap(), last_valid_slot);
+        let info = TransactionInfo::new(
+            signature,
+            serialize(&transaction).unwrap(),
+            last_valid_block_height,
+        );
         self.transaction_sender.send(info).unwrap();
-        self.poll_signature_status(&signature, blockhash, last_valid_slot, commitment)
+        self.poll_signature_status(&signature, blockhash, last_valid_block_height, commitment)
             .await
     }
 
diff --git a/banks-server/src/send_transaction_service.rs b/banks-server/src/send_transaction_service.rs
index 54eb6b3f4d7e9a..0371474dbc5b29 100644
--- a/banks-server/src/send_transaction_service.rs
+++ b/banks-server/src/send_transaction_service.rs
@@ -2,7 +2,7 @@
 use log::*;
 use solana_metrics::{datapoint_warn, inc_new_counter_info};
 use solana_runtime::{bank::Bank, bank_forks::BankForks};
-use solana_sdk::{clock::Slot, signature::Signature};
+use solana_sdk::signature::Signature;
 use std::{
     collections::HashMap,
     net::{SocketAddr, UdpSocket},
@@ -24,15 +24,19 @@ pub struct SendTransactionService {
 pub struct TransactionInfo {
     pub signature: Signature,
     pub wire_transaction: Vec<u8>,
-    pub last_valid_slot: Slot,
+    pub last_valid_block_height: u64,
 }
 
 impl TransactionInfo {
-    pub fn new(signature: Signature, wire_transaction: Vec<u8>, last_valid_slot: Slot) -> Self {
+    pub fn new(
+        signature: Signature,
+        wire_transaction: Vec<u8>,
+        last_valid_block_height: u64,
+    ) -> Self {
         Self {
             signature,
             wire_transaction,
-            last_valid_slot,
+            last_valid_block_height,
         }
     }
 }
@@ -124,7 +128,7 @@ impl SendTransactionService {
                 result.rooted += 1;
                 inc_new_counter_info!("send_transaction_service-rooted", 1);
                 false
-            } else if transaction_info.last_valid_slot < root_bank.slot() {
+            } else if transaction_info.last_valid_block_height < root_bank.block_height() {
                 info!("Dropping expired transaction: {}", signature);
                 result.expired += 1;
                 inc_new_counter_info!("send_transaction_service-expired", 1);
@@ -138,8 +142,8 @@ impl SendTransactionService {
                         result.retried += 1;
                         inc_new_counter_info!("send_transaction_service-retry", 1);
                         Self::send_transaction(
-                            &send_socket,
-                            &tpu_address,
+                            send_socket,
+                            tpu_address,
                             &transaction_info.wire_transaction,
                         );
                         true
diff --git a/bench-exchange/Cargo.toml b/bench-exchange/Cargo.toml
index 9c0d8a89d5316e..4cce4905aa28de 100644
--- a/bench-exchange/Cargo.toml
+++ b/bench-exchange/Cargo.toml
@@ -2,7 +2,7 @@
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 edition = "2018"
 name = "solana-bench-exchange"
-version = "1.7.0"
+version = "1.7.11"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
@@ -18,22 +18,23 @@ rand = "0.7.0"
 rayon = "1.5.0"
 serde_json = "1.0.56"
 serde_yaml = "0.8.13"
-solana-clap-utils = { path = "../clap-utils", version = "=1.7.0" }
-solana-core = { path = "../core", version = "=1.7.0" }
-solana-genesis = { path = "../genesis", version = "=1.7.0" }
-solana-client = { path = "../client", version = "=1.7.0" }
-solana-exchange-program = { path = "../programs/exchange", version = "=1.7.0" }
-solana-faucet = { path = "../faucet", version = "=1.7.0" }
-solana-gossip = { path = "../gossip", version = "=1.7.0" }
-solana-logger = { path = "../logger", version = "=1.7.0" }
-solana-metrics = { path = "../metrics", version = "=1.7.0" }
-solana-net-utils = { path = "../net-utils", version = "=1.7.0" }
-solana-runtime = { path = "../runtime", version = "=1.7.0" }
-solana-sdk = { path = "../sdk", version = "=1.7.0" }
-solana-version = { path = "../version", version = "=1.7.0" }
+solana-clap-utils = { path = "../clap-utils", version = "=1.7.11" }
+solana-core = { path = "../core", version = "=1.7.11" }
+solana-genesis = { path = "../genesis", version = "=1.7.11" }
+solana-client = { path = "../client", version = "=1.7.11" }
+solana-exchange-program = { path = "../programs/exchange", version = "=1.7.11" }
+solana-faucet = { path = "../faucet", version = "=1.7.11" }
+solana-gossip = { path = "../gossip", version = "=1.7.11" }
+solana-logger = { path = "../logger", version = "=1.7.11" }
+solana-metrics = { path = "../metrics", version = "=1.7.11" }
+solana-net-utils = { path = "../net-utils", version = "=1.7.11" }
+solana-runtime = { path = "../runtime", version = "=1.7.11" }
+solana-sdk = { path = "../sdk", version = "=1.7.11" }
+solana-streamer = { path = "../streamer", version = "=1.7.11" }
+solana-version = { path = "../version", version = "=1.7.11" }
 
 [dev-dependencies]
-solana-local-cluster = { path = "../local-cluster", version = "=1.7.0" }
+solana-local-cluster = { path = "../local-cluster", version = "=1.7.11" }
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
diff --git a/bench-exchange/src/bench.rs b/bench-exchange/src/bench.rs
index f975d1602f1345..cffb7605be56ff 100644
--- a/bench-exchange/src/bench.rs
+++ b/bench-exchange/src/bench.rs
@@ -451,13 +451,13 @@ fn swapper<T>(
             let to_swap_txs: Vec<_> = to_swap
                 .par_iter()
                 .map(|(signer, swap, profit)| {
-                    let s: &Keypair = &signer;
+                    let s: &Keypair = signer;
                     let owner = &signer.pubkey();
                     let instruction = exchange_instruction::swap_request(
                         owner,
                         &swap.0.pubkey,
                         &swap.1.pubkey,
-                        &profit,
+                        profit,
                     );
                     let message = Message::new(&[instruction], Some(&s.pubkey()));
                     Transaction::new(&[s], message, blockhash)
@@ -600,7 +600,7 @@ fn trader<T>(
                             src,
                         ),
                     ];
-                    let message = Message::new(&instructions, Some(&owner_pubkey));
+                    let message = Message::new(&instructions, Some(owner_pubkey));
                     Transaction::new(&[owner.as_ref(), trade], message, blockhash)
                 })
                 .collect();
@@ -739,7 +739,7 @@ pub fn fund_keys<T: Client>(client: &T, source: &Keypair, dests: &[Arc<Keypair>]
             let mut to_fund_txs: Vec<_> = chunk
                 .par_iter()
                 .map(|(k, m)| {
-                    let instructions = system_instruction::transfer_many(&k.pubkey(), &m);
+                    let instructions = system_instruction::transfer_many(&k.pubkey(), m);
                     let message = Message::new(&instructions, Some(&k.pubkey()));
                     (k.clone(), Transaction::new_unsigned(message))
                 })
@@ -777,7 +777,7 @@ pub fn fund_keys<T: Client>(client: &T, source: &Keypair, dests: &[Arc<Keypair>]
                 let mut waits = 0;
                 loop {
                     sleep(Duration::from_millis(200));
-                    to_fund_txs.retain(|(_, tx)| !verify_funding_transfer(client, &tx, amount));
+                    to_fund_txs.retain(|(_, tx)| !verify_funding_transfer(client, tx, amount));
                     if to_fund_txs.is_empty() {
                         break;
                     }
@@ -836,7 +836,7 @@ pub fn create_token_accounts<T: Client>(
                     );
                     let request_ix =
                         exchange_instruction::account_request(owner_pubkey, &new_keypair.pubkey());
-                    let message = Message::new(&[create_ix, request_ix], Some(&owner_pubkey));
+                    let message = Message::new(&[create_ix, request_ix], Some(owner_pubkey));
                     (
                         (from_keypair, new_keypair),
                         Transaction::new_unsigned(message),
@@ -872,7 +872,7 @@ pub fn create_token_accounts<T: Client>(
                 let mut waits = 0;
                 while !to_create_txs.is_empty() {
                     sleep(Duration::from_millis(200));
-                    to_create_txs.retain(|(_, tx)| !verify_transaction(client, &tx));
+                    to_create_txs.retain(|(_, tx)| !verify_transaction(client, tx));
                     if to_create_txs.is_empty() {
                         break;
                     }
@@ -958,7 +958,7 @@ fn compute_and_report_stats(maxes: &Arc<RwLock<Vec<(String, SampleStats)>>>, tot
 
 fn generate_keypairs(num: u64) -> Vec<Keypair> {
     let mut seed = [0_u8; 32];
-    seed.copy_from_slice(&Keypair::new().pubkey().as_ref());
+    seed.copy_from_slice(Keypair::new().pubkey().as_ref());
     let mut rnd = GenKeys::new(seed);
     rnd.gen_n_keypairs(num)
 }
@@ -989,7 +989,7 @@ pub fn airdrop_lamports<T: Client>(
         let (blockhash, _fee_calculator, _last_valid_slot) = client
             .get_recent_blockhash_with_commitment(CommitmentConfig::processed())
             .expect("Failed to get blockhash");
-        match request_airdrop_transaction(&faucet_addr, &id.pubkey(), amount_to_drop, blockhash) {
+        match request_airdrop_transaction(faucet_addr, &id.pubkey(), amount_to_drop, blockhash) {
             Ok(transaction) => {
                 let signature = client.async_send_transaction(transaction).unwrap();
 
diff --git a/bench-exchange/src/main.rs b/bench-exchange/src/main.rs
index 8986a67e6895fb..4e52f4027a89c7 100644
--- a/bench-exchange/src/main.rs
+++ b/bench-exchange/src/main.rs
@@ -7,6 +7,7 @@ use crate::bench::{airdrop_lamports, create_client_accounts_file, do_bench_excha
 use log::*;
 use solana_gossip::gossip_service::{discover_cluster, get_multi_client};
 use solana_sdk::signature::Signer;
+use solana_streamer::socket::SocketAddrSpace;
 
 fn main() {
     solana_logger::setup();
@@ -55,11 +56,12 @@ fn main() {
         );
     } else {
         info!("Connecting to the cluster");
-        let nodes = discover_cluster(&entrypoint_addr, num_nodes).unwrap_or_else(|_| {
-            panic!("Failed to discover nodes");
-        });
+        let nodes = discover_cluster(&entrypoint_addr, num_nodes, SocketAddrSpace::Unspecified)
+            .unwrap_or_else(|_| {
+                panic!("Failed to discover nodes");
+            });
 
-        let (client, num_clients) = get_multi_client(&nodes);
+        let (client, num_clients) = get_multi_client(&nodes, &SocketAddrSpace::Unspecified);
 
         info!("{} nodes found", num_clients);
         if num_clients < num_nodes {
diff --git a/bench-exchange/tests/bench_exchange.rs b/bench-exchange/tests/bench_exchange.rs
index 0cba65a7ff3671..081791e439c4ff 100644
--- a/bench-exchange/tests/bench_exchange.rs
+++ b/bench-exchange/tests/bench_exchange.rs
@@ -15,6 +15,7 @@ use solana_sdk::{
     genesis_config::create_genesis_config,
     signature::{Keypair, Signer},
 };
+use solana_streamer::socket::SocketAddrSpace;
 use std::{process::exit, sync::mpsc::channel, time::Duration};
 
 #[test]
@@ -43,13 +44,19 @@ fn test_exchange_local_cluster() {
     } = config;
     let accounts_in_groups = batch_size * account_groups;
 
-    let cluster = LocalCluster::new(&mut ClusterConfig {
-        node_stakes: vec![100_000; NUM_NODES],
-        cluster_lamports: 100_000_000_000_000,
-        validator_configs: make_identical_validator_configs(&ValidatorConfig::default(), NUM_NODES),
-        native_instruction_processors: [solana_exchange_program!()].to_vec(),
-        ..ClusterConfig::default()
-    });
+    let cluster = LocalCluster::new(
+        &mut ClusterConfig {
+            node_stakes: vec![100_000; NUM_NODES],
+            cluster_lamports: 100_000_000_000_000,
+            validator_configs: make_identical_validator_configs(
+                &ValidatorConfig::default(),
+                NUM_NODES,
+            ),
+            native_instruction_processors: [solana_exchange_program!()].to_vec(),
+            ..ClusterConfig::default()
+        },
+        SocketAddrSpace::Unspecified,
+    );
 
     let faucet_keypair = Keypair::new();
     cluster.transfer(
@@ -66,13 +73,17 @@ fn test_exchange_local_cluster() {
         .expect("faucet_addr");
 
     info!("Connecting to the cluster");
-    let nodes =
-        discover_cluster(&cluster.entry_point_info.gossip, NUM_NODES).unwrap_or_else(|err| {
-            error!("Failed to discover {} nodes: {:?}", NUM_NODES, err);
-            exit(1);
-        });
+    let nodes = discover_cluster(
+        &cluster.entry_point_info.gossip,
+        NUM_NODES,
+        SocketAddrSpace::Unspecified,
+    )
+    .unwrap_or_else(|err| {
+        error!("Failed to discover {} nodes: {:?}", NUM_NODES, err);
+        exit(1);
+    });
 
-    let (client, num_clients) = get_multi_client(&nodes);
+    let (client, num_clients) = get_multi_client(&nodes, &SocketAddrSpace::Unspecified);
 
     info!("clients: {}", num_clients);
     assert!(num_clients >= NUM_NODES);
diff --git a/bench-streamer/Cargo.toml b/bench-streamer/Cargo.toml
index 430908d99a0040..4c7fe1b628c908 100644
--- a/bench-streamer/Cargo.toml
+++ b/bench-streamer/Cargo.toml
@@ -2,7 +2,7 @@
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 edition = "2018"
 name = "solana-bench-streamer"
-version = "1.7.0"
+version = "1.7.11"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
@@ -10,11 +10,11 @@ publish = false
 
 [dependencies]
 clap = "2.33.1"
-solana-clap-utils = { path = "../clap-utils", version = "=1.7.0" }
-solana-streamer = { path = "../streamer", version = "=1.7.0" }
-solana-logger = { path = "../logger", version = "=1.7.0" }
-solana-net-utils = { path = "../net-utils", version = "=1.7.0" }
-solana-version = { path = "../version", version = "=1.7.0" }
+solana-clap-utils = { path = "../clap-utils", version = "=1.7.11" }
+solana-streamer = { path = "../streamer", version = "=1.7.11" }
+solana-logger = { path = "../logger", version = "=1.7.11" }
+solana-net-utils = { path = "../net-utils", version = "=1.7.11" }
+solana-version = { path = "../version", version = "=1.7.11" }
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
diff --git a/bench-streamer/src/main.rs b/bench-streamer/src/main.rs
index 18fa4f0d0eae84..4e1f070eb0fa65 100644
--- a/bench-streamer/src/main.rs
+++ b/bench-streamer/src/main.rs
@@ -18,7 +18,7 @@ fn producer(addr: &SocketAddr, exit: Arc<AtomicBool>) -> JoinHandle<()> {
     msgs.packets.resize(10, Packet::default());
     for w in msgs.packets.iter_mut() {
         w.meta.size = PACKET_DATA_SIZE;
-        w.meta.set_addr(&addr);
+        w.meta.set_addr(addr);
     }
     let msgs = Arc::new(msgs);
     spawn(move || loop {
@@ -92,6 +92,7 @@ fn main() -> Result<()> {
             recycler.clone(),
             "bench-streamer-test",
             1,
+            true,
         ));
     }
 
diff --git a/bench-tps/Cargo.toml b/bench-tps/Cargo.toml
index 813ed90479ff2d..c7de9a0851c373 100644
--- a/bench-tps/Cargo.toml
+++ b/bench-tps/Cargo.toml
@@ -2,7 +2,7 @@
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 edition = "2018"
 name = "solana-bench-tps"
-version = "1.7.0"
+version = "1.7.11"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
@@ -15,23 +15,24 @@ log = "0.4.11"
 rayon = "1.5.0"
 serde_json = "1.0.56"
 serde_yaml = "0.8.13"
-solana-clap-utils = { path = "../clap-utils", version = "=1.7.0" }
-solana-core = { path = "../core", version = "=1.7.0" }
-solana-genesis = { path = "../genesis", version = "=1.7.0" }
-solana-client = { path = "../client", version = "=1.7.0" }
-solana-faucet = { path = "../faucet", version = "=1.7.0" }
-solana-gossip = { path = "../gossip", version = "=1.7.0" }
-solana-logger = { path = "../logger", version = "=1.7.0" }
-solana-metrics = { path = "../metrics", version = "=1.7.0" }
-solana-measure = { path = "../measure", version = "=1.7.0" }
-solana-net-utils = { path = "../net-utils", version = "=1.7.0" }
-solana-runtime = { path = "../runtime", version = "=1.7.0" }
-solana-sdk = { path = "../sdk", version = "=1.7.0" }
-solana-version = { path = "../version", version = "=1.7.0" }
+solana-clap-utils = { path = "../clap-utils", version = "=1.7.11" }
+solana-core = { path = "../core", version = "=1.7.11" }
+solana-genesis = { path = "../genesis", version = "=1.7.11" }
+solana-client = { path = "../client", version = "=1.7.11" }
+solana-faucet = { path = "../faucet", version = "=1.7.11" }
+solana-gossip = { path = "../gossip", version = "=1.7.11" }
+solana-logger = { path = "../logger", version = "=1.7.11" }
+solana-metrics = { path = "../metrics", version = "=1.7.11" }
+solana-measure = { path = "../measure", version = "=1.7.11" }
+solana-net-utils = { path = "../net-utils", version = "=1.7.11" }
+solana-runtime = { path = "../runtime", version = "=1.7.11" }
+solana-sdk = { path = "../sdk", version = "=1.7.11" }
+solana-streamer = { path = "../streamer", version = "=1.7.11" }
+solana-version = { path = "../version", version = "=1.7.11" }
 
 [dev-dependencies]
 serial_test = "0.4.0"
-solana-local-cluster = { path = "../local-cluster", version = "=1.7.0" }
+solana-local-cluster = { path = "../local-cluster", version = "=1.7.11" }
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
diff --git a/bench-tps/src/bench.rs b/bench-tps/src/bench.rs
index 084b81ddec2f00..a2c21ce7efead1 100644
--- a/bench-tps/src/bench.rs
+++ b/bench-tps/src/bench.rs
@@ -544,12 +544,12 @@ impl<'a> FundingTransactions<'a> for Vec<(&'a Keypair, Transaction)> {
 
             // re-sign retained to_fund_txes with updated blockhash
             self.sign(blockhash);
-            self.send(&client);
+            self.send(client);
 
             // Sleep a few slots to allow transactions to process
             sleep(Duration::from_secs(1));
 
-            self.verify(&client, to_lamports);
+            self.verify(client, to_lamports);
 
             // retry anything that seems to have dropped through cracks
             //  again since these txs are all or nothing, they're fine to
@@ -564,7 +564,7 @@ impl<'a> FundingTransactions<'a> for Vec<(&'a Keypair, Transaction)> {
         let to_fund_txs: Vec<(&Keypair, Transaction)> = to_fund
             .par_iter()
             .map(|(k, t)| {
-                let instructions = system_instruction::transfer_many(&k.pubkey(), &t);
+                let instructions = system_instruction::transfer_many(&k.pubkey(), t);
                 let message = Message::new(&instructions, Some(&k.pubkey()));
                 (*k, Transaction::new_unsigned(message))
             })
@@ -617,7 +617,7 @@ impl<'a> FundingTransactions<'a> for Vec<(&'a Keypair, Transaction)> {
                         return None;
                     }
 
-                    let verified = if verify_funding_transfer(&client, &tx, to_lamports) {
+                    let verified = if verify_funding_transfer(&client, tx, to_lamports) {
                         verified_txs.fetch_add(1, Ordering::Relaxed);
                         Some(k.pubkey())
                     } else {
@@ -733,7 +733,7 @@ pub fn airdrop_lamports<T: Client>(
         );
 
         let (blockhash, _fee_calculator) = get_recent_blockhash(client);
-        match request_airdrop_transaction(&faucet_addr, &id.pubkey(), airdrop_amount, blockhash) {
+        match request_airdrop_transaction(faucet_addr, &id.pubkey(), airdrop_amount, blockhash) {
             Ok(transaction) => {
                 let mut tries = 0;
                 loop {
diff --git a/bench-tps/src/main.rs b/bench-tps/src/main.rs
index abb9b3a7eb4491..03ae9f7463d976 100644
--- a/bench-tps/src/main.rs
+++ b/bench-tps/src/main.rs
@@ -7,6 +7,7 @@ use solana_gossip::gossip_service::{discover_cluster, get_client, get_multi_clie
 use solana_sdk::fee_calculator::FeeRateGovernor;
 use solana_sdk::signature::{Keypair, Signer};
 use solana_sdk::system_program;
+use solana_streamer::socket::SocketAddrSpace;
 use std::{collections::HashMap, fs::File, io::prelude::*, path::Path, process::exit, sync::Arc};
 
 /// Number of signatures for all transactions in ~1 week at ~100K TPS
@@ -39,7 +40,7 @@ fn main() {
     let keypair_count = *tx_count * keypair_multiplier;
     if *write_to_client_file {
         info!("Generating {} keypairs", keypair_count);
-        let (keypairs, _) = generate_keypairs(&id, keypair_count as u64);
+        let (keypairs, _) = generate_keypairs(id, keypair_count as u64);
         let num_accounts = keypairs.len() as u64;
         let max_fee =
             FeeRateGovernor::new(*target_lamports_per_signature, 0).max_lamports_per_signature;
@@ -68,13 +69,14 @@ fn main() {
     }
 
     info!("Connecting to the cluster");
-    let nodes = discover_cluster(&entrypoint_addr, *num_nodes).unwrap_or_else(|err| {
-        eprintln!("Failed to discover {} nodes: {:?}", num_nodes, err);
-        exit(1);
-    });
+    let nodes = discover_cluster(entrypoint_addr, *num_nodes, SocketAddrSpace::Unspecified)
+        .unwrap_or_else(|err| {
+            eprintln!("Failed to discover {} nodes: {:?}", num_nodes, err);
+            exit(1);
+        });
 
     let client = if *multi_client {
-        let (client, num_clients) = get_multi_client(&nodes);
+        let (client, num_clients) = get_multi_client(&nodes, &SocketAddrSpace::Unspecified);
         if nodes.len() < num_clients {
             eprintln!(
                 "Error: Insufficient nodes discovered.  Expecting {} or more",
@@ -88,7 +90,7 @@ fn main() {
         let mut target_client = None;
         for node in nodes {
             if node.id == *target_node {
-                target_client = Some(Arc::new(get_client(&[node])));
+                target_client = Some(Arc::new(get_client(&[node], &SocketAddrSpace::Unspecified)));
                 break;
             }
         }
@@ -97,7 +99,7 @@ fn main() {
             exit(1);
         })
     } else {
-        Arc::new(get_client(&nodes))
+        Arc::new(get_client(&nodes, &SocketAddrSpace::Unspecified))
     };
 
     let keypairs = if *read_from_client_file {
@@ -135,7 +137,7 @@ fn main() {
         generate_and_fund_keypairs(
             client.clone(),
             Some(*faucet_addr),
-            &id,
+            id,
             keypair_count,
             *num_lamports_per_account,
         )
diff --git a/bench-tps/tests/bench_tps.rs b/bench-tps/tests/bench_tps.rs
index 2aab3983cc4d9e..26e6a1f895afe4 100644
--- a/bench-tps/tests/bench_tps.rs
+++ b/bench-tps/tests/bench_tps.rs
@@ -13,6 +13,7 @@ use solana_local_cluster::{
     validator_configs::make_identical_validator_configs,
 };
 use solana_sdk::signature::{Keypair, Signer};
+use solana_streamer::socket::SocketAddrSpace;
 use std::{
     sync::{mpsc::channel, Arc},
     time::Duration,
@@ -23,13 +24,19 @@ fn test_bench_tps_local_cluster(config: Config) {
 
     solana_logger::setup();
     const NUM_NODES: usize = 1;
-    let cluster = LocalCluster::new(&mut ClusterConfig {
-        node_stakes: vec![999_990; NUM_NODES],
-        cluster_lamports: 200_000_000,
-        validator_configs: make_identical_validator_configs(&ValidatorConfig::default(), NUM_NODES),
-        native_instruction_processors,
-        ..ClusterConfig::default()
-    });
+    let cluster = LocalCluster::new(
+        &mut ClusterConfig {
+            node_stakes: vec![999_990; NUM_NODES],
+            cluster_lamports: 200_000_000,
+            validator_configs: make_identical_validator_configs(
+                &ValidatorConfig::default(),
+                NUM_NODES,
+            ),
+            native_instruction_processors,
+            ..ClusterConfig::default()
+        },
+        SocketAddrSpace::Unspecified,
+    );
 
     let faucet_keypair = Keypair::new();
     cluster.transfer(
diff --git a/ci/buildkite-pipeline.sh b/ci/buildkite-pipeline.sh
index c92426f28af5ce..671d3f0c143f0f 100755
--- a/ci/buildkite-pipeline.sh
+++ b/ci/buildkite-pipeline.sh
@@ -148,6 +148,33 @@ all_test_steps() {
   command_step stable ". ci/rust-version.sh; ci/docker-run.sh \$\$rust_stable_docker_image ci/test-stable.sh" 60
   wait_step
 
+  # BPF test suite
+  if affects \
+             .rs$ \
+             Cargo.lock$ \
+             Cargo.toml$ \
+             ^ci/rust-version.sh \
+             ^ci/test-stable-bpf.sh \
+             ^ci/test-stable.sh \
+             ^ci/test-local-cluster.sh \
+             ^core/build.rs \
+             ^fetch-perf-libs.sh \
+             ^programs/ \
+             ^sdk/ \
+      ; then
+    cat >> "$output_file" <<"EOF"
+  - command: "ci/test-stable-bpf.sh"
+    name: "stable-bpf"
+    timeout_in_minutes: 20
+    artifact_paths: "bpf-dumps.tar.bz2"
+    agents:
+      - "queue=default"
+EOF
+  else
+    annotate --style info \
+      "Stable-BPF skipped as no relevant files were modified"
+  fi
+
   # Perf test suite
   if affects \
              .rs$ \
@@ -165,7 +192,7 @@ all_test_steps() {
     cat >> "$output_file" <<"EOF"
   - command: "ci/test-stable-perf.sh"
     name: "stable-perf"
-    timeout_in_minutes: 40
+    timeout_in_minutes: 20
     artifact_paths: "log-*.txt"
     agents:
       - "queue=cuda"
diff --git a/ci/buildkite-secondary.yml b/ci/buildkite-secondary.yml
index 1be27d2fcb92b7..6b3c02846791b1 100644
--- a/ci/buildkite-secondary.yml
+++ b/ci/buildkite-secondary.yml
@@ -3,13 +3,19 @@
 # Pull requests to not run these steps.
 steps:
   - command: "ci/publish-tarball.sh"
+    agents:
+      - "queue=release-build"
     timeout_in_minutes: 60
     name: "publish tarball"
   - wait
   - command: "sdk/docker-solana/build.sh"
+    agents:
+      - "queue=release-build"
     timeout_in_minutes: 60
     name: "publish docker"
   - command: "ci/publish-crate.sh"
+    agents:
+      - "queue=release-build"
     timeout_in_minutes: 240
     name: "publish crate"
     branches: "!master"
diff --git a/ci/do-audit.sh b/ci/do-audit.sh
index b6c1b86be1a326..71a0465d6fbf69 100755
--- a/ci/do-audit.sh
+++ b/ci/do-audit.sh
@@ -28,16 +28,23 @@ cargo_audit_ignores=(
   # Blocked on multiple crates updating `time` to >= 0.2.23
   --ignore RUSTSEC-2020-0071
 
-  # difference is unmaintained
-  #
-  # Blocked on predicates v1.0.6 removing its dependency on `difference`
-  --ignore RUSTSEC-2020-0095
-
   # generic-array: arr! macro erases lifetimes
   #
   # Blocked on libsecp256k1 releasing with upgraded dependencies
   # https://github.com/paritytech/libsecp256k1/issues/66
   --ignore RUSTSEC-2020-0146
 
+  # hyper: Lenient `hyper` header parsing of `Content-Length` could allow request smuggling
+  #
+  # Blocked on jsonrpc removing dependency on unmaintained `websocket`
+  # https://github.com/paritytech/jsonrpc/issues/605
+  --ignore RUSTSEC-2021-0078
+
+  # hyper: Integer overflow in `hyper`'s parsing of the `Transfer-Encoding` header leads to data loss
+  #
+  # Blocked on jsonrpc removing dependency on unmaintained `websocket`
+  # https://github.com/paritytech/jsonrpc/issues/605
+  --ignore RUSTSEC-2021-0079
+
 )
 scripts/cargo-for-all-lock-files.sh stable audit "${cargo_audit_ignores[@]}"
diff --git a/ci/env.sh b/ci/env.sh
index d075b259997020..973f4c85323bf1 100644
--- a/ci/env.sh
+++ b/ci/env.sh
@@ -74,10 +74,13 @@ else
   export CI_BUILD_ID=
   export CI_COMMIT=
   export CI_JOB_ID=
-  export CI_OS_NAME=
   export CI_PULL_REQUEST=
   export CI_REPO_SLUG=
   export CI_TAG=
+  # Don't override ci/run-local.sh
+  if [[ -z $CI_LOCAL_RUN ]]; then
+    export CI_OS_NAME=
+  fi
 fi
 
 cat <<EOF
diff --git a/ci/localnet-sanity.sh b/ci/localnet-sanity.sh
index d5dbf12a56e90b..f827c0443f5235 100755
--- a/ci/localnet-sanity.sh
+++ b/ci/localnet-sanity.sh
@@ -127,7 +127,7 @@ startNode() {
 waitForNodeToInit() {
   declare initCompleteFile=$1
   while [[ ! -r $initCompleteFile ]]; do
-    if [[ $SECONDS -ge 240 ]]; then
+    if [[ $SECONDS -ge 300 ]]; then
       echo "^^^ +++"
       echo "Error: $initCompleteFile not found in $SECONDS seconds"
       exit 1
diff --git a/ci/order-crates-for-publishing.py b/ci/order-crates-for-publishing.py
index efa5e0aca33463..05f572b2a912a8 100755
--- a/ci/order-crates-for-publishing.py
+++ b/ci/order-crates-for-publishing.py
@@ -12,10 +12,14 @@
 import subprocess
 import sys;
 
+real_file = os.path.realpath(__file__)
+ci_path = os.path.dirname(real_file)
+src_root = os.path.dirname(ci_path)
+
 def load_metadata():
+    cmd = f'{src_root}/cargo metadata --no-deps --format-version=1'
     return json.loads(subprocess.Popen(
-        'cargo metadata --no-deps --format-version=1',
-        shell=True, stdout=subprocess.PIPE).communicate()[0])
+        cmd, shell=True, stdout=subprocess.PIPE).communicate()[0])
 
 def get_packages():
     metadata = load_metadata()
diff --git a/ci/run-local.sh b/ci/run-local.sh
new file mode 100755
index 00000000000000..092f35f562b66d
--- /dev/null
+++ b/ci/run-local.sh
@@ -0,0 +1,55 @@
+#!/usr/bin/env bash
+
+cd "$(dirname "$0")/.."
+
+export CI_LOCAL_RUN=true
+
+set -e
+
+case $(uname -o) in
+  */Linux)
+    export CI_OS_NAME=linux
+    ;;
+  *)
+    echo "local CI runs are only supported on Linux" 1>&2
+    exit 1
+    ;;
+esac
+
+steps=()
+steps+=(test-sanity)
+steps+=(shellcheck)
+steps+=(test-checks)
+steps+=(test-coverage)
+steps+=(test-stable)
+steps+=(test-stable-bpf)
+steps+=(test-stable-perf)
+steps+=(test-downstream-builds)
+steps+=(test-bench)
+steps+=(test-local-cluster)
+
+step_index=0
+if [[ -n "$1" ]]; then
+  start_step="$1"
+  while [[ $step_index -lt ${#steps[@]} ]]; do
+    step="${steps[$step_index]}"
+    if [[ "$step" = "$start_step" ]]; then
+      break
+    fi
+    step_index=$((step_index + 1))
+  done
+  if [[ $step_index -eq ${#steps[@]} ]]; then
+    echo "unexpected start step: \"$start_step\"" 1>&2
+    exit 1
+  else
+    echo "** starting at step: \"$start_step\" **"
+    echo
+  fi
+fi
+
+while [[ $step_index -lt ${#steps[@]} ]]; do
+  step="${steps[$step_index]}"
+  cmd="ci/${step}.sh"
+  $cmd
+  step_index=$((step_index + 1))
+done
diff --git a/ci/setup-new-buildkite-agent/setup-buildkite.sh b/ci/setup-new-buildkite-agent/setup-buildkite.sh
index c3c6a33cbb62e9..b28110ccf68a9a 100755
--- a/ci/setup-new-buildkite-agent/setup-buildkite.sh
+++ b/ci/setup-new-buildkite-agent/setup-buildkite.sh
@@ -76,7 +76,7 @@ RestartForceExitStatus=SIGPIPE
 TimeoutStartSec=10
 TimeoutStopSec=0
 KillMode=process
-LimitNOFILE=700000
+LimitNOFILE=1000000
 
 [Install]
 WantedBy=multi-user.target
diff --git a/ci/setup-new-buildkite-agent/setup-limits.sh b/ci/setup-new-buildkite-agent/setup-limits.sh
index cf0c0be273137f..7fc4d5ad70be4e 100755
--- a/ci/setup-new-buildkite-agent/setup-limits.sh
+++ b/ci/setup-new-buildkite-agent/setup-limits.sh
@@ -8,5 +8,5 @@ source "$HERE"/utils.sh
 ensure_env || exit 1
 
 # Allow more files to be opened by a user
-echo "* - nofile 700000" > /etc/security/limits.d/90-solana-nofiles.conf
+echo "* - nofile 1000000" > /etc/security/limits.d/90-solana-nofiles.conf
 
diff --git a/ci/test-bench.sh b/ci/test-bench.sh
index f2480f9882dd1c..ef56bcb1eff2e0 100755
--- a/ci/test-bench.sh
+++ b/ci/test-bench.sh
@@ -49,6 +49,10 @@ _ "$cargo" nightly bench --manifest-path runtime/Cargo.toml ${V:+--verbose} \
 _ "$cargo" nightly bench --manifest-path gossip/Cargo.toml ${V:+--verbose} \
   -- -Z unstable-options --format=json | tee -a "$BENCH_FILE"
 
+# Run poh benches
+_ "$cargo" nightly bench --manifest-path poh/Cargo.toml ${V:+--verbose} \
+  -- -Z unstable-options --format=json | tee -a "$BENCH_FILE"
+
 # Run core benches
 _ "$cargo" nightly bench --manifest-path core/Cargo.toml ${V:+--verbose} \
   -- -Z unstable-options --format=json | tee -a "$BENCH_FILE"
diff --git a/ci/test-checks.sh b/ci/test-checks.sh
index 03ddeea0c41f97..8cf93132f00dbf 100755
--- a/ci/test-checks.sh
+++ b/ci/test-checks.sh
@@ -14,7 +14,7 @@ scripts/increment-cargo-version.sh check
 
 # Disallow uncommitted Cargo.lock changes
 (
-  _ scripts/cargo-for-all-lock-files.sh tree
+  _ scripts/cargo-for-all-lock-files.sh tree >/dev/null
   set +e
   if ! _ git diff --exit-code; then
     echo -e "\nError: Uncommitted Cargo.lock changes" 1>&2
@@ -35,8 +35,10 @@ echo --- build environment
   "$cargo" stable clippy --version --verbose
   "$cargo" nightly clippy --version --verbose
 
-  # audit is done only with stable
+  # audit is done only with "$cargo stable"
   "$cargo" stable audit --version
+
+  grcov --version
 )
 
 export RUST_BACKTRACE=1
@@ -65,7 +67,8 @@ _ ci/order-crates-for-publishing.py
 
 # -Z... is needed because of clippy bug: https://github.com/rust-lang/rust-clippy/issues/4612
 # run nightly clippy for `sdk/` as there's a moderate amount of nightly-only code there
-_ "$cargo" nightly clippy -Zunstable-options --workspace --all-targets -- --deny=warnings --deny=clippy::integer_arithmetic
+_ "$cargo" nightly clippy -Zunstable-options --workspace --all-targets -- \
+  --deny=warnings --deny=clippy::integer_arithmetic --allow=clippy::inconsistent_struct_constructor
 
 _ "$cargo" stable fmt --all -- --check
 
diff --git a/ci/test-downstream-builds.sh b/ci/test-downstream-builds.sh
new file mode 100755
index 00000000000000..0a45db80d2b0bc
--- /dev/null
+++ b/ci/test-downstream-builds.sh
@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+cd "$(dirname "$0")/.."
+
+export CI_LOCAL_RUN=true
+
+set -ex
+
+scripts/build-downstream-projects.sh
diff --git a/ci/test-stable-bpf.sh b/ci/test-stable-bpf.sh
new file mode 120000
index 00000000000000..0c92a5c7bd6fd4
--- /dev/null
+++ b/ci/test-stable-bpf.sh
@@ -0,0 +1 @@
+test-stable.sh
\ No newline at end of file
diff --git a/ci/test-stable.sh b/ci/test-stable.sh
index e3e6aaabad0ab8..025c1d9d82d2cc 100755
--- a/ci/test-stable.sh
+++ b/ci/test-stable.sh
@@ -21,10 +21,6 @@ export RUST_BACKTRACE=1
 export RUSTFLAGS="-D warnings"
 source scripts/ulimit-n.sh
 
-# Clear the C dependency files, if dependency moves these files are not regenerated
-test -d target/debug/bpf && find target/debug/bpf -name '*.d' -delete
-test -d target/release/bpf && find target/release/bpf -name '*.d' -delete
-
 # Limit compiler jobs to reduce memory usage
 # on machines with 2gb/thread of memory
 NPROC=$(nproc)
@@ -35,17 +31,25 @@ case $testName in
 test-stable)
   _ "$cargo" stable test --jobs "$NPROC" --all --exclude solana-local-cluster ${V:+--verbose} -- --nocapture
   ;;
-test-stable-perf)
+test-stable-bpf)
+  # Clear the C dependency files, if dependency moves these files are not regenerated
+  test -d target/debug/bpf && find target/debug/bpf -name '*.d' -delete
+  test -d target/release/bpf && find target/release/bpf -name '*.d' -delete
+
+  # rustfilt required for dumping BPF assembly listings
+  "$cargo" install rustfilt
+
   # solana-keygen required when building C programs
   _ "$cargo" build --manifest-path=keygen/Cargo.toml
   export PATH="$PWD/target/debug":$PATH
+  cargo_build_bpf="$(realpath ./cargo-build-bpf)"
 
   # BPF solana-sdk legacy compile test
-  ./cargo-build-bpf --manifest-path sdk/Cargo.toml
+  "$cargo_build_bpf" --manifest-path sdk/Cargo.toml
 
   # BPF Program unit tests
   "$cargo" test --manifest-path programs/bpf/Cargo.toml
-  cargo-build-bpf --manifest-path programs/bpf/Cargo.toml --bpf-sdk sdk/bpf
+  "$cargo_build_bpf" --manifest-path programs/bpf/Cargo.toml --bpf-sdk sdk/bpf
 
   # BPF program system tests
   _ make -C programs/bpf/c tests
@@ -53,11 +57,32 @@ test-stable-perf)
     --manifest-path programs/bpf/Cargo.toml \
     --no-default-features --features=bpf_c,bpf_rust -- --nocapture
 
+  # Dump BPF program assembly listings
+  for bpf_test in programs/bpf/rust/*; do
+    if pushd "$bpf_test"; then
+      "$cargo_build_bpf" --dump
+      popd
+    fi
+  done
+
+  # BPF program instruction count assertion
+  bpf_target_path=programs/bpf/target
+  _ "$cargo" stable test \
+    --manifest-path programs/bpf/Cargo.toml \
+    --no-default-features --features=bpf_c,bpf_rust assert_instruction_count \
+    -- --nocapture &> "${bpf_target_path}"/deploy/instuction_counts.txt
+
+  bpf_dump_archive="bpf-dumps.tar.bz2"
+  rm -f "$bpf_dump_archive"
+  tar cjvf "$bpf_dump_archive" "${bpf_target_path}"/{deploy/*.txt,bpfel-unknown-unknown/release/*.so}
+  exit 0
+  ;;
+test-stable-perf)
   if [[ $(uname) = Linux ]]; then
     # Enable persistence mode to keep the CUDA kernel driver loaded, avoiding a
     # lengthy and unexpected delay the first time CUDA is involved when the driver
     # is not yet loaded.
-    sudo --non-interactive ./net/scripts/enable-nvidia-persistence-mode.sh
+    sudo --non-interactive ./net/scripts/enable-nvidia-persistence-mode.sh || true
 
     rm -rf target/perf-libs
     ./fetch-perf-libs.sh
diff --git a/clap-utils/Cargo.toml b/clap-utils/Cargo.toml
index 147281dd6dc1a7..b5ae62b06556b0 100644
--- a/clap-utils/Cargo.toml
+++ b/clap-utils/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "solana-clap-utils"
-version = "1.7.0"
+version = "1.7.11"
 description = "Solana utilities for the clap"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -12,8 +12,8 @@ edition = "2018"
 [dependencies]
 clap = "2.33.0"
 rpassword = "4.0"
-solana-remote-wallet = { path = "../remote-wallet", version = "=1.7.0" }
-solana-sdk = { path = "../sdk", version = "=1.7.0" }
+solana-remote-wallet = { path = "../remote-wallet", version = "=1.7.11" }
+solana-sdk = { path = "../sdk", version = "=1.7.11" }
 thiserror = "1.0.21"
 tiny-bip39 = "0.8.0"
 uriparse = "0.6.3"
diff --git a/clap-utils/src/keypair.rs b/clap-utils/src/keypair.rs
index d39bca21d4bc56..f63227043dce45 100644
--- a/clap-utils/src/keypair.rs
+++ b/clap-utils/src/keypair.rs
@@ -24,9 +24,11 @@ use {
         },
     },
     std::{
+        cell::RefCell,
         convert::TryFrom,
         error,
         io::{stdin, stdout, Write},
+        ops::Deref,
         process::exit,
         str::FromStr,
         sync::Arc,
@@ -89,33 +91,49 @@ impl CliSignerInfo {
             .collect()
     }
 }
-#[derive(Debug)]
+
+#[derive(Debug, Default)]
 pub struct DefaultSigner {
     pub arg_name: String,
     pub path: String,
+    is_path_checked: RefCell<bool>,
 }
 
 impl DefaultSigner {
-    pub fn new(path: String) -> Self {
+    pub fn new<AN: AsRef<str>, P: AsRef<str>>(arg_name: AN, path: P) -> Self {
+        let arg_name = arg_name.as_ref().to_string();
+        let path = path.as_ref().to_string();
         Self {
-            arg_name: "keypair".to_string(),
+            arg_name,
             path,
+            ..Self::default()
         }
     }
-    pub fn from_path(path: String) -> Result<Self, Box<dyn error::Error>> {
-        std::fs::metadata(&path)
-            .map_err(|_| {
-                std::io::Error::new(
-                    std::io::ErrorKind::Other,
-                    format!(
-                    "No default signer found, run \"solana-keygen new -o {}\" to create a new one",
-                    path
-                ),
-                )
-                .into()
-            })
-            .map(|_| Self::new(path))
+
+    fn path(&self) -> Result<&str, Box<dyn std::error::Error>> {
+        if !self.is_path_checked.borrow().deref() {
+            parse_signer_source(&self.path)
+                .and_then(|s| {
+                    if let SignerSourceKind::Filepath(path) = &s.kind {
+                        std::fs::metadata(path).map(|_| ()).map_err(|e| e.into())
+                    } else {
+                        Ok(())
+                    }
+                })
+                .map_err(|_| {
+                    std::io::Error::new(
+                        std::io::ErrorKind::Other,
+                        format!(
+                        "No default signer found, run \"solana-keygen new -o {}\" to create a new one",
+                        self.path
+                    ),
+                    )
+                })?;
+            *self.is_path_checked.borrow_mut() = true;
+        }
+        Ok(&self.path)
     }
+
     pub fn generate_unique_signers(
         &self,
         bulk_signers: Vec<Option<Box<dyn Signer>>>,
@@ -145,7 +163,7 @@ impl DefaultSigner {
         matches: &ArgMatches,
         wallet_manager: &mut Option<Arc<RemoteWalletManager>>,
     ) -> Result<Box<dyn Signer>, Box<dyn std::error::Error>> {
-        signer_from_path(matches, &self.path, &self.arg_name, wallet_manager)
+        signer_from_path(matches, self.path()?, &self.arg_name, wallet_manager)
     }
 
     pub fn signer_from_path_with_config(
@@ -154,7 +172,13 @@ impl DefaultSigner {
         wallet_manager: &mut Option<Arc<RemoteWalletManager>>,
         config: &SignerFromPathConfig,
     ) -> Result<Box<dyn Signer>, Box<dyn std::error::Error>> {
-        signer_from_path_with_config(matches, &self.path, &self.arg_name, wallet_manager, config)
+        signer_from_path_with_config(
+            matches,
+            self.path()?,
+            &self.arg_name,
+            wallet_manager,
+            config,
+        )
     }
 }
 
@@ -277,7 +301,9 @@ pub(crate) fn parse_signer_source<S: AsRef<str>>(
                     ASK_KEYWORD => Ok(SignerSource::new_legacy(SignerSourceKind::Prompt)),
                     _ => match Pubkey::from_str(source.as_str()) {
                         Ok(pubkey) => Ok(SignerSource::new(SignerSourceKind::Pubkey(pubkey))),
-                        Err(_) => Ok(SignerSource::new(SignerSourceKind::Filepath(source))),
+                        Err(_) => std::fs::metadata(source.as_str())
+                            .map(|_| SignerSource::new(SignerSourceKind::Filepath(source)))
+                            .map_err(|err| err.into()),
                     },
                 }
             }
@@ -480,7 +506,7 @@ pub const SKIP_SEED_PHRASE_VALIDATION_ARG: ArgConstant<'static> = ArgConstant {
 
 /// Prompts user for a passphrase and then asks for confirmirmation to check for mistakes
 pub fn prompt_passphrase(prompt: &str) -> Result<String, Box<dyn error::Error>> {
-    let passphrase = prompt_password_stderr(&prompt)?;
+    let passphrase = prompt_password_stderr(prompt)?;
     if !passphrase.is_empty() {
         let confirmed = rpassword::prompt_password_stderr("Enter same passphrase again: ")?;
         if confirmed != passphrase {
@@ -560,9 +586,9 @@ pub fn keypair_from_seed_phrase(
     let keypair = if skip_validation {
         let passphrase = prompt_passphrase(&passphrase_prompt)?;
         if legacy {
-            keypair_from_seed_phrase_and_passphrase(&seed_phrase, &passphrase)?
+            keypair_from_seed_phrase_and_passphrase(seed_phrase, &passphrase)?
         } else {
-            let seed = generate_seed_from_seed_phrase_and_passphrase(&seed_phrase, &passphrase);
+            let seed = generate_seed_from_seed_phrase_and_passphrase(seed_phrase, &passphrase);
             keypair_from_seed_and_derivation_path(&seed, derivation_path)?
         }
     } else {
@@ -590,7 +616,7 @@ pub fn keypair_from_seed_phrase(
         if legacy {
             keypair_from_seed(seed.as_bytes())?
         } else {
-            keypair_from_seed_and_derivation_path(&seed.as_bytes(), derivation_path)?
+            keypair_from_seed_and_derivation_path(seed.as_bytes(), derivation_path)?
         }
     };
 
@@ -751,6 +777,10 @@ mod tests {
         // Catchall into SignerSource::Filepath fails
         let junk = "sometextthatisnotapubkeyorfile".to_string();
         assert!(Pubkey::from_str(&junk).is_err());
+        assert!(matches!(
+            parse_signer_source(&junk),
+            Err(SignerSourceError::IoError(_))
+        ));
 
         let prompt = "prompt:".to_string();
         assert!(matches!(
diff --git a/cli-config/Cargo.toml b/cli-config/Cargo.toml
index ca6afa37ca2faf..da9e2aa5cf9a1f 100644
--- a/cli-config/Cargo.toml
+++ b/cli-config/Cargo.toml
@@ -3,7 +3,7 @@ authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 edition = "2018"
 name = "solana-cli-config"
 description = "Blockchain, Rebuilt for Scale"
-version = "1.7.0"
+version = "1.7.11"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
diff --git a/cli-config/src/config.rs b/cli-config/src/config.rs
index f98af53f4a6ce7..d9706ef9295655 100644
--- a/cli-config/src/config.rs
+++ b/cli-config/src/config.rs
@@ -107,24 +107,24 @@ mod test {
     #[test]
     fn compute_websocket_url() {
         assert_eq!(
-            Config::compute_websocket_url(&"http://api.devnet.solana.com"),
+            Config::compute_websocket_url("http://api.devnet.solana.com"),
             "ws://api.devnet.solana.com/".to_string()
         );
 
         assert_eq!(
-            Config::compute_websocket_url(&"https://api.devnet.solana.com"),
+            Config::compute_websocket_url("https://api.devnet.solana.com"),
             "wss://api.devnet.solana.com/".to_string()
         );
 
         assert_eq!(
-            Config::compute_websocket_url(&"http://example.com:8899"),
+            Config::compute_websocket_url("http://example.com:8899"),
             "ws://example.com:8900/".to_string()
         );
         assert_eq!(
-            Config::compute_websocket_url(&"https://example.com:1234"),
+            Config::compute_websocket_url("https://example.com:1234"),
             "wss://example.com:1235/".to_string()
         );
 
-        assert_eq!(Config::compute_websocket_url(&"garbage"), String::new());
+        assert_eq!(Config::compute_websocket_url("garbage"), String::new());
     }
 }
diff --git a/cli-output/Cargo.toml b/cli-output/Cargo.toml
index 3f6cf479d4290f..5e5669740e7c32 100644
--- a/cli-output/Cargo.toml
+++ b/cli-output/Cargo.toml
@@ -3,7 +3,7 @@ authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 edition = "2018"
 name = "solana-cli-output"
 description = "Blockchain, Rebuilt for Scale"
-version = "1.7.0"
+version = "1.7.11"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
@@ -12,20 +12,20 @@ documentation = "https://docs.rs/solana-cli-output"
 [dependencies]
 base64 = "0.13.0"
 chrono = { version = "0.4.11", features = ["serde"] }
-console = "0.11.3"
+clap = "2.33.0"
+console = "0.14.1"
 humantime = "2.0.1"
 Inflector = "0.11.4"
 indicatif = "0.15.0"
 serde = "1.0.122"
 serde_derive = "1.0.103"
 serde_json = "1.0.56"
-solana-account-decoder = { path = "../account-decoder", version = "=1.7.0" }
-solana-clap-utils = { path = "../clap-utils", version = "=1.7.0" }
-solana-client = { path = "../client", version = "=1.7.0" }
-solana-sdk = { path = "../sdk", version = "=1.7.0" }
-solana-stake-program = { path = "../programs/stake", version = "=1.7.0" }
-solana-transaction-status = { path = "../transaction-status", version = "=1.7.0" }
-solana-vote-program = { path = "../programs/vote", version = "=1.7.0" }
+solana-account-decoder = { path = "../account-decoder", version = "=1.7.11" }
+solana-clap-utils = { path = "../clap-utils", version = "=1.7.11" }
+solana-client = { path = "../client", version = "=1.7.11" }
+solana-sdk = { path = "../sdk", version = "=1.7.11" }
+solana-transaction-status = { path = "../transaction-status", version = "=1.7.11" }
+solana-vote-program = { path = "../programs/vote", version = "=1.7.11" }
 spl-memo = { version = "=3.0.1", features = ["no-entrypoint"] }
 
 [package.metadata.docs.rs]
diff --git a/cli-output/src/cli_output.rs b/cli-output/src/cli_output.rs
index 7532a41d934937..31d26c664a330c 100644
--- a/cli-output/src/cli_output.rs
+++ b/cli-output/src/cli_output.rs
@@ -8,6 +8,7 @@ use {
         QuietDisplay, VerboseDisplay,
     },
     chrono::{Local, TimeZone},
+    clap::ArgMatches,
     console::{style, Emoji},
     inflector::cases::titlecase::to_title_case,
     serde::{Deserialize, Serialize},
@@ -25,10 +26,10 @@ use {
         native_token::lamports_to_sol,
         pubkey::Pubkey,
         signature::Signature,
+        stake::state::{Authorized, Lockup},
         stake_history::StakeHistoryEntry,
         transaction::{Transaction, TransactionError},
     },
-    solana_stake_program::stake_state::{Authorized, Lockup},
     solana_transaction_status::{
         EncodedConfirmedBlock, EncodedTransaction, TransactionConfirmationStatus,
         UiTransactionStatusMeta,
@@ -47,7 +48,7 @@ use {
 
 static WARNING: Emoji = Emoji("⚠️", "!");
 
-#[derive(PartialEq)]
+#[derive(PartialEq, Debug)]
 pub enum OutputFormat {
     Display,
     Json,
@@ -77,6 +78,21 @@ impl OutputFormat {
             OutputFormat::JsonCompact => serde_json::to_value(item).unwrap().to_string(),
         }
     }
+
+    pub fn from_matches(matches: &ArgMatches<'_>, output_name: &str, verbose: bool) -> Self {
+        matches
+            .value_of(output_name)
+            .map(|value| match value {
+                "json" => OutputFormat::Json,
+                "json-compact" => OutputFormat::JsonCompact,
+                _ => unreachable!(),
+            })
+            .unwrap_or(if verbose {
+                OutputFormat::DisplayVerbose
+            } else {
+                OutputFormat::Display
+            })
+    }
 }
 
 #[derive(Serialize, Deserialize)]
@@ -233,6 +249,10 @@ pub struct CliEpochInfo {
     pub epoch_info: EpochInfo,
     #[serde(skip)]
     pub average_slot_time_ms: u64,
+    #[serde(skip)]
+    pub start_block_time: Option<UnixTimestamp>,
+    #[serde(skip)]
+    pub current_block_time: Option<UnixTimestamp>,
 }
 
 impl QuietDisplay for CliEpochInfo {}
@@ -277,21 +297,41 @@ impl fmt::Display for CliEpochInfo {
                 remaining_slots_in_epoch
             ),
         )?;
+        let (time_elapsed, annotation) = if let (Some(start_block_time), Some(current_block_time)) =
+            (self.start_block_time, self.current_block_time)
+        {
+            (
+                Duration::from_secs((current_block_time - start_block_time) as u64),
+                None,
+            )
+        } else {
+            (
+                slot_to_duration(self.epoch_info.slot_index, self.average_slot_time_ms),
+                Some("* estimated based on current slot durations"),
+            )
+        };
+        let time_remaining = slot_to_duration(remaining_slots_in_epoch, self.average_slot_time_ms);
         writeln_name_value(
             f,
             "Epoch Completed Time:",
             &format!(
-                "{}/{} ({} remaining)",
-                slot_to_human_time(self.epoch_info.slot_index, self.average_slot_time_ms),
-                slot_to_human_time(self.epoch_info.slots_in_epoch, self.average_slot_time_ms),
-                slot_to_human_time(remaining_slots_in_epoch, self.average_slot_time_ms)
+                "{}{}/{} ({} remaining)",
+                humantime::format_duration(time_elapsed).to_string(),
+                if annotation.is_some() { "*" } else { "" },
+                humantime::format_duration(time_elapsed + time_remaining).to_string(),
+                humantime::format_duration(time_remaining).to_string(),
             ),
-        )
+        )?;
+        if let Some(annotation) = annotation {
+            writeln!(f)?;
+            writeln!(f, "{}", annotation)?;
+        }
+        Ok(())
     }
 }
 
-fn slot_to_human_time(slot: Slot, slot_time_ms: u64) -> String {
-    humantime::format_duration(Duration::from_secs((slot * slot_time_ms) / 1000)).to_string()
+fn slot_to_duration(slot: Slot, slot_time_ms: u64) -> Duration {
+    Duration::from_secs((slot * slot_time_ms) / 1000)
 }
 
 #[derive(Serialize, Deserialize, Default)]
@@ -323,6 +363,8 @@ pub struct CliValidators {
     pub total_current_stake: u64,
     pub total_delinquent_stake: u64,
     pub validators: Vec<CliValidator>,
+    pub average_skip_rate: f64,
+    pub average_stake_weighted_skip_rate: f64,
     #[serde(skip_serializing)]
     pub validators_sort_order: CliValidatorsSortOrder,
     #[serde(skip_serializing)]
@@ -486,6 +528,18 @@ impl fmt::Display for CliValidators {
             writeln!(f, "{}", header)?;
         }
 
+        writeln!(f)?;
+        writeln_name_value(
+            f,
+            "Average Stake-Weighted Skip Rate:",
+            &format!("{:.2}%", self.average_stake_weighted_skip_rate,),
+        )?;
+        writeln_name_value(
+            f,
+            "Average Unweighted Skip Rate:    ",
+            &format!("{:.2}%", self.average_skip_rate),
+        )?;
+
         writeln!(f)?;
         writeln_name_value(
             f,
@@ -733,6 +787,7 @@ pub struct CliEpochReward {
     pub post_balance: u64, // lamports
     pub percent_change: f64,
     pub apr: Option<f64>,
+    pub commission: Option<u8>,
 }
 
 #[derive(Serialize, Deserialize)]
@@ -777,23 +832,27 @@ impl fmt::Display for CliKeyedEpochRewards {
         writeln!(f, "Epoch Rewards:")?;
         writeln!(
             f,
-            "  {:<44}  {:<18}  {:<18}  {:>14}  {:>14}",
-            "Address", "Amount", "New Balance", "Percent Change", "APR"
+            "  {:<44}  {:<18}  {:<18}  {:>14}  {:>14}  {:>10}",
+            "Address", "Amount", "New Balance", "Percent Change", "APR", "Commission"
         )?;
         for keyed_reward in &self.rewards {
             match &keyed_reward.reward {
                 Some(reward) => {
                     writeln!(
                         f,
-                        "  {:<44}  ◎{:<17.9}  ◎{:<17.9}  {:>13.2}%  {}",
+                        "  {:<44}  ◎{:<17.9}  ◎{:<17.9}  {:>13.9}%  {:>14}  {:>10}",
                         keyed_reward.address,
                         lamports_to_sol(reward.amount),
                         lamports_to_sol(reward.post_balance),
                         reward.percent_change,
                         reward
                             .apr
-                            .map(|apr| format!("{:>13.2}%", apr))
+                            .map(|apr| format!("{:.2}%", apr))
                             .unwrap_or_default(),
+                        reward
+                            .commission
+                            .map(|commission| format!("{}%", commission))
+                            .unwrap_or_else(|| "-".to_string())
                     )?;
                 }
                 None => {
@@ -910,13 +969,13 @@ fn show_epoch_rewards(
         writeln!(f, "Epoch Rewards:")?;
         writeln!(
             f,
-            "  {:<6}  {:<11}  {:<18}  {:<18}  {:>14}  {:>14}",
-            "Epoch", "Reward Slot", "Amount", "New Balance", "Percent Change", "APR"
+            "  {:<6}  {:<11}  {:<18}  {:<18}  {:>14}  {:>14}  {:>10}",
+            "Epoch", "Reward Slot", "Amount", "New Balance", "Percent Change", "APR", "Commission"
         )?;
         for reward in epoch_rewards {
             writeln!(
                 f,
-                "  {:<6}  {:<11}  ◎{:<17.9}  ◎{:<17.9}  {:>13.2}%  {}",
+                "  {:<6}  {:<11}  ◎{:<17.9}  ◎{:<17.9}  {:>13.9}%  {:>14}  {:>10}",
                 reward.epoch,
                 reward.effective_slot,
                 lamports_to_sol(reward.amount),
@@ -924,8 +983,12 @@ fn show_epoch_rewards(
                 reward.percent_change,
                 reward
                     .apr
-                    .map(|apr| format!("{:>13.2}%", apr))
+                    .map(|apr| format!("{:.2}%", apr))
                     .unwrap_or_default(),
+                reward
+                    .commission
+                    .map(|commission| format!("{}%", commission))
+                    .unwrap_or_else(|| "-".to_string())
             )?;
         }
     }
@@ -1287,7 +1350,7 @@ impl fmt::Display for CliValidatorInfo {
             writeln_name_value(
                 f,
                 &format!("  {}:", to_title_case(key)),
-                &value.as_str().unwrap_or("?"),
+                value.as_str().unwrap_or("?"),
             )?;
         }
         Ok(())
@@ -1325,8 +1388,8 @@ impl fmt::Display for CliVoteAccount {
             build_balance_message(self.account_balance, self.use_lamports_unit, true)
         )?;
         writeln!(f, "Validator Identity: {}", self.validator_identity)?;
-        writeln!(f, "Authorized Voters: {}", self.authorized_voters)?;
-        writeln!(f, "Authorized Withdrawer: {}", self.authorized_withdrawer)?;
+        writeln!(f, "Vote Authority: {}", self.authorized_voters)?;
+        writeln!(f, "Withdraw Authority: {}", self.authorized_withdrawer)?;
         writeln!(f, "Credits: {}", self.credits)?;
         writeln!(f, "Commission: {}%", self.commission)?;
         writeln!(
@@ -1513,15 +1576,19 @@ impl fmt::Display for CliInflation {
             "Staking rate:            {:>5.2}%",
             self.current_rate.validator * 100.
         )?;
-        writeln!(
-            f,
-            "Foundation rate:         {:>5.2}%",
-            self.current_rate.foundation * 100.
-        )
+
+        if self.current_rate.foundation > 0. {
+            writeln!(
+                f,
+                "Foundation rate:         {:>5.2}%",
+                self.current_rate.foundation * 100.
+            )?;
+        }
+        Ok(())
     }
 }
 
-#[derive(Serialize, Deserialize, Default)]
+#[derive(Serialize, Deserialize, Default, Debug, PartialEq)]
 #[serde(rename_all = "camelCase")]
 pub struct CliSignOnlyData {
     pub blockhash: String,
@@ -1669,6 +1736,7 @@ pub struct CliFeesInner {
     pub blockhash: String,
     pub lamports_per_signature: u64,
     pub last_valid_slot: Option<Slot>,
+    pub last_valid_block_height: Option<Slot>,
 }
 
 impl QuietDisplay for CliFeesInner {}
@@ -1682,11 +1750,11 @@ impl fmt::Display for CliFeesInner {
             "Lamports per signature:",
             &self.lamports_per_signature.to_string(),
         )?;
-        let last_valid_slot = self
-            .last_valid_slot
+        let last_valid_block_height = self
+            .last_valid_block_height
             .map(|s| s.to_string())
             .unwrap_or_default();
-        writeln_name_value(f, "Last valid slot:", &last_valid_slot)
+        writeln_name_value(f, "Last valid block height:", &last_valid_block_height)
     }
 }
 
@@ -1715,6 +1783,7 @@ impl CliFees {
         blockhash: Hash,
         lamports_per_signature: u64,
         last_valid_slot: Option<Slot>,
+        last_valid_block_height: Option<Slot>,
     ) -> Self {
         Self {
             inner: Some(CliFeesInner {
@@ -1722,6 +1791,7 @@ impl CliFees {
                 blockhash: blockhash.to_string(),
                 lamports_per_signature,
                 last_valid_slot,
+                last_valid_block_height,
             }),
         }
     }
@@ -1768,7 +1838,7 @@ impl fmt::Display for CliTokenAccount {
         writeln_name_value(
             f,
             "Close authority:",
-            &account.close_authority.as_ref().unwrap_or(&String::new()),
+            account.close_authority.as_ref().unwrap_or(&String::new()),
         )?;
         Ok(())
     }
@@ -1970,6 +2040,11 @@ pub fn return_signers_with_config(
     output_format: &OutputFormat,
     config: &ReturnSignersConfig,
 ) -> Result<String, Box<dyn std::error::Error>> {
+    let cli_command = return_signers_data(tx, config);
+    Ok(output_format.formatted_string(&cli_command))
+}
+
+pub fn return_signers_data(tx: &Transaction, config: &ReturnSignersConfig) -> CliSignOnlyData {
     let verify_results = tx.verify_with_results();
     let mut signers = Vec::new();
     let mut absent = Vec::new();
@@ -1994,19 +2069,17 @@ pub fn return_signers_with_config(
         None
     };
 
-    let cli_command = CliSignOnlyData {
+    CliSignOnlyData {
         blockhash: tx.message.recent_blockhash.to_string(),
         message,
         signers,
         absent,
         bad_sig,
-    };
-
-    Ok(output_format.formatted_string(&cli_command))
+    }
 }
 
 pub fn parse_sign_only_reply_string(reply: &str) -> SignOnly {
-    let object: Value = serde_json::from_str(&reply).unwrap();
+    let object: Value = serde_json::from_str(reply).unwrap();
     let blockhash_str = object.get("blockhash").unwrap().as_str().unwrap();
     let blockhash = blockhash_str.parse::<Hash>().unwrap();
     let mut present_signers: Vec<(Pubkey, Signature)> = Vec::new();
@@ -2136,8 +2209,8 @@ impl fmt::Display for CliBlock {
             writeln!(f, "Rewards:")?;
             writeln!(
                 f,
-                "  {:<44}  {:^15}  {:<15}  {:<20}  {:>14}",
-                "Address", "Type", "Amount", "New Balance", "Percent Change"
+                "  {:<44}  {:^15}  {:<15}  {:<20}  {:>14}  {:>10}",
+                "Address", "Type", "Amount", "New Balance", "Percent Change", "Commission"
             )?;
             for reward in rewards {
                 let sign = if reward.lamports < 0 { "-" } else { "" };
@@ -2145,7 +2218,7 @@ impl fmt::Display for CliBlock {
                 total_rewards += reward.lamports;
                 writeln!(
                     f,
-                    "  {:<44}  {:^15}  {:>15}  {}",
+                    "  {:<44}  {:^15}  {:>15}  {}  {}",
                     reward.pubkey,
                     if let Some(reward_type) = reward.reward_type {
                         format!("{}", reward_type)
@@ -2167,7 +2240,11 @@ impl fmt::Display for CliBlock {
                                 / (reward.post_balance as f64 - reward.lamports as f64))
                                 * 100.0
                         )
-                    }
+                    },
+                    reward
+                        .commission
+                        .map(|commission| format!("{:>9}%", commission))
+                        .unwrap_or_else(|| "    -".to_string())
                 )?;
             }
 
@@ -2380,6 +2457,7 @@ impl VerboseDisplay for CliGossipNodes {}
 #[cfg(test)]
 mod tests {
     use super::*;
+    use clap::{App, Arg};
     use solana_sdk::{
         message::Message,
         pubkey::Pubkey,
@@ -2408,6 +2486,10 @@ mod tests {
             fn try_sign_message(&self, _message: &[u8]) -> Result<Signature, SignerError> {
                 Ok(Signature::new(&[1u8; 64]))
             }
+
+            fn is_interactive(&self) -> bool {
+                false
+            }
         }
 
         let present: Box<dyn Signer> = Box::new(keypair_from_seed(&[2u8; 32]).unwrap());
@@ -2436,6 +2518,22 @@ mod tests {
         assert_eq!(sign_only.absent_signers[0], absent.pubkey());
         assert_eq!(sign_only.bad_signers[0], bad.pubkey());
 
+        let res_data = return_signers_data(&tx, &ReturnSignersConfig::default());
+        assert_eq!(
+            res_data,
+            CliSignOnlyData {
+                blockhash: blockhash.to_string(),
+                message: None,
+                signers: vec![format!(
+                    "{}={}",
+                    present.pubkey().to_string(),
+                    tx.signatures[1]
+                )],
+                absent: vec![absent.pubkey().to_string()],
+                bad_sig: vec![bad.pubkey().to_string()],
+            }
+        );
+
         let expected_msg = "AwECBwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDgTl3Dqh9\
             F19Wo1Rmw0x+zMuNipG07jeiXfYPW4/Js5QEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQE\
             BAQEBAYGBgYGBgYGBgYGBgYGBgYGBgYGBgYGBgYGBgYGBgYGBQUFBQUFBQUFBQUFBQUFBQUF\
@@ -2449,10 +2547,26 @@ mod tests {
         let res = return_signers_with_config(&tx, &OutputFormat::JsonCompact, &config).unwrap();
         let sign_only = parse_sign_only_reply_string(&res);
         assert_eq!(sign_only.blockhash, blockhash);
-        assert_eq!(sign_only.message, Some(expected_msg));
+        assert_eq!(sign_only.message, Some(expected_msg.clone()));
         assert_eq!(sign_only.present_signers[0].0, present.pubkey());
         assert_eq!(sign_only.absent_signers[0], absent.pubkey());
         assert_eq!(sign_only.bad_signers[0], bad.pubkey());
+
+        let res_data = return_signers_data(&tx, &config);
+        assert_eq!(
+            res_data,
+            CliSignOnlyData {
+                blockhash: blockhash.to_string(),
+                message: Some(expected_msg),
+                signers: vec![format!(
+                    "{}={}",
+                    present.pubkey().to_string(),
+                    tx.signatures[1]
+                )],
+                absent: vec![absent.pubkey().to_string()],
+                bad_sig: vec![bad.pubkey().to_string()],
+            }
+        );
     }
 
     #[test]
@@ -2501,4 +2615,50 @@ mod tests {
             "verbose"
         );
     }
+
+    #[test]
+    fn test_output_format_from_matches() {
+        let app = App::new("test").arg(
+            Arg::with_name("output_format")
+                .long("output")
+                .value_name("FORMAT")
+                .global(true)
+                .takes_value(true)
+                .possible_values(&["json", "json-compact"])
+                .help("Return information in specified output format"),
+        );
+        let matches = app
+            .clone()
+            .get_matches_from(vec!["test", "--output", "json"]);
+        assert_eq!(
+            OutputFormat::from_matches(&matches, "output_format", false),
+            OutputFormat::Json
+        );
+        assert_eq!(
+            OutputFormat::from_matches(&matches, "output_format", true),
+            OutputFormat::Json
+        );
+
+        let matches = app
+            .clone()
+            .get_matches_from(vec!["test", "--output", "json-compact"]);
+        assert_eq!(
+            OutputFormat::from_matches(&matches, "output_format", false),
+            OutputFormat::JsonCompact
+        );
+        assert_eq!(
+            OutputFormat::from_matches(&matches, "output_format", true),
+            OutputFormat::JsonCompact
+        );
+
+        let matches = app.clone().get_matches_from(vec!["test"]);
+        assert_eq!(
+            OutputFormat::from_matches(&matches, "output_format", false),
+            OutputFormat::Display
+        );
+        assert_eq!(
+            OutputFormat::from_matches(&matches, "output_format", true),
+            OutputFormat::DisplayVerbose
+        );
+    }
 }
diff --git a/cli-output/src/display.rs b/cli-output/src/display.rs
index ec4f8b4a41030a..f8f7e8274a1694 100644
--- a/cli-output/src/display.rs
+++ b/cli-output/src/display.rs
@@ -5,7 +5,7 @@ use {
     indicatif::{ProgressBar, ProgressStyle},
     solana_sdk::{
         clock::UnixTimestamp, hash::Hash, message::Message, native_token::lamports_to_sol,
-        program_utils::limited_deserialize, pubkey::Pubkey, transaction::Transaction,
+        program_utils::limited_deserialize, pubkey::Pubkey, stake, transaction::Transaction,
     },
     solana_transaction_status::UiTransactionStatusMeta,
     spl_memo::id as spl_memo_id,
@@ -140,7 +140,7 @@ fn format_account_mode(message: &Message, index: usize) -> String {
         } else {
             "-"
         },
-        if message.is_writable(index, /*demote_sysvar_write_locks=*/ true) {
+        if message.is_writable(index) {
             "w" // comment for consistent rust fmt (no joking; lol)
         } else {
             "-"
@@ -244,10 +244,9 @@ pub fn write_transaction<W: io::Write>(
                 writeln!(w, "{}  {:?}", prefix, vote_instruction)?;
                 raw = false;
             }
-        } else if program_pubkey == solana_stake_program::id() {
-            if let Ok(stake_instruction) = limited_deserialize::<
-                solana_stake_program::stake_instruction::StakeInstruction,
-            >(&instruction.data)
+        } else if program_pubkey == stake::program::id() {
+            if let Ok(stake_instruction) =
+                limited_deserialize::<stake::instruction::StakeInstruction>(&instruction.data)
             {
                 writeln!(w, "{}  {:?}", prefix, stake_instruction)?;
                 raw = false;
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
index c0847937208200..9b2a9cf8bcbda1 100644
--- a/cli/Cargo.toml
+++ b/cli/Cargo.toml
@@ -3,7 +3,7 @@ authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 edition = "2018"
 name = "solana-cli"
 description = "Blockchain, Rebuilt for Scale"
-version = "1.7.0"
+version = "1.7.11"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
@@ -16,7 +16,8 @@ chrono = { version = "0.4.11", features = ["serde"] }
 clap = "2.33.1"
 criterion-stats = "0.3.0"
 ctrlc = { version = "3.1.5", features = ["termination"] }
-console = "0.11.3"
+console = "0.14.1"
+const_format = "0.2.14"
 dirs-next = "2.0.0"
 log = "0.4.11"
 Inflector = "0.11.4"
@@ -28,30 +29,30 @@ reqwest = { version = "0.11.2", default-features = false, features = ["blocking"
 serde = "1.0.122"
 serde_derive = "1.0.103"
 serde_json = "1.0.56"
-solana-account-decoder = { path = "../account-decoder", version = "=1.7.0" }
-solana-bpf-loader-program = { path = "../programs/bpf_loader", version = "=1.7.0" }
-solana-clap-utils = { path = "../clap-utils", version = "=1.7.0" }
-solana-cli-config = { path = "../cli-config", version = "=1.7.0" }
-solana-cli-output = { path = "../cli-output", version = "=1.7.0" }
-solana-client = { path = "../client", version = "=1.7.0" }
-solana-config-program = { path = "../programs/config", version = "=1.7.0" }
-solana-faucet = { path = "../faucet", version = "=1.7.0" }
-solana-logger = { path = "../logger", version = "=1.7.0" }
-solana-net-utils = { path = "../net-utils", version = "=1.7.0" }
+solana-account-decoder = { path = "../account-decoder", version = "=1.7.11" }
+solana-bpf-loader-program = { path = "../programs/bpf_loader", version = "=1.7.11" }
+solana-clap-utils = { path = "../clap-utils", version = "=1.7.11" }
+solana-cli-config = { path = "../cli-config", version = "=1.7.11" }
+solana-cli-output = { path = "../cli-output", version = "=1.7.11" }
+solana-client = { path = "../client", version = "=1.7.11" }
+solana-config-program = { path = "../programs/config", version = "=1.7.11" }
+solana-faucet = { path = "../faucet", version = "=1.7.11" }
+solana-logger = { path = "../logger", version = "=1.7.11" }
+solana-net-utils = { path = "../net-utils", version = "=1.7.11" }
 solana_rbpf = "=0.2.11"
-solana-remote-wallet = { path = "../remote-wallet", version = "=1.7.0" }
-solana-sdk = { path = "../sdk", version = "=1.7.0" }
-solana-stake-program = { path = "../programs/stake", version = "=1.7.0" }
-solana-transaction-status = { path = "../transaction-status", version = "=1.7.0" }
-solana-version = { path = "../version", version = "=1.7.0" }
-solana-vote-program = { path = "../programs/vote", version = "=1.7.0" }
+solana-remote-wallet = { path = "../remote-wallet", version = "=1.7.11" }
+solana-sdk = { path = "../sdk", version = "=1.7.11" }
+solana-transaction-status = { path = "../transaction-status", version = "=1.7.11" }
+solana-version = { path = "../version", version = "=1.7.11" }
+solana-vote-program = { path = "../programs/vote", version = "=1.7.11" }
 spl-memo = { version = "=3.0.1", features = ["no-entrypoint"] }
 thiserror = "1.0.21"
 tiny-bip39 = "0.7.0"
 url = "2.1.1"
 
 [dev-dependencies]
-solana-core = { path = "../core", version = "=1.7.0" }
+solana-core = { path = "../core", version = "=1.7.11" }
+solana-streamer = { path = "../streamer", version = "=1.7.11" }
 tempfile = "3.1.0"
 
 [[bin]]
diff --git a/cli/src/clap_app.rs b/cli/src/clap_app.rs
new file mode 100644
index 00000000000000..cf15285c3d9c9b
--- /dev/null
+++ b/cli/src/clap_app.rs
@@ -0,0 +1,202 @@
+use crate::{
+    cli::*, cluster_query::*, feature::*, inflation::*, nonce::*, program::*, stake::*,
+    validator_info::*, vote::*, wallet::*,
+};
+use clap::{App, AppSettings, Arg, ArgGroup, SubCommand};
+use solana_clap_utils::{self, input_validators::*, keypair::*};
+use solana_cli_config::CONFIG_FILE;
+
+pub fn get_clap_app<'ab, 'v>(name: &str, about: &'ab str, version: &'v str) -> App<'ab, 'v> {
+    App::new(name)
+        .about(about)
+        .version(version)
+        .setting(AppSettings::SubcommandRequiredElseHelp)
+        .arg({
+            let arg = Arg::with_name("config_file")
+                .short("C")
+                .long("config")
+                .value_name("FILEPATH")
+                .takes_value(true)
+                .global(true)
+                .help("Configuration file to use");
+            if let Some(ref config_file) = *CONFIG_FILE {
+                arg.default_value(config_file)
+            } else {
+                arg
+            }
+        })
+        .arg(
+            Arg::with_name("json_rpc_url")
+                .short("u")
+                .long("url")
+                .value_name("URL_OR_MONIKER")
+                .takes_value(true)
+                .global(true)
+                .validator(is_url_or_moniker)
+                .help(
+                    "URL for Solana's JSON RPC or moniker (or their first letter): \
+                       [mainnet-beta, testnet, devnet, localhost]",
+                ),
+        )
+        .arg(
+            Arg::with_name("websocket_url")
+                .long("ws")
+                .value_name("URL")
+                .takes_value(true)
+                .global(true)
+                .validator(is_url)
+                .help("WebSocket URL for the solana cluster"),
+        )
+        .arg(
+            Arg::with_name("keypair")
+                .short("k")
+                .long("keypair")
+                .value_name("KEYPAIR")
+                .global(true)
+                .takes_value(true)
+                .help("Filepath or URL to a keypair"),
+        )
+        .arg(
+            Arg::with_name("commitment")
+                .long("commitment")
+                .takes_value(true)
+                .possible_values(&[
+                    "processed",
+                    "confirmed",
+                    "finalized",
+                    "recent", // Deprecated as of v1.5.5
+                    "single", // Deprecated as of v1.5.5
+                    "singleGossip", // Deprecated as of v1.5.5
+                    "root", // Deprecated as of v1.5.5
+                    "max", // Deprecated as of v1.5.5
+                ])
+                .value_name("COMMITMENT_LEVEL")
+                .hide_possible_values(true)
+                .global(true)
+                .help("Return information at the selected commitment level [possible values: processed, confirmed, finalized]"),
+        )
+        .arg(
+            Arg::with_name("verbose")
+                .long("verbose")
+                .short("v")
+                .global(true)
+                .help("Show additional information"),
+        )
+        .arg(
+            Arg::with_name("no_address_labels")
+                .long("no-address-labels")
+                .global(true)
+                .help("Do not use address labels in the output"),
+        )
+        .arg(
+            Arg::with_name("output_format")
+                .long("output")
+                .value_name("FORMAT")
+                .global(true)
+                .takes_value(true)
+                .possible_values(&["json", "json-compact"])
+                .help("Return information in specified output format"),
+        )
+        .arg(
+            Arg::with_name(SKIP_SEED_PHRASE_VALIDATION_ARG.name)
+                .long(SKIP_SEED_PHRASE_VALIDATION_ARG.long)
+                .global(true)
+                .help(SKIP_SEED_PHRASE_VALIDATION_ARG.help),
+        )
+        .arg(
+            Arg::with_name("rpc_timeout")
+                .long("rpc-timeout")
+                .value_name("SECONDS")
+                .takes_value(true)
+                .default_value(DEFAULT_RPC_TIMEOUT_SECONDS)
+                .global(true)
+                .hidden(true)
+                .help("Timeout value for RPC requests"),
+        )
+        .arg(
+            Arg::with_name("confirm_transaction_initial_timeout")
+                .long("confirm-timeout")
+                .value_name("SECONDS")
+                .takes_value(true)
+                .default_value(DEFAULT_CONFIRM_TX_TIMEOUT_SECONDS)
+                .global(true)
+                .hidden(true)
+                .help("Timeout value for initial transaction status"),
+        )
+        .cluster_query_subcommands()
+        .feature_subcommands()
+        .inflation_subcommands()
+        .nonce_subcommands()
+        .program_subcommands()
+        .stake_subcommands()
+        .validator_info_subcommands()
+        .vote_subcommands()
+        .wallet_subcommands()
+        .subcommand(
+            SubCommand::with_name("config")
+                .about("Solana command-line tool configuration settings")
+                .aliases(&["get", "set"])
+                .setting(AppSettings::SubcommandRequiredElseHelp)
+                .subcommand(
+                    SubCommand::with_name("get")
+                        .about("Get current config settings")
+                        .arg(
+                            Arg::with_name("specific_setting")
+                                .index(1)
+                                .value_name("CONFIG_FIELD")
+                                .takes_value(true)
+                                .possible_values(&[
+                                    "json_rpc_url",
+                                    "websocket_url",
+                                    "keypair",
+                                    "commitment",
+                                ])
+                                .help("Return a specific config setting"),
+                        ),
+                )
+                .subcommand(
+                    SubCommand::with_name("set")
+                        .about("Set a config setting")
+                        .group(
+                            ArgGroup::with_name("config_settings")
+                                .args(&["json_rpc_url", "websocket_url", "keypair", "commitment"])
+                                .multiple(true)
+                                .required(true),
+                        ),
+                )
+                .subcommand(
+                    SubCommand::with_name("import-address-labels")
+                        .about("Import a list of address labels")
+                        .arg(
+                            Arg::with_name("filename")
+                                .index(1)
+                                .value_name("FILENAME")
+                                .takes_value(true)
+                                .help("YAML file of address labels"),
+                        ),
+                )
+                .subcommand(
+                    SubCommand::with_name("export-address-labels")
+                        .about("Export the current address labels")
+                        .arg(
+                            Arg::with_name("filename")
+                                .index(1)
+                                .value_name("FILENAME")
+                                .takes_value(true)
+                                .help("YAML file to receive the current address labels"),
+                        ),
+                ),
+        )
+        .subcommand(
+            SubCommand::with_name("completion")
+            .about("Generate completion scripts for various shells")
+            .arg(
+                Arg::with_name("shell")
+                .long("shell")
+                .short("s")
+                .takes_value(true)
+                .possible_values(&["bash", "fish", "zsh", "powershell", "elvish"])
+                .default_value("bash")
+            )
+        )
+}
diff --git a/cli/src/cli.rs b/cli/src/cli.rs
index e1092f7df52ea9..8a0b58928cc209 100644
--- a/cli/src/cli.rs
+++ b/cli/src/cli.rs
@@ -1,38 +1,21 @@
 use crate::{
-    cluster_query::*, feature::*, inflation::*, memo::*, nonce::*, program::*, spend_utils::*,
-    stake::*, validator_info::*, vote::*,
+    clap_app::*, cluster_query::*, feature::*, inflation::*, nonce::*, program::*, spend_utils::*,
+    stake::*, validator_info::*, vote::*, wallet::*,
 };
-use clap::{value_t_or_exit, App, AppSettings, Arg, ArgMatches, SubCommand};
+use clap::{crate_description, crate_name, value_t_or_exit, ArgMatches, Shell};
 use log::*;
 use num_traits::FromPrimitive;
 use serde_json::{self, Value};
-use solana_account_decoder::{UiAccount, UiAccountEncoding};
-use solana_clap_utils::{
-    self,
-    fee_payer::{fee_payer_arg, FEE_PAYER_ARG},
-    input_parsers::*,
-    input_validators::*,
-    keypair::*,
-    memo::{memo_arg, MEMO_ARG},
-    nonce::*,
-    offline::*,
-};
+use solana_clap_utils::{self, input_parsers::*, input_validators::*, keypair::*};
 use solana_cli_output::{
-    display::{build_balance_message, println_name_value},
-    return_signers_with_config, CliAccount, CliSignature, CliSignatureVerificationStatus,
-    CliTransaction, CliTransactionConfirmation, CliValidatorsSortOrder, OutputFormat,
-    ReturnSignersConfig,
+    display::println_name_value, CliSignature, CliValidatorsSortOrder, OutputFormat,
 };
 use solana_client::{
     blockhash_query::BlockhashQuery,
-    client_error::{ClientError, ClientErrorKind, Result as ClientResult},
+    client_error::{ClientError, Result as ClientResult},
     nonce_utils,
     rpc_client::RpcClient,
-    rpc_config::{
-        RpcLargestAccountsFilter, RpcSendTransactionConfig, RpcTransactionConfig,
-        RpcTransactionLogsFilter,
-    },
-    rpc_response::RpcKeyedAccount,
+    rpc_config::{RpcLargestAccountsFilter, RpcSendTransactionConfig, RpcTransactionLogsFilter},
 };
 use solana_remote_wallet::remote_wallet::RemoteWalletManager;
 use solana_sdk::{
@@ -41,26 +24,18 @@ use solana_sdk::{
     decode_error::DecodeError,
     hash::Hash,
     instruction::InstructionError,
-    message::Message,
     pubkey::Pubkey,
     signature::{Signature, Signer, SignerError},
-    system_instruction::{self, SystemError},
-    system_program,
+    stake::{instruction::LockupArgs, state::Lockup},
     transaction::{Transaction, TransactionError},
 };
-use solana_stake_program::{
-    stake_instruction::LockupArgs,
-    stake_state::{Lockup, StakeAuthorize},
-};
-use solana_transaction_status::{EncodedTransaction, UiTransactionEncoding};
 use solana_vote_program::vote_state::VoteAuthorize;
-use std::{
-    collections::HashMap, error, fmt::Write as FmtWrite, fs::File, io::Write, str::FromStr,
-    sync::Arc, time::Duration,
-};
+use std::{collections::HashMap, error, io::stdout, str::FromStr, sync::Arc, time::Duration};
 use thiserror::Error;
 
 pub const DEFAULT_RPC_TIMEOUT_SECONDS: &str = "30";
+pub const DEFAULT_CONFIRM_TX_TIMEOUT_SECONDS: &str = "5";
+const CHECKED: bool = true;
 
 #[derive(Debug, PartialEq)]
 #[allow(clippy::large_enum_variant)]
@@ -75,11 +50,6 @@ pub enum CliCommand {
     },
     ClusterDate,
     ClusterVersion,
-    CreateAddressWithSeed {
-        from_pubkey: Option<Pubkey>,
-        seed: String,
-        program_id: Pubkey,
-    },
     Feature(FeatureCliCommand),
     Inflation(InflationCliCommand),
     Fees {
@@ -134,6 +104,8 @@ pub enum CliCommand {
         sort_order: CliValidatorsSortOrder,
         reverse_sort: bool,
         number_validators: bool,
+        keep_unstaked_delinquents: bool,
+        delinquent_slot_distance: Option<Slot>,
     },
     Supply {
         print_accounts: bool,
@@ -194,6 +166,7 @@ pub enum CliCommand {
         seed: Option<String>,
         staker: Option<Pubkey>,
         withdrawer: Option<Pubkey>,
+        withdrawer_signer: Option<SignerIndex>,
         lockup: Lockup,
         amount: SpendAmount,
         sign_only: bool,
@@ -267,7 +240,7 @@ pub enum CliCommand {
     },
     StakeAuthorize {
         stake_account_pubkey: Pubkey,
-        new_authorizations: Vec<(StakeAuthorize, Pubkey, SignerIndex)>,
+        new_authorizations: Vec<StakeAuthorizationIndexed>,
         sign_only: bool,
         dump_transaction_message: bool,
         blockhash_query: BlockhashQuery,
@@ -282,6 +255,7 @@ pub enum CliCommand {
         stake_account_pubkey: Pubkey,
         lockup: LockupArgs,
         custodian: SignerIndex,
+        new_custodian_signer: Option<SignerIndex>,
         sign_only: bool,
         dump_transaction_message: bool,
         blockhash_query: BlockhashQuery,
@@ -339,6 +313,8 @@ pub enum CliCommand {
         new_authorized_pubkey: Pubkey,
         vote_authorize: VoteAuthorize,
         memo: Option<String>,
+        authorized: SignerIndex,
+        new_authorized: Option<SignerIndex>,
     },
     VoteUpdateValidator {
         vote_account_pubkey: Pubkey,
@@ -363,6 +339,11 @@ pub enum CliCommand {
         use_lamports_unit: bool,
     },
     Confirm(Signature),
+    CreateAddressWithSeed {
+        from_pubkey: Option<Pubkey>,
+        seed: String,
+        program_id: Pubkey,
+    },
     DecodeTransaction(Transaction),
     ResolveSigner(Option<String>),
     ShowAccount {
@@ -451,6 +432,7 @@ pub struct CliConfig<'a> {
     pub output_format: OutputFormat,
     pub commitment: CommitmentConfig,
     pub send_transaction_config: RpcSendTransactionConfig,
+    pub confirm_transaction_initial_timeout: Duration,
     pub address_labels: HashMap<String, String>,
 }
 
@@ -595,6 +577,9 @@ impl Default for CliConfig<'_> {
             output_format: OutputFormat::Display,
             commitment: CommitmentConfig::confirmed(),
             send_transaction_config: RpcSendTransactionConfig::default(),
+            confirm_transaction_initial_timeout: Duration::from_secs(
+                u64::from_str(DEFAULT_CONFIRM_TX_TIMEOUT_SECONDS).unwrap(),
+            ),
             address_labels: HashMap::new(),
         }
     }
@@ -606,7 +591,31 @@ pub fn parse_command(
     wallet_manager: &mut Option<Arc<RemoteWalletManager>>,
 ) -> Result<CliCommandInfo, Box<dyn error::Error>> {
     let response = match matches.subcommand() {
+        // Autocompletion Command
+        ("completion", Some(matches)) => {
+            let shell_choice = match matches.value_of("shell") {
+                Some("bash") => Shell::Bash,
+                Some("fish") => Shell::Fish,
+                Some("zsh") => Shell::Zsh,
+                Some("powershell") => Shell::PowerShell,
+                Some("elvish") => Shell::Elvish,
+                // This is safe, since we assign default_value and possible_values
+                // are restricted
+                _ => unreachable!(),
+            };
+            get_clap_app(
+                crate_name!(),
+                crate_description!(),
+                solana_version::version!(),
+            )
+            .gen_completions_to("solana", shell_choice, &mut stdout());
+            std::process::exit(0);
+        }
         // Cluster Query Commands
+        ("block", Some(matches)) => parse_get_block(matches),
+        ("block-height", Some(matches)) => parse_get_block_height(matches),
+        ("block-production", Some(matches)) => parse_show_block_production(matches),
+        ("block-time", Some(matches)) => parse_get_block_time(matches),
         ("catchup", Some(matches)) => parse_catchup(matches, wallet_manager),
         ("cluster-date", Some(_matches)) => Ok(CliCommandInfo {
             command: CliCommand::ClusterDate,
@@ -616,9 +625,8 @@ pub fn parse_command(
             command: CliCommand::ClusterVersion,
             signers: vec![],
         }),
-        ("create-address-with-seed", Some(matches)) => {
-            parse_create_address_with_seed(matches, default_signer, wallet_manager)
-        }
+        ("epoch", Some(matches)) => parse_get_epoch(matches),
+        ("epoch-info", Some(matches)) => parse_get_epoch_info(matches),
         ("feature", Some(matches)) => {
             parse_feature_subcommand(matches, default_signer, wallet_manager)
         }
@@ -633,40 +641,47 @@ pub fn parse_command(
             command: CliCommand::FirstAvailableBlock,
             signers: vec![],
         }),
-        ("block", Some(matches)) => parse_get_block(matches),
-        ("block-time", Some(matches)) => parse_get_block_time(matches),
-        ("epoch-info", Some(matches)) => parse_get_epoch_info(matches),
         ("genesis-hash", Some(_matches)) => Ok(CliCommandInfo {
             command: CliCommand::GetGenesisHash,
             signers: vec![],
         }),
-        ("epoch", Some(matches)) => parse_get_epoch(matches),
-        ("slot", Some(matches)) => parse_get_slot(matches),
-        ("block-height", Some(matches)) => parse_get_block_height(matches),
+        ("gossip", Some(_matches)) => Ok(CliCommandInfo {
+            command: CliCommand::ShowGossip,
+            signers: vec![],
+        }),
         ("inflation", Some(matches)) => {
             parse_inflation_subcommand(matches, default_signer, wallet_manager)
         }
         ("largest-accounts", Some(matches)) => parse_largest_accounts(matches),
-        ("supply", Some(matches)) => parse_supply(matches),
-        ("total-supply", Some(matches)) => parse_total_supply(matches),
-        ("transaction-count", Some(matches)) => parse_get_transaction_count(matches),
         ("leader-schedule", Some(matches)) => parse_leader_schedule(matches),
-        ("ping", Some(matches)) => parse_cluster_ping(matches, default_signer, wallet_manager),
         ("live-slots", Some(_matches)) => Ok(CliCommandInfo {
             command: CliCommand::LiveSlots,
             signers: vec![],
         }),
         ("logs", Some(matches)) => parse_logs(matches, wallet_manager),
-        ("block-production", Some(matches)) => parse_show_block_production(matches),
-        ("gossip", Some(_matches)) => Ok(CliCommandInfo {
-            command: CliCommand::ShowGossip,
-            signers: vec![],
-        }),
+        ("ping", Some(matches)) => parse_cluster_ping(matches, default_signer, wallet_manager),
+        ("rent", Some(matches)) => {
+            let data_length = value_of::<RentLengthValue>(matches, "data_length")
+                .unwrap()
+                .length();
+            let use_lamports_unit = matches.is_present("lamports");
+            Ok(CliCommandInfo {
+                command: CliCommand::Rent {
+                    data_length,
+                    use_lamports_unit,
+                },
+                signers: vec![],
+            })
+        }
+        ("slot", Some(matches)) => parse_get_slot(matches),
         ("stakes", Some(matches)) => parse_show_stakes(matches, wallet_manager),
-        ("validators", Some(matches)) => parse_show_validators(matches),
+        ("supply", Some(matches)) => parse_supply(matches),
+        ("total-supply", Some(matches)) => parse_total_supply(matches),
+        ("transaction-count", Some(matches)) => parse_get_transaction_count(matches),
         ("transaction-history", Some(matches)) => {
             parse_transaction_history(matches, wallet_manager)
         }
+        ("validators", Some(matches)) => parse_show_validators(matches),
         // Nonce Commands
         ("authorize-nonce-account", Some(matches)) => {
             parse_authorize_nonce_account(matches, default_signer, wallet_manager)
@@ -711,7 +726,10 @@ pub fn parse_command(
         }
         // Stake Commands
         ("create-stake-account", Some(matches)) => {
-            parse_create_stake_account(matches, default_signer, wallet_manager)
+            parse_create_stake_account(matches, default_signer, wallet_manager, !CHECKED)
+        }
+        ("create-stake-account-checked", Some(matches)) => {
+            parse_create_stake_account(matches, default_signer, wallet_manager, CHECKED)
         }
         ("delegate-stake", Some(matches)) => {
             parse_stake_delegate_stake(matches, default_signer, wallet_manager)
@@ -729,10 +747,16 @@ pub fn parse_command(
             parse_merge_stake(matches, default_signer, wallet_manager)
         }
         ("stake-authorize", Some(matches)) => {
-            parse_stake_authorize(matches, default_signer, wallet_manager)
+            parse_stake_authorize(matches, default_signer, wallet_manager, !CHECKED)
+        }
+        ("stake-authorize-checked", Some(matches)) => {
+            parse_stake_authorize(matches, default_signer, wallet_manager, CHECKED)
         }
         ("stake-set-lockup", Some(matches)) => {
-            parse_stake_set_lockup(matches, default_signer, wallet_manager)
+            parse_stake_set_lockup(matches, default_signer, wallet_manager, !CHECKED)
+        }
+        ("stake-set-lockup-checked", Some(matches)) => {
+            parse_stake_set_lockup(matches, default_signer, wallet_manager, CHECKED)
         }
         ("stake-account", Some(matches)) => parse_show_stake_account(matches, wallet_manager),
         ("stake-history", Some(matches)) => parse_show_stake_history(matches),
@@ -759,50 +783,41 @@ pub fn parse_command(
             default_signer,
             wallet_manager,
             VoteAuthorize::Voter,
+            !CHECKED,
         ),
         ("vote-authorize-withdrawer", Some(matches)) => parse_vote_authorize(
             matches,
             default_signer,
             wallet_manager,
             VoteAuthorize::Withdrawer,
+            !CHECKED,
+        ),
+        ("vote-authorize-voter-checked", Some(matches)) => parse_vote_authorize(
+            matches,
+            default_signer,
+            wallet_manager,
+            VoteAuthorize::Voter,
+            CHECKED,
+        ),
+        ("vote-authorize-withdrawer-checked", Some(matches)) => parse_vote_authorize(
+            matches,
+            default_signer,
+            wallet_manager,
+            VoteAuthorize::Withdrawer,
+            CHECKED,
         ),
         ("vote-account", Some(matches)) => parse_vote_get_account_command(matches, wallet_manager),
         ("withdraw-from-vote-account", Some(matches)) => {
             parse_withdraw_from_vote_account(matches, default_signer, wallet_manager)
         }
         // Wallet Commands
+        ("account", Some(matches)) => parse_account(matches, wallet_manager),
         ("address", Some(matches)) => Ok(CliCommandInfo {
             command: CliCommand::Address,
             signers: vec![default_signer.signer_from_path(matches, wallet_manager)?],
         }),
-        ("airdrop", Some(matches)) => {
-            let pubkey = pubkey_of_signer(matches, "to", wallet_manager)?;
-            let signers = if pubkey.is_some() {
-                vec![]
-            } else {
-                vec![default_signer.signer_from_path(matches, wallet_manager)?]
-            };
-            let lamports = lamports_of_sol(matches, "amount").unwrap();
-            Ok(CliCommandInfo {
-                command: CliCommand::Airdrop { pubkey, lamports },
-                signers,
-            })
-        }
-        ("balance", Some(matches)) => {
-            let pubkey = pubkey_of_signer(matches, "pubkey", wallet_manager)?;
-            let signers = if pubkey.is_some() {
-                vec![]
-            } else {
-                vec![default_signer.signer_from_path(matches, wallet_manager)?]
-            };
-            Ok(CliCommandInfo {
-                command: CliCommand::Balance {
-                    pubkey,
-                    use_lamports_unit: matches.is_present("lamports"),
-                },
-                signers,
-            })
-        }
+        ("airdrop", Some(matches)) => parse_airdrop(matches, default_signer, wallet_manager),
+        ("balance", Some(matches)) => parse_balance(matches, default_signer, wallet_manager),
         ("confirm", Some(matches)) => match matches.value_of("signature").unwrap().parse() {
             Ok(signature) => Ok(CliCommandInfo {
                 command: CliCommand::Confirm(signature),
@@ -810,40 +825,10 @@ pub fn parse_command(
             }),
             _ => Err(CliError::BadParameter("Invalid signature".to_string())),
         },
-        ("decode-transaction", Some(matches)) => {
-            let blob = value_t_or_exit!(matches, "transaction", String);
-            let encoding = match matches.value_of("encoding").unwrap() {
-                "base58" => UiTransactionEncoding::Base58,
-                "base64" => UiTransactionEncoding::Base64,
-                _ => unreachable!(),
-            };
-
-            let encoded_transaction = EncodedTransaction::Binary(blob, encoding);
-            if let Some(transaction) = encoded_transaction.decode() {
-                Ok(CliCommandInfo {
-                    command: CliCommand::DecodeTransaction(transaction),
-                    signers: vec![],
-                })
-            } else {
-                Err(CliError::BadParameter(
-                    "Unable to decode transaction".to_string(),
-                ))
-            }
-        }
-        ("account", Some(matches)) => {
-            let account_pubkey =
-                pubkey_of_signer(matches, "account_pubkey", wallet_manager)?.unwrap();
-            let output_file = matches.value_of("output_file");
-            let use_lamports_unit = matches.is_present("lamports");
-            Ok(CliCommandInfo {
-                command: CliCommand::ShowAccount {
-                    pubkey: account_pubkey,
-                    output_file: output_file.map(ToString::to_string),
-                    use_lamports_unit,
-                },
-                signers: vec![],
-            })
+        ("create-address-with-seed", Some(matches)) => {
+            parse_create_address_with_seed(matches, default_signer, wallet_manager)
         }
+        ("decode-transaction", Some(matches)) => parse_decode_transaction(matches),
         ("resolve-signer", Some(matches)) => {
             let signer_path = resolve_signer(matches, "signer", wallet_manager)?;
             Ok(CliCommandInfo {
@@ -851,69 +836,7 @@ pub fn parse_command(
                 signers: vec![],
             })
         }
-        ("transfer", Some(matches)) => {
-            let amount = SpendAmount::new_from_matches(matches, "amount");
-            let to = pubkey_of_signer(matches, "to", wallet_manager)?.unwrap();
-            let sign_only = matches.is_present(SIGN_ONLY_ARG.name);
-            let dump_transaction_message = matches.is_present(DUMP_TRANSACTION_MESSAGE.name);
-            let no_wait = matches.is_present("no_wait");
-            let blockhash_query = BlockhashQuery::new_from_matches(matches);
-            let nonce_account = pubkey_of_signer(matches, NONCE_ARG.name, wallet_manager)?;
-            let (nonce_authority, nonce_authority_pubkey) =
-                signer_of(matches, NONCE_AUTHORITY_ARG.name, wallet_manager)?;
-            let memo = matches.value_of(MEMO_ARG.name).map(String::from);
-            let (fee_payer, fee_payer_pubkey) =
-                signer_of(matches, FEE_PAYER_ARG.name, wallet_manager)?;
-            let (from, from_pubkey) = signer_of(matches, "from", wallet_manager)?;
-            let allow_unfunded_recipient = matches.is_present("allow_unfunded_recipient");
-
-            let mut bulk_signers = vec![fee_payer, from];
-            if nonce_account.is_some() {
-                bulk_signers.push(nonce_authority);
-            }
-
-            let signer_info =
-                default_signer.generate_unique_signers(bulk_signers, matches, wallet_manager)?;
-
-            let derived_address_seed = matches
-                .value_of("derived_address_seed")
-                .map(|s| s.to_string());
-            let derived_address_program_id =
-                resolve_derived_address_program_id(matches, "derived_address_program_id");
-
-            Ok(CliCommandInfo {
-                command: CliCommand::Transfer {
-                    amount,
-                    to,
-                    sign_only,
-                    dump_transaction_message,
-                    allow_unfunded_recipient,
-                    no_wait,
-                    blockhash_query,
-                    nonce_account,
-                    nonce_authority: signer_info.index_of(nonce_authority_pubkey).unwrap(),
-                    memo,
-                    fee_payer: signer_info.index_of(fee_payer_pubkey).unwrap(),
-                    from: signer_info.index_of(from_pubkey).unwrap(),
-                    derived_address_seed,
-                    derived_address_program_id,
-                },
-                signers: signer_info.signers,
-            })
-        }
-        ("rent", Some(matches)) => {
-            let data_length = value_of::<RentLengthValue>(matches, "data_length")
-                .unwrap()
-                .length();
-            let use_lamports_unit = matches.is_present("lamports");
-            Ok(CliCommandInfo {
-                command: CliCommand::Rent {
-                    data_length,
-                    use_lamports_unit,
-                },
-                signers: vec![],
-            })
-        }
+        ("transfer", Some(matches)) => parse_transfer(matches, default_signer, wallet_manager),
         //
         ("", None) => {
             eprintln!("{}", matches.usage());
@@ -928,349 +851,6 @@ pub fn parse_command(
 
 pub type ProcessResult = Result<String, Box<dyn std::error::Error>>;
 
-fn resolve_derived_address_program_id(matches: &ArgMatches<'_>, arg_name: &str) -> Option<Pubkey> {
-    matches.value_of(arg_name).and_then(|v| match v {
-        "NONCE" => Some(system_program::id()),
-        "STAKE" => Some(solana_stake_program::id()),
-        "VOTE" => Some(solana_vote_program::id()),
-        _ => pubkey_of(matches, arg_name),
-    })
-}
-
-pub fn parse_create_address_with_seed(
-    matches: &ArgMatches<'_>,
-    default_signer: &DefaultSigner,
-    wallet_manager: &mut Option<Arc<RemoteWalletManager>>,
-) -> Result<CliCommandInfo, CliError> {
-    let from_pubkey = pubkey_of_signer(matches, "from", wallet_manager)?;
-    let signers = if from_pubkey.is_some() {
-        vec![]
-    } else {
-        vec![default_signer.signer_from_path(matches, wallet_manager)?]
-    };
-
-    let program_id = resolve_derived_address_program_id(matches, "program_id").unwrap();
-
-    let seed = matches.value_of("seed").unwrap().to_string();
-
-    Ok(CliCommandInfo {
-        command: CliCommand::CreateAddressWithSeed {
-            from_pubkey,
-            seed,
-            program_id,
-        },
-        signers,
-    })
-}
-
-fn process_create_address_with_seed(
-    config: &CliConfig,
-    from_pubkey: Option<&Pubkey>,
-    seed: &str,
-    program_id: &Pubkey,
-) -> ProcessResult {
-    let from_pubkey = if let Some(pubkey) = from_pubkey {
-        *pubkey
-    } else {
-        config.pubkey()?
-    };
-    let address = Pubkey::create_with_seed(&from_pubkey, seed, program_id)?;
-    Ok(address.to_string())
-}
-
-fn process_airdrop(
-    rpc_client: &RpcClient,
-    config: &CliConfig,
-    pubkey: &Option<Pubkey>,
-    lamports: u64,
-) -> ProcessResult {
-    let pubkey = if let Some(pubkey) = pubkey {
-        *pubkey
-    } else {
-        config.pubkey()?
-    };
-    println!(
-        "Requesting airdrop of {}",
-        build_balance_message(lamports, false, true),
-    );
-
-    let pre_balance = rpc_client.get_balance(&pubkey)?;
-
-    let result = request_and_confirm_airdrop(rpc_client, config, &pubkey, lamports);
-    if let Ok(signature) = result {
-        let signature_cli_message = log_instruction_custom_error::<SystemError>(result, &config)?;
-        println!("{}", signature_cli_message);
-
-        let current_balance = rpc_client.get_balance(&pubkey)?;
-
-        if current_balance < pre_balance.saturating_add(lamports) {
-            println!("Balance unchanged");
-            println!("Run `solana confirm -v {:?}` for more info", signature);
-            Ok("".to_string())
-        } else {
-            Ok(build_balance_message(current_balance, false, true))
-        }
-    } else {
-        log_instruction_custom_error::<SystemError>(result, &config)
-    }
-}
-
-fn process_balance(
-    rpc_client: &RpcClient,
-    config: &CliConfig,
-    pubkey: &Option<Pubkey>,
-    use_lamports_unit: bool,
-) -> ProcessResult {
-    let pubkey = if let Some(pubkey) = pubkey {
-        *pubkey
-    } else {
-        config.pubkey()?
-    };
-    let balance = rpc_client.get_balance(&pubkey)?;
-    Ok(build_balance_message(balance, use_lamports_unit, true))
-}
-
-fn process_confirm(
-    rpc_client: &RpcClient,
-    config: &CliConfig,
-    signature: &Signature,
-) -> ProcessResult {
-    match rpc_client.get_signature_statuses_with_history(&[*signature]) {
-        Ok(status) => {
-            let cli_transaction = if let Some(transaction_status) = &status.value[0] {
-                let mut transaction = None;
-                let mut get_transaction_error = None;
-                if config.verbose {
-                    match rpc_client.get_transaction_with_config(
-                        signature,
-                        RpcTransactionConfig {
-                            encoding: Some(UiTransactionEncoding::Base64),
-                            commitment: Some(CommitmentConfig::confirmed()),
-                        },
-                    ) {
-                        Ok(confirmed_transaction) => {
-                            let decoded_transaction = confirmed_transaction
-                                .transaction
-                                .transaction
-                                .decode()
-                                .expect("Successful decode");
-                            let json_transaction = EncodedTransaction::encode(
-                                decoded_transaction.clone(),
-                                UiTransactionEncoding::Json,
-                            );
-
-                            transaction = Some(CliTransaction {
-                                transaction: json_transaction,
-                                meta: confirmed_transaction.transaction.meta,
-                                block_time: confirmed_transaction.block_time,
-                                slot: Some(confirmed_transaction.slot),
-                                decoded_transaction,
-                                prefix: "  ".to_string(),
-                                sigverify_status: vec![],
-                            });
-                        }
-                        Err(err) => {
-                            get_transaction_error = Some(format!("{:?}", err));
-                        }
-                    }
-                }
-                CliTransactionConfirmation {
-                    confirmation_status: Some(transaction_status.confirmation_status()),
-                    transaction,
-                    get_transaction_error,
-                    err: transaction_status.err.clone(),
-                }
-            } else {
-                CliTransactionConfirmation {
-                    confirmation_status: None,
-                    transaction: None,
-                    get_transaction_error: None,
-                    err: None,
-                }
-            };
-            Ok(config.output_format.formatted_string(&cli_transaction))
-        }
-        Err(err) => Err(CliError::RpcRequestError(format!("Unable to confirm: {}", err)).into()),
-    }
-}
-
-#[allow(clippy::unnecessary_wraps)]
-fn process_decode_transaction(config: &CliConfig, transaction: &Transaction) -> ProcessResult {
-    let sigverify_status = CliSignatureVerificationStatus::verify_transaction(&transaction);
-    let decode_transaction = CliTransaction {
-        decoded_transaction: transaction.clone(),
-        transaction: EncodedTransaction::encode(transaction.clone(), UiTransactionEncoding::Json),
-        meta: None,
-        block_time: None,
-        slot: None,
-        prefix: "".to_string(),
-        sigverify_status,
-    };
-    Ok(config.output_format.formatted_string(&decode_transaction))
-}
-
-fn process_show_account(
-    rpc_client: &RpcClient,
-    config: &CliConfig,
-    account_pubkey: &Pubkey,
-    output_file: &Option<String>,
-    use_lamports_unit: bool,
-) -> ProcessResult {
-    let account = rpc_client.get_account(account_pubkey)?;
-    let data = account.data.clone();
-    let cli_account = CliAccount {
-        keyed_account: RpcKeyedAccount {
-            pubkey: account_pubkey.to_string(),
-            account: UiAccount::encode(
-                account_pubkey,
-                &account,
-                UiAccountEncoding::Base64,
-                None,
-                None,
-            ),
-        },
-        use_lamports_unit,
-    };
-
-    let mut account_string = config.output_format.formatted_string(&cli_account);
-
-    if config.output_format == OutputFormat::Display
-        || config.output_format == OutputFormat::DisplayVerbose
-    {
-        if let Some(output_file) = output_file {
-            let mut f = File::create(output_file)?;
-            f.write_all(&data)?;
-            writeln!(&mut account_string)?;
-            writeln!(&mut account_string, "Wrote account data to {}", output_file)?;
-        } else if !data.is_empty() {
-            use pretty_hex::*;
-            writeln!(&mut account_string, "{:?}", data.hex_dump())?;
-        }
-    }
-
-    Ok(account_string)
-}
-
-#[allow(clippy::too_many_arguments)]
-fn process_transfer(
-    rpc_client: &RpcClient,
-    config: &CliConfig,
-    amount: SpendAmount,
-    to: &Pubkey,
-    from: SignerIndex,
-    sign_only: bool,
-    dump_transaction_message: bool,
-    allow_unfunded_recipient: bool,
-    no_wait: bool,
-    blockhash_query: &BlockhashQuery,
-    nonce_account: Option<&Pubkey>,
-    nonce_authority: SignerIndex,
-    memo: Option<&String>,
-    fee_payer: SignerIndex,
-    derived_address_seed: Option<String>,
-    derived_address_program_id: Option<&Pubkey>,
-) -> ProcessResult {
-    let from = config.signers[from];
-    let mut from_pubkey = from.pubkey();
-
-    let (recent_blockhash, fee_calculator) =
-        blockhash_query.get_blockhash_and_fee_calculator(rpc_client, config.commitment)?;
-
-    if !sign_only && !allow_unfunded_recipient {
-        let recipient_balance = rpc_client
-            .get_balance_with_commitment(to, config.commitment)?
-            .value;
-        if recipient_balance == 0 {
-            return Err(format!(
-                "The recipient address ({}) is not funded. \
-                                Add `--allow-unfunded-recipient` to complete the transfer \
-                               ",
-                to
-            )
-            .into());
-        }
-    }
-
-    let nonce_authority = config.signers[nonce_authority];
-    let fee_payer = config.signers[fee_payer];
-
-    let derived_parts = derived_address_seed.zip(derived_address_program_id);
-    let with_seed = if let Some((seed, program_id)) = derived_parts {
-        let base_pubkey = from_pubkey;
-        from_pubkey = Pubkey::create_with_seed(&base_pubkey, &seed, program_id)?;
-        Some((base_pubkey, seed, program_id, from_pubkey))
-    } else {
-        None
-    };
-
-    let build_message = |lamports| {
-        let ixs = if let Some((base_pubkey, seed, program_id, from_pubkey)) = with_seed.as_ref() {
-            vec![system_instruction::transfer_with_seed(
-                from_pubkey,
-                base_pubkey,
-                seed.clone(),
-                program_id,
-                to,
-                lamports,
-            )]
-            .with_memo(memo)
-        } else {
-            vec![system_instruction::transfer(&from_pubkey, to, lamports)].with_memo(memo)
-        };
-
-        if let Some(nonce_account) = &nonce_account {
-            Message::new_with_nonce(
-                ixs,
-                Some(&fee_payer.pubkey()),
-                nonce_account,
-                &nonce_authority.pubkey(),
-            )
-        } else {
-            Message::new(&ixs, Some(&fee_payer.pubkey()))
-        }
-    };
-
-    let (message, _) = resolve_spend_tx_and_check_account_balances(
-        rpc_client,
-        sign_only,
-        amount,
-        &fee_calculator,
-        &from_pubkey,
-        &fee_payer.pubkey(),
-        build_message,
-        config.commitment,
-    )?;
-    let mut tx = Transaction::new_unsigned(message);
-
-    if sign_only {
-        tx.try_partial_sign(&config.signers, recent_blockhash)?;
-        return_signers_with_config(
-            &tx,
-            &config.output_format,
-            &ReturnSignersConfig {
-                dump_transaction_message,
-            },
-        )
-    } else {
-        if let Some(nonce_account) = &nonce_account {
-            let nonce_account = nonce_utils::get_account_with_commitment(
-                rpc_client,
-                nonce_account,
-                config.commitment,
-            )?;
-            check_nonce_account(&nonce_account, &nonce_authority.pubkey(), &recent_blockhash)?;
-        }
-
-        tx.try_sign(&config.signers, recent_blockhash)?;
-        let result = if no_wait {
-            rpc_client.send_transaction(&tx)
-        } else {
-            rpc_client.send_and_confirm_transaction_with_spinner(&tx)
-        };
-        log_instruction_custom_error::<SystemError>(result, &config)
-    }
-}
-
 pub fn process_command(config: &CliConfig) -> ProcessResult {
     if config.verbose && config.output_format == OutputFormat::DisplayVerbose {
         println_name_value("RPC URL:", &config.json_rpc_url);
@@ -1286,10 +866,11 @@ pub fn process_command(config: &CliConfig) -> ProcessResult {
     }
 
     let rpc_client = if config.rpc_client.is_none() {
-        Arc::new(RpcClient::new_with_timeout_and_commitment(
+        Arc::new(RpcClient::new_with_timeouts_and_commitment(
             config.json_rpc_url.to_string(),
             config.rpc_timeout,
             config.commitment,
+            config.confirm_transaction_initial_timeout,
         ))
     } else {
         // Primarily for testing
@@ -1322,7 +903,7 @@ pub fn process_command(config: &CliConfig) -> ProcessResult {
             from_pubkey,
             seed,
             program_id,
-        } => process_create_address_with_seed(config, from_pubkey.as_ref(), &seed, &program_id),
+        } => process_create_address_with_seed(config, from_pubkey.as_ref(), seed, program_id),
         CliCommand::Fees { ref blockhash } => process_fees(&rpc_client, config, blockhash.as_ref()),
         CliCommand::Feature(feature_subcommand) => {
             process_feature_subcommand(&rpc_client, config, feature_subcommand)
@@ -1345,8 +926,8 @@ pub fn process_command(config: &CliConfig) -> ProcessResult {
         CliCommand::LeaderSchedule { epoch } => {
             process_leader_schedule(&rpc_client, config, *epoch)
         }
-        CliCommand::LiveSlots => process_live_slots(&config),
-        CliCommand::Logs { filter } => process_logs(&config, filter),
+        CliCommand::LiveSlots => process_live_slots(config),
+        CliCommand::Logs { filter } => process_logs(config, filter),
         CliCommand::Ping {
             lamports,
             interval,
@@ -1389,6 +970,8 @@ pub fn process_command(config: &CliConfig) -> ProcessResult {
             sort_order,
             reverse_sort,
             number_validators,
+            keep_unstaked_delinquents,
+            delinquent_slot_distance,
         } => process_show_validators(
             &rpc_client,
             config,
@@ -1396,6 +979,8 @@ pub fn process_command(config: &CliConfig) -> ProcessResult {
             *sort_order,
             *reverse_sort,
             *number_validators,
+            *keep_unstaked_delinquents,
+            *delinquent_slot_distance,
         ),
         CliCommand::Supply { print_accounts } => {
             process_supply(&rpc_client, config, *print_accounts)
@@ -1451,7 +1036,7 @@ pub fn process_command(config: &CliConfig) -> ProcessResult {
         ),
         // Get the current nonce
         CliCommand::GetNonce(nonce_account_pubkey) => {
-            process_get_nonce(&rpc_client, config, &nonce_account_pubkey)
+            process_get_nonce(&rpc_client, config, nonce_account_pubkey)
         }
         // Get a new nonce
         CliCommand::NewNonce {
@@ -1472,7 +1057,7 @@ pub fn process_command(config: &CliConfig) -> ProcessResult {
         } => process_show_nonce_account(
             &rpc_client,
             config,
-            &nonce_account_pubkey,
+            nonce_account_pubkey,
             *use_lamports_unit,
         ),
         // Withdraw lamports from a nonce account
@@ -1485,10 +1070,10 @@ pub fn process_command(config: &CliConfig) -> ProcessResult {
         } => process_withdraw_from_nonce_account(
             &rpc_client,
             config,
-            &nonce_account,
+            nonce_account,
             *nonce_authority,
             memo.as_ref(),
-            &destination_account_pubkey,
+            destination_account_pubkey,
             *lamports,
         ),
 
@@ -1520,6 +1105,7 @@ pub fn process_command(config: &CliConfig) -> ProcessResult {
             seed,
             staker,
             withdrawer,
+            withdrawer_signer,
             lockup,
             amount,
             sign_only,
@@ -1537,6 +1123,7 @@ pub fn process_command(config: &CliConfig) -> ProcessResult {
             seed,
             staker,
             withdrawer,
+            *withdrawer_signer,
             lockup,
             *amount,
             *sign_only,
@@ -1562,7 +1149,7 @@ pub fn process_command(config: &CliConfig) -> ProcessResult {
         } => process_deactivate_stake_account(
             &rpc_client,
             config,
-            &stake_account_pubkey,
+            stake_account_pubkey,
             *stake_authority,
             *sign_only,
             *dump_transaction_message,
@@ -1588,8 +1175,8 @@ pub fn process_command(config: &CliConfig) -> ProcessResult {
         } => process_delegate_stake(
             &rpc_client,
             config,
-            &stake_account_pubkey,
-            &vote_account_pubkey,
+            stake_account_pubkey,
+            vote_account_pubkey,
             *stake_authority,
             *force,
             *sign_only,
@@ -1616,7 +1203,7 @@ pub fn process_command(config: &CliConfig) -> ProcessResult {
         } => process_split_stake(
             &rpc_client,
             config,
-            &stake_account_pubkey,
+            stake_account_pubkey,
             *stake_authority,
             *sign_only,
             *dump_transaction_message,
@@ -1643,8 +1230,8 @@ pub fn process_command(config: &CliConfig) -> ProcessResult {
         } => process_merge_stake(
             &rpc_client,
             config,
-            &stake_account_pubkey,
-            &source_stake_account_pubkey,
+            stake_account_pubkey,
+            source_stake_account_pubkey,
             *stake_authority,
             *sign_only,
             *dump_transaction_message,
@@ -1661,7 +1248,7 @@ pub fn process_command(config: &CliConfig) -> ProcessResult {
         } => process_show_stake_account(
             &rpc_client,
             config,
-            &stake_account_pubkey,
+            stake_account_pubkey,
             *use_lamports_unit,
             *with_rewards,
         ),
@@ -1684,7 +1271,7 @@ pub fn process_command(config: &CliConfig) -> ProcessResult {
         } => process_stake_authorize(
             &rpc_client,
             config,
-            &stake_account_pubkey,
+            stake_account_pubkey,
             new_authorizations,
             *custodian,
             *sign_only,
@@ -1698,8 +1285,9 @@ pub fn process_command(config: &CliConfig) -> ProcessResult {
         ),
         CliCommand::StakeSetLockup {
             stake_account_pubkey,
-            mut lockup,
+            lockup,
             custodian,
+            new_custodian_signer,
             sign_only,
             dump_transaction_message,
             blockhash_query,
@@ -1710,8 +1298,9 @@ pub fn process_command(config: &CliConfig) -> ProcessResult {
         } => process_stake_set_lockup(
             &rpc_client,
             config,
-            &stake_account_pubkey,
-            &mut lockup,
+            stake_account_pubkey,
+            lockup,
+            *new_custodian_signer,
             *custodian,
             *sign_only,
             *dump_transaction_message,
@@ -1738,8 +1327,8 @@ pub fn process_command(config: &CliConfig) -> ProcessResult {
         } => process_withdraw_stake(
             &rpc_client,
             config,
-            &stake_account_pubkey,
-            &destination_account_pubkey,
+            stake_account_pubkey,
+            destination_account_pubkey,
             *amount,
             *withdraw_authority,
             *custodian,
@@ -1767,7 +1356,7 @@ pub fn process_command(config: &CliConfig) -> ProcessResult {
         } => process_set_validator_info(
             &rpc_client,
             config,
-            &validator_info,
+            validator_info,
             *force_keybase,
             *info_pubkey,
         ),
@@ -1801,7 +1390,7 @@ pub fn process_command(config: &CliConfig) -> ProcessResult {
         } => process_show_vote_account(
             &rpc_client,
             config,
-            &vote_account_pubkey,
+            vote_account_pubkey,
             *use_lamports_unit,
             *with_rewards,
         ),
@@ -1825,12 +1414,16 @@ pub fn process_command(config: &CliConfig) -> ProcessResult {
             new_authorized_pubkey,
             vote_authorize,
             memo,
+            authorized,
+            new_authorized,
         } => process_vote_authorize(
             &rpc_client,
             config,
-            &vote_account_pubkey,
-            &new_authorized_pubkey,
+            vote_account_pubkey,
+            new_authorized_pubkey,
             *vote_authorize,
+            *authorized,
+            *new_authorized,
             memo.as_ref(),
         ),
         CliCommand::VoteUpdateValidator {
@@ -1841,7 +1434,7 @@ pub fn process_command(config: &CliConfig) -> ProcessResult {
         } => process_vote_update_validator(
             &rpc_client,
             config,
-            &vote_account_pubkey,
+            vote_account_pubkey,
             *new_identity_account,
             *withdraw_authority,
             memo.as_ref(),
@@ -1854,7 +1447,7 @@ pub fn process_command(config: &CliConfig) -> ProcessResult {
         } => process_vote_update_commission(
             &rpc_client,
             config,
-            &vote_account_pubkey,
+            vote_account_pubkey,
             *commission,
             *withdraw_authority,
             memo.as_ref(),
@@ -1870,7 +1463,7 @@ pub fn process_command(config: &CliConfig) -> ProcessResult {
         CliCommand::Balance {
             pubkey,
             use_lamports_unit,
-        } => process_balance(&rpc_client, config, &pubkey, *use_lamports_unit),
+        } => process_balance(&rpc_client, config, pubkey, *use_lamports_unit),
         // Confirm the last client transaction by signature
         CliCommand::Confirm(signature) => process_confirm(&rpc_client, config, signature),
         CliCommand::DecodeTransaction(transaction) => {
@@ -1887,13 +1480,7 @@ pub fn process_command(config: &CliConfig) -> ProcessResult {
             pubkey,
             output_file,
             use_lamports_unit,
-        } => process_show_account(
-            &rpc_client,
-            config,
-            &pubkey,
-            &output_file,
-            *use_lamports_unit,
-        ),
+        } => process_show_account(&rpc_client, config, pubkey, output_file, *use_lamports_unit),
         CliCommand::Transfer {
             amount,
             to,
@@ -1947,21 +1534,41 @@ pub fn request_and_confirm_airdrop(
     Ok(signature)
 }
 
+fn common_error_adapter<E>(ix_error: &InstructionError) -> Option<E>
+where
+    E: 'static + std::error::Error + DecodeError<E> + FromPrimitive,
+{
+    if let InstructionError::Custom(code) = ix_error {
+        E::decode_custom_error_to_enum(*code)
+    } else {
+        None
+    }
+}
+
 pub fn log_instruction_custom_error<E>(
     result: ClientResult<Signature>,
     config: &CliConfig,
 ) -> ProcessResult
 where
     E: 'static + std::error::Error + DecodeError<E> + FromPrimitive,
+{
+    log_instruction_custom_error_ex::<E, _>(result, config, common_error_adapter)
+}
+
+pub fn log_instruction_custom_error_ex<E, F>(
+    result: ClientResult<Signature>,
+    config: &CliConfig,
+    error_adapter: F,
+) -> ProcessResult
+where
+    E: 'static + std::error::Error + DecodeError<E> + FromPrimitive,
+    F: Fn(&InstructionError) -> Option<E>,
 {
     match result {
         Err(err) => {
-            if let ClientErrorKind::TransactionError(TransactionError::InstructionError(
-                _,
-                InstructionError::Custom(code),
-            )) = err.kind()
-            {
-                if let Some(specific_error) = E::decode_custom_error_to_enum(*code) {
+            let maybe_tx_err = err.get_transaction_error();
+            if let Some(TransactionError::InstructionError(_, ix_error)) = maybe_tx_err {
+                if let Some(specific_error) = error_adapter(&ix_error) {
                     return Err(specific_error.into());
                 }
             }
@@ -1976,289 +1583,6 @@ where
     }
 }
 
-pub fn app<'ab, 'v>(name: &str, about: &'ab str, version: &'v str) -> App<'ab, 'v> {
-    App::new(name)
-        .about(about)
-        .version(version)
-        .setting(AppSettings::SubcommandRequiredElseHelp)
-        .subcommand(
-            SubCommand::with_name("address")
-                .about("Get your public key")
-                .arg(
-                    Arg::with_name("confirm_key")
-                        .long("confirm-key")
-                        .takes_value(false)
-                        .help("Confirm key on device; only relevant if using remote wallet"),
-                ),
-        )
-        .cluster_query_subcommands()
-        .feature_subcommands()
-        .inflation_subcommands()
-        .nonce_subcommands()
-        .program_subcommands()
-        .stake_subcommands()
-        .subcommand(
-            SubCommand::with_name("airdrop")
-                .about("Request lamports")
-                .arg(
-                    Arg::with_name("faucet_host")
-                        .long("faucet-host")
-                        .value_name("URL")
-                        .takes_value(true)
-                        .help("Faucet host to use [default: the --url host]"),
-                )
-                .arg(
-                    Arg::with_name("faucet_port")
-                        .long("faucet-port")
-                        .value_name("PORT_NUMBER")
-                        .takes_value(true)
-                        .default_value(solana_faucet::faucet::FAUCET_PORT_STR)
-                        .help("Faucet port to use"),
-                )
-                .arg(
-                    Arg::with_name("amount")
-                        .index(1)
-                        .value_name("AMOUNT")
-                        .takes_value(true)
-                        .validator(is_amount)
-                        .required(true)
-                        .help("The airdrop amount to request, in SOL"),
-                )
-                .arg(
-                    pubkey!(Arg::with_name("to")
-                        .index(2)
-                        .value_name("RECIPIENT_ADDRESS"),
-                        "The account address of airdrop recipient. "),
-                ),
-        )
-        .subcommand(
-            SubCommand::with_name("balance")
-                .about("Get your balance")
-                .arg(
-                    pubkey!(Arg::with_name("pubkey")
-                        .index(1)
-                        .value_name("ACCOUNT_ADDRESS"),
-                        "The account address of the balance to check. ")
-                )
-                .arg(
-                    Arg::with_name("lamports")
-                        .long("lamports")
-                        .takes_value(false)
-                        .help("Display balance in lamports instead of SOL"),
-                ),
-        )
-        .subcommand(
-            SubCommand::with_name("confirm")
-                .about("Confirm transaction by signature")
-                .arg(
-                    Arg::with_name("signature")
-                        .index(1)
-                        .value_name("TRANSACTION_SIGNATURE")
-                        .takes_value(true)
-                        .required(true)
-                        .help("The transaction signature to confirm"),
-                )
-                .after_help(// Formatted specifically for the manually-indented heredoc string
-                   "Note: This will show more detailed information for finalized transactions with verbose mode (-v/--verbose).\
-                  \n\
-                  \nAccount modes:\
-                  \n  |srwx|\
-                  \n    s: signed\
-                  \n    r: readable (always true)\
-                  \n    w: writable\
-                  \n    x: program account (inner instructions excluded)\
-                   "
-                ),
-        )
-        .subcommand(
-            SubCommand::with_name("decode-transaction")
-                .about("Decode a serialized transaction")
-                .arg(
-                    Arg::with_name("transaction")
-                        .index(1)
-                        .value_name("TRANSACTION")
-                        .takes_value(true)
-                        .required(true)
-                        .help("transaction to decode"),
-                )
-                .arg(
-                    Arg::with_name("encoding")
-                        .index(2)
-                        .value_name("ENCODING")
-                        .possible_values(&["base58", "base64"]) // Subset of `UiTransactionEncoding` enum
-                        .default_value("base58")
-                        .takes_value(true)
-                        .required(true)
-                        .help("transaction encoding"),
-                ),
-        )
-        .subcommand(
-            SubCommand::with_name("create-address-with-seed")
-                .about("Generate a derived account address with a seed")
-                .arg(
-                    Arg::with_name("seed")
-                        .index(1)
-                        .value_name("SEED_STRING")
-                        .takes_value(true)
-                        .required(true)
-                        .validator(is_derived_address_seed)
-                        .help("The seed.  Must not take more than 32 bytes to encode as utf-8"),
-                )
-                .arg(
-                    Arg::with_name("program_id")
-                        .index(2)
-                        .value_name("PROGRAM_ID")
-                        .takes_value(true)
-                        .required(true)
-                        .help(
-                            "The program_id that the address will ultimately be used for, \n\
-                             or one of NONCE, STAKE, and VOTE keywords",
-                        ),
-                )
-                .arg(
-                    pubkey!(Arg::with_name("from")
-                        .long("from")
-                        .value_name("FROM_PUBKEY")
-                        .required(false),
-                        "From (base) key, [default: cli config keypair]. "),
-                ),
-        )
-        .subcommand(
-            SubCommand::with_name("deploy")
-                .about("Deploy a program")
-                .arg(
-                    Arg::with_name("program_location")
-                        .index(1)
-                        .value_name("PROGRAM_FILEPATH")
-                        .takes_value(true)
-                        .required(true)
-                        .help("/path/to/program.o"),
-                )
-                .arg(
-                    Arg::with_name("address_signer")
-                        .index(2)
-                        .value_name("PROGRAM_ADDRESS_SIGNER")
-                        .takes_value(true)
-                        .validator(is_valid_signer)
-                        .help("The signer for the desired address of the program [default: new random address]")
-                )
-                .arg(
-                    Arg::with_name("use_deprecated_loader")
-                        .long("use-deprecated-loader")
-                        .takes_value(false)
-                        .hidden(true) // Don't document this argument to discourage its use
-                        .help("Use the deprecated BPF loader")
-                )
-                .arg(
-                    Arg::with_name("allow_excessive_balance")
-                        .long("allow-excessive-deploy-account-balance")
-                        .takes_value(false)
-                        .help("Use the designated program id, even if the account already holds a large balance of SOL")
-                ),
-        )
-        .subcommand(
-            SubCommand::with_name("resolve-signer")
-                .about("Checks that a signer is valid, and returns its specific path; useful for signers that may be specified generally, eg. usb://ledger")
-                .arg(
-                    Arg::with_name("signer")
-                        .index(1)
-                        .value_name("SIGNER_KEYPAIR")
-                        .takes_value(true)
-                        .required(true)
-                        .validator(is_valid_signer)
-                        .help("The signer path to resolve")
-                )
-        )
-        .subcommand(
-            SubCommand::with_name("transfer")
-                .about("Transfer funds between system accounts")
-                .alias("pay")
-                .arg(
-                    pubkey!(Arg::with_name("to")
-                        .index(1)
-                        .value_name("RECIPIENT_ADDRESS")
-                        .required(true),
-                        "The account address of recipient. "),
-                )
-                .arg(
-                    Arg::with_name("amount")
-                        .index(2)
-                        .value_name("AMOUNT")
-                        .takes_value(true)
-                        .validator(is_amount_or_all)
-                        .required(true)
-                        .help("The amount to send, in SOL; accepts keyword ALL"),
-                )
-                .arg(
-                    pubkey!(Arg::with_name("from")
-                        .long("from")
-                        .value_name("FROM_ADDRESS"),
-                        "Source account of funds (if different from client local account). "),
-                )
-                .arg(
-                    Arg::with_name("no_wait")
-                        .long("no-wait")
-                        .takes_value(false)
-                        .help("Return signature immediately after submitting the transaction, instead of waiting for confirmations"),
-                )
-                .arg(
-                    Arg::with_name("derived_address_seed")
-                        .long("derived-address-seed")
-                        .takes_value(true)
-                        .value_name("SEED_STRING")
-                        .requires("derived_address_program_id")
-                        .validator(is_derived_address_seed)
-                        .hidden(true)
-                )
-                .arg(
-                    Arg::with_name("derived_address_program_id")
-                        .long("derived-address-program-id")
-                        .takes_value(true)
-                        .value_name("PROGRAM_ID")
-                        .requires("derived_address_seed")
-                        .hidden(true)
-                )
-                .arg(
-                    Arg::with_name("allow_unfunded_recipient")
-                        .long("allow-unfunded-recipient")
-                        .takes_value(false)
-                        .help("Complete the transfer even if the recipient address is not funded")
-                )
-                .offline_args()
-                .nonce_args(false)
-		.arg(memo_arg())
-                .arg(fee_payer_arg()),
-        )
-        .subcommand(
-            SubCommand::with_name("account")
-                .about("Show the contents of an account")
-                .alias("account")
-                .arg(
-                    pubkey!(Arg::with_name("account_pubkey")
-                        .index(1)
-                        .value_name("ACCOUNT_ADDRESS")
-                        .required(true),
-                        "Account key URI. ")
-                )
-                .arg(
-                    Arg::with_name("output_file")
-                        .long("output-file")
-                        .short("o")
-                        .value_name("FILEPATH")
-                        .takes_value(true)
-                        .help("Write the account data to this file"),
-                )
-                .arg(
-                    Arg::with_name("lamports")
-                        .long("lamports")
-                        .takes_value(false)
-                        .help("Display balance in lamports instead of SOL"),
-                ),
-        )
-        .validator_info_subcommands()
-        .vote_subcommands()
-}
-
 #[cfg(test)]
 mod tests {
     use super::*;
@@ -2272,6 +1596,7 @@ mod tests {
     use solana_sdk::{
         pubkey::Pubkey,
         signature::{keypair_from_seed, read_keypair_file, write_keypair_file, Keypair, Presigner},
+        stake, system_program,
         transaction::TransactionError,
     };
     use solana_transaction_status::TransactionConfirmationStatus;
@@ -2299,7 +1624,7 @@ mod tests {
         let default_keypair_file = make_tmp_path("keypair_file");
         write_keypair_file(&default_keypair, &default_keypair_file).unwrap();
 
-        let default_signer = DefaultSigner::new(default_keypair_file);
+        let default_signer = DefaultSigner::new("keypair", &default_keypair_file);
 
         let signer_info = default_signer
             .generate_unique_signers(vec![], &matches, &mut None)
@@ -2368,7 +1693,7 @@ mod tests {
     #[test]
     #[allow(clippy::cognitive_complexity)]
     fn test_cli_parse_command() {
-        let test_commands = app("test", "desc", "version");
+        let test_commands = get_clap_app("test", "desc", "version");
 
         let pubkey = solana_sdk::pubkey::new_rand();
         let pubkey_string = format!("{}", pubkey);
@@ -2377,7 +1702,7 @@ mod tests {
         let keypair_file = make_tmp_path("keypair_file");
         write_keypair_file(&default_keypair, &keypair_file).unwrap();
         let keypair = read_keypair_file(&keypair_file).unwrap();
-        let default_signer = DefaultSigner::new(keypair_file.clone());
+        let default_signer = DefaultSigner::new("", &keypair_file);
         // Test Airdrop Subcommand
         let test_airdrop =
             test_commands
@@ -2464,7 +1789,7 @@ mod tests {
         let from_pubkey = Some(solana_sdk::pubkey::new_rand());
         let from_str = from_pubkey.unwrap().to_string();
         for (name, program_id) in &[
-            ("STAKE", solana_stake_program::id()),
+            ("STAKE", stake::program::id()),
             ("VOTE", solana_vote_program::id()),
             ("NONCE", system_program::id()),
         ] {
@@ -2500,7 +1825,7 @@ mod tests {
                 command: CliCommand::CreateAddressWithSeed {
                     from_pubkey: None,
                     seed: "seed".to_string(),
-                    program_id: solana_stake_program::id(),
+                    program_id: stake::program::id(),
                 },
                 signers: vec![read_keypair_file(&keypair_file).unwrap().into()],
             }
@@ -2633,6 +1958,8 @@ mod tests {
             new_authorized_pubkey,
             vote_authorize: VoteAuthorize::Voter,
             memo: None,
+            authorized: 0,
+            new_authorized: None,
         };
         let result = process_command(&config);
         assert!(result.is_ok());
@@ -2656,6 +1983,7 @@ mod tests {
             seed: None,
             staker: None,
             withdrawer: None,
+            withdrawer_signer: None,
             lockup: Lockup {
                 epoch: 0,
                 unix_timestamp: 0,
@@ -2763,11 +2091,11 @@ mod tests {
         config.command = CliCommand::CreateAddressWithSeed {
             from_pubkey: Some(from_pubkey),
             seed: "seed".to_string(),
-            program_id: solana_stake_program::id(),
+            program_id: stake::program::id(),
         };
         let address = process_command(&config);
         let expected_address =
-            Pubkey::create_with_seed(&from_pubkey, "seed", &solana_stake_program::id()).unwrap();
+            Pubkey::create_with_seed(&from_pubkey, "seed", &stake::program::id()).unwrap();
         assert_eq!(address.unwrap(), expected_address.to_string());
 
         // Need airdrop cases
@@ -2828,6 +2156,8 @@ mod tests {
             new_authorized_pubkey: bob_pubkey,
             vote_authorize: VoteAuthorize::Voter,
             memo: None,
+            authorized: 0,
+            new_authorized: None,
         };
         assert!(process_command(&config).is_err());
 
@@ -2900,12 +2230,12 @@ mod tests {
 
     #[test]
     fn test_parse_transfer_subcommand() {
-        let test_commands = app("test", "desc", "version");
+        let test_commands = get_clap_app("test", "desc", "version");
 
         let default_keypair = Keypair::new();
         let default_keypair_file = make_tmp_path("keypair_file");
         write_keypair_file(&default_keypair, &default_keypair_file).unwrap();
-        let default_signer = DefaultSigner::new(default_keypair_file.clone());
+        let default_signer = DefaultSigner::new("", &default_keypair_file);
 
         //Test Transfer Subcommand, SOL
         let from_keypair = keypair_from_seed(&[0u8; 32]).unwrap();
@@ -3154,7 +2484,7 @@ mod tests {
                     memo: None,
                     fee_payer: 0,
                     derived_address_seed: Some(derived_address_seed),
-                    derived_address_program_id: Some(solana_stake_program::id()),
+                    derived_address_program_id: Some(stake::program::id()),
                 },
                 signers: vec![read_keypair_file(&default_keypair_file).unwrap().into(),],
             }
diff --git a/cli/src/cluster_query.rs b/cli/src/cluster_query.rs
index b4874b1b21dc71..c2d5e9a221fa7b 100644
--- a/cli/src/cluster_query.rs
+++ b/cli/src/cluster_query.rs
@@ -1,7 +1,6 @@
 use crate::{
     cli::{CliCommand, CliCommandInfo, CliConfig, CliError, ProcessResult},
     spend_utils::{resolve_spend_tx_and_check_account_balance, SpendAmount},
-    stake::is_stake_program_v2_enabled,
 };
 use clap::{value_t, value_t_or_exit, App, AppSettings, Arg, ArgMatches, SubCommand};
 use console::{style, Emoji};
@@ -24,11 +23,12 @@ use solana_client::{
     pubsub_client::PubsubClient,
     rpc_client::{GetConfirmedSignaturesForAddress2Config, RpcClient},
     rpc_config::{
-        RpcAccountInfoConfig, RpcBlockConfig, RpcLargestAccountsConfig, RpcLargestAccountsFilter,
-        RpcProgramAccountsConfig, RpcTransactionConfig, RpcTransactionLogsConfig,
-        RpcTransactionLogsFilter,
+        RpcAccountInfoConfig, RpcBlockConfig, RpcGetVoteAccountsConfig, RpcLargestAccountsConfig,
+        RpcLargestAccountsFilter, RpcProgramAccountsConfig, RpcTransactionConfig,
+        RpcTransactionLogsConfig, RpcTransactionLogsFilter,
     },
     rpc_filter,
+    rpc_request::DELINQUENT_VALIDATOR_SLOT_DISTANCE,
     rpc_response::SlotInfo,
 };
 use solana_remote_wallet::remote_wallet::RemoteWalletManager;
@@ -46,7 +46,9 @@ use solana_sdk::{
     rent::Rent,
     rpc_port::DEFAULT_RPC_PORT_STR,
     signature::Signature,
-    slot_history, system_instruction, system_program,
+    slot_history,
+    stake::{self, state::StakeState},
+    system_instruction, system_program,
     sysvar::{
         self,
         slot_history::SlotHistory,
@@ -55,7 +57,6 @@ use solana_sdk::{
     timing,
     transaction::Transaction,
 };
-use solana_stake_program::stake_state::StakeState;
 use solana_transaction_status::UiTransactionEncoding;
 use solana_vote_program::vote_state::VoteState;
 use std::{
@@ -121,7 +122,7 @@ impl ClusterQuerySubCommands for App<'_, '_> {
                         .long("our-localhost")
                         .takes_value(false)
                         .value_name("PORT")
-                        .default_value(&DEFAULT_RPC_PORT_STR)
+                        .default_value(DEFAULT_RPC_PORT_STR)
                         .validator(is_port)
                         .help("Guess Identity pubkey and validator rpc node assuming local (possibly private) validator"),
                 )
@@ -175,7 +176,7 @@ impl ClusterQuerySubCommands for App<'_, '_> {
                     .takes_value(true)
                     .value_name("EPOCH")
                     .validator(is_epoch)
-                    .help("Epoch to show leader schedule for. (default: current)")
+                    .help("Epoch to show leader schedule for. [default: current]")
             )
         )
         .subcommand(
@@ -381,6 +382,25 @@ impl ClusterQuerySubCommands for App<'_, '_> {
                         ])
                         .default_value("stake")
                         .help("Sort order (does not affect JSON output)"),
+                )
+                .arg(
+                    Arg::with_name("keep_unstaked_delinquents")
+                        .long("keep-unstaked-delinquents")
+                        .takes_value(false)
+                        .help("Don't discard unstaked, delinquent validators")
+                )
+                .arg(
+                    Arg::with_name("delinquent_slot_distance")
+                        .long("delinquent-slot-distance")
+                        .takes_value(true)
+                        .value_name("SLOT_DISTANCE")
+                        .validator(is_slot)
+                        .help(
+                            concatcp!(
+                                "Minimum slot distance from the tip to consider a validator delinquent. [default: ",
+                                DELINQUENT_VALIDATOR_SLOT_DISTANCE,
+                                "]",
+                        ))
                 ),
         )
         .subcommand(
@@ -616,6 +636,8 @@ pub fn parse_show_validators(matches: &ArgMatches<'_>) -> Result<CliCommandInfo,
     let use_lamports_unit = matches.is_present("lamports");
     let number_validators = matches.is_present("number");
     let reverse_sort = matches.is_present("reverse");
+    let keep_unstaked_delinquents = matches.is_present("keep_unstaked_delinquents");
+    let delinquent_slot_distance = value_of(matches, "delinquent_slot_distance");
 
     let sort_order = match value_t_or_exit!(matches, "sort", String).as_str() {
         "delinquent" => CliValidatorsSortOrder::Delinquent,
@@ -636,6 +658,8 @@ pub fn parse_show_validators(matches: &ArgMatches<'_>) -> Result<CliCommandInfo,
             sort_order,
             reverse_sort,
             number_validators,
+            keep_unstaked_delinquents,
+            delinquent_slot_distance,
         },
         signers: vec![],
     })
@@ -937,18 +961,19 @@ pub fn process_fees(
                 *recent_blockhash,
                 fee_calculator.lamports_per_signature,
                 None,
+                None,
             )
         } else {
             CliFees::none()
         }
     } else {
-        let result = rpc_client.get_recent_blockhash_with_commitment(config.commitment)?;
-        let (recent_blockhash, fee_calculator, last_valid_slot) = result.value;
+        let result = rpc_client.get_fees_with_commitment(config.commitment)?;
         CliFees::some(
             result.context.slot,
-            recent_blockhash,
-            fee_calculator.lamports_per_signature,
-            Some(last_valid_slot),
+            result.value.blockhash,
+            result.value.fee_calculator.lamports_per_signature,
+            None,
+            Some(result.value.last_valid_block_height),
         )
     };
     Ok(config.output_format.formatted_string(&fees))
@@ -1075,9 +1100,15 @@ pub fn process_get_epoch_info(rpc_client: &RpcClient, config: &CliConfig) -> Pro
             (secs as u64).saturating_mul(1000).checked_div(slots)
         })
         .unwrap_or(clock::DEFAULT_MS_PER_SLOT);
+    let start_block_time = rpc_client
+        .get_block_time(epoch_info.absolute_slot - epoch_info.slot_index)
+        .ok();
+    let current_block_time = rpc_client.get_block_time(epoch_info.absolute_slot).ok();
     let epoch_info = CliEpochInfo {
         epoch_info,
         average_slot_time_ms,
+        start_block_time,
+        current_block_time,
     };
     Ok(config.output_format.formatted_string(&epoch_info))
 }
@@ -1707,7 +1738,7 @@ pub fn process_show_stakes(
         }
     }
     let all_stake_accounts = rpc_client
-        .get_program_accounts_with_config(&solana_stake_program::id(), program_accounts_config)?;
+        .get_program_accounts_with_config(&stake::program::id(), program_accounts_config)?;
     let stake_history_account = rpc_client.get_account(&stake_history::id())?;
     let clock_account = rpc_client.get_account(&sysvar::clock::id())?;
     let clock: Clock = from_account(&clock_account).ok_or_else(|| {
@@ -1718,8 +1749,6 @@ pub fn process_show_stakes(
     let stake_history = from_account(&stake_history_account).ok_or_else(|| {
         CliError::RpcRequestError("Failed to deserialize stake history".to_string())
     })?;
-    // At v1.6, this check can be removed and simply passed as `true`
-    let stake_program_v2_enabled = is_stake_program_v2_enabled(rpc_client)?;
 
     let mut stake_accounts: Vec<CliKeyedStakeState> = vec![];
     for (stake_pubkey, stake_account) in all_stake_accounts {
@@ -1735,7 +1764,6 @@ pub fn process_show_stakes(
                                 use_lamports_unit,
                                 &stake_history,
                                 &clock,
-                                stake_program_v2_enabled,
                             ),
                         });
                     }
@@ -1754,7 +1782,6 @@ pub fn process_show_stakes(
                                 use_lamports_unit,
                                 &stake_history,
                                 &clock,
-                                stake_program_v2_enabled,
                             ),
                         });
                     }
@@ -1785,11 +1812,17 @@ pub fn process_show_validators(
     validators_sort_order: CliValidatorsSortOrder,
     validators_reverse_sort: bool,
     number_validators: bool,
+    keep_unstaked_delinquents: bool,
+    delinquent_slot_distance: Option<Slot>,
 ) -> ProcessResult {
     let progress_bar = new_spinner_progress_bar();
     progress_bar.set_message("Fetching vote accounts...");
     let epoch_info = rpc_client.get_epoch_info()?;
-    let vote_accounts = rpc_client.get_vote_accounts()?;
+    let vote_accounts = rpc_client.get_vote_accounts_with_config(RpcGetVoteAccountsConfig {
+        keep_unstaked_delinquents: Some(keep_unstaked_delinquents),
+        delinquent_slot_distance,
+        ..RpcGetVoteAccountsConfig::default()
+    })?;
 
     progress_bar.set_message("Fetching block production...");
     let skip_rate: HashMap<_, _> = rpc_client
@@ -1888,14 +1921,40 @@ pub fn process_show_validators(
         entry.delinquent_active_stake += validator.activated_stake;
     }
 
+    let validators: Vec<_> = current_validators
+        .into_iter()
+        .chain(delinquent_validators.into_iter())
+        .collect();
+
+    let (average_skip_rate, average_stake_weighted_skip_rate) = {
+        let mut skip_rate_len = 0;
+        let mut skip_rate_sum = 0.;
+        let mut skip_rate_weighted_sum = 0.;
+        for validator in validators.iter() {
+            if let Some(skip_rate) = validator.skip_rate {
+                skip_rate_sum += skip_rate;
+                skip_rate_len += 1;
+                skip_rate_weighted_sum += skip_rate * validator.activated_stake as f64;
+            }
+        }
+
+        if skip_rate_len > 0 && total_active_stake > 0 {
+            (
+                skip_rate_sum / skip_rate_len as f64,
+                skip_rate_weighted_sum / total_active_stake as f64,
+            )
+        } else {
+            (100., 100.) // Impossible?
+        }
+    };
+
     let cli_validators = CliValidators {
         total_active_stake,
         total_current_stake,
         total_delinquent_stake,
-        validators: current_validators
-            .into_iter()
-            .chain(delinquent_validators.into_iter())
-            .collect(),
+        validators,
+        average_skip_rate,
+        average_stake_weighted_skip_rate,
         validators_sort_order,
         validators_reverse_sort,
         number_validators,
@@ -2082,7 +2141,7 @@ pub fn process_calculate_rent(
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::cli::{app, parse_command};
+    use crate::{clap_app::get_clap_app, cli::parse_command};
     use solana_sdk::signature::{write_keypair, Keypair};
     use std::str::FromStr;
     use tempfile::NamedTempFile;
@@ -2094,11 +2153,11 @@ mod tests {
 
     #[test]
     fn test_parse_command() {
-        let test_commands = app("test", "desc", "version");
+        let test_commands = get_clap_app("test", "desc", "version");
         let default_keypair = Keypair::new();
         let (default_keypair_file, mut tmp_file) = make_tmp_file();
         write_keypair(&default_keypair, tmp_file.as_file_mut()).unwrap();
-        let default_signer = DefaultSigner::new(default_keypair_file);
+        let default_signer = DefaultSigner::new("", &default_keypair_file);
 
         let test_cluster_version = test_commands
             .clone()
diff --git a/cli/src/feature.rs b/cli/src/feature.rs
index 86d6a24dc8ab58..5e64b338dc4ebb 100644
--- a/cli/src/feature.rs
+++ b/cli/src/feature.rs
@@ -10,6 +10,7 @@ use solana_cli_output::{QuietDisplay, VerboseDisplay};
 use solana_client::{client_error::ClientError, rpc_client::RpcClient};
 use solana_remote_wallet::remote_wallet::RemoteWalletManager;
 use solana_sdk::{
+    account::Account,
     clock::Slot,
     feature::{self, Feature},
     feature_set::FEATURE_NAMES,
@@ -312,6 +313,31 @@ fn feature_activation_allowed(rpc_client: &RpcClient, quiet: bool) -> Result<boo
     Ok(feature_activation_allowed)
 }
 
+fn status_from_account(account: Account) -> Option<CliFeatureStatus> {
+    feature::from_account(&account).map(|feature| match feature.activated_at {
+        None => CliFeatureStatus::Pending,
+        Some(activation_slot) => CliFeatureStatus::Active(activation_slot),
+    })
+}
+
+fn get_feature_status(
+    rpc_client: &RpcClient,
+    feature_id: &Pubkey,
+) -> Result<Option<CliFeatureStatus>, Box<dyn std::error::Error>> {
+    rpc_client
+        .get_account(feature_id)
+        .map(status_from_account)
+        .map_err(|e| e.into())
+}
+
+pub fn get_feature_is_active(
+    rpc_client: &RpcClient,
+    feature_id: &Pubkey,
+) -> Result<bool, Box<dyn std::error::Error>> {
+    get_feature_status(rpc_client, feature_id)
+        .map(|status| matches!(status, Some(CliFeatureStatus::Active(_))))
+}
+
 fn process_status(
     rpc_client: &RpcClient,
     config: &CliConfig,
@@ -327,11 +353,7 @@ fn process_status(
         let feature_id = &feature_ids[i];
         let feature_name = FEATURE_NAMES.get(feature_id).unwrap();
         if let Some(account) = account {
-            if let Some(feature) = feature::from_account(&account) {
-                let feature_status = match feature.activated_at {
-                    None => CliFeatureStatus::Pending,
-                    Some(activation_slot) => CliFeatureStatus::Active(activation_slot),
-                };
+            if let Some(feature_status) = status_from_account(account) {
                 features.push(CliFeature {
                     id: feature_id.to_string(),
                     description: feature_name.to_string(),
diff --git a/cli/src/inflation.rs b/cli/src/inflation.rs
index 11d3fbfb5248ee..8ec8233db04291 100644
--- a/cli/src/inflation.rs
+++ b/cli/src/inflation.rs
@@ -102,7 +102,7 @@ fn process_rewards(
     rewards_epoch: Option<Epoch>,
 ) -> ProcessResult {
     let rewards = rpc_client
-        .get_inflation_reward(&addresses, rewards_epoch)
+        .get_inflation_reward(addresses, rewards_epoch)
         .map_err(|err| {
             if let Some(epoch) = rewards_epoch {
                 format!("Rewards not available for epoch {}", epoch)
diff --git a/cli/src/lib.rs b/cli/src/lib.rs
index 21596aa94cd2bd..9fd8c7b98e2451 100644
--- a/cli/src/lib.rs
+++ b/cli/src/lib.rs
@@ -18,9 +18,13 @@ macro_rules! pubkey {
     };
 }
 
+#[macro_use]
+extern crate const_format;
+
 extern crate serde_derive;
 
 pub mod checks;
+pub mod clap_app;
 pub mod cli;
 pub mod cluster_query;
 pub mod feature;
@@ -33,3 +37,4 @@ pub mod stake;
 pub mod test_utils;
 pub mod validator_info;
 pub mod vote;
+pub mod wallet;
diff --git a/cli/src/main.rs b/cli/src/main.rs
index d4b4056e2102c5..4b1d03ce7a6bc1 100644
--- a/cli/src/main.rs
+++ b/cli/src/main.rs
@@ -1,18 +1,15 @@
-use clap::{
-    crate_description, crate_name, value_t_or_exit, AppSettings, Arg, ArgGroup, ArgMatches,
-    SubCommand,
-};
+use clap::{crate_description, crate_name, value_t_or_exit, ArgMatches};
 use console::style;
 use solana_clap_utils::{
-    input_validators::{is_url, is_url_or_moniker, normalize_to_url_if_moniker},
-    keypair::{CliSigners, DefaultSigner, SKIP_SEED_PHRASE_VALIDATION_ARG},
+    input_validators::normalize_to_url_if_moniker,
+    keypair::{CliSigners, DefaultSigner},
     DisplayError,
 };
-use solana_cli::cli::{
-    app, parse_command, process_command, CliCommandInfo, CliConfig, SettingType,
-    DEFAULT_RPC_TIMEOUT_SECONDS,
+use solana_cli::{
+    clap_app::get_clap_app,
+    cli::{parse_command, process_command, CliCommandInfo, CliConfig, SettingType},
 };
-use solana_cli_config::{Config, CONFIG_FILE};
+use solana_cli_config::Config;
 use solana_cli_output::{display::println_name_value, OutputFormat};
 use solana_client::rpc_config::RpcSendTransactionConfig;
 use solana_remote_wallet::remote_wallet::RemoteWalletManager;
@@ -167,23 +164,29 @@ pub fn parse_args<'a>(
     let rpc_timeout = value_t_or_exit!(matches, "rpc_timeout", u64);
     let rpc_timeout = Duration::from_secs(rpc_timeout);
 
+    let confirm_transaction_initial_timeout =
+        value_t_or_exit!(matches, "confirm_transaction_initial_timeout", u64);
+    let confirm_transaction_initial_timeout =
+        Duration::from_secs(confirm_transaction_initial_timeout);
+
     let (_, websocket_url) = CliConfig::compute_websocket_url_setting(
         matches.value_of("websocket_url").unwrap_or(""),
         &config.websocket_url,
         matches.value_of("json_rpc_url").unwrap_or(""),
         &config.json_rpc_url,
     );
+    let default_signer_arg_name = "keypair".to_string();
     let (_, default_signer_path) = CliConfig::compute_keypair_path_setting(
-        matches.value_of("keypair").unwrap_or(""),
+        matches.value_of(&default_signer_arg_name).unwrap_or(""),
         &config.keypair_path,
     );
 
-    let default_signer = DefaultSigner::from_path(default_signer_path.clone())?;
+    let default_signer = DefaultSigner::new(default_signer_arg_name, &default_signer_path);
 
     let CliCommandInfo {
         command,
         mut signers,
-    } = parse_command(&matches, &default_signer, &mut wallet_manager)?;
+    } = parse_command(matches, &default_signer, &mut wallet_manager)?;
 
     if signers.is_empty() {
         if let Ok(signer_info) =
@@ -194,18 +197,7 @@ pub fn parse_args<'a>(
     }
 
     let verbose = matches.is_present("verbose");
-    let output_format = matches
-        .value_of("output_format")
-        .map(|value| match value {
-            "json" => OutputFormat::Json,
-            "json-compact" => OutputFormat::JsonCompact,
-            _ => unreachable!(),
-        })
-        .unwrap_or(if verbose {
-            OutputFormat::DisplayVerbose
-        } else {
-            OutputFormat::Display
-        });
+    let output_format = OutputFormat::from_matches(matches, "output_format", verbose);
 
     let (_, commitment) = CliConfig::compute_commitment_config(
         matches.value_of("commitment").unwrap_or(""),
@@ -234,6 +226,7 @@ pub fn parse_args<'a>(
                 preflight_commitment: Some(commitment.commitment),
                 ..RpcSendTransactionConfig::default()
             },
+            confirm_transaction_initial_timeout,
             address_labels,
         },
         signers,
@@ -242,178 +235,21 @@ pub fn parse_args<'a>(
 
 fn main() -> Result<(), Box<dyn error::Error>> {
     solana_logger::setup_with_default("off");
-    let matches = app(
+    let matches = get_clap_app(
         crate_name!(),
         crate_description!(),
         solana_version::version!(),
     )
-    .arg({
-        let arg = Arg::with_name("config_file")
-            .short("C")
-            .long("config")
-            .value_name("FILEPATH")
-            .takes_value(true)
-            .global(true)
-            .help("Configuration file to use");
-        if let Some(ref config_file) = *CONFIG_FILE {
-            arg.default_value(&config_file)
-        } else {
-            arg
-        }
-    })
-    .arg(
-        Arg::with_name("json_rpc_url")
-            .short("u")
-            .long("url")
-            .value_name("URL_OR_MONIKER")
-            .takes_value(true)
-            .global(true)
-            .validator(is_url_or_moniker)
-            .help(
-                "URL for Solana's JSON RPC or moniker (or their first letter): \
-                   [mainnet-beta, testnet, devnet, localhost]",
-            ),
-    )
-    .arg(
-        Arg::with_name("websocket_url")
-            .long("ws")
-            .value_name("URL")
-            .takes_value(true)
-            .global(true)
-            .validator(is_url)
-            .help("WebSocket URL for the solana cluster"),
-    )
-    .arg(
-        Arg::with_name("keypair")
-            .short("k")
-            .long("keypair")
-            .value_name("KEYPAIR")
-            .global(true)
-            .takes_value(true)
-            .help("Filepath or URL to a keypair"),
-    )
-    .arg(
-        Arg::with_name("commitment")
-            .long("commitment")
-            .takes_value(true)
-            .possible_values(&[
-                "processed",
-                "confirmed",
-                "finalized",
-                "recent", // Deprecated as of v1.5.5
-                "single", // Deprecated as of v1.5.5
-                "singleGossip", // Deprecated as of v1.5.5
-                "root", // Deprecated as of v1.5.5
-                "max", // Deprecated as of v1.5.5
-            ])
-            .value_name("COMMITMENT_LEVEL")
-            .hide_possible_values(true)
-            .global(true)
-            .help("Return information at the selected commitment level [possible values: processed, confirmed, finalized]"),
-    )
-    .arg(
-        Arg::with_name("verbose")
-            .long("verbose")
-            .short("v")
-            .global(true)
-            .help("Show additional information"),
-    )
-    .arg(
-        Arg::with_name("no_address_labels")
-            .long("no-address-labels")
-            .global(true)
-            .help("Do not use address labels in the output"),
-    )
-    .arg(
-        Arg::with_name("output_format")
-            .long("output")
-            .value_name("FORMAT")
-            .global(true)
-            .takes_value(true)
-            .possible_values(&["json", "json-compact"])
-            .help("Return information in specified output format"),
-    )
-    .arg(
-        Arg::with_name(SKIP_SEED_PHRASE_VALIDATION_ARG.name)
-            .long(SKIP_SEED_PHRASE_VALIDATION_ARG.long)
-            .global(true)
-            .help(SKIP_SEED_PHRASE_VALIDATION_ARG.help),
-    )
-    .arg(
-        Arg::with_name("rpc_timeout")
-            .long("rpc-timeout")
-            .value_name("SECONDS")
-            .takes_value(true)
-            .default_value(DEFAULT_RPC_TIMEOUT_SECONDS)
-            .global(true)
-            .hidden(true)
-            .help("Timeout value for RPC requests"),
-    )
-    .subcommand(
-        SubCommand::with_name("config")
-            .about("Solana command-line tool configuration settings")
-            .aliases(&["get", "set"])
-            .setting(AppSettings::SubcommandRequiredElseHelp)
-            .subcommand(
-                SubCommand::with_name("get")
-                    .about("Get current config settings")
-                    .arg(
-                        Arg::with_name("specific_setting")
-                            .index(1)
-                            .value_name("CONFIG_FIELD")
-                            .takes_value(true)
-                            .possible_values(&[
-                                "json_rpc_url",
-                                "websocket_url",
-                                "keypair",
-                                "commitment",
-                            ])
-                            .help("Return a specific config setting"),
-                    ),
-            )
-            .subcommand(
-                SubCommand::with_name("set")
-                    .about("Set a config setting")
-                    .group(
-                        ArgGroup::with_name("config_settings")
-                            .args(&["json_rpc_url", "websocket_url", "keypair", "commitment"])
-                            .multiple(true)
-                            .required(true),
-                    ),
-            )
-            .subcommand(
-                SubCommand::with_name("import-address-labels")
-                    .about("Import a list of address labels")
-                    .arg(
-                        Arg::with_name("filename")
-                            .index(1)
-                            .value_name("FILENAME")
-                            .takes_value(true)
-                            .help("YAML file of address labels"),
-                    ),
-            )
-            .subcommand(
-                SubCommand::with_name("export-address-labels")
-                    .about("Export the current address labels")
-                    .arg(
-                        Arg::with_name("filename")
-                            .index(1)
-                            .value_name("FILENAME")
-                            .takes_value(true)
-                            .help("YAML file to receive the current address labels"),
-                    ),
-            ),
-    )
     .get_matches();
 
     do_main(&matches).map_err(|err| DisplayError::new_as_boxed(err).into())
 }
 
 fn do_main(matches: &ArgMatches<'_>) -> Result<(), Box<dyn error::Error>> {
-    if parse_settings(&matches)? {
+    if parse_settings(matches)? {
         let mut wallet_manager = None;
 
-        let (mut config, signers) = parse_args(&matches, &mut wallet_manager)?;
+        let (mut config, signers) = parse_args(matches, &mut wallet_manager)?;
         config.signers = signers.iter().map(|s| s.as_ref()).collect();
         let result = process_command(&config)?;
         println!("{}", result);
diff --git a/cli/src/nonce.rs b/cli/src/nonce.rs
index c978dae6e0405b..90e53be7938b01 100644
--- a/cli/src/nonce.rs
+++ b/cli/src/nonce.rs
@@ -1,9 +1,10 @@
 use crate::{
     checks::{check_account_for_fee_with_commitment, check_unique_pubkeys},
     cli::{
-        log_instruction_custom_error, CliCommand, CliCommandInfo, CliConfig, CliError,
-        ProcessResult,
+        log_instruction_custom_error, log_instruction_custom_error_ex, CliCommand, CliCommandInfo,
+        CliConfig, CliError, ProcessResult,
     },
+    feature::get_feature_is_active,
     memo::WithMemo,
     spend_utils::{resolve_spend_tx_and_check_account_balance, SpendAmount},
 };
@@ -12,7 +13,7 @@ use solana_clap_utils::{
     input_parsers::*,
     input_validators::*,
     keypair::{DefaultSigner, SignerIndex},
-    memo::MEMO_ARG,
+    memo::{memo_arg, MEMO_ARG},
     nonce::*,
 };
 use solana_cli_output::CliNonceAccount;
@@ -20,16 +21,19 @@ use solana_client::{nonce_utils::*, rpc_client::RpcClient};
 use solana_remote_wallet::remote_wallet::RemoteWalletManager;
 use solana_sdk::{
     account::Account,
+    feature_set::merge_nonce_error_into_system_error,
     hash::Hash,
+    instruction::InstructionError,
     message::Message,
     nonce::{self, State},
     pubkey::Pubkey,
     system_instruction::{
         advance_nonce_account, authorize_nonce_account, create_nonce_account,
-        create_nonce_account_with_seed, withdraw_nonce_account, NonceError, SystemError,
+        create_nonce_account_with_seed, instruction_to_nonce_error, withdraw_nonce_account,
+        NonceError, SystemError,
     },
     system_program,
-    transaction::Transaction,
+    transaction::{Transaction, TransactionError},
 };
 use std::sync::Arc;
 
@@ -56,7 +60,8 @@ impl NonceSubCommands for App<'_, '_> {
                         .required(true),
                         "Account to be granted authority of the nonce account. "),
                 )
-                .arg(nonce_authority_arg()),
+                .arg(nonce_authority_arg())
+                .arg(memo_arg()),
         )
         .subcommand(
             SubCommand::with_name("create-nonce-account")
@@ -91,7 +96,8 @@ impl NonceSubCommands for App<'_, '_> {
                         .value_name("STRING")
                         .takes_value(true)
                         .help("Seed for address generation; if specified, the resulting account will be at a derived address of the NONCE_ACCOUNT pubkey")
-                ),
+                )
+                .arg(memo_arg()),
         )
         .subcommand(
             SubCommand::with_name("nonce")
@@ -115,7 +121,8 @@ impl NonceSubCommands for App<'_, '_> {
                         .required(true),
                         "Address of the nonce account. "),
                 )
-                .arg(nonce_authority_arg()),
+                .arg(nonce_authority_arg())
+                .arg(memo_arg()),
         )
         .subcommand(
             SubCommand::with_name("nonce-account")
@@ -161,7 +168,8 @@ impl NonceSubCommands for App<'_, '_> {
                         .validator(is_amount)
                         .help("The amount to withdraw from the nonce account, in SOL"),
                 )
-                .arg(nonce_authority_arg()),
+                .arg(nonce_authority_arg())
+                .arg(memo_arg()),
         )
     }
 }
@@ -363,8 +371,21 @@ pub fn process_authorize_nonce_account(
         &tx.message,
         config.commitment,
     )?;
+    let merge_errors =
+        get_feature_is_active(rpc_client, &merge_nonce_error_into_system_error::id())?;
     let result = rpc_client.send_and_confirm_transaction_with_spinner(&tx);
-    log_instruction_custom_error::<NonceError>(result, &config)
+
+    if merge_errors {
+        log_instruction_custom_error::<SystemError>(result, config)
+    } else {
+        log_instruction_custom_error_ex::<NonceError, _>(result, config, |ix_error| {
+            if let InstructionError::Custom(_) = ix_error {
+                instruction_to_nonce_error(ix_error, merge_errors)
+            } else {
+                None
+            }
+        })
+    }
 }
 
 pub fn process_create_nonce_account(
@@ -448,8 +469,40 @@ pub fn process_create_nonce_account(
 
     let mut tx = Transaction::new_unsigned(message);
     tx.try_sign(&config.signers, recent_blockhash)?;
+    let merge_errors =
+        get_feature_is_active(rpc_client, &merge_nonce_error_into_system_error::id())?;
     let result = rpc_client.send_and_confirm_transaction_with_spinner(&tx);
-    log_instruction_custom_error::<SystemError>(result, &config)
+
+    let err_ix_index = if let Err(err) = &result {
+        err.get_transaction_error().and_then(|tx_err| {
+            if let TransactionError::InstructionError(ix_index, _) = tx_err {
+                Some(ix_index)
+            } else {
+                None
+            }
+        })
+    } else {
+        None
+    };
+
+    match err_ix_index {
+        // SystemInstruction::InitializeNonceAccount failed
+        Some(1) => {
+            if merge_errors {
+                log_instruction_custom_error::<SystemError>(result, config)
+            } else {
+                log_instruction_custom_error_ex::<NonceError, _>(result, config, |ix_error| {
+                    if let InstructionError::Custom(_) = ix_error {
+                        instruction_to_nonce_error(ix_error, merge_errors)
+                    } else {
+                        None
+                    }
+                })
+            }
+        }
+        // SystemInstruction::CreateAccount{,WithSeed} failed
+        _ => log_instruction_custom_error::<SystemError>(result, config),
+    }
 }
 
 pub fn process_get_nonce(
@@ -474,10 +527,10 @@ pub fn process_new_nonce(
 ) -> ProcessResult {
     check_unique_pubkeys(
         (&config.signers[0].pubkey(), "cli keypair".to_string()),
-        (&nonce_account, "nonce_account_pubkey".to_string()),
+        (nonce_account, "nonce_account_pubkey".to_string()),
     )?;
 
-    if let Err(err) = rpc_client.get_account(&nonce_account) {
+    if let Err(err) = rpc_client.get_account(nonce_account) {
         return Err(CliError::BadParameter(format!(
             "Unable to advance nonce account {}. error: {}",
             nonce_account, err
@@ -487,7 +540,7 @@ pub fn process_new_nonce(
 
     let nonce_authority = config.signers[nonce_authority];
     let ixs = vec![advance_nonce_account(
-        &nonce_account,
+        nonce_account,
         &nonce_authority.pubkey(),
     )]
     .with_memo(memo);
@@ -502,8 +555,21 @@ pub fn process_new_nonce(
         &tx.message,
         config.commitment,
     )?;
+    let merge_errors =
+        get_feature_is_active(rpc_client, &merge_nonce_error_into_system_error::id())?;
     let result = rpc_client.send_and_confirm_transaction_with_spinner(&tx);
-    log_instruction_custom_error::<SystemError>(result, &config)
+
+    if merge_errors {
+        log_instruction_custom_error::<SystemError>(result, config)
+    } else {
+        log_instruction_custom_error_ex::<NonceError, _>(result, config, |ix_error| {
+            if let InstructionError::Custom(_) = ix_error {
+                instruction_to_nonce_error(ix_error, merge_errors)
+            } else {
+                None
+            }
+        })
+    }
 }
 
 pub fn process_show_nonce_account(
@@ -522,7 +588,7 @@ pub fn process_show_nonce_account(
             use_lamports_unit,
             ..CliNonceAccount::default()
         };
-        if let Some(ref data) = data {
+        if let Some(data) = data {
             nonce_account.nonce = Some(data.blockhash.to_string());
             nonce_account.lamports_per_signature = Some(data.fee_calculator.lamports_per_signature);
             nonce_account.authority = Some(data.authority.to_string());
@@ -565,14 +631,27 @@ pub fn process_withdraw_from_nonce_account(
         &tx.message,
         config.commitment,
     )?;
+    let merge_errors =
+        get_feature_is_active(rpc_client, &merge_nonce_error_into_system_error::id())?;
     let result = rpc_client.send_and_confirm_transaction_with_spinner(&tx);
-    log_instruction_custom_error::<NonceError>(result, &config)
+
+    if merge_errors {
+        log_instruction_custom_error::<SystemError>(result, config)
+    } else {
+        log_instruction_custom_error_ex::<NonceError, _>(result, config, |ix_error| {
+            if let InstructionError::Custom(_) = ix_error {
+                instruction_to_nonce_error(ix_error, merge_errors)
+            } else {
+                None
+            }
+        })
+    }
 }
 
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::cli::{app, parse_command};
+    use crate::{clap_app::get_clap_app, cli::parse_command};
     use solana_sdk::{
         account::Account,
         account_utils::StateMut,
@@ -592,11 +671,11 @@ mod tests {
 
     #[test]
     fn test_parse_command() {
-        let test_commands = app("test", "desc", "version");
+        let test_commands = get_clap_app("test", "desc", "version");
         let default_keypair = Keypair::new();
         let (default_keypair_file, mut tmp_file) = make_tmp_file();
         write_keypair(&default_keypair, tmp_file.as_file_mut()).unwrap();
-        let default_signer = DefaultSigner::new(default_keypair_file.clone());
+        let default_signer = DefaultSigner::new("", &default_keypair_file);
         let (keypair_file, mut tmp_file) = make_tmp_file();
         let nonce_account_keypair = Keypair::new();
         write_keypair(&nonce_account_keypair, tmp_file.as_file_mut()).unwrap();
diff --git a/cli/src/program.rs b/cli/src/program.rs
index 2c4382a48ce061..1726303d7ea428 100644
--- a/cli/src/program.rs
+++ b/cli/src/program.rs
@@ -23,6 +23,7 @@ use solana_client::{
     rpc_config::{RpcAccountInfoConfig, RpcProgramAccountsConfig},
     rpc_filter::{Memcmp, MemcmpEncodedBytes, RpcFilterType},
     rpc_request::MAX_GET_SIGNATURE_STATUSES_QUERY_ITEMS,
+    rpc_response::Fees,
     tpu_client::{TpuClient, TpuClientConfig},
 };
 use solana_rbpf::vm::{Config, Executable};
@@ -32,7 +33,6 @@ use solana_sdk::{
     account_utils::StateMut,
     bpf_loader, bpf_loader_deprecated,
     bpf_loader_upgradeable::{self, UpgradeableLoaderState},
-    clock::Slot,
     commitment_config::CommitmentConfig,
     instruction::Instruction,
     instruction::InstructionError,
@@ -150,7 +150,7 @@ impl ProgramSubCommands for App<'_, '_> {
                             pubkey!(Arg::with_name("program_id")
                                 .long("program-id")
                                 .value_name("PROGRAM_ID"),
-                                "Executable program's address, must be a signer for initial deploys, can be a pubkey for upgrades \
+                                "Executable program's address, must be a keypair for initial deploys, can be a pubkey for upgrades \
                                 [default: address of keypair at /path/to/program-keypair.json if present, otherwise a random address]"),
                         )
                         .arg(
@@ -330,7 +330,7 @@ impl ProgramSubCommands for App<'_, '_> {
                 )
                 .subcommand(
                     SubCommand::with_name("close")
-                        .about("Close an acount and withdraw all lamports")
+                        .about("Close an account and withdraw all lamports")
                         .arg(
                             Arg::with_name("account")
                                 .index(1)
@@ -367,6 +367,39 @@ impl ProgramSubCommands for App<'_, '_> {
                         ),
                 )
         )
+        .subcommand(
+            SubCommand::with_name("deploy")
+                .about("Deploy a program")
+                .arg(
+                    Arg::with_name("program_location")
+                        .index(1)
+                        .value_name("PROGRAM_FILEPATH")
+                        .takes_value(true)
+                        .required(true)
+                        .help("/path/to/program.o"),
+                )
+                .arg(
+                    Arg::with_name("address_signer")
+                        .index(2)
+                        .value_name("PROGRAM_ADDRESS_SIGNER")
+                        .takes_value(true)
+                        .validator(is_valid_signer)
+                        .help("The signer for the desired address of the program [default: new random address]")
+                )
+                .arg(
+                    Arg::with_name("use_deprecated_loader")
+                        .long("use-deprecated-loader")
+                        .takes_value(false)
+                        .hidden(true) // Don't document this argument to discourage its use
+                        .help("Use the deprecated BPF loader")
+                )
+                .arg(
+                    Arg::with_name("allow_excessive_balance")
+                        .long("allow-excessive-deploy-account-balance")
+                        .takes_value(false)
+                        .help("Use the designated program id, even if the account already holds a large balance of SOL")
+                ),
+        )
     }
 }
 
@@ -767,7 +800,7 @@ fn process_program_deploy(
     };
     let upgrade_authority_signer = config.signers[upgrade_authority_signer_index];
 
-    let default_program_keypair = get_default_program_keypair(&program_location);
+    let default_program_keypair = get_default_program_keypair(program_location);
     let (program_signer, program_pubkey) = if let Some(i) = program_signer_index {
         (Some(config.signers[i]), config.signers[i].pubkey())
     } else if let Some(program_pubkey) = program_pubkey {
@@ -843,7 +876,7 @@ fn process_program_deploy(
     };
 
     let (program_data, program_len) = if let Some(program_location) = program_location {
-        let program_data = read_and_verify_elf(&program_location)?;
+        let program_data = read_and_verify_elf(program_location)?;
         let program_len = program_data.len();
         (program_data, program_len)
     } else if buffer_provided {
@@ -886,6 +919,11 @@ fn process_program_deploy(
     )?;
 
     let result = if do_deploy {
+        if program_signer.is_none() {
+            return Err(
+                "Initial deployments require a keypair be provided for the program id".into(),
+            );
+        }
         do_process_program_write_and_deploy(
             rpc_client.clone(),
             config,
@@ -1254,7 +1292,7 @@ fn process_dump(
                                 UpgradeableLoaderState::programdata_data_offset().unwrap_or(0);
                             let program_data = &programdata_account.data[offset..];
                             let mut f = File::create(output_location)?;
-                            f.write_all(&program_data)?;
+                            f.write_all(program_data)?;
                             Ok(format!("Wrote program to {}", output_location))
                         } else {
                             Err(
@@ -1274,7 +1312,7 @@ fn process_dump(
                     let offset = UpgradeableLoaderState::buffer_data_offset().unwrap_or(0);
                     let program_data = &account.data[offset..];
                     let mut f = File::create(output_location)?;
-                    f.write_all(&program_data)?;
+                    f.write_all(program_data)?;
                     Ok(format!("Wrote program to {}", output_location))
                 } else {
                     Err(format!(
@@ -1305,8 +1343,8 @@ fn close(
 
     let mut tx = Transaction::new_unsigned(Message::new(
         &[bpf_loader_upgradeable::close(
-            &account_pubkey,
-            &recipient_pubkey,
+            account_pubkey,
+            recipient_pubkey,
             &authority_signer.pubkey(),
         )],
         Some(&config.signers[0].pubkey()),
@@ -1415,7 +1453,7 @@ fn process_close(
             if close(
                 rpc_client,
                 config,
-                &address,
+                address,
                 &recipient_pubkey,
                 authority_signer,
             )
@@ -1516,7 +1554,7 @@ fn do_process_program_write_and_deploy(
                 .value
             {
                 complete_partial_program_init(
-                    &loader_id,
+                    loader_id,
                     &config.signers[0].pubkey(),
                     buffer_pubkey,
                     &account,
@@ -1546,7 +1584,7 @@ fn do_process_program_write_and_deploy(
                         buffer_pubkey,
                         minimum_balance,
                         buffer_data_len as u64,
-                        &loader_id,
+                        loader_id,
                     )],
                     minimum_balance,
                 )
@@ -1574,7 +1612,7 @@ fn do_process_program_write_and_deploy(
                 } else {
                     loader_instruction::write(
                         buffer_pubkey,
-                        &loader_id,
+                        loader_id,
                         (i * DATA_CHUNK_SIZE) as u32,
                         chunk.to_vec(),
                     )
@@ -1618,7 +1656,7 @@ fn do_process_program_write_and_deploy(
             )
         } else {
             Message::new(
-                &[loader_instruction::finalize(buffer_pubkey, &loader_id)],
+                &[loader_instruction::finalize(buffer_pubkey, loader_id)],
                 Some(&config.signers[0].pubkey()),
             )
         };
@@ -1744,8 +1782,8 @@ fn do_process_program_upgrade(
     // Create and add final message
     let final_message = Message::new(
         &[bpf_loader_upgradeable::upgrade(
-            &program_id,
-            &buffer_pubkey,
+            program_id,
+            buffer_pubkey,
             &upgrade_authority.pubkey(),
             &config.signers[0].pubkey(),
         )],
@@ -1813,7 +1851,7 @@ fn complete_partial_program_init(
             account_data_len as u64,
         ));
         if account.owner != *loader_id {
-            instructions.push(system_instruction::assign(elf_pubkey, &loader_id));
+            instructions.push(system_instruction::assign(elf_pubkey, loader_id));
         }
     }
     if account.lamports < minimum_balance {
@@ -1885,7 +1923,7 @@ fn send_deploy_messages(
                 initial_transaction.try_sign(&[payer_signer], blockhash)?;
             }
             let result = rpc_client.send_and_confirm_transaction_with_spinner(&initial_transaction);
-            log_instruction_custom_error::<SystemError>(result, &config)
+            log_instruction_custom_error::<SystemError>(result, config)
                 .map_err(|err| format!("Account allocation failed: {}", err))?;
         } else {
             return Err("Buffer account not created yet, must provide a key pair".into());
@@ -1895,8 +1933,12 @@ fn send_deploy_messages(
     if let Some(write_messages) = write_messages {
         if let Some(write_signer) = write_signer {
             trace!("Writing program data");
-            let (blockhash, _, last_valid_slot) = rpc_client
-                .get_recent_blockhash_with_commitment(config.commitment)?
+            let Fees {
+                blockhash,
+                last_valid_block_height,
+                ..
+            } = rpc_client
+                .get_fees_with_commitment(config.commitment)?
                 .value;
             let mut write_transactions = vec![];
             for message in write_messages.iter() {
@@ -1911,7 +1953,7 @@ fn send_deploy_messages(
                 write_transactions,
                 &[payer_signer, write_signer],
                 config.commitment,
-                last_valid_slot,
+                last_valid_block_height,
             )
             .map_err(|err| format!("Data writes to account failed: {}", err))?;
         }
@@ -1981,7 +2023,7 @@ fn send_and_confirm_transactions_with_spinner<T: Signers>(
     mut transactions: Vec<Transaction>,
     signer_keys: &T,
     commitment: CommitmentConfig,
-    mut last_valid_slot: Slot,
+    mut last_valid_block_height: u64,
 ) -> Result<(), Box<dyn error::Error>> {
     let progress_bar = new_spinner_progress_bar();
     let mut send_retries = 5;
@@ -2021,7 +2063,7 @@ fn send_and_confirm_transactions_with_spinner<T: Signers>(
 
         // Collect statuses for all the transactions, drop those that are confirmed
         loop {
-            let mut slot = 0;
+            let mut block_height = 0;
             let pending_signatures = pending_transactions.keys().cloned().collect::<Vec<_>>();
             for pending_signatures_chunk in
                 pending_signatures.chunks(MAX_GET_SIGNATURE_STATUSES_QUERY_ITEMS)
@@ -2046,12 +2088,12 @@ fn send_and_confirm_transactions_with_spinner<T: Signers>(
                     }
                 }
 
-                slot = rpc_client.get_slot()?;
+                block_height = rpc_client.get_block_height()?;
                 progress_bar.set_message(&format!(
-                    "[{}/{}] Transactions confirmed. Retrying in {} slots",
+                    "[{}/{}] Transactions confirmed. Retrying in {} blocks",
                     num_transactions - pending_transactions.len(),
                     num_transactions,
-                    last_valid_slot.saturating_sub(slot)
+                    last_valid_block_height.saturating_sub(block_height)
                 ));
             }
 
@@ -2059,7 +2101,7 @@ fn send_and_confirm_transactions_with_spinner<T: Signers>(
                 return Ok(());
             }
 
-            if slot > last_valid_slot {
+            if block_height > last_valid_block_height {
                 break;
             }
 
@@ -2089,10 +2131,12 @@ fn send_and_confirm_transactions_with_spinner<T: Signers>(
         send_retries -= 1;
 
         // Re-sign any failed transactions with a new blockhash and retry
-        let (blockhash, _fee_calculator, new_last_valid_slot) = rpc_client
-            .get_recent_blockhash_with_commitment(commitment)?
-            .value;
-        last_valid_slot = new_last_valid_slot;
+        let Fees {
+            blockhash,
+            last_valid_block_height: new_last_valid_block_height,
+            ..
+        } = rpc_client.get_fees_with_commitment(commitment)?.value;
+        last_valid_block_height = new_last_valid_block_height;
         transactions = vec![];
         for (_, mut transaction) in pending_transactions.into_iter() {
             transaction.try_sign(signer_keys, blockhash)?;
@@ -2104,7 +2148,10 @@ fn send_and_confirm_transactions_with_spinner<T: Signers>(
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::cli::{app, parse_command, process_command};
+    use crate::{
+        clap_app::get_clap_app,
+        cli::{parse_command, process_command},
+    };
     use serde_json::Value;
     use solana_cli_output::OutputFormat;
     use solana_sdk::signature::write_keypair_file;
@@ -2126,12 +2173,12 @@ mod tests {
     #[test]
     #[allow(clippy::cognitive_complexity)]
     fn test_cli_parse_deploy() {
-        let test_commands = app("test", "desc", "version");
+        let test_commands = get_clap_app("test", "desc", "version");
 
         let default_keypair = Keypair::new();
         let keypair_file = make_tmp_path("keypair_file");
         write_keypair_file(&default_keypair, &keypair_file).unwrap();
-        let default_signer = DefaultSigner::new(keypair_file.clone());
+        let default_signer = DefaultSigner::new("", &keypair_file);
 
         let test_command = test_commands.clone().get_matches_from(vec![
             "test",
@@ -2334,12 +2381,12 @@ mod tests {
     #[test]
     #[allow(clippy::cognitive_complexity)]
     fn test_cli_parse_write_buffer() {
-        let test_commands = app("test", "desc", "version");
+        let test_commands = get_clap_app("test", "desc", "version");
 
         let default_keypair = Keypair::new();
         let keypair_file = make_tmp_path("keypair_file");
         write_keypair_file(&default_keypair, &keypair_file).unwrap();
-        let default_signer = DefaultSigner::new(keypair_file.clone());
+        let default_signer = DefaultSigner::new("", &keypair_file);
 
         // defaults
         let test_command = test_commands.clone().get_matches_from(vec![
@@ -2482,12 +2529,12 @@ mod tests {
     #[test]
     #[allow(clippy::cognitive_complexity)]
     fn test_cli_parse_set_upgrade_authority() {
-        let test_commands = app("test", "desc", "version");
+        let test_commands = get_clap_app("test", "desc", "version");
 
         let default_keypair = Keypair::new();
         let keypair_file = make_tmp_path("keypair_file");
         write_keypair_file(&default_keypair, &keypair_file).unwrap();
-        let default_signer = DefaultSigner::new(keypair_file.clone());
+        let default_signer = DefaultSigner::new("", &keypair_file);
 
         let program_pubkey = Pubkey::new_unique();
         let new_authority_pubkey = Pubkey::new_unique();
@@ -2590,12 +2637,12 @@ mod tests {
     #[test]
     #[allow(clippy::cognitive_complexity)]
     fn test_cli_parse_set_buffer_authority() {
-        let test_commands = app("test", "desc", "version");
+        let test_commands = get_clap_app("test", "desc", "version");
 
         let default_keypair = Keypair::new();
         let keypair_file = make_tmp_path("keypair_file");
         write_keypair_file(&default_keypair, &keypair_file).unwrap();
-        let default_signer = DefaultSigner::new(keypair_file.clone());
+        let default_signer = DefaultSigner::new("", &keypair_file);
 
         let buffer_pubkey = Pubkey::new_unique();
         let new_authority_pubkey = Pubkey::new_unique();
@@ -2647,12 +2694,12 @@ mod tests {
     #[test]
     #[allow(clippy::cognitive_complexity)]
     fn test_cli_parse_show() {
-        let test_commands = app("test", "desc", "version");
+        let test_commands = get_clap_app("test", "desc", "version");
 
         let default_keypair = Keypair::new();
         let keypair_file = make_tmp_path("keypair_file");
         write_keypair_file(&default_keypair, &keypair_file).unwrap();
-        let default_signer = DefaultSigner::new(keypair_file);
+        let default_signer = DefaultSigner::new("", &keypair_file);
 
         // defaults
         let buffer_pubkey = Pubkey::new_unique();
@@ -2746,12 +2793,12 @@ mod tests {
     #[test]
     #[allow(clippy::cognitive_complexity)]
     fn test_cli_parse_close() {
-        let test_commands = app("test", "desc", "version");
+        let test_commands = get_clap_app("test", "desc", "version");
 
         let default_keypair = Keypair::new();
         let keypair_file = make_tmp_path("keypair_file");
         write_keypair_file(&default_keypair, &keypair_file).unwrap();
-        let default_signer = DefaultSigner::new(keypair_file.clone());
+        let default_signer = DefaultSigner::new("", &keypair_file);
 
         // defaults
         let buffer_pubkey = Pubkey::new_unique();
diff --git a/cli/src/spend_utils.rs b/cli/src/spend_utils.rs
index 95431ccad26c85..df785e457b1845 100644
--- a/cli/src/spend_utils.rs
+++ b/cli/src/spend_utils.rs
@@ -92,7 +92,7 @@ where
         Ok((message, spend))
     } else {
         let from_balance = rpc_client
-            .get_balance_with_commitment(&from_pubkey, commitment)?
+            .get_balance_with_commitment(from_pubkey, commitment)?
             .value;
         let (message, SpendAndFee { spend, fee }) = resolve_spend_message(
             amount,
diff --git a/cli/src/stake.rs b/cli/src/stake.rs
index f8d8c801dcd968..4125b296dab86c 100644
--- a/cli/src/stake.rs
+++ b/cli/src/stake.rs
@@ -14,7 +14,7 @@ use solana_clap_utils::{
     input_parsers::*,
     input_validators::*,
     keypair::{DefaultSigner, SignerIndex},
-    memo::MEMO_ARG,
+    memo::{memo_arg, MEMO_ARG},
     nonce::*,
     offline::*,
     ArgConstant,
@@ -33,9 +33,13 @@ use solana_sdk::{
     account_utils::StateMut,
     clock::{Clock, UnixTimestamp, SECONDS_PER_DAY},
     epoch_schedule::EpochSchedule,
-    feature, feature_set,
     message::Message,
     pubkey::Pubkey,
+    stake::{
+        self,
+        instruction::{self as stake_instruction, LockupArgs, StakeError},
+        state::{Authorized, Lockup, Meta, StakeAuthorize, StakeState},
+    },
     system_instruction::SystemError,
     sysvar::{
         clock,
@@ -43,10 +47,6 @@ use solana_sdk::{
     },
     transaction::Transaction,
 };
-use solana_stake_program::{
-    stake_instruction::{self, LockupArgs, StakeError},
-    stake_state::{Authorized, Lockup, Meta, StakeAuthorize, StakeState},
-};
 use solana_vote_program::vote_state::VoteState;
 use std::{ops::Deref, sync::Arc};
 
@@ -95,6 +95,20 @@ fn custodian_arg<'a, 'b>() -> Arg<'a, 'b> {
         .help(CUSTODIAN_ARG.help)
 }
 
+pub(crate) struct StakeAuthorization {
+    authorization_type: StakeAuthorize,
+    new_authority_pubkey: Pubkey,
+    authority_pubkey: Option<Pubkey>,
+}
+
+#[derive(Debug, PartialEq)]
+pub struct StakeAuthorizationIndexed {
+    pub authorization_type: StakeAuthorize,
+    pub new_authority_pubkey: Pubkey,
+    pub authority: SignerIndex,
+    pub new_authority_signer: Option<SignerIndex>,
+}
+
 pub trait StakeSubCommands {
     fn stake_subcommands(self) -> Self;
 }
@@ -178,6 +192,65 @@ impl StakeSubCommands for App<'_, '_> {
                 .offline_args()
                 .nonce_args(false)
                 .arg(fee_payer_arg())
+                .arg(memo_arg())
+        )
+        .subcommand(
+            SubCommand::with_name("create-stake-account-checked")
+                .about("Create a stake account, checking the withdraw authority as a signer")
+                .arg(
+                    Arg::with_name("stake_account")
+                        .index(1)
+                        .value_name("STAKE_ACCOUNT_KEYPAIR")
+                        .takes_value(true)
+                        .required(true)
+                        .validator(is_valid_signer)
+                        .help("Stake account to create (or base of derived address if --seed is used)")
+                )
+                .arg(
+                    Arg::with_name("amount")
+                        .index(2)
+                        .value_name("AMOUNT")
+                        .takes_value(true)
+                        .validator(is_amount_or_all)
+                        .required(true)
+                        .help("The amount to send to the stake account, in SOL; accepts keyword ALL")
+                )
+                .arg(
+                    Arg::with_name("seed")
+                        .long("seed")
+                        .value_name("STRING")
+                        .takes_value(true)
+                        .help("Seed for address generation; if specified, the resulting account \
+                               will be at a derived address of the STAKE_ACCOUNT_KEYPAIR pubkey")
+                )
+                .arg(
+                    Arg::with_name(STAKE_AUTHORITY_ARG.name)
+                        .long(STAKE_AUTHORITY_ARG.long)
+                        .value_name("PUBKEY")
+                        .takes_value(true)
+                        .validator(is_valid_pubkey)
+                        .help(STAKE_AUTHORITY_ARG.help)
+                )
+                .arg(
+                    Arg::with_name(WITHDRAW_AUTHORITY_ARG.name)
+                        .long(WITHDRAW_AUTHORITY_ARG.long)
+                        .value_name("KEYPAIR")
+                        .takes_value(true)
+                        .validator(is_valid_signer)
+                        .help(WITHDRAW_AUTHORITY_ARG.help)
+                )
+                .arg(
+                    Arg::with_name("from")
+                        .long("from")
+                        .takes_value(true)
+                        .value_name("KEYPAIR")
+                        .validator(is_valid_signer)
+                        .help("Source account of funds [default: cli config keypair]"),
+                )
+                .offline_args()
+                .nonce_args(false)
+                .arg(fee_payer_arg())
+                .arg(memo_arg())
         )
         .subcommand(
             SubCommand::with_name("delegate-stake")
@@ -207,6 +280,7 @@ impl StakeSubCommands for App<'_, '_> {
                 .offline_args()
                 .nonce_args(false)
                 .arg(fee_payer_arg())
+                .arg(memo_arg())
         )
         .subcommand(
             SubCommand::with_name("stake-authorize")
@@ -244,6 +318,47 @@ impl StakeSubCommands for App<'_, '_> {
                         .takes_value(false)
                         .help("Return signature immediately after submitting the transaction, instead of waiting for confirmations"),
                 )
+                .arg(memo_arg())
+        )
+        .subcommand(
+            SubCommand::with_name("stake-authorize-checked")
+                .about("Authorize a new signing keypair for the given stake account, checking the authority as a signer")
+                .arg(
+                    pubkey!(Arg::with_name("stake_account_pubkey")
+                        .required(true)
+                        .index(1)
+                        .value_name("STAKE_ACCOUNT_ADDRESS"),
+                        "Stake account in which to set a new authority. ")
+                )
+                .arg(
+                    Arg::with_name("new_stake_authority")
+                        .long("new-stake-authority")
+                        .value_name("KEYPAIR")
+                        .takes_value(true)
+                        .validator(is_valid_signer)
+                        .help("New authorized staker")
+                )
+                .arg(
+                    Arg::with_name("new_withdraw_authority")
+                        .long("new-withdraw-authority")
+                        .value_name("KEYPAIR")
+                        .takes_value(true)
+                        .validator(is_valid_signer)
+                        .help("New authorized withdrawer")
+                )
+                .arg(stake_authority_arg())
+                .arg(withdraw_authority_arg())
+                .offline_args()
+                .nonce_args(false)
+                .arg(fee_payer_arg())
+                .arg(custodian_arg())
+                .arg(
+                    Arg::with_name("no_wait")
+                        .long("no-wait")
+                        .takes_value(false)
+                        .help("Return signature immediately after submitting the transaction, instead of waiting for confirmations"),
+                )
+                .arg(memo_arg())
         )
         .subcommand(
             SubCommand::with_name("deactivate-stake")
@@ -267,6 +382,7 @@ impl StakeSubCommands for App<'_, '_> {
                 .offline_args()
                 .nonce_args(false)
                 .arg(fee_payer_arg())
+                .arg(memo_arg())
         )
         .subcommand(
             SubCommand::with_name("split-stake")
@@ -308,6 +424,7 @@ impl StakeSubCommands for App<'_, '_> {
                 .offline_args()
                 .nonce_args(false)
                 .arg(fee_payer_arg())
+                .arg(memo_arg())
         )
         .subcommand(
             SubCommand::with_name("merge-stake")
@@ -331,6 +448,7 @@ impl StakeSubCommands for App<'_, '_> {
                 .offline_args()
                 .nonce_args(false)
                 .arg(fee_payer_arg())
+                .arg(memo_arg())
         )
         .subcommand(
             SubCommand::with_name("withdraw-stake")
@@ -371,6 +489,7 @@ impl StakeSubCommands for App<'_, '_> {
                 .nonce_args(false)
                 .arg(fee_payer_arg())
                 .arg(custodian_arg())
+                .arg(memo_arg())
         )
         .subcommand(
             SubCommand::with_name("stake-set-lockup")
@@ -418,6 +537,57 @@ impl StakeSubCommands for App<'_, '_> {
                 .offline_args()
                 .nonce_args(false)
                 .arg(fee_payer_arg())
+                .arg(memo_arg())
+        )
+        .subcommand(
+            SubCommand::with_name("stake-set-lockup-checked")
+                .about("Set Lockup for the stake account, checking the new authority as a signer")
+                .arg(
+                    pubkey!(Arg::with_name("stake_account_pubkey")
+                        .index(1)
+                        .value_name("STAKE_ACCOUNT_ADDRESS")
+                        .required(true),
+                        "Stake account for which to set lockup parameters. ")
+                )
+                .arg(
+                    Arg::with_name("lockup_epoch")
+                        .long("lockup-epoch")
+                        .value_name("NUMBER")
+                        .takes_value(true)
+                        .help("The epoch height at which this account will be available for withdrawal")
+                )
+                .arg(
+                    Arg::with_name("lockup_date")
+                        .long("lockup-date")
+                        .value_name("RFC3339 DATETIME")
+                        .validator(is_rfc3339_datetime)
+                        .takes_value(true)
+                        .help("The date and time at which this account will be available for withdrawal")
+                )
+                .arg(
+                    Arg::with_name("new_custodian")
+                        .long("new-custodian")
+                        .value_name("KEYPAIR")
+                        .takes_value(true)
+                        .validator(is_valid_signer)
+                        .help("Keypair of a new lockup custodian")
+                )
+                .group(ArgGroup::with_name("lockup_details")
+                    .args(&["lockup_epoch", "lockup_date", "new_custodian"])
+                    .multiple(true)
+                    .required(true))
+                .arg(
+                    Arg::with_name("custodian")
+                        .long("custodian")
+                        .takes_value(true)
+                        .value_name("KEYPAIR")
+                        .validator(is_valid_signer)
+                        .help("Keypair of the existing custodian [default: cli config pubkey]")
+                )
+                .offline_args()
+                .nonce_args(false)
+                .arg(fee_payer_arg())
+                .arg(memo_arg())
         )
         .subcommand(
             SubCommand::with_name("stake-account")
@@ -484,13 +654,23 @@ pub fn parse_create_stake_account(
     matches: &ArgMatches<'_>,
     default_signer: &DefaultSigner,
     wallet_manager: &mut Option<Arc<RemoteWalletManager>>,
+    checked: bool,
 ) -> Result<CliCommandInfo, CliError> {
     let seed = matches.value_of("seed").map(|s| s.to_string());
     let epoch = value_of(matches, "lockup_epoch").unwrap_or(0);
     let unix_timestamp = unix_timestamp_from_rfc3339_datetime(matches, "lockup_date").unwrap_or(0);
     let custodian = pubkey_of_signer(matches, "custodian", wallet_manager)?.unwrap_or_default();
     let staker = pubkey_of_signer(matches, STAKE_AUTHORITY_ARG.name, wallet_manager)?;
-    let withdrawer = pubkey_of_signer(matches, WITHDRAW_AUTHORITY_ARG.name, wallet_manager)?;
+
+    let (withdrawer_signer, withdrawer) = if checked {
+        signer_of(matches, WITHDRAW_AUTHORITY_ARG.name, wallet_manager)?
+    } else {
+        (
+            None,
+            pubkey_of_signer(matches, WITHDRAW_AUTHORITY_ARG.name, wallet_manager)?,
+        )
+    };
+
     let amount = SpendAmount::new_from_matches(matches, "amount");
     let sign_only = matches.is_present(SIGN_ONLY_ARG.name);
     let dump_transaction_message = matches.is_present(DUMP_TRANSACTION_MESSAGE.name);
@@ -508,6 +688,9 @@ pub fn parse_create_stake_account(
     if nonce_account.is_some() {
         bulk_signers.push(nonce_authority);
     }
+    if withdrawer_signer.is_some() {
+        bulk_signers.push(withdrawer_signer);
+    }
     let signer_info =
         default_signer.generate_unique_signers(bulk_signers, matches, wallet_manager)?;
 
@@ -517,6 +700,11 @@ pub fn parse_create_stake_account(
             seed,
             staker,
             withdrawer,
+            withdrawer_signer: if checked {
+                signer_info.index_of(withdrawer)
+            } else {
+                None
+            },
             lockup: Lockup {
                 unix_timestamp,
                 epoch,
@@ -586,15 +774,24 @@ pub fn parse_stake_authorize(
     matches: &ArgMatches<'_>,
     default_signer: &DefaultSigner,
     wallet_manager: &mut Option<Arc<RemoteWalletManager>>,
+    checked: bool,
 ) -> Result<CliCommandInfo, CliError> {
     let stake_account_pubkey =
         pubkey_of_signer(matches, "stake_account_pubkey", wallet_manager)?.unwrap();
 
     let mut new_authorizations = Vec::new();
     let mut bulk_signers = Vec::new();
-    if let Some(new_authority_pubkey) =
-        pubkey_of_signer(matches, "new_stake_authority", wallet_manager)?
-    {
+
+    let (new_staker_signer, new_staker) = if checked {
+        signer_of(matches, "new_stake_authority", wallet_manager)?
+    } else {
+        (
+            None,
+            pubkey_of_signer(matches, "new_stake_authority", wallet_manager)?,
+        )
+    };
+
+    if let Some(new_authority_pubkey) = new_staker {
         let (authority, authority_pubkey) = {
             let (authority, authority_pubkey) =
                 signer_of(matches, STAKE_AUTHORITY_ARG.name, wallet_manager)?;
@@ -605,24 +802,38 @@ pub fn parse_stake_authorize(
                 (authority, authority_pubkey)
             }
         };
-        new_authorizations.push((
-            StakeAuthorize::Staker,
+        new_authorizations.push(StakeAuthorization {
+            authorization_type: StakeAuthorize::Staker,
             new_authority_pubkey,
             authority_pubkey,
-        ));
+        });
         bulk_signers.push(authority);
+        if new_staker.is_some() {
+            bulk_signers.push(new_staker_signer);
+        }
     };
-    if let Some(new_authority_pubkey) =
-        pubkey_of_signer(matches, "new_withdraw_authority", wallet_manager)?
-    {
+
+    let (new_withdrawer_signer, new_withdrawer) = if checked {
+        signer_of(matches, "new_withdraw_authority", wallet_manager)?
+    } else {
+        (
+            None,
+            pubkey_of_signer(matches, "new_withdraw_authority", wallet_manager)?,
+        )
+    };
+
+    if let Some(new_authority_pubkey) = new_withdrawer {
         let (authority, authority_pubkey) =
             signer_of(matches, WITHDRAW_AUTHORITY_ARG.name, wallet_manager)?;
-        new_authorizations.push((
-            StakeAuthorize::Withdrawer,
+        new_authorizations.push(StakeAuthorization {
+            authorization_type: StakeAuthorize::Withdrawer,
             new_authority_pubkey,
             authority_pubkey,
-        ));
+        });
         bulk_signers.push(authority);
+        if new_withdrawer_signer.is_some() {
+            bulk_signers.push(new_withdrawer_signer);
+        }
     };
     let sign_only = matches.is_present(SIGN_ONLY_ARG.name);
     let dump_transaction_message = matches.is_present(DUMP_TRANSACTION_MESSAGE.name);
@@ -648,12 +859,17 @@ pub fn parse_stake_authorize(
     let new_authorizations = new_authorizations
         .into_iter()
         .map(
-            |(stake_authorize, new_authority_pubkey, authority_pubkey)| {
-                (
-                    stake_authorize,
+            |StakeAuthorization {
+                 authorization_type,
+                 new_authority_pubkey,
+                 authority_pubkey,
+             }| {
+                StakeAuthorizationIndexed {
+                    authorization_type,
                     new_authority_pubkey,
-                    signer_info.index_of(authority_pubkey).unwrap(),
-                )
+                    authority: signer_info.index_of(authority_pubkey).unwrap(),
+                    new_authority_signer: signer_info.index_of(Some(new_authority_pubkey)),
+                }
             },
         )
         .collect();
@@ -870,12 +1086,21 @@ pub fn parse_stake_set_lockup(
     matches: &ArgMatches<'_>,
     default_signer: &DefaultSigner,
     wallet_manager: &mut Option<Arc<RemoteWalletManager>>,
+    checked: bool,
 ) -> Result<CliCommandInfo, CliError> {
     let stake_account_pubkey =
         pubkey_of_signer(matches, "stake_account_pubkey", wallet_manager)?.unwrap();
     let epoch = value_of(matches, "lockup_epoch");
     let unix_timestamp = unix_timestamp_from_rfc3339_datetime(matches, "lockup_date");
-    let new_custodian = pubkey_of_signer(matches, "new_custodian", wallet_manager)?;
+
+    let (new_custodian_signer, new_custodian) = if checked {
+        signer_of(matches, "new_custodian", wallet_manager)?
+    } else {
+        (
+            None,
+            pubkey_of_signer(matches, "new_custodian", wallet_manager)?,
+        )
+    };
 
     let sign_only = matches.is_present(SIGN_ONLY_ARG.name);
     let dump_transaction_message = matches.is_present(DUMP_TRANSACTION_MESSAGE.name);
@@ -892,6 +1117,9 @@ pub fn parse_stake_set_lockup(
     if nonce_account.is_some() {
         bulk_signers.push(nonce_authority);
     }
+    if new_custodian_signer.is_some() {
+        bulk_signers.push(new_custodian_signer);
+    }
     let signer_info =
         default_signer.generate_unique_signers(bulk_signers, matches, wallet_manager)?;
 
@@ -903,6 +1131,11 @@ pub fn parse_stake_set_lockup(
                 epoch,
                 unix_timestamp,
             },
+            new_custodian_signer: if checked {
+                signer_info.index_of(new_custodian)
+            } else {
+                None
+            },
             custodian: signer_info.index_of(custodian_pubkey).unwrap(),
             sign_only,
             dump_transaction_message,
@@ -958,6 +1191,7 @@ pub fn process_create_stake_account(
     seed: &Option<String>,
     staker: &Option<Pubkey>,
     withdrawer: &Option<Pubkey>,
+    withdrawer_signer: Option<SignerIndex>,
     lockup: &Lockup,
     amount: SpendAmount,
     sign_only: bool,
@@ -971,7 +1205,7 @@ pub fn process_create_stake_account(
 ) -> ProcessResult {
     let stake_account = config.signers[stake_account];
     let stake_account_address = if let Some(seed) = seed {
-        Pubkey::create_with_seed(&stake_account.pubkey(), &seed, &solana_stake_program::id())?
+        Pubkey::create_with_seed(&stake_account.pubkey(), seed, &stake::program::id())?
     } else {
         stake_account.pubkey()
     };
@@ -990,8 +1224,18 @@ pub fn process_create_stake_account(
             withdrawer: withdrawer.unwrap_or(from.pubkey()),
         };
 
-        let ixs = if let Some(seed) = seed {
-            stake_instruction::create_account_with_seed(
+        let ixs = match (seed, withdrawer_signer) {
+            (Some(seed), Some(_withdrawer_signer)) => {
+                stake_instruction::create_account_with_seed_checked(
+                    &from.pubkey(),          // from
+                    &stake_account_address,  // to
+                    &stake_account.pubkey(), // base
+                    seed,                    // seed
+                    &authorized,
+                    lamports,
+                )
+            }
+            (Some(seed), None) => stake_instruction::create_account_with_seed(
                 &from.pubkey(),          // from
                 &stake_account_address,  // to
                 &stake_account.pubkey(), // base
@@ -999,18 +1243,22 @@ pub fn process_create_stake_account(
                 &authorized,
                 lockup,
                 lamports,
-            )
-            .with_memo(memo)
-        } else {
-            stake_instruction::create_account(
+            ),
+            (None, Some(_withdrawer_signer)) => stake_instruction::create_account_checked(
+                &from.pubkey(),
+                &stake_account.pubkey(),
+                &authorized,
+                lamports,
+            ),
+            (None, None) => stake_instruction::create_account(
                 &from.pubkey(),
                 &stake_account.pubkey(),
                 &authorized,
                 lockup,
                 lamports,
-            )
-            .with_memo(memo)
-        };
+            ),
+        }
+        .with_memo(memo);
         if let Some(nonce_account) = &nonce_account {
             Message::new_with_nonce(
                 ixs,
@@ -1039,7 +1287,7 @@ pub fn process_create_stake_account(
 
     if !sign_only {
         if let Ok(stake_account) = rpc_client.get_account(&stake_account_address) {
-            let err_msg = if stake_account.owner == solana_stake_program::id() {
+            let err_msg = if stake_account.owner == stake::program::id() {
                 format!("Stake account {} already exists", stake_account_address)
             } else {
                 format!(
@@ -1084,7 +1332,7 @@ pub fn process_create_stake_account(
     } else {
         tx.try_sign(&config.signers, recent_blockhash)?;
         let result = rpc_client.send_and_confirm_transaction_with_spinner(&tx);
-        log_instruction_custom_error::<SystemError>(result, &config)
+        log_instruction_custom_error::<SystemError>(result, config)
     }
 }
 
@@ -1093,7 +1341,7 @@ pub fn process_stake_authorize(
     rpc_client: &RpcClient,
     config: &CliConfig,
     stake_account_pubkey: &Pubkey,
-    new_authorizations: &[(StakeAuthorize, Pubkey, SignerIndex)],
+    new_authorizations: &[StakeAuthorizationIndexed],
     custodian: Option<SignerIndex>,
     sign_only: bool,
     dump_transaction_message: bool,
@@ -1106,19 +1354,35 @@ pub fn process_stake_authorize(
 ) -> ProcessResult {
     let mut ixs = Vec::new();
     let custodian = custodian.map(|index| config.signers[index]);
-    for (stake_authorize, authorized_pubkey, authority) in new_authorizations.iter() {
+    for StakeAuthorizationIndexed {
+        authorization_type,
+        new_authority_pubkey,
+        authority,
+        new_authority_signer,
+    } in new_authorizations.iter()
+    {
         check_unique_pubkeys(
             (stake_account_pubkey, "stake_account_pubkey".to_string()),
-            (authorized_pubkey, "new_authorized_pubkey".to_string()),
+            (new_authority_pubkey, "new_authorized_pubkey".to_string()),
         )?;
         let authority = config.signers[*authority];
-        ixs.push(stake_instruction::authorize(
-            stake_account_pubkey, // stake account to update
-            &authority.pubkey(),  // currently authorized
-            authorized_pubkey,    // new stake signer
-            *stake_authorize,     // stake or withdraw
-            custodian.map(|signer| signer.pubkey()).as_ref(),
-        ));
+        if new_authority_signer.is_some() {
+            ixs.push(stake_instruction::authorize_checked(
+                stake_account_pubkey, // stake account to update
+                &authority.pubkey(),  // currently authorized
+                new_authority_pubkey, // new stake signer
+                *authorization_type,  // stake or withdraw
+                custodian.map(|signer| signer.pubkey()).as_ref(),
+            ));
+        } else {
+            ixs.push(stake_instruction::authorize(
+                stake_account_pubkey, // stake account to update
+                &authority.pubkey(),  // currently authorized
+                new_authority_pubkey, // new stake signer
+                *authorization_type,  // stake or withdraw
+                custodian.map(|signer| signer.pubkey()).as_ref(),
+            ));
+        }
     }
     ixs = ixs.with_memo(memo);
 
@@ -1171,7 +1435,7 @@ pub fn process_stake_authorize(
         } else {
             rpc_client.send_and_confirm_transaction_with_spinner(&tx)
         };
-        log_instruction_custom_error::<StakeError>(result, &config)
+        log_instruction_custom_error::<StakeError>(result, config)
     }
 }
 
@@ -1195,7 +1459,7 @@ pub fn process_deactivate_stake_account(
     let stake_authority = config.signers[stake_authority];
 
     let stake_account_address = if let Some(seed) = seed {
-        Pubkey::create_with_seed(&stake_account_pubkey, seed, &solana_stake_program::id())?
+        Pubkey::create_with_seed(stake_account_pubkey, seed, &stake::program::id())?
     } else {
         *stake_account_pubkey
     };
@@ -1247,7 +1511,7 @@ pub fn process_deactivate_stake_account(
             config.commitment,
         )?;
         let result = rpc_client.send_and_confirm_transaction_with_spinner(&tx);
-        log_instruction_custom_error::<StakeError>(result, &config)
+        log_instruction_custom_error::<StakeError>(result, config)
     }
 }
 
@@ -1273,7 +1537,7 @@ pub fn process_withdraw_stake(
     let custodian = custodian.map(|index| config.signers[index]);
 
     let stake_account_address = if let Some(seed) = seed {
-        Pubkey::create_with_seed(&stake_account_pubkey, seed, &solana_stake_program::id())?
+        Pubkey::create_with_seed(stake_account_pubkey, seed, &stake::program::id())?
     } else {
         *stake_account_pubkey
     };
@@ -1346,7 +1610,7 @@ pub fn process_withdraw_stake(
             config.commitment,
         )?;
         let result = rpc_client.send_and_confirm_transaction_with_spinner(&tx);
-        log_instruction_custom_error::<SystemError>(result, &config)
+        log_instruction_custom_error::<SystemError>(result, config)
     }
 }
 
@@ -1381,10 +1645,10 @@ pub fn process_split_stake(
     }
     check_unique_pubkeys(
         (&fee_payer.pubkey(), "fee-payer keypair".to_string()),
-        (&stake_account_pubkey, "stake_account".to_string()),
+        (stake_account_pubkey, "stake_account".to_string()),
     )?;
     check_unique_pubkeys(
-        (&stake_account_pubkey, "stake_account".to_string()),
+        (stake_account_pubkey, "stake_account".to_string()),
         (
             &split_stake_account.pubkey(),
             "split_stake_account".to_string(),
@@ -1394,18 +1658,14 @@ pub fn process_split_stake(
     let stake_authority = config.signers[stake_authority];
 
     let split_stake_account_address = if let Some(seed) = split_stake_account_seed {
-        Pubkey::create_with_seed(
-            &split_stake_account.pubkey(),
-            &seed,
-            &solana_stake_program::id(),
-        )?
+        Pubkey::create_with_seed(&split_stake_account.pubkey(), seed, &stake::program::id())?
     } else {
         split_stake_account.pubkey()
     };
 
     if !sign_only {
         if let Ok(stake_account) = rpc_client.get_account(&split_stake_account_address) {
-            let err_msg = if stake_account.owner == solana_stake_program::id() {
+            let err_msg = if stake_account.owner == stake::program::id() {
                 format!(
                     "Stake account {} already exists",
                     split_stake_account_address
@@ -1436,7 +1696,7 @@ pub fn process_split_stake(
 
     let ixs = if let Some(seed) = split_stake_account_seed {
         stake_instruction::split_with_seed(
-            &stake_account_pubkey,
+            stake_account_pubkey,
             &stake_authority.pubkey(),
             lamports,
             &split_stake_account_address,
@@ -1446,7 +1706,7 @@ pub fn process_split_stake(
         .with_memo(memo)
     } else {
         stake_instruction::split(
-            &stake_account_pubkey,
+            stake_account_pubkey,
             &stake_authority.pubkey(),
             lamports,
             &split_stake_account_address,
@@ -1495,7 +1755,7 @@ pub fn process_split_stake(
             config.commitment,
         )?;
         let result = rpc_client.send_and_confirm_transaction_with_spinner(&tx);
-        log_instruction_custom_error::<StakeError>(result, &config)
+        log_instruction_custom_error::<StakeError>(result, config)
     }
 }
 
@@ -1518,19 +1778,19 @@ pub fn process_merge_stake(
 
     check_unique_pubkeys(
         (&fee_payer.pubkey(), "fee-payer keypair".to_string()),
-        (&stake_account_pubkey, "stake_account".to_string()),
+        (stake_account_pubkey, "stake_account".to_string()),
     )?;
     check_unique_pubkeys(
         (&fee_payer.pubkey(), "fee-payer keypair".to_string()),
         (
-            &source_stake_account_pubkey,
+            source_stake_account_pubkey,
             "source_stake_account".to_string(),
         ),
     )?;
     check_unique_pubkeys(
-        (&stake_account_pubkey, "stake_account".to_string()),
+        (stake_account_pubkey, "stake_account".to_string()),
         (
-            &source_stake_account_pubkey,
+            source_stake_account_pubkey,
             "source_stake_account".to_string(),
         ),
     )?;
@@ -1540,7 +1800,7 @@ pub fn process_merge_stake(
     if !sign_only {
         for stake_account_address in &[stake_account_pubkey, source_stake_account_pubkey] {
             if let Ok(stake_account) = rpc_client.get_account(stake_account_address) {
-                if stake_account.owner != solana_stake_program::id() {
+                if stake_account.owner != stake::program::id() {
                     return Err(CliError::BadParameter(format!(
                         "Account {} is not a stake account",
                         stake_account_address
@@ -1555,8 +1815,8 @@ pub fn process_merge_stake(
         blockhash_query.get_blockhash_and_fee_calculator(rpc_client, config.commitment)?;
 
     let ixs = stake_instruction::merge(
-        &stake_account_pubkey,
-        &source_stake_account_pubkey,
+        stake_account_pubkey,
+        source_stake_account_pubkey,
         &stake_authority.pubkey(),
     )
     .with_memo(memo);
@@ -1606,7 +1866,7 @@ pub fn process_merge_stake(
             config.commitment,
             config.send_transaction_config,
         );
-        log_instruction_custom_error::<StakeError>(result, &config)
+        log_instruction_custom_error::<StakeError>(result, config)
     }
 }
 
@@ -1615,7 +1875,8 @@ pub fn process_stake_set_lockup(
     rpc_client: &RpcClient,
     config: &CliConfig,
     stake_account_pubkey: &Pubkey,
-    lockup: &mut LockupArgs,
+    lockup: &LockupArgs,
+    new_custodian_signer: Option<SignerIndex>,
     custodian: SignerIndex,
     sign_only: bool,
     dump_transaction_message: bool,
@@ -1629,11 +1890,11 @@ pub fn process_stake_set_lockup(
         blockhash_query.get_blockhash_and_fee_calculator(rpc_client, config.commitment)?;
     let custodian = config.signers[custodian];
 
-    let ixs = vec![stake_instruction::set_lockup(
-        stake_account_pubkey,
-        lockup,
-        &custodian.pubkey(),
-    )]
+    let ixs = vec![if new_custodian_signer.is_some() {
+        stake_instruction::set_lockup_checked(stake_account_pubkey, lockup, &custodian.pubkey())
+    } else {
+        stake_instruction::set_lockup(stake_account_pubkey, lockup, &custodian.pubkey())
+    }]
     .with_memo(memo);
     let nonce_authority = config.signers[nonce_authority];
     let fee_payer = config.signers[fee_payer];
@@ -1677,7 +1938,7 @@ pub fn process_stake_set_lockup(
             config.commitment,
         )?;
         let result = rpc_client.send_and_confirm_transaction_with_spinner(&tx);
-        log_instruction_custom_error::<StakeError>(result, &config)
+        log_instruction_custom_error::<StakeError>(result, config)
     }
 }
 
@@ -1695,7 +1956,6 @@ pub fn build_stake_state(
     use_lamports_unit: bool,
     stake_history: &StakeHistory,
     clock: &Clock,
-    stake_program_v2_enabled: bool,
 ) -> CliStakeState {
     match stake_state {
         StakeState::Stake(
@@ -1707,12 +1967,9 @@ pub fn build_stake_state(
             stake,
         ) => {
             let current_epoch = clock.epoch;
-            let (active_stake, activating_stake, deactivating_stake) =
-                stake.delegation.stake_activating_and_deactivating(
-                    current_epoch,
-                    Some(stake_history),
-                    stake_program_v2_enabled,
-                );
+            let (active_stake, activating_stake, deactivating_stake) = stake
+                .delegation
+                .stake_activating_and_deactivating(current_epoch, Some(stake_history));
             let lockup = if lockup.is_in_force(clock, None) {
                 Some(lockup.into())
             } else {
@@ -1827,6 +2084,7 @@ pub fn make_cli_reward(
             post_balance: reward.post_balance,
             percent_change: rate_change * 100.0,
             apr: Some(apr * 100.0),
+            commission: reward.commission,
         })
     } else {
         None
@@ -1876,7 +2134,7 @@ pub fn process_show_stake_account(
     with_rewards: Option<usize>,
 ) -> ProcessResult {
     let stake_account = rpc_client.get_account(stake_account_address)?;
-    if stake_account.owner != solana_stake_program::id() {
+    if stake_account.owner != stake::program::id() {
         return Err(CliError::RpcRequestError(format!(
             "{:?} is not a stake account",
             stake_account_address,
@@ -1900,7 +2158,6 @@ pub fn process_show_stake_account(
                 use_lamports_unit,
                 &stake_history,
                 &clock,
-                is_stake_program_v2_enabled(rpc_client)?, // At v1.6, this check can be removed and simply passed as `true`
             );
 
             if state.stake_type == CliStakeType::Stake && state.activation_epoch.is_some() {
@@ -2079,23 +2336,14 @@ pub fn process_delegate_stake(
             config.commitment,
         )?;
         let result = rpc_client.send_and_confirm_transaction_with_spinner(&tx);
-        log_instruction_custom_error::<StakeError>(result, &config)
+        log_instruction_custom_error::<StakeError>(result, config)
     }
 }
 
-pub fn is_stake_program_v2_enabled(
-    rpc_client: &RpcClient,
-) -> Result<bool, Box<dyn std::error::Error>> {
-    let feature_account = rpc_client.get_account(&feature_set::stake_program_v2::id())?;
-    Ok(feature::from_account(&feature_account)
-        .and_then(|feature| feature.activated_at)
-        .is_some())
-}
-
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::cli::{app, parse_command};
+    use crate::{clap_app::get_clap_app, cli::parse_command};
     use solana_client::blockhash_query;
     use solana_sdk::{
         hash::Hash,
@@ -2113,11 +2361,11 @@ mod tests {
     #[test]
     #[allow(clippy::cognitive_complexity)]
     fn test_parse_command() {
-        let test_commands = app("test", "desc", "version");
+        let test_commands = get_clap_app("test", "desc", "version");
         let default_keypair = Keypair::new();
         let (default_keypair_file, mut tmp_file) = make_tmp_file();
         write_keypair(&default_keypair, tmp_file.as_file_mut()).unwrap();
-        let default_signer = DefaultSigner::new(default_keypair_file.clone());
+        let default_signer = DefaultSigner::new("", &default_keypair_file);
         let (keypair_file, mut tmp_file) = make_tmp_file();
         let stake_account_keypair = Keypair::new();
         write_keypair(&stake_account_keypair, tmp_file.as_file_mut()).unwrap();
@@ -2150,8 +2398,18 @@ mod tests {
                 command: CliCommand::StakeAuthorize {
                     stake_account_pubkey,
                     new_authorizations: vec![
-                        (StakeAuthorize::Staker, new_stake_authority, 0,),
-                        (StakeAuthorize::Withdrawer, new_withdraw_authority, 0,),
+                        StakeAuthorizationIndexed {
+                            authorization_type: StakeAuthorize::Staker,
+                            new_authority_pubkey: new_stake_authority,
+                            authority: 0,
+                            new_authority_signer: None,
+                        },
+                        StakeAuthorizationIndexed {
+                            authorization_type: StakeAuthorize::Withdrawer,
+                            new_authority_pubkey: new_withdraw_authority,
+                            authority: 0,
+                            new_authority_signer: None,
+                        },
                     ],
                     sign_only: false,
                     dump_transaction_message: false,
@@ -2188,8 +2446,18 @@ mod tests {
                 command: CliCommand::StakeAuthorize {
                     stake_account_pubkey,
                     new_authorizations: vec![
-                        (StakeAuthorize::Staker, new_stake_authority, 1,),
-                        (StakeAuthorize::Withdrawer, new_withdraw_authority, 2,),
+                        StakeAuthorizationIndexed {
+                            authorization_type: StakeAuthorize::Staker,
+                            new_authority_pubkey: new_stake_authority,
+                            authority: 1,
+                            new_authority_signer: None,
+                        },
+                        StakeAuthorizationIndexed {
+                            authorization_type: StakeAuthorize::Withdrawer,
+                            new_authority_pubkey: new_withdraw_authority,
+                            authority: 2,
+                            new_authority_signer: None,
+                        },
                     ],
                     sign_only: false,
                     dump_transaction_message: false,
@@ -2230,8 +2498,18 @@ mod tests {
                 command: CliCommand::StakeAuthorize {
                     stake_account_pubkey,
                     new_authorizations: vec![
-                        (StakeAuthorize::Staker, new_stake_authority, 1,),
-                        (StakeAuthorize::Withdrawer, new_withdraw_authority, 1,),
+                        StakeAuthorizationIndexed {
+                            authorization_type: StakeAuthorize::Staker,
+                            new_authority_pubkey: new_stake_authority,
+                            authority: 1,
+                            new_authority_signer: None,
+                        },
+                        StakeAuthorizationIndexed {
+                            authorization_type: StakeAuthorize::Withdrawer,
+                            new_authority_pubkey: new_withdraw_authority,
+                            authority: 1,
+                            new_authority_signer: None,
+                        },
                     ],
                     sign_only: false,
                     dump_transaction_message: false,
@@ -2263,7 +2541,12 @@ mod tests {
             CliCommandInfo {
                 command: CliCommand::StakeAuthorize {
                     stake_account_pubkey,
-                    new_authorizations: vec![(StakeAuthorize::Staker, new_stake_authority, 0,),],
+                    new_authorizations: vec![StakeAuthorizationIndexed {
+                        authorization_type: StakeAuthorize::Staker,
+                        new_authority_pubkey: new_stake_authority,
+                        authority: 0,
+                        new_authority_signer: None,
+                    }],
                     sign_only: false,
                     dump_transaction_message: false,
                     blockhash_query: BlockhashQuery::All(blockhash_query::Source::Cluster),
@@ -2291,7 +2574,12 @@ mod tests {
             CliCommandInfo {
                 command: CliCommand::StakeAuthorize {
                     stake_account_pubkey,
-                    new_authorizations: vec![(StakeAuthorize::Staker, new_stake_authority, 1,),],
+                    new_authorizations: vec![StakeAuthorizationIndexed {
+                        authorization_type: StakeAuthorize::Staker,
+                        new_authority_pubkey: new_stake_authority,
+                        authority: 1,
+                        new_authority_signer: None,
+                    }],
                     sign_only: false,
                     dump_transaction_message: false,
                     blockhash_query: BlockhashQuery::All(blockhash_query::Source::Cluster),
@@ -2325,7 +2613,12 @@ mod tests {
             CliCommandInfo {
                 command: CliCommand::StakeAuthorize {
                     stake_account_pubkey,
-                    new_authorizations: vec![(StakeAuthorize::Staker, new_stake_authority, 1,),],
+                    new_authorizations: vec![StakeAuthorizationIndexed {
+                        authorization_type: StakeAuthorize::Staker,
+                        new_authority_pubkey: new_stake_authority,
+                        authority: 1,
+                        new_authority_signer: None,
+                    }],
                     sign_only: false,
                     dump_transaction_message: false,
                     blockhash_query: BlockhashQuery::All(blockhash_query::Source::Cluster),
@@ -2356,11 +2649,12 @@ mod tests {
             CliCommandInfo {
                 command: CliCommand::StakeAuthorize {
                     stake_account_pubkey,
-                    new_authorizations: vec![(
-                        StakeAuthorize::Withdrawer,
-                        new_withdraw_authority,
-                        0,
-                    ),],
+                    new_authorizations: vec![StakeAuthorizationIndexed {
+                        authorization_type: StakeAuthorize::Withdrawer,
+                        new_authority_pubkey: new_withdraw_authority,
+                        authority: 0,
+                        new_authority_signer: None,
+                    }],
                     sign_only: false,
                     dump_transaction_message: false,
                     blockhash_query: BlockhashQuery::All(blockhash_query::Source::Cluster),
@@ -2388,11 +2682,12 @@ mod tests {
             CliCommandInfo {
                 command: CliCommand::StakeAuthorize {
                     stake_account_pubkey,
-                    new_authorizations: vec![(
-                        StakeAuthorize::Withdrawer,
-                        new_withdraw_authority,
-                        1,
-                    ),],
+                    new_authorizations: vec![StakeAuthorizationIndexed {
+                        authorization_type: StakeAuthorize::Withdrawer,
+                        new_authority_pubkey: new_withdraw_authority,
+                        authority: 1,
+                        new_authority_signer: None,
+                    }],
                     sign_only: false,
                     dump_transaction_message: false,
                     blockhash_query: BlockhashQuery::All(blockhash_query::Source::Cluster),
@@ -2426,7 +2721,12 @@ mod tests {
             CliCommandInfo {
                 command: CliCommand::StakeAuthorize {
                     stake_account_pubkey,
-                    new_authorizations: vec![(StakeAuthorize::Staker, stake_account_pubkey, 0)],
+                    new_authorizations: vec![StakeAuthorizationIndexed {
+                        authorization_type: StakeAuthorize::Staker,
+                        new_authority_pubkey: stake_account_pubkey,
+                        authority: 0,
+                        new_authority_signer: None,
+                    }],
                     sign_only: false,
                     dump_transaction_message: false,
                     blockhash_query: BlockhashQuery::All(blockhash_query::Source::Cluster),
@@ -2441,28 +2741,41 @@ mod tests {
             }
         );
 
-        // Test Authorize Subcommand w/ sign-only
-        let blockhash = Hash::default();
-        let blockhash_string = format!("{}", blockhash);
-        let test_authorize = test_commands.clone().get_matches_from(vec![
+        // stake-authorize-checked subcommand
+        let (authority_keypair_file, mut tmp_file) = make_tmp_file();
+        let authority_keypair = Keypair::new();
+        write_keypair(&authority_keypair, tmp_file.as_file_mut()).unwrap();
+        let test_stake_authorize = test_commands.clone().get_matches_from(vec![
             "test",
-            "stake-authorize",
+            "stake-authorize-checked",
             &stake_account_string,
             "--new-stake-authority",
-            &stake_account_string,
-            "--blockhash",
-            &blockhash_string,
-            "--sign-only",
+            &authority_keypair_file,
+            "--new-withdraw-authority",
+            &authority_keypair_file,
         ]);
         assert_eq!(
-            parse_command(&test_authorize, &default_signer, &mut None).unwrap(),
+            parse_command(&test_stake_authorize, &default_signer, &mut None).unwrap(),
             CliCommandInfo {
                 command: CliCommand::StakeAuthorize {
                     stake_account_pubkey,
-                    new_authorizations: vec![(StakeAuthorize::Staker, stake_account_pubkey, 0)],
-                    sign_only: true,
+                    new_authorizations: vec![
+                        StakeAuthorizationIndexed {
+                            authorization_type: StakeAuthorize::Staker,
+                            new_authority_pubkey: authority_keypair.pubkey(),
+                            authority: 0,
+                            new_authority_signer: Some(1),
+                        },
+                        StakeAuthorizationIndexed {
+                            authorization_type: StakeAuthorize::Withdrawer,
+                            new_authority_pubkey: authority_keypair.pubkey(),
+                            authority: 0,
+                            new_authority_signer: Some(1),
+                        },
+                    ],
+                    sign_only: false,
                     dump_transaction_message: false,
-                    blockhash_query: BlockhashQuery::None(blockhash),
+                    blockhash_query: BlockhashQuery::All(blockhash_query::Source::Cluster),
                     nonce_account: None,
                     nonce_authority: 0,
                     memo: None,
@@ -2470,33 +2783,409 @@ mod tests {
                     custodian: None,
                     no_wait: false,
                 },
-                signers: vec![read_keypair_file(&default_keypair_file).unwrap().into()],
-            }
+                signers: vec![
+                    read_keypair_file(&default_keypair_file).unwrap().into(),
+                    read_keypair_file(&authority_keypair_file).unwrap().into(),
+                ],
+            },
         );
-        // Test Authorize Subcommand w/ offline feepayer
-        let keypair = Keypair::new();
-        let pubkey = keypair.pubkey();
-        let sig = keypair.sign_message(&[0u8]);
-        let signer = format!("{}={}", keypair.pubkey(), sig);
-        let test_authorize = test_commands.clone().get_matches_from(vec![
+        let (withdraw_authority_keypair_file, mut tmp_file) = make_tmp_file();
+        let withdraw_authority_keypair = Keypair::new();
+        write_keypair(&withdraw_authority_keypair, tmp_file.as_file_mut()).unwrap();
+        let test_stake_authorize = test_commands.clone().get_matches_from(vec![
             "test",
-            "stake-authorize",
+            "stake-authorize-checked",
             &stake_account_string,
             "--new-stake-authority",
-            &stake_account_string,
-            "--blockhash",
-            &blockhash_string,
-            "--signer",
-            &signer,
-            "--fee-payer",
-            &pubkey.to_string(),
+            &authority_keypair_file,
+            "--new-withdraw-authority",
+            &authority_keypair_file,
+            "--stake-authority",
+            &stake_authority_keypair_file,
+            "--withdraw-authority",
+            &withdraw_authority_keypair_file,
         ]);
         assert_eq!(
-            parse_command(&test_authorize, &default_signer, &mut None).unwrap(),
+            parse_command(&test_stake_authorize, &default_signer, &mut None).unwrap(),
+            CliCommandInfo {
+                command: CliCommand::StakeAuthorize {
+                    stake_account_pubkey,
+                    new_authorizations: vec![
+                        StakeAuthorizationIndexed {
+                            authorization_type: StakeAuthorize::Staker,
+                            new_authority_pubkey: authority_keypair.pubkey(),
+                            authority: 1,
+                            new_authority_signer: Some(2),
+                        },
+                        StakeAuthorizationIndexed {
+                            authorization_type: StakeAuthorize::Withdrawer,
+                            new_authority_pubkey: authority_keypair.pubkey(),
+                            authority: 3,
+                            new_authority_signer: Some(2),
+                        },
+                    ],
+                    sign_only: false,
+                    dump_transaction_message: false,
+                    blockhash_query: BlockhashQuery::All(blockhash_query::Source::Cluster),
+                    nonce_account: None,
+                    nonce_authority: 0,
+                    memo: None,
+                    fee_payer: 0,
+                    custodian: None,
+                    no_wait: false,
+                },
+                signers: vec![
+                    read_keypair_file(&default_keypair_file).unwrap().into(),
+                    read_keypair_file(&stake_authority_keypair_file)
+                        .unwrap()
+                        .into(),
+                    read_keypair_file(&authority_keypair_file).unwrap().into(),
+                    read_keypair_file(&withdraw_authority_keypair_file)
+                        .unwrap()
+                        .into(),
+                ],
+            },
+        );
+        // Withdraw authority may set both new authorities
+        let test_stake_authorize = test_commands.clone().get_matches_from(vec![
+            "test",
+            "stake-authorize-checked",
+            &stake_account_string,
+            "--new-stake-authority",
+            &authority_keypair_file,
+            "--new-withdraw-authority",
+            &authority_keypair_file,
+            "--withdraw-authority",
+            &withdraw_authority_keypair_file,
+        ]);
+        assert_eq!(
+            parse_command(&test_stake_authorize, &default_signer, &mut None).unwrap(),
+            CliCommandInfo {
+                command: CliCommand::StakeAuthorize {
+                    stake_account_pubkey,
+                    new_authorizations: vec![
+                        StakeAuthorizationIndexed {
+                            authorization_type: StakeAuthorize::Staker,
+                            new_authority_pubkey: authority_keypair.pubkey(),
+                            authority: 1,
+                            new_authority_signer: Some(2),
+                        },
+                        StakeAuthorizationIndexed {
+                            authorization_type: StakeAuthorize::Withdrawer,
+                            new_authority_pubkey: authority_keypair.pubkey(),
+                            authority: 1,
+                            new_authority_signer: Some(2),
+                        },
+                    ],
+                    sign_only: false,
+                    dump_transaction_message: false,
+                    blockhash_query: BlockhashQuery::All(blockhash_query::Source::Cluster),
+                    nonce_account: None,
+                    nonce_authority: 0,
+                    memo: None,
+                    fee_payer: 0,
+                    custodian: None,
+                    no_wait: false,
+                },
+                signers: vec![
+                    read_keypair_file(&default_keypair_file).unwrap().into(),
+                    read_keypair_file(&withdraw_authority_keypair_file)
+                        .unwrap()
+                        .into(),
+                    read_keypair_file(&authority_keypair_file).unwrap().into(),
+                ],
+            },
+        );
+        let test_stake_authorize = test_commands.clone().get_matches_from(vec![
+            "test",
+            "stake-authorize-checked",
+            &stake_account_string,
+            "--new-stake-authority",
+            &authority_keypair_file,
+        ]);
+        assert_eq!(
+            parse_command(&test_stake_authorize, &default_signer, &mut None).unwrap(),
+            CliCommandInfo {
+                command: CliCommand::StakeAuthorize {
+                    stake_account_pubkey,
+                    new_authorizations: vec![StakeAuthorizationIndexed {
+                        authorization_type: StakeAuthorize::Staker,
+                        new_authority_pubkey: authority_keypair.pubkey(),
+                        authority: 0,
+                        new_authority_signer: Some(1),
+                    }],
+                    sign_only: false,
+                    dump_transaction_message: false,
+                    blockhash_query: BlockhashQuery::All(blockhash_query::Source::Cluster),
+                    nonce_account: None,
+                    nonce_authority: 0,
+                    memo: None,
+                    fee_payer: 0,
+                    custodian: None,
+                    no_wait: false,
+                },
+                signers: vec![
+                    read_keypair_file(&default_keypair_file).unwrap().into(),
+                    read_keypair_file(&authority_keypair_file).unwrap().into(),
+                ],
+            },
+        );
+        let test_stake_authorize = test_commands.clone().get_matches_from(vec![
+            "test",
+            "stake-authorize-checked",
+            &stake_account_string,
+            "--new-stake-authority",
+            &authority_keypair_file,
+            "--stake-authority",
+            &stake_authority_keypair_file,
+        ]);
+        assert_eq!(
+            parse_command(&test_stake_authorize, &default_signer, &mut None).unwrap(),
             CliCommandInfo {
                 command: CliCommand::StakeAuthorize {
                     stake_account_pubkey,
-                    new_authorizations: vec![(StakeAuthorize::Staker, stake_account_pubkey, 0)],
+                    new_authorizations: vec![StakeAuthorizationIndexed {
+                        authorization_type: StakeAuthorize::Staker,
+                        new_authority_pubkey: authority_keypair.pubkey(),
+                        authority: 1,
+                        new_authority_signer: Some(2),
+                    }],
+                    sign_only: false,
+                    dump_transaction_message: false,
+                    blockhash_query: BlockhashQuery::All(blockhash_query::Source::Cluster),
+                    nonce_account: None,
+                    nonce_authority: 0,
+                    memo: None,
+                    fee_payer: 0,
+                    custodian: None,
+                    no_wait: false,
+                },
+                signers: vec![
+                    read_keypair_file(&default_keypair_file).unwrap().into(),
+                    read_keypair_file(&stake_authority_keypair_file)
+                        .unwrap()
+                        .into(),
+                    read_keypair_file(&authority_keypair_file).unwrap().into(),
+                ],
+            },
+        );
+        // Withdraw authority may set new stake authority
+        let test_stake_authorize = test_commands.clone().get_matches_from(vec![
+            "test",
+            "stake-authorize-checked",
+            &stake_account_string,
+            "--new-stake-authority",
+            &authority_keypair_file,
+            "--withdraw-authority",
+            &withdraw_authority_keypair_file,
+        ]);
+        assert_eq!(
+            parse_command(&test_stake_authorize, &default_signer, &mut None).unwrap(),
+            CliCommandInfo {
+                command: CliCommand::StakeAuthorize {
+                    stake_account_pubkey,
+                    new_authorizations: vec![StakeAuthorizationIndexed {
+                        authorization_type: StakeAuthorize::Staker,
+                        new_authority_pubkey: authority_keypair.pubkey(),
+                        authority: 1,
+                        new_authority_signer: Some(2),
+                    }],
+                    sign_only: false,
+                    dump_transaction_message: false,
+                    blockhash_query: BlockhashQuery::All(blockhash_query::Source::Cluster),
+                    nonce_account: None,
+                    nonce_authority: 0,
+                    memo: None,
+                    fee_payer: 0,
+                    custodian: None,
+                    no_wait: false,
+                },
+                signers: vec![
+                    read_keypair_file(&default_keypair_file).unwrap().into(),
+                    read_keypair_file(&withdraw_authority_keypair_file)
+                        .unwrap()
+                        .into(),
+                    read_keypair_file(&authority_keypair_file).unwrap().into(),
+                ],
+            },
+        );
+        let test_stake_authorize = test_commands.clone().get_matches_from(vec![
+            "test",
+            "stake-authorize-checked",
+            &stake_account_string,
+            "--new-withdraw-authority",
+            &authority_keypair_file,
+        ]);
+        assert_eq!(
+            parse_command(&test_stake_authorize, &default_signer, &mut None).unwrap(),
+            CliCommandInfo {
+                command: CliCommand::StakeAuthorize {
+                    stake_account_pubkey,
+                    new_authorizations: vec![StakeAuthorizationIndexed {
+                        authorization_type: StakeAuthorize::Withdrawer,
+                        new_authority_pubkey: authority_keypair.pubkey(),
+                        authority: 0,
+                        new_authority_signer: Some(1),
+                    }],
+                    sign_only: false,
+                    dump_transaction_message: false,
+                    blockhash_query: BlockhashQuery::All(blockhash_query::Source::Cluster),
+                    nonce_account: None,
+                    nonce_authority: 0,
+                    memo: None,
+                    fee_payer: 0,
+                    custodian: None,
+                    no_wait: false,
+                },
+                signers: vec![
+                    read_keypair_file(&default_keypair_file).unwrap().into(),
+                    read_keypair_file(&authority_keypair_file).unwrap().into(),
+                ],
+            },
+        );
+        let test_stake_authorize = test_commands.clone().get_matches_from(vec![
+            "test",
+            "stake-authorize-checked",
+            &stake_account_string,
+            "--new-withdraw-authority",
+            &authority_keypair_file,
+            "--withdraw-authority",
+            &withdraw_authority_keypair_file,
+        ]);
+        assert_eq!(
+            parse_command(&test_stake_authorize, &default_signer, &mut None).unwrap(),
+            CliCommandInfo {
+                command: CliCommand::StakeAuthorize {
+                    stake_account_pubkey,
+                    new_authorizations: vec![StakeAuthorizationIndexed {
+                        authorization_type: StakeAuthorize::Withdrawer,
+                        new_authority_pubkey: authority_keypair.pubkey(),
+                        authority: 1,
+                        new_authority_signer: Some(2),
+                    }],
+                    sign_only: false,
+                    dump_transaction_message: false,
+                    blockhash_query: BlockhashQuery::All(blockhash_query::Source::Cluster),
+                    nonce_account: None,
+                    nonce_authority: 0,
+                    memo: None,
+                    fee_payer: 0,
+                    custodian: None,
+                    no_wait: false,
+                },
+                signers: vec![
+                    read_keypair_file(&default_keypair_file).unwrap().into(),
+                    read_keypair_file(&withdraw_authority_keypair_file)
+                        .unwrap()
+                        .into(),
+                    read_keypair_file(&authority_keypair_file).unwrap().into(),
+                ],
+            },
+        );
+
+        // Test Authorize Subcommand w/ no-wait
+        let test_authorize = test_commands.clone().get_matches_from(vec![
+            "test",
+            "stake-authorize-checked",
+            &stake_account_string,
+            "--new-stake-authority",
+            &authority_keypair_file,
+            "--no-wait",
+        ]);
+        assert_eq!(
+            parse_command(&test_authorize, &default_signer, &mut None).unwrap(),
+            CliCommandInfo {
+                command: CliCommand::StakeAuthorize {
+                    stake_account_pubkey,
+                    new_authorizations: vec![StakeAuthorizationIndexed {
+                        authorization_type: StakeAuthorize::Staker,
+                        new_authority_pubkey: authority_keypair.pubkey(),
+                        authority: 0,
+                        new_authority_signer: Some(1),
+                    }],
+                    sign_only: false,
+                    dump_transaction_message: false,
+                    blockhash_query: BlockhashQuery::All(blockhash_query::Source::Cluster),
+                    nonce_account: None,
+                    nonce_authority: 0,
+                    memo: None,
+                    fee_payer: 0,
+                    custodian: None,
+                    no_wait: true,
+                },
+                signers: vec![
+                    read_keypair_file(&default_keypair_file).unwrap().into(),
+                    read_keypair_file(&authority_keypair_file).unwrap().into(),
+                ],
+            }
+        );
+
+        // Test Authorize Subcommand w/ sign-only
+        let blockhash = Hash::default();
+        let blockhash_string = format!("{}", blockhash);
+        let test_authorize = test_commands.clone().get_matches_from(vec![
+            "test",
+            "stake-authorize",
+            &stake_account_string,
+            "--new-stake-authority",
+            &stake_account_string,
+            "--blockhash",
+            &blockhash_string,
+            "--sign-only",
+        ]);
+        assert_eq!(
+            parse_command(&test_authorize, &default_signer, &mut None).unwrap(),
+            CliCommandInfo {
+                command: CliCommand::StakeAuthorize {
+                    stake_account_pubkey,
+                    new_authorizations: vec![StakeAuthorizationIndexed {
+                        authorization_type: StakeAuthorize::Staker,
+                        new_authority_pubkey: stake_account_pubkey,
+                        authority: 0,
+                        new_authority_signer: None,
+                    }],
+                    sign_only: true,
+                    dump_transaction_message: false,
+                    blockhash_query: BlockhashQuery::None(blockhash),
+                    nonce_account: None,
+                    nonce_authority: 0,
+                    memo: None,
+                    fee_payer: 0,
+                    custodian: None,
+                    no_wait: false,
+                },
+                signers: vec![read_keypair_file(&default_keypair_file).unwrap().into()],
+            }
+        );
+        // Test Authorize Subcommand w/ offline feepayer
+        let keypair = Keypair::new();
+        let pubkey = keypair.pubkey();
+        let sig = keypair.sign_message(&[0u8]);
+        let signer = format!("{}={}", keypair.pubkey(), sig);
+        let test_authorize = test_commands.clone().get_matches_from(vec![
+            "test",
+            "stake-authorize",
+            &stake_account_string,
+            "--new-stake-authority",
+            &stake_account_string,
+            "--blockhash",
+            &blockhash_string,
+            "--signer",
+            &signer,
+            "--fee-payer",
+            &pubkey.to_string(),
+        ]);
+        assert_eq!(
+            parse_command(&test_authorize, &default_signer, &mut None).unwrap(),
+            CliCommandInfo {
+                command: CliCommand::StakeAuthorize {
+                    stake_account_pubkey,
+                    new_authorizations: vec![StakeAuthorizationIndexed {
+                        authorization_type: StakeAuthorize::Staker,
+                        new_authority_pubkey: stake_account_pubkey,
+                        authority: 0,
+                        new_authority_signer: None,
+                    }],
                     sign_only: false,
                     dump_transaction_message: false,
                     blockhash_query: BlockhashQuery::FeeCalculator(
@@ -2546,7 +3235,12 @@ mod tests {
             CliCommandInfo {
                 command: CliCommand::StakeAuthorize {
                     stake_account_pubkey,
-                    new_authorizations: vec![(StakeAuthorize::Staker, stake_account_pubkey, 0)],
+                    new_authorizations: vec![StakeAuthorizationIndexed {
+                        authorization_type: StakeAuthorize::Staker,
+                        new_authority_pubkey: stake_account_pubkey,
+                        authority: 0,
+                        new_authority_signer: None,
+                    }],
                     sign_only: false,
                     dump_transaction_message: false,
                     blockhash_query: BlockhashQuery::FeeCalculator(
@@ -2582,7 +3276,12 @@ mod tests {
             CliCommandInfo {
                 command: CliCommand::StakeAuthorize {
                     stake_account_pubkey,
-                    new_authorizations: vec![(StakeAuthorize::Staker, stake_account_pubkey, 0)],
+                    new_authorizations: vec![StakeAuthorizationIndexed {
+                        authorization_type: StakeAuthorize::Staker,
+                        new_authority_pubkey: stake_account_pubkey,
+                        authority: 0,
+                        new_authority_signer: None,
+                    }],
                     sign_only: false,
                     dump_transaction_message: false,
                     blockhash_query: BlockhashQuery::FeeCalculator(
@@ -2623,7 +3322,12 @@ mod tests {
             CliCommandInfo {
                 command: CliCommand::StakeAuthorize {
                     stake_account_pubkey,
-                    new_authorizations: vec![(StakeAuthorize::Staker, stake_account_pubkey, 0)],
+                    new_authorizations: vec![StakeAuthorizationIndexed {
+                        authorization_type: StakeAuthorize::Staker,
+                        new_authority_pubkey: stake_account_pubkey,
+                        authority: 0,
+                        new_authority_signer: None,
+                    }],
                     sign_only: false,
                     dump_transaction_message: false,
                     blockhash_query: BlockhashQuery::FeeCalculator(
@@ -2663,7 +3367,12 @@ mod tests {
             CliCommandInfo {
                 command: CliCommand::StakeAuthorize {
                     stake_account_pubkey,
-                    new_authorizations: vec![(StakeAuthorize::Staker, stake_account_pubkey, 0)],
+                    new_authorizations: vec![StakeAuthorizationIndexed {
+                        authorization_type: StakeAuthorize::Staker,
+                        new_authority_pubkey: stake_account_pubkey,
+                        authority: 0,
+                        new_authority_signer: None,
+                    }],
                     sign_only: false,
                     dump_transaction_message: false,
                     blockhash_query: BlockhashQuery::All(blockhash_query::Source::Cluster),
@@ -2701,7 +3410,12 @@ mod tests {
             CliCommandInfo {
                 command: CliCommand::StakeAuthorize {
                     stake_account_pubkey,
-                    new_authorizations: vec![(StakeAuthorize::Staker, stake_account_pubkey, 0)],
+                    new_authorizations: vec![StakeAuthorizationIndexed {
+                        authorization_type: StakeAuthorize::Staker,
+                        new_authority_pubkey: stake_account_pubkey,
+                        authority: 0,
+                        new_authority_signer: None,
+                    }],
                     sign_only: false,
                     dump_transaction_message: false,
                     blockhash_query: BlockhashQuery::FeeCalculator(
@@ -2749,6 +3463,7 @@ mod tests {
                     seed: None,
                     staker: Some(authorized),
                     withdrawer: Some(authorized),
+                    withdrawer_signer: None,
                     lockup: Lockup {
                         epoch: 43,
                         unix_timestamp: 0,
@@ -2792,6 +3507,7 @@ mod tests {
                     seed: None,
                     staker: None,
                     withdrawer: None,
+                    withdrawer_signer: None,
                     lockup: Lockup::default(),
                     amount: SpendAmount::Some(50_000_000_000),
                     sign_only: false,
@@ -2809,6 +3525,58 @@ mod tests {
                 ],
             }
         );
+        let (withdrawer_keypair_file, mut tmp_file) = make_tmp_file();
+        let withdrawer_keypair = Keypair::new();
+        write_keypair(&withdrawer_keypair, tmp_file.as_file_mut()).unwrap();
+        let test_create_stake_account = test_commands.clone().get_matches_from(vec![
+            "test",
+            "create-stake-account-checked",
+            &keypair_file,
+            "50",
+            "--stake-authority",
+            &authorized_string,
+            "--withdraw-authority",
+            &withdrawer_keypair_file,
+        ]);
+        assert_eq!(
+            parse_command(&test_create_stake_account, &default_signer, &mut None).unwrap(),
+            CliCommandInfo {
+                command: CliCommand::CreateStakeAccount {
+                    stake_account: 1,
+                    seed: None,
+                    staker: Some(authorized),
+                    withdrawer: Some(withdrawer_keypair.pubkey()),
+                    withdrawer_signer: Some(2),
+                    lockup: Lockup::default(),
+                    amount: SpendAmount::Some(50_000_000_000),
+                    sign_only: false,
+                    dump_transaction_message: false,
+                    blockhash_query: BlockhashQuery::All(blockhash_query::Source::Cluster),
+                    nonce_account: None,
+                    nonce_authority: 0,
+                    memo: None,
+                    fee_payer: 0,
+                    from: 0,
+                },
+                signers: vec![
+                    read_keypair_file(&default_keypair_file).unwrap().into(),
+                    stake_account_keypair.into(),
+                    withdrawer_keypair.into(),
+                ],
+            }
+        );
+
+        let test_create_stake_account = test_commands.clone().get_matches_from(vec![
+            "test",
+            "create-stake-account-checked",
+            &keypair_file,
+            "50",
+            "--stake-authority",
+            &authorized_string,
+            "--withdraw-authority",
+            &authorized_string,
+        ]);
+        assert!(parse_command(&test_create_stake_account, &default_signer, &mut None).is_err());
 
         // CreateStakeAccount offline and nonce
         let nonce_account = Pubkey::new(&[1u8; 32]);
@@ -2847,6 +3615,7 @@ mod tests {
                     seed: None,
                     staker: None,
                     withdrawer: None,
+                    withdrawer_signer: None,
                     lockup: Lockup::default(),
                     amount: SpendAmount::Some(50_000_000_000),
                     sign_only: false,
diff --git a/cli/src/validator_info.rs b/cli/src/validator_info.rs
index 5479c0cb87300b..61054a3e98f6cc 100644
--- a/cli/src/validator_info.rs
+++ b/cli/src/validator_info.rs
@@ -119,7 +119,7 @@ fn parse_validator_info(
     let key_list: ConfigKeys = deserialize(&account.data)?;
     if !key_list.keys.is_empty() {
         let (validator_pubkey, _) = key_list.keys[1];
-        let validator_info_string: String = deserialize(&get_config_data(&account.data)?)?;
+        let validator_info_string: String = deserialize(get_config_data(&account.data)?)?;
         let validator_info: Map<_, _> = serde_json::from_str(&validator_info_string)?;
         Ok((validator_pubkey, validator_info))
     } else {
@@ -246,7 +246,7 @@ pub fn process_set_validator_info(
 ) -> ProcessResult {
     // Validate keybase username
     if let Some(string) = validator_info.get("keybaseUsername") {
-        let result = verify_keybase(&config.signers[0].pubkey(), &string);
+        let result = verify_keybase(&config.signers[0].pubkey(), string);
         if result.is_err() {
             if force_keybase {
                 println!("--force supplied, ignoring: {:?}", result);
@@ -272,7 +272,7 @@ pub fn process_set_validator_info(
             },
         )
         .find(|(pubkey, account)| {
-            let (validator_pubkey, _) = parse_validator_info(&pubkey, &account).unwrap();
+            let (validator_pubkey, _) = parse_validator_info(pubkey, account).unwrap();
             validator_pubkey == config.signers[0].pubkey()
         });
 
@@ -393,7 +393,7 @@ pub fn process_get_validator_info(
     }
     for (validator_info_pubkey, validator_info_account) in validator_info.iter() {
         let (validator_pubkey, validator_info) =
-            parse_validator_info(&validator_info_pubkey, &validator_info_account)?;
+            parse_validator_info(validator_info_pubkey, validator_info_account)?;
         validator_info_list.push(CliValidatorInfo {
             identity_pubkey: validator_pubkey.to_string(),
             info_pubkey: validator_info_pubkey.to_string(),
@@ -408,7 +408,7 @@ pub fn process_get_validator_info(
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::cli::app;
+    use crate::clap_app::get_clap_app;
     use bincode::{serialize, serialized_size};
     use serde_json::json;
 
@@ -432,7 +432,7 @@ mod tests {
 
     #[test]
     fn test_parse_args() {
-        let matches = app("test", "desc", "version").get_matches_from(vec![
+        let matches = get_clap_app("test", "desc", "version").get_matches_from(vec![
             "test",
             "validator-info",
             "publish",
@@ -451,7 +451,7 @@ mod tests {
             "name": "Alice",
             "keybaseUsername": "alice_keybase",
         });
-        assert_eq!(parse_args(&matches), expected);
+        assert_eq!(parse_args(matches), expected);
     }
 
     #[test]
diff --git a/cli/src/vote.rs b/cli/src/vote.rs
index 96e8e046e25b9b..ee81929d077381 100644
--- a/cli/src/vote.rs
+++ b/cli/src/vote.rs
@@ -82,7 +82,7 @@ impl VoteSubCommands for App<'_, '_> {
                         .takes_value(true)
                         .help("Seed for address generation; if specified, the resulting account will be at a derived address of the VOTE ACCOUNT pubkey")
                 )
-		.arg(memo_arg())
+                .arg(memo_arg())
         )
         .subcommand(
             SubCommand::with_name("vote-authorize-voter")
@@ -109,7 +109,7 @@ impl VoteSubCommands for App<'_, '_> {
                         .required(true),
                         "New authorized vote signer. "),
                 )
-		.arg(memo_arg())
+                .arg(memo_arg())
         )
         .subcommand(
             SubCommand::with_name("vote-authorize-withdrawer")
@@ -136,7 +136,65 @@ impl VoteSubCommands for App<'_, '_> {
                         .required(true),
                         "New authorized withdrawer. "),
                 )
-		.arg(memo_arg())
+                .arg(memo_arg())
+        )
+        .subcommand(
+            SubCommand::with_name("vote-authorize-voter-checked")
+                .about("Authorize a new vote signing keypair for the given vote account, \
+                    checking the new authority as a signer")
+                .arg(
+                    pubkey!(Arg::with_name("vote_account_pubkey")
+                        .index(1)
+                        .value_name("VOTE_ACCOUNT_ADDRESS")
+                        .required(true),
+                        "Vote account in which to set the authorized voter. "),
+                )
+                .arg(
+                    Arg::with_name("authorized")
+                        .index(2)
+                        .value_name("AUTHORIZED_KEYPAIR")
+                        .required(true)
+                        .validator(is_valid_signer)
+                        .help("Current authorized vote signer."),
+                )
+                .arg(
+                    Arg::with_name("new_authorized")
+                        .index(3)
+                        .value_name("NEW_AUTHORIZED_KEYPAIR")
+                        .required(true)
+                        .validator(is_valid_signer)
+                        .help("New authorized vote signer."),
+                )
+                .arg(memo_arg())
+        )
+        .subcommand(
+            SubCommand::with_name("vote-authorize-withdrawer-checked")
+                .about("Authorize a new withdraw signing keypair for the given vote account, \
+                    checking the new authority as a signer")
+                .arg(
+                    pubkey!(Arg::with_name("vote_account_pubkey")
+                        .index(1)
+                        .value_name("VOTE_ACCOUNT_ADDRESS")
+                        .required(true),
+                        "Vote account in which to set the authorized withdrawer. "),
+                )
+                .arg(
+                    Arg::with_name("authorized")
+                        .index(2)
+                        .value_name("AUTHORIZED_KEYPAIR")
+                        .required(true)
+                        .validator(is_valid_signer)
+                        .help("Current authorized withdrawer."),
+                )
+                .arg(
+                    Arg::with_name("new_authorized")
+                        .index(3)
+                        .value_name("NEW_AUTHORIZED_KEYPAIR")
+                        .required(true)
+                        .validator(is_valid_signer)
+                        .help("New authorized withdrawer."),
+                )
+                .arg(memo_arg())
         )
         .subcommand(
             SubCommand::with_name("vote-update-validator")
@@ -166,7 +224,7 @@ impl VoteSubCommands for App<'_, '_> {
                         .validator(is_valid_signer)
                         .help("Authorized withdrawer keypair"),
                 )
-		.arg(memo_arg())
+                .arg(memo_arg())
         )
         .subcommand(
             SubCommand::with_name("vote-update-commission")
@@ -196,7 +254,7 @@ impl VoteSubCommands for App<'_, '_> {
                         .validator(is_valid_signer)
                         .help("Authorized withdrawer keypair"),
                 )
-		.arg(memo_arg())
+                .arg(memo_arg())
         )
         .subcommand(
             SubCommand::with_name("vote-account")
@@ -266,7 +324,7 @@ impl VoteSubCommands for App<'_, '_> {
                         .validator(is_valid_signer)
                         .help("Authorized withdrawer [default: cli config keypair]"),
                 )
-		.arg(memo_arg())
+                .arg(memo_arg())
         )
     }
 }
@@ -311,19 +369,25 @@ pub fn parse_vote_authorize(
     default_signer: &DefaultSigner,
     wallet_manager: &mut Option<Arc<RemoteWalletManager>>,
     vote_authorize: VoteAuthorize,
+    checked: bool,
 ) -> Result<CliCommandInfo, CliError> {
     let vote_account_pubkey =
         pubkey_of_signer(matches, "vote_account_pubkey", wallet_manager)?.unwrap();
-    let new_authorized_pubkey =
-        pubkey_of_signer(matches, "new_authorized_pubkey", wallet_manager)?.unwrap();
-    let (authorized, _) = signer_of(matches, "authorized", wallet_manager)?;
+    let (authorized, authorized_pubkey) = signer_of(matches, "authorized", wallet_manager)?;
 
     let payer_provided = None;
-    let signer_info = default_signer.generate_unique_signers(
-        vec![payer_provided, authorized],
-        matches,
-        wallet_manager,
-    )?;
+    let mut signers = vec![payer_provided, authorized];
+
+    let new_authorized_pubkey = if checked {
+        let (new_authorized_signer, new_authorized_pubkey) =
+            signer_of(matches, "new_authorized", wallet_manager)?;
+        signers.push(new_authorized_signer);
+        new_authorized_pubkey.unwrap()
+    } else {
+        pubkey_of_signer(matches, "new_authorized_pubkey", wallet_manager)?.unwrap()
+    };
+
+    let signer_info = default_signer.generate_unique_signers(signers, matches, wallet_manager)?;
     let memo = matches.value_of(MEMO_ARG.name).map(String::from);
 
     Ok(CliCommandInfo {
@@ -332,6 +396,12 @@ pub fn parse_vote_authorize(
             new_authorized_pubkey,
             vote_authorize,
             memo,
+            authorized: signer_info.index_of(authorized_pubkey).unwrap(),
+            new_authorized: if checked {
+                signer_info.index_of(Some(new_authorized_pubkey))
+            } else {
+                None
+            },
         },
         signers: signer_info.signers,
     })
@@ -468,7 +538,7 @@ pub fn process_create_vote_account(
     let vote_account = config.signers[vote_account];
     let vote_account_pubkey = vote_account.pubkey();
     let vote_account_address = if let Some(seed) = seed {
-        Pubkey::create_with_seed(&vote_account_pubkey, &seed, &solana_vote_program::id())?
+        Pubkey::create_with_seed(&vote_account_pubkey, seed, &solana_vote_program::id())?
     } else {
         vote_account_pubkey
     };
@@ -549,7 +619,7 @@ pub fn process_create_vote_account(
     let mut tx = Transaction::new_unsigned(message);
     tx.try_sign(&config.signers, recent_blockhash)?;
     let result = rpc_client.send_and_confirm_transaction_with_spinner(&tx);
-    log_instruction_custom_error::<SystemError>(result, &config)
+    log_instruction_custom_error::<SystemError>(result, config)
 }
 
 pub fn process_vote_authorize(
@@ -558,28 +628,34 @@ pub fn process_vote_authorize(
     vote_account_pubkey: &Pubkey,
     new_authorized_pubkey: &Pubkey,
     vote_authorize: VoteAuthorize,
+    authorized: SignerIndex,
+    new_authorized: Option<SignerIndex>,
     memo: Option<&String>,
 ) -> ProcessResult {
-    // If the `authorized_account` is also the fee payer, `config.signers` will only have one
-    // keypair in it
-    let authorized = if config.signers.len() == 2 {
-        config.signers[1]
-    } else {
-        config.signers[0]
-    };
+    let authorized = config.signers[authorized];
+    let new_authorized_signer = new_authorized.map(|index| config.signers[index]);
 
     check_unique_pubkeys(
         (&authorized.pubkey(), "authorized_account".to_string()),
         (new_authorized_pubkey, "new_authorized_pubkey".to_string()),
     )?;
     let (recent_blockhash, fee_calculator) = rpc_client.get_recent_blockhash()?;
-    let ixs = vec![vote_instruction::authorize(
-        vote_account_pubkey,   // vote account to update
-        &authorized.pubkey(),  // current authorized
-        new_authorized_pubkey, // new vote signer/withdrawer
-        vote_authorize,        // vote or withdraw
-    )]
-    .with_memo(memo);
+    let vote_ix = if new_authorized_signer.is_some() {
+        vote_instruction::authorize_checked(
+            vote_account_pubkey,   // vote account to update
+            &authorized.pubkey(),  // current authorized
+            new_authorized_pubkey, // new vote signer/withdrawer
+            vote_authorize,        // vote or withdraw
+        )
+    } else {
+        vote_instruction::authorize(
+            vote_account_pubkey,   // vote account to update
+            &authorized.pubkey(),  // current authorized
+            new_authorized_pubkey, // new vote signer/withdrawer
+            vote_authorize,        // vote or withdraw
+        )
+    };
+    let ixs = vec![vote_ix].with_memo(memo);
 
     let message = Message::new(&ixs, Some(&config.signers[0].pubkey()));
     let mut tx = Transaction::new_unsigned(message);
@@ -592,7 +668,7 @@ pub fn process_vote_authorize(
         config.commitment,
     )?;
     let result = rpc_client.send_and_confirm_transaction_with_spinner(&tx);
-    log_instruction_custom_error::<VoteError>(result, &config)
+    log_instruction_custom_error::<VoteError>(result, config)
 }
 
 pub fn process_vote_update_validator(
@@ -629,7 +705,7 @@ pub fn process_vote_update_validator(
         config.commitment,
     )?;
     let result = rpc_client.send_and_confirm_transaction_with_spinner(&tx);
-    log_instruction_custom_error::<VoteError>(result, &config)
+    log_instruction_custom_error::<VoteError>(result, config)
 }
 
 pub fn process_vote_update_commission(
@@ -660,7 +736,7 @@ pub fn process_vote_update_commission(
         config.commitment,
     )?;
     let result = rpc_client.send_and_confirm_transaction_with_spinner(&tx);
-    log_instruction_custom_error::<VoteError>(result, &config)
+    log_instruction_custom_error::<VoteError>(result, config)
 }
 
 fn get_vote_account(
@@ -763,7 +839,7 @@ pub fn process_withdraw_from_vote_account(
     let (recent_blockhash, fee_calculator) = rpc_client.get_recent_blockhash()?;
     let withdraw_authority = config.signers[withdraw_authority];
 
-    let current_balance = rpc_client.get_balance(&vote_account_pubkey)?;
+    let current_balance = rpc_client.get_balance(vote_account_pubkey)?;
     let minimum_balance = rpc_client.get_minimum_balance_for_rent_exemption(VoteState::size_of())?;
 
     let lamports = match withdraw_amount {
@@ -798,13 +874,13 @@ pub fn process_withdraw_from_vote_account(
         config.commitment,
     )?;
     let result = rpc_client.send_and_confirm_transaction_with_spinner(&transaction);
-    log_instruction_custom_error::<VoteError>(result, &config)
+    log_instruction_custom_error::<VoteError>(result, config)
 }
 
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::cli::{app, parse_command};
+    use crate::{clap_app::get_clap_app, cli::parse_command};
     use solana_sdk::signature::{read_keypair_file, write_keypair, Keypair, Signer};
     use tempfile::NamedTempFile;
 
@@ -815,7 +891,7 @@ mod tests {
 
     #[test]
     fn test_parse_command() {
-        let test_commands = app("test", "desc", "version");
+        let test_commands = get_clap_app("test", "desc", "version");
         let keypair = Keypair::new();
         let pubkey = keypair.pubkey();
         let pubkey_string = pubkey.to_string();
@@ -826,7 +902,7 @@ mod tests {
         let default_keypair = Keypair::new();
         let (default_keypair_file, mut tmp_file) = make_tmp_file();
         write_keypair(&default_keypair, tmp_file.as_file_mut()).unwrap();
-        let default_signer = DefaultSigner::new(default_keypair_file.clone());
+        let default_signer = DefaultSigner::new("", &default_keypair_file);
 
         let test_authorize_voter = test_commands.clone().get_matches_from(vec![
             "test",
@@ -843,6 +919,8 @@ mod tests {
                     new_authorized_pubkey: pubkey2,
                     vote_authorize: VoteAuthorize::Voter,
                     memo: None,
+                    authorized: 0,
+                    new_authorized: None,
                 },
                 signers: vec![read_keypair_file(&default_keypair_file).unwrap().into()],
             }
@@ -867,14 +945,80 @@ mod tests {
                     new_authorized_pubkey: pubkey2,
                     vote_authorize: VoteAuthorize::Voter,
                     memo: None,
+                    authorized: 1,
+                    new_authorized: None,
+                },
+                signers: vec![
+                    read_keypair_file(&default_keypair_file).unwrap().into(),
+                    read_keypair_file(&authorized_keypair_file).unwrap().into(),
+                ],
+            }
+        );
+
+        let (voter_keypair_file, mut tmp_file) = make_tmp_file();
+        let voter_keypair = Keypair::new();
+        write_keypair(&voter_keypair, tmp_file.as_file_mut()).unwrap();
+
+        let test_authorize_voter = test_commands.clone().get_matches_from(vec![
+            "test",
+            "vote-authorize-voter-checked",
+            &pubkey_string,
+            &default_keypair_file,
+            &voter_keypair_file,
+        ]);
+        assert_eq!(
+            parse_command(&test_authorize_voter, &default_signer, &mut None).unwrap(),
+            CliCommandInfo {
+                command: CliCommand::VoteAuthorize {
+                    vote_account_pubkey: pubkey,
+                    new_authorized_pubkey: voter_keypair.pubkey(),
+                    vote_authorize: VoteAuthorize::Voter,
+                    memo: None,
+                    authorized: 0,
+                    new_authorized: Some(1),
+                },
+                signers: vec![
+                    read_keypair_file(&default_keypair_file).unwrap().into(),
+                    read_keypair_file(&voter_keypair_file).unwrap().into()
+                ],
+            }
+        );
+
+        let test_authorize_voter = test_commands.clone().get_matches_from(vec![
+            "test",
+            "vote-authorize-voter-checked",
+            &pubkey_string,
+            &authorized_keypair_file,
+            &voter_keypair_file,
+        ]);
+        assert_eq!(
+            parse_command(&test_authorize_voter, &default_signer, &mut None).unwrap(),
+            CliCommandInfo {
+                command: CliCommand::VoteAuthorize {
+                    vote_account_pubkey: pubkey,
+                    new_authorized_pubkey: voter_keypair.pubkey(),
+                    vote_authorize: VoteAuthorize::Voter,
+                    memo: None,
+                    authorized: 1,
+                    new_authorized: Some(2),
                 },
                 signers: vec![
                     read_keypair_file(&default_keypair_file).unwrap().into(),
                     read_keypair_file(&authorized_keypair_file).unwrap().into(),
+                    read_keypair_file(&voter_keypair_file).unwrap().into(),
                 ],
             }
         );
 
+        let test_authorize_voter = test_commands.clone().get_matches_from(vec![
+            "test",
+            "vote-authorize-voter-checked",
+            &pubkey_string,
+            &authorized_keypair_file,
+            &pubkey2_string,
+        ]);
+        assert!(parse_command(&test_authorize_voter, &default_signer, &mut None).is_err());
+
         let (keypair_file, mut tmp_file) = make_tmp_file();
         let keypair = Keypair::new();
         write_keypair(&keypair, tmp_file.as_file_mut()).unwrap();
diff --git a/cli/src/wallet.rs b/cli/src/wallet.rs
new file mode 100644
index 00000000000000..f375562588d2c1
--- /dev/null
+++ b/cli/src/wallet.rs
@@ -0,0 +1,744 @@
+use crate::{
+    cli::{
+        log_instruction_custom_error, request_and_confirm_airdrop, CliCommand, CliCommandInfo,
+        CliConfig, CliError, ProcessResult,
+    },
+    memo::WithMemo,
+    nonce::check_nonce_account,
+    spend_utils::{resolve_spend_tx_and_check_account_balances, SpendAmount},
+};
+use clap::{value_t_or_exit, App, Arg, ArgMatches, SubCommand};
+use solana_account_decoder::{UiAccount, UiAccountEncoding};
+use solana_clap_utils::{
+    fee_payer::*,
+    input_parsers::*,
+    input_validators::*,
+    keypair::{DefaultSigner, SignerIndex},
+    memo::*,
+    nonce::*,
+    offline::*,
+};
+use solana_cli_output::{
+    display::build_balance_message, return_signers_with_config, CliAccount,
+    CliSignatureVerificationStatus, CliTransaction, CliTransactionConfirmation, OutputFormat,
+    ReturnSignersConfig,
+};
+use solana_client::{
+    blockhash_query::BlockhashQuery, nonce_utils, rpc_client::RpcClient,
+    rpc_config::RpcTransactionConfig, rpc_response::RpcKeyedAccount,
+};
+use solana_remote_wallet::remote_wallet::RemoteWalletManager;
+use solana_sdk::{
+    commitment_config::CommitmentConfig,
+    message::Message,
+    pubkey::Pubkey,
+    signature::Signature,
+    stake,
+    system_instruction::{self, SystemError},
+    system_program,
+    transaction::Transaction,
+};
+use solana_transaction_status::{EncodedTransaction, UiTransactionEncoding};
+use std::{fmt::Write as FmtWrite, fs::File, io::Write, sync::Arc};
+
+pub trait WalletSubCommands {
+    fn wallet_subcommands(self) -> Self;
+}
+
+impl WalletSubCommands for App<'_, '_> {
+    fn wallet_subcommands(self) -> Self {
+        self.subcommand(
+            SubCommand::with_name("account")
+                .about("Show the contents of an account")
+                .alias("account")
+                .arg(
+                    pubkey!(Arg::with_name("account_pubkey")
+                        .index(1)
+                        .value_name("ACCOUNT_ADDRESS")
+                        .required(true),
+                        "Account key URI. ")
+                )
+                .arg(
+                    Arg::with_name("output_file")
+                        .long("output-file")
+                        .short("o")
+                        .value_name("FILEPATH")
+                        .takes_value(true)
+                        .help("Write the account data to this file"),
+                )
+                .arg(
+                    Arg::with_name("lamports")
+                        .long("lamports")
+                        .takes_value(false)
+                        .help("Display balance in lamports instead of SOL"),
+                ),
+        )
+        .subcommand(
+            SubCommand::with_name("address")
+                .about("Get your public key")
+                .arg(
+                    Arg::with_name("confirm_key")
+                        .long("confirm-key")
+                        .takes_value(false)
+                        .help("Confirm key on device; only relevant if using remote wallet"),
+                ),
+        )
+        .subcommand(
+            SubCommand::with_name("airdrop")
+                .about("Request SOL from a faucet")
+                .arg(
+                    Arg::with_name("amount")
+                        .index(1)
+                        .value_name("AMOUNT")
+                        .takes_value(true)
+                        .validator(is_amount)
+                        .required(true)
+                        .help("The airdrop amount to request, in SOL"),
+                )
+                .arg(
+                    pubkey!(Arg::with_name("to")
+                        .index(2)
+                        .value_name("RECIPIENT_ADDRESS"),
+                        "The account address of airdrop recipient. "),
+                ),
+        )
+        .subcommand(
+            SubCommand::with_name("balance")
+                .about("Get your balance")
+                .arg(
+                    pubkey!(Arg::with_name("pubkey")
+                        .index(1)
+                        .value_name("ACCOUNT_ADDRESS"),
+                        "The account address of the balance to check. ")
+                )
+                .arg(
+                    Arg::with_name("lamports")
+                        .long("lamports")
+                        .takes_value(false)
+                        .help("Display balance in lamports instead of SOL"),
+                ),
+        )
+        .subcommand(
+            SubCommand::with_name("confirm")
+                .about("Confirm transaction by signature")
+                .arg(
+                    Arg::with_name("signature")
+                        .index(1)
+                        .value_name("TRANSACTION_SIGNATURE")
+                        .takes_value(true)
+                        .required(true)
+                        .help("The transaction signature to confirm"),
+                )
+                .after_help(// Formatted specifically for the manually-indented heredoc string
+                   "Note: This will show more detailed information for finalized transactions with verbose mode (-v/--verbose).\
+                  \n\
+                  \nAccount modes:\
+                  \n  |srwx|\
+                  \n    s: signed\
+                  \n    r: readable (always true)\
+                  \n    w: writable\
+                  \n    x: program account (inner instructions excluded)\
+                   "
+                ),
+        )
+        .subcommand(
+            SubCommand::with_name("create-address-with-seed")
+                .about("Generate a derived account address with a seed")
+                .arg(
+                    Arg::with_name("seed")
+                        .index(1)
+                        .value_name("SEED_STRING")
+                        .takes_value(true)
+                        .required(true)
+                        .validator(is_derived_address_seed)
+                        .help("The seed.  Must not take more than 32 bytes to encode as utf-8"),
+                )
+                .arg(
+                    Arg::with_name("program_id")
+                        .index(2)
+                        .value_name("PROGRAM_ID")
+                        .takes_value(true)
+                        .required(true)
+                        .help(
+                            "The program_id that the address will ultimately be used for, \n\
+                             or one of NONCE, STAKE, and VOTE keywords",
+                        ),
+                )
+                .arg(
+                    pubkey!(Arg::with_name("from")
+                        .long("from")
+                        .value_name("FROM_PUBKEY")
+                        .required(false),
+                        "From (base) key, [default: cli config keypair]. "),
+                ),
+        )
+        .subcommand(
+            SubCommand::with_name("decode-transaction")
+                .about("Decode a serialized transaction")
+                .arg(
+                    Arg::with_name("transaction")
+                        .index(1)
+                        .value_name("TRANSACTION")
+                        .takes_value(true)
+                        .required(true)
+                        .help("transaction to decode"),
+                )
+                .arg(
+                    Arg::with_name("encoding")
+                        .index(2)
+                        .value_name("ENCODING")
+                        .possible_values(&["base58", "base64"]) // Subset of `UiTransactionEncoding` enum
+                        .default_value("base58")
+                        .takes_value(true)
+                        .required(true)
+                        .help("transaction encoding"),
+                ),
+        )
+        .subcommand(
+            SubCommand::with_name("resolve-signer")
+                .about("Checks that a signer is valid, and returns its specific path; useful for signers that may be specified generally, eg. usb://ledger")
+                .arg(
+                    Arg::with_name("signer")
+                        .index(1)
+                        .value_name("SIGNER_KEYPAIR")
+                        .takes_value(true)
+                        .required(true)
+                        .validator(is_valid_signer)
+                        .help("The signer path to resolve")
+                )
+        )
+        .subcommand(
+            SubCommand::with_name("transfer")
+                .about("Transfer funds between system accounts")
+                .alias("pay")
+                .arg(
+                    pubkey!(Arg::with_name("to")
+                        .index(1)
+                        .value_name("RECIPIENT_ADDRESS")
+                        .required(true),
+                        "The account address of recipient. "),
+                )
+                .arg(
+                    Arg::with_name("amount")
+                        .index(2)
+                        .value_name("AMOUNT")
+                        .takes_value(true)
+                        .validator(is_amount_or_all)
+                        .required(true)
+                        .help("The amount to send, in SOL; accepts keyword ALL"),
+                )
+                .arg(
+                    pubkey!(Arg::with_name("from")
+                        .long("from")
+                        .value_name("FROM_ADDRESS"),
+                        "Source account of funds (if different from client local account). "),
+                )
+                .arg(
+                    Arg::with_name("no_wait")
+                        .long("no-wait")
+                        .takes_value(false)
+                        .help("Return signature immediately after submitting the transaction, instead of waiting for confirmations"),
+                )
+                .arg(
+                    Arg::with_name("derived_address_seed")
+                        .long("derived-address-seed")
+                        .takes_value(true)
+                        .value_name("SEED_STRING")
+                        .requires("derived_address_program_id")
+                        .validator(is_derived_address_seed)
+                        .hidden(true)
+                )
+                .arg(
+                    Arg::with_name("derived_address_program_id")
+                        .long("derived-address-program-id")
+                        .takes_value(true)
+                        .value_name("PROGRAM_ID")
+                        .requires("derived_address_seed")
+                        .hidden(true)
+                )
+                .arg(
+                    Arg::with_name("allow_unfunded_recipient")
+                        .long("allow-unfunded-recipient")
+                        .takes_value(false)
+                        .help("Complete the transfer even if the recipient address is not funded")
+                )
+                .offline_args()
+                .nonce_args(false)
+                .arg(memo_arg())
+                .arg(fee_payer_arg()),
+        )
+    }
+}
+
+fn resolve_derived_address_program_id(matches: &ArgMatches<'_>, arg_name: &str) -> Option<Pubkey> {
+    matches.value_of(arg_name).and_then(|v| match v {
+        "NONCE" => Some(system_program::id()),
+        "STAKE" => Some(stake::program::id()),
+        "VOTE" => Some(solana_vote_program::id()),
+        _ => pubkey_of(matches, arg_name),
+    })
+}
+
+pub fn parse_account(
+    matches: &ArgMatches<'_>,
+    wallet_manager: &mut Option<Arc<RemoteWalletManager>>,
+) -> Result<CliCommandInfo, CliError> {
+    let account_pubkey = pubkey_of_signer(matches, "account_pubkey", wallet_manager)?.unwrap();
+    let output_file = matches.value_of("output_file");
+    let use_lamports_unit = matches.is_present("lamports");
+    Ok(CliCommandInfo {
+        command: CliCommand::ShowAccount {
+            pubkey: account_pubkey,
+            output_file: output_file.map(ToString::to_string),
+            use_lamports_unit,
+        },
+        signers: vec![],
+    })
+}
+
+pub fn parse_airdrop(
+    matches: &ArgMatches<'_>,
+    default_signer: &DefaultSigner,
+    wallet_manager: &mut Option<Arc<RemoteWalletManager>>,
+) -> Result<CliCommandInfo, CliError> {
+    let pubkey = pubkey_of_signer(matches, "to", wallet_manager)?;
+    let signers = if pubkey.is_some() {
+        vec![]
+    } else {
+        vec![default_signer.signer_from_path(matches, wallet_manager)?]
+    };
+    let lamports = lamports_of_sol(matches, "amount").unwrap();
+    Ok(CliCommandInfo {
+        command: CliCommand::Airdrop { pubkey, lamports },
+        signers,
+    })
+}
+
+pub fn parse_balance(
+    matches: &ArgMatches<'_>,
+    default_signer: &DefaultSigner,
+    wallet_manager: &mut Option<Arc<RemoteWalletManager>>,
+) -> Result<CliCommandInfo, CliError> {
+    let pubkey = pubkey_of_signer(matches, "pubkey", wallet_manager)?;
+    let signers = if pubkey.is_some() {
+        vec![]
+    } else {
+        vec![default_signer.signer_from_path(matches, wallet_manager)?]
+    };
+    Ok(CliCommandInfo {
+        command: CliCommand::Balance {
+            pubkey,
+            use_lamports_unit: matches.is_present("lamports"),
+        },
+        signers,
+    })
+}
+
+pub fn parse_decode_transaction(matches: &ArgMatches<'_>) -> Result<CliCommandInfo, CliError> {
+    let blob = value_t_or_exit!(matches, "transaction", String);
+    let encoding = match matches.value_of("encoding").unwrap() {
+        "base58" => UiTransactionEncoding::Base58,
+        "base64" => UiTransactionEncoding::Base64,
+        _ => unreachable!(),
+    };
+
+    let encoded_transaction = EncodedTransaction::Binary(blob, encoding);
+    if let Some(transaction) = encoded_transaction.decode() {
+        Ok(CliCommandInfo {
+            command: CliCommand::DecodeTransaction(transaction),
+            signers: vec![],
+        })
+    } else {
+        Err(CliError::BadParameter(
+            "Unable to decode transaction".to_string(),
+        ))
+    }
+}
+
+pub fn parse_create_address_with_seed(
+    matches: &ArgMatches<'_>,
+    default_signer: &DefaultSigner,
+    wallet_manager: &mut Option<Arc<RemoteWalletManager>>,
+) -> Result<CliCommandInfo, CliError> {
+    let from_pubkey = pubkey_of_signer(matches, "from", wallet_manager)?;
+    let signers = if from_pubkey.is_some() {
+        vec![]
+    } else {
+        vec![default_signer.signer_from_path(matches, wallet_manager)?]
+    };
+
+    let program_id = resolve_derived_address_program_id(matches, "program_id").unwrap();
+
+    let seed = matches.value_of("seed").unwrap().to_string();
+
+    Ok(CliCommandInfo {
+        command: CliCommand::CreateAddressWithSeed {
+            from_pubkey,
+            seed,
+            program_id,
+        },
+        signers,
+    })
+}
+
+pub fn parse_transfer(
+    matches: &ArgMatches<'_>,
+    default_signer: &DefaultSigner,
+    wallet_manager: &mut Option<Arc<RemoteWalletManager>>,
+) -> Result<CliCommandInfo, CliError> {
+    let amount = SpendAmount::new_from_matches(matches, "amount");
+    let to = pubkey_of_signer(matches, "to", wallet_manager)?.unwrap();
+    let sign_only = matches.is_present(SIGN_ONLY_ARG.name);
+    let dump_transaction_message = matches.is_present(DUMP_TRANSACTION_MESSAGE.name);
+    let no_wait = matches.is_present("no_wait");
+    let blockhash_query = BlockhashQuery::new_from_matches(matches);
+    let nonce_account = pubkey_of_signer(matches, NONCE_ARG.name, wallet_manager)?;
+    let (nonce_authority, nonce_authority_pubkey) =
+        signer_of(matches, NONCE_AUTHORITY_ARG.name, wallet_manager)?;
+    let memo = matches.value_of(MEMO_ARG.name).map(String::from);
+    let (fee_payer, fee_payer_pubkey) = signer_of(matches, FEE_PAYER_ARG.name, wallet_manager)?;
+    let (from, from_pubkey) = signer_of(matches, "from", wallet_manager)?;
+    let allow_unfunded_recipient = matches.is_present("allow_unfunded_recipient");
+
+    let mut bulk_signers = vec![fee_payer, from];
+    if nonce_account.is_some() {
+        bulk_signers.push(nonce_authority);
+    }
+
+    let signer_info =
+        default_signer.generate_unique_signers(bulk_signers, matches, wallet_manager)?;
+
+    let derived_address_seed = matches
+        .value_of("derived_address_seed")
+        .map(|s| s.to_string());
+    let derived_address_program_id =
+        resolve_derived_address_program_id(matches, "derived_address_program_id");
+
+    Ok(CliCommandInfo {
+        command: CliCommand::Transfer {
+            amount,
+            to,
+            sign_only,
+            dump_transaction_message,
+            allow_unfunded_recipient,
+            no_wait,
+            blockhash_query,
+            nonce_account,
+            nonce_authority: signer_info.index_of(nonce_authority_pubkey).unwrap(),
+            memo,
+            fee_payer: signer_info.index_of(fee_payer_pubkey).unwrap(),
+            from: signer_info.index_of(from_pubkey).unwrap(),
+            derived_address_seed,
+            derived_address_program_id,
+        },
+        signers: signer_info.signers,
+    })
+}
+
+pub fn process_show_account(
+    rpc_client: &RpcClient,
+    config: &CliConfig,
+    account_pubkey: &Pubkey,
+    output_file: &Option<String>,
+    use_lamports_unit: bool,
+) -> ProcessResult {
+    let account = rpc_client.get_account(account_pubkey)?;
+    let data = account.data.clone();
+    let cli_account = CliAccount {
+        keyed_account: RpcKeyedAccount {
+            pubkey: account_pubkey.to_string(),
+            account: UiAccount::encode(
+                account_pubkey,
+                &account,
+                UiAccountEncoding::Base64,
+                None,
+                None,
+            ),
+        },
+        use_lamports_unit,
+    };
+
+    let mut account_string = config.output_format.formatted_string(&cli_account);
+
+    if config.output_format == OutputFormat::Display
+        || config.output_format == OutputFormat::DisplayVerbose
+    {
+        if let Some(output_file) = output_file {
+            let mut f = File::create(output_file)?;
+            f.write_all(&data)?;
+            writeln!(&mut account_string)?;
+            writeln!(&mut account_string, "Wrote account data to {}", output_file)?;
+        } else if !data.is_empty() {
+            use pretty_hex::*;
+            writeln!(&mut account_string, "{:?}", data.hex_dump())?;
+        }
+    }
+
+    Ok(account_string)
+}
+
+pub fn process_airdrop(
+    rpc_client: &RpcClient,
+    config: &CliConfig,
+    pubkey: &Option<Pubkey>,
+    lamports: u64,
+) -> ProcessResult {
+    let pubkey = if let Some(pubkey) = pubkey {
+        *pubkey
+    } else {
+        config.pubkey()?
+    };
+    println!(
+        "Requesting airdrop of {}",
+        build_balance_message(lamports, false, true),
+    );
+
+    let pre_balance = rpc_client.get_balance(&pubkey)?;
+
+    let result = request_and_confirm_airdrop(rpc_client, config, &pubkey, lamports);
+    if let Ok(signature) = result {
+        let signature_cli_message = log_instruction_custom_error::<SystemError>(result, config)?;
+        println!("{}", signature_cli_message);
+
+        let current_balance = rpc_client.get_balance(&pubkey)?;
+
+        if current_balance < pre_balance.saturating_add(lamports) {
+            println!("Balance unchanged");
+            println!("Run `solana confirm -v {:?}` for more info", signature);
+            Ok("".to_string())
+        } else {
+            Ok(build_balance_message(current_balance, false, true))
+        }
+    } else {
+        log_instruction_custom_error::<SystemError>(result, config)
+    }
+}
+
+pub fn process_balance(
+    rpc_client: &RpcClient,
+    config: &CliConfig,
+    pubkey: &Option<Pubkey>,
+    use_lamports_unit: bool,
+) -> ProcessResult {
+    let pubkey = if let Some(pubkey) = pubkey {
+        *pubkey
+    } else {
+        config.pubkey()?
+    };
+    let balance = rpc_client.get_balance(&pubkey)?;
+    Ok(build_balance_message(balance, use_lamports_unit, true))
+}
+
+pub fn process_confirm(
+    rpc_client: &RpcClient,
+    config: &CliConfig,
+    signature: &Signature,
+) -> ProcessResult {
+    match rpc_client.get_signature_statuses_with_history(&[*signature]) {
+        Ok(status) => {
+            let cli_transaction = if let Some(transaction_status) = &status.value[0] {
+                let mut transaction = None;
+                let mut get_transaction_error = None;
+                if config.verbose {
+                    match rpc_client.get_transaction_with_config(
+                        signature,
+                        RpcTransactionConfig {
+                            encoding: Some(UiTransactionEncoding::Base64),
+                            commitment: Some(CommitmentConfig::confirmed()),
+                        },
+                    ) {
+                        Ok(confirmed_transaction) => {
+                            let decoded_transaction = confirmed_transaction
+                                .transaction
+                                .transaction
+                                .decode()
+                                .expect("Successful decode");
+                            let json_transaction = EncodedTransaction::encode(
+                                decoded_transaction.clone(),
+                                UiTransactionEncoding::Json,
+                            );
+
+                            transaction = Some(CliTransaction {
+                                transaction: json_transaction,
+                                meta: confirmed_transaction.transaction.meta,
+                                block_time: confirmed_transaction.block_time,
+                                slot: Some(confirmed_transaction.slot),
+                                decoded_transaction,
+                                prefix: "  ".to_string(),
+                                sigverify_status: vec![],
+                            });
+                        }
+                        Err(err) => {
+                            get_transaction_error = Some(format!("{:?}", err));
+                        }
+                    }
+                }
+                CliTransactionConfirmation {
+                    confirmation_status: Some(transaction_status.confirmation_status()),
+                    transaction,
+                    get_transaction_error,
+                    err: transaction_status.err.clone(),
+                }
+            } else {
+                CliTransactionConfirmation {
+                    confirmation_status: None,
+                    transaction: None,
+                    get_transaction_error: None,
+                    err: None,
+                }
+            };
+            Ok(config.output_format.formatted_string(&cli_transaction))
+        }
+        Err(err) => Err(CliError::RpcRequestError(format!("Unable to confirm: {}", err)).into()),
+    }
+}
+
+#[allow(clippy::unnecessary_wraps)]
+pub fn process_decode_transaction(config: &CliConfig, transaction: &Transaction) -> ProcessResult {
+    let sigverify_status = CliSignatureVerificationStatus::verify_transaction(transaction);
+    let decode_transaction = CliTransaction {
+        decoded_transaction: transaction.clone(),
+        transaction: EncodedTransaction::encode(transaction.clone(), UiTransactionEncoding::Json),
+        meta: None,
+        block_time: None,
+        slot: None,
+        prefix: "".to_string(),
+        sigverify_status,
+    };
+    Ok(config.output_format.formatted_string(&decode_transaction))
+}
+
+pub fn process_create_address_with_seed(
+    config: &CliConfig,
+    from_pubkey: Option<&Pubkey>,
+    seed: &str,
+    program_id: &Pubkey,
+) -> ProcessResult {
+    let from_pubkey = if let Some(pubkey) = from_pubkey {
+        *pubkey
+    } else {
+        config.pubkey()?
+    };
+    let address = Pubkey::create_with_seed(&from_pubkey, seed, program_id)?;
+    Ok(address.to_string())
+}
+
+#[allow(clippy::too_many_arguments)]
+pub fn process_transfer(
+    rpc_client: &RpcClient,
+    config: &CliConfig,
+    amount: SpendAmount,
+    to: &Pubkey,
+    from: SignerIndex,
+    sign_only: bool,
+    dump_transaction_message: bool,
+    allow_unfunded_recipient: bool,
+    no_wait: bool,
+    blockhash_query: &BlockhashQuery,
+    nonce_account: Option<&Pubkey>,
+    nonce_authority: SignerIndex,
+    memo: Option<&String>,
+    fee_payer: SignerIndex,
+    derived_address_seed: Option<String>,
+    derived_address_program_id: Option<&Pubkey>,
+) -> ProcessResult {
+    let from = config.signers[from];
+    let mut from_pubkey = from.pubkey();
+
+    let (recent_blockhash, fee_calculator) =
+        blockhash_query.get_blockhash_and_fee_calculator(rpc_client, config.commitment)?;
+
+    if !sign_only && !allow_unfunded_recipient {
+        let recipient_balance = rpc_client
+            .get_balance_with_commitment(to, config.commitment)?
+            .value;
+        if recipient_balance == 0 {
+            return Err(format!(
+                "The recipient address ({}) is not funded. \
+                                Add `--allow-unfunded-recipient` to complete the transfer \
+                               ",
+                to
+            )
+            .into());
+        }
+    }
+
+    let nonce_authority = config.signers[nonce_authority];
+    let fee_payer = config.signers[fee_payer];
+
+    let derived_parts = derived_address_seed.zip(derived_address_program_id);
+    let with_seed = if let Some((seed, program_id)) = derived_parts {
+        let base_pubkey = from_pubkey;
+        from_pubkey = Pubkey::create_with_seed(&base_pubkey, &seed, program_id)?;
+        Some((base_pubkey, seed, program_id, from_pubkey))
+    } else {
+        None
+    };
+
+    let build_message = |lamports| {
+        let ixs = if let Some((base_pubkey, seed, program_id, from_pubkey)) = with_seed.as_ref() {
+            vec![system_instruction::transfer_with_seed(
+                from_pubkey,
+                base_pubkey,
+                seed.clone(),
+                program_id,
+                to,
+                lamports,
+            )]
+            .with_memo(memo)
+        } else {
+            vec![system_instruction::transfer(&from_pubkey, to, lamports)].with_memo(memo)
+        };
+
+        if let Some(nonce_account) = &nonce_account {
+            Message::new_with_nonce(
+                ixs,
+                Some(&fee_payer.pubkey()),
+                nonce_account,
+                &nonce_authority.pubkey(),
+            )
+        } else {
+            Message::new(&ixs, Some(&fee_payer.pubkey()))
+        }
+    };
+
+    let (message, _) = resolve_spend_tx_and_check_account_balances(
+        rpc_client,
+        sign_only,
+        amount,
+        &fee_calculator,
+        &from_pubkey,
+        &fee_payer.pubkey(),
+        build_message,
+        config.commitment,
+    )?;
+    let mut tx = Transaction::new_unsigned(message);
+
+    if sign_only {
+        tx.try_partial_sign(&config.signers, recent_blockhash)?;
+        return_signers_with_config(
+            &tx,
+            &config.output_format,
+            &ReturnSignersConfig {
+                dump_transaction_message,
+            },
+        )
+    } else {
+        if let Some(nonce_account) = &nonce_account {
+            let nonce_account = nonce_utils::get_account_with_commitment(
+                rpc_client,
+                nonce_account,
+                config.commitment,
+            )?;
+            check_nonce_account(&nonce_account, &nonce_authority.pubkey(), &recent_blockhash)?;
+        }
+
+        tx.try_sign(&config.signers, recent_blockhash)?;
+        let result = if no_wait {
+            rpc_client.send_transaction(&tx)
+        } else {
+            rpc_client.send_and_confirm_transaction_with_spinner(&tx)
+        };
+        log_instruction_custom_error::<SystemError>(result, config)
+    }
+}
diff --git a/cli/tests/nonce.rs b/cli/tests/nonce.rs
index 2e539934213c42..fe17bb811e2738 100644
--- a/cli/tests/nonce.rs
+++ b/cli/tests/nonce.rs
@@ -18,13 +18,15 @@ use solana_sdk::{
     signature::{keypair_from_seed, Keypair, Signer},
     system_program,
 };
+use solana_streamer::socket::SocketAddrSpace;
 
 #[test]
 fn test_nonce() {
     let mint_keypair = Keypair::new();
     let mint_pubkey = mint_keypair.pubkey();
     let faucet_addr = run_local_faucet(mint_keypair, None);
-    let test_validator = TestValidator::with_no_fees(mint_pubkey, Some(faucet_addr));
+    let test_validator =
+        TestValidator::with_no_fees(mint_pubkey, Some(faucet_addr), SocketAddrSpace::Unspecified);
 
     full_battery_tests(test_validator, None, false);
 }
@@ -34,7 +36,8 @@ fn test_nonce_with_seed() {
     let mint_keypair = Keypair::new();
     let mint_pubkey = mint_keypair.pubkey();
     let faucet_addr = run_local_faucet(mint_keypair, None);
-    let test_validator = TestValidator::with_no_fees(mint_pubkey, Some(faucet_addr));
+    let test_validator =
+        TestValidator::with_no_fees(mint_pubkey, Some(faucet_addr), SocketAddrSpace::Unspecified);
 
     full_battery_tests(test_validator, Some(String::from("seed")), false);
 }
@@ -44,7 +47,8 @@ fn test_nonce_with_authority() {
     let mint_keypair = Keypair::new();
     let mint_pubkey = mint_keypair.pubkey();
     let faucet_addr = run_local_faucet(mint_keypair, None);
-    let test_validator = TestValidator::with_no_fees(mint_pubkey, Some(faucet_addr));
+    let test_validator =
+        TestValidator::with_no_fees(mint_pubkey, Some(faucet_addr), SocketAddrSpace::Unspecified);
 
     full_battery_tests(test_validator, None, true);
 }
@@ -216,7 +220,12 @@ fn test_create_account_with_seed() {
     let mint_keypair = Keypair::new();
     let mint_pubkey = mint_keypair.pubkey();
     let faucet_addr = run_local_faucet(mint_keypair, None);
-    let test_validator = TestValidator::with_custom_fees(mint_pubkey, 1, Some(faucet_addr));
+    let test_validator = TestValidator::with_custom_fees(
+        mint_pubkey,
+        1,
+        Some(faucet_addr),
+        SocketAddrSpace::Unspecified,
+    );
 
     let offline_nonce_authority_signer = keypair_from_seed(&[1u8; 32]).unwrap();
     let online_nonce_creator_signer = keypair_from_seed(&[2u8; 32]).unwrap();
diff --git a/cli/tests/program.rs b/cli/tests/program.rs
index 5a83d0ea2409bc..1772bec05479f2 100644
--- a/cli/tests/program.rs
+++ b/cli/tests/program.rs
@@ -15,6 +15,7 @@ use solana_sdk::{
     pubkey::Pubkey,
     signature::{Keypair, Signer},
 };
+use solana_streamer::socket::SocketAddrSpace;
 use std::{env, fs::File, io::Read, path::PathBuf, str::FromStr};
 
 #[test]
@@ -30,7 +31,8 @@ fn test_cli_program_deploy_non_upgradeable() {
     let mint_keypair = Keypair::new();
     let mint_pubkey = mint_keypair.pubkey();
     let faucet_addr = run_local_faucet(mint_keypair, None);
-    let test_validator = TestValidator::with_no_fees(mint_pubkey, Some(faucet_addr));
+    let test_validator =
+        TestValidator::with_no_fees(mint_pubkey, Some(faucet_addr), SocketAddrSpace::Unspecified);
 
     let rpc_client =
         RpcClient::new_with_commitment(test_validator.rpc_url(), CommitmentConfig::processed());
@@ -68,7 +70,7 @@ fn test_cli_program_deploy_non_upgradeable() {
         .unwrap()
         .as_str()
         .unwrap();
-    let program_id = Pubkey::from_str(&program_id_str).unwrap();
+    let program_id = Pubkey::from_str(program_id_str).unwrap();
     let account0 = rpc_client.get_account(&program_id).unwrap();
     assert_eq!(account0.lamports, minimum_balance_for_rent_exemption);
     assert_eq!(account0.owner, bpf_loader::id());
@@ -146,7 +148,8 @@ fn test_cli_program_deploy_no_authority() {
     let mint_keypair = Keypair::new();
     let mint_pubkey = mint_keypair.pubkey();
     let faucet_addr = run_local_faucet(mint_keypair, None);
-    let test_validator = TestValidator::with_no_fees(mint_pubkey, Some(faucet_addr));
+    let test_validator =
+        TestValidator::with_no_fees(mint_pubkey, Some(faucet_addr), SocketAddrSpace::Unspecified);
 
     let rpc_client =
         RpcClient::new_with_commitment(test_validator.rpc_url(), CommitmentConfig::processed());
@@ -198,7 +201,7 @@ fn test_cli_program_deploy_no_authority() {
         .unwrap()
         .as_str()
         .unwrap();
-    let program_id = Pubkey::from_str(&program_id_str).unwrap();
+    let program_id = Pubkey::from_str(program_id_str).unwrap();
 
     // Attempt to upgrade the program
     config.signers = vec![&keypair, &upgrade_authority];
@@ -229,7 +232,8 @@ fn test_cli_program_deploy_with_authority() {
     let mint_keypair = Keypair::new();
     let mint_pubkey = mint_keypair.pubkey();
     let faucet_addr = run_local_faucet(mint_keypair, None);
-    let test_validator = TestValidator::with_no_fees(mint_pubkey, Some(faucet_addr));
+    let test_validator =
+        TestValidator::with_no_fees(mint_pubkey, Some(faucet_addr), SocketAddrSpace::Unspecified);
 
     let rpc_client =
         RpcClient::new_with_commitment(test_validator.rpc_url(), CommitmentConfig::processed());
@@ -284,7 +288,7 @@ fn test_cli_program_deploy_with_authority() {
         .unwrap();
     assert_eq!(
         program_keypair.pubkey(),
-        Pubkey::from_str(&program_pubkey_str).unwrap()
+        Pubkey::from_str(program_pubkey_str).unwrap()
     );
     let program_account = rpc_client.get_account(&program_keypair.pubkey()).unwrap();
     assert_eq!(program_account.lamports, minimum_balance_for_program);
@@ -328,7 +332,7 @@ fn test_cli_program_deploy_with_authority() {
         .unwrap()
         .as_str()
         .unwrap();
-    let program_pubkey = Pubkey::from_str(&program_pubkey_str).unwrap();
+    let program_pubkey = Pubkey::from_str(program_pubkey_str).unwrap();
     let program_account = rpc_client.get_account(&program_pubkey).unwrap();
     assert_eq!(program_account.lamports, minimum_balance_for_program);
     assert_eq!(program_account.owner, bpf_loader_upgradeable::id());
@@ -397,7 +401,7 @@ fn test_cli_program_deploy_with_authority() {
         .as_str()
         .unwrap();
     assert_eq!(
-        Pubkey::from_str(&new_upgrade_authority_str).unwrap(),
+        Pubkey::from_str(new_upgrade_authority_str).unwrap(),
         new_upgrade_authority.pubkey()
     );
 
@@ -452,7 +456,7 @@ fn test_cli_program_deploy_with_authority() {
         .unwrap();
     assert_eq!(
         new_upgrade_authority.pubkey(),
-        Pubkey::from_str(&authority_pubkey_str).unwrap()
+        Pubkey::from_str(authority_pubkey_str).unwrap()
     );
 
     // Set no authority
@@ -510,7 +514,7 @@ fn test_cli_program_deploy_with_authority() {
         .unwrap()
         .as_str()
         .unwrap();
-    let program_pubkey = Pubkey::from_str(&program_pubkey_str).unwrap();
+    let program_pubkey = Pubkey::from_str(program_pubkey_str).unwrap();
     let (programdata_pubkey, _) =
         Pubkey::find_program_address(&[program_pubkey.as_ref()], &bpf_loader_upgradeable::id());
     let programdata_account = rpc_client.get_account(&programdata_pubkey).unwrap();
@@ -557,7 +561,8 @@ fn test_cli_program_write_buffer() {
     let mint_keypair = Keypair::new();
     let mint_pubkey = mint_keypair.pubkey();
     let faucet_addr = run_local_faucet(mint_keypair, None);
-    let test_validator = TestValidator::with_no_fees(mint_pubkey, Some(faucet_addr));
+    let test_validator =
+        TestValidator::with_no_fees(mint_pubkey, Some(faucet_addr), SocketAddrSpace::Unspecified);
 
     let rpc_client =
         RpcClient::new_with_commitment(test_validator.rpc_url(), CommitmentConfig::processed());
@@ -606,7 +611,7 @@ fn test_cli_program_write_buffer() {
         .unwrap()
         .as_str()
         .unwrap();
-    let new_buffer_pubkey = Pubkey::from_str(&buffer_pubkey_str).unwrap();
+    let new_buffer_pubkey = Pubkey::from_str(buffer_pubkey_str).unwrap();
     let buffer_account = rpc_client.get_account(&new_buffer_pubkey).unwrap();
     assert_eq!(buffer_account.lamports, minimum_balance_for_buffer_default);
     assert_eq!(buffer_account.owner, bpf_loader_upgradeable::id());
@@ -641,7 +646,7 @@ fn test_cli_program_write_buffer() {
         .unwrap();
     assert_eq!(
         buffer_keypair.pubkey(),
-        Pubkey::from_str(&buffer_pubkey_str).unwrap()
+        Pubkey::from_str(buffer_pubkey_str).unwrap()
     );
     let buffer_account = rpc_client.get_account(&buffer_keypair.pubkey()).unwrap();
     assert_eq!(buffer_account.lamports, minimum_balance_for_buffer);
@@ -675,7 +680,7 @@ fn test_cli_program_write_buffer() {
         .unwrap();
     assert_eq!(
         keypair.pubkey(),
-        Pubkey::from_str(&authority_pubkey_str).unwrap()
+        Pubkey::from_str(authority_pubkey_str).unwrap()
     );
 
     // Specify buffer authority
@@ -700,7 +705,7 @@ fn test_cli_program_write_buffer() {
         .unwrap();
     assert_eq!(
         buffer_keypair.pubkey(),
-        Pubkey::from_str(&buffer_pubkey_str).unwrap()
+        Pubkey::from_str(buffer_pubkey_str).unwrap()
     );
     let buffer_account = rpc_client.get_account(&buffer_keypair.pubkey()).unwrap();
     assert_eq!(buffer_account.lamports, minimum_balance_for_buffer_default);
@@ -735,7 +740,7 @@ fn test_cli_program_write_buffer() {
         .unwrap()
         .as_str()
         .unwrap();
-    let buffer_pubkey = Pubkey::from_str(&buffer_pubkey_str).unwrap();
+    let buffer_pubkey = Pubkey::from_str(buffer_pubkey_str).unwrap();
     let buffer_account = rpc_client.get_account(&buffer_pubkey).unwrap();
     assert_eq!(buffer_account.lamports, minimum_balance_for_buffer_default);
     assert_eq!(buffer_account.owner, bpf_loader_upgradeable::id());
@@ -768,7 +773,7 @@ fn test_cli_program_write_buffer() {
         .unwrap();
     assert_eq!(
         authority_keypair.pubkey(),
-        Pubkey::from_str(&authority_pubkey_str).unwrap()
+        Pubkey::from_str(authority_pubkey_str).unwrap()
     );
 
     // Close buffer
@@ -806,7 +811,7 @@ fn test_cli_program_write_buffer() {
         .unwrap()
         .as_str()
         .unwrap();
-    let new_buffer_pubkey = Pubkey::from_str(&buffer_pubkey_str).unwrap();
+    let new_buffer_pubkey = Pubkey::from_str(buffer_pubkey_str).unwrap();
 
     // Close buffers and deposit default keypair
     let pre_lamports = rpc_client.get_account(&keypair.pubkey()).unwrap().lamports;
@@ -839,7 +844,8 @@ fn test_cli_program_set_buffer_authority() {
     let mint_keypair = Keypair::new();
     let mint_pubkey = mint_keypair.pubkey();
     let faucet_addr = run_local_faucet(mint_keypair, None);
-    let test_validator = TestValidator::with_no_fees(mint_pubkey, Some(faucet_addr));
+    let test_validator =
+        TestValidator::with_no_fees(mint_pubkey, Some(faucet_addr), SocketAddrSpace::Unspecified);
 
     let rpc_client =
         RpcClient::new_with_commitment(test_validator.rpc_url(), CommitmentConfig::processed());
@@ -901,7 +907,7 @@ fn test_cli_program_set_buffer_authority() {
         .as_str()
         .unwrap();
     assert_eq!(
-        Pubkey::from_str(&new_buffer_authority_str).unwrap(),
+        Pubkey::from_str(new_buffer_authority_str).unwrap(),
         new_buffer_authority.pubkey()
     );
     let buffer_account = rpc_client.get_account(&buffer_keypair.pubkey()).unwrap();
@@ -928,7 +934,7 @@ fn test_cli_program_set_buffer_authority() {
         .as_str()
         .unwrap();
     assert_eq!(
-        Pubkey::from_str(&buffer_authority_str).unwrap(),
+        Pubkey::from_str(buffer_authority_str).unwrap(),
         buffer_keypair.pubkey()
     );
     let buffer_account = rpc_client.get_account(&buffer_keypair.pubkey()).unwrap();
@@ -952,7 +958,8 @@ fn test_cli_program_mismatch_buffer_authority() {
     let mint_keypair = Keypair::new();
     let mint_pubkey = mint_keypair.pubkey();
     let faucet_addr = run_local_faucet(mint_keypair, None);
-    let test_validator = TestValidator::with_no_fees(mint_pubkey, Some(faucet_addr));
+    let test_validator =
+        TestValidator::with_no_fees(mint_pubkey, Some(faucet_addr), SocketAddrSpace::Unspecified);
 
     let rpc_client =
         RpcClient::new_with_commitment(test_validator.rpc_url(), CommitmentConfig::processed());
@@ -1041,7 +1048,8 @@ fn test_cli_program_show() {
     let mint_keypair = Keypair::new();
     let mint_pubkey = mint_keypair.pubkey();
     let faucet_addr = run_local_faucet(mint_keypair, None);
-    let test_validator = TestValidator::with_no_fees(mint_pubkey, Some(faucet_addr));
+    let test_validator =
+        TestValidator::with_no_fees(mint_pubkey, Some(faucet_addr), SocketAddrSpace::Unspecified);
 
     let rpc_client =
         RpcClient::new_with_commitment(test_validator.rpc_url(), CommitmentConfig::processed());
@@ -1101,7 +1109,7 @@ fn test_cli_program_show() {
         .unwrap();
     assert_eq!(
         buffer_keypair.pubkey(),
-        Pubkey::from_str(&address_str).unwrap()
+        Pubkey::from_str(address_str).unwrap()
     );
     let authority_str = json
         .as_object()
@@ -1112,7 +1120,7 @@ fn test_cli_program_show() {
         .unwrap();
     assert_eq!(
         authority_keypair.pubkey(),
-        Pubkey::from_str(&authority_str).unwrap()
+        Pubkey::from_str(authority_str).unwrap()
     );
     let data_len = json
         .as_object()
@@ -1161,7 +1169,7 @@ fn test_cli_program_show() {
         .unwrap();
     assert_eq!(
         program_keypair.pubkey(),
-        Pubkey::from_str(&address_str).unwrap()
+        Pubkey::from_str(address_str).unwrap()
     );
     let programdata_address_str = json
         .as_object()
@@ -1176,7 +1184,7 @@ fn test_cli_program_show() {
     );
     assert_eq!(
         programdata_pubkey,
-        Pubkey::from_str(&programdata_address_str).unwrap()
+        Pubkey::from_str(programdata_address_str).unwrap()
     );
     let authority_str = json
         .as_object()
@@ -1187,7 +1195,7 @@ fn test_cli_program_show() {
         .unwrap();
     assert_eq!(
         authority_keypair.pubkey(),
-        Pubkey::from_str(&authority_str).unwrap()
+        Pubkey::from_str(authority_str).unwrap()
     );
     let deployed_slot = json
         .as_object()
@@ -1221,7 +1229,8 @@ fn test_cli_program_dump() {
     let mint_keypair = Keypair::new();
     let mint_pubkey = mint_keypair.pubkey();
     let faucet_addr = run_local_faucet(mint_keypair, None);
-    let test_validator = TestValidator::with_no_fees(mint_pubkey, Some(faucet_addr));
+    let test_validator =
+        TestValidator::with_no_fees(mint_pubkey, Some(faucet_addr), SocketAddrSpace::Unspecified);
 
     let rpc_client =
         RpcClient::new_with_commitment(test_validator.rpc_url(), CommitmentConfig::processed());
diff --git a/cli/tests/request_airdrop.rs b/cli/tests/request_airdrop.rs
index 0787d7725d9e16..56444472bf27f4 100644
--- a/cli/tests/request_airdrop.rs
+++ b/cli/tests/request_airdrop.rs
@@ -6,13 +6,15 @@ use solana_sdk::{
     commitment_config::CommitmentConfig,
     signature::{Keypair, Signer},
 };
+use solana_streamer::socket::SocketAddrSpace;
 
 #[test]
 fn test_cli_request_airdrop() {
     let mint_keypair = Keypair::new();
     let mint_pubkey = mint_keypair.pubkey();
     let faucet_addr = run_local_faucet(mint_keypair, None);
-    let test_validator = TestValidator::with_no_fees(mint_pubkey, Some(faucet_addr));
+    let test_validator =
+        TestValidator::with_no_fees(mint_pubkey, Some(faucet_addr), SocketAddrSpace::Unspecified);
 
     let mut bob_config = CliConfig::recent_for_tests();
     bob_config.json_rpc_url = test_validator.rpc_url();
diff --git a/cli/tests/stake.rs b/cli/tests/stake.rs
index 51c3bd97705ff9..5e41030a53de4b 100644
--- a/cli/tests/stake.rs
+++ b/cli/tests/stake.rs
@@ -1,6 +1,7 @@
 use solana_cli::{
     cli::{process_command, request_and_confirm_airdrop, CliCommand, CliConfig},
     spend_utils::SpendAmount,
+    stake::StakeAuthorizationIndexed,
     test_utils::{check_ready, check_recent_balance},
 };
 use solana_cli_output::{parse_sign_only_reply_string, OutputFormat};
@@ -17,18 +18,21 @@ use solana_sdk::{
     nonce::State as NonceState,
     pubkey::Pubkey,
     signature::{keypair_from_seed, Keypair, Signer},
+    stake::{
+        self,
+        instruction::LockupArgs,
+        state::{Lockup, StakeAuthorize, StakeState},
+    },
 };
-use solana_stake_program::{
-    stake_instruction::LockupArgs,
-    stake_state::{Lockup, StakeAuthorize, StakeState},
-};
+use solana_streamer::socket::SocketAddrSpace;
 
 #[test]
 fn test_stake_delegation_force() {
     let mint_keypair = Keypair::new();
     let mint_pubkey = mint_keypair.pubkey();
     let faucet_addr = run_local_faucet(mint_keypair, None);
-    let test_validator = TestValidator::with_no_fees(mint_pubkey, Some(faucet_addr));
+    let test_validator =
+        TestValidator::with_no_fees(mint_pubkey, Some(faucet_addr), SocketAddrSpace::Unspecified);
 
     let rpc_client =
         RpcClient::new_with_commitment(test_validator.rpc_url(), CommitmentConfig::processed());
@@ -63,6 +67,7 @@ fn test_stake_delegation_force() {
         seed: None,
         staker: None,
         withdrawer: None,
+        withdrawer_signer: None,
         lockup: Lockup::default(),
         amount: SpendAmount::Some(50_000),
         sign_only: false,
@@ -117,7 +122,8 @@ fn test_seed_stake_delegation_and_deactivation() {
     let mint_keypair = Keypair::new();
     let mint_pubkey = mint_keypair.pubkey();
     let faucet_addr = run_local_faucet(mint_keypair, None);
-    let test_validator = TestValidator::with_no_fees(mint_pubkey, Some(faucet_addr));
+    let test_validator =
+        TestValidator::with_no_fees(mint_pubkey, Some(faucet_addr), SocketAddrSpace::Unspecified);
 
     let rpc_client =
         RpcClient::new_with_commitment(test_validator.rpc_url(), CommitmentConfig::processed());
@@ -139,7 +145,7 @@ fn test_seed_stake_delegation_and_deactivation() {
     let stake_address = Pubkey::create_with_seed(
         &config_validator.signers[0].pubkey(),
         "hi there",
-        &solana_stake_program::id(),
+        &stake::program::id(),
     )
     .expect("bad seed");
 
@@ -150,6 +156,7 @@ fn test_seed_stake_delegation_and_deactivation() {
         seed: Some("hi there".to_string()),
         staker: None,
         withdrawer: None,
+        withdrawer_signer: None,
         lockup: Lockup::default(),
         amount: SpendAmount::Some(50_000),
         sign_only: false,
@@ -202,7 +209,8 @@ fn test_stake_delegation_and_deactivation() {
     let mint_keypair = Keypair::new();
     let mint_pubkey = mint_keypair.pubkey();
     let faucet_addr = run_local_faucet(mint_keypair, None);
-    let test_validator = TestValidator::with_no_fees(mint_pubkey, Some(faucet_addr));
+    let test_validator =
+        TestValidator::with_no_fees(mint_pubkey, Some(faucet_addr), SocketAddrSpace::Unspecified);
 
     let rpc_client =
         RpcClient::new_with_commitment(test_validator.rpc_url(), CommitmentConfig::processed());
@@ -230,6 +238,7 @@ fn test_stake_delegation_and_deactivation() {
         seed: None,
         staker: None,
         withdrawer: None,
+        withdrawer_signer: None,
         lockup: Lockup::default(),
         amount: SpendAmount::Some(50_000),
         sign_only: false,
@@ -283,7 +292,8 @@ fn test_offline_stake_delegation_and_deactivation() {
     let mint_keypair = Keypair::new();
     let mint_pubkey = mint_keypair.pubkey();
     let faucet_addr = run_local_faucet(mint_keypair, None);
-    let test_validator = TestValidator::with_no_fees(mint_pubkey, Some(faucet_addr));
+    let test_validator =
+        TestValidator::with_no_fees(mint_pubkey, Some(faucet_addr), SocketAddrSpace::Unspecified);
 
     let rpc_client =
         RpcClient::new_with_commitment(test_validator.rpc_url(), CommitmentConfig::processed());
@@ -331,6 +341,7 @@ fn test_offline_stake_delegation_and_deactivation() {
         seed: None,
         staker: Some(config_offline.signers[0].pubkey()),
         withdrawer: None,
+        withdrawer_signer: None,
         lockup: Lockup::default(),
         amount: SpendAmount::Some(50_000),
         sign_only: false,
@@ -425,7 +436,8 @@ fn test_nonced_stake_delegation_and_deactivation() {
     let mint_keypair = Keypair::new();
     let mint_pubkey = mint_keypair.pubkey();
     let faucet_addr = run_local_faucet(mint_keypair, None);
-    let test_validator = TestValidator::with_no_fees(mint_pubkey, Some(faucet_addr));
+    let test_validator =
+        TestValidator::with_no_fees(mint_pubkey, Some(faucet_addr), SocketAddrSpace::Unspecified);
 
     let rpc_client =
         RpcClient::new_with_commitment(test_validator.rpc_url(), CommitmentConfig::processed());
@@ -450,6 +462,7 @@ fn test_nonced_stake_delegation_and_deactivation() {
         seed: None,
         staker: None,
         withdrawer: None,
+        withdrawer_signer: None,
         lockup: Lockup::default(),
         amount: SpendAmount::Some(50_000),
         sign_only: false,
@@ -541,7 +554,8 @@ fn test_stake_authorize() {
     let mint_keypair = Keypair::new();
     let mint_pubkey = mint_keypair.pubkey();
     let faucet_addr = run_local_faucet(mint_keypair, None);
-    let test_validator = TestValidator::with_no_fees(mint_pubkey, Some(faucet_addr));
+    let test_validator =
+        TestValidator::with_no_fees(mint_pubkey, Some(faucet_addr), SocketAddrSpace::Unspecified);
 
     let rpc_client =
         RpcClient::new_with_commitment(test_validator.rpc_url(), CommitmentConfig::processed());
@@ -580,6 +594,7 @@ fn test_stake_authorize() {
         seed: None,
         staker: None,
         withdrawer: None,
+        withdrawer_signer: None,
         lockup: Lockup::default(),
         amount: SpendAmount::Some(50_000),
         sign_only: false,
@@ -599,7 +614,12 @@ fn test_stake_authorize() {
     config.signers.pop();
     config.command = CliCommand::StakeAuthorize {
         stake_account_pubkey,
-        new_authorizations: vec![(StakeAuthorize::Staker, online_authority_pubkey, 0)],
+        new_authorizations: vec![StakeAuthorizationIndexed {
+            authorization_type: StakeAuthorize::Staker,
+            new_authority_pubkey: online_authority_pubkey,
+            authority: 0,
+            new_authority_signer: None,
+        }],
         sign_only: false,
         dump_transaction_message: false,
         blockhash_query: BlockhashQuery::default(),
@@ -628,8 +648,18 @@ fn test_stake_authorize() {
     config.command = CliCommand::StakeAuthorize {
         stake_account_pubkey,
         new_authorizations: vec![
-            (StakeAuthorize::Staker, online_authority2_pubkey, 1),
-            (StakeAuthorize::Withdrawer, withdraw_authority_pubkey, 0),
+            StakeAuthorizationIndexed {
+                authorization_type: StakeAuthorize::Staker,
+                new_authority_pubkey: online_authority2_pubkey,
+                authority: 1,
+                new_authority_signer: None,
+            },
+            StakeAuthorizationIndexed {
+                authorization_type: StakeAuthorize::Withdrawer,
+                new_authority_pubkey: withdraw_authority_pubkey,
+                authority: 0,
+                new_authority_signer: None,
+            },
         ],
         sign_only: false,
         dump_transaction_message: false,
@@ -656,7 +686,12 @@ fn test_stake_authorize() {
     config.signers.push(&online_authority2);
     config.command = CliCommand::StakeAuthorize {
         stake_account_pubkey,
-        new_authorizations: vec![(StakeAuthorize::Staker, offline_authority_pubkey, 1)],
+        new_authorizations: vec![StakeAuthorizationIndexed {
+            authorization_type: StakeAuthorize::Staker,
+            new_authority_pubkey: offline_authority_pubkey,
+            authority: 1,
+            new_authority_signer: None,
+        }],
         sign_only: false,
         dump_transaction_message: false,
         blockhash_query: BlockhashQuery::default(),
@@ -682,7 +717,12 @@ fn test_stake_authorize() {
     let (blockhash, _) = rpc_client.get_recent_blockhash().unwrap();
     config_offline.command = CliCommand::StakeAuthorize {
         stake_account_pubkey,
-        new_authorizations: vec![(StakeAuthorize::Staker, nonced_authority_pubkey, 0)],
+        new_authorizations: vec![StakeAuthorizationIndexed {
+            authorization_type: StakeAuthorize::Staker,
+            new_authority_pubkey: nonced_authority_pubkey,
+            authority: 0,
+            new_authority_signer: None,
+        }],
         sign_only: true,
         dump_transaction_message: false,
         blockhash_query: BlockhashQuery::None(blockhash),
@@ -701,7 +741,12 @@ fn test_stake_authorize() {
     config.signers = vec![&offline_presigner];
     config.command = CliCommand::StakeAuthorize {
         stake_account_pubkey,
-        new_authorizations: vec![(StakeAuthorize::Staker, nonced_authority_pubkey, 0)],
+        new_authorizations: vec![StakeAuthorizationIndexed {
+            authorization_type: StakeAuthorize::Staker,
+            new_authority_pubkey: nonced_authority_pubkey,
+            authority: 0,
+            new_authority_signer: None,
+        }],
         sign_only: false,
         dump_transaction_message: false,
         blockhash_query: BlockhashQuery::FeeCalculator(blockhash_query::Source::Cluster, blockhash),
@@ -752,7 +797,12 @@ fn test_stake_authorize() {
     config_offline.signers.push(&nonced_authority);
     config_offline.command = CliCommand::StakeAuthorize {
         stake_account_pubkey,
-        new_authorizations: vec![(StakeAuthorize::Staker, online_authority_pubkey, 1)],
+        new_authorizations: vec![StakeAuthorizationIndexed {
+            authorization_type: StakeAuthorize::Staker,
+            new_authority_pubkey: online_authority_pubkey,
+            authority: 1,
+            new_authority_signer: None,
+        }],
         sign_only: true,
         dump_transaction_message: false,
         blockhash_query: BlockhashQuery::None(nonce_hash),
@@ -772,7 +822,12 @@ fn test_stake_authorize() {
     config.signers = vec![&offline_presigner, &nonced_authority_presigner];
     config.command = CliCommand::StakeAuthorize {
         stake_account_pubkey,
-        new_authorizations: vec![(StakeAuthorize::Staker, online_authority_pubkey, 1)],
+        new_authorizations: vec![StakeAuthorizationIndexed {
+            authorization_type: StakeAuthorize::Staker,
+            new_authority_pubkey: online_authority_pubkey,
+            authority: 1,
+            new_authority_signer: None,
+        }],
         sign_only: false,
         dump_transaction_message: false,
         blockhash_query: BlockhashQuery::FeeCalculator(
@@ -814,7 +869,12 @@ fn test_stake_authorize_with_fee_payer() {
     let mint_keypair = Keypair::new();
     let mint_pubkey = mint_keypair.pubkey();
     let faucet_addr = run_local_faucet(mint_keypair, None);
-    let test_validator = TestValidator::with_custom_fees(mint_pubkey, SIG_FEE, Some(faucet_addr));
+    let test_validator = TestValidator::with_custom_fees(
+        mint_pubkey,
+        SIG_FEE,
+        Some(faucet_addr),
+        SocketAddrSpace::Unspecified,
+    );
 
     let rpc_client =
         RpcClient::new_with_commitment(test_validator.rpc_url(), CommitmentConfig::processed());
@@ -860,6 +920,7 @@ fn test_stake_authorize_with_fee_payer() {
         seed: None,
         staker: None,
         withdrawer: None,
+        withdrawer_signer: None,
         lockup: Lockup::default(),
         amount: SpendAmount::Some(50_000),
         sign_only: false,
@@ -879,7 +940,12 @@ fn test_stake_authorize_with_fee_payer() {
     config.signers = vec![&default_signer, &payer_keypair];
     config.command = CliCommand::StakeAuthorize {
         stake_account_pubkey,
-        new_authorizations: vec![(StakeAuthorize::Staker, offline_pubkey, 0)],
+        new_authorizations: vec![StakeAuthorizationIndexed {
+            authorization_type: StakeAuthorize::Staker,
+            new_authority_pubkey: offline_pubkey,
+            authority: 0,
+            new_authority_signer: None,
+        }],
         sign_only: false,
         dump_transaction_message: false,
         blockhash_query: BlockhashQuery::All(blockhash_query::Source::Cluster),
@@ -901,7 +967,12 @@ fn test_stake_authorize_with_fee_payer() {
     let (blockhash, _) = rpc_client.get_recent_blockhash().unwrap();
     config_offline.command = CliCommand::StakeAuthorize {
         stake_account_pubkey,
-        new_authorizations: vec![(StakeAuthorize::Staker, payer_pubkey, 0)],
+        new_authorizations: vec![StakeAuthorizationIndexed {
+            authorization_type: StakeAuthorize::Staker,
+            new_authority_pubkey: payer_pubkey,
+            authority: 0,
+            new_authority_signer: None,
+        }],
         sign_only: true,
         dump_transaction_message: false,
         blockhash_query: BlockhashQuery::None(blockhash),
@@ -920,7 +991,12 @@ fn test_stake_authorize_with_fee_payer() {
     config.signers = vec![&offline_presigner];
     config.command = CliCommand::StakeAuthorize {
         stake_account_pubkey,
-        new_authorizations: vec![(StakeAuthorize::Staker, payer_pubkey, 0)],
+        new_authorizations: vec![StakeAuthorizationIndexed {
+            authorization_type: StakeAuthorize::Staker,
+            new_authority_pubkey: payer_pubkey,
+            authority: 0,
+            new_authority_signer: None,
+        }],
         sign_only: false,
         dump_transaction_message: false,
         blockhash_query: BlockhashQuery::FeeCalculator(blockhash_query::Source::Cluster, blockhash),
@@ -946,7 +1022,12 @@ fn test_stake_split() {
     let mint_keypair = Keypair::new();
     let mint_pubkey = mint_keypair.pubkey();
     let faucet_addr = run_local_faucet(mint_keypair, None);
-    let test_validator = TestValidator::with_custom_fees(mint_pubkey, 1, Some(faucet_addr));
+    let test_validator = TestValidator::with_custom_fees(
+        mint_pubkey,
+        1,
+        Some(faucet_addr),
+        SocketAddrSpace::Unspecified,
+    );
 
     let rpc_client =
         RpcClient::new_with_commitment(test_validator.rpc_url(), CommitmentConfig::processed());
@@ -984,6 +1065,7 @@ fn test_stake_split() {
         seed: None,
         staker: Some(offline_pubkey),
         withdrawer: Some(offline_pubkey),
+        withdrawer_signer: None,
         lockup: Lockup::default(),
         amount: SpendAmount::Some(10 * minimum_stake_balance),
         sign_only: false,
@@ -1089,7 +1171,12 @@ fn test_stake_set_lockup() {
     let mint_keypair = Keypair::new();
     let mint_pubkey = mint_keypair.pubkey();
     let faucet_addr = run_local_faucet(mint_keypair, None);
-    let test_validator = TestValidator::with_custom_fees(mint_pubkey, 1, Some(faucet_addr));
+    let test_validator = TestValidator::with_custom_fees(
+        mint_pubkey,
+        1,
+        Some(faucet_addr),
+        SocketAddrSpace::Unspecified,
+    );
 
     let rpc_client =
         RpcClient::new_with_commitment(test_validator.rpc_url(), CommitmentConfig::processed());
@@ -1134,6 +1221,7 @@ fn test_stake_set_lockup() {
         seed: None,
         staker: Some(offline_pubkey),
         withdrawer: Some(config.signers[0].pubkey()),
+        withdrawer_signer: None,
         lockup,
         amount: SpendAmount::Some(10 * minimum_stake_balance),
         sign_only: false,
@@ -1162,6 +1250,7 @@ fn test_stake_set_lockup() {
     config.command = CliCommand::StakeSetLockup {
         stake_account_pubkey,
         lockup,
+        new_custodian_signer: None,
         custodian: 0,
         sign_only: false,
         dump_transaction_message: false,
@@ -1197,6 +1286,7 @@ fn test_stake_set_lockup() {
     config.command = CliCommand::StakeSetLockup {
         stake_account_pubkey,
         lockup,
+        new_custodian_signer: None,
         custodian: 0,
         sign_only: false,
         dump_transaction_message: false,
@@ -1217,6 +1307,7 @@ fn test_stake_set_lockup() {
     config.command = CliCommand::StakeSetLockup {
         stake_account_pubkey,
         lockup,
+        new_custodian_signer: None,
         custodian: 1,
         sign_only: false,
         dump_transaction_message: false,
@@ -1249,6 +1340,7 @@ fn test_stake_set_lockup() {
     config.command = CliCommand::StakeSetLockup {
         stake_account_pubkey,
         lockup,
+        new_custodian_signer: None,
         custodian: 1,
         sign_only: false,
         dump_transaction_message: false,
@@ -1296,6 +1388,7 @@ fn test_stake_set_lockup() {
     config_offline.command = CliCommand::StakeSetLockup {
         stake_account_pubkey,
         lockup,
+        new_custodian_signer: None,
         custodian: 0,
         sign_only: true,
         dump_transaction_message: false,
@@ -1314,6 +1407,7 @@ fn test_stake_set_lockup() {
     config.command = CliCommand::StakeSetLockup {
         stake_account_pubkey,
         lockup,
+        new_custodian_signer: None,
         custodian: 0,
         sign_only: false,
         dump_transaction_message: false,
@@ -1348,7 +1442,8 @@ fn test_offline_nonced_create_stake_account_and_withdraw() {
     let mint_keypair = Keypair::new();
     let mint_pubkey = mint_keypair.pubkey();
     let faucet_addr = run_local_faucet(mint_keypair, None);
-    let test_validator = TestValidator::with_no_fees(mint_pubkey, Some(faucet_addr));
+    let test_validator =
+        TestValidator::with_no_fees(mint_pubkey, Some(faucet_addr), SocketAddrSpace::Unspecified);
 
     let rpc_client =
         RpcClient::new_with_commitment(test_validator.rpc_url(), CommitmentConfig::processed());
@@ -1408,6 +1503,7 @@ fn test_offline_nonced_create_stake_account_and_withdraw() {
         seed: None,
         staker: None,
         withdrawer: None,
+        withdrawer_signer: None,
         lockup: Lockup::default(),
         amount: SpendAmount::Some(50_000),
         sign_only: true,
@@ -1431,6 +1527,7 @@ fn test_offline_nonced_create_stake_account_and_withdraw() {
         seed: None,
         staker: Some(offline_pubkey),
         withdrawer: None,
+        withdrawer_signer: None,
         lockup: Lockup::default(),
         amount: SpendAmount::Some(50_000),
         sign_only: false,
@@ -1520,6 +1617,7 @@ fn test_offline_nonced_create_stake_account_and_withdraw() {
         seed: Some(seed.to_string()),
         staker: None,
         withdrawer: None,
+        withdrawer_signer: None,
         lockup: Lockup::default(),
         amount: SpendAmount::Some(50_000),
         sign_only: true,
@@ -1541,6 +1639,7 @@ fn test_offline_nonced_create_stake_account_and_withdraw() {
         seed: Some(seed.to_string()),
         staker: Some(offline_pubkey),
         withdrawer: Some(offline_pubkey),
+        withdrawer_signer: None,
         lockup: Lockup::default(),
         amount: SpendAmount::Some(50_000),
         sign_only: false,
@@ -1557,6 +1656,232 @@ fn test_offline_nonced_create_stake_account_and_withdraw() {
     };
     process_command(&config).unwrap();
     let seed_address =
-        Pubkey::create_with_seed(&stake_pubkey, seed, &solana_stake_program::id()).unwrap();
+        Pubkey::create_with_seed(&stake_pubkey, seed, &stake::program::id()).unwrap();
     check_recent_balance(50_000, &rpc_client, &seed_address);
 }
+
+#[test]
+fn test_stake_checked_instructions() {
+    solana_logger::setup();
+
+    let mint_keypair = Keypair::new();
+    let mint_pubkey = mint_keypair.pubkey();
+    let faucet_addr = run_local_faucet(mint_keypair, None);
+    let test_validator =
+        TestValidator::with_no_fees(mint_pubkey, Some(faucet_addr), SocketAddrSpace::Unspecified);
+
+    let rpc_client =
+        RpcClient::new_with_commitment(test_validator.rpc_url(), CommitmentConfig::processed());
+    let default_signer = Keypair::new();
+
+    let mut config = CliConfig::recent_for_tests();
+    config.json_rpc_url = test_validator.rpc_url();
+    config.signers = vec![&default_signer];
+
+    request_and_confirm_airdrop(&rpc_client, &config, &config.signers[0].pubkey(), 100_000)
+        .unwrap();
+
+    // Create stake account with withdrawer
+    let stake_keypair = Keypair::new();
+    let stake_account_pubkey = stake_keypair.pubkey();
+    let withdrawer_keypair = Keypair::new();
+    let withdrawer_pubkey = withdrawer_keypair.pubkey();
+    config.signers.push(&stake_keypair);
+    config.command = CliCommand::CreateStakeAccount {
+        stake_account: 1,
+        seed: None,
+        staker: None,
+        withdrawer: Some(withdrawer_pubkey),
+        withdrawer_signer: Some(1),
+        lockup: Lockup::default(),
+        amount: SpendAmount::Some(50_000),
+        sign_only: false,
+        dump_transaction_message: false,
+        blockhash_query: BlockhashQuery::All(blockhash_query::Source::Cluster),
+        nonce_account: None,
+        nonce_authority: 0,
+        memo: None,
+        fee_payer: 0,
+        from: 0,
+    };
+    process_command(&config).unwrap_err(); // unsigned authority should fail
+
+    config.signers = vec![&default_signer, &stake_keypair, &withdrawer_keypair];
+    config.command = CliCommand::CreateStakeAccount {
+        stake_account: 1,
+        seed: None,
+        staker: None,
+        withdrawer: Some(withdrawer_pubkey),
+        withdrawer_signer: Some(1),
+        lockup: Lockup::default(),
+        amount: SpendAmount::Some(50_000),
+        sign_only: false,
+        dump_transaction_message: false,
+        blockhash_query: BlockhashQuery::All(blockhash_query::Source::Cluster),
+        nonce_account: None,
+        nonce_authority: 0,
+        memo: None,
+        fee_payer: 0,
+        from: 0,
+    };
+    process_command(&config).unwrap();
+
+    // Re-authorize account, checking new authority
+    let staker_keypair = Keypair::new();
+    let staker_pubkey = staker_keypair.pubkey();
+    config.signers = vec![&default_signer];
+    config.command = CliCommand::StakeAuthorize {
+        stake_account_pubkey,
+        new_authorizations: vec![StakeAuthorizationIndexed {
+            authorization_type: StakeAuthorize::Staker,
+            new_authority_pubkey: staker_pubkey,
+            authority: 0,
+            new_authority_signer: Some(0),
+        }],
+        sign_only: false,
+        dump_transaction_message: false,
+        blockhash_query: BlockhashQuery::default(),
+        nonce_account: None,
+        nonce_authority: 0,
+        memo: None,
+        fee_payer: 0,
+        custodian: None,
+        no_wait: false,
+    };
+    process_command(&config).unwrap_err(); // unsigned authority should fail
+
+    config.signers = vec![&default_signer, &staker_keypair];
+    config.command = CliCommand::StakeAuthorize {
+        stake_account_pubkey,
+        new_authorizations: vec![StakeAuthorizationIndexed {
+            authorization_type: StakeAuthorize::Staker,
+            new_authority_pubkey: staker_pubkey,
+            authority: 0,
+            new_authority_signer: Some(1),
+        }],
+        sign_only: false,
+        dump_transaction_message: false,
+        blockhash_query: BlockhashQuery::default(),
+        nonce_account: None,
+        nonce_authority: 0,
+        memo: None,
+        fee_payer: 0,
+        custodian: None,
+        no_wait: false,
+    };
+    process_command(&config).unwrap();
+    let stake_account = rpc_client.get_account(&stake_account_pubkey).unwrap();
+    let stake_state: StakeState = stake_account.state().unwrap();
+    let current_authority = match stake_state {
+        StakeState::Initialized(meta) => meta.authorized.staker,
+        _ => panic!("Unexpected stake state!"),
+    };
+    assert_eq!(current_authority, staker_pubkey);
+
+    let new_withdrawer_keypair = Keypair::new();
+    let new_withdrawer_pubkey = new_withdrawer_keypair.pubkey();
+    config.signers = vec![&default_signer, &withdrawer_keypair];
+    config.command = CliCommand::StakeAuthorize {
+        stake_account_pubkey,
+        new_authorizations: vec![StakeAuthorizationIndexed {
+            authorization_type: StakeAuthorize::Withdrawer,
+            new_authority_pubkey: new_withdrawer_pubkey,
+            authority: 1,
+            new_authority_signer: Some(1),
+        }],
+        sign_only: false,
+        dump_transaction_message: false,
+        blockhash_query: BlockhashQuery::default(),
+        nonce_account: None,
+        nonce_authority: 0,
+        memo: None,
+        fee_payer: 0,
+        custodian: None,
+        no_wait: false,
+    };
+    process_command(&config).unwrap_err(); // unsigned authority should fail
+
+    config.signers = vec![
+        &default_signer,
+        &withdrawer_keypair,
+        &new_withdrawer_keypair,
+    ];
+    config.command = CliCommand::StakeAuthorize {
+        stake_account_pubkey,
+        new_authorizations: vec![StakeAuthorizationIndexed {
+            authorization_type: StakeAuthorize::Withdrawer,
+            new_authority_pubkey: new_withdrawer_pubkey,
+            authority: 1,
+            new_authority_signer: Some(2),
+        }],
+        sign_only: false,
+        dump_transaction_message: false,
+        blockhash_query: BlockhashQuery::default(),
+        nonce_account: None,
+        nonce_authority: 0,
+        memo: None,
+        fee_payer: 0,
+        custodian: None,
+        no_wait: false,
+    };
+    process_command(&config).unwrap();
+    let stake_account = rpc_client.get_account(&stake_account_pubkey).unwrap();
+    let stake_state: StakeState = stake_account.state().unwrap();
+    let current_authority = match stake_state {
+        StakeState::Initialized(meta) => meta.authorized.withdrawer,
+        _ => panic!("Unexpected stake state!"),
+    };
+    assert_eq!(current_authority, new_withdrawer_pubkey);
+
+    // Set lockup, checking new custodian
+    let custodian = Keypair::new();
+    let custodian_pubkey = custodian.pubkey();
+    let lockup = LockupArgs {
+        unix_timestamp: Some(1_581_534_570),
+        epoch: Some(200),
+        custodian: Some(custodian_pubkey),
+    };
+    config.signers = vec![&default_signer, &new_withdrawer_keypair];
+    config.command = CliCommand::StakeSetLockup {
+        stake_account_pubkey,
+        lockup,
+        new_custodian_signer: Some(1),
+        custodian: 1,
+        sign_only: false,
+        dump_transaction_message: false,
+        blockhash_query: BlockhashQuery::default(),
+        nonce_account: None,
+        nonce_authority: 0,
+        memo: None,
+        fee_payer: 0,
+    };
+    process_command(&config).unwrap_err(); // unsigned new custodian should fail
+
+    config.signers = vec![&default_signer, &new_withdrawer_keypair, &custodian];
+    config.command = CliCommand::StakeSetLockup {
+        stake_account_pubkey,
+        lockup,
+        new_custodian_signer: Some(2),
+        custodian: 1,
+        sign_only: false,
+        dump_transaction_message: false,
+        blockhash_query: BlockhashQuery::default(),
+        nonce_account: None,
+        nonce_authority: 0,
+        memo: None,
+        fee_payer: 0,
+    };
+    process_command(&config).unwrap();
+    let stake_account = rpc_client.get_account(&stake_account_pubkey).unwrap();
+    let stake_state: StakeState = stake_account.state().unwrap();
+    let current_lockup = match stake_state {
+        StakeState::Initialized(meta) => meta.lockup,
+        _ => panic!("Unexpected stake state!"),
+    };
+    assert_eq!(
+        current_lockup.unix_timestamp,
+        lockup.unix_timestamp.unwrap()
+    );
+    assert_eq!(current_lockup.epoch, lockup.epoch.unwrap());
+    assert_eq!(current_lockup.custodian, custodian_pubkey);
+}
diff --git a/cli/tests/transfer.rs b/cli/tests/transfer.rs
index 3d971588305578..ad457846147701 100644
--- a/cli/tests/transfer.rs
+++ b/cli/tests/transfer.rs
@@ -16,7 +16,9 @@ use solana_sdk::{
     nonce::State as NonceState,
     pubkey::Pubkey,
     signature::{keypair_from_seed, Keypair, NullSigner, Signer},
+    stake,
 };
+use solana_streamer::socket::SocketAddrSpace;
 
 #[test]
 fn test_transfer() {
@@ -24,7 +26,12 @@ fn test_transfer() {
     let mint_keypair = Keypair::new();
     let mint_pubkey = mint_keypair.pubkey();
     let faucet_addr = run_local_faucet(mint_keypair, None);
-    let test_validator = TestValidator::with_custom_fees(mint_pubkey, 1, Some(faucet_addr));
+    let test_validator = TestValidator::with_custom_fees(
+        mint_pubkey,
+        1,
+        Some(faucet_addr),
+        SocketAddrSpace::Unspecified,
+    );
 
     let rpc_client =
         RpcClient::new_with_commitment(test_validator.rpc_url(), CommitmentConfig::processed());
@@ -276,7 +283,12 @@ fn test_transfer_multisession_signing() {
     let mint_keypair = Keypair::new();
     let mint_pubkey = mint_keypair.pubkey();
     let faucet_addr = run_local_faucet(mint_keypair, None);
-    let test_validator = TestValidator::with_custom_fees(mint_pubkey, 1, Some(faucet_addr));
+    let test_validator = TestValidator::with_custom_fees(
+        mint_pubkey,
+        1,
+        Some(faucet_addr),
+        SocketAddrSpace::Unspecified,
+    );
 
     let to_pubkey = Pubkey::new(&[1u8; 32]);
     let offline_from_signer = keypair_from_seed(&[2u8; 32]).unwrap();
@@ -403,7 +415,12 @@ fn test_transfer_all() {
     let mint_keypair = Keypair::new();
     let mint_pubkey = mint_keypair.pubkey();
     let faucet_addr = run_local_faucet(mint_keypair, None);
-    let test_validator = TestValidator::with_custom_fees(mint_pubkey, 1, Some(faucet_addr));
+    let test_validator = TestValidator::with_custom_fees(
+        mint_pubkey,
+        1,
+        Some(faucet_addr),
+        SocketAddrSpace::Unspecified,
+    );
 
     let rpc_client =
         RpcClient::new_with_commitment(test_validator.rpc_url(), CommitmentConfig::processed());
@@ -451,7 +468,12 @@ fn test_transfer_unfunded_recipient() {
     let mint_keypair = Keypair::new();
     let mint_pubkey = mint_keypair.pubkey();
     let faucet_addr = run_local_faucet(mint_keypair, None);
-    let test_validator = TestValidator::with_custom_fees(mint_pubkey, 1, Some(faucet_addr));
+    let test_validator = TestValidator::with_custom_fees(
+        mint_pubkey,
+        1,
+        Some(faucet_addr),
+        SocketAddrSpace::Unspecified,
+    );
 
     let rpc_client =
         RpcClient::new_with_commitment(test_validator.rpc_url(), CommitmentConfig::processed());
@@ -499,7 +521,12 @@ fn test_transfer_with_seed() {
     let mint_keypair = Keypair::new();
     let mint_pubkey = mint_keypair.pubkey();
     let faucet_addr = run_local_faucet(mint_keypair, None);
-    let test_validator = TestValidator::with_custom_fees(mint_pubkey, 1, Some(faucet_addr));
+    let test_validator = TestValidator::with_custom_fees(
+        mint_pubkey,
+        1,
+        Some(faucet_addr),
+        SocketAddrSpace::Unspecified,
+    );
 
     let rpc_client =
         RpcClient::new_with_commitment(test_validator.rpc_url(), CommitmentConfig::processed());
@@ -513,7 +540,7 @@ fn test_transfer_with_seed() {
     let sender_pubkey = config.signers[0].pubkey();
     let recipient_pubkey = Pubkey::new(&[1u8; 32]);
     let derived_address_seed = "seed".to_string();
-    let derived_address_program_id = solana_stake_program::id();
+    let derived_address_program_id = stake::program::id();
     let derived_address = Pubkey::create_with_seed(
         &sender_pubkey,
         &derived_address_seed,
diff --git a/cli/tests/vote.rs b/cli/tests/vote.rs
index 64c67a1d0b8c1c..6026bdde355792 100644
--- a/cli/tests/vote.rs
+++ b/cli/tests/vote.rs
@@ -14,6 +14,7 @@ use solana_sdk::{
     commitment_config::CommitmentConfig,
     signature::{Keypair, Signer},
 };
+use solana_streamer::socket::SocketAddrSpace;
 use solana_vote_program::vote_state::{VoteAuthorize, VoteState, VoteStateVersions};
 
 #[test]
@@ -21,7 +22,8 @@ fn test_vote_authorize_and_withdraw() {
     let mint_keypair = Keypair::new();
     let mint_pubkey = mint_keypair.pubkey();
     let faucet_addr = run_local_faucet(mint_keypair, None);
-    let test_validator = TestValidator::with_no_fees(mint_pubkey, Some(faucet_addr));
+    let test_validator =
+        TestValidator::with_no_fees(mint_pubkey, Some(faucet_addr), SocketAddrSpace::Unspecified);
 
     let rpc_client =
         RpcClient::new_with_commitment(test_validator.rpc_url(), CommitmentConfig::processed());
@@ -83,13 +85,48 @@ fn test_vote_authorize_and_withdraw() {
     check_recent_balance(expected_balance, &rpc_client, &vote_account_pubkey);
 
     // Authorize vote account withdrawal to another signer
-    let withdraw_authority = Keypair::new();
+    let first_withdraw_authority = Keypair::new();
     config.signers = vec![&default_signer];
+    config.command = CliCommand::VoteAuthorize {
+        vote_account_pubkey,
+        new_authorized_pubkey: first_withdraw_authority.pubkey(),
+        vote_authorize: VoteAuthorize::Withdrawer,
+        memo: None,
+        authorized: 0,
+        new_authorized: None,
+    };
+    process_command(&config).unwrap();
+    let vote_account = rpc_client
+        .get_account(&vote_account_keypair.pubkey())
+        .unwrap();
+    let vote_state: VoteStateVersions = vote_account.state().unwrap();
+    let authorized_withdrawer = vote_state.convert_to_current().authorized_withdrawer;
+    assert_eq!(authorized_withdrawer, first_withdraw_authority.pubkey());
+
+    // Authorize vote account withdrawal to another signer with checked instruction
+    let withdraw_authority = Keypair::new();
+    config.signers = vec![&default_signer, &first_withdraw_authority];
+    config.command = CliCommand::VoteAuthorize {
+        vote_account_pubkey,
+        new_authorized_pubkey: withdraw_authority.pubkey(),
+        vote_authorize: VoteAuthorize::Withdrawer,
+        memo: None,
+        authorized: 1,
+        new_authorized: Some(1),
+    };
+    process_command(&config).unwrap_err(); // unsigned by new authority should fail
+    config.signers = vec![
+        &default_signer,
+        &first_withdraw_authority,
+        &withdraw_authority,
+    ];
     config.command = CliCommand::VoteAuthorize {
         vote_account_pubkey,
         new_authorized_pubkey: withdraw_authority.pubkey(),
         vote_authorize: VoteAuthorize::Withdrawer,
         memo: None,
+        authorized: 1,
+        new_authorized: Some(2),
     };
     process_command(&config).unwrap();
     let vote_account = rpc_client
diff --git a/client/Cargo.toml b/client/Cargo.toml
index 4ed8a9db0b6fde..1260b2fa09f837 100644
--- a/client/Cargo.toml
+++ b/client/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "solana-client"
-version = "1.7.0"
+version = "1.7.11"
 description = "Solana Client"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -24,14 +24,14 @@ semver = "0.11.0"
 serde = "1.0.122"
 serde_derive = "1.0.103"
 serde_json = "1.0.56"
-solana-account-decoder = { path = "../account-decoder", version = "=1.7.0" }
-solana-clap-utils = { path = "../clap-utils", version = "=1.7.0" }
-solana-faucet = { path = "../faucet", version = "=1.7.0" }
-solana-net-utils = { path = "../net-utils", version = "=1.7.0" }
-solana-sdk = { path = "../sdk", version = "=1.7.0" }
-solana-transaction-status = { path = "../transaction-status", version = "=1.7.0" }
-solana-version = { path = "../version", version = "=1.7.0" }
-solana-vote-program = { path = "../programs/vote", version = "=1.7.0" }
+solana-account-decoder = { path = "../account-decoder", version = "=1.7.11" }
+solana-clap-utils = { path = "../clap-utils", version = "=1.7.11" }
+solana-faucet = { path = "../faucet", version = "=1.7.11" }
+solana-net-utils = { path = "../net-utils", version = "=1.7.11" }
+solana-sdk = { path = "../sdk", version = "=1.7.11" }
+solana-transaction-status = { path = "../transaction-status", version = "=1.7.11" }
+solana-version = { path = "../version", version = "=1.7.11" }
+solana-vote-program = { path = "../programs/vote", version = "=1.7.11" }
 thiserror = "1.0"
 tokio = { version = "1", features = ["full"] }
 tungstenite = "0.10.1"
@@ -40,7 +40,7 @@ url = "2.1.1"
 [dev-dependencies]
 assert_matches = "1.3.0"
 jsonrpc-http-server = "17.0.0"
-solana-logger = { path = "../logger", version = "=1.7.0" }
+solana-logger = { path = "../logger", version = "=1.7.11" }
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
diff --git a/client/src/blockhash_query.rs b/client/src/blockhash_query.rs
index ced886b04bf280..78dd26e39118a8 100644
--- a/client/src/blockhash_query.rs
+++ b/client/src/blockhash_query.rs
@@ -122,10 +122,10 @@ mod tests {
     use crate::{
         blockhash_query,
         rpc_request::RpcRequest,
-        rpc_response::{Response, RpcFeeCalculator, RpcResponseContext},
+        rpc_response::{Response, RpcFeeCalculator, RpcFees, RpcResponseContext},
     };
     use clap::App;
-    use serde_json::{self, json, Value};
+    use serde_json::{self, json};
     use solana_account_decoder::{UiAccount, UiAccountEncoding};
     use solana_sdk::{account::Account, hash::hash, nonce, system_program};
     use std::collections::HashMap;
@@ -288,10 +288,12 @@ mod tests {
         let rpc_fee_calc = FeeCalculator::new(42);
         let get_recent_blockhash_response = json!(Response {
             context: RpcResponseContext { slot: 1 },
-            value: json!((
-                Value::String(rpc_blockhash.to_string()),
-                serde_json::to_value(rpc_fee_calc.clone()).unwrap()
-            )),
+            value: json!(RpcFees {
+                blockhash: rpc_blockhash.to_string(),
+                fee_calculator: rpc_fee_calc.clone(),
+                last_valid_slot: 42,
+                last_valid_block_height: 42,
+            }),
         });
         let get_fee_calculator_for_blockhash_response = json!(Response {
             context: RpcResponseContext { slot: 1 },
@@ -300,10 +302,7 @@ mod tests {
             }),
         });
         let mut mocks = HashMap::new();
-        mocks.insert(
-            RpcRequest::GetRecentBlockhash,
-            get_recent_blockhash_response.clone(),
-        );
+        mocks.insert(RpcRequest::GetFees, get_recent_blockhash_response.clone());
         let rpc_client = RpcClient::new_mock_with_mocks("".to_string(), mocks);
         assert_eq!(
             BlockhashQuery::default()
@@ -312,10 +311,7 @@ mod tests {
             (rpc_blockhash, rpc_fee_calc.clone()),
         );
         let mut mocks = HashMap::new();
-        mocks.insert(
-            RpcRequest::GetRecentBlockhash,
-            get_recent_blockhash_response.clone(),
-        );
+        mocks.insert(RpcRequest::GetFees, get_recent_blockhash_response.clone());
         mocks.insert(
             RpcRequest::GetFeeCalculatorForBlockhash,
             get_fee_calculator_for_blockhash_response,
@@ -328,10 +324,7 @@ mod tests {
             (test_blockhash, rpc_fee_calc),
         );
         let mut mocks = HashMap::new();
-        mocks.insert(
-            RpcRequest::GetRecentBlockhash,
-            get_recent_blockhash_response,
-        );
+        mocks.insert(RpcRequest::GetFees, get_recent_blockhash_response);
         let rpc_client = RpcClient::new_mock_with_mocks("".to_string(), mocks);
         assert_eq!(
             BlockhashQuery::None(test_blockhash)
diff --git a/client/src/client_error.rs b/client/src/client_error.rs
index fec5d047c304f3..365d70941c4b4d 100644
--- a/client/src/client_error.rs
+++ b/client/src/client_error.rs
@@ -1,5 +1,5 @@
 use {
-    crate::rpc_request,
+    crate::{rpc_request, rpc_response},
     solana_faucet::faucet::FaucetError,
     solana_sdk::{
         signature::SignerError, transaction::TransactionError, transport::TransportError,
@@ -30,6 +30,24 @@ pub enum ClientErrorKind {
     Custom(String),
 }
 
+impl ClientErrorKind {
+    pub fn get_transaction_error(&self) -> Option<TransactionError> {
+        match self {
+            Self::RpcError(rpc_request::RpcError::RpcResponseError {
+                data:
+                    rpc_request::RpcResponseErrorData::SendTransactionPreflightFailure(
+                        rpc_response::RpcSimulateTransactionResult {
+                            err: Some(tx_err), ..
+                        },
+                    ),
+                ..
+            }) => Some(tx_err.clone()),
+            Self::TransactionError(tx_err) => Some(tx_err.clone()),
+            _ => None,
+        }
+    }
+}
+
 impl From<TransportError> for ClientErrorKind {
     fn from(err: TransportError) -> Self {
         match err {
@@ -86,6 +104,10 @@ impl ClientError {
     pub fn kind(&self) -> &ClientErrorKind {
         &self.kind
     }
+
+    pub fn get_transaction_error(&self) -> Option<TransactionError> {
+        self.kind.get_transaction_error()
+    }
 }
 
 impl From<ClientErrorKind> for ClientError {
diff --git a/client/src/http_sender.rs b/client/src/http_sender.rs
index 9c3f98a9b5b253..79d5c4ed852409 100644
--- a/client/src/http_sender.rs
+++ b/client/src/http_sender.rs
@@ -1,3 +1,5 @@
+//! The standard [`RpcSender`] over HTTP.
+
 use {
     crate::{
         client_error::Result,
@@ -28,11 +30,19 @@ pub struct HttpSender {
     request_id: AtomicU64,
 }
 
+/// The standard [`RpcSender`] over HTTP.
 impl HttpSender {
+    /// Create an HTTP RPC sender.
+    ///
+    /// The URL is an HTTP URL, usually for port 8899, as in
+    /// "http://localhost:8899". The sender has a default timeout of 30 seconds.
     pub fn new(url: String) -> Self {
         Self::new_with_timeout(url, Duration::from_secs(30))
     }
 
+    /// Create an HTTP RPC sender.
+    ///
+    /// The URL is an HTTP URL, usually for port 8899.
     pub fn new_with_timeout(url: String, timeout: Duration) -> Self {
         // `reqwest::blocking::Client` panics if run in a tokio async context.  Shuttle the
         // request to a different tokio thread to avoid this
@@ -57,7 +67,6 @@ impl HttpSender {
 struct RpcErrorObject {
     code: i64,
     message: String,
-    data: serde_json::Value,
 }
 
 impl RpcSender for HttpSender {
diff --git a/client/src/mock_sender.rs b/client/src/mock_sender.rs
index e40e456745546e..b5f478df5331a3 100644
--- a/client/src/mock_sender.rs
+++ b/client/src/mock_sender.rs
@@ -1,8 +1,15 @@
+//! An [`RpcSender`] used for unit testing [`RpcClient`](crate::rpc_client::RpcClient).
+
 use {
     crate::{
         client_error::Result,
+        rpc_config::RpcBlockProductionConfig,
         rpc_request::RpcRequest,
-        rpc_response::{Response, RpcResponseContext, RpcVersionInfo},
+        rpc_response::{
+            Response, RpcAccountBalance, RpcBlockProduction, RpcBlockProductionRange, RpcFees,
+            RpcResponseContext, RpcSimulateTransactionResult, RpcStakeActivation, RpcSupply,
+            RpcVersionInfo, RpcVoteAccountStatus, StakeActivationState,
+        },
         rpc_sender::RpcSender,
     },
     serde_json::{json, Number, Value},
@@ -28,6 +35,31 @@ pub struct MockSender {
     url: String,
 }
 
+/// An [`RpcSender`] used for unit testing [`RpcClient`](crate::rpc_client::RpcClient).
+///
+/// This is primarily for internal use.
+///
+/// Unless directed otherwise, it will generally return a reasonable default
+/// response, at least for [`RpcRequest`] values for which responses have been
+/// implemented.
+///
+/// The behavior can be customized in two ways:
+///
+/// 1) The `url` constructor argument is not actually a URL, but a simple string
+///    directive that changes `MockSender`s behavior in specific scenarios.
+///
+///    If `url` is "fails" then any call to `send` will return `Ok(Value::Null)`.
+///
+///    It is customary to set the `url` to "succeeds" for mocks that should
+///    return sucessfully, though this value is not actually interpreted.
+///
+///    Other possible values of `url` are specific to different `RpcRequest`
+///    values. Read the implementation for specifics.
+///
+/// 2) Custom responses can be configured by providing [`Mocks`] to the
+///    [`MockSender::new_with_mocks`] constructor. This type is a [`HashMap`]
+///    from [`RpcRequest`] to a JSON [`Value`] response, Any entries in this map
+///    override the default behavior for the given request.
 impl MockSender {
     pub fn new(url: String) -> Self {
         Self::new_with_mocks(url, Mocks::default())
@@ -49,23 +81,26 @@ impl RpcSender for MockSender {
         if self.url == "fails" {
             return Ok(Value::Null);
         }
-        let val = match request {
-            RpcRequest::GetAccountInfo => serde_json::to_value(Response {
+
+        let method = &request.build_request_json(42, params.clone())["method"];
+
+        let val = match method.as_str().unwrap() {
+            "getAccountInfo" => serde_json::to_value(Response {
                 context: RpcResponseContext { slot: 1 },
                 value: Value::Null,
             })?,
-            RpcRequest::GetBalance => serde_json::to_value(Response {
+            "getBalance" => serde_json::to_value(Response {
                 context: RpcResponseContext { slot: 1 },
                 value: Value::Number(Number::from(50)),
             })?,
-            RpcRequest::GetRecentBlockhash => serde_json::to_value(Response {
+            "getRecentBlockhash" => serde_json::to_value(Response {
                 context: RpcResponseContext { slot: 1 },
                 value: (
                     Value::String(PUBKEY.to_string()),
                     serde_json::to_value(FeeCalculator::default()).unwrap(),
                 ),
             })?,
-            RpcRequest::GetEpochInfo => serde_json::to_value(EpochInfo {
+            "getEpochInfo" => serde_json::to_value(EpochInfo {
                 epoch: 1,
                 slot_index: 2,
                 slots_in_epoch: 32,
@@ -73,7 +108,7 @@ impl RpcSender for MockSender {
                 block_height: 34,
                 transaction_count: Some(123),
             })?,
-            RpcRequest::GetFeeCalculatorForBlockhash => {
+            "getFeeCalculatorForBlockhash" => {
                 let value = if self.url == "blockhash_expired" {
                     Value::Null
                 } else {
@@ -84,11 +119,21 @@ impl RpcSender for MockSender {
                     value,
                 })?
             }
-            RpcRequest::GetFeeRateGovernor => serde_json::to_value(Response {
+            "getFeeRateGovernor" => serde_json::to_value(Response {
                 context: RpcResponseContext { slot: 1 },
                 value: serde_json::to_value(FeeRateGovernor::default()).unwrap(),
             })?,
-            RpcRequest::GetSignatureStatuses => {
+            "getFees" => serde_json::to_value(Response {
+                context: RpcResponseContext { slot: 1 },
+                value: serde_json::to_value(RpcFees {
+                    blockhash: PUBKEY.to_string(),
+                    fee_calculator: FeeCalculator::default(),
+                    last_valid_slot: 42,
+                    last_valid_block_height: 42,
+                })
+                .unwrap(),
+            })?,
+            "getSignatureStatuses" => {
                 let status: transaction::Result<()> = if self.url == "account_in_use" {
                     Err(TransactionError::AccountInUse)
                 } else if self.url == "instruction_error" {
@@ -122,11 +167,83 @@ impl RpcSender for MockSender {
                     value: statuses,
                 })?
             }
-            RpcRequest::GetTransactionCount => Value::Number(Number::from(1234)),
-            RpcRequest::GetSlot => Value::Number(Number::from(0)),
-            RpcRequest::GetMaxShredInsertSlot => Value::Number(Number::from(0)),
-            RpcRequest::RequestAirdrop => Value::String(Signature::new(&[8; 64]).to_string()),
-            RpcRequest::SendTransaction => {
+            "getTransactionCount" => json![1234],
+            "getSlot" => json![0],
+            "getMaxShredInsertSlot" => json![0],
+            "requestAirdrop" => Value::String(Signature::new(&[8; 64]).to_string()),
+            "getSnapshotSlot" => Value::Number(Number::from(0)),
+            "getBlockHeight" => Value::Number(Number::from(1234)),
+            "getSlotLeaders" => json!([PUBKEY]),
+            "getBlockProduction" => {
+                if params.is_null() {
+                    json!(Response {
+                        context: RpcResponseContext { slot: 1 },
+                        value: RpcBlockProduction {
+                            by_identity: HashMap::new(),
+                            range: RpcBlockProductionRange {
+                                first_slot: 1,
+                                last_slot: 2,
+                            },
+                        },
+                    })
+                } else {
+                    let config: Vec<RpcBlockProductionConfig> =
+                        serde_json::from_value(params).unwrap();
+                    let config = config[0].clone();
+                    let mut by_identity = HashMap::new();
+                    by_identity.insert(config.identity.unwrap(), (1, 123));
+                    let config_range = config.range.unwrap_or_default();
+
+                    json!(Response {
+                        context: RpcResponseContext { slot: 1 },
+                        value: RpcBlockProduction {
+                            by_identity,
+                            range: RpcBlockProductionRange {
+                                first_slot: config_range.first_slot,
+                                last_slot: {
+                                    if let Some(last_slot) = config_range.last_slot {
+                                        last_slot
+                                    } else {
+                                        2
+                                    }
+                                },
+                            },
+                        },
+                    })
+                }
+            }
+            "getStakeActivation" => json!(RpcStakeActivation {
+                state: StakeActivationState::Active,
+                active: 123,
+                inactive: 12,
+            }),
+            "getSupply" => json!(Response {
+                context: RpcResponseContext { slot: 1 },
+                value: RpcSupply {
+                    total: 100000000,
+                    circulating: 50000,
+                    non_circulating: 20000,
+                    non_circulating_accounts: vec![PUBKEY.to_string()],
+                },
+            }),
+            "getLargestAccounts" => {
+                let rpc_account_balance = RpcAccountBalance {
+                    address: PUBKEY.to_string(),
+                    lamports: 10000,
+                };
+
+                json!(Response {
+                    context: RpcResponseContext { slot: 1 },
+                    value: vec![rpc_account_balance],
+                })
+            }
+            "getVoteAccounts" => {
+                json!(RpcVoteAccountStatus {
+                    current: vec![],
+                    delinquent: vec![],
+                })
+            }
+            "sendTransaction" => {
                 let signature = if self.url == "malicious" {
                     Signature::new(&[8; 64]).to_string()
                 } else {
@@ -137,8 +254,16 @@ impl RpcSender for MockSender {
                 };
                 Value::String(signature)
             }
-            RpcRequest::GetMinimumBalanceForRentExemption => Value::Number(Number::from(20)),
-            RpcRequest::GetVersion => {
+            "simulateTransaction" => serde_json::to_value(Response {
+                context: RpcResponseContext { slot: 1 },
+                value: RpcSimulateTransactionResult {
+                    err: None,
+                    logs: None,
+                    accounts: None,
+                },
+            })?,
+            "getMinimumBalanceForRentExemption" => json![20],
+            "getVersion" => {
                 let version = Version::default();
                 json!(RpcVersionInfo {
                     solana_core: version.to_string(),
diff --git a/client/src/rpc_cache.rs b/client/src/rpc_cache.rs
index 38dbba582562dd..4207d3ce36752b 100644
--- a/client/src/rpc_cache.rs
+++ b/client/src/rpc_cache.rs
@@ -31,7 +31,7 @@ impl LargestAccountsCache {
         &self,
         filter: &Option<RpcLargestAccountsFilter>,
     ) -> Option<(u64, Vec<RpcAccountBalance>)> {
-        self.cache.get(&filter).and_then(|value| {
+        self.cache.get(filter).and_then(|value| {
             if let Ok(elapsed) = value.cached_time.elapsed() {
                 if elapsed < Duration::from_secs(self.duration) {
                     return Some((value.slot, value.accounts.clone()));
diff --git a/client/src/rpc_client.rs b/client/src/rpc_client.rs
index c54ef4ad94f5bf..5221a5cde2fe90 100644
--- a/client/src/rpc_client.rs
+++ b/client/src/rpc_client.rs
@@ -1,3 +1,11 @@
+//! Communication with a Solana node over RPC.
+//!
+//! Software that interacts with the Solana blockchain, whether querying its
+//! state or submitting transactions, communicates with a Solana node over
+//! [JSON-RPC], using the [`RpcClient`] type.
+//!
+//! [JSON-RPC]: https://www.jsonrpc.org/specification
+
 #[allow(deprecated)]
 use crate::rpc_deprecated_config::{
     RpcConfirmedBlockConfig, RpcConfirmedTransactionConfig,
@@ -49,59 +57,198 @@ use {
     },
 };
 
-pub struct RpcClient {
-    sender: Box<dyn RpcSender + Send + Sync + 'static>,
+#[derive(Default)]
+pub struct RpcClientConfig {
     commitment_config: CommitmentConfig,
-    node_version: RwLock<Option<semver::Version>>,
+    confirm_transaction_initial_timeout: Option<Duration>,
 }
 
-fn serialize_encode_transaction(
-    transaction: &Transaction,
-    encoding: UiTransactionEncoding,
-) -> ClientResult<String> {
-    let serialized = serialize(transaction)
-        .map_err(|e| ClientErrorKind::Custom(format!("transaction serialization failed: {}", e)))?;
-    let encoded = match encoding {
-        UiTransactionEncoding::Base58 => bs58::encode(serialized).into_string(),
-        UiTransactionEncoding::Base64 => base64::encode(serialized),
-        _ => {
-            return Err(ClientErrorKind::Custom(format!(
-                "unsupported transaction encoding: {}. Supported encodings: base58, base64",
-                encoding
-            ))
-            .into())
+impl RpcClientConfig {
+    fn with_commitment(commitment_config: CommitmentConfig) -> Self {
+        RpcClientConfig {
+            commitment_config,
+            ..Self::default()
         }
-    };
-    Ok(encoded)
+    }
+}
+
+/// A client of a remote Solana node.
+///
+/// `RpcClient` communicates with a Solana node over [JSON-RPC], with the
+/// [Solana JSON-RPC protocol][jsonprot]. It is the primary Rust interface for
+/// querying and transacting with the network from external programs.
+///
+/// This type builds on the underlying RPC protocol, adding extra features such
+/// as timeout handling, retries, and waiting on transaction commitment levels.
+/// Some methods simply pass through to the underlying RPC protocol. Not all RPC
+/// methods are encapsulated by this type, but `RpcClient` does expose a generic
+/// [`send`](RpcClient::send) method for making any [`RpcRequest`].
+///
+/// The documentation for most `RpcClient` methods contains an "RPC Reference"
+/// section that links to the documentation for the underlying JSON-RPC method.
+/// The documentation for `RpcClient` does not reproduce the documentation for
+/// the underlying JSON-RPC methods. Thus reading both is necessary for complete
+/// understanding.
+///
+/// `RpcClient`s generally communicate over HTTP on port 8899, a typical server
+/// URL being "http://localhost:8899".
+///
+/// By default, requests to confirm transactions only succeed once those
+/// transactions are finalized, meaning they are definitely permanently
+/// committed. Transactions can be confirmed with less finality by creating
+/// `RpcClient` with an explicit [`CommitmentConfig`], or by calling the various
+/// `_with_commitment` methods, like
+/// [`RpcClient::confirm_transaction_with_commitment`].
+///
+/// [jsonprot]: https://docs.solana.com/developing/clients/jsonrpc-api
+/// [JSON-RPC]: https://www.jsonrpc.org/specification
+///
+/// # Errors
+///
+/// Methods on `RpcClient` return
+/// [`client_error::Result`][crate::client_error::Result], and many of them
+/// return the [`RpcResult`][crate::rpc_response::RpcResult] typedef, which
+/// contains [`Response<T>`][crate::rpc_response::Response] on `Ok`. Both
+/// `client_error::Result` and [`RpcResult`] contain `ClientError` on error. In
+/// the case of `RpcResult`, the actual return value is in the
+/// [`value`][crate::rpc_response::Response::value] field, with RPC contextual
+/// information in the [`context`][crate::rpc_response::Response::context]
+/// field, so it is common for the value to be accessed with `?.value`, as in
+///
+/// ```
+/// # use solana_sdk::system_transaction;
+/// # use solana_client::rpc_client::RpcClient;
+/// # use solana_client::client_error::ClientError;
+/// # use solana_sdk::signature::{Keypair, Signer};
+/// # use solana_sdk::hash::Hash;
+/// # let rpc_client = RpcClient::new_mock("succeeds".to_string());
+/// # let key = Keypair::new();
+/// # let to = solana_sdk::pubkey::new_rand();
+/// # let lamports = 50;
+/// # let recent_blockhash = Hash::default();
+/// # let tx = system_transaction::transfer(&key, &to, lamports, recent_blockhash);
+/// let signature = rpc_client.send_transaction(&tx)?;
+/// let statuses = rpc_client.get_signature_statuses(&[signature])?.value;
+/// # Ok::<(), ClientError>(())
+/// ```
+///
+/// Requests may timeout, in which case they return a [`ClientError`] where the
+/// [`ClientErrorKind`] is [`ClientErrorKind::Reqwest`], and where the interior
+/// [`reqwest::Error`](crate::client_error::reqwest::Error)s
+/// [`is_timeout`](crate::client_error::reqwest::Error::is_timeout) method
+/// returns `true`. The default timeout is 30 seconds, and may be changed by
+/// calling an appropriate constructor with a `timeout` parameter.
+pub struct RpcClient {
+    sender: Box<dyn RpcSender + Send + Sync + 'static>,
+    config: RpcClientConfig,
+    node_version: RwLock<Option<semver::Version>>,
 }
 
 impl RpcClient {
+    /// Create an `RpcClient` from an [`RpcSender`] and an [`RpcClientConfig`].
+    ///
+    /// This is the basic constructor, allowing construction with any type of
+    /// `RpcSender`. Most applications should use one of the other constructors,
+    /// such as [`new`] and [`new_mock`], which create an `RpcClient`
+    /// encapsulating an [`HttpSender`] and [`MockSender`] respectively.
     fn new_sender<T: RpcSender + Send + Sync + 'static>(
         sender: T,
-        commitment_config: CommitmentConfig,
+        config: RpcClientConfig,
     ) -> Self {
         Self {
             sender: Box::new(sender),
             node_version: RwLock::new(None),
-            commitment_config,
+            config,
         }
     }
 
+    /// Create an HTTP `RpcClient`.
+    ///
+    /// The URL is an HTTP URL, usually for port 8899, as in
+    /// "http://localhost:8899".
+    ///
+    /// The client has a default timeout of 30 seconds, and a default commitment
+    /// level of [`Finalized`](CommitmentLevel::Finalized).
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// # use solana_client::rpc_client::RpcClient;
+    /// let url = "http://localhost:8899".to_string();
+    /// let client = RpcClient::new(url);
+    /// ```
     pub fn new(url: String) -> Self {
         Self::new_with_commitment(url, CommitmentConfig::default())
     }
 
+    /// Create an HTTP `RpcClient` with specified commitment level.
+    ///
+    /// The URL is an HTTP URL, usually for port 8899, as in
+    /// "http://localhost:8899".
+    ///
+    /// The client has a default timeout of 30 seconds, and a user-specified
+    /// [`CommitmentLevel`] via [`CommitmentConfig`].
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// # use solana_sdk::commitment_config::CommitmentConfig;
+    /// # use solana_client::rpc_client::RpcClient;
+    /// let url = "http://localhost:8899".to_string();
+    /// let commitment_config = CommitmentConfig::processed();
+    /// let client = RpcClient::new_with_commitment(url, commitment_config);
+    /// ```
     pub fn new_with_commitment(url: String, commitment_config: CommitmentConfig) -> Self {
-        Self::new_sender(HttpSender::new(url), commitment_config)
+        Self::new_sender(
+            HttpSender::new(url),
+            RpcClientConfig::with_commitment(commitment_config),
+        )
     }
 
+    /// Create an HTTP `RpcClient` with specified timeout.
+    ///
+    /// The URL is an HTTP URL, usually for port 8899, as in
+    /// "http://localhost:8899".
+    ///
+    /// The client has and a default commitment level of
+    /// [`Finalized`](CommitmentLevel::Finalized).
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// # use std::time::Duration;
+    /// # use solana_client::rpc_client::RpcClient;
+    /// let url = "http://localhost::8899".to_string();
+    /// let timeout = Duration::from_secs(1);
+    /// let client = RpcClient::new_with_timeout(url, timeout);
+    /// ```
     pub fn new_with_timeout(url: String, timeout: Duration) -> Self {
         Self::new_sender(
             HttpSender::new_with_timeout(url, timeout),
-            CommitmentConfig::default(),
+            RpcClientConfig::with_commitment(CommitmentConfig::default()),
         )
     }
 
+    /// Create an HTTP `RpcClient` with specified timeout and commitment level.
+    ///
+    /// The URL is an HTTP URL, usually for port 8899, as in
+    /// "http://localhost:8899".
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// # use std::time::Duration;
+    /// # use solana_client::rpc_client::RpcClient;
+    /// # use solana_sdk::commitment_config::CommitmentConfig;
+    /// let url = "http://localhost::8899".to_string();
+    /// let timeout = Duration::from_secs(1);
+    /// let commitment_config = CommitmentConfig::processed();
+    /// let client = RpcClient::new_with_timeout_and_commitment(
+    ///     url,
+    ///     timeout,
+    ///     commitment_config,
+    /// );
+    /// ```
     pub fn new_with_timeout_and_commitment(
         url: String,
         timeout: Duration,
@@ -109,25 +256,151 @@ impl RpcClient {
     ) -> Self {
         Self::new_sender(
             HttpSender::new_with_timeout(url, timeout),
-            commitment_config,
+            RpcClientConfig::with_commitment(commitment_config),
         )
     }
 
+    /// Create an HTTP `RpcClient` with specified timeout and commitment level.
+    ///
+    /// The URL is an HTTP URL, usually for port 8899, as in
+    /// "http://localhost:8899".
+    ///
+    /// The `confirm_transaction_initial_timeout` argument specifies, when
+    /// confirming a transaction via one of the `_with_spinner` methods, like
+    /// [`RpcClient::send_and_confirm_transaction_with_spinner`], the amount of
+    /// time to allow for the server to initially process a transaction. In
+    /// other words, setting `confirm_transaction_initial_timeout` to > 0 allows
+    /// `RpcClient` to wait for confirmation of a transaction that the server
+    /// has not "seen" yet.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// # use std::time::Duration;
+    /// # use solana_client::rpc_client::RpcClient;
+    /// # use solana_sdk::commitment_config::CommitmentConfig;
+    /// let url = "http://localhost::8899".to_string();
+    /// let timeout = Duration::from_secs(1);
+    /// let commitment_config = CommitmentConfig::processed();
+    /// let confirm_transaction_initial_timeout = Duration::from_secs(10);
+    /// let client = RpcClient::new_with_timeouts_and_commitment(
+    ///     url,
+    ///     timeout,
+    ///     commitment_config,
+    ///     confirm_transaction_initial_timeout,
+    /// );
+    /// ```
+    pub fn new_with_timeouts_and_commitment(
+        url: String,
+        timeout: Duration,
+        commitment_config: CommitmentConfig,
+        confirm_transaction_initial_timeout: Duration,
+    ) -> Self {
+        Self::new_sender(
+            HttpSender::new_with_timeout(url, timeout),
+            RpcClientConfig {
+                commitment_config,
+                confirm_transaction_initial_timeout: Some(confirm_transaction_initial_timeout),
+            },
+        )
+    }
+
+    /// Create a mock `RpcClient`.
+    ///
+    /// See the [`MockSender`] documentation for an explanation of
+    /// how it treats the `url` argument.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// # use solana_client::rpc_client::RpcClient;
+    /// // Create an `RpcClient` that always succeeds
+    /// let url = "succeeds".to_string();
+    /// let successful_client = RpcClient::new_mock(url);
+    /// ```
+    ///
+    /// ```
+    /// # use solana_client::rpc_client::RpcClient;
+    /// // Create an `RpcClient` that always fails
+    /// let url = "fails".to_string();
+    /// let successful_client = RpcClient::new_mock(url);
+    /// ```
     pub fn new_mock(url: String) -> Self {
-        Self::new_sender(MockSender::new(url), CommitmentConfig::default())
+        Self::new_sender(
+            MockSender::new(url),
+            RpcClientConfig::with_commitment(CommitmentConfig::default()),
+        )
     }
 
+    /// Create a mock `RpcClient`.
+    ///
+    /// See the [`MockSender`] documentation for an explanation of how it treats
+    /// the `url` argument.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// # use solana_client::{
+    /// #     rpc_client::RpcClient,
+    /// #     rpc_request::RpcRequest,
+    /// #     rpc_response::{Response, RpcResponseContext},
+    /// # };
+    /// # use std::collections::HashMap;
+    /// # use serde_json::json;
+    /// // Create a mock with a custom repsonse to the `GetBalance` request
+    /// let account_balance = 50;
+    /// let account_balance_response = json!(Response {
+    ///     context: RpcResponseContext { slot: 1 },
+    ///     value: json!(account_balance),
+    /// });
+    ///
+    /// let mut mocks = HashMap::new();
+    /// mocks.insert(RpcRequest::GetBalance, account_balance_response);
+    /// let url = "succeeds".to_string();
+    /// let client = RpcClient::new_mock_with_mocks(url, mocks);
+    /// ```
     pub fn new_mock_with_mocks(url: String, mocks: Mocks) -> Self {
         Self::new_sender(
             MockSender::new_with_mocks(url, mocks),
-            CommitmentConfig::default(),
+            RpcClientConfig::with_commitment(CommitmentConfig::default()),
         )
     }
 
+    /// Create an HTTP `RpcClient` from a [`SocketAddr`].
+    ///
+    /// The client has a default timeout of 30 seconds, and a default commitment
+    /// level of [`Finalized`](CommitmentLevel::Finalized).
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// # use std::net::SocketAddr;
+    /// # use solana_client::rpc_client::RpcClient;
+    /// let addr = SocketAddr::from(([127, 0, 0, 1], 8899));
+    /// let client = RpcClient::new_socket(addr);
+    /// ```
     pub fn new_socket(addr: SocketAddr) -> Self {
         Self::new(get_rpc_request_str(addr, false))
     }
 
+    /// Create an HTTP `RpcClient` from a [`SocketAddr`] with specified commitment level.
+    ///
+    /// The client has a default timeout of 30 seconds, and a user-specified
+    /// [`CommitmentLevel`] via [`CommitmentConfig`].
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// # use std::net::SocketAddr;
+    /// # use solana_client::rpc_client::RpcClient;
+    /// # use solana_sdk::commitment_config::CommitmentConfig;
+    /// let addr = SocketAddr::from(([127, 0, 0, 1], 8899));
+    /// let commitment_config = CommitmentConfig::processed();
+    /// let client = RpcClient::new_socket_with_commitment(
+    ///     addr,
+    ///     commitment_config
+    /// );
+    /// ```
     pub fn new_socket_with_commitment(
         addr: SocketAddr,
         commitment_config: CommitmentConfig,
@@ -135,6 +408,20 @@ impl RpcClient {
         Self::new_with_commitment(get_rpc_request_str(addr, false), commitment_config)
     }
 
+    /// Create an HTTP `RpcClient` from a [`SocketAddr`] with specified timeout.
+    ///
+    /// The client has and a default commitment level of [`Finalized`](CommitmentLevel::Finalized).
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// # use std::net::SocketAddr;
+    /// # use std::time::Duration;
+    /// # use solana_client::rpc_client::RpcClient;
+    /// let addr = SocketAddr::from(([127, 0, 0, 1], 8899));
+    /// let timeout = Duration::from_secs(1);
+    /// let client = RpcClient::new_socket_with_timeout(addr, timeout);
+    /// ```
     pub fn new_socket_with_timeout(addr: SocketAddr, timeout: Duration) -> Self {
         let url = get_rpc_request_str(addr, false);
         Self::new_with_timeout(url, timeout)
@@ -158,8 +445,19 @@ impl RpcClient {
         }
     }
 
+    /// Get the configured default commitment level.
+    ///
+    /// The commitment config may be specified during construction, and
+    /// determines how thoroughly committed a transaction must be when waiting
+    /// for its confirmation or otherwise checking for confirmation. If not
+    /// specified, the default commitment level is
+    /// [`Finalized`](CommitmentLevel::Finalized).
+    ///
+    /// The default commitment level is overridden when calling methods that
+    /// explicitly provide a [`CommitmentConfig`], like
+    /// [`RpcClient::confirm_transaction_with_commitment`].
     pub fn commitment(&self) -> CommitmentConfig {
-        self.commitment_config
+        self.config.commitment_config
     }
 
     fn use_deprecated_commitment(&self) -> Result<bool, RpcError> {
@@ -199,12 +497,119 @@ impl RpcClient {
         Ok(request)
     }
 
+    /// Check the confirmation status of a transaction.
+    ///
+    /// Returns `true` if the given transaction succeeded and has been committed
+    /// with the configured commitment level, which can be retrieved with
+    /// the [`commitment`](RpcClient::commitment) method.
+    ///
+    /// Note that this method does not wait for a transaction to be confirmed
+    /// &mdash; it only checks whether a transaction has been confirmed. To
+    /// submit a transaction and wait for it to confirm, use
+    /// [`send_and_confirm_transaction`][RpcClient::send_and_confirm_transaction].
+    ///
+    /// _This method returns `false` if the transaction failed, even if it has
+    /// been confirmed._
+    ///
+    /// # RPC Reference
+    ///
+    /// This method is built on the [`getSignatureStatuses`] RPC method.
+    ///
+    /// [`getSignatureStatuses`]: https://docs.solana.com/developing/clients/jsonrpc-api#getsignaturestatuses
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// # use solana_client::{
+    /// #     client_error::ClientError,
+    /// #     rpc_client::RpcClient,
+    /// #     rpc_config::RpcSimulateTransactionConfig,
+    /// # };
+    /// # use solana_sdk::{
+    /// #     signature::Signer,
+    /// #     signature::Signature,
+    /// #     signer::keypair::Keypair,
+    /// #     hash::Hash,
+    /// #     system_transaction,
+    /// # };
+    /// # use std::time::Duration;
+    /// # let rpc_client = RpcClient::new_mock("succeeds".to_string());
+    /// // Transfer lamports from Alice to Bob and wait for confirmation
+    /// # let alice = Keypair::new();
+    /// # let bob = Keypair::new();
+    /// # let lamports = 50;
+    /// let (recent_blockhash, _) = rpc_client.get_recent_blockhash()?;
+    /// let tx = system_transaction::transfer(&alice, &bob.pubkey(), lamports, recent_blockhash);
+    /// let signature = rpc_client.send_transaction(&tx)?;
+    ///
+    /// loop {
+    ///     let confirmed = rpc_client.confirm_transaction(&signature)?;
+    ///     if confirmed {
+    ///         break;
+    ///     }
+    /// }
+    /// # Ok::<(), ClientError>(())
+    /// ```
     pub fn confirm_transaction(&self, signature: &Signature) -> ClientResult<bool> {
         Ok(self
-            .confirm_transaction_with_commitment(signature, self.commitment_config)?
+            .confirm_transaction_with_commitment(signature, self.commitment())?
             .value)
     }
 
+    /// Check the confirmation status of a transaction.
+    ///
+    /// Returns an [`RpcResult`] with value `true` if the given transaction
+    /// succeeded and has been committed with the given commitment level.
+    ///
+    /// Note that this method does not wait for a transaction to be confirmed
+    /// &mdash; it only checks whether a transaction has been confirmed. To
+    /// submit a transaction and wait for it to confirm, use
+    /// [`send_and_confirm_transaction`][RpcClient::send_and_confirm_transaction].
+    ///
+    /// _This method returns an [`RpcResult`] with value `false` if the
+    /// transaction failed, even if it has been confirmed._
+    ///
+    /// # RPC Reference
+    ///
+    /// This method is built on the [`getSignatureStatuses`] RPC method.
+    ///
+    /// [`getSignatureStatuses`]: https://docs.solana.com/developing/clients/jsonrpc-api#getsignaturestatuses
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// # use solana_client::{
+    /// #     client_error::ClientError,
+    /// #     rpc_client::RpcClient,
+    /// #     rpc_config::RpcSimulateTransactionConfig,
+    /// # };
+    /// # use solana_sdk::{
+    /// #     commitment_config::CommitmentConfig,
+    /// #     signature::Signer,
+    /// #     signature::Signature,
+    /// #     signer::keypair::Keypair,
+    /// #     hash::Hash,
+    /// #     system_transaction,
+    /// # };
+    /// # use std::time::Duration;
+    /// # let rpc_client = RpcClient::new_mock("succeeds".to_string());
+    /// // Transfer lamports from Alice to Bob and wait for confirmation
+    /// # let alice = Keypair::new();
+    /// # let bob = Keypair::new();
+    /// # let lamports = 50;
+    /// let (recent_blockhash, _) = rpc_client.get_recent_blockhash()?;
+    /// let tx = system_transaction::transfer(&alice, &bob.pubkey(), lamports, recent_blockhash);
+    /// let signature = rpc_client.send_transaction(&tx)?;
+    ///
+    /// loop {
+    ///     let commitment_config = CommitmentConfig::processed();
+    ///     let confirmed = rpc_client.confirm_transaction_with_commitment(&signature, commitment_config)?;
+    ///     if confirmed.value {
+    ///         break;
+    ///     }
+    /// }
+    /// # Ok::<(), ClientError>(())
+    /// ```
     pub fn confirm_transaction_with_commitment(
         &self,
         signature: &Signature,
@@ -222,13 +627,36 @@ impl RpcClient {
         })
     }
 
+    /// # Examples
+    ///
+    /// ```
+    /// # use solana_client::{
+    /// #     client_error::ClientError,
+    /// #     rpc_client::RpcClient,
+    /// # };
+    /// # use solana_sdk::{
+    /// #     signature::Signer,
+    /// #     signature::Signature,
+    /// #     signer::keypair::Keypair,
+    /// #     hash::Hash,
+    /// #     system_transaction,
+    /// # };
+    /// # let rpc_client = RpcClient::new_mock("succeeds".to_string());
+    /// // Transfer lamports from Alice to Bob
+    /// # let alice = Keypair::new();
+    /// # let bob = Keypair::new();
+    /// # let lamports = 50;
+    /// let (recent_blockhash, _) = rpc_client.get_recent_blockhash()?;
+    /// let tx = system_transaction::transfer(&alice, &bob.pubkey(), lamports, recent_blockhash);
+    /// let signature = rpc_client.send_transaction(&tx)?;
+    /// # Ok::<(), ClientError>(())
+    /// ```
     pub fn send_transaction(&self, transaction: &Transaction) -> ClientResult<Signature> {
         self.send_transaction_with_config(
             transaction,
             RpcSendTransactionConfig {
                 preflight_commitment: Some(
-                    self.maybe_map_commitment(self.commitment_config)?
-                        .commitment,
+                    self.maybe_map_commitment(self.commitment())?.commitment,
                 ),
                 ..RpcSendTransactionConfig::default()
             },
@@ -243,6 +671,38 @@ impl RpcClient {
         }
     }
 
+    /// # Examples
+    ///
+    /// ```
+    /// # use solana_client::{
+    /// #     client_error::ClientError,
+    /// #     rpc_client::RpcClient,
+    /// #     rpc_config::RpcSendTransactionConfig,
+    /// # };
+    /// # use solana_sdk::{
+    /// #     signature::Signer,
+    /// #     signature::Signature,
+    /// #     signer::keypair::Keypair,
+    /// #     hash::Hash,
+    /// #     system_transaction,
+    /// # };
+    /// # let rpc_client = RpcClient::new_mock("succeeds".to_string());
+    /// // Transfer lamports from Alice to Bob
+    /// # let alice = Keypair::new();
+    /// # let bob = Keypair::new();
+    /// # let lamports = 50;
+    /// let (recent_blockhash, _) = rpc_client.get_recent_blockhash()?;
+    /// let tx = system_transaction::transfer(&alice, &bob.pubkey(), lamports, recent_blockhash);
+    /// let config = RpcSendTransactionConfig {
+    ///     skip_preflight: true,
+    ///     .. RpcSendTransactionConfig::default()
+    /// };
+    /// let signature = rpc_client.send_transaction_with_config(
+    ///     &tx,
+    ///     config,
+    /// )?;
+    /// # Ok::<(), ClientError>(())
+    /// ```
     pub fn send_transaction_with_config(
         &self,
         transaction: &Transaction,
@@ -310,6 +770,32 @@ impl RpcClient {
         }
     }
 
+    /// # Examples
+    ///
+    /// ```
+    /// # use solana_client::{
+    /// #     client_error::ClientError,
+    /// #     rpc_client::RpcClient,
+    /// #     rpc_response::RpcSimulateTransactionResult,
+    /// # };
+    /// # use solana_sdk::{
+    /// #     signature::Signer,
+    /// #     signature::Signature,
+    /// #     signer::keypair::Keypair,
+    /// #     hash::Hash,
+    /// #     system_transaction,
+    /// # };
+    /// # let rpc_client = RpcClient::new_mock("succeeds".to_string());
+    /// // Transfer lamports from Alice to Bob
+    /// # let alice = Keypair::new();
+    /// # let bob = Keypair::new();
+    /// # let lamports = 50;
+    /// let (recent_blockhash, _) = rpc_client.get_recent_blockhash()?;
+    /// let tx = system_transaction::transfer(&alice, &bob.pubkey(), lamports, recent_blockhash);
+    /// let result = rpc_client.simulate_transaction(&tx)?;
+    /// assert!(result.value.err.is_none());
+    /// # Ok::<(), ClientError>(())
+    /// ```
     pub fn simulate_transaction(
         &self,
         transaction: &Transaction,
@@ -317,12 +803,45 @@ impl RpcClient {
         self.simulate_transaction_with_config(
             transaction,
             RpcSimulateTransactionConfig {
-                commitment: Some(self.commitment_config),
+                commitment: Some(self.commitment()),
                 ..RpcSimulateTransactionConfig::default()
             },
         )
     }
 
+    /// # Examples
+    ///
+    /// ```
+    /// # use solana_client::{
+    /// #     client_error::ClientError,
+    /// #     rpc_client::RpcClient,
+    /// #     rpc_config::RpcSimulateTransactionConfig,
+    /// #     rpc_response::RpcSimulateTransactionResult,
+    /// # };
+    /// # use solana_sdk::{
+    /// #     signature::Signer,
+    /// #     signer::keypair::Keypair,
+    /// #     hash::Hash,
+    /// #     system_transaction,
+    /// # };
+    /// # let rpc_client = RpcClient::new_mock("succeeds".to_string());
+    /// // Transfer lamports from Alice to Bob
+    /// # let alice = Keypair::new();
+    /// # let bob = Keypair::new();
+    /// # let lamports = 50;
+    /// let (recent_blockhash, _) = rpc_client.get_recent_blockhash()?;
+    /// let tx = system_transaction::transfer(&alice, &bob.pubkey(), lamports, recent_blockhash);
+    /// let config = RpcSimulateTransactionConfig {
+    ///     sig_verify: false,
+    ///     .. RpcSimulateTransactionConfig::default()
+    /// };
+    /// let result = rpc_client.simulate_transaction_with_config(
+    ///     &tx,
+    ///     config,
+    /// )?;
+    /// assert!(result.value.err.is_none());
+    /// # Ok::<(), ClientError>(())
+    /// ```
     pub fn simulate_transaction_with_config(
         &self,
         transaction: &Transaction,
@@ -347,17 +866,123 @@ impl RpcClient {
         )
     }
 
+    /// # Examples
+    ///
+    /// ```
+    /// # use solana_client::{
+    /// #     rpc_client::RpcClient,
+    /// #     client_error::ClientError,
+    /// # };
+    /// # let rpc_client = RpcClient::new_mock("succeeds".to_string());
+    /// let slot = rpc_client.get_snapshot_slot()?;
+    /// # Ok::<(), ClientError>(())
+    /// ```
     pub fn get_snapshot_slot(&self) -> ClientResult<Slot> {
         self.send(RpcRequest::GetSnapshotSlot, Value::Null)
     }
 
+    /// # Examples
+    ///
+    /// ```
+    /// # use solana_client::{
+    /// #     rpc_client::RpcClient,
+    /// #     client_error::ClientError,
+    /// # };
+    /// # use solana_sdk::{
+    /// #     signature::Signer,
+    /// #     signature::Signature,
+    /// #     signer::keypair::Keypair,
+    /// #     hash::Hash,
+    /// #     system_transaction,
+    /// # };
+    /// # let rpc_client = RpcClient::new_mock("succeeds".to_string());
+    /// # let alice = Keypair::new();
+    /// # let bob = Keypair::new();
+    /// # let lamports = 50;
+    /// # let (recent_blockhash, _) = rpc_client.get_recent_blockhash()?;
+    /// # let tx = system_transaction::transfer(&alice, &bob.pubkey(), lamports, recent_blockhash);
+    /// let signature = rpc_client.send_transaction(&tx)?;
+    /// let status = rpc_client.get_signature_status(&signature)?;
+    /// # Ok::<(), ClientError>(())
+    /// ```
     pub fn get_signature_status(
         &self,
         signature: &Signature,
     ) -> ClientResult<Option<transaction::Result<()>>> {
-        self.get_signature_status_with_commitment(signature, self.commitment_config)
-    }
-
+        self.get_signature_status_with_commitment(signature, self.commitment())
+    }
+
+    /// Gets the statuses of a list of transaction signatures.
+    ///
+    /// The returned vector of [`TransactionStatus`] has the same length as the
+    /// input slice.
+    ///
+    /// For any transaction that has not been processed by the network, the
+    /// value of the corresponding entry in the returned vector is `None`. As a
+    /// result, a transaction that has recently been submitted will not have a
+    /// status immediately.
+    ///
+    /// To submit a transaction and wait for it to confirm, use
+    /// [`send_and_confirm_transaction`][RpcClient::send_and_confirm_transaction].
+    ///
+    /// This function ignores the configured confirmation level, and returns the
+    /// transaction status whatever it is. It does not wait for transactions to
+    /// be processed.
+    ///
+    /// This function only searches a node's recent history, including all
+    /// recent slots, plus up to
+    /// [`MAX_RECENT_BLOCKHASHES`][solana_sdk::clock::MAX_RECENT_BLOCKHASHES]
+    /// rooted slots. To search the full transaction history use the
+    /// [`get_signature_statuses_with_history`][RpcClient::get_signature_statuses_with_history]
+    /// method.
+    ///
+    /// # Errors
+    ///
+    /// Any individual `TransactionStatus` may have triggered an error during
+    /// processing, in which case its [`err`][`TransactionStatus::err`] field
+    /// will be `Some`.
+    ///
+    /// # RPC Reference
+    ///
+    /// This method corresponds directly to the [`getSignatureStatuses`] RPC method.
+    ///
+    /// [`getSignatureStatuses`]: https://docs.solana.com/developing/clients/jsonrpc-api#getsignaturestatuses
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// # use solana_client::{
+    /// #     rpc_client::RpcClient,
+    /// #     client_error::ClientError,
+    /// # };
+    /// # use solana_sdk::{
+    /// #     signature::Signer,
+    /// #     signature::Signature,
+    /// #     signer::keypair::Keypair,
+    /// #     hash::Hash,
+    /// #     system_transaction,
+    /// # };
+    /// # use std::time::Duration;
+    /// # let rpc_client = RpcClient::new_mock("succeeds".to_string());
+    /// # let alice = Keypair::new();
+    /// // Send lamports from Alice to Bob and wait for the transaction to be processed
+    /// # let bob = Keypair::new();
+    /// # let lamports = 50;
+    /// let (recent_blockhash, _) = rpc_client.get_recent_blockhash()?;
+    /// let tx = system_transaction::transfer(&alice, &bob.pubkey(), lamports, recent_blockhash);
+    /// let signature = rpc_client.send_transaction(&tx)?;
+    ///
+    /// let status = loop {
+    ///    let statuses = rpc_client.get_signature_statuses(&[signature])?.value;
+    ///    if let Some(status) = statuses[0].clone() {
+    ///        break status;
+    ///    }
+    ///    std::thread::sleep(Duration::from_millis(100));
+    /// };
+    ///
+    /// assert!(status.err.is_none());
+    /// # Ok::<(), ClientError>(())
+    /// ```
     pub fn get_signature_statuses(
         &self,
         signatures: &[Signature],
@@ -366,6 +991,67 @@ impl RpcClient {
         self.send(RpcRequest::GetSignatureStatuses, json!([signatures]))
     }
 
+    /// Gets the statuses of a list of transaction signatures.
+    ///
+    /// The returned vector of [`TransactionStatus`] has the same length as the
+    /// input slice.
+    ///
+    /// For any transaction that has not been processed by the network, the
+    /// value of the corresponding entry in the returned vector is `None`. As a
+    /// result, a transaction that has recently been submitted will not have a
+    /// status immediately.
+    ///
+    /// To submit a transaction and wait for it to confirm, use
+    /// [`send_and_confirm_transaction`][RpcClient::send_and_confirm_transaction].
+    ///
+    /// This function ignores the configured confirmation level, and returns the
+    /// transaction status whatever it is. It does not wait for transactions to
+    /// be processed.
+    ///
+    /// This function searches a node's full ledger history and (if implemented) long-term storage. To search for
+    /// transactions in recent slots only use the
+    /// [`get_signature_statuses`][RpcClient::get_signature_statuses] method.
+    ///
+    /// # Errors
+    ///
+    /// Any individual `TransactionStatus` may have triggered an error during
+    /// processing, in which case its [`err`][`TransactionStatus::err`] field
+    /// will be `Some`.
+    ///
+    /// # RPC Reference
+    ///
+    /// This method corresponds directly to the [`getSignatureStatuses`] RPC
+    /// method, with the `searchTransactionHistory` configuration option set to
+    /// `true`.
+    ///
+    /// [`getSignatureStatuses`]: https://docs.solana.com/developing/clients/jsonrpc-api#getsignaturestatuses
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// # use solana_client::{
+    /// #     rpc_client::RpcClient,
+    /// #     client_error::ClientError,
+    /// # };
+    /// # use solana_sdk::{
+    /// #     signature::Signer,
+    /// #     signature::Signature,
+    /// #     signer::keypair::Keypair,
+    /// #     hash::Hash,
+    /// #     system_transaction,
+    /// # };
+    /// # let rpc_client = RpcClient::new_mock("succeeds".to_string());
+    /// # let alice = Keypair::new();
+    /// # fn get_old_transaction_signature() -> Signature { Signature::default() }
+    /// // Check if an old transaction exists
+    /// let signature = get_old_transaction_signature();
+    /// let (recent_blockhash, _) = rpc_client.get_recent_blockhash()?;
+    /// let statuses = rpc_client.get_signature_statuses_with_history(&[signature])?.value;
+    /// if statuses[0].is_none() {
+    ///     println!("old transaction does not exist");
+    /// }
+    /// # Ok::<(), ClientError>(())
+    /// ```
     pub fn get_signature_statuses_with_history(
         &self,
         signatures: &[Signature],
@@ -379,6 +1065,35 @@ impl RpcClient {
         )
     }
 
+    /// # Examples
+    ///
+    /// ```
+    /// # use solana_client::{
+    /// #     rpc_client::RpcClient,
+    /// #     client_error::ClientError,
+    /// # };
+    /// # use solana_sdk::{
+    /// #     commitment_config::CommitmentConfig,
+    /// #     signature::Signer,
+    /// #     signature::Signature,
+    /// #     signer::keypair::Keypair,
+    /// #     hash::Hash,
+    /// #     system_transaction,
+    /// # };
+    /// # let rpc_client = RpcClient::new_mock("succeeds".to_string());
+    /// # let alice = Keypair::new();
+    /// # let bob = Keypair::new();
+    /// # let lamports = 50;
+    /// # let (recent_blockhash, _) = rpc_client.get_recent_blockhash()?;
+    /// # let tx = system_transaction::transfer(&alice, &bob.pubkey(), lamports, recent_blockhash);
+    /// let signature = rpc_client.send_transaction(&tx)?;
+    /// let commitment_config = CommitmentConfig::processed();
+    /// let status = rpc_client.get_signature_status_with_commitment(
+    ///     &signature,
+    ///     commitment_config,
+    /// )?;
+    /// # Ok::<(), ClientError>(())
+    /// ```
     pub fn get_signature_status_with_commitment(
         &self,
         signature: &Signature,
@@ -394,6 +1109,37 @@ impl RpcClient {
             .map(|status_meta| status_meta.status))
     }
 
+    /// # Examples
+    ///
+    /// ```
+    /// # use solana_client::{
+    /// #     rpc_client::RpcClient,
+    /// #     client_error::ClientError,
+    /// # };
+    /// # use solana_sdk::{
+    /// #     commitment_config::CommitmentConfig,
+    /// #     signature::Signer,
+    /// #     signature::Signature,
+    /// #     signer::keypair::Keypair,
+    /// #     hash::Hash,
+    /// #     system_transaction,
+    /// # };
+    /// # let rpc_client = RpcClient::new_mock("succeeds".to_string());
+    /// # let alice = Keypair::new();
+    /// # let bob = Keypair::new();
+    /// # let lamports = 50;
+    /// # let (recent_blockhash, _) = rpc_client.get_recent_blockhash()?;
+    /// # let tx = system_transaction::transfer(&alice, &bob.pubkey(), lamports, recent_blockhash);
+    /// let signature = rpc_client.send_transaction(&tx)?;
+    /// let commitment_config = CommitmentConfig::processed();
+    /// let search_transaction_history = true;
+    /// let status = rpc_client.get_signature_status_with_commitment_and_history(
+    ///     &signature,
+    ///     commitment_config,
+    ///     search_transaction_history,
+    /// )?;
+    /// # Ok::<(), ClientError>(())
+    /// ```
     pub fn get_signature_status_with_commitment_and_history(
         &self,
         signature: &Signature,
@@ -412,10 +1158,34 @@ impl RpcClient {
             .map(|status_meta| status_meta.status))
     }
 
+    /// # Examples
+    ///
+    /// ```
+    /// # use solana_client::{
+    /// #     rpc_client::RpcClient,
+    /// #     client_error::ClientError,
+    /// # };
+    /// # let rpc_client = RpcClient::new_mock("succeeds".to_string());
+    /// let slot = rpc_client.get_slot()?;
+    /// # Ok::<(), ClientError>(())
+    /// ```
     pub fn get_slot(&self) -> ClientResult<Slot> {
-        self.get_slot_with_commitment(self.commitment_config)
-    }
-
+        self.get_slot_with_commitment(self.commitment())
+    }
+
+    /// # Examples
+    ///
+    /// ```
+    /// # use solana_client::{
+    /// #     rpc_client::RpcClient,
+    /// #     client_error::ClientError,
+    /// # };
+    /// # use solana_sdk::commitment_config::CommitmentConfig;
+    /// # let rpc_client = RpcClient::new_mock("succeeds".to_string());
+    /// let commitment_config = CommitmentConfig::processed();
+    /// let slot = rpc_client.get_slot_with_commitment(commitment_config)?;
+    /// # Ok::<(), ClientError>(())
+    /// ```
     pub fn get_slot_with_commitment(
         &self,
         commitment_config: CommitmentConfig,
@@ -426,10 +1196,36 @@ impl RpcClient {
         )
     }
 
+    /// # Examples
+    ///
+    /// ```
+    /// # use solana_client::{
+    /// #     rpc_client::RpcClient,
+    /// #     client_error::ClientError,
+    /// # };
+    /// # let rpc_client = RpcClient::new_mock("succeeds".to_string());
+    /// let block_height = rpc_client.get_block_height()?;
+    /// # Ok::<(), ClientError>(())
+    /// ```
     pub fn get_block_height(&self) -> ClientResult<u64> {
-        self.get_block_height_with_commitment(self.commitment_config)
-    }
-
+        self.get_block_height_with_commitment(self.commitment())
+    }
+
+    /// # Examples
+    ///
+    /// ```
+    /// # use solana_client::{
+    /// #     rpc_client::RpcClient,
+    /// #     client_error::ClientError,
+    /// # };
+    /// # use solana_sdk::commitment_config::CommitmentConfig;
+    /// # let rpc_client = RpcClient::new_mock("succeeds".to_string());
+    /// let commitment_config = CommitmentConfig::processed();
+    /// let block_height = rpc_client.get_block_height_with_commitment(
+    ///     commitment_config,
+    /// )?;
+    /// # Ok::<(), ClientError>(())
+    /// ```
     pub fn get_block_height_with_commitment(
         &self,
         commitment_config: CommitmentConfig,
@@ -440,6 +1236,20 @@ impl RpcClient {
         )
     }
 
+    /// # Examples
+    ///
+    /// ```
+    /// # use solana_client::{
+    /// #     rpc_client::RpcClient,
+    /// #     client_error::ClientError,
+    /// # };
+    /// # use solana_sdk::slot_history::Slot;
+    /// # let rpc_client = RpcClient::new_mock("succeeds".to_string());
+    /// let start_slot = 1;
+    /// let limit = 3;
+    /// let leaders = rpc_client.get_slot_leaders(start_slot, limit)?;
+    /// # Ok::<(), ClientError>(())
+    /// ```
     pub fn get_slot_leaders(&self, start_slot: Slot, limit: u64) -> ClientResult<Vec<Pubkey>> {
         self.send(RpcRequest::GetSlotLeaders, json!([start_slot, limit]))
             .and_then(|slot_leaders: Vec<String>| {
@@ -458,18 +1268,84 @@ impl RpcClient {
             })
     }
 
-    /// Get block production for the current epoch
+    /// Get block production for the current epoch.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// # use solana_client::{
+    /// #     rpc_client::RpcClient,
+    /// #     client_error::ClientError,
+    /// # };
+    /// # let rpc_client = RpcClient::new_mock("succeeds".to_string());
+    /// let production = rpc_client.get_block_production()?;
+    /// # Ok::<(), ClientError>(())
+    /// ```
     pub fn get_block_production(&self) -> RpcResult<RpcBlockProduction> {
         self.send(RpcRequest::GetBlockProduction, Value::Null)
     }
 
+    /// # Examples
+    ///
+    /// ```
+    /// # use solana_client::{
+    /// #     rpc_client::RpcClient,
+    /// #     client_error::ClientError,
+    /// #     rpc_config::RpcBlockProductionConfig,
+    /// #     rpc_config::RpcBlockProductionConfigRange,
+    /// # };
+    /// # use solana_sdk::{
+    /// #     signature::Signer,
+    /// #     signer::keypair::Keypair,
+    /// #     commitment_config::CommitmentConfig,
+    /// # };
+    /// # let rpc_client = RpcClient::new_mock("succeeds".to_string());
+    /// # let start_slot = 1;
+    /// # let limit = 3;
+    /// let leader = rpc_client.get_slot_leaders(start_slot, limit)?;
+    /// let leader = leader[0];
+    /// let range = RpcBlockProductionConfigRange {
+    ///     first_slot: 0,
+    ///     last_slot: Some(0),
+    /// };
+    /// let config = RpcBlockProductionConfig {
+    ///     identity: Some(leader.to_string()),
+    ///     range: Some(range),
+    ///     commitment: Some(CommitmentConfig::processed()),
+    /// };
+    /// let production = rpc_client.get_block_production_with_config(
+    ///     config
+    /// )?;
+    /// # Ok::<(), ClientError>(())
+    /// ```
     pub fn get_block_production_with_config(
         &self,
         config: RpcBlockProductionConfig,
     ) -> RpcResult<RpcBlockProduction> {
-        self.send(RpcRequest::GetBlockProduction, json!(config))
-    }
-
+        self.send(RpcRequest::GetBlockProduction, json!([config]))
+    }
+
+    /// # Examples
+    ///
+    /// ```
+    /// # use solana_client::{
+    /// #     rpc_client::RpcClient,
+    /// #     client_error::ClientError,
+    /// # };
+    /// # use solana_sdk::{
+    /// #     signer::keypair::Keypair,
+    /// #     signature::Signer,
+    /// # };
+    /// # let rpc_client = RpcClient::new_mock("succeeds".to_string());
+    /// # let stake_account_keypair = Keypair::new();
+    /// let stake_account = stake_account_keypair.pubkey();
+    /// let epoch = rpc_client.get_epoch_info()?;
+    /// let activation = rpc_client.get_stake_activation(
+    ///     stake_account,
+    ///     Some(epoch.epoch),
+    /// )?;
+    /// # Ok::<(), ClientError>(())
+    /// ```
     pub fn get_stake_activation(
         &self,
         stake_account: Pubkey,
@@ -481,16 +1357,42 @@ impl RpcClient {
                 stake_account.to_string(),
                 RpcEpochConfig {
                     epoch,
-                    commitment: Some(self.commitment_config),
+                    commitment: Some(self.commitment()),
                 }
             ]),
         )
     }
 
+    /// # Examples
+    ///
+    /// ```
+    /// # use solana_client::{
+    /// #     rpc_client::RpcClient,
+    /// #     client_error::ClientError,
+    /// # };
+    /// # let rpc_client = RpcClient::new_mock("succeeds".to_string());
+    /// let supply = rpc_client.supply()?;
+    /// # Ok::<(), ClientError>(())
+    /// ```
     pub fn supply(&self) -> RpcResult<RpcSupply> {
-        self.supply_with_commitment(self.commitment_config)
-    }
-
+        self.supply_with_commitment(self.commitment())
+    }
+
+    /// # Examples
+    ///
+    /// ```
+    /// # use solana_client::{
+    /// #     rpc_client::RpcClient,
+    /// #     client_error::ClientError,
+    /// # };
+    /// # use solana_sdk::commitment_config::CommitmentConfig;
+    /// # let rpc_client = RpcClient::new_mock("succeeds".to_string());
+    /// let commitment_config = CommitmentConfig::processed();
+    /// let supply = rpc_client.supply_with_commitment(
+    ///     commitment_config,
+    /// )?;
+    /// # Ok::<(), ClientError>(())
+    /// ```
     pub fn supply_with_commitment(
         &self,
         commitment_config: CommitmentConfig,
@@ -501,6 +1403,27 @@ impl RpcClient {
         )
     }
 
+    /// # Examples
+    ///
+    /// ```
+    /// # use solana_client::{
+    /// #     rpc_client::RpcClient,
+    /// #     client_error::ClientError,
+    /// #     rpc_config::RpcLargestAccountsConfig,
+    /// #     rpc_config::RpcLargestAccountsFilter,
+    /// # };
+    /// # use solana_sdk::commitment_config::CommitmentConfig;
+    /// # let rpc_client = RpcClient::new_mock("succeeds".to_string());
+    /// let commitment_config = CommitmentConfig::processed();
+    /// let config = RpcLargestAccountsConfig {
+    ///     commitment: Some(commitment_config),
+    ///     filter: Some(RpcLargestAccountsFilter::Circulating),
+    /// };
+    /// let accounts = rpc_client.get_largest_accounts_with_config(
+    ///     config,
+    /// )?;
+    /// # Ok::<(), ClientError>(())
+    /// ```
     pub fn get_largest_accounts_with_config(
         &self,
         config: RpcLargestAccountsConfig,
@@ -514,10 +1437,36 @@ impl RpcClient {
         self.send(RpcRequest::GetLargestAccounts, json!([config]))
     }
 
+    /// # Examples
+    ///
+    /// ```
+    /// # use solana_client::{
+    /// #     rpc_client::RpcClient,
+    /// #     client_error::ClientError,
+    /// # };
+    /// # let rpc_client = RpcClient::new_mock("succeeds".to_string());
+    /// let accounts = rpc_client.get_vote_accounts()?;
+    /// # Ok::<(), ClientError>(())
+    /// ```
     pub fn get_vote_accounts(&self) -> ClientResult<RpcVoteAccountStatus> {
-        self.get_vote_accounts_with_commitment(self.commitment_config)
-    }
-
+        self.get_vote_accounts_with_commitment(self.commitment())
+    }
+
+    /// # Examples
+    ///
+    /// ```
+    /// # use solana_sdk::commitment_config::CommitmentConfig;
+    /// # use solana_client::{
+    /// #     rpc_client::RpcClient,
+    /// #     client_error::ClientError,
+    /// # };
+    /// # let rpc_client = RpcClient::new_mock("succeeds".to_string());
+    /// let commitment_config = CommitmentConfig::processed();
+    /// let accounts = rpc_client.get_vote_accounts_with_commitment(
+    ///     commitment_config,
+    /// )?;
+    /// # Ok::<(), ClientError>(())
+    /// ```
     pub fn get_vote_accounts_with_commitment(
         &self,
         commitment_config: CommitmentConfig,
@@ -528,6 +1477,34 @@ impl RpcClient {
         })
     }
 
+    /// # Examples
+    ///
+    /// ```
+    /// # use solana_client::{
+    /// #     rpc_client::RpcClient,
+    /// #     client_error::ClientError,
+    /// #     rpc_config::RpcGetVoteAccountsConfig,
+    /// # };
+    /// # use solana_sdk::{
+    /// #     signer::keypair::Keypair,
+    /// #     signature::Signer,
+    /// #     commitment_config::CommitmentConfig,
+    /// # };
+    /// # let rpc_client = RpcClient::new_mock("succeeds".to_string());
+    /// # let vote_keypair = Keypair::new();
+    /// let vote_pubkey = vote_keypair.pubkey();
+    /// let commitment = CommitmentConfig::processed();
+    /// let config = RpcGetVoteAccountsConfig {
+    ///     vote_pubkey: Some(vote_pubkey.to_string()),
+    ///     commitment: Some(commitment),
+    ///     keep_unstaked_delinquents: Some(true),
+    ///     delinquent_slot_distance: Some(10),
+    /// };
+    /// let accounts = rpc_client.get_vote_accounts_with_config(
+    ///     config,
+    /// )?;
+    /// # Ok::<(), ClientError>(())
+    /// ```
     pub fn get_vote_accounts_with_config(
         &self,
         config: RpcGetVoteAccountsConfig,
@@ -892,7 +1869,7 @@ impl RpcClient {
     }
 
     pub fn get_epoch_info(&self) -> ClientResult<EpochInfo> {
-        self.get_epoch_info_with_commitment(self.commitment_config)
+        self.get_epoch_info_with_commitment(self.commitment())
     }
 
     pub fn get_epoch_info_with_commitment(
@@ -909,7 +1886,7 @@ impl RpcClient {
         &self,
         slot: Option<Slot>,
     ) -> ClientResult<Option<RpcLeaderSchedule>> {
-        self.get_leader_schedule_with_commitment(slot, self.commitment_config)
+        self.get_leader_schedule_with_commitment(slot, self.commitment())
     }
 
     pub fn get_leader_schedule_with_commitment(
@@ -979,7 +1956,7 @@ impl RpcClient {
                 addresses,
                 RpcEpochConfig {
                     epoch,
-                    commitment: Some(self.commitment_config),
+                    commitment: Some(self.commitment()),
                 }
             ]),
         )
@@ -997,55 +1974,61 @@ impl RpcClient {
         &self,
         transaction: &Transaction,
     ) -> ClientResult<Signature> {
-        let signature = self.send_transaction(transaction)?;
-        let recent_blockhash = if uses_durable_nonce(transaction).is_some() {
-            self.get_recent_blockhash_with_commitment(CommitmentConfig::processed())?
-                .value
-                .0
-        } else {
-            transaction.message.recent_blockhash
-        };
-        let status = loop {
-            let status = self.get_signature_status(&signature)?;
-            if status.is_none() {
-                if self
-                    .get_fee_calculator_for_blockhash_with_commitment(
-                        &recent_blockhash,
-                        CommitmentConfig::processed(),
-                    )?
-                    .value
-                    .is_none()
-                {
-                    break status;
-                }
+        const SEND_RETRIES: usize = 1;
+        const GET_STATUS_RETRIES: usize = usize::MAX;
+
+        'sending: for _ in 0..SEND_RETRIES {
+            let signature = self.send_transaction(transaction)?;
+
+            let recent_blockhash = if uses_durable_nonce(transaction).is_some() {
+                let (recent_blockhash, ..) = self
+                    .get_recent_blockhash_with_commitment(CommitmentConfig::processed())?
+                    .value;
+                recent_blockhash
             } else {
-                break status;
-            }
-            if cfg!(not(test)) {
-                // Retry twice a second
-                sleep(Duration::from_millis(500));
-            }
-        };
-        if let Some(result) = status {
-            match result {
-                Ok(_) => Ok(signature),
-                Err(err) => Err(err.into()),
+                transaction.message.recent_blockhash
+            };
+
+            for status_retry in 0..GET_STATUS_RETRIES {
+                match self.get_signature_status(&signature)? {
+                    Some(Ok(_)) => return Ok(signature),
+                    Some(Err(e)) => return Err(e.into()),
+                    None => {
+                        let fee_calculator = self
+                            .get_fee_calculator_for_blockhash_with_commitment(
+                                &recent_blockhash,
+                                CommitmentConfig::processed(),
+                            )?
+                            .value;
+                        if fee_calculator.is_none() {
+                            // Block hash is not found by some reason
+                            break 'sending;
+                        } else if cfg!(not(test))
+                            // Ignore sleep at last step.
+                            && status_retry < GET_STATUS_RETRIES
+                        {
+                            // Retry twice a second
+                            sleep(Duration::from_millis(500));
+                            continue;
+                        }
+                    }
+                }
             }
-        } else {
-            Err(RpcError::ForUser(
-                "unable to confirm transaction. \
-                                  This can happen in situations such as transaction expiration \
-                                  and insufficient fee-payer funds"
-                    .to_string(),
-            )
-            .into())
         }
+
+        Err(RpcError::ForUser(
+            "unable to confirm transaction. \
+             This can happen in situations such as transaction expiration \
+             and insufficient fee-payer funds"
+                .to_string(),
+        )
+        .into())
     }
 
     /// Note that `get_account` returns `Err(..)` if the account does not exist whereas
     /// `get_account_with_commitment` returns `Ok(None)` if the account does not exist.
     pub fn get_account(&self, pubkey: &Pubkey) -> ClientResult<Account> {
-        self.get_account_with_commitment(pubkey, self.commitment_config)?
+        self.get_account_with_commitment(pubkey, self.commitment())?
             .value
             .ok_or_else(|| RpcError::ForUser(format!("AccountNotFound: pubkey={}", pubkey)).into())
     }
@@ -1101,7 +2084,7 @@ impl RpcClient {
 
     pub fn get_multiple_accounts(&self, pubkeys: &[Pubkey]) -> ClientResult<Vec<Option<Account>>> {
         Ok(self
-            .get_multiple_accounts_with_commitment(pubkeys, self.commitment_config)?
+            .get_multiple_accounts_with_commitment(pubkeys, self.commitment())?
             .value)
     }
 
@@ -1155,7 +2138,7 @@ impl RpcClient {
     /// Request the balance of the account `pubkey`.
     pub fn get_balance(&self, pubkey: &Pubkey) -> ClientResult<u64> {
         Ok(self
-            .get_balance_with_commitment(pubkey, self.commitment_config)?
+            .get_balance_with_commitment(pubkey, self.commitment())?
             .value)
     }
 
@@ -1213,7 +2196,7 @@ impl RpcClient {
 
     /// Request the transaction count.
     pub fn get_transaction_count(&self) -> ClientResult<u64> {
-        self.get_transaction_count_with_commitment(self.commitment_config)
+        self.get_transaction_count_with_commitment(self.commitment())
     }
 
     pub fn get_transaction_count_with_commitment(
@@ -1226,9 +2209,37 @@ impl RpcClient {
         )
     }
 
+    pub fn get_fees(&self) -> ClientResult<Fees> {
+        Ok(self.get_fees_with_commitment(self.commitment())?.value)
+    }
+
+    pub fn get_fees_with_commitment(&self, commitment_config: CommitmentConfig) -> RpcResult<Fees> {
+        let Response {
+            context,
+            value: fees,
+        } = self.send::<Response<RpcFees>>(
+            RpcRequest::GetFees,
+            json!([self.maybe_map_commitment(commitment_config)?]),
+        )?;
+        let blockhash = fees.blockhash.parse().map_err(|_| {
+            ClientError::new_with_request(
+                RpcError::ParseError("Hash".to_string()).into(),
+                RpcRequest::GetFees,
+            )
+        })?;
+        Ok(Response {
+            context,
+            value: Fees {
+                blockhash,
+                fee_calculator: fees.fee_calculator,
+                last_valid_block_height: fees.last_valid_block_height,
+            },
+        })
+    }
+
     pub fn get_recent_blockhash(&self) -> ClientResult<(Hash, FeeCalculator)> {
         let (blockhash, fee_calculator, _last_valid_slot) = self
-            .get_recent_blockhash_with_commitment(self.commitment_config)?
+            .get_recent_blockhash_with_commitment(self.commitment())?
             .value;
         Ok((blockhash, fee_calculator))
     }
@@ -1301,7 +2312,7 @@ impl RpcClient {
         blockhash: &Hash,
     ) -> ClientResult<Option<FeeCalculator>> {
         Ok(self
-            .get_fee_calculator_for_blockhash_with_commitment(blockhash, self.commitment_config)?
+            .get_fee_calculator_for_blockhash_with_commitment(blockhash, self.commitment())?
             .value)
     }
 
@@ -1383,7 +2394,7 @@ impl RpcClient {
 
     pub fn get_token_account(&self, pubkey: &Pubkey) -> ClientResult<Option<UiTokenAccount>> {
         Ok(self
-            .get_token_account_with_commitment(pubkey, self.commitment_config)?
+            .get_token_account_with_commitment(pubkey, self.commitment())?
             .value)
     }
 
@@ -1444,7 +2455,7 @@ impl RpcClient {
 
     pub fn get_token_account_balance(&self, pubkey: &Pubkey) -> ClientResult<UiTokenAmount> {
         Ok(self
-            .get_token_account_balance_with_commitment(pubkey, self.commitment_config)?
+            .get_token_account_balance_with_commitment(pubkey, self.commitment())?
             .value)
     }
 
@@ -1471,7 +2482,7 @@ impl RpcClient {
             .get_token_accounts_by_delegate_with_commitment(
                 delegate,
                 token_account_filter,
-                self.commitment_config,
+                self.commitment(),
             )?
             .value)
     }
@@ -1510,7 +2521,7 @@ impl RpcClient {
             .get_token_accounts_by_owner_with_commitment(
                 owner,
                 token_account_filter,
-                self.commitment_config,
+                self.commitment(),
             )?
             .value)
     }
@@ -1542,7 +2553,7 @@ impl RpcClient {
 
     pub fn get_token_supply(&self, mint: &Pubkey) -> ClientResult<UiTokenAmount> {
         Ok(self
-            .get_token_supply_with_commitment(mint, self.commitment_config)?
+            .get_token_supply_with_commitment(mint, self.commitment())?
             .value)
     }
 
@@ -1565,7 +2576,7 @@ impl RpcClient {
             pubkey,
             lamports,
             RpcRequestAirdropConfig {
-                commitment: Some(self.commitment_config),
+                commitment: Some(self.commitment()),
                 ..RpcRequestAirdropConfig::default()
             },
         )
@@ -1581,7 +2592,7 @@ impl RpcClient {
             pubkey,
             lamports,
             RpcRequestAirdropConfig {
-                commitment: Some(self.commitment_config),
+                commitment: Some(self.commitment()),
                 recent_blockhash: Some(recent_blockhash.to_string()),
             },
         )
@@ -1627,7 +2638,7 @@ impl RpcClient {
     ) -> ClientResult<u64> {
         let now = Instant::now();
         loop {
-            match self.get_balance_with_commitment(&pubkey, commitment_config) {
+            match self.get_balance_with_commitment(pubkey, commitment_config) {
                 Ok(bal) => {
                     return Ok(bal.value);
                 }
@@ -1684,7 +2695,7 @@ impl RpcClient {
 
     /// Poll the server to confirm a transaction.
     pub fn poll_for_signature(&self, signature: &Signature) -> ClientResult<()> {
-        self.poll_for_signature_with_commitment(signature, self.commitment_config)
+        self.poll_for_signature_with_commitment(signature, self.commitment())
     }
 
     /// Poll the server to confirm a transaction.
@@ -1696,7 +2707,7 @@ impl RpcClient {
         let now = Instant::now();
         loop {
             if let Ok(Some(_)) =
-                self.get_signature_status_with_commitment(&signature, commitment_config)
+                self.get_signature_status_with_commitment(signature, commitment_config)
             {
                 break;
             }
@@ -1794,7 +2805,7 @@ impl RpcClient {
     ) -> ClientResult<Signature> {
         self.send_and_confirm_transaction_with_spinner_and_commitment(
             transaction,
-            self.commitment_config,
+            self.commitment(),
         )
     }
 
@@ -1850,19 +2861,25 @@ impl RpcClient {
             "[{}/{}] Finalizing transaction {}",
             confirmations, desired_confirmations, signature,
         ));
+
+        let now = Instant::now();
+        let confirm_transaction_initial_timeout = self
+            .config
+            .confirm_transaction_initial_timeout
+            .unwrap_or_default();
         let (signature, status) = loop {
             // Get recent commitment in order to count confirmations for successful transactions
             let status = self
-                .get_signature_status_with_commitment(&signature, CommitmentConfig::processed())?;
+                .get_signature_status_with_commitment(signature, CommitmentConfig::processed())?;
             if status.is_none() {
-                if self
+                let blockhash_not_found = self
                     .get_fee_calculator_for_blockhash_with_commitment(
-                        &recent_blockhash,
+                        recent_blockhash,
                         CommitmentConfig::processed(),
                     )?
                     .value
-                    .is_none()
-                {
+                    .is_none();
+                if blockhash_not_found && now.elapsed() >= confirm_transaction_initial_timeout {
                     break (signature, status);
                 }
             } else {
@@ -1891,7 +2908,7 @@ impl RpcClient {
             // Return when specified commitment is reached
             // Failed transactions have already been eliminated, `is_some` check is sufficient
             if self
-                .get_signature_status_with_commitment(&signature, commitment)?
+                .get_signature_status_with_commitment(signature, commitment)?
                 .is_some()
             {
                 progress_bar.set_message("Transaction confirmed");
@@ -1907,7 +2924,7 @@ impl RpcClient {
             ));
             sleep(Duration::from_millis(500));
             confirmations = self
-                .get_num_blocks_since_signature_confirmation(&signature)
+                .get_num_blocks_since_signature_confirmation(signature)
                 .unwrap_or(confirmations);
             if now.elapsed().as_secs() >= MAX_HASH_AGE_IN_SECONDS as u64 {
                 return Err(
@@ -1924,6 +2941,7 @@ impl RpcClient {
         T: serde::de::DeserializeOwned,
     {
         assert!(params.is_array() || params.is_null());
+
         let response = self
             .sender
             .send(request, params)
@@ -1933,6 +2951,26 @@ impl RpcClient {
     }
 }
 
+fn serialize_encode_transaction(
+    transaction: &Transaction,
+    encoding: UiTransactionEncoding,
+) -> ClientResult<String> {
+    let serialized = serialize(transaction)
+        .map_err(|e| ClientErrorKind::Custom(format!("transaction serialization failed: {}", e)))?;
+    let encoded = match encoding {
+        UiTransactionEncoding::Base58 => bs58::encode(serialized).into_string(),
+        UiTransactionEncoding::Base64 => base64::encode(serialized),
+        _ => {
+            return Err(ClientErrorKind::Custom(format!(
+                "unsupported transaction encoding: {}. Supported encodings: base58, base64",
+                encoding
+            ))
+            .into())
+        }
+    };
+    Ok(encoded)
+}
+
 #[derive(Debug, Default)]
 pub struct GetConfirmedSignaturesForAddress2Config {
     pub before: Option<Signature>,
@@ -1991,7 +3029,9 @@ mod tests {
     use jsonrpc_http_server::{AccessControlAllowOrigin, DomainsValidation, ServerBuilder};
     use serde_json::Number;
     use solana_sdk::{
-        instruction::InstructionError, signature::Keypair, system_transaction,
+        instruction::InstructionError,
+        signature::{Keypair, Signer},
+        system_transaction,
         transaction::TransactionError,
     };
     use std::{io, sync::mpsc::channel, thread};
@@ -2087,6 +3127,7 @@ mod tests {
         let signature = rpc_client.send_transaction(&tx);
         assert!(signature.is_err());
     }
+
     #[test]
     fn test_get_recent_blockhash() {
         let rpc_client = RpcClient::new_mock("succeeds".to_string());
@@ -2101,6 +3142,20 @@ mod tests {
         assert!(rpc_client.get_recent_blockhash().is_err());
     }
 
+    #[test]
+    fn test_custom_request() {
+        let rpc_client = RpcClient::new_mock("succeeds".to_string());
+
+        let slot = rpc_client.get_slot().unwrap();
+        assert_eq!(slot, 0);
+
+        let custom_slot = rpc_client
+            .send::<Slot>(RpcRequest::Custom { method: "getSlot" }, Value::Null)
+            .unwrap();
+
+        assert_eq!(slot, custom_slot);
+    }
+
     #[test]
     fn test_get_signature_status() {
         let signature = Signature::default();
@@ -2155,4 +3210,23 @@ mod tests {
         let rpc_client = RpcClient::new_mock("succeeds".to_string());
         thread::spawn(move || rpc_client);
     }
+
+    // Regression test that the get_block_production_with_config
+    // method internally creates the json params array correctly.
+    #[test]
+    fn get_block_production_with_config_no_error() -> ClientResult<()> {
+        let rpc_client = RpcClient::new_mock("succeeds".to_string());
+
+        let config = RpcBlockProductionConfig {
+            identity: Some(Keypair::new().pubkey().to_string()),
+            range: None,
+            commitment: None,
+        };
+
+        let prod = rpc_client.get_block_production_with_config(config)?.value;
+
+        assert!(!prod.by_identity.is_empty());
+
+        Ok(())
+    }
 }
diff --git a/client/src/rpc_config.rs b/client/src/rpc_config.rs
index 5597384e3081dc..cd9e2fa11dc4d0 100644
--- a/client/src/rpc_config.rs
+++ b/client/src/rpc_config.rs
@@ -81,6 +81,8 @@ pub struct RpcGetVoteAccountsConfig {
     pub vote_pubkey: Option<String>, // validator vote address, as a base-58 encoded string
     #[serde(flatten)]
     pub commitment: Option<CommitmentConfig>,
+    pub keep_unstaked_delinquents: Option<bool>,
+    pub delinquent_slot_distance: Option<u64>,
 }
 
 #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
@@ -114,6 +116,15 @@ pub struct RpcLargestAccountsConfig {
     pub filter: Option<RpcLargestAccountsFilter>,
 }
 
+#[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct RpcSupplyConfig {
+    #[serde(flatten)]
+    pub commitment: Option<CommitmentConfig>,
+    #[serde(default)]
+    pub exclude_non_circulating_accounts_list: bool,
+}
+
 #[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct RpcEpochConfig {
diff --git a/client/src/rpc_custom_error.rs b/client/src/rpc_custom_error.rs
index 400947dcd6e828..82487e3a986e6f 100644
--- a/client/src/rpc_custom_error.rs
+++ b/client/src/rpc_custom_error.rs
@@ -1,5 +1,5 @@
 //! Implementation defined RPC server errors
-
+use thiserror::Error;
 use {
     crate::rpc_response::RpcSimulateTransactionResult,
     jsonrpc_core::{Error, ErrorCode},
@@ -17,35 +17,43 @@ pub const JSON_RPC_SERVER_ERROR_NO_SNAPSHOT: i64 = -32008;
 pub const JSON_RPC_SERVER_ERROR_LONG_TERM_STORAGE_SLOT_SKIPPED: i64 = -32009;
 pub const JSON_RPC_SERVER_ERROR_KEY_EXCLUDED_FROM_SECONDARY_INDEX: i64 = -32010;
 pub const JSON_RPC_SERVER_ERROR_TRANSACTION_HISTORY_NOT_AVAILABLE: i64 = -32011;
+pub const JSON_RPC_SCAN_ERROR: i64 = -32012;
+pub const JSON_RPC_SERVER_ERROR_TRANSACTION_SIGNATURE_LEN_MISMATCH: i64 = -32013;
 
+#[derive(Error, Debug)]
 pub enum RpcCustomError {
+    #[error("BlockCleanedUp")]
     BlockCleanedUp {
         slot: Slot,
         first_available_block: Slot,
     },
+    #[error("SendTransactionPreflightFailure")]
     SendTransactionPreflightFailure {
         message: String,
         result: RpcSimulateTransactionResult,
     },
+    #[error("TransactionSignatureVerificationFailure")]
     TransactionSignatureVerificationFailure,
-    BlockNotAvailable {
-        slot: Slot,
-    },
-    NodeUnhealthy {
-        num_slots_behind: Option<Slot>,
-    },
+    #[error("BlockNotAvailable")]
+    BlockNotAvailable { slot: Slot },
+    #[error("NodeUnhealthy")]
+    NodeUnhealthy { num_slots_behind: Option<Slot> },
+    #[error("TransactionPrecompileVerificationFailure")]
     TransactionPrecompileVerificationFailure(solana_sdk::transaction::TransactionError),
-    SlotSkipped {
-        slot: Slot,
-    },
+    #[error("SlotSkipped")]
+    SlotSkipped { slot: Slot },
+    #[error("NoSnapshot")]
     NoSnapshot,
-    LongTermStorageSlotSkipped {
-        slot: Slot,
-    },
-    KeyExcludedFromSecondaryIndex {
-        index_key: String,
-    },
+    #[error("LongTermStorageSlotSkipped")]
+    LongTermStorageSlotSkipped { slot: Slot },
+    #[error("KeyExcludedFromSecondaryIndex")]
+    KeyExcludedFromSecondaryIndex { index_key: String },
+    #[error("TransactionHistoryNotAvailable")]
     TransactionHistoryNotAvailable,
+    #[error("ScanError")]
+    ScanError { message: String },
+    #[error("TransactionSignatureLenMismatch")]
+    TransactionSignatureLenMismatch,
 }
 
 #[derive(Debug, Serialize, Deserialize)]
@@ -141,6 +149,18 @@ impl From<RpcCustomError> for Error {
                 message: "Transaction history is not available from this node".to_string(),
                 data: None,
             },
+            RpcCustomError::ScanError { message } => Self {
+                code: ErrorCode::ServerError(JSON_RPC_SCAN_ERROR),
+                message,
+                data: None,
+            },
+            RpcCustomError::TransactionSignatureLenMismatch => Self {
+                code: ErrorCode::ServerError(
+                    JSON_RPC_SERVER_ERROR_TRANSACTION_SIGNATURE_LEN_MISMATCH,
+                ),
+                message: "Transaction signature length mismatch".to_string(),
+                data: None,
+            },
         }
     }
 }
diff --git a/client/src/rpc_request.rs b/client/src/rpc_request.rs
index 25d76ff28404be..52bae09c161024 100644
--- a/client/src/rpc_request.rs
+++ b/client/src/rpc_request.rs
@@ -86,6 +86,9 @@ pub enum RpcRequest {
     SendTransaction,
     SimulateTransaction,
     SignVote,
+    Custom {
+        method: &'static str,
+    },
 }
 
 #[allow(deprecated)]
@@ -154,6 +157,7 @@ impl fmt::Display for RpcRequest {
             RpcRequest::SendTransaction => "sendTransaction",
             RpcRequest::SimulateTransaction => "simulateTransaction",
             RpcRequest::SignVote => "signVote",
+            RpcRequest::Custom { method } => method,
         };
 
         write!(f, "{}", method)
diff --git a/client/src/rpc_response.rs b/client/src/rpc_response.rs
index a712739e60d14c..ddbc41ef209a40 100644
--- a/client/src/rpc_response.rs
+++ b/client/src/rpc_response.rs
@@ -4,6 +4,7 @@ use {
     solana_sdk::{
         clock::{Epoch, Slot, UnixTimestamp},
         fee_calculator::{FeeCalculator, FeeRateGovernor},
+        hash::Hash,
         inflation::Inflation,
         transaction::{Result, TransactionError},
     },
@@ -57,6 +58,14 @@ pub struct DeprecatedRpcFees {
     pub last_valid_slot: Slot,
 }
 
+#[derive(Serialize, Deserialize, Clone, Debug)]
+#[serde(rename_all = "camelCase")]
+pub struct Fees {
+    pub blockhash: Hash,
+    pub fee_calculator: FeeCalculator,
+    pub last_valid_block_height: u64,
+}
+
 #[derive(Serialize, Deserialize, Clone, Debug)]
 #[serde(rename_all = "camelCase")]
 pub struct RpcFeeCalculator {
@@ -394,8 +403,9 @@ pub struct RpcPerfSample {
 pub struct RpcInflationReward {
     pub epoch: Epoch,
     pub effective_slot: Slot,
-    pub amount: u64,       // lamports
-    pub post_balance: u64, // lamports
+    pub amount: u64,            // lamports
+    pub post_balance: u64,      // lamports
+    pub commission: Option<u8>, // Vote account commission when the reward was credited
 }
 
 impl From<ConfirmedTransactionStatusWithSignature> for RpcConfirmedTransactionStatusWithSignature {
diff --git a/client/src/rpc_sender.rs b/client/src/rpc_sender.rs
index 6574637b0a2ba7..75e5aab0e0c099 100644
--- a/client/src/rpc_sender.rs
+++ b/client/src/rpc_sender.rs
@@ -1,5 +1,18 @@
+//! A transport for RPC calls.
+
 use crate::{client_error::Result, rpc_request::RpcRequest};
 
+/// A transport for RPC calls.
+///
+/// `RpcSender` implements the underlying transport of requests to, and
+/// responses from, a Solana node, and is used primarily by [`RpcClient`].
+///
+/// It is typically implemented by [`HttpSender`] in production, and
+/// [`MockSender`] in unit tests.
+///
+/// [`RpcClient`]: crate::rpc_client::RpcClient
+/// [`HttpSender`]: crate::http_sender::HttpSender
+/// [`MockSender`]: crate::mock_sender::MockSender
 pub trait RpcSender {
     fn send(&self, request: RpcRequest, params: serde_json::Value) -> Result<serde_json::Value>;
 }
diff --git a/client/src/thin_client.rs b/client/src/thin_client.rs
index 8b3d0830840c6e..3988e8e5d086b3 100644
--- a/client/src/thin_client.rs
+++ b/client/src/thin_client.rs
@@ -451,7 +451,7 @@ impl SyncClient for ThinClient {
     ) -> TransportResult<Option<transaction::Result<()>>> {
         let status = self
             .rpc_client()
-            .get_signature_status(&signature)
+            .get_signature_status(signature)
             .map_err(|err| {
                 io::Error::new(
                     io::ErrorKind::Other,
@@ -468,7 +468,7 @@ impl SyncClient for ThinClient {
     ) -> TransportResult<Option<transaction::Result<()>>> {
         let status = self
             .rpc_client()
-            .get_signature_status_with_commitment(&signature, commitment_config)
+            .get_signature_status_with_commitment(signature, commitment_config)
             .map_err(|err| {
                 io::Error::new(
                     io::ErrorKind::Other,
diff --git a/client/src/tpu_client.rs b/client/src/tpu_client.rs
index ae264f9875fe18..01c902af12a009 100644
--- a/client/src/tpu_client.rs
+++ b/client/src/tpu_client.rs
@@ -121,7 +121,7 @@ struct LeaderTpuCache {
 impl LeaderTpuCache {
     fn new(rpc_client: &RpcClient, first_slot: Slot) -> Self {
         let leaders = Self::fetch_slot_leaders(rpc_client, first_slot).unwrap_or_default();
-        let leader_tpu_map = Self::fetch_cluster_tpu_sockets(&rpc_client).unwrap_or_default();
+        let leader_tpu_map = Self::fetch_cluster_tpu_sockets(rpc_client).unwrap_or_default();
         Self {
             first_slot,
             leaders,
diff --git a/core/Cargo.toml b/core/Cargo.toml
index c75e7cf30baa81..aa6ade53440c1c 100644
--- a/core/Cargo.toml
+++ b/core/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "solana-core"
 description = "Blockchain, Rebuilt for Scale"
-version = "1.7.0"
+version = "1.7.11"
 homepage = "https://solana.com/"
 documentation = "https://docs.rs/solana-core"
 readme = "../README.md"
@@ -22,17 +22,12 @@ bv = { version = "0.11.1", features = ["serde"] }
 bs58 = "0.3.1"
 byteorder = "1.3.4"
 chrono = { version = "0.4.11", features = ["serde"] }
-core_affinity = "0.5.10"
 crossbeam-channel = "0.4"
 ed25519-dalek = "=1.0.1"
 fs_extra = "1.2.0"
 flate2 = "1.0"
 indexmap = { version = "1.5", features = ["rayon"] }
 itertools = "0.9.0"
-jsonrpc-core = "17.0.0"
-jsonrpc-core-client = { version = "17.0.0", features = ["ipc", "ws"] }
-jsonrpc-derive = "17.0.0"
-jsonrpc-http-server = "17.0.0"
 libc = "0.2.81"
 log = "0.4.11"
 lru = "0.6.1"
@@ -44,54 +39,52 @@ rand_chacha = "0.2.2"
 rand_core = "0.6.2"
 raptorq = "1.4.2"
 rayon = "1.5.0"
-regex = "1.3.9"
 retain_mut = "0.1.2"
 serde = "1.0.122"
 serde_bytes = "0.11"
 serde_derive = "1.0.103"
-serde_json = "1.0.56"
-solana-account-decoder = { path = "../account-decoder", version = "=1.7.0" }
-solana-banks-server = { path = "../banks-server", version = "=1.7.0" }
-solana-clap-utils = { path = "../clap-utils", version = "=1.7.0" }
-solana-client = { path = "../client", version = "=1.7.0" }
-solana-faucet = { path = "../faucet", version = "=1.7.0" }
-solana-gossip = { path = "../gossip", version = "=1.7.0" }
-solana-ledger = { path = "../ledger", version = "=1.7.0" }
-solana-logger = { path = "../logger", version = "=1.7.0" }
-solana-merkle-tree = { path = "../merkle-tree", version = "=1.7.0" }
-solana-metrics = { path = "../metrics", version = "=1.7.0" }
-solana-measure = { path = "../measure", version = "=1.7.0" }
-solana-net-utils = { path = "../net-utils", version = "=1.7.0" }
-solana-perf = { path = "../perf", version = "=1.7.0" }
-solana-program-test = { path = "../program-test", version = "=1.7.0" }
-solana-rpc = { path = "../rpc", version = "=1.7.0" }
-solana-runtime = { path = "../runtime", version = "=1.7.0" }
-solana-sdk = { path = "../sdk", version = "=1.7.0" }
-solana-frozen-abi = { path = "../frozen-abi", version = "=1.7.0" }
-solana-frozen-abi-macro = { path = "../frozen-abi/macro", version = "=1.7.0" }
-solana-stake-program = { path = "../programs/stake", version = "=1.7.0" }
-solana-storage-bigtable = { path = "../storage-bigtable", version = "=1.7.0" }
-solana-streamer = { path = "../streamer", version = "=1.7.0" }
-solana-sys-tuner = { path = "../sys-tuner", version = "=1.7.0" }
-solana-transaction-status = { path = "../transaction-status", version = "=1.7.0" }
-solana-version = { path = "../version", version = "=1.7.0" }
-solana-vote-program = { path = "../programs/vote", version = "=1.7.0" }
-spl-token-v2-0 = { package = "spl-token", version = "=3.1.0", features = ["no-entrypoint"] }
+solana-account-decoder = { path = "../account-decoder", version = "=1.7.11" }
+solana-banks-server = { path = "../banks-server", version = "=1.7.11" }
+solana-clap-utils = { path = "../clap-utils", version = "=1.7.11" }
+solana-client = { path = "../client", version = "=1.7.11" }
+solana-gossip = { path = "../gossip", version = "=1.7.11" }
+solana-ledger = { path = "../ledger", version = "=1.7.11" }
+solana-logger = { path = "../logger", version = "=1.7.11" }
+solana-merkle-tree = { path = "../merkle-tree", version = "=1.7.11" }
+solana-metrics = { path = "../metrics", version = "=1.7.11" }
+solana-measure = { path = "../measure", version = "=1.7.11" }
+solana-net-utils = { path = "../net-utils", version = "=1.7.11" }
+solana-perf = { path = "../perf", version = "=1.7.11" }
+solana-poh = { path = "../poh", version = "=1.7.11" }
+solana-program-test = { path = "../program-test", version = "=1.7.11" }
+solana-rpc = { path = "../rpc", version = "=1.7.11" }
+solana-runtime = { path = "../runtime", version = "=1.7.11" }
+solana-sdk = { path = "../sdk", version = "=1.7.11" }
+solana-frozen-abi = { path = "../frozen-abi", version = "=1.7.11" }
+solana-frozen-abi-macro = { path = "../frozen-abi/macro", version = "=1.7.11" }
+solana-streamer = { path = "../streamer", version = "=1.7.11" }
+solana-transaction-status = { path = "../transaction-status", version = "=1.7.11" }
+solana-version = { path = "../version", version = "=1.7.11" }
+solana-vote-program = { path = "../programs/vote", version = "=1.7.11" }
+spl-token-v2-0 = { package = "spl-token", version = "=3.2.0", features = ["no-entrypoint"] }
 tempfile = "3.1.0"
 thiserror = "1.0"
-tokio = { version = "1", features = ["full"] }
-tokio_02 = { version = "0.2", package = "tokio", features = ["full"] }
-tokio-util = { version = "0.3", features = ["codec"] } # This crate needs to stay in sync with tokio_02, until that dependency can be removed
-solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "=1.7.0" }
+solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "=1.7.11" }
 trees = "0.2.1"
 
 [dev-dependencies]
+jsonrpc-core = "17.1.0"
+jsonrpc-core-client = { version = "17.1.0", features = ["ipc", "ws"] }
 matches = "0.1.6"
 num_cpus = "1.13.0"
 reqwest = { version = "0.11.2", default-features = false, features = ["blocking", "rustls-tls", "json"] }
+serde_json = "1.0.56"
 serial_test = "0.4.0"
+solana-stake-program = { path = "../programs/stake", version = "=1.7.11" }
+solana-version = { path = "../version", version = "=1.7.11" }
 symlink = "0.1.0"
 systemstat = "0.1.5"
+tokio_02 = { version = "0.2", package = "tokio", features = ["full"] }
 
 [build-dependencies]
 rustc_version = "0.2"
@@ -111,9 +104,6 @@ name = "gen_keys"
 [[bench]]
 name = "sigverify_stage"
 
-[[bench]]
-name = "poh"
-
 [[bench]]
 name = "retransmit_stage"
 
diff --git a/core/benches/banking_stage.rs b/core/benches/banking_stage.rs
index 13e2d088c532b9..0d411e554d8624 100644
--- a/core/benches/banking_stage.rs
+++ b/core/benches/banking_stage.rs
@@ -7,8 +7,7 @@ use crossbeam_channel::unbounded;
 use log::*;
 use rand::{thread_rng, Rng};
 use rayon::prelude::*;
-use solana_core::banking_stage::{create_test_recorder, BankingStage, BankingStageStats};
-use solana_core::poh_recorder::WorkingBankEntry;
+use solana_core::banking_stage::{BankingStage, BankingStageStats};
 use solana_gossip::cluster_info::ClusterInfo;
 use solana_gossip::cluster_info::Node;
 use solana_ledger::blockstore_processor::process_entries;
@@ -17,6 +16,7 @@ use solana_ledger::genesis_utils::{create_genesis_config, GenesisConfigInfo};
 use solana_ledger::{blockstore::Blockstore, get_tmp_ledger_path};
 use solana_perf::packet::to_packets_chunked;
 use solana_perf::test_tx::test_tx;
+use solana_poh::poh_recorder::{create_test_recorder, WorkingBankEntry};
 use solana_runtime::bank::Bank;
 use solana_sdk::genesis_config::GenesisConfig;
 use solana_sdk::hash::Hash;
@@ -29,6 +29,7 @@ use solana_sdk::system_instruction;
 use solana_sdk::system_transaction;
 use solana_sdk::timing::{duration_as_us, timestamp};
 use solana_sdk::transaction::Transaction;
+use solana_streamer::socket::SocketAddrSpace;
 use std::collections::VecDeque;
 use std::sync::atomic::Ordering;
 use std::sync::mpsc::Receiver;
@@ -183,7 +184,7 @@ fn bench_banking(bencher: &mut Bencher, tx_type: TransactionType) {
     });
     //sanity check, make sure all the transactions can execute sequentially
     transactions.iter().for_each(|tx| {
-        let res = bank.process_transaction(&tx);
+        let res = bank.process_transaction(tx);
         assert!(res.is_ok(), "sanity test transactions");
     });
     bank.clear_signatures();
@@ -201,7 +202,11 @@ fn bench_banking(bencher: &mut Bencher, tx_type: TransactionType) {
         );
         let (exit, poh_recorder, poh_service, signal_receiver) =
             create_test_recorder(&bank, &blockstore, None);
-        let cluster_info = ClusterInfo::new_with_invalid_keypair(Node::new_localhost().info);
+        let cluster_info = ClusterInfo::new(
+            Node::new_localhost().info,
+            Arc::new(Keypair::new()),
+            SocketAddrSpace::Unspecified,
+        );
         let cluster_info = Arc::new(cluster_info);
         let (s, _r) = unbounded();
         let _banking_stage = BankingStage::new(
diff --git a/core/benches/cluster_info.rs b/core/benches/cluster_info.rs
index 54750a249704f1..c3665998487311 100644
--- a/core/benches/cluster_info.rs
+++ b/core/benches/cluster_info.rs
@@ -3,13 +3,17 @@
 extern crate test;
 
 use rand::{thread_rng, Rng};
-use solana_core::broadcast_stage::broadcast_metrics::TransmitShredsStats;
-use solana_core::broadcast_stage::{broadcast_shreds, get_broadcast_peers};
-use solana_gossip::cluster_info::{ClusterInfo, Node};
-use solana_gossip::contact_info::ContactInfo;
+use solana_core::{
+    broadcast_stage::{broadcast_metrics::TransmitShredsStats, broadcast_shreds, BroadcastStage},
+    cluster_nodes::ClusterNodes,
+};
+use solana_gossip::{
+    cluster_info::{ClusterInfo, Node},
+    contact_info::ContactInfo,
+};
 use solana_ledger::shred::Shred;
-use solana_sdk::pubkey;
-use solana_sdk::timing::timestamp;
+use solana_sdk::{pubkey, signature::Keypair, timing::timestamp};
+use solana_streamer::socket::SocketAddrSpace;
 use std::{
     collections::HashMap,
     net::UdpSocket,
@@ -22,7 +26,11 @@ fn broadcast_shreds_bench(bencher: &mut Bencher) {
     solana_logger::setup();
     let leader_pubkey = pubkey::new_rand();
     let leader_info = Node::new_localhost_with_pubkey(&leader_pubkey);
-    let cluster_info = ClusterInfo::new_with_invalid_keypair(leader_info.info);
+    let cluster_info = ClusterInfo::new(
+        leader_info.info,
+        Arc::new(Keypair::new()),
+        SocketAddrSpace::Unspecified,
+    );
     let socket = UdpSocket::bind("0.0.0.0:0").unwrap();
 
     const NUM_SHREDS: usize = 32;
@@ -36,7 +44,7 @@ fn broadcast_shreds_bench(bencher: &mut Bencher) {
         stakes.insert(id, thread_rng().gen_range(1, NUM_PEERS) as u64);
     }
     let cluster_info = Arc::new(cluster_info);
-    let (peers, peers_and_stakes) = get_broadcast_peers(&cluster_info, Some(&stakes));
+    let cluster_nodes = ClusterNodes::<BroadcastStage>::new(&cluster_info, &stakes);
     let shreds = Arc::new(shreds);
     let last_datapoint = Arc::new(AtomicU64::new(0));
     bencher.iter(move || {
@@ -44,10 +52,10 @@ fn broadcast_shreds_bench(bencher: &mut Bencher) {
         broadcast_shreds(
             &socket,
             &shreds,
-            &peers_and_stakes,
-            &peers,
+            &cluster_nodes,
             &last_datapoint,
             &mut TransmitShredsStats::default(),
+            &SocketAddrSpace::Unspecified,
         )
         .unwrap();
     });
diff --git a/core/benches/consensus.rs b/core/benches/consensus.rs
index 64035f4c3af177..280ee08c13e46e 100644
--- a/core/benches/consensus.rs
+++ b/core/benches/consensus.rs
@@ -24,10 +24,10 @@ fn bench_save_tower(bench: &mut Bencher) {
     let heaviest_bank = BankForks::new(Bank::default()).working_bank();
     let tower = Tower::new(
         &node_keypair.pubkey(),
-        &vote_account_pubkey,
+        vote_account_pubkey,
         0,
         &heaviest_bank,
-        &path,
+        path,
     );
 
     bench.iter(move || {
diff --git a/core/benches/retransmit_stage.rs b/core/benches/retransmit_stage.rs
index 5d225560718def..d5816a3d49e948 100644
--- a/core/benches/retransmit_stage.rs
+++ b/core/benches/retransmit_stage.rs
@@ -21,6 +21,7 @@ use solana_sdk::pubkey;
 use solana_sdk::signature::{Keypair, Signer};
 use solana_sdk::system_transaction;
 use solana_sdk::timing::timestamp;
+use solana_streamer::socket::SocketAddrSpace;
 use std::net::UdpSocket;
 use std::sync::atomic::{AtomicUsize, Ordering};
 use std::sync::mpsc::channel;
@@ -35,11 +36,20 @@ use test::Bencher;
 #[allow(clippy::same_item_push)]
 fn bench_retransmitter(bencher: &mut Bencher) {
     solana_logger::setup();
-    let cluster_info = ClusterInfo::new_with_invalid_keypair(Node::new_localhost().info);
+    let cluster_info = ClusterInfo::new(
+        Node::new_localhost().info,
+        Arc::new(Keypair::new()),
+        SocketAddrSpace::Unspecified,
+    );
     const NUM_PEERS: usize = 4;
     let mut peer_sockets = Vec::new();
     for _ in 0..NUM_PEERS {
-        let id = pubkey::new_rand();
+        // This ensures that cluster_info.id() is the root of turbine
+        // retransmit tree and so the shreds are retransmited to all other
+        // nodes in the cluster.
+        let id = std::iter::repeat_with(pubkey::new_rand)
+            .find(|pk| cluster_info.id() < *pk)
+            .unwrap();
         let socket = UdpSocket::bind("0.0.0.0:0").unwrap();
         let mut contact_info = ContactInfo::new_localhost(&id, timestamp());
         contact_info.tvu = socket.local_addr().unwrap();
diff --git a/core/src/accounts_hash_verifier.rs b/core/src/accounts_hash_verifier.rs
index 07f115ac3047bd..c320a6c47c6a63 100644
--- a/core/src/accounts_hash_verifier.rs
+++ b/core/src/accounts_hash_verifier.rs
@@ -1,7 +1,7 @@
 // Service to verify accounts hashes with other trusted validator nodes.
 //
 // Each interval, publish the snapshat hash which is the full accounts state
-// hash on gossip. Monitor gossip for messages from validators in the --trusted-validators
+// hash on gossip. Monitor gossip for messages from validators in the `--known-validator`s
 // set and halt the node if a mismatch is detected.
 
 use crate::snapshot_packager_service::PendingSnapshotPackage;
@@ -148,7 +148,7 @@ impl AccountsHashVerifier {
             for (slot, hash) in hashes.iter() {
                 slot_to_hash.insert(*slot, *hash);
             }
-            if Self::should_halt(&cluster_info, trusted_validators, &mut slot_to_hash) {
+            if Self::should_halt(cluster_info, trusted_validators, &mut slot_to_hash) {
                 exit.store(true, Ordering::Relaxed);
             }
         }
@@ -223,13 +223,22 @@ mod tests {
         hash::hash,
         signature::{Keypair, Signer},
     };
+    use solana_streamer::socket::SocketAddrSpace;
+
+    fn new_test_cluster_info(contact_info: ContactInfo) -> ClusterInfo {
+        ClusterInfo::new(
+            contact_info,
+            Arc::new(Keypair::new()),
+            SocketAddrSpace::Unspecified,
+        )
+    }
 
     #[test]
     fn test_should_halt() {
         let keypair = Keypair::new();
 
         let contact_info = ContactInfo::new_localhost(&keypair.pubkey(), 0);
-        let cluster_info = ClusterInfo::new_with_invalid_keypair(contact_info);
+        let cluster_info = new_test_cluster_info(contact_info);
         let cluster_info = Arc::new(cluster_info);
 
         let mut trusted_validators = HashSet::new();
@@ -265,7 +274,7 @@ mod tests {
         let keypair = Keypair::new();
 
         let contact_info = ContactInfo::new_localhost(&keypair.pubkey(), 0);
-        let cluster_info = ClusterInfo::new_with_invalid_keypair(contact_info);
+        let cluster_info = new_test_cluster_info(contact_info);
         let cluster_info = Arc::new(cluster_info);
 
         let trusted_validators = HashSet::new();
diff --git a/core/src/banking_stage.rs b/core/src/banking_stage.rs
index 092cbd9b83024d..386d41024e0d99 100644
--- a/core/src/banking_stage.rs
+++ b/core/src/banking_stage.rs
@@ -1,20 +1,13 @@
 //! The `banking_stage` processes Transaction messages. It is intended to be used
 //! to contruct a software pipeline. The stage uses all available CPU cores and
 //! can do its processing in parallel with signature verification on the GPU.
-use crate::{
-    packet_hasher::PacketHasher,
-    poh_recorder::{PohRecorder, PohRecorderError, TransactionRecorder, WorkingBankEntry},
-    poh_service::{self, PohService},
-};
+use crate::packet_hasher::PacketHasher;
 use crossbeam_channel::{Receiver as CrossbeamReceiver, RecvTimeoutError};
 use itertools::Itertools;
 use lru::LruCache;
 use retain_mut::RetainMut;
 use solana_gossip::cluster_info::ClusterInfo;
-use solana_ledger::{
-    blockstore::Blockstore, blockstore_processor::TransactionStatusSender,
-    entry::hash_transactions, leader_schedule_cache::LeaderScheduleCache,
-};
+use solana_ledger::{blockstore_processor::TransactionStatusSender, entry::hash_transactions};
 use solana_measure::measure::Measure;
 use solana_metrics::{inc_new_counter_debug, inc_new_counter_info};
 use solana_perf::{
@@ -22,6 +15,7 @@ use solana_perf::{
     packet::{limited_deserialize, Packet, Packets, PACKETS_PER_BATCH},
     perf_libs,
 };
+use solana_poh::poh_recorder::{PohRecorder, PohRecorderError, TransactionRecorder};
 use solana_runtime::{
     accounts_db::ErrorCounters,
     bank::{
@@ -39,7 +33,6 @@ use solana_sdk::{
         MAX_TRANSACTION_FORWARDING_DELAY_GPU,
     },
     message::Message,
-    poh_config::PohConfig,
     pubkey::Pubkey,
     short_vec::decode_shortu16_len,
     signature::Signature,
@@ -57,8 +50,7 @@ use std::{
     mem::size_of,
     net::UdpSocket,
     ops::DerefMut,
-    sync::atomic::{AtomicBool, AtomicU64, AtomicUsize, Ordering},
-    sync::mpsc::Receiver,
+    sync::atomic::{AtomicU64, AtomicUsize, Ordering},
     sync::{Arc, Mutex},
     thread::{self, Builder, JoinHandle},
     time::Duration,
@@ -360,9 +352,9 @@ impl BankingStage {
                 // We've hit the end of this slot, no need to perform more processing,
                 // just filter the remaining packets for the invalid (e.g. too old) ones
                 let new_unprocessed_indexes = Self::filter_unprocessed_packets(
-                    &bank,
-                    &msgs,
-                    &original_unprocessed_indexes,
+                    bank,
+                    msgs,
+                    original_unprocessed_indexes,
                     my_pubkey,
                     *next_leader,
                 );
@@ -377,8 +369,8 @@ impl BankingStage {
                         Self::process_packets_transactions(
                             &bank,
                             &bank_creation_time,
-                            &recorder,
-                            &msgs,
+                            recorder,
+                            msgs,
                             original_unprocessed_indexes.to_owned(),
                             transaction_status_sender.clone(),
                             gossip_vote_sender,
@@ -411,7 +403,7 @@ impl BankingStage {
                     // `original_unprocessed_indexes` must have remaining packets to process
                     // if not yet processed.
                     assert!(Self::packet_has_more_unprocessed_transactions(
-                        &original_unprocessed_indexes
+                        original_unprocessed_indexes
                     ));
                     true
                 }
@@ -605,7 +597,7 @@ impl BankingStage {
                 let decision = Self::process_buffered_packets(
                     &my_pubkey,
                     &socket,
-                    &poh_recorder,
+                    poh_recorder,
                     cluster_info,
                     &mut buffered_packets,
                     enable_forwarding,
@@ -635,8 +627,8 @@ impl BankingStage {
 
             match Self::process_packets(
                 &my_pubkey,
-                &verified_receiver,
-                &poh_recorder,
+                verified_receiver,
+                poh_recorder,
                 recv_start,
                 recv_timeout,
                 id,
@@ -746,7 +738,7 @@ impl BankingStage {
         let mut mint_decimals: HashMap<Pubkey, u8> = HashMap::new();
 
         let pre_token_balances = if transaction_status_sender.is_some() {
-            collect_token_balances(&bank, &batch, &mut mint_decimals)
+            collect_token_balances(bank, batch, &mut mint_decimals)
         } else {
             vec![]
         };
@@ -806,7 +798,7 @@ impl BankingStage {
             if let Some(transaction_status_sender) = transaction_status_sender {
                 let txs = batch.transactions_iter().cloned().collect();
                 let post_balances = bank.collect_balances(batch);
-                let post_token_balances = collect_token_balances(&bank, &batch, &mut mint_decimals);
+                let post_token_balances = collect_token_balances(bank, batch, &mut mint_decimals);
                 transaction_status_sender.send_transaction_status_batch(
                     bank.clone(),
                     txs,
@@ -984,16 +976,15 @@ impl BankingStage {
     fn transactions_from_packets(
         msgs: &Packets,
         transaction_indexes: &[usize],
-        secp256k1_program_enabled: bool,
+        libsecp256k1_0_5_upgrade_enabled: bool,
     ) -> (Vec<HashedTransaction<'static>>, Vec<usize>) {
         transaction_indexes
             .iter()
             .filter_map(|tx_index| {
                 let p = &msgs.packets[*tx_index];
                 let tx: Transaction = limited_deserialize(&p.data[0..p.meta.size]).ok()?;
-                if secp256k1_program_enabled {
-                    tx.verify_precompiles().ok()?;
-                }
+                tx.verify_precompiles(libsecp256k1_0_5_upgrade_enabled)
+                    .ok()?;
                 let message_bytes = Self::packet_message(p)?;
                 let message_hash = Message::hash_raw_message(message_bytes);
                 Some((
@@ -1057,7 +1048,7 @@ impl BankingStage {
         let (transactions, transaction_to_packet_indexes) = Self::transactions_from_packets(
             msgs,
             &packet_indexes,
-            bank.secp256k1_program_enabled(),
+            bank.libsecp256k1_0_5_upgrade_enabled(),
         );
         packet_conversion_time.stop();
 
@@ -1128,7 +1119,7 @@ impl BankingStage {
         let (transactions, transaction_to_packet_indexes) = Self::transactions_from_packets(
             msgs,
             &transaction_indexes,
-            bank.secp256k1_program_enabled(),
+            bank.libsecp256k1_0_5_upgrade_enabled(),
         );
 
         let tx_count = transaction_to_packet_indexes.len();
@@ -1257,7 +1248,7 @@ impl BankingStage {
                         &bank,
                         &msgs,
                         &packet_indexes,
-                        &my_pubkey,
+                        my_pubkey,
                         next_leader,
                     );
                     Self::push_unprocessed(
@@ -1392,79 +1383,54 @@ fn next_leader_tpu_forwards(
     }
 }
 
-pub fn create_test_recorder(
-    bank: &Arc<Bank>,
-    blockstore: &Arc<Blockstore>,
-    poh_config: Option<PohConfig>,
-) -> (
-    Arc<AtomicBool>,
-    Arc<Mutex<PohRecorder>>,
-    PohService,
-    Receiver<WorkingBankEntry>,
-) {
-    let exit = Arc::new(AtomicBool::new(false));
-    let poh_config = Arc::new(poh_config.unwrap_or_default());
-    let (mut poh_recorder, entry_receiver, record_receiver) = PohRecorder::new(
-        bank.tick_height(),
-        bank.last_blockhash(),
-        bank.slot(),
-        Some((4, 4)),
-        bank.ticks_per_slot(),
-        &Pubkey::default(),
-        blockstore,
-        &Arc::new(LeaderScheduleCache::new_from_bank(&bank)),
-        &poh_config,
-        exit.clone(),
-    );
-    poh_recorder.set_bank(&bank);
-
-    let poh_recorder = Arc::new(Mutex::new(poh_recorder));
-    let poh_service = PohService::new(
-        poh_recorder.clone(),
-        &poh_config,
-        &exit,
-        bank.ticks_per_slot(),
-        poh_service::DEFAULT_PINNED_CPU_CORE,
-        poh_service::DEFAULT_HASHES_PER_BATCH,
-        record_receiver,
-    );
-
-    (exit, poh_recorder, poh_service, entry_receiver)
-}
-
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::{
-        poh_recorder::Record, poh_recorder::WorkingBank,
-        transaction_status_service::TransactionStatusService,
-    };
     use crossbeam_channel::unbounded;
     use itertools::Itertools;
-    use solana_gossip::cluster_info::Node;
+    use solana_gossip::{cluster_info::Node, contact_info::ContactInfo};
     use solana_ledger::{
-        blockstore::entries_to_test_shreds,
+        blockstore::{entries_to_test_shreds, Blockstore},
         entry::{next_entry, Entry, EntrySlice},
         genesis_utils::{create_genesis_config, GenesisConfigInfo},
         get_tmp_ledger_path,
+        leader_schedule_cache::LeaderScheduleCache,
     };
     use solana_perf::packet::to_packets_chunked;
+    use solana_poh::{
+        poh_recorder::{create_test_recorder, Record, WorkingBank, WorkingBankEntry},
+        poh_service::PohService,
+    };
+    use solana_rpc::transaction_status_service::TransactionStatusService;
     use solana_sdk::{
         hash::Hash,
         instruction::InstructionError,
+        poh_config::PohConfig,
         signature::{Keypair, Signer},
         system_instruction::SystemError,
         system_transaction,
         transaction::TransactionError,
     };
+    use solana_streamer::socket::SocketAddrSpace;
     use solana_transaction_status::TransactionWithStatusMeta;
     use std::{
         net::SocketAddr,
         path::Path,
-        sync::atomic::{AtomicBool, Ordering},
+        sync::{
+            atomic::{AtomicBool, Ordering},
+            mpsc::Receiver,
+        },
         thread::sleep,
     };
 
+    fn new_test_cluster_info(contact_info: ContactInfo) -> ClusterInfo {
+        ClusterInfo::new(
+            contact_info,
+            Arc::new(Keypair::new()),
+            SocketAddrSpace::Unspecified,
+        )
+    }
+
     #[test]
     fn test_banking_stage_shutdown1() {
         let genesis_config = create_genesis_config(2).genesis_config;
@@ -1480,7 +1446,7 @@ mod tests {
             );
             let (exit, poh_recorder, poh_service, _entry_receiever) =
                 create_test_recorder(&bank, &blockstore, None);
-            let cluster_info = ClusterInfo::new_with_invalid_keypair(Node::new_localhost().info);
+            let cluster_info = new_test_cluster_info(Node::new_localhost().info);
             let cluster_info = Arc::new(cluster_info);
             let banking_stage = BankingStage::new(
                 &cluster_info,
@@ -1523,7 +1489,7 @@ mod tests {
             };
             let (exit, poh_recorder, poh_service, entry_receiver) =
                 create_test_recorder(&bank, &blockstore, Some(poh_config));
-            let cluster_info = ClusterInfo::new_with_invalid_keypair(Node::new_localhost().info);
+            let cluster_info = new_test_cluster_info(Node::new_localhost().info);
             let cluster_info = Arc::new(cluster_info);
             let (gossip_vote_sender, _gossip_vote_receiver) = unbounded();
 
@@ -1592,7 +1558,7 @@ mod tests {
             };
             let (exit, poh_recorder, poh_service, entry_receiver) =
                 create_test_recorder(&bank, &blockstore, Some(poh_config));
-            let cluster_info = ClusterInfo::new_with_invalid_keypair(Node::new_localhost().info);
+            let cluster_info = new_test_cluster_info(Node::new_localhost().info);
             let cluster_info = Arc::new(cluster_info);
             let (gossip_vote_sender, _gossip_vote_receiver) = unbounded();
 
@@ -1740,8 +1706,7 @@ mod tests {
                 };
                 let (exit, poh_recorder, poh_service, entry_receiver) =
                     create_test_recorder(&bank, &blockstore, Some(poh_config));
-                let cluster_info =
-                    ClusterInfo::new_with_invalid_keypair(Node::new_localhost().info);
+                let cluster_info = new_test_cluster_info(Node::new_localhost().info);
                 let cluster_info = Arc::new(cluster_info);
                 let _banking_stage = BankingStage::new_num_threads(
                     &cluster_info,
@@ -2422,7 +2387,7 @@ mod tests {
 
             let shreds = entries_to_test_shreds(entries, bank.slot(), 0, true, 0);
             blockstore.insert_shreds(shreds, None, false).unwrap();
-            blockstore.set_roots(&[bank.slot()]).unwrap();
+            blockstore.set_roots(std::iter::once(&bank.slot())).unwrap();
 
             let (transaction_status_sender, transaction_status_receiver) = unbounded();
             let transaction_status_service = TransactionStatusService::new(
@@ -2491,7 +2456,7 @@ mod tests {
         Receiver<WorkingBankEntry>,
         JoinHandle<()>,
     ) {
-        Blockstore::destroy(&ledger_path).unwrap();
+        Blockstore::destroy(ledger_path).unwrap();
         let genesis_config_info = create_slow_genesis_config(10_000);
         let GenesisConfigInfo {
             genesis_config,
@@ -2499,8 +2464,8 @@ mod tests {
             ..
         } = &genesis_config_info;
         let blockstore =
-            Blockstore::open(&ledger_path).expect("Expected to be able to open database ledger");
-        let bank = Arc::new(Bank::new_no_wallclock_throttle(&genesis_config));
+            Blockstore::open(ledger_path).expect("Expected to be able to open database ledger");
+        let bank = Arc::new(Bank::new_no_wallclock_throttle(genesis_config));
         let exit = Arc::new(AtomicBool::default());
         let (poh_recorder, entry_receiver, record_receiver) = PohRecorder::new(
             bank.tick_height(),
@@ -2521,9 +2486,9 @@ mod tests {
         let pubkey1 = solana_sdk::pubkey::new_rand();
         let pubkey2 = solana_sdk::pubkey::new_rand();
         let transactions = vec![
-            system_transaction::transfer(&mint_keypair, &pubkey0, 1, genesis_config.hash()),
-            system_transaction::transfer(&mint_keypair, &pubkey1, 1, genesis_config.hash()),
-            system_transaction::transfer(&mint_keypair, &pubkey2, 1, genesis_config.hash()),
+            system_transaction::transfer(mint_keypair, &pubkey0, 1, genesis_config.hash()),
+            system_transaction::transfer(mint_keypair, &pubkey1, 1, genesis_config.hash()),
+            system_transaction::transfer(mint_keypair, &pubkey2, 1, genesis_config.hash()),
         ];
         let poh_simulator = simulate_poh(record_receiver, &poh_recorder);
 
diff --git a/core/src/broadcast_stage.rs b/core/src/broadcast_stage.rs
index d03b9dd65db2f8..668ebee6c623a9 100644
--- a/core/src/broadcast_stage.rs
+++ b/core/src/broadcast_stage.rs
@@ -1,31 +1,28 @@
 //! A stage to broadcast data from a leader node to validators
 #![allow(clippy::rc_buffer)]
 use self::{
+    broadcast_duplicates_run::BroadcastDuplicatesRun,
     broadcast_fake_shreds_run::BroadcastFakeShredsRun, broadcast_metrics::*,
     fail_entry_verification_broadcast_run::FailEntryVerificationBroadcastRun,
     standard_broadcast_run::StandardBroadcastRun,
 };
 use crate::{
-    poh_recorder::WorkingBankEntry,
+    cluster_nodes::ClusterNodes,
     result::{Error, Result},
 };
 use crossbeam_channel::{
     Receiver as CrossbeamReceiver, RecvTimeoutError as CrossbeamRecvTimeoutError,
     Sender as CrossbeamSender,
 };
-use solana_gossip::{
-    cluster_info::{self, ClusterInfo, ClusterInfoError},
-    contact_info::ContactInfo,
-    crds_gossip_pull::CRDS_GOSSIP_PULL_CRDS_TIMEOUT_MS,
-    weighted_shuffle::weighted_best,
-};
+use solana_gossip::cluster_info::{ClusterInfo, ClusterInfoError};
 use solana_ledger::{blockstore::Blockstore, shred::Shred};
 use solana_measure::measure::Measure;
 use solana_metrics::{inc_new_counter_error, inc_new_counter_info};
+use solana_poh::poh_recorder::WorkingBankEntry;
 use solana_runtime::bank::Bank;
 use solana_sdk::timing::timestamp;
 use solana_sdk::{clock::Slot, pubkey::Pubkey};
-use solana_streamer::sendmmsg::send_mmsg;
+use solana_streamer::{sendmmsg::send_mmsg, socket::SocketAddrSpace};
 use std::sync::atomic::AtomicU64;
 use std::{
     collections::HashMap,
@@ -37,6 +34,7 @@ use std::{
     time::{Duration, Instant},
 };
 
+mod broadcast_duplicates_run;
 mod broadcast_fake_shreds_run;
 pub mod broadcast_metrics;
 pub(crate) mod broadcast_utils;
@@ -54,11 +52,20 @@ pub enum BroadcastStageReturnType {
     ChannelDisconnected,
 }
 
+#[derive(PartialEq, Clone, Debug)]
+pub struct BroadcastDuplicatesConfig {
+    /// Percentage of stake to send different version of slots to
+    pub stake_partition: u8,
+    /// Number of slots to wait before sending duplicate shreds
+    pub duplicate_send_delay: usize,
+}
+
 #[derive(PartialEq, Clone, Debug)]
 pub enum BroadcastStageType {
     Standard,
     FailEntryVerification,
     BroadcastFakeShreds,
+    BroadcastDuplicates(BroadcastDuplicatesConfig),
 }
 
 impl BroadcastStageType {
@@ -103,6 +110,16 @@ impl BroadcastStageType {
                 blockstore,
                 BroadcastFakeShredsRun::new(keypair, 0, shred_version),
             ),
+
+            BroadcastStageType::BroadcastDuplicates(config) => BroadcastStage::new(
+                sock,
+                cluster_info,
+                receiver,
+                retransmit_slots_receiver,
+                exit_sender,
+                blockstore,
+                BroadcastDuplicatesRun::new(keypair, shred_version, config.clone()),
+            ),
         }
     }
 }
@@ -172,15 +189,15 @@ impl BroadcastStage {
     fn handle_error(r: Result<()>, name: &str) -> Option<BroadcastStageReturnType> {
         if let Err(e) = r {
             match e {
-                Error::RecvTimeoutError(RecvTimeoutError::Disconnected)
-                | Error::SendError
-                | Error::RecvError(RecvError)
-                | Error::CrossbeamRecvTimeoutError(CrossbeamRecvTimeoutError::Disconnected) => {
+                Error::RecvTimeout(RecvTimeoutError::Disconnected)
+                | Error::Send
+                | Error::Recv(RecvError)
+                | Error::CrossbeamRecvTimeout(CrossbeamRecvTimeoutError::Disconnected) => {
                     return Some(BroadcastStageReturnType::ChannelDisconnected);
                 }
-                Error::RecvTimeoutError(RecvTimeoutError::Timeout)
-                | Error::CrossbeamRecvTimeoutError(CrossbeamRecvTimeoutError::Timeout) => (),
-                Error::ClusterInfoError(ClusterInfoError::NoPeers) => (), // TODO: Why are the unit-tests throwing hundreds of these?
+                Error::RecvTimeout(RecvTimeoutError::Timeout)
+                | Error::CrossbeamRecvTimeout(CrossbeamRecvTimeoutError::Timeout) => (),
+                Error::ClusterInfo(ClusterInfoError::NoPeers) => (), // TODO: Why are the unit-tests throwing hundreds of these?
                 _ => {
                     inc_new_counter_error!("streamer-broadcaster-error", 1, 1);
                     error!("{} broadcaster error: {:?}", name, e);
@@ -361,26 +378,17 @@ fn update_peer_stats(
     }
 }
 
-pub fn get_broadcast_peers(
-    cluster_info: &ClusterInfo,
-    stakes: Option<&HashMap<Pubkey, u64>>,
-) -> (Vec<ContactInfo>, Vec<(u64, usize)>) {
-    let mut peers = cluster_info.tvu_peers();
-    let peers_and_stakes = cluster_info::stake_weight_peers(&mut peers, stakes);
-    (peers, peers_and_stakes)
-}
-
 /// broadcast messages from the leader to layer 1 nodes
 /// # Remarks
 pub fn broadcast_shreds(
     s: &UdpSocket,
     shreds: &[Shred],
-    peers_and_stakes: &[(u64, usize)],
-    peers: &[ContactInfo],
+    cluster_nodes: &ClusterNodes<BroadcastStage>,
     last_datapoint_submit: &Arc<AtomicU64>,
     transmit_stats: &mut TransmitShredsStats,
+    socket_addr_space: &SocketAddrSpace,
 ) -> Result<()> {
-    let broadcast_len = peers_and_stakes.len();
+    let broadcast_len = cluster_nodes.num_peers();
     if broadcast_len == 0 {
         update_peer_stats(1, 1, last_datapoint_submit);
         return Ok(());
@@ -388,10 +396,13 @@ pub fn broadcast_shreds(
     let mut shred_select = Measure::start("shred_select");
     let packets: Vec<_> = shreds
         .iter()
-        .map(|shred| {
-            let broadcast_index = weighted_best(&peers_and_stakes, shred.seed());
-
-            (&shred.payload, &peers[broadcast_index].tvu)
+        .filter_map(|shred| {
+            let node = cluster_nodes.get_broadcast_peer(shred.seed())?;
+            if socket_addr_space.check(&node.tvu) {
+                Some((&shred.payload, &node.tvu))
+            } else {
+                None
+            }
         })
         .collect();
     shred_select.stop();
@@ -410,7 +421,7 @@ pub fn broadcast_shreds(
     send_mmsg_time.stop();
     transmit_stats.send_mmsg_elapsed += send_mmsg_time.as_us();
 
-    let num_live_peers = num_live_peers(&peers);
+    let num_live_peers = cluster_nodes.num_peers_live(timestamp()) as i64;
     update_peer_stats(
         num_live_peers,
         broadcast_len as i64 + 1,
@@ -419,25 +430,6 @@ pub fn broadcast_shreds(
     Ok(())
 }
 
-fn distance(a: u64, b: u64) -> u64 {
-    if a > b {
-        a - b
-    } else {
-        b - a
-    }
-}
-
-fn num_live_peers(peers: &[ContactInfo]) -> i64 {
-    let mut num_live_peers = 1i64;
-    peers.iter().for_each(|p| {
-        // A peer is considered live if they generated their contact info recently
-        if distance(timestamp(), p.wallclock) <= CRDS_GOSSIP_PULL_CRDS_TIMEOUT_MS {
-            num_live_peers += 1;
-        }
-    });
-    num_live_peers
-}
-
 #[cfg(test)]
 pub mod test {
     use super::*;
@@ -521,19 +513,6 @@ pub mod test {
         assert_eq!(num_expected_coding_shreds, coding_index);
     }
 
-    #[test]
-    fn test_num_live_peers() {
-        let mut ci = ContactInfo {
-            wallclock: std::u64::MAX,
-            ..ContactInfo::default()
-        };
-        assert_eq!(num_live_peers(&[ci.clone()]), 1);
-        ci.wallclock = timestamp() - 1;
-        assert_eq!(num_live_peers(&[ci.clone()]), 2);
-        ci.wallclock = timestamp() - CRDS_GOSSIP_PULL_CRDS_TIMEOUT_MS - 1;
-        assert_eq!(num_live_peers(&[ci]), 1);
-    }
-
     #[test]
     fn test_duplicate_retransmit_signal() {
         // Setup
@@ -607,7 +586,11 @@ pub mod test {
         let broadcast_buddy = Node::new_localhost_with_pubkey(&buddy_keypair.pubkey());
 
         // Fill the cluster_info with the buddy's info
-        let cluster_info = ClusterInfo::new_with_invalid_keypair(leader_info.info.clone());
+        let cluster_info = ClusterInfo::new(
+            leader_info.info.clone(),
+            Arc::new(Keypair::new()),
+            SocketAddrSpace::Unspecified,
+        );
         cluster_info.insert_info(broadcast_buddy.info);
         let cluster_info = Arc::new(cluster_info);
 
diff --git a/core/src/broadcast_stage/broadcast_duplicates_run.rs b/core/src/broadcast_stage/broadcast_duplicates_run.rs
new file mode 100644
index 00000000000000..cbe7a3861e95af
--- /dev/null
+++ b/core/src/broadcast_stage/broadcast_duplicates_run.rs
@@ -0,0 +1,338 @@
+use super::broadcast_utils::ReceiveResults;
+use super::*;
+use log::*;
+use solana_ledger::entry::{create_ticks, Entry, EntrySlice};
+use solana_ledger::shred::Shredder;
+use solana_runtime::blockhash_queue::BlockhashQueue;
+use solana_sdk::clock::Slot;
+use solana_sdk::fee_calculator::FeeCalculator;
+use solana_sdk::hash::Hash;
+use solana_sdk::signature::{Keypair, Signer};
+use solana_sdk::transaction::Transaction;
+use std::collections::VecDeque;
+use std::sync::Mutex;
+
+// Queue which facilitates delivering shreds with a delay
+type DelayedQueue = VecDeque<(Option<Pubkey>, Option<Vec<Shred>>)>;
+
+#[derive(Clone)]
+pub(super) struct BroadcastDuplicatesRun {
+    config: BroadcastDuplicatesConfig,
+    // Local queue for broadcast to track which duplicate blockhashes we've sent
+    duplicate_queue: BlockhashQueue,
+    // Shared queue between broadcast and transmit threads
+    delayed_queue: Arc<Mutex<DelayedQueue>>,
+    // Buffer for duplicate entries
+    duplicate_entries_buffer: Vec<Entry>,
+    last_duplicate_entry_hash: Hash,
+    last_broadcast_slot: Slot,
+    next_shred_index: u32,
+    shred_version: u16,
+    keypair: Arc<Keypair>,
+}
+
+impl BroadcastDuplicatesRun {
+    pub(super) fn new(
+        keypair: Arc<Keypair>,
+        shred_version: u16,
+        config: BroadcastDuplicatesConfig,
+    ) -> Self {
+        let mut delayed_queue = DelayedQueue::new();
+        delayed_queue.resize(config.duplicate_send_delay, (None, None));
+        Self {
+            config,
+            delayed_queue: Arc::new(Mutex::new(delayed_queue)),
+            duplicate_queue: BlockhashQueue::default(),
+            duplicate_entries_buffer: vec![],
+            next_shred_index: u32::MAX,
+            last_broadcast_slot: 0,
+            last_duplicate_entry_hash: Hash::default(),
+            shred_version,
+            keypair,
+        }
+    }
+
+    fn queue_or_create_duplicate_entries(
+        &mut self,
+        bank: &Arc<Bank>,
+        receive_results: &ReceiveResults,
+    ) -> (Vec<Entry>, u32) {
+        // If the last entry hash is default, grab the last blockhash from the parent bank
+        if self.last_duplicate_entry_hash == Hash::default() {
+            self.last_duplicate_entry_hash = bank.last_blockhash();
+        }
+
+        // Create duplicate entries by..
+        //  1) rearranging real entries so that all transaction entries are moved to
+        //     the front and tick entries are moved to the back.
+        //  2) setting all transaction entries to zero hashes and all tick entries to `hashes_per_tick`.
+        //  3) removing any transactions which reference blockhashes which aren't in the
+        //     duplicate blockhash queue.
+        let (duplicate_entries, next_shred_index) = if bank.slot() > MINIMUM_DUPLICATE_SLOT {
+            let mut tx_entries: Vec<Entry> = receive_results
+                .entries
+                .iter()
+                .filter_map(|entry| {
+                    if entry.is_tick() {
+                        return None;
+                    }
+
+                    let transactions: Vec<Transaction> = entry
+                        .transactions
+                        .iter()
+                        .filter(|tx| {
+                            self.duplicate_queue
+                                .get_hash_age(&tx.message.recent_blockhash)
+                                .is_some()
+                        })
+                        .cloned()
+                        .collect();
+                    if !transactions.is_empty() {
+                        Some(Entry::new_mut(
+                            &mut self.last_duplicate_entry_hash,
+                            &mut 0,
+                            transactions,
+                        ))
+                    } else {
+                        None
+                    }
+                })
+                .collect();
+            let mut tick_entries = create_ticks(
+                receive_results.entries.tick_count(),
+                bank.hashes_per_tick().unwrap_or_default(),
+                self.last_duplicate_entry_hash,
+            );
+            self.duplicate_entries_buffer.append(&mut tx_entries);
+            self.duplicate_entries_buffer.append(&mut tick_entries);
+
+            // Only send out duplicate entries when the block is finished otherwise the
+            // recipient will start repairing for shreds they haven't received yet and
+            // hit duplicate slot issues before we want them to.
+            let entries = if receive_results.last_tick_height == bank.max_tick_height() {
+                self.duplicate_entries_buffer.drain(..).collect()
+            } else {
+                vec![]
+            };
+
+            // Set next shred index to 0 since we are sending the full slot
+            (entries, 0)
+        } else {
+            // Send real entries until we hit min duplicate slot
+            (receive_results.entries.clone(), self.next_shred_index)
+        };
+
+        // Save last duplicate entry hash to avoid invalid entry hash errors
+        if let Some(last_duplicate_entry) = duplicate_entries.last() {
+            self.last_duplicate_entry_hash = last_duplicate_entry.hash;
+        }
+
+        (duplicate_entries, next_shred_index)
+    }
+}
+
+/// Duplicate slots should only be sent once all validators have started.
+/// This constant is intended to be used as a buffer so that all validators
+/// are live before sending duplicate slots.
+pub const MINIMUM_DUPLICATE_SLOT: Slot = 20;
+
+impl BroadcastRun for BroadcastDuplicatesRun {
+    fn run(
+        &mut self,
+        blockstore: &Arc<Blockstore>,
+        receiver: &Receiver<WorkingBankEntry>,
+        socket_sender: &Sender<(TransmitShreds, Option<BroadcastShredBatchInfo>)>,
+        blockstore_sender: &Sender<(Arc<Vec<Shred>>, Option<BroadcastShredBatchInfo>)>,
+    ) -> Result<()> {
+        // 1) Pull entries from banking stage
+        let receive_results = broadcast_utils::recv_slot_entries(receiver)?;
+        let bank = receive_results.bank.clone();
+        let last_tick_height = receive_results.last_tick_height;
+
+        if self.next_shred_index == u32::MAX {
+            self.next_shred_index = blockstore
+                .meta(bank.slot())
+                .expect("Database error")
+                .map(|meta| meta.consumed)
+                .unwrap_or(0) as u32
+        }
+
+        // We were not the leader, but just became leader again
+        if bank.slot() > self.last_broadcast_slot + 1 {
+            self.last_duplicate_entry_hash = Hash::default();
+        }
+        self.last_broadcast_slot = bank.slot();
+
+        let shredder = Shredder::new(
+            bank.slot(),
+            bank.parent().unwrap().slot(),
+            self.keypair.clone(),
+            (bank.tick_height() % bank.ticks_per_slot()) as u8,
+            self.shred_version,
+        )
+        .expect("Expected to create a new shredder");
+
+        let (data_shreds, coding_shreds, last_shred_index) = shredder.entries_to_shreds(
+            &receive_results.entries,
+            last_tick_height == bank.max_tick_height(),
+            self.next_shred_index,
+        );
+
+        let (duplicate_entries, next_duplicate_shred_index) =
+            self.queue_or_create_duplicate_entries(&bank, &receive_results);
+        let (duplicate_data_shreds, duplicate_coding_shreds, _) = if !duplicate_entries.is_empty() {
+            shredder.entries_to_shreds(
+                &duplicate_entries,
+                last_tick_height == bank.max_tick_height(),
+                next_duplicate_shred_index,
+            )
+        } else {
+            (vec![], vec![], 0)
+        };
+
+        // Manually track the shred index because relying on slot meta consumed is racy
+        if last_tick_height == bank.max_tick_height() {
+            self.next_shred_index = 0;
+            self.duplicate_queue
+                .register_hash(&self.last_duplicate_entry_hash, &FeeCalculator::default());
+        } else {
+            self.next_shred_index = last_shred_index;
+        }
+
+        // Partition network with duplicate and real shreds based on stake
+        let bank_epoch = bank.get_leader_schedule_epoch(bank.slot());
+        let mut duplicate_recipients = HashMap::new();
+        let mut real_recipients = HashMap::new();
+
+        let mut stakes: Vec<(Pubkey, u64)> = bank
+            .epoch_staked_nodes(bank_epoch)
+            .unwrap()
+            .into_iter()
+            .filter(|(pubkey, _)| *pubkey != self.keypair.pubkey())
+            .collect();
+        stakes.sort_by(|(l_key, l_stake), (r_key, r_stake)| {
+            if r_stake == l_stake {
+                l_key.cmp(r_key)
+            } else {
+                r_stake.cmp(l_stake)
+            }
+        });
+
+        let highest_staked_node = stakes.first().cloned().map(|x| x.0);
+        let stake_total: u64 = stakes.iter().map(|(_, stake)| *stake).sum();
+        let mut cumulative_stake: u64 = 0;
+        for (pubkey, stake) in stakes.into_iter().rev() {
+            cumulative_stake += stake;
+            if (100 * cumulative_stake / stake_total) as u8 <= self.config.stake_partition {
+                duplicate_recipients.insert(pubkey, stake);
+            } else {
+                real_recipients.insert(pubkey, stake);
+            }
+        }
+
+        if let Some(highest_staked_node) = highest_staked_node {
+            if bank.slot() > MINIMUM_DUPLICATE_SLOT && last_tick_height == bank.max_tick_height() {
+                warn!(
+                    "{} sent duplicate slot {} to nodes: {:?}",
+                    self.keypair.pubkey(),
+                    bank.slot(),
+                    &duplicate_recipients,
+                );
+                warn!(
+                    "Duplicate shreds for slot {} will be broadcast in {} slot(s)",
+                    bank.slot(),
+                    self.config.duplicate_send_delay
+                );
+
+                let delayed_shreds: Option<Vec<Shred>> = vec![
+                    duplicate_data_shreds.last().cloned(),
+                    data_shreds.last().cloned(),
+                ]
+                .into_iter()
+                .collect();
+                self.delayed_queue
+                    .lock()
+                    .unwrap()
+                    .push_back((Some(highest_staked_node), delayed_shreds));
+            }
+        }
+
+        let duplicate_recipients = Arc::new(duplicate_recipients);
+        let real_recipients = Arc::new(real_recipients);
+
+        let data_shreds = Arc::new(data_shreds);
+        blockstore_sender.send((data_shreds.clone(), None))?;
+
+        // 3) Start broadcast step
+        socket_sender.send((
+            (
+                Some(duplicate_recipients.clone()),
+                Arc::new(duplicate_data_shreds),
+            ),
+            None,
+        ))?;
+        socket_sender.send((
+            (
+                Some(duplicate_recipients),
+                Arc::new(duplicate_coding_shreds),
+            ),
+            None,
+        ))?;
+        socket_sender.send(((Some(real_recipients.clone()), data_shreds), None))?;
+        socket_sender.send(((Some(real_recipients), Arc::new(coding_shreds)), None))?;
+
+        Ok(())
+    }
+    fn transmit(
+        &mut self,
+        receiver: &Arc<Mutex<TransmitReceiver>>,
+        cluster_info: &ClusterInfo,
+        sock: &UdpSocket,
+    ) -> Result<()> {
+        // Check the delay queue for shreds that are ready to be sent
+        let (delayed_recipient, delayed_shreds) = {
+            let mut delayed_deque = self.delayed_queue.lock().unwrap();
+            if delayed_deque.len() > self.config.duplicate_send_delay {
+                delayed_deque.pop_front().unwrap()
+            } else {
+                (None, None)
+            }
+        };
+
+        let ((stakes, shreds), _) = receiver.lock().unwrap().recv()?;
+        let stakes = stakes.unwrap();
+        let socket_addr_space = cluster_info.socket_addr_space();
+        for peer in cluster_info.tvu_peers() {
+            // Forward shreds to circumvent gossip
+            if stakes.get(&peer.id).is_some() {
+                shreds.iter().for_each(|shred| {
+                    if socket_addr_space.check(&peer.tvu_forwards) {
+                        sock.send_to(&shred.payload, &peer.tvu_forwards).unwrap();
+                    }
+                });
+            }
+
+            // After a delay, broadcast duplicate shreds to a single node
+            if let Some(shreds) = delayed_shreds.as_ref() {
+                if Some(peer.id) == delayed_recipient {
+                    shreds.iter().for_each(|shred| {
+                        if socket_addr_space.check(&peer.tvu) {
+                            sock.send_to(&shred.payload, &peer.tvu).unwrap();
+                        }
+                    });
+                }
+            }
+        }
+
+        Ok(())
+    }
+    fn record(
+        &mut self,
+        receiver: &Arc<Mutex<RecordReceiver>>,
+        blockstore: &Arc<Blockstore>,
+    ) -> Result<()> {
+        let (data_shreds, _) = receiver.lock().unwrap().recv()?;
+        blockstore.insert_shreds(data_shreds.to_vec(), None, true)?;
+        Ok(())
+    }
+}
diff --git a/core/src/broadcast_stage/broadcast_fake_shreds_run.rs b/core/src/broadcast_stage/broadcast_fake_shreds_run.rs
index 55983fd35e202d..6461f350ac6b77 100644
--- a/core/src/broadcast_stage/broadcast_fake_shreds_run.rs
+++ b/core/src/broadcast_stage/broadcast_fake_shreds_run.rs
@@ -139,14 +139,16 @@ impl BroadcastRun for BroadcastFakeShredsRun {
 mod tests {
     use super::*;
     use solana_gossip::contact_info::ContactInfo;
+    use solana_streamer::socket::SocketAddrSpace;
     use std::net::{IpAddr, Ipv4Addr, SocketAddr};
 
     #[test]
     fn test_tvu_peers_ordering() {
-        let cluster = ClusterInfo::new_with_invalid_keypair(ContactInfo::new_localhost(
-            &solana_sdk::pubkey::new_rand(),
-            0,
-        ));
+        let cluster = ClusterInfo::new(
+            ContactInfo::new_localhost(&solana_sdk::pubkey::new_rand(), 0),
+            Arc::new(Keypair::new()),
+            SocketAddrSpace::Unspecified,
+        );
         cluster.insert_info(ContactInfo::new_with_socketaddr(&SocketAddr::new(
             IpAddr::V4(Ipv4Addr::new(192, 168, 1, 1)),
             8080,
diff --git a/core/src/broadcast_stage/broadcast_utils.rs b/core/src/broadcast_stage/broadcast_utils.rs
index b421a2a5245d24..08a9d40738bb52 100644
--- a/core/src/broadcast_stage/broadcast_utils.rs
+++ b/core/src/broadcast_stage/broadcast_utils.rs
@@ -1,6 +1,6 @@
-use crate::poh_recorder::WorkingBankEntry;
 use crate::result::Result;
 use solana_ledger::{entry::Entry, shred::Shred};
+use solana_poh::poh_recorder::WorkingBankEntry;
 use solana_runtime::bank::Bank;
 use solana_sdk::clock::Slot;
 use std::{
diff --git a/core/src/broadcast_stage/fail_entry_verification_broadcast_run.rs b/core/src/broadcast_stage/fail_entry_verification_broadcast_run.rs
index b66681786d6f7d..4fb06e416cc3af 100644
--- a/core/src/broadcast_stage/fail_entry_verification_broadcast_run.rs
+++ b/core/src/broadcast_stage/fail_entry_verification_broadcast_run.rs
@@ -1,4 +1,5 @@
 use super::*;
+use crate::cluster_nodes::ClusterNodes;
 use solana_ledger::shred::Shredder;
 use solana_sdk::hash::Hash;
 use solana_sdk::signature::Keypair;
@@ -134,15 +135,17 @@ impl BroadcastRun for FailEntryVerificationBroadcastRun {
     ) -> Result<()> {
         let ((stakes, shreds), _) = receiver.lock().unwrap().recv()?;
         // Broadcast data
-        let (peers, peers_and_stakes) = get_broadcast_peers(cluster_info, stakes.as_deref());
-
+        let cluster_nodes = ClusterNodes::<BroadcastStage>::new(
+            cluster_info,
+            stakes.as_deref().unwrap_or(&HashMap::default()),
+        );
         broadcast_shreds(
             sock,
             &shreds,
-            &peers_and_stakes,
-            &peers,
+            &cluster_nodes,
             &Arc::new(AtomicU64::new(0)),
             &mut TransmitShredsStats::default(),
+            cluster_info.socket_addr_space(),
         )?;
 
         Ok(())
diff --git a/core/src/broadcast_stage/standard_broadcast_run.rs b/core/src/broadcast_stage/standard_broadcast_run.rs
index 6908d5dd1b9908..27caca8eabfdf8 100644
--- a/core/src/broadcast_stage/standard_broadcast_run.rs
+++ b/core/src/broadcast_stage/standard_broadcast_run.rs
@@ -4,7 +4,7 @@ use super::{
     broadcast_utils::{self, ReceiveResults},
     *,
 };
-use crate::broadcast_stage::broadcast_utils::UnfinishedSlotInfo;
+use crate::{broadcast_stage::broadcast_utils::UnfinishedSlotInfo, cluster_nodes::ClusterNodes};
 use solana_ledger::{
     entry::Entry,
     shred::{
@@ -27,16 +27,10 @@ pub struct StandardBroadcastRun {
     shred_version: u16,
     last_datapoint_submit: Arc<AtomicU64>,
     num_batches: usize,
-    broadcast_peer_cache: Arc<RwLock<BroadcastPeerCache>>,
+    cluster_nodes: Arc<RwLock<ClusterNodes<BroadcastStage>>>,
     last_peer_update: Arc<AtomicU64>,
 }
 
-#[derive(Default)]
-struct BroadcastPeerCache {
-    peers: Vec<ContactInfo>,
-    peers_and_stakes: Vec<(u64, usize)>,
-}
-
 impl StandardBroadcastRun {
     pub(super) fn new(keypair: Arc<Keypair>, shred_version: u16) -> Self {
         Self {
@@ -50,7 +44,7 @@ impl StandardBroadcastRun {
             shred_version,
             last_datapoint_submit: Arc::default(),
             num_batches: 0,
-            broadcast_peer_cache: Arc::default(),
+            cluster_nodes: Arc::default(),
             last_peer_update: Arc::default(),
         }
     }
@@ -161,7 +155,7 @@ impl StandardBroadcastRun {
     ) -> Result<()> {
         let (bsend, brecv) = channel();
         let (ssend, srecv) = channel();
-        self.process_receive_results(&blockstore, &ssend, &bsend, receive_results)?;
+        self.process_receive_results(blockstore, &ssend, &bsend, receive_results)?;
         let srecv = Arc::new(Mutex::new(srecv));
         let brecv = Arc::new(Mutex::new(brecv));
         //data
@@ -351,16 +345,16 @@ impl StandardBroadcastRun {
         if now - last > BROADCAST_PEER_UPDATE_INTERVAL_MS
             && self
                 .last_peer_update
-                .compare_and_swap(now, last, Ordering::Relaxed)
+                .compare_and_swap(last, now, Ordering::Relaxed)
                 == last
         {
-            let mut w_broadcast_peer_cache = self.broadcast_peer_cache.write().unwrap();
-            let (peers, peers_and_stakes) = get_broadcast_peers(cluster_info, stakes);
-            w_broadcast_peer_cache.peers = peers;
-            w_broadcast_peer_cache.peers_and_stakes = peers_and_stakes;
+            *self.cluster_nodes.write().unwrap() = ClusterNodes::<BroadcastStage>::new(
+                cluster_info,
+                stakes.unwrap_or(&HashMap::default()),
+            );
         }
         get_peers_time.stop();
-        let r_broadcast_peer_cache = self.broadcast_peer_cache.read().unwrap();
+        let cluster_nodes = self.cluster_nodes.read().unwrap();
 
         let mut transmit_stats = TransmitShredsStats::default();
         // Broadcast the shreds
@@ -368,12 +362,12 @@ impl StandardBroadcastRun {
         broadcast_shreds(
             sock,
             &shreds,
-            &r_broadcast_peer_cache.peers_and_stakes,
-            &r_broadcast_peer_cache.peers,
+            &cluster_nodes,
             &self.last_datapoint_submit,
             &mut transmit_stats,
+            cluster_info.socket_addr_space(),
         )?;
-        drop(r_broadcast_peer_cache);
+        drop(cluster_nodes);
         transmit_time.stop();
 
         transmit_stats.transmit_elapsed = transmit_time.as_us();
@@ -505,6 +499,7 @@ mod test {
         genesis_config::GenesisConfig,
         signature::{Keypair, Signer},
     };
+    use solana_streamer::socket::SocketAddrSpace;
     use std::sync::Arc;
     use std::time::Duration;
 
@@ -526,7 +521,11 @@ mod test {
         let leader_keypair = Arc::new(Keypair::new());
         let leader_pubkey = leader_keypair.pubkey();
         let leader_info = Node::new_localhost_with_pubkey(&leader_pubkey);
-        let cluster_info = Arc::new(ClusterInfo::new_with_invalid_keypair(leader_info.info));
+        let cluster_info = Arc::new(ClusterInfo::new(
+            leader_info.info,
+            Arc::new(Keypair::new()),
+            SocketAddrSpace::Unspecified,
+        ));
         let socket = UdpSocket::bind("0.0.0.0:0").unwrap();
         let mut genesis_config = create_genesis_config(10_000).genesis_config;
         genesis_config.ticks_per_slot = max_ticks_per_n_shreds(num_shreds_per_slot, None) + 1;
diff --git a/core/src/cluster_info_vote_listener.rs b/core/src/cluster_info_vote_listener.rs
index be3e410a62b92c..b0afdd586fc1c7 100644
--- a/core/src/cluster_info_vote_listener.rs
+++ b/core/src/cluster_info_vote_listener.rs
@@ -1,6 +1,5 @@
 use crate::{
     optimistic_confirmation_verifier::OptimisticConfirmationVerifier,
-    poh_recorder::PohRecorder,
     replay_stage::DUPLICATE_THRESHOLD,
     result::{Error, Result},
     sigverify,
@@ -20,6 +19,7 @@ use solana_gossip::{
 use solana_ledger::blockstore::Blockstore;
 use solana_metrics::inc_new_counter_debug;
 use solana_perf::packet::{self, Packets};
+use solana_poh::poh_recorder::PohRecorder;
 use solana_rpc::{
     optimistically_confirmed_bank_tracker::{BankNotification, BankNotificationSender},
     rpc_subscriptions::RpcSubscriptions,
@@ -33,7 +33,7 @@ use solana_runtime::{
     vote_sender_types::{ReplayVoteReceiver, ReplayedVote},
 };
 use solana_sdk::{
-    clock::{Epoch, Slot, DEFAULT_MS_PER_SLOT},
+    clock::{Epoch, Slot, DEFAULT_MS_PER_SLOT, DEFAULT_TICKS_PER_SLOT},
     epoch_schedule::EpochSchedule,
     hash::Hash,
     pubkey::Pubkey,
@@ -110,7 +110,7 @@ impl VoteTracker {
             epoch_schedule: *root_bank.epoch_schedule(),
             ..VoteTracker::default()
         };
-        vote_tracker.progress_with_new_root_bank(&root_bank);
+        vote_tracker.progress_with_new_root_bank(root_bank);
         assert_eq!(
             *vote_tracker.leader_schedule_epoch.read().unwrap(),
             root_bank.get_leader_schedule_epoch(root_bank.slot())
@@ -384,15 +384,20 @@ impl ClusterInfoVoteListener {
                 return Ok(());
             }
 
+            let would_be_leader = poh_recorder
+                .lock()
+                .unwrap()
+                .would_be_leader(20 * DEFAULT_TICKS_PER_SLOT);
             if let Err(e) = verified_vote_packets.receive_and_process_vote_packets(
                 &verified_vote_label_packets_receiver,
                 &mut update_version,
+                would_be_leader,
             ) {
                 match e {
-                    Error::CrossbeamRecvTimeoutError(RecvTimeoutError::Disconnected) => {
+                    Error::CrossbeamRecvTimeout(RecvTimeoutError::Disconnected) => {
                         return Ok(());
                     }
-                    Error::CrossbeamRecvTimeoutError(RecvTimeoutError::Timeout) => (),
+                    Error::CrossbeamRecvTimeout(RecvTimeoutError::Timeout) => (),
                     _ => {
                         error!("thread {:?} error {:?}", thread::current().name(), e);
                     }
@@ -474,8 +479,8 @@ impl ClusterInfoVoteListener {
                         .add_new_optimistic_confirmed_slots(confirmed_slots.clone());
                 }
                 Err(e) => match e {
-                    Error::CrossbeamRecvTimeoutError(RecvTimeoutError::Timeout)
-                    | Error::ReadyTimeoutError => (),
+                    Error::CrossbeamRecvTimeout(RecvTimeoutError::Timeout)
+                    | Error::ReadyTimeout => (),
                     _ => {
                         error!("thread {:?} error {:?}", thread::current().name(), e);
                     }
@@ -598,7 +603,7 @@ impl ClusterInfoVoteListener {
             if slot == last_vote_slot {
                 let vote_accounts = Stakes::vote_accounts(epoch_stakes.stakes());
                 let stake = vote_accounts
-                    .get(&vote_pubkey)
+                    .get(vote_pubkey)
                     .map(|(stake, _)| *stake)
                     .unwrap_or_default();
                 let total_stake = epoch_stakes.total_stake();
@@ -687,7 +692,7 @@ impl ClusterInfoVoteListener {
         // voters trying to make votes for slots earlier than the epoch for
         // which they are authorized
         let actual_authorized_voter =
-            vote_tracker.get_authorized_voter(&vote_pubkey, *last_vote_slot);
+            vote_tracker.get_authorized_voter(vote_pubkey, *last_vote_slot);
 
         if actual_authorized_voter.is_none() {
             return false;
@@ -695,7 +700,7 @@ impl ClusterInfoVoteListener {
 
         // Voting without the correct authorized pubkey, dump the vote
         if !VoteTracker::vote_contains_authorized_voter(
-            &gossip_tx,
+            gossip_tx,
             &actual_authorized_voter.unwrap(),
         ) {
             return false;
@@ -733,7 +738,7 @@ impl ClusterInfoVoteListener {
             Self::track_new_votes_and_notify_confirmations(
                 vote,
                 &vote_pubkey,
-                &vote_tracker,
+                vote_tracker,
                 root_bank,
                 subscriptions,
                 verified_vote_sender,
diff --git a/core/src/cluster_nodes.rs b/core/src/cluster_nodes.rs
new file mode 100644
index 00000000000000..ca0a82d18f2a7c
--- /dev/null
+++ b/core/src/cluster_nodes.rs
@@ -0,0 +1,446 @@
+use {
+    crate::{broadcast_stage::BroadcastStage, retransmit_stage::RetransmitStage},
+    itertools::Itertools,
+    solana_gossip::{
+        cluster_info::{compute_retransmit_peers, ClusterInfo},
+        contact_info::ContactInfo,
+        crds_gossip_pull::CRDS_GOSSIP_PULL_CRDS_TIMEOUT_MS,
+        weighted_shuffle::{weighted_best, weighted_shuffle},
+    },
+    solana_sdk::pubkey::Pubkey,
+    std::{any::TypeId, cmp::Reverse, collections::HashMap, marker::PhantomData},
+};
+
+enum NodeId {
+    // TVU node obtained through gossip (staked or not).
+    ContactInfo(ContactInfo),
+    // Staked node with no contact-info in gossip table.
+    Pubkey(Pubkey),
+}
+
+struct Node {
+    node: NodeId,
+    stake: u64,
+}
+
+pub struct ClusterNodes<T> {
+    pubkey: Pubkey, // The local node itself.
+    // All staked nodes + other known tvu-peers + the node itself;
+    // sorted by (stake, pubkey) in descending order.
+    nodes: Vec<Node>,
+    // Weights and indices for sampling peers. weighted_{shuffle,best} expect
+    // weights >= 1. For backward compatibility we use max(1, stake) for
+    // weights and exclude nodes with no contact-info.
+    index: Vec<(/*weight:*/ u64, /*index:*/ usize)>,
+    _phantom: PhantomData<T>,
+}
+
+impl Node {
+    #[inline]
+    fn pubkey(&self) -> Pubkey {
+        match &self.node {
+            NodeId::Pubkey(pubkey) => *pubkey,
+            NodeId::ContactInfo(node) => node.id,
+        }
+    }
+
+    #[inline]
+    fn contact_info(&self) -> Option<&ContactInfo> {
+        match &self.node {
+            NodeId::Pubkey(_) => None,
+            NodeId::ContactInfo(node) => Some(node),
+        }
+    }
+}
+
+impl<T> ClusterNodes<T> {
+    pub fn num_peers(&self) -> usize {
+        self.index.len()
+    }
+
+    // A peer is considered live if they generated their contact info recently.
+    pub fn num_peers_live(&self, now: u64) -> usize {
+        self.index
+            .iter()
+            .filter_map(|(_, index)| self.nodes[*index].contact_info())
+            .filter(|node| {
+                let elapsed = if node.wallclock < now {
+                    now - node.wallclock
+                } else {
+                    node.wallclock - now
+                };
+                elapsed < CRDS_GOSSIP_PULL_CRDS_TIMEOUT_MS
+            })
+            .count()
+    }
+}
+
+impl ClusterNodes<BroadcastStage> {
+    pub fn new(cluster_info: &ClusterInfo, stakes: &HashMap<Pubkey, u64>) -> Self {
+        new_cluster_nodes(cluster_info, stakes)
+    }
+
+    /// Returns the root of turbine broadcast tree, which the leader sends the
+    /// shred to.
+    pub fn get_broadcast_peer(&self, shred_seed: [u8; 32]) -> Option<&ContactInfo> {
+        if self.index.is_empty() {
+            None
+        } else {
+            let index = weighted_best(&self.index, shred_seed);
+            match &self.nodes[index].node {
+                NodeId::ContactInfo(node) => Some(node),
+                NodeId::Pubkey(_) => panic!("this should not happen!"),
+            }
+        }
+    }
+}
+
+impl ClusterNodes<RetransmitStage> {
+    pub fn new(cluster_info: &ClusterInfo, stakes: &HashMap<Pubkey, u64>) -> Self {
+        new_cluster_nodes(cluster_info, stakes)
+    }
+
+    pub fn get_retransmit_peers(
+        &self,
+        shred_seed: [u8; 32],
+        fanout: usize,
+        slot_leader: Option<Pubkey>,
+    ) -> (
+        Vec<&ContactInfo>, // neighbors
+        Vec<&ContactInfo>, // children
+    ) {
+        // Exclude leader from list of nodes.
+        let index = self.index.iter().copied();
+        let (weights, index): (Vec<u64>, Vec<usize>) = match slot_leader {
+            None => {
+                error!("unknown leader for shred slot");
+                index.unzip()
+            }
+            Some(slot_leader) if slot_leader == self.pubkey => {
+                error!("retransmit from slot leader: {}", slot_leader);
+                index.unzip()
+            }
+            Some(slot_leader) => index
+                .filter(|(_, i)| self.nodes[*i].pubkey() != slot_leader)
+                .unzip(),
+        };
+        let index: Vec<_> = {
+            let shuffle = weighted_shuffle(&weights, shred_seed);
+            shuffle.into_iter().map(|i| index[i]).collect()
+        };
+        let self_index = index
+            .iter()
+            .position(|i| self.nodes[*i].pubkey() == self.pubkey)
+            .unwrap();
+        let (neighbors, children) = compute_retransmit_peers(fanout, self_index, &index);
+        // Assert that the node itself is included in the set of neighbors, at
+        // the right offset.
+        debug_assert_eq!(
+            self.nodes[neighbors[self_index % fanout]].pubkey(),
+            self.pubkey
+        );
+        let get_contact_infos = |index: Vec<usize>| -> Vec<&ContactInfo> {
+            index
+                .into_iter()
+                .map(|i| self.nodes[i].contact_info().unwrap())
+                .collect()
+        };
+        (get_contact_infos(neighbors), get_contact_infos(children))
+    }
+}
+
+fn new_cluster_nodes<T: 'static>(
+    cluster_info: &ClusterInfo,
+    stakes: &HashMap<Pubkey, u64>,
+) -> ClusterNodes<T> {
+    let self_pubkey = cluster_info.id();
+    let nodes = get_nodes(cluster_info, stakes);
+    let broadcast = TypeId::of::<T>() == TypeId::of::<BroadcastStage>();
+    // For backward compatibility:
+    //   * nodes which do not have contact-info are excluded.
+    //   * stakes are floored at 1.
+    // The sorting key here should be equivalent to
+    // solana_gossip::deprecated::sorted_stakes_with_index.
+    // Leader itself is excluded when sampling broadcast peers.
+    let index = nodes
+        .iter()
+        .enumerate()
+        .filter(|(_, node)| node.contact_info().is_some())
+        .filter(|(_, node)| !broadcast || node.pubkey() != self_pubkey)
+        .sorted_by_key(|(_, node)| Reverse((node.stake.max(1), node.pubkey())))
+        .map(|(index, node)| (node.stake.max(1), index))
+        .collect();
+    ClusterNodes {
+        pubkey: self_pubkey,
+        nodes,
+        index,
+        _phantom: PhantomData::default(),
+    }
+}
+
+// All staked nodes + other known tvu-peers + the node itself;
+// sorted by (stake, pubkey) in descending order.
+fn get_nodes(cluster_info: &ClusterInfo, stakes: &HashMap<Pubkey, u64>) -> Vec<Node> {
+    let self_pubkey = cluster_info.id();
+    // The local node itself.
+    std::iter::once({
+        let stake = stakes.get(&self_pubkey).copied().unwrap_or_default();
+        let node = NodeId::from(cluster_info.my_contact_info());
+        Node { node, stake }
+    })
+    // All known tvu-peers from gossip.
+    .chain(cluster_info.tvu_peers().into_iter().map(|node| {
+        let stake = stakes.get(&node.id).copied().unwrap_or_default();
+        let node = NodeId::from(node);
+        Node { node, stake }
+    }))
+    // All staked nodes.
+    .chain(
+        stakes
+            .iter()
+            .filter(|(_, stake)| **stake > 0)
+            .map(|(&pubkey, &stake)| Node {
+                node: NodeId::from(pubkey),
+                stake,
+            }),
+    )
+    .sorted_by_key(|node| Reverse((node.stake, node.pubkey())))
+    // Since sorted_by_key is stable, in case of duplicates, this
+    // will keep nodes with contact-info.
+    .dedup_by(|a, b| a.pubkey() == b.pubkey())
+    .collect()
+}
+
+impl From<ContactInfo> for NodeId {
+    fn from(node: ContactInfo) -> Self {
+        NodeId::ContactInfo(node)
+    }
+}
+
+impl From<Pubkey> for NodeId {
+    fn from(pubkey: Pubkey) -> Self {
+        NodeId::Pubkey(pubkey)
+    }
+}
+
+impl<T> Default for ClusterNodes<T> {
+    fn default() -> Self {
+        Self {
+            pubkey: Pubkey::default(),
+            nodes: Vec::default(),
+            index: Vec::default(),
+            _phantom: PhantomData::default(),
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use {
+        super::*,
+        rand::{seq::SliceRandom, Rng},
+        solana_gossip::{
+            crds_value::{CrdsData, CrdsValue},
+            deprecated::{
+                shuffle_peers_and_index, sorted_retransmit_peers_and_stakes,
+                sorted_stakes_with_index,
+            },
+        },
+        solana_sdk::{signature::Keypair, timing::timestamp},
+        solana_streamer::socket::SocketAddrSpace,
+        std::{iter::repeat_with, sync::Arc},
+    };
+
+    // Legacy methods copied for testing backward compatibility.
+
+    fn get_broadcast_peers(
+        cluster_info: &ClusterInfo,
+        stakes: Option<&HashMap<Pubkey, u64>>,
+    ) -> (Vec<ContactInfo>, Vec<(u64, usize)>) {
+        let mut peers = cluster_info.tvu_peers();
+        let peers_and_stakes = stake_weight_peers(&mut peers, stakes);
+        (peers, peers_and_stakes)
+    }
+
+    fn stake_weight_peers(
+        peers: &mut Vec<ContactInfo>,
+        stakes: Option<&HashMap<Pubkey, u64>>,
+    ) -> Vec<(u64, usize)> {
+        peers.dedup();
+        sorted_stakes_with_index(peers, stakes)
+    }
+
+    fn make_cluster<R: Rng>(
+        rng: &mut R,
+    ) -> (
+        Vec<ContactInfo>,
+        HashMap<Pubkey, u64>, // stakes
+        ClusterInfo,
+    ) {
+        let mut nodes: Vec<_> = repeat_with(|| ContactInfo::new_rand(rng, None))
+            .take(1000)
+            .collect();
+        nodes.shuffle(rng);
+        let this_node = nodes[0].clone();
+        let mut stakes: HashMap<Pubkey, u64> = nodes
+            .iter()
+            .filter_map(|node| {
+                if rng.gen_ratio(1, 7) {
+                    None // No stake for some of the nodes.
+                } else {
+                    Some((node.id, rng.gen_range(0, 20)))
+                }
+            })
+            .collect();
+        // Add some staked nodes with no contact-info.
+        stakes.extend(repeat_with(|| (Pubkey::new_unique(), rng.gen_range(0, 20))).take(100));
+        let cluster_info = ClusterInfo::new(
+            this_node,
+            Arc::new(Keypair::new()),
+            SocketAddrSpace::Unspecified,
+        );
+        {
+            let now = timestamp();
+            let mut gossip = cluster_info.gossip.write().unwrap();
+            // First node is pushed to crds table by ClusterInfo constructor.
+            for node in nodes.iter().skip(1) {
+                let node = CrdsData::ContactInfo(node.clone());
+                let node = CrdsValue::new_unsigned(node);
+                assert_eq!(gossip.crds.insert(node, now), Ok(()));
+            }
+        }
+        (nodes, stakes, cluster_info)
+    }
+
+    #[test]
+    fn test_cluster_nodes_retransmit() {
+        let mut rng = rand::thread_rng();
+        let (nodes, stakes, cluster_info) = make_cluster(&mut rng);
+        let this_node = cluster_info.my_contact_info();
+        // ClusterInfo::tvu_peers excludes the node itself.
+        assert_eq!(cluster_info.tvu_peers().len(), nodes.len() - 1);
+        let cluster_nodes = ClusterNodes::<RetransmitStage>::new(&cluster_info, &stakes);
+        // All nodes with contact-info should be in the index.
+        assert_eq!(cluster_nodes.index.len(), nodes.len());
+        // Staked nodes with no contact-info should be included.
+        assert!(cluster_nodes.nodes.len() > nodes.len());
+        // Assert that all nodes keep their contact-info.
+        // and, all staked nodes are also included.
+        {
+            let cluster_nodes: HashMap<_, _> = cluster_nodes
+                .nodes
+                .iter()
+                .map(|node| (node.pubkey(), node))
+                .collect();
+            for node in &nodes {
+                assert_eq!(cluster_nodes[&node.id].contact_info().unwrap().id, node.id);
+            }
+            for (pubkey, stake) in &stakes {
+                if *stake > 0 {
+                    assert_eq!(cluster_nodes[pubkey].stake, *stake);
+                }
+            }
+        }
+        let (peers, stakes_and_index) =
+            sorted_retransmit_peers_and_stakes(&cluster_info, Some(&stakes));
+        assert_eq!(stakes_and_index.len(), peers.len());
+        assert_eq!(cluster_nodes.index.len(), peers.len());
+        for (i, node) in cluster_nodes
+            .index
+            .iter()
+            .map(|(_, i)| &cluster_nodes.nodes[*i])
+            .enumerate()
+        {
+            let (stake, index) = stakes_and_index[i];
+            // Wallclock may be update by ClusterInfo::push_self.
+            if node.pubkey() == this_node.id {
+                assert_eq!(this_node.id, peers[index].id)
+            } else {
+                assert_eq!(node.contact_info().unwrap(), &peers[index]);
+            }
+            assert_eq!(node.stake.max(1), stake);
+        }
+        let slot_leader = nodes[1..].choose(&mut rng).unwrap().id;
+        // Remove slot leader from peers indices.
+        let stakes_and_index: Vec<_> = stakes_and_index
+            .into_iter()
+            .filter(|(_stake, index)| peers[*index].id != slot_leader)
+            .collect();
+        assert_eq!(peers.len(), stakes_and_index.len() + 1);
+        let mut shred_seed = [0u8; 32];
+        rng.fill(&mut shred_seed[..]);
+        let (self_index, shuffled_peers_and_stakes) =
+            shuffle_peers_and_index(&this_node.id, &peers, &stakes_and_index, shred_seed);
+        let shuffled_index: Vec<_> = shuffled_peers_and_stakes
+            .into_iter()
+            .map(|(_, index)| index)
+            .collect();
+        assert_eq!(this_node.id, peers[shuffled_index[self_index]].id);
+        for fanout in 1..200 {
+            let (neighbors_indices, children_indices) =
+                compute_retransmit_peers(fanout, self_index, &shuffled_index);
+            let (neighbors, children) =
+                cluster_nodes.get_retransmit_peers(shred_seed, fanout, Some(slot_leader));
+            assert_eq!(children.len(), children_indices.len());
+            for (node, index) in children.into_iter().zip(children_indices) {
+                assert_eq!(*node, peers[index]);
+            }
+            assert_eq!(neighbors.len(), neighbors_indices.len());
+            assert_eq!(neighbors[0].id, peers[neighbors_indices[0]].id);
+            for (node, index) in neighbors.into_iter().zip(neighbors_indices).skip(1) {
+                assert_eq!(*node, peers[index]);
+            }
+        }
+    }
+
+    #[test]
+    fn test_cluster_nodes_broadcast() {
+        let mut rng = rand::thread_rng();
+        let (nodes, stakes, cluster_info) = make_cluster(&mut rng);
+        // ClusterInfo::tvu_peers excludes the node itself.
+        assert_eq!(cluster_info.tvu_peers().len(), nodes.len() - 1);
+        let cluster_nodes = ClusterNodes::<BroadcastStage>::new(&cluster_info, &stakes);
+        // All nodes with contact-info should be in the index.
+        // Excluding this node itself.
+        assert_eq!(cluster_nodes.index.len() + 1, nodes.len());
+        // Staked nodes with no contact-info should be included.
+        assert!(cluster_nodes.nodes.len() > nodes.len());
+        // Assert that all nodes keep their contact-info.
+        // and, all staked nodes are also included.
+        {
+            let cluster_nodes: HashMap<_, _> = cluster_nodes
+                .nodes
+                .iter()
+                .map(|node| (node.pubkey(), node))
+                .collect();
+            for node in &nodes {
+                assert_eq!(cluster_nodes[&node.id].contact_info().unwrap().id, node.id);
+            }
+            for (pubkey, stake) in &stakes {
+                if *stake > 0 {
+                    assert_eq!(cluster_nodes[pubkey].stake, *stake);
+                }
+            }
+        }
+        let (peers, peers_and_stakes) = get_broadcast_peers(&cluster_info, Some(&stakes));
+        assert_eq!(peers_and_stakes.len(), peers.len());
+        assert_eq!(cluster_nodes.index.len(), peers.len());
+        for (i, node) in cluster_nodes
+            .index
+            .iter()
+            .map(|(_, i)| &cluster_nodes.nodes[*i])
+            .enumerate()
+        {
+            let (stake, index) = peers_and_stakes[i];
+            assert_eq!(node.contact_info().unwrap(), &peers[index]);
+            assert_eq!(node.stake.max(1), stake);
+        }
+        for _ in 0..100 {
+            let mut shred_seed = [0u8; 32];
+            rng.fill(&mut shred_seed[..]);
+            let index = weighted_best(&peers_and_stakes, shred_seed);
+            let peer = cluster_nodes.get_broadcast_peer(shred_seed).unwrap();
+            assert_eq!(*peer, peers[index]);
+        }
+    }
+}
diff --git a/core/src/cluster_slot_state_verifier.rs b/core/src/cluster_slot_state_verifier.rs
index 2bc47e2a75ffd9..2ad5090ce5c5e8 100644
--- a/core/src/cluster_slot_state_verifier.rs
+++ b/core/src/cluster_slot_state_verifier.rs
@@ -3,8 +3,9 @@ use crate::{
     progress_map::ProgressMap,
 };
 use solana_sdk::{clock::Slot, hash::Hash};
-use std::collections::{BTreeMap, HashMap, HashSet};
+use std::collections::{BTreeMap, BTreeSet};
 
+pub(crate) type DuplicateSlotsTracker = BTreeSet<Slot>;
 pub(crate) type GossipDuplicateConfirmedSlots = BTreeMap<Slot, Hash>;
 type SlotStateHandler = fn(Slot, &Hash, Option<&Hash>, bool, bool) -> Vec<ResultingStateChange>;
 
@@ -191,7 +192,7 @@ fn get_cluster_duplicate_confirmed_hash<'a>(
                     slot, gossip_duplicate_confirmed_hash, local_duplicate_confirmed_hash
                 );
             }
-            Some(&local_frozen_hash)
+            Some(local_frozen_hash)
         }
         (Some(local_frozen_hash), None) => Some(local_frozen_hash),
         _ => gossip_duplicate_confirmed_hash,
@@ -200,19 +201,12 @@ fn get_cluster_duplicate_confirmed_hash<'a>(
 
 fn apply_state_changes(
     slot: Slot,
-    progress: &mut ProgressMap,
     fork_choice: &mut HeaviestSubtreeForkChoice,
-    ancestors: &HashMap<Slot, HashSet<Slot>>,
-    descendants: &HashMap<Slot, HashSet<Slot>>,
     state_changes: Vec<ResultingStateChange>,
 ) {
     for state_change in state_changes {
         match state_change {
             ResultingStateChange::MarkSlotDuplicate(bank_frozen_hash) => {
-                progress.set_unconfirmed_duplicate_slot(
-                    slot,
-                    descendants.get(&slot).unwrap_or(&HashSet::default()),
-                );
                 fork_choice.mark_fork_invalid_candidate(&(slot, bank_frozen_hash));
             }
             ResultingStateChange::RepairDuplicateConfirmedVersion(
@@ -223,25 +217,20 @@ fn apply_state_changes(
                 repair_correct_version(slot, &cluster_duplicate_confirmed_hash);
             }
             ResultingStateChange::DuplicateConfirmedSlotMatchesCluster(bank_frozen_hash) => {
-                progress.set_confirmed_duplicate_slot(
-                    slot,
-                    ancestors.get(&slot).unwrap_or(&HashSet::default()),
-                    descendants.get(&slot).unwrap_or(&HashSet::default()),
-                );
                 fork_choice.mark_fork_valid_candidate(&(slot, bank_frozen_hash));
             }
         }
     }
 }
 
+#[allow(clippy::too_many_arguments)]
 pub(crate) fn check_slot_agrees_with_cluster(
     slot: Slot,
     root: Slot,
     frozen_hash: Option<Hash>,
+    duplicate_slots_tracker: &mut DuplicateSlotsTracker,
     gossip_duplicate_confirmed_slots: &GossipDuplicateConfirmedSlots,
-    ancestors: &HashMap<Slot, HashSet<Slot>>,
-    descendants: &HashMap<Slot, HashSet<Slot>>,
-    progress: &mut ProgressMap,
+    progress: &ProgressMap,
     fork_choice: &mut HeaviestSubtreeForkChoice,
     slot_state_update: SlotStateUpdate,
 ) {
@@ -258,6 +247,15 @@ pub(crate) fn check_slot_agrees_with_cluster(
         return;
     }
 
+    // Needs to happen before the frozen_hash.is_none() check below to account for duplicate
+    // signals arriving before the bank is constructed in replay.
+    if matches!(slot_state_update, SlotStateUpdate::Duplicate) {
+        // If this slot has already been processed before, return
+        if !duplicate_slots_tracker.insert(slot) {
+            return;
+        }
+    }
+
     if frozen_hash.is_none() {
         // If the bank doesn't even exist in BankForks yet,
         // then there's nothing to do as replay of the slot
@@ -268,25 +266,18 @@ pub(crate) fn check_slot_agrees_with_cluster(
     let frozen_hash = frozen_hash.unwrap();
     let gossip_duplicate_confirmed_hash = gossip_duplicate_confirmed_slots.get(&slot);
 
-    let is_local_replay_duplicate_confirmed = progress.is_duplicate_confirmed(slot).expect("If the frozen hash exists, then the slot must exist in bank forks and thus in progress map");
+    // If the bank hasn't been frozen yet, then we haven't duplicate confirmed a local version
+    // this slot through replay yet.
+    let is_local_replay_duplicate_confirmed = fork_choice
+        .is_duplicate_confirmed(&(slot, frozen_hash))
+        .unwrap_or(false);
     let cluster_duplicate_confirmed_hash = get_cluster_duplicate_confirmed_hash(
         slot,
         gossip_duplicate_confirmed_hash,
         &frozen_hash,
         is_local_replay_duplicate_confirmed,
     );
-    let mut is_slot_duplicate =
-        progress.is_unconfirmed_duplicate(slot).expect("If the frozen hash exists, then the slot must exist in bank forks and thus in progress map");
-    if matches!(slot_state_update, SlotStateUpdate::Duplicate) {
-        if is_slot_duplicate {
-            // Already processed duplicate signal for this slot, no need to continue
-            return;
-        } else {
-            // Otherwise, mark the slot as duplicate so the appropriate state changes
-            // will trigger
-            is_slot_duplicate = true;
-        }
-    }
+    let is_slot_duplicate = duplicate_slots_tracker.contains(&slot);
     let is_dead = progress.is_dead(slot).expect("If the frozen hash exists, then the slot must exist in bank forks and thus in progress map");
 
     info!(
@@ -309,14 +300,7 @@ pub(crate) fn check_slot_agrees_with_cluster(
         is_slot_duplicate,
         is_dead,
     );
-    apply_state_changes(
-        slot,
-        progress,
-        fork_choice,
-        ancestors,
-        descendants,
-        state_changes,
-    );
+    apply_state_changes(slot, fork_choice, state_changes);
 }
 
 #[cfg(test)]
@@ -324,15 +308,16 @@ mod test {
     use super::*;
     use crate::consensus::test::VoteSimulator;
     use solana_runtime::bank_forks::BankForks;
-    use std::sync::RwLock;
+    use std::{
+        collections::{HashMap, HashSet},
+        sync::RwLock,
+    };
     use trees::tr;
 
     struct InitialState {
         heaviest_subtree_fork_choice: HeaviestSubtreeForkChoice,
         progress: ProgressMap,
-        ancestors: HashMap<Slot, HashSet<Slot>>,
         descendants: HashMap<Slot, HashSet<Slot>>,
-        slot: Slot,
         bank_forks: RwLock<BankForks>,
     }
 
@@ -341,7 +326,6 @@ mod test {
         let forks = tr(0) / (tr(1) / (tr(2) / tr(3)));
         let mut vote_simulator = VoteSimulator::new(1);
         vote_simulator.fill_bank_forks(forks, &HashMap::new());
-        let ancestors = vote_simulator.bank_forks.read().unwrap().ancestors();
 
         let descendants = vote_simulator
             .bank_forks
@@ -353,9 +337,7 @@ mod test {
         InitialState {
             heaviest_subtree_fork_choice: vote_simulator.heaviest_subtree_fork_choice,
             progress: vote_simulator.progress,
-            ancestors,
             descendants,
-            slot: 0,
             bank_forks: vote_simulator.bank_forks,
         }
     }
@@ -626,75 +608,159 @@ mod test {
         // Common state
         let InitialState {
             mut heaviest_subtree_fork_choice,
-            mut progress,
-            ancestors,
             descendants,
-            slot,
             bank_forks,
+            ..
         } = setup();
 
         // MarkSlotDuplicate should mark progress map and remove
         // the slot from fork choice
-        let slot_hash = bank_forks.read().unwrap().get(slot).unwrap().hash();
+        let duplicate_slot = bank_forks.read().unwrap().root() + 1;
+        let duplicate_slot_hash = bank_forks
+            .read()
+            .unwrap()
+            .get(duplicate_slot)
+            .unwrap()
+            .hash();
         apply_state_changes(
-            slot,
-            &mut progress,
+            duplicate_slot,
             &mut heaviest_subtree_fork_choice,
-            &ancestors,
-            &descendants,
-            vec![ResultingStateChange::MarkSlotDuplicate(slot_hash)],
+            vec![ResultingStateChange::MarkSlotDuplicate(duplicate_slot_hash)],
         );
         assert!(!heaviest_subtree_fork_choice
-            .is_candidate_slot(&(slot, slot_hash))
+            .is_candidate(&(duplicate_slot, duplicate_slot_hash))
             .unwrap());
         for child_slot in descendants
-            .get(&slot)
+            .get(&duplicate_slot)
             .unwrap()
             .iter()
-            .chain(std::iter::once(&slot))
+            .chain(std::iter::once(&duplicate_slot))
         {
             assert_eq!(
-                progress
-                    .latest_unconfirmed_duplicate_ancestor(*child_slot)
+                heaviest_subtree_fork_choice
+                    .latest_invalid_ancestor(&(
+                        *child_slot,
+                        bank_forks.read().unwrap().get(*child_slot).unwrap().hash()
+                    ))
                     .unwrap(),
-                slot
+                duplicate_slot
             );
         }
 
         // DuplicateConfirmedSlotMatchesCluster should re-enable fork choice
         apply_state_changes(
-            slot,
-            &mut progress,
+            duplicate_slot,
             &mut heaviest_subtree_fork_choice,
-            &ancestors,
-            &descendants,
             vec![ResultingStateChange::DuplicateConfirmedSlotMatchesCluster(
-                slot_hash,
+                duplicate_slot_hash,
             )],
         );
         for child_slot in descendants
-            .get(&slot)
+            .get(&duplicate_slot)
             .unwrap()
             .iter()
-            .chain(std::iter::once(&slot))
+            .chain(std::iter::once(&duplicate_slot))
         {
-            assert!(progress
-                .latest_unconfirmed_duplicate_ancestor(*child_slot)
+            assert!(heaviest_subtree_fork_choice
+                .latest_invalid_ancestor(&(
+                    *child_slot,
+                    bank_forks.read().unwrap().get(*child_slot).unwrap().hash()
+                ))
                 .is_none());
         }
         assert!(heaviest_subtree_fork_choice
-            .is_candidate_slot(&(slot, slot_hash))
+            .is_candidate(&(duplicate_slot, duplicate_slot_hash))
             .unwrap());
     }
 
+    fn run_test_state_duplicate_then_bank_frozen(initial_bank_hash: Option<Hash>) {
+        // Common state
+        let InitialState {
+            mut heaviest_subtree_fork_choice,
+            progress,
+            bank_forks,
+            ..
+        } = setup();
+
+        // Setup a duplicate slot state transition with the initial bank state of the duplicate slot
+        // determined by `initial_bank_hash`, which can be:
+        // 1) A default hash (unfrozen bank),
+        // 2) None (a slot that hasn't even started replay yet).
+        let root = 0;
+        let mut duplicate_slots_tracker = DuplicateSlotsTracker::default();
+        let gossip_duplicate_confirmed_slots = GossipDuplicateConfirmedSlots::default();
+        let duplicate_slot = 2;
+        check_slot_agrees_with_cluster(
+            duplicate_slot,
+            root,
+            initial_bank_hash,
+            &mut duplicate_slots_tracker,
+            &gossip_duplicate_confirmed_slots,
+            &progress,
+            &mut heaviest_subtree_fork_choice,
+            SlotStateUpdate::Duplicate,
+        );
+        assert!(duplicate_slots_tracker.contains(&duplicate_slot));
+        // Nothing should be applied yet to fork choice, since bank was not yet frozen
+        for slot in 2..=3 {
+            let slot_hash = bank_forks.read().unwrap().get(slot).unwrap().hash();
+            assert!(heaviest_subtree_fork_choice
+                .latest_invalid_ancestor(&(slot, slot_hash))
+                .is_none());
+        }
+
+        // Now freeze the bank
+        let frozen_duplicate_slot_hash = bank_forks
+            .read()
+            .unwrap()
+            .get(duplicate_slot)
+            .unwrap()
+            .hash();
+        check_slot_agrees_with_cluster(
+            duplicate_slot,
+            root,
+            Some(frozen_duplicate_slot_hash),
+            &mut duplicate_slots_tracker,
+            &gossip_duplicate_confirmed_slots,
+            &progress,
+            &mut heaviest_subtree_fork_choice,
+            SlotStateUpdate::Frozen,
+        );
+
+        // Progress map should have the correct updates, fork choice should mark duplicate
+        // as unvotable
+        assert!(heaviest_subtree_fork_choice
+            .is_unconfirmed_duplicate(&(duplicate_slot, frozen_duplicate_slot_hash))
+            .unwrap());
+
+        // The ancestor of the duplicate slot should be the best slot now
+        let (duplicate_ancestor, duplicate_parent_hash) = {
+            let r_bank_forks = bank_forks.read().unwrap();
+            let parent_bank = r_bank_forks.get(duplicate_slot).unwrap().parent().unwrap();
+            (parent_bank.slot(), parent_bank.hash())
+        };
+        assert_eq!(
+            heaviest_subtree_fork_choice.best_overall_slot(),
+            (duplicate_ancestor, duplicate_parent_hash)
+        );
+    }
+
+    #[test]
+    fn test_state_unfrozen_bank_duplicate_then_bank_frozen() {
+        run_test_state_duplicate_then_bank_frozen(Some(Hash::default()));
+    }
+
+    #[test]
+    fn test_state_unreplayed_bank_duplicate_then_bank_frozen() {
+        run_test_state_duplicate_then_bank_frozen(None);
+    }
+
     #[test]
     fn test_state_ancestor_confirmed_descendant_duplicate() {
         // Common state
         let InitialState {
             mut heaviest_subtree_fork_choice,
-            mut progress,
-            ancestors,
-            descendants,
+            progress,
             bank_forks,
             ..
         } = setup();
@@ -705,6 +771,7 @@ mod test {
             (3, slot3_hash)
         );
         let root = 0;
+        let mut duplicate_slots_tracker = DuplicateSlotsTracker::default();
         let mut gossip_duplicate_confirmed_slots = GossipDuplicateConfirmedSlots::default();
 
         // Mark slot 2 as duplicate confirmed
@@ -714,36 +781,67 @@ mod test {
             2,
             root,
             Some(slot2_hash),
+            &mut duplicate_slots_tracker,
             &gossip_duplicate_confirmed_slots,
-            &ancestors,
-            &descendants,
-            &mut progress,
+            &progress,
             &mut heaviest_subtree_fork_choice,
             SlotStateUpdate::DuplicateConfirmed,
         );
-
+        assert!(heaviest_subtree_fork_choice
+            .is_duplicate_confirmed(&(2, slot2_hash))
+            .unwrap());
         assert_eq!(
             heaviest_subtree_fork_choice.best_overall_slot(),
             (3, slot3_hash)
         );
+        for slot in 0..=2 {
+            let slot_hash = bank_forks.read().unwrap().get(slot).unwrap().hash();
+            assert!(heaviest_subtree_fork_choice
+                .is_duplicate_confirmed(&(slot, slot_hash))
+                .unwrap());
+            assert!(heaviest_subtree_fork_choice
+                .latest_invalid_ancestor(&(slot, slot_hash))
+                .is_none());
+        }
 
-        // Mark 3 as duplicate, should not remove slot 2 from fork choice
+        // Mark 3 as duplicate, should not remove the duplicate confirmed slot 2 from
+        // fork choice
         check_slot_agrees_with_cluster(
             3,
             root,
             Some(slot3_hash),
+            &mut duplicate_slots_tracker,
             &gossip_duplicate_confirmed_slots,
-            &ancestors,
-            &descendants,
-            &mut progress,
+            &progress,
             &mut heaviest_subtree_fork_choice,
             SlotStateUpdate::Duplicate,
         );
-
+        assert!(duplicate_slots_tracker.contains(&3));
         assert_eq!(
             heaviest_subtree_fork_choice.best_overall_slot(),
             (2, slot2_hash)
         );
+        for slot in 0..=3 {
+            let slot_hash = bank_forks.read().unwrap().get(slot).unwrap().hash();
+            if slot <= 2 {
+                assert!(heaviest_subtree_fork_choice
+                    .is_duplicate_confirmed(&(slot, slot_hash))
+                    .unwrap());
+                assert!(heaviest_subtree_fork_choice
+                    .latest_invalid_ancestor(&(slot, slot_hash))
+                    .is_none());
+            } else {
+                assert!(!heaviest_subtree_fork_choice
+                    .is_duplicate_confirmed(&(slot, slot_hash))
+                    .unwrap());
+                assert_eq!(
+                    heaviest_subtree_fork_choice
+                        .latest_invalid_ancestor(&(slot, slot_hash))
+                        .unwrap(),
+                    3
+                );
+            }
+        }
     }
 
     #[test]
@@ -751,9 +849,7 @@ mod test {
         // Common state
         let InitialState {
             mut heaviest_subtree_fork_choice,
-            mut progress,
-            ancestors,
-            descendants,
+            progress,
             bank_forks,
             ..
         } = setup();
@@ -764,19 +860,30 @@ mod test {
             (3, slot3_hash)
         );
         let root = 0;
+        let mut duplicate_slots_tracker = DuplicateSlotsTracker::default();
         let mut gossip_duplicate_confirmed_slots = GossipDuplicateConfirmedSlots::default();
-        // Mark 2 as duplicate confirmed
+
+        // Mark 2 as duplicate
         check_slot_agrees_with_cluster(
             2,
             root,
             Some(bank_forks.read().unwrap().get(2).unwrap().hash()),
+            &mut duplicate_slots_tracker,
             &gossip_duplicate_confirmed_slots,
-            &ancestors,
-            &descendants,
-            &mut progress,
+            &progress,
             &mut heaviest_subtree_fork_choice,
             SlotStateUpdate::Duplicate,
         );
+        assert!(duplicate_slots_tracker.contains(&2));
+        for slot in 2..=3 {
+            let slot_hash = bank_forks.read().unwrap().get(slot).unwrap().hash();
+            assert_eq!(
+                heaviest_subtree_fork_choice
+                    .latest_invalid_ancestor(&(slot, slot_hash))
+                    .unwrap(),
+                2
+            );
+        }
 
         let slot1_hash = bank_forks.read().unwrap().get(1).unwrap().hash();
         assert_eq!(
@@ -790,14 +897,93 @@ mod test {
             3,
             root,
             Some(slot3_hash),
+            &mut duplicate_slots_tracker,
             &gossip_duplicate_confirmed_slots,
-            &ancestors,
-            &descendants,
-            &mut progress,
+            &progress,
             &mut heaviest_subtree_fork_choice,
             SlotStateUpdate::DuplicateConfirmed,
         );
+        for slot in 0..=3 {
+            let slot_hash = bank_forks.read().unwrap().get(slot).unwrap().hash();
+            assert!(heaviest_subtree_fork_choice
+                .is_duplicate_confirmed(&(slot, slot_hash))
+                .unwrap());
+            assert!(heaviest_subtree_fork_choice
+                .latest_invalid_ancestor(&(slot, slot_hash))
+                .is_none());
+        }
+        assert_eq!(
+            heaviest_subtree_fork_choice.best_overall_slot(),
+            (3, slot3_hash)
+        );
+    }
 
+    #[test]
+    fn test_state_descendant_confirmed_ancestor_duplicate() {
+        // Common state
+        let InitialState {
+            mut heaviest_subtree_fork_choice,
+            progress,
+            bank_forks,
+            ..
+        } = setup();
+
+        let slot3_hash = bank_forks.read().unwrap().get(3).unwrap().hash();
+        assert_eq!(
+            heaviest_subtree_fork_choice.best_overall_slot(),
+            (3, slot3_hash)
+        );
+        let root = 0;
+        let mut duplicate_slots_tracker = DuplicateSlotsTracker::default();
+        let mut gossip_duplicate_confirmed_slots = GossipDuplicateConfirmedSlots::default();
+
+        // Mark 3 as duplicate confirmed
+        gossip_duplicate_confirmed_slots.insert(3, slot3_hash);
+        check_slot_agrees_with_cluster(
+            3,
+            root,
+            Some(slot3_hash),
+            &mut duplicate_slots_tracker,
+            &gossip_duplicate_confirmed_slots,
+            &progress,
+            &mut heaviest_subtree_fork_choice,
+            SlotStateUpdate::DuplicateConfirmed,
+        );
+        let verify_all_slots_duplicate_confirmed =
+            |bank_forks: &RwLock<BankForks>,
+             heaviest_subtree_fork_choice: &HeaviestSubtreeForkChoice| {
+                for slot in 0..=3 {
+                    let slot_hash = bank_forks.read().unwrap().get(slot).unwrap().hash();
+                    assert!(heaviest_subtree_fork_choice
+                        .is_duplicate_confirmed(&(slot, slot_hash))
+                        .unwrap());
+                    assert!(heaviest_subtree_fork_choice
+                        .latest_invalid_ancestor(&(slot, slot_hash))
+                        .is_none());
+                }
+            };
+        verify_all_slots_duplicate_confirmed(&bank_forks, &heaviest_subtree_fork_choice);
+        assert_eq!(
+            heaviest_subtree_fork_choice.best_overall_slot(),
+            (3, slot3_hash)
+        );
+
+        // Mark ancestor 1 as duplicate, fork choice should be unaffected since
+        // slot 1 was duplicate confirmed by the confirmation on its
+        // descendant, 3.
+        let slot1_hash = bank_forks.read().unwrap().get(1).unwrap().hash();
+        check_slot_agrees_with_cluster(
+            1,
+            root,
+            Some(slot1_hash),
+            &mut duplicate_slots_tracker,
+            &gossip_duplicate_confirmed_slots,
+            &progress,
+            &mut heaviest_subtree_fork_choice,
+            SlotStateUpdate::Duplicate,
+        );
+        assert!(duplicate_slots_tracker.contains(&1));
+        verify_all_slots_duplicate_confirmed(&bank_forks, &heaviest_subtree_fork_choice);
         assert_eq!(
             heaviest_subtree_fork_choice.best_overall_slot(),
             (3, slot3_hash)
diff --git a/core/src/cluster_slots.rs b/core/src/cluster_slots.rs
index 7a9ca5fd3ddc91..1eee4ff29e8ace 100644
--- a/core/src/cluster_slots.rs
+++ b/core/src/cluster_slots.rs
@@ -1,20 +1,24 @@
-use crate::serve_repair::RepairType;
-use itertools::Itertools;
-use solana_gossip::{
-    cluster_info::ClusterInfo, contact_info::ContactInfo, crds::Cursor, epoch_slots::EpochSlots,
-};
-use solana_runtime::{bank_forks::BankForks, epoch_stakes::NodeIdToVoteAccounts};
-use solana_sdk::{clock::Slot, pubkey::Pubkey};
-use std::{
-    collections::{BTreeMap, HashMap, HashSet},
-    sync::{Arc, Mutex, RwLock},
+use {
+    itertools::Itertools,
+    solana_gossip::{
+        cluster_info::ClusterInfo, contact_info::ContactInfo, crds::Cursor, epoch_slots::EpochSlots,
+    },
+    solana_runtime::{bank::Bank, epoch_stakes::NodeIdToVoteAccounts},
+    solana_sdk::{
+        clock::{Slot, DEFAULT_SLOTS_PER_EPOCH},
+        pubkey::Pubkey,
+    },
+    std::{
+        collections::{BTreeMap, HashMap},
+        sync::{Arc, Mutex, RwLock},
+    },
 };
 
 // Limit the size of cluster-slots map in case
 // of receiving bogus epoch slots values.
 const CLUSTER_SLOTS_TRIM_SIZE: usize = 524_288; // 512K
 
-pub type SlotPubkeys = HashMap<Pubkey, u64>;
+pub(crate) type SlotPubkeys = HashMap</*node:*/ Pubkey, /*stake:*/ u64>;
 
 #[derive(Default)]
 pub struct ClusterSlots {
@@ -25,20 +29,21 @@ pub struct ClusterSlots {
 }
 
 impl ClusterSlots {
-    pub fn lookup(&self, slot: Slot) -> Option<Arc<RwLock<SlotPubkeys>>> {
+    pub(crate) fn lookup(&self, slot: Slot) -> Option<Arc<RwLock<SlotPubkeys>>> {
         self.cluster_slots.read().unwrap().get(&slot).cloned()
     }
 
-    pub fn update(&self, root: Slot, cluster_info: &ClusterInfo, bank_forks: &RwLock<BankForks>) {
-        self.update_peers(bank_forks);
+    pub(crate) fn update(&self, root_bank: &Bank, cluster_info: &ClusterInfo) {
+        self.update_peers(root_bank);
         let epoch_slots = {
             let mut cursor = self.cursor.lock().unwrap();
             cluster_info.get_epoch_slots(&mut cursor)
         };
-        self.update_internal(root, epoch_slots);
+        let num_epoch_slots = root_bank.get_slots_in_epoch(root_bank.epoch());
+        self.update_internal(root_bank.slot(), epoch_slots, num_epoch_slots);
     }
 
-    fn update_internal(&self, root: Slot, epoch_slots_list: Vec<EpochSlots>) {
+    fn update_internal(&self, root: Slot, epoch_slots_list: Vec<EpochSlots>, num_epoch_slots: u64) {
         // Attach validator's total stake.
         let epoch_slots_list: Vec<_> = {
             let validator_stakes = self.validator_stakes.read().unwrap();
@@ -53,13 +58,20 @@ impl ClusterSlots {
                 })
                 .collect()
         };
+        // Discard slots at or before current root or epochs ahead.
+        let slot_range = (root + 1)
+            ..root.saturating_add(
+                num_epoch_slots
+                    .max(DEFAULT_SLOTS_PER_EPOCH)
+                    .saturating_mul(2),
+            );
         let slot_nodes_stakes = epoch_slots_list
             .into_iter()
             .flat_map(|(epoch_slots, stake)| {
                 epoch_slots
                     .to_slots(root)
                     .into_iter()
-                    .filter(|slot| *slot > root)
+                    .filter(|slot| slot_range.contains(slot))
                     .zip(std::iter::repeat((epoch_slots.from, stake)))
             })
             .into_group_map();
@@ -89,16 +101,6 @@ impl ClusterSlots {
         }
     }
 
-    pub fn collect(&self, id: &Pubkey) -> HashSet<Slot> {
-        self.cluster_slots
-            .read()
-            .unwrap()
-            .iter()
-            .filter(|(_, keys)| keys.read().unwrap().contains_key(id))
-            .map(|(slot, _)| *slot)
-            .collect()
-    }
-
     #[cfg(test)]
     pub(crate) fn insert_node_id(&self, slot: Slot, node_id: Pubkey) {
         let balance = self
@@ -118,8 +120,7 @@ impl ClusterSlots {
         slot_pubkeys.write().unwrap().insert(node_id, balance);
     }
 
-    fn update_peers(&self, bank_forks: &RwLock<BankForks>) {
-        let root_bank = bank_forks.read().unwrap().root_bank();
+    fn update_peers(&self, root_bank: &Bank) {
         let root_epoch = root_bank.epoch();
         let my_epoch = *self.epoch.read().unwrap();
 
@@ -135,7 +136,10 @@ impl ClusterSlots {
         }
     }
 
-    pub fn compute_weights(&self, slot: Slot, repair_peers: &[ContactInfo]) -> Vec<u64> {
+    pub(crate) fn compute_weights(&self, slot: Slot, repair_peers: &[ContactInfo]) -> Vec<u64> {
+        if repair_peers.is_empty() {
+            return Vec::default();
+        }
         let stakes = {
             let validator_stakes = self.validator_stakes.read().unwrap();
             repair_peers
@@ -162,7 +166,7 @@ impl ClusterSlots {
             .collect()
     }
 
-    pub fn compute_weights_exclude_noncomplete(
+    pub(crate) fn compute_weights_exclude_noncomplete(
         &self,
         slot: Slot,
         repair_peers: &[ContactInfo],
@@ -178,21 +182,6 @@ impl ClusterSlots {
             })
             .collect()
     }
-
-    pub fn generate_repairs_for_missing_slots(
-        &self,
-        self_id: &Pubkey,
-        root: Slot,
-    ) -> Vec<RepairType> {
-        let my_slots = self.collect(self_id);
-        self.cluster_slots
-            .read()
-            .unwrap()
-            .keys()
-            .filter(|x| **x > root && !my_slots.contains(*x))
-            .map(|x| RepairType::HighestShred(*x, 0))
-            .collect()
-    }
 }
 
 #[cfg(test)]
@@ -209,7 +198,7 @@ mod tests {
     #[test]
     fn test_update_noop() {
         let cs = ClusterSlots::default();
-        cs.update_internal(0, vec![]);
+        cs.update_internal(0, vec![], DEFAULT_SLOTS_PER_EPOCH);
         assert!(cs.cluster_slots.read().unwrap().is_empty());
     }
 
@@ -217,7 +206,7 @@ mod tests {
     fn test_update_empty() {
         let cs = ClusterSlots::default();
         let epoch_slot = EpochSlots::default();
-        cs.update_internal(0, vec![epoch_slot]);
+        cs.update_internal(0, vec![epoch_slot], DEFAULT_SLOTS_PER_EPOCH);
         assert!(cs.lookup(0).is_none());
     }
 
@@ -227,7 +216,7 @@ mod tests {
         let cs = ClusterSlots::default();
         let mut epoch_slot = EpochSlots::default();
         epoch_slot.fill(&[0], 0);
-        cs.update_internal(0, vec![epoch_slot]);
+        cs.update_internal(0, vec![epoch_slot], DEFAULT_SLOTS_PER_EPOCH);
         assert!(cs.lookup(0).is_none());
     }
 
@@ -236,7 +225,7 @@ mod tests {
         let cs = ClusterSlots::default();
         let mut epoch_slot = EpochSlots::default();
         epoch_slot.fill(&[1], 0);
-        cs.update_internal(0, vec![epoch_slot]);
+        cs.update_internal(0, vec![epoch_slot], DEFAULT_SLOTS_PER_EPOCH);
         assert!(cs.lookup(0).is_none());
         assert!(cs.lookup(1).is_some());
         assert_eq!(
@@ -366,7 +355,7 @@ mod tests {
         );
 
         *cs.validator_stakes.write().unwrap() = map;
-        cs.update_internal(0, vec![epoch_slot]);
+        cs.update_internal(0, vec![epoch_slot], DEFAULT_SLOTS_PER_EPOCH);
         assert!(cs.lookup(1).is_some());
         assert_eq!(
             cs.lookup(1)
@@ -377,40 +366,4 @@ mod tests {
             Some(&1)
         );
     }
-
-    #[test]
-    fn test_generate_repairs() {
-        let cs = ClusterSlots::default();
-        let mut epoch_slot = EpochSlots::default();
-        epoch_slot.fill(&[1], 0);
-        cs.update_internal(0, vec![epoch_slot]);
-        let self_id = solana_sdk::pubkey::new_rand();
-        assert_eq!(
-            cs.generate_repairs_for_missing_slots(&self_id, 0),
-            vec![RepairType::HighestShred(1, 0)]
-        )
-    }
-
-    #[test]
-    fn test_collect_my_slots() {
-        let cs = ClusterSlots::default();
-        let mut epoch_slot = EpochSlots::default();
-        epoch_slot.fill(&[1], 0);
-        let self_id = epoch_slot.from;
-        cs.update_internal(0, vec![epoch_slot]);
-        let slots: Vec<Slot> = cs.collect(&self_id).into_iter().collect();
-        assert_eq!(slots, vec![1]);
-    }
-
-    #[test]
-    fn test_generate_repairs_existing() {
-        let cs = ClusterSlots::default();
-        let mut epoch_slot = EpochSlots::default();
-        epoch_slot.fill(&[1], 0);
-        let self_id = epoch_slot.from;
-        cs.update_internal(0, vec![epoch_slot]);
-        assert!(cs
-            .generate_repairs_for_missing_slots(&self_id, 0)
-            .is_empty());
-    }
 }
diff --git a/core/src/cluster_slots_service.rs b/core/src/cluster_slots_service.rs
index 1f059521b67c57..d2f7e7a295f513 100644
--- a/core/src/cluster_slots_service.rs
+++ b/core/src/cluster_slots_service.rs
@@ -1,29 +1,32 @@
 use crate::cluster_slots::ClusterSlots;
+use crossbeam_channel::{Receiver, RecvTimeoutError, Sender};
 use solana_gossip::cluster_info::ClusterInfo;
-use solana_ledger::blockstore::{Blockstore, CompletedSlotsReceiver};
+use solana_ledger::blockstore::Blockstore;
 use solana_measure::measure::Measure;
 use solana_runtime::bank_forks::BankForks;
-use solana_sdk::{clock::Slot, pubkey::Pubkey};
+use solana_sdk::clock::Slot;
 use std::{
     sync::{
         atomic::{AtomicBool, Ordering},
-        mpsc::RecvTimeoutError,
         {Arc, RwLock},
     },
     thread::{self, Builder, JoinHandle},
     time::{Duration, Instant},
 };
 
+pub type ClusterSlotsUpdateReceiver = Receiver<Vec<Slot>>;
+pub type ClusterSlotsUpdateSender = Sender<Vec<Slot>>;
+
 #[derive(Default, Debug)]
 struct ClusterSlotsServiceTiming {
     pub lowest_slot_elapsed: u64,
-    pub update_completed_slots_elapsed: u64,
+    pub process_cluster_slots_updates_elapsed: u64,
 }
 
 impl ClusterSlotsServiceTiming {
-    fn update(&mut self, lowest_slot_elapsed: u64, update_completed_slots_elapsed: u64) {
+    fn update(&mut self, lowest_slot_elapsed: u64, process_cluster_slots_updates_elapsed: u64) {
         self.lowest_slot_elapsed += lowest_slot_elapsed;
-        self.update_completed_slots_elapsed += update_completed_slots_elapsed;
+        self.process_cluster_slots_updates_elapsed += process_cluster_slots_updates_elapsed;
     }
 }
 
@@ -37,12 +40,11 @@ impl ClusterSlotsService {
         cluster_slots: Arc<ClusterSlots>,
         bank_forks: Arc<RwLock<BankForks>>,
         cluster_info: Arc<ClusterInfo>,
-        completed_slots_receiver: CompletedSlotsReceiver,
+        cluster_slots_update_receiver: ClusterSlotsUpdateReceiver,
         exit: Arc<AtomicBool>,
     ) -> Self {
-        let id = cluster_info.id();
-        Self::initialize_lowest_slot(id, &blockstore, &cluster_info);
-        Self::initialize_epoch_slots(&blockstore, &cluster_info, &completed_slots_receiver);
+        Self::initialize_lowest_slot(&blockstore, &cluster_info);
+        Self::initialize_epoch_slots(&bank_forks, &cluster_info);
         let t_cluster_slots_service = Builder::new()
             .name("solana-cluster-slots-service".to_string())
             .spawn(move || {
@@ -51,7 +53,7 @@ impl ClusterSlotsService {
                     cluster_slots,
                     bank_forks,
                     cluster_info,
-                    completed_slots_receiver,
+                    cluster_slots_update_receiver,
                     exit,
                 )
             })
@@ -71,7 +73,7 @@ impl ClusterSlotsService {
         cluster_slots: Arc<ClusterSlots>,
         bank_forks: Arc<RwLock<BankForks>>,
         cluster_info: Arc<ClusterInfo>,
-        completed_slots_receiver: CompletedSlotsReceiver,
+        cluster_slots_update_receiver: ClusterSlotsUpdateReceiver,
         exit: Arc<AtomicBool>,
     ) {
         let mut cluster_slots_service_timing = ClusterSlotsServiceTiming::default();
@@ -80,7 +82,8 @@ impl ClusterSlotsService {
             if exit.load(Ordering::Relaxed) {
                 break;
             }
-            let slots = match completed_slots_receiver.recv_timeout(Duration::from_millis(200)) {
+            let slots = match cluster_slots_update_receiver.recv_timeout(Duration::from_millis(200))
+            {
                 Ok(slots) => Some(slots),
                 Err(RecvTimeoutError::Timeout) => None,
                 Err(RecvTimeoutError::Disconnected) => {
@@ -88,23 +91,26 @@ impl ClusterSlotsService {
                     break;
                 }
             };
-            let new_root = bank_forks.read().unwrap().root();
-            let id = cluster_info.id();
             let mut lowest_slot_elapsed = Measure::start("lowest_slot_elapsed");
             let lowest_slot = blockstore.lowest_slot();
-            Self::update_lowest_slot(&id, lowest_slot, &cluster_info);
+            Self::update_lowest_slot(lowest_slot, &cluster_info);
             lowest_slot_elapsed.stop();
-            let mut update_completed_slots_elapsed =
-                Measure::start("update_completed_slots_elapsed");
+            let mut process_cluster_slots_updates_elapsed =
+                Measure::start("process_cluster_slots_updates_elapsed");
             if let Some(slots) = slots {
-                Self::update_completed_slots(slots, &completed_slots_receiver, &cluster_info);
+                Self::process_cluster_slots_updates(
+                    slots,
+                    &cluster_slots_update_receiver,
+                    &cluster_info,
+                );
             }
-            cluster_slots.update(new_root, &cluster_info, &bank_forks);
-            update_completed_slots_elapsed.stop();
+            let root_bank = bank_forks.read().unwrap().root_bank();
+            cluster_slots.update(&root_bank, &cluster_info);
+            process_cluster_slots_updates_elapsed.stop();
 
             cluster_slots_service_timing.update(
                 lowest_slot_elapsed.as_us(),
-                update_completed_slots_elapsed.as_us(),
+                process_cluster_slots_updates_elapsed.as_us(),
             );
 
             if last_stats.elapsed().as_secs() > 2 {
@@ -116,8 +122,8 @@ impl ClusterSlotsService {
                         i64
                     ),
                     (
-                        "update_completed_slots_elapsed",
-                        cluster_slots_service_timing.update_completed_slots_elapsed,
+                        "process_cluster_slots_updates_elapsed",
+                        cluster_slots_service_timing.process_cluster_slots_updates_elapsed,
                         i64
                     ),
                 );
@@ -127,12 +133,12 @@ impl ClusterSlotsService {
         }
     }
 
-    fn update_completed_slots(
+    fn process_cluster_slots_updates(
         mut slots: Vec<Slot>,
-        completed_slots_receiver: &CompletedSlotsReceiver,
+        cluster_slots_update_receiver: &ClusterSlotsUpdateReceiver,
         cluster_info: &ClusterInfo,
     ) {
-        while let Ok(mut more) = completed_slots_receiver.try_recv() {
+        while let Ok(mut more) = cluster_slots_update_receiver.try_recv() {
             slots.append(&mut more);
         }
         #[allow(clippy::stable_sort_primitive)]
@@ -143,57 +149,51 @@ impl ClusterSlotsService {
         }
     }
 
-    fn initialize_lowest_slot(id: Pubkey, blockstore: &Blockstore, cluster_info: &ClusterInfo) {
+    fn initialize_lowest_slot(blockstore: &Blockstore, cluster_info: &ClusterInfo) {
         // Safe to set into gossip because by this time, the leader schedule cache should
         // also be updated with the latest root (done in blockstore_processor) and thus
         // will provide a schedule to window_service for any incoming shreds up to the
         // last_confirmed_epoch.
-        cluster_info.push_lowest_slot(id, blockstore.lowest_slot());
+        cluster_info.push_lowest_slot(blockstore.lowest_slot());
     }
 
-    fn update_lowest_slot(id: &Pubkey, lowest_slot: Slot, cluster_info: &ClusterInfo) {
-        cluster_info.push_lowest_slot(*id, lowest_slot);
+    fn update_lowest_slot(lowest_slot: Slot, cluster_info: &ClusterInfo) {
+        cluster_info.push_lowest_slot(lowest_slot);
     }
 
-    fn initialize_epoch_slots(
-        blockstore: &Blockstore,
-        cluster_info: &ClusterInfo,
-        completed_slots_receiver: &CompletedSlotsReceiver,
-    ) {
-        let root = blockstore.last_root();
-        let mut slots: Vec<_> = blockstore
-            .live_slots_iterator(root)
-            .filter_map(|(slot, slot_meta)| {
-                if slot_meta.is_full() {
-                    Some(slot)
-                } else {
-                    None
-                }
-            })
-            .collect();
+    fn initialize_epoch_slots(bank_forks: &RwLock<BankForks>, cluster_info: &ClusterInfo) {
+        // TODO: Should probably incorporate slots that were replayed on startup,
+        // and maybe some that were frozen < snapshot root in case validators restart
+        // from newer snapshots and lose history.
+        let frozen_banks = bank_forks.read().unwrap().frozen_banks();
+        let mut frozen_bank_slots: Vec<Slot> = frozen_banks.keys().cloned().collect();
+        frozen_bank_slots.sort_unstable();
 
-        while let Ok(mut more) = completed_slots_receiver.try_recv() {
-            slots.append(&mut more);
-        }
-        slots.sort_unstable();
-        slots.dedup();
-        if !slots.is_empty() {
-            cluster_info.push_epoch_slots(&slots);
+        if !frozen_bank_slots.is_empty() {
+            cluster_info.push_epoch_slots(&frozen_bank_slots);
         }
     }
 }
 
 #[cfg(test)]
 mod test {
-    use super::*;
-    use solana_gossip::{cluster_info::Node, crds_value::CrdsValueLabel};
+    use {
+        super::*,
+        solana_gossip::{cluster_info::Node, crds_value::CrdsValueLabel},
+        solana_sdk::{pubkey::Pubkey, signature::Keypair},
+        solana_streamer::socket::SocketAddrSpace,
+    };
 
     #[test]
     pub fn test_update_lowest_slot() {
         let pubkey = Pubkey::new_unique();
         let node_info = Node::new_localhost_with_pubkey(&pubkey);
-        let cluster_info = ClusterInfo::new_with_invalid_keypair(node_info.info);
-        ClusterSlotsService::update_lowest_slot(&pubkey, 5, &cluster_info);
+        let cluster_info = ClusterInfo::new(
+            node_info.info,
+            Arc::new(Keypair::new()),
+            SocketAddrSpace::Unspecified,
+        );
+        ClusterSlotsService::update_lowest_slot(5, &cluster_info);
         cluster_info.flush_push_queue();
         let lowest = {
             let label = CrdsValueLabel::LowestSlot(pubkey);
diff --git a/core/src/commitment_service.rs b/core/src/commitment_service.rs
index 02cb4732c651aa..fe10848b755704 100644
--- a/core/src/commitment_service.rs
+++ b/core/src/commitment_service.rs
@@ -352,15 +352,15 @@ mod tests {
             if *a <= root {
                 let mut expected = BlockCommitment::default();
                 expected.increase_rooted_stake(lamports);
-                assert_eq!(*commitment.get(&a).unwrap(), expected);
+                assert_eq!(*commitment.get(a).unwrap(), expected);
             } else if i <= 4 {
                 let mut expected = BlockCommitment::default();
                 expected.increase_confirmation_stake(2, lamports);
-                assert_eq!(*commitment.get(&a).unwrap(), expected);
+                assert_eq!(*commitment.get(a).unwrap(), expected);
             } else if i <= 6 {
                 let mut expected = BlockCommitment::default();
                 expected.increase_confirmation_stake(1, lamports);
-                assert_eq!(*commitment.get(&a).unwrap(), expected);
+                assert_eq!(*commitment.get(a).unwrap(), expected);
             }
         }
         assert_eq!(rooted_stake[0], (root, lamports));
diff --git a/core/src/consensus.rs b/core/src/consensus.rs
index 8462ea54a82651..f4643afdd7533c 100644
--- a/core/src/consensus.rs
+++ b/core/src/consensus.rs
@@ -1,4 +1,5 @@
 use crate::{
+    heaviest_subtree_fork_choice::HeaviestSubtreeForkChoice,
     latest_validator_votes_for_frozen_banks::LatestValidatorVotesForFrozenBanks,
     progress_map::{LockoutIntervals, ProgressMap},
 };
@@ -103,13 +104,13 @@ pub(crate) struct ComputedBankState {
     pub my_latest_landed_vote: Option<Slot>,
 }
 
-#[frozen_abi(digest = "Eay84NBbJqiMBfE7HHH2o6e51wcvoU79g8zCi5sw6uj3")]
+#[frozen_abi(digest = "GMs1FxKteU7K4ZFRofMBqNhBpM4xkPVxfYod6R8DQmpT")]
 #[derive(Clone, Serialize, Deserialize, Debug, PartialEq, AbiExample)]
 pub struct Tower {
     node_pubkey: Pubkey,
     threshold_depth: usize,
     threshold_size: f64,
-    lockouts: VoteState,
+    vote_state: VoteState,
     last_vote: Vote,
     #[serde(skip)]
     // The blockhash used in the last vote transaction, may or may not equal the
@@ -140,7 +141,7 @@ impl Default for Tower {
             node_pubkey: Pubkey::default(),
             threshold_depth: VOTE_THRESHOLD_DEPTH,
             threshold_size: VOTE_THRESHOLD_SIZE,
-            lockouts: VoteState::default(),
+            vote_state: VoteState::default(),
             last_vote: Vote::default(),
             last_timestamp: BlockTimestamp::default(),
             last_vote_tx_blockhash: Hash::default(),
@@ -150,7 +151,7 @@ impl Default for Tower {
             last_switch_threshold_check: Option::default(),
         };
         // VoteState::root_slot is ensured to be Some in Tower
-        tower.lockouts.root_slot = Some(Slot::default());
+        tower.vote_state.root_slot = Some(Slot::default());
         tower
     }
 }
@@ -163,7 +164,7 @@ impl Tower {
         bank: &Bank,
         path: &Path,
     ) -> Self {
-        let path = Self::get_filename(&path, node_pubkey);
+        let path = Self::get_filename(path, node_pubkey);
         let tmp_path = Self::get_tmp_filename(&path);
         let mut tower = Self {
             node_pubkey: *node_pubkey,
@@ -204,8 +205,8 @@ impl Tower {
             crate::replay_stage::ReplayStage::initialize_progress_and_fork_choice(
                 root_bank.deref(),
                 bank_forks.frozen_banks().values().cloned().collect(),
-                &my_pubkey,
-                &vote_account,
+                my_pubkey,
+                vote_account,
             );
         let root = root_bank.slot();
 
@@ -217,13 +218,7 @@ impl Tower {
             )
             .clone();
 
-        Self::new(
-            &my_pubkey,
-            &vote_account,
-            root,
-            &heaviest_bank,
-            &ledger_path,
-        )
+        Self::new(my_pubkey, vote_account, root, &heaviest_bank, ledger_path)
     }
 
     pub(crate) fn collect_vote_lockouts<F>(
@@ -378,7 +373,7 @@ impl Tower {
     }
 
     pub fn tower_slots(&self) -> Vec<Slot> {
-        self.lockouts.tower()
+        self.vote_state.tower()
     }
 
     pub fn last_vote_tx_blockhash(&self) -> Hash {
@@ -426,7 +421,7 @@ impl Tower {
         let last_voted_slot_in_bank = Self::last_voted_slot_in_bank(bank, vote_account_pubkey);
 
         // Returns the new root if one is made after applying a vote for the given bank to
-        // `self.lockouts`
+        // `self.vote_state`
         self.record_bank_vote_and_update_lockouts(bank.slot(), bank.hash(), last_voted_slot_in_bank)
     }
 
@@ -439,7 +434,7 @@ impl Tower {
         trace!("{} record_vote for {}", self.node_pubkey, vote_slot);
         let old_root = self.root();
         let mut new_vote = Self::apply_vote_and_generate_vote_diff(
-            &mut self.lockouts,
+            &mut self.vote_state,
             vote_slot,
             vote_hash,
             last_voted_slot_in_bank,
@@ -507,12 +502,12 @@ impl Tower {
     // snapshot (slot N). In other words, there should be no possibility a Tower doesn't have
     // root, unlike young vote accounts.
     pub fn root(&self) -> Slot {
-        self.lockouts.root_slot.unwrap()
+        self.vote_state.root_slot.unwrap()
     }
 
     // a slot is recent if it's newer than the last vote we have
     pub fn is_recent(&self, slot: Slot) -> bool {
-        if let Some(last_voted_slot) = self.lockouts.last_voted_slot() {
+        if let Some(last_voted_slot) = self.vote_state.last_voted_slot() {
             if slot <= last_voted_slot {
                 return false;
             }
@@ -521,7 +516,7 @@ impl Tower {
     }
 
     pub fn has_voted(&self, slot: Slot) -> bool {
-        for vote in &self.lockouts.votes {
+        for vote in &self.vote_state.votes {
             if slot == vote.slot {
                 return true;
             }
@@ -538,15 +533,15 @@ impl Tower {
         // slot to the current lockouts to pop any expired votes. If any of the
         // remaining voted slots are on a different fork from the checked slot,
         // it's still locked out.
-        let mut lockouts = self.lockouts.clone();
-        lockouts.process_slot_vote_unchecked(slot);
-        for vote in &lockouts.votes {
+        let mut vote_state = self.vote_state.clone();
+        vote_state.process_slot_vote_unchecked(slot);
+        for vote in &vote_state.votes {
             if slot != vote.slot && !ancestors.contains(&vote.slot) {
                 return true;
             }
         }
 
-        if let Some(root_slot) = lockouts.root_slot {
+        if let Some(root_slot) = vote_state.root_slot {
             if slot != root_slot {
                 // This case should never happen because bank forks purges all
                 // non-descendants of the root every time root is set
@@ -573,6 +568,7 @@ impl Tower {
             .map(|candidate_slot_ancestors| candidate_slot_ancestors.contains(&last_voted_slot))
     }
 
+    #[allow(clippy::too_many_arguments)]
     fn make_check_switch_threshold_decision(
         &self,
         switch_slot: u64,
@@ -582,9 +578,10 @@ impl Tower {
         total_stake: u64,
         epoch_vote_accounts: &HashMap<Pubkey, (u64, ArcVoteAccount)>,
         latest_validator_votes_for_frozen_banks: &LatestValidatorVotesForFrozenBanks,
+        heaviest_subtree_fork_choice: &HeaviestSubtreeForkChoice,
     ) -> SwitchForkDecision {
-        self.last_voted_slot()
-            .map(|last_voted_slot| {
+        self.last_voted_slot_hash()
+            .map(|(last_voted_slot, last_voted_hash)| {
                 let root = self.root();
                 let empty_ancestors = HashSet::default();
                 let empty_ancestors_due_to_minor_unsynced_ledger = || {
@@ -673,7 +670,7 @@ impl Tower {
                 if last_vote_ancestors.contains(&switch_slot) {
                     if self.is_stray_last_vote() {
                         return suspended_decision_due_to_major_unsynced_ledger();
-                    } else if let Some(latest_duplicate_ancestor) = progress.latest_unconfirmed_duplicate_ancestor(last_voted_slot) {
+                    } else if let Some(latest_duplicate_ancestor) = heaviest_subtree_fork_choice.latest_invalid_ancestor(&(last_voted_slot, last_voted_hash)) {
                         // We're rolling back because one of the ancestors of the last vote was a duplicate. In this
                         // case, it's acceptable if the switch candidate is one of ancestors of the previous vote,
                         // just fail the switch check because there's no point in voting on an ancestor. ReplayStage
@@ -733,7 +730,7 @@ impl Tower {
                     // finding any lockout intervals in the `lockout_intervals` tree
                     // for this bank that contain `last_vote`.
                     let lockout_intervals = &progress
-                        .get(&candidate_slot)
+                        .get(candidate_slot)
                         .unwrap()
                         .fork_stats
                         .lockout_intervals;
@@ -821,6 +818,7 @@ impl Tower {
             .unwrap_or(SwitchForkDecision::SameFork)
     }
 
+    #[allow(clippy::too_many_arguments)]
     pub(crate) fn check_switch_threshold(
         &mut self,
         switch_slot: u64,
@@ -830,6 +828,7 @@ impl Tower {
         total_stake: u64,
         epoch_vote_accounts: &HashMap<Pubkey, (u64, ArcVoteAccount)>,
         latest_validator_votes_for_frozen_banks: &LatestValidatorVotesForFrozenBanks,
+        heaviest_subtree_fork_choice: &HeaviestSubtreeForkChoice,
     ) -> SwitchForkDecision {
         let decision = self.make_check_switch_threshold_decision(
             switch_slot,
@@ -839,6 +838,7 @@ impl Tower {
             total_stake,
             epoch_vote_accounts,
             latest_validator_votes_for_frozen_banks,
+            heaviest_subtree_fork_choice,
         );
         let new_check = Some((switch_slot, decision.clone()));
         if new_check != self.last_switch_threshold_check {
@@ -862,9 +862,9 @@ impl Tower {
         voted_stakes: &VotedStakes,
         total_stake: Stake,
     ) -> bool {
-        let mut lockouts = self.lockouts.clone();
-        lockouts.process_slot_vote_unchecked(slot);
-        let vote = lockouts.nth_recent_vote(self.threshold_depth);
+        let mut vote_state = self.vote_state.clone();
+        vote_state.process_slot_vote_unchecked(slot);
+        let vote = vote_state.nth_recent_vote(self.threshold_depth);
         if let Some(vote) = vote {
             if let Some(fork_stake) = voted_stakes.get(&vote.slot) {
                 let lockout = *fork_stake as f64 / total_stake as f64;
@@ -873,7 +873,7 @@ impl Tower {
                     slot, vote.slot, lockout, fork_stake, total_stake
                 );
                 if vote.confirmation_count as usize > self.threshold_depth {
-                    for old_vote in &self.lockouts.votes {
+                    for old_vote in &self.vote_state.votes {
                         if old_vote.slot == vote.slot
                             && old_vote.confirmation_count == vote.confirmation_count
                         {
@@ -928,7 +928,7 @@ impl Tower {
     }
 
     fn voted_slots(&self) -> Vec<Slot> {
-        self.lockouts
+        self.vote_state
             .votes
             .iter()
             .map(|lockout| lockout.slot)
@@ -964,11 +964,11 @@ impl Tower {
         assert_eq!(slot_history.check(replayed_root), Check::Found);
 
         assert!(
-            self.last_vote == Vote::default() && self.lockouts.votes.is_empty()
-                || self.last_vote != Vote::default() && !self.lockouts.votes.is_empty(),
-            "last vote: {:?} lockouts.votes: {:?}",
+            self.last_vote == Vote::default() && self.vote_state.votes.is_empty()
+                || self.last_vote != Vote::default() && !self.vote_state.votes.is_empty(),
+            "last vote: {:?} vote_state.votes: {:?}",
             self.last_vote,
-            self.lockouts.votes
+            self.vote_state.votes
         );
 
         if let Some(last_voted_slot) = self.last_voted_slot() {
@@ -1034,7 +1034,7 @@ impl Tower {
         let tower_root = self.root();
         // retained slots will be consisted only from divergent slots
         let mut retain_flags_for_each_vote_in_reverse: Vec<_> =
-            Vec::with_capacity(self.lockouts.votes.len());
+            Vec::with_capacity(self.vote_state.votes.len());
 
         let mut still_in_future = true;
         let mut past_outside_history = false;
@@ -1112,10 +1112,10 @@ impl Tower {
         let mut retain_flags_for_each_vote =
             retain_flags_for_each_vote_in_reverse.into_iter().rev();
 
-        let original_votes_len = self.lockouts.votes.len();
+        let original_votes_len = self.vote_state.votes.len();
         self.initialize_lockouts(move |_| retain_flags_for_each_vote.next().unwrap());
 
-        if self.lockouts.votes.is_empty() {
+        if self.vote_state.votes.is_empty() {
             info!("All restored votes were behind; resetting root_slot and last_vote in tower!");
             // we might not have banks for those votes so just reset.
             // That's because the votes may well past replayed_root
@@ -1145,7 +1145,7 @@ impl Tower {
         bank: &Bank,
     ) {
         if let Some((_stake, vote_account)) = bank.get_vote_account(vote_account_pubkey) {
-            self.lockouts = vote_account
+            self.vote_state = vote_account
                 .vote_state()
                 .as_ref()
                 .expect("vote_account isn't a VoteState?")
@@ -1158,7 +1158,7 @@ impl Tower {
                 bank.slot(),
             );
             assert_eq!(
-                self.lockouts.node_pubkey, self.node_pubkey,
+                self.vote_state.node_pubkey, self.node_pubkey,
                 "vote account's node_pubkey doesn't match",
             );
         } else {
@@ -1172,13 +1172,13 @@ impl Tower {
     }
 
     fn initialize_lockouts<F: FnMut(&Lockout) -> bool>(&mut self, should_retain: F) {
-        self.lockouts.votes.retain(should_retain);
+        self.vote_state.votes.retain(should_retain);
     }
 
     // Updating root is needed to correctly restore from newly-saved tower for the next
     // boot
     fn initialize_root(&mut self, root: Slot) {
-        self.lockouts.root_slot = Some(root);
+        self.vote_state.root_slot = Some(root);
     }
 
     pub fn get_filename(path: &Path, node_pubkey: &Pubkey) -> PathBuf {
@@ -1322,7 +1322,7 @@ pub fn reconcile_blockstore_roots_with_tower(
     if last_blockstore_root < tower_root {
         // Ensure tower_root itself to exist and be marked as rooted in the blockstore
         // in addition to its ancestors.
-        let new_roots: Vec<_> = AncestorIterator::new_inclusive(tower_root, &blockstore)
+        let new_roots: Vec<_> = AncestorIterator::new_inclusive(tower_root, blockstore)
             .take_while(|current| match current.cmp(&last_blockstore_root) {
                 Ordering::Greater => true,
                 Ordering::Equal => false,
@@ -1337,7 +1337,7 @@ pub fn reconcile_blockstore_roots_with_tower(
                 "Reconciling slots as root based on tower root: {:?} ({}..{}) ",
                 new_roots, tower_root, last_blockstore_root
             );
-            blockstore.set_roots(&new_roots)?;
+            blockstore.set_roots(new_roots.iter())?;
         } else {
             // This indicates we're in bad state; but still don't panic here.
             // That's because we might have a chance of recovering properly with
@@ -1358,11 +1358,11 @@ pub mod test {
     use super::*;
     use crate::{
         cluster_info_vote_listener::VoteTracker,
-        cluster_slot_state_verifier::GossipDuplicateConfirmedSlots,
+        cluster_slot_state_verifier::{DuplicateSlotsTracker, GossipDuplicateConfirmedSlots},
         cluster_slots::ClusterSlots,
-        fork_choice::SelectVoteAndResetForkResult,
-        heaviest_subtree_fork_choice::{HeaviestSubtreeForkChoice, SlotHashKey},
-        progress_map::{DuplicateStats, ForkProgress},
+        fork_choice::{ForkChoice, SelectVoteAndResetForkResult},
+        heaviest_subtree_fork_choice::SlotHashKey,
+        progress_map::ForkProgress,
         replay_stage::{HeaviestForkFailures, ReplayStage},
         unfrozen_gossip_verified_vote_hashes::UnfrozenGossipVerifiedVoteHashes,
     };
@@ -1439,9 +1439,6 @@ pub mod test {
 
             while let Some(visit) = walk.get() {
                 let slot = visit.node().data;
-                self.progress.entry(slot).or_insert_with(|| {
-                    ForkProgress::new(Hash::default(), None, DuplicateStats::default(), None, 0, 0)
-                });
                 if self.bank_forks.read().unwrap().get(slot).is_some() {
                     walk.forward();
                     continue;
@@ -1449,6 +1446,9 @@ pub mod test {
                 let parent = walk.get_parent().unwrap().data;
                 let parent_bank = self.bank_forks.read().unwrap().get(parent).unwrap().clone();
                 let new_bank = Bank::new_from_parent(&parent_bank, &Pubkey::default(), slot);
+                self.progress
+                    .entry(slot)
+                    .or_insert_with(|| ForkProgress::new(Hash::default(), None, None, 0, 0));
                 for (pubkey, vote) in cluster_votes.iter() {
                     if vote.contains(&parent) {
                         let keypairs = self.validator_keypairs.get(pubkey).unwrap();
@@ -1484,7 +1484,7 @@ pub mod test {
             tower: &mut Tower,
         ) -> Vec<HeaviestForkFailures> {
             // Try to simulate the vote
-            let my_keypairs = self.validator_keypairs.get(&my_pubkey).unwrap();
+            let my_keypairs = self.validator_keypairs.get(my_pubkey).unwrap();
             let my_vote_pubkey = my_keypairs.vote_keypair.pubkey();
             let ancestors = self.bank_forks.read().unwrap().ancestors();
             let mut frozen_banks: Vec<_> = self
@@ -1497,7 +1497,7 @@ pub mod test {
                 .collect();
 
             let _ = ReplayStage::compute_bank_stats(
-                &my_pubkey,
+                my_pubkey,
                 &ancestors,
                 &mut frozen_banks,
                 tower,
@@ -1530,6 +1530,7 @@ pub mod test {
                 &self.progress,
                 tower,
                 &self.latest_validator_votes_for_frozen_banks,
+                &self.heaviest_subtree_fork_choice,
             );
 
             // Make sure this slot isn't locked out or failing threshold
@@ -1554,6 +1555,7 @@ pub mod test {
                 &AbsRequestSender::default(),
                 None,
                 &mut self.heaviest_subtree_fork_choice,
+                &mut DuplicateSlotsTracker::default(),
                 &mut GossipDuplicateConfirmedSlots::default(),
                 &mut UnfrozenGossipVerifiedVoteHashes::default(),
                 &mut true,
@@ -1574,9 +1576,9 @@ pub mod test {
                 .filter_map(|slot| {
                     let mut fork_tip_parent = tr(slot - 1);
                     fork_tip_parent.push_front(tr(slot));
-                    self.fill_bank_forks(fork_tip_parent, &cluster_votes);
+                    self.fill_bank_forks(fork_tip_parent, cluster_votes);
                     if votes_to_simulate.contains(&slot) {
-                        Some((slot, self.simulate_vote(slot, &my_pubkey, tower)))
+                        Some((slot, self.simulate_vote(slot, my_pubkey, tower)))
                     } else {
                         None
                     }
@@ -1592,9 +1594,7 @@ pub mod test {
         ) {
             self.progress
                 .entry(slot)
-                .or_insert_with(|| {
-                    ForkProgress::new(Hash::default(), None, DuplicateStats::default(), None, 0, 0)
-                })
+                .or_insert_with(|| ForkProgress::new(Hash::default(), None, None, 0, 0))
                 .fork_stats
                 .lockout_intervals
                 .entry(lockout_interval.1)
@@ -1621,7 +1621,7 @@ pub mod test {
                 fork_tip_parent.push_front(tr(start_slot + i));
                 self.fill_bank_forks(fork_tip_parent, cluster_votes);
                 if self
-                    .simulate_vote(i + start_slot, &my_pubkey, tower)
+                    .simulate_vote(i + start_slot, my_pubkey, tower)
                     .is_empty()
                 {
                     cluster_votes
@@ -1701,10 +1701,10 @@ pub mod test {
         let mut progress = ProgressMap::default();
         progress.insert(
             0,
-            ForkProgress::new(
-                bank0.last_blockhash(),
-                None,
-                DuplicateStats::default(),
+            ForkProgress::new_from_bank(
+                &bank0,
+                bank0.collector_id(),
+                &Pubkey::default(),
                 None,
                 0,
                 0,
@@ -1800,8 +1800,8 @@ pub mod test {
         }
 
         for i in 0..5 {
-            assert_eq!(tower.lockouts.votes[i].slot as usize, i);
-            assert_eq!(tower.lockouts.votes[i].confirmation_count as usize, 6 - i);
+            assert_eq!(tower.vote_state.votes[i].slot as usize, i);
+            assert_eq!(tower.vote_state.votes[i].confirmation_count as usize, 6 - i);
         }
     }
 
@@ -1867,21 +1867,46 @@ pub mod test {
         let mut tower = Tower::new_with_key(&vote_simulator.node_pubkeys[0]);
 
         // Last vote is 47
-        tower.record_vote(47, Hash::default());
+        tower.record_vote(
+            47,
+            vote_simulator
+                .bank_forks
+                .read()
+                .unwrap()
+                .get(47)
+                .unwrap()
+                .hash(),
+        );
 
         // Trying to switch to an ancestor of last vote should only not panic
         // if the current vote has a duplicate ancestor
         let ancestor_of_voted_slot = 43;
         let duplicate_ancestor1 = 44;
         let duplicate_ancestor2 = 45;
-        vote_simulator.progress.set_unconfirmed_duplicate_slot(
-            duplicate_ancestor1,
-            &descendants.get(&duplicate_ancestor1).unwrap(),
-        );
-        vote_simulator.progress.set_unconfirmed_duplicate_slot(
-            duplicate_ancestor2,
-            &descendants.get(&duplicate_ancestor2).unwrap(),
-        );
+        vote_simulator
+            .heaviest_subtree_fork_choice
+            .mark_fork_invalid_candidate(&(
+                duplicate_ancestor1,
+                vote_simulator
+                    .bank_forks
+                    .read()
+                    .unwrap()
+                    .get(duplicate_ancestor1)
+                    .unwrap()
+                    .hash(),
+            ));
+        vote_simulator
+            .heaviest_subtree_fork_choice
+            .mark_fork_invalid_candidate(&(
+                duplicate_ancestor2,
+                vote_simulator
+                    .bank_forks
+                    .read()
+                    .unwrap()
+                    .get(duplicate_ancestor2)
+                    .unwrap()
+                    .hash(),
+            ));
         assert_eq!(
             tower.check_switch_threshold(
                 ancestor_of_voted_slot,
@@ -1890,7 +1915,8 @@ pub mod test {
                 &vote_simulator.progress,
                 total_stake,
                 bank0.epoch_vote_accounts(0).unwrap(),
-                &vote_simulator.latest_validator_votes_for_frozen_banks
+                &vote_simulator.latest_validator_votes_for_frozen_banks,
+                &vote_simulator.heaviest_subtree_fork_choice,
             ),
             SwitchForkDecision::FailedSwitchDuplicateRollback(duplicate_ancestor2)
         );
@@ -1903,11 +1929,18 @@ pub mod test {
             confirm_ancestors.push(duplicate_ancestor2);
         }
         for (i, duplicate_ancestor) in confirm_ancestors.into_iter().enumerate() {
-            vote_simulator.progress.set_confirmed_duplicate_slot(
-                duplicate_ancestor,
-                ancestors.get(&duplicate_ancestor).unwrap(),
-                &descendants.get(&duplicate_ancestor).unwrap(),
-            );
+            vote_simulator
+                .heaviest_subtree_fork_choice
+                .mark_fork_valid_candidate(&(
+                    duplicate_ancestor,
+                    vote_simulator
+                        .bank_forks
+                        .read()
+                        .unwrap()
+                        .get(duplicate_ancestor)
+                        .unwrap()
+                        .hash(),
+                ));
             let res = tower.check_switch_threshold(
                 ancestor_of_voted_slot,
                 &ancestors,
@@ -1916,6 +1949,7 @@ pub mod test {
                 total_stake,
                 bank0.epoch_vote_accounts(0).unwrap(),
                 &vote_simulator.latest_validator_votes_for_frozen_banks,
+                &vote_simulator.heaviest_subtree_fork_choice,
             );
             if i == 0 {
                 assert_eq!(
@@ -1951,7 +1985,8 @@ pub mod test {
                 &vote_simulator.progress,
                 total_stake,
                 bank0.epoch_vote_accounts(0).unwrap(),
-                &vote_simulator.latest_validator_votes_for_frozen_banks
+                &vote_simulator.latest_validator_votes_for_frozen_banks,
+                &vote_simulator.heaviest_subtree_fork_choice,
             ),
             SwitchForkDecision::SameFork
         );
@@ -1965,7 +2000,8 @@ pub mod test {
                 &vote_simulator.progress,
                 total_stake,
                 bank0.epoch_vote_accounts(0).unwrap(),
-                &vote_simulator.latest_validator_votes_for_frozen_banks
+                &vote_simulator.latest_validator_votes_for_frozen_banks,
+                &vote_simulator.heaviest_subtree_fork_choice,
             ),
             SwitchForkDecision::FailedSwitchThreshold(0, 20000)
         );
@@ -1981,7 +2017,8 @@ pub mod test {
                 &vote_simulator.progress,
                 total_stake,
                 bank0.epoch_vote_accounts(0).unwrap(),
-                &vote_simulator.latest_validator_votes_for_frozen_banks
+                &vote_simulator.latest_validator_votes_for_frozen_banks,
+                &vote_simulator.heaviest_subtree_fork_choice,
             ),
             SwitchForkDecision::FailedSwitchThreshold(0, 20000)
         );
@@ -1997,7 +2034,8 @@ pub mod test {
                 &vote_simulator.progress,
                 total_stake,
                 bank0.epoch_vote_accounts(0).unwrap(),
-                &vote_simulator.latest_validator_votes_for_frozen_banks
+                &vote_simulator.latest_validator_votes_for_frozen_banks,
+                &vote_simulator.heaviest_subtree_fork_choice,
             ),
             SwitchForkDecision::FailedSwitchThreshold(0, 20000)
         );
@@ -2013,7 +2051,8 @@ pub mod test {
                 &vote_simulator.progress,
                 total_stake,
                 bank0.epoch_vote_accounts(0).unwrap(),
-                &vote_simulator.latest_validator_votes_for_frozen_banks
+                &vote_simulator.latest_validator_votes_for_frozen_banks,
+                &vote_simulator.heaviest_subtree_fork_choice,
             ),
             SwitchForkDecision::FailedSwitchThreshold(0, 20000)
         );
@@ -2031,7 +2070,8 @@ pub mod test {
                 &vote_simulator.progress,
                 total_stake,
                 bank0.epoch_vote_accounts(0).unwrap(),
-                &vote_simulator.latest_validator_votes_for_frozen_banks
+                &vote_simulator.latest_validator_votes_for_frozen_banks,
+                &vote_simulator.heaviest_subtree_fork_choice,
             ),
             SwitchForkDecision::FailedSwitchThreshold(0, 20000)
         );
@@ -2047,7 +2087,8 @@ pub mod test {
                 &vote_simulator.progress,
                 total_stake,
                 bank0.epoch_vote_accounts(0).unwrap(),
-                &vote_simulator.latest_validator_votes_for_frozen_banks
+                &vote_simulator.latest_validator_votes_for_frozen_banks,
+                &vote_simulator.heaviest_subtree_fork_choice,
             ),
             SwitchForkDecision::SwitchProof(Hash::default())
         );
@@ -2064,7 +2105,8 @@ pub mod test {
                 &vote_simulator.progress,
                 total_stake,
                 bank0.epoch_vote_accounts(0).unwrap(),
-                &vote_simulator.latest_validator_votes_for_frozen_banks
+                &vote_simulator.latest_validator_votes_for_frozen_banks,
+                &vote_simulator.heaviest_subtree_fork_choice,
             ),
             SwitchForkDecision::SwitchProof(Hash::default())
         );
@@ -2072,7 +2114,7 @@ pub mod test {
         // If we set a root, then any lockout intervals below the root shouldn't
         // count toward the switch threshold. This means the other validator's
         // vote lockout no longer counts
-        tower.lockouts.root_slot = Some(43);
+        tower.vote_state.root_slot = Some(43);
         // Refresh ancestors and descendants for new root.
         let ancestors = vote_simulator.bank_forks.read().unwrap().ancestors();
         let descendants = vote_simulator
@@ -2090,7 +2132,8 @@ pub mod test {
                 &vote_simulator.progress,
                 total_stake,
                 bank0.epoch_vote_accounts(0).unwrap(),
-                &vote_simulator.latest_validator_votes_for_frozen_banks
+                &vote_simulator.latest_validator_votes_for_frozen_banks,
+                &vote_simulator.heaviest_subtree_fork_choice,
             ),
             SwitchForkDecision::FailedSwitchThreshold(0, 20000)
         );
@@ -2122,7 +2165,8 @@ pub mod test {
                 &vote_simulator.progress,
                 total_stake,
                 bank0.epoch_vote_accounts(0).unwrap(),
-                &vote_simulator.latest_validator_votes_for_frozen_banks
+                &vote_simulator.latest_validator_votes_for_frozen_banks,
+                &vote_simulator.heaviest_subtree_fork_choice,
             ),
             SwitchForkDecision::FailedSwitchThreshold(0, num_validators * 10000)
         );
@@ -2137,7 +2181,8 @@ pub mod test {
                 &vote_simulator.progress,
                 total_stake,
                 bank0.epoch_vote_accounts(0).unwrap(),
-                &vote_simulator.latest_validator_votes_for_frozen_banks
+                &vote_simulator.latest_validator_votes_for_frozen_banks,
+                &vote_simulator.heaviest_subtree_fork_choice,
             ),
             SwitchForkDecision::FailedSwitchThreshold(0, 20000)
         );
@@ -2169,7 +2214,8 @@ pub mod test {
                 &vote_simulator.progress,
                 total_stake,
                 bank0.epoch_vote_accounts(0).unwrap(),
-                &vote_simulator.latest_validator_votes_for_frozen_banks
+                &vote_simulator.latest_validator_votes_for_frozen_banks,
+                &vote_simulator.heaviest_subtree_fork_choice,
             ),
             SwitchForkDecision::SwitchProof(Hash::default())
         );
@@ -2193,7 +2239,8 @@ pub mod test {
                 &vote_simulator.progress,
                 total_stake,
                 bank0.epoch_vote_accounts(0).unwrap(),
-                &vote_simulator.latest_validator_votes_for_frozen_banks
+                &vote_simulator.latest_validator_votes_for_frozen_banks,
+                &vote_simulator.heaviest_subtree_fork_choice,
             ),
             SwitchForkDecision::FailedSwitchThreshold(0, 20000)
         );
@@ -2307,7 +2354,7 @@ pub mod test {
                 .is_empty());
         }
 
-        info!("local tower: {:#?}", tower.lockouts.votes);
+        info!("local tower: {:#?}", tower.vote_state.votes);
         let observed = vote_simulator
             .bank_forks
             .read()
@@ -2399,14 +2446,14 @@ pub mod test {
         };
         let root_weight = root.lockout() as u128;
         let vote_account_expected_weight = tower
-            .lockouts
+            .vote_state
             .votes
             .iter()
             .map(|v| v.lockout() as u128)
             .sum::<u128>()
             + root_weight;
         let expected_bank_weight = 2 * vote_account_expected_weight;
-        assert_eq!(tower.lockouts.root_slot, Some(0));
+        assert_eq!(tower.vote_state.root_slot, Some(0));
         let mut latest_validator_votes_for_frozen_banks =
             LatestValidatorVotesForFrozenBanks::default();
         let ComputedBankState {
@@ -2483,7 +2530,7 @@ pub mod test {
     fn test_is_locked_out_root_slot_child_pass() {
         let mut tower = Tower::new_for_tests(0, 0.67);
         let ancestors: HashSet<Slot> = vec![0].into_iter().collect();
-        tower.lockouts.root_slot = Some(0);
+        tower.vote_state.root_slot = Some(0);
         assert!(!tower.is_locked_out(1, &ancestors));
     }
 
@@ -2491,7 +2538,7 @@ pub mod test {
     fn test_is_locked_out_root_slot_sibling_fail() {
         let mut tower = Tower::new_for_tests(0, 0.67);
         let ancestors: HashSet<Slot> = vec![0].into_iter().collect();
-        tower.lockouts.root_slot = Some(0);
+        tower.vote_state.root_slot = Some(0);
         tower.record_vote(1, Hash::default());
         assert!(tower.is_locked_out(2, &ancestors));
     }
@@ -2552,10 +2599,10 @@ pub mod test {
         tower.record_vote(1, Hash::default());
         assert!(!tower.is_locked_out(4, &ancestors));
         tower.record_vote(4, Hash::default());
-        assert_eq!(tower.lockouts.votes[0].slot, 0);
-        assert_eq!(tower.lockouts.votes[0].confirmation_count, 2);
-        assert_eq!(tower.lockouts.votes[1].slot, 4);
-        assert_eq!(tower.lockouts.votes[1].confirmation_count, 1);
+        assert_eq!(tower.vote_state.votes[0].slot, 0);
+        assert_eq!(tower.vote_state.votes[0].confirmation_count, 2);
+        assert_eq!(tower.vote_state.votes[1].slot, 4);
+        assert_eq!(tower.vote_state.votes[1].confirmation_count, 1);
     }
 
     #[test]
@@ -2804,7 +2851,7 @@ pub mod test {
 
         tower.save(&identity_keypair).unwrap();
         modify_serialized(&tower.path);
-        let loaded = Tower::restore(&dir.path(), &identity_keypair.pubkey());
+        let loaded = Tower::restore(dir.path(), &identity_keypair.pubkey());
 
         (tower, loaded)
     }
@@ -2872,7 +2919,8 @@ pub mod test {
                 &vote_simulator.progress,
                 total_stake,
                 bank0.epoch_vote_accounts(0).unwrap(),
-                &vote_simulator.latest_validator_votes_for_frozen_banks
+                &vote_simulator.latest_validator_votes_for_frozen_banks,
+                &vote_simulator.heaviest_subtree_fork_choice,
             ),
             SwitchForkDecision::SameFork
         );
@@ -2886,7 +2934,8 @@ pub mod test {
                 &vote_simulator.progress,
                 total_stake,
                 bank0.epoch_vote_accounts(0).unwrap(),
-                &vote_simulator.latest_validator_votes_for_frozen_banks
+                &vote_simulator.latest_validator_votes_for_frozen_banks,
+                &vote_simulator.heaviest_subtree_fork_choice,
             ),
             SwitchForkDecision::FailedSwitchThreshold(0, 20000)
         );
@@ -2901,7 +2950,8 @@ pub mod test {
                 &vote_simulator.progress,
                 total_stake,
                 bank0.epoch_vote_accounts(0).unwrap(),
-                &vote_simulator.latest_validator_votes_for_frozen_banks
+                &vote_simulator.latest_validator_votes_for_frozen_banks,
+                &vote_simulator.heaviest_subtree_fork_choice,
             ),
             SwitchForkDecision::SwitchProof(Hash::default())
         );
@@ -2912,7 +2962,7 @@ pub mod test {
             tower.record_vote(110, Hash::default());
             tower.record_vote(111, Hash::default());
             assert_eq!(tower.voted_slots(), vec![43, 110, 111]);
-            assert_eq!(tower.lockouts.root_slot, Some(0));
+            assert_eq!(tower.vote_state.root_slot, Some(0));
         }
 
         // Prepare simulated validator restart!
@@ -2971,7 +3021,8 @@ pub mod test {
                 &vote_simulator.progress,
                 total_stake,
                 bank0.epoch_vote_accounts(0).unwrap(),
-                &vote_simulator.latest_validator_votes_for_frozen_banks
+                &vote_simulator.latest_validator_votes_for_frozen_banks,
+                &vote_simulator.heaviest_subtree_fork_choice,
             ),
             SwitchForkDecision::FailedSwitchThreshold(0, 20000)
         );
@@ -2986,7 +3037,8 @@ pub mod test {
                 &vote_simulator.progress,
                 total_stake,
                 bank0.epoch_vote_accounts(0).unwrap(),
-                &vote_simulator.latest_validator_votes_for_frozen_banks
+                &vote_simulator.latest_validator_votes_for_frozen_banks,
+                &vote_simulator.heaviest_subtree_fork_choice,
             ),
             SwitchForkDecision::FailedSwitchThreshold(0, 20000)
         );
@@ -3001,7 +3053,8 @@ pub mod test {
                 &vote_simulator.progress,
                 total_stake,
                 bank0.epoch_vote_accounts(0).unwrap(),
-                &vote_simulator.latest_validator_votes_for_frozen_banks
+                &vote_simulator.latest_validator_votes_for_frozen_banks,
+                &vote_simulator.heaviest_subtree_fork_choice,
             ),
             SwitchForkDecision::SwitchProof(Hash::default())
         );
@@ -3009,7 +3062,7 @@ pub mod test {
         tower.record_vote(110, Hash::default());
         tower.record_vote(111, Hash::default());
         assert_eq!(tower.voted_slots(), vec![110, 111]);
-        assert_eq!(tower.lockouts.root_slot, Some(replayed_root_slot));
+        assert_eq!(tower.vote_state.root_slot, Some(replayed_root_slot));
     }
 
     #[test]
@@ -3099,7 +3152,7 @@ pub mod test {
             assert!(!blockstore.is_root(4));
 
             let mut tower = Tower::new_with_key(&Pubkey::default());
-            tower.lockouts.root_slot = Some(4);
+            tower.vote_state.root_slot = Some(4);
             reconcile_blockstore_roots_with_tower(&tower, &blockstore).unwrap();
 
             assert!(!blockstore.is_root(0));
@@ -3124,14 +3177,14 @@ pub mod test {
             blockstore.insert_shreds(shreds, None, false).unwrap();
             let (shreds, _) = make_slot_entries(4, 1, 42);
             blockstore.insert_shreds(shreds, None, false).unwrap();
-            blockstore.set_roots(&[3]).unwrap();
+            blockstore.set_roots(std::iter::once(&3)).unwrap();
             assert!(!blockstore.is_root(0));
             assert!(!blockstore.is_root(1));
             assert!(blockstore.is_root(3));
             assert!(!blockstore.is_root(4));
 
             let mut tower = Tower::new_with_key(&Pubkey::default());
-            tower.lockouts.root_slot = Some(4);
+            tower.vote_state.root_slot = Some(4);
             reconcile_blockstore_roots_with_tower(&tower, &blockstore).unwrap();
         }
         Blockstore::destroy(&blockstore_path).expect("Expected successful database destruction");
@@ -3153,7 +3206,7 @@ pub mod test {
             assert!(!blockstore.is_root(3));
 
             let mut tower = Tower::new_with_key(&Pubkey::default());
-            tower.lockouts.root_slot = Some(4);
+            tower.vote_state.root_slot = Some(4);
             assert_eq!(blockstore.last_root(), 0);
             reconcile_blockstore_roots_with_tower(&tower, &blockstore).unwrap();
             assert_eq!(blockstore.last_root(), 0);
@@ -3305,7 +3358,7 @@ pub mod test {
     #[test]
     fn test_adjust_lockouts_after_replay_all_not_found_even_if_rooted() {
         let mut tower = Tower::new_for_tests(10, 0.9);
-        tower.lockouts.root_slot = Some(4);
+        tower.vote_state.root_slot = Some(4);
         tower.record_vote(5, Hash::default());
         tower.record_vote(6, Hash::default());
 
@@ -3327,7 +3380,7 @@ pub mod test {
     #[test]
     fn test_adjust_lockouts_after_replay_all_future_votes_only_root_found() {
         let mut tower = Tower::new_for_tests(10, 0.9);
-        tower.lockouts.root_slot = Some(2);
+        tower.vote_state.root_slot = Some(2);
         tower.record_vote(3, Hash::default());
         tower.record_vote(4, Hash::default());
         tower.record_vote(5, Hash::default());
@@ -3383,8 +3436,8 @@ pub mod test {
     #[test]
     fn test_adjust_lockouts_after_replay_time_warped() {
         let mut tower = Tower::new_for_tests(10, 0.9);
-        tower.lockouts.votes.push_back(Lockout::new(1));
-        tower.lockouts.votes.push_back(Lockout::new(0));
+        tower.vote_state.votes.push_back(Lockout::new(1));
+        tower.vote_state.votes.push_back(Lockout::new(0));
         let vote = Vote::new(vec![0], Hash::default());
         tower.last_vote = vote;
 
@@ -3401,8 +3454,8 @@ pub mod test {
     #[test]
     fn test_adjust_lockouts_after_replay_diverged_ancestor() {
         let mut tower = Tower::new_for_tests(10, 0.9);
-        tower.lockouts.votes.push_back(Lockout::new(1));
-        tower.lockouts.votes.push_back(Lockout::new(2));
+        tower.vote_state.votes.push_back(Lockout::new(1));
+        tower.vote_state.votes.push_back(Lockout::new(2));
         let vote = Vote::new(vec![2], Hash::default());
         tower.last_vote = vote;
 
@@ -3423,11 +3476,11 @@ pub mod test {
 
         let mut tower = Tower::new_for_tests(10, 0.9);
         tower
-            .lockouts
+            .vote_state
             .votes
             .push_back(Lockout::new(MAX_ENTRIES - 1));
-        tower.lockouts.votes.push_back(Lockout::new(0));
-        tower.lockouts.votes.push_back(Lockout::new(1));
+        tower.vote_state.votes.push_back(Lockout::new(0));
+        tower.vote_state.votes.push_back(Lockout::new(1));
         let vote = Vote::new(vec![1], Hash::default());
         tower.last_vote = vote;
 
@@ -3445,8 +3498,8 @@ pub mod test {
     #[should_panic(expected = "slot_in_tower(2) < checked_slot(1)")]
     fn test_adjust_lockouts_after_replay_reversed_votes() {
         let mut tower = Tower::new_for_tests(10, 0.9);
-        tower.lockouts.votes.push_back(Lockout::new(2));
-        tower.lockouts.votes.push_back(Lockout::new(1));
+        tower.vote_state.votes.push_back(Lockout::new(2));
+        tower.vote_state.votes.push_back(Lockout::new(1));
         let vote = Vote::new(vec![1], Hash::default());
         tower.last_vote = vote;
 
@@ -3463,9 +3516,9 @@ pub mod test {
     #[should_panic(expected = "slot_in_tower(3) < checked_slot(3)")]
     fn test_adjust_lockouts_after_replay_repeated_non_root_votes() {
         let mut tower = Tower::new_for_tests(10, 0.9);
-        tower.lockouts.votes.push_back(Lockout::new(2));
-        tower.lockouts.votes.push_back(Lockout::new(3));
-        tower.lockouts.votes.push_back(Lockout::new(3));
+        tower.vote_state.votes.push_back(Lockout::new(2));
+        tower.vote_state.votes.push_back(Lockout::new(3));
+        tower.vote_state.votes.push_back(Lockout::new(3));
         let vote = Vote::new(vec![3], Hash::default());
         tower.last_vote = vote;
 
@@ -3481,10 +3534,10 @@ pub mod test {
     #[test]
     fn test_adjust_lockouts_after_replay_vote_on_root() {
         let mut tower = Tower::new_for_tests(10, 0.9);
-        tower.lockouts.root_slot = Some(42);
-        tower.lockouts.votes.push_back(Lockout::new(42));
-        tower.lockouts.votes.push_back(Lockout::new(43));
-        tower.lockouts.votes.push_back(Lockout::new(44));
+        tower.vote_state.root_slot = Some(42);
+        tower.vote_state.votes.push_back(Lockout::new(42));
+        tower.vote_state.votes.push_back(Lockout::new(43));
+        tower.vote_state.votes.push_back(Lockout::new(44));
         let vote = Vote::new(vec![44], Hash::default());
         tower.last_vote = vote;
 
@@ -3498,7 +3551,7 @@ pub mod test {
     #[test]
     fn test_adjust_lockouts_after_replay_vote_on_genesis() {
         let mut tower = Tower::new_for_tests(10, 0.9);
-        tower.lockouts.votes.push_back(Lockout::new(0));
+        tower.vote_state.votes.push_back(Lockout::new(0));
         let vote = Vote::new(vec![0], Hash::default());
         tower.last_vote = vote;
 
@@ -3511,8 +3564,8 @@ pub mod test {
     #[test]
     fn test_adjust_lockouts_after_replay_future_tower() {
         let mut tower = Tower::new_for_tests(10, 0.9);
-        tower.lockouts.votes.push_back(Lockout::new(13));
-        tower.lockouts.votes.push_back(Lockout::new(14));
+        tower.vote_state.votes.push_back(Lockout::new(13));
+        tower.vote_state.votes.push_back(Lockout::new(14));
         let vote = Vote::new(vec![14], Hash::default());
         tower.last_vote = vote;
         tower.initialize_root(12);
diff --git a/core/src/fetch_stage.rs b/core/src/fetch_stage.rs
index 418e748d6cf85d..8aea7fe25cc0a5 100644
--- a/core/src/fetch_stage.rs
+++ b/core/src/fetch_stage.rs
@@ -1,11 +1,11 @@
 //! The `fetch_stage` batches input from a UDP socket and sends it to a channel.
 
 use crate::banking_stage::HOLD_TRANSACTIONS_SLOT_OFFSET;
-use crate::poh_recorder::PohRecorder;
 use crate::result::{Error, Result};
 use solana_metrics::{inc_new_counter_debug, inc_new_counter_info};
 use solana_perf::packet::PacketsRecycler;
 use solana_perf::recycler::Recycler;
+use solana_poh::poh_recorder::PohRecorder;
 use solana_sdk::clock::DEFAULT_TICKS_PER_SLOT;
 use solana_streamer::streamer::{self, PacketReceiver, PacketSender};
 use std::net::UdpSocket;
@@ -34,7 +34,7 @@ impl FetchStage {
                 tpu_forwards_sockets,
                 exit,
                 &sender,
-                &poh_recorder,
+                poh_recorder,
                 coalesce_ms,
             ),
             receiver,
@@ -54,8 +54,8 @@ impl FetchStage {
             tx_sockets,
             tpu_forwards_sockets,
             exit,
-            &sender,
-            &poh_recorder,
+            sender,
+            poh_recorder,
             coalesce_ms,
         )
     }
@@ -85,7 +85,7 @@ impl FetchStage {
             inc_new_counter_debug!("fetch_stage-honor_forwards", len);
             for packets in batch {
                 if sendr.send(packets).is_err() {
-                    return Err(Error::SendError);
+                    return Err(Error::Send);
                 }
             }
         } else {
@@ -108,11 +108,12 @@ impl FetchStage {
         let tpu_threads = sockets.into_iter().map(|socket| {
             streamer::receiver(
                 socket,
-                &exit,
+                exit,
                 sender.clone(),
                 recycler.clone(),
                 "fetch_stage",
                 coalesce_ms,
+                true,
             )
         });
 
@@ -120,11 +121,12 @@ impl FetchStage {
         let tpu_forwards_threads = tpu_forwards_sockets.into_iter().map(|socket| {
             streamer::receiver(
                 socket,
-                &exit,
+                exit,
                 forward_sender.clone(),
                 recycler.clone(),
                 "fetch_forward_stage",
                 coalesce_ms,
+                true,
             )
         });
 
@@ -138,10 +140,10 @@ impl FetchStage {
                     Self::handle_forwarded_packets(&forward_receiver, &sender, &poh_recorder)
                 {
                     match e {
-                        Error::RecvTimeoutError(RecvTimeoutError::Disconnected) => break,
-                        Error::RecvTimeoutError(RecvTimeoutError::Timeout) => (),
-                        Error::RecvError(_) => break,
-                        Error::SendError => break,
+                        Error::RecvTimeout(RecvTimeoutError::Disconnected) => break,
+                        Error::RecvTimeout(RecvTimeoutError::Timeout) => (),
+                        Error::Recv(_) => break,
+                        Error::Send => break,
                         _ => error!("{:?}", e),
                     }
                 }
diff --git a/core/src/heaviest_subtree_fork_choice.rs b/core/src/heaviest_subtree_fork_choice.rs
index fb1f10eac0ab1c..df75eaae7269da 100644
--- a/core/src/heaviest_subtree_fork_choice.rs
+++ b/core/src/heaviest_subtree_fork_choice.rs
@@ -30,7 +30,17 @@ const MAX_ROOT_PRINT_SECONDS: u64 = 30;
 enum UpdateLabel {
     Aggregate,
     Add,
-    MarkValid,
+
+    // Notify a fork in the tree that a particular slot in that fork is now
+    // marked as valid. If there are multiple MarkValid operations for
+    // a single node, should apply the one with the smaller slot first (hence
+    // why the actual slot is included here).
+    MarkValid(Slot),
+    // Notify a fork in the tree that a particular slot in that fork is now
+    // marked as invalid. If there are multiple MarkInvalid operations for
+    // a single node, should apply the one with the smaller slot first (hence
+    // why the actual slot is included here).
+    MarkInvalid(Slot),
     Subtract,
 }
 
@@ -53,7 +63,10 @@ impl GetSlotHash for Slot {
 #[derive(PartialEq, Eq, Clone, Debug)]
 enum UpdateOperation {
     Add(u64),
-    MarkValid,
+    MarkValid(Slot),
+    // Notify a fork in the tree that a particular slot in that fork is now
+    // marked as invalid.
+    MarkInvalid(Slot),
     Subtract(u64),
     Aggregate,
 }
@@ -63,7 +76,8 @@ impl UpdateOperation {
         match self {
             Self::Aggregate => panic!("Should not get here"),
             Self::Add(stake) => *stake += new_stake,
-            Self::MarkValid => panic!("Should not get here"),
+            Self::MarkValid(_slot) => panic!("Should not get here"),
+            Self::MarkInvalid(_slot) => panic!("Should not get here"),
             Self::Subtract(stake) => *stake += new_stake,
         }
     }
@@ -80,9 +94,68 @@ struct ForkInfo {
     best_slot: SlotHashKey,
     parent: Option<SlotHashKey>,
     children: Vec<SlotHashKey>,
-    // Whether the fork rooted at this slot is a valid contender
-    // for the best fork
-    is_candidate: bool,
+    // The latest ancestor of this node that has been marked invalid. If the slot
+    // itself is a duplicate, this is set to the slot itself.
+    latest_invalid_ancestor: Option<Slot>,
+    // Set to true if this slot or a child node was duplicate confirmed.
+    is_duplicate_confirmed: bool,
+}
+
+impl ForkInfo {
+    /// Returns if this node has been explicitly marked as a duplicate
+    /// slot
+    fn is_unconfirmed_duplicate(&self, my_slot: Slot) -> bool {
+        self.latest_invalid_ancestor
+            .map(|ancestor| ancestor == my_slot)
+            .unwrap_or(false)
+    }
+
+    /// Returns if the fork rooted at this node is included in fork choice
+    fn is_candidate(&self) -> bool {
+        self.latest_invalid_ancestor.is_none()
+    }
+
+    fn is_duplicate_confirmed(&self) -> bool {
+        self.is_duplicate_confirmed
+    }
+
+    fn set_duplicate_confirmed(&mut self) {
+        self.is_duplicate_confirmed = true;
+        self.latest_invalid_ancestor = None;
+    }
+
+    fn update_with_newly_valid_ancestor(
+        &mut self,
+        my_key: &SlotHashKey,
+        newly_valid_ancestor: Slot,
+    ) {
+        if let Some(latest_invalid_ancestor) = self.latest_invalid_ancestor {
+            if latest_invalid_ancestor <= newly_valid_ancestor {
+                info!("Fork choice for {:?} clearing latest invalid ancestor {:?} because {:?} was duplicate confirmed", my_key, latest_invalid_ancestor, newly_valid_ancestor);
+                self.latest_invalid_ancestor = None;
+            }
+        }
+    }
+
+    fn update_with_newly_invalid_ancestor(
+        &mut self,
+        my_key: &SlotHashKey,
+        newly_invalid_ancestor: Slot,
+    ) {
+        // Should not be marking a duplicate confirmed slot as invalid
+        assert!(!self.is_duplicate_confirmed);
+        if self
+            .latest_invalid_ancestor
+            .map(|latest_invalid_ancestor| newly_invalid_ancestor > latest_invalid_ancestor)
+            .unwrap_or(true)
+        {
+            info!(
+                "Fork choice for {:?} setting latest invalid ancestor from {:?} to {}",
+                my_key, self.latest_invalid_ancestor, newly_invalid_ancestor
+            );
+            self.latest_invalid_ancestor = Some(newly_invalid_ancestor);
+        }
+    }
 }
 
 pub struct HeaviestSubtreeForkChoice {
@@ -182,12 +255,6 @@ impl HeaviestSubtreeForkChoice {
             .map(|fork_info| fork_info.stake_voted_subtree)
     }
 
-    pub fn is_candidate_slot(&self, key: &SlotHashKey) -> Option<bool> {
-        self.fork_infos
-            .get(key)
-            .map(|fork_info| fork_info.is_candidate)
-    }
-
     pub fn root(&self) -> SlotHashKey {
         self.root
     }
@@ -252,35 +319,41 @@ impl HeaviestSubtreeForkChoice {
             best_slot: root_info.best_slot,
             children: vec![self.root],
             parent: None,
-            is_candidate: true,
+            latest_invalid_ancestor: None,
+            is_duplicate_confirmed: root_info.is_duplicate_confirmed,
         };
         self.fork_infos.insert(root_parent, root_parent_info);
         self.root = root_parent;
     }
 
-    pub fn add_new_leaf_slot(&mut self, slot: SlotHashKey, parent: Option<SlotHashKey>) {
+    pub fn add_new_leaf_slot(&mut self, slot_hash_key: SlotHashKey, parent: Option<SlotHashKey>) {
         if self.last_root_time.elapsed().as_secs() > MAX_ROOT_PRINT_SECONDS {
             self.print_state();
             self.last_root_time = Instant::now();
         }
 
-        if self.fork_infos.contains_key(&slot) {
+        if self.fork_infos.contains_key(&slot_hash_key) {
             // Can potentially happen if we repair the same version of the duplicate slot, after
             // dumping the original version
             return;
         }
 
+        let parent_latest_invalid_ancestor =
+            parent.and_then(|parent| self.latest_invalid_ancestor(&parent));
         self.fork_infos
-            .entry(slot)
-            .and_modify(|slot_info| slot_info.parent = parent)
+            .entry(slot_hash_key)
+            .and_modify(|fork_info| fork_info.parent = parent)
             .or_insert(ForkInfo {
                 stake_voted_at: 0,
                 stake_voted_subtree: 0,
                 // The `best_slot` of a leaf is itself
-                best_slot: slot,
+                best_slot: slot_hash_key,
                 children: vec![],
                 parent,
-                is_candidate: true,
+                latest_invalid_ancestor: parent_latest_invalid_ancestor,
+                // If the parent is none, then this is the root, which implies this must
+                // have reached the duplicate confirmed threshold
+                is_duplicate_confirmed: parent.is_none(),
             });
 
         if parent.is_none() {
@@ -294,11 +367,11 @@ impl HeaviestSubtreeForkChoice {
             .get_mut(&parent)
             .unwrap()
             .children
-            .push(slot);
+            .push(slot_hash_key);
 
         // Propagate leaf up the tree to any ancestors who considered the previous leaf
         // the `best_slot`
-        self.propagate_new_leaf(&slot, &parent)
+        self.propagate_new_leaf(&slot_hash_key, &parent)
     }
 
     // Returns if the given `maybe_best_child` is the heaviest among the children
@@ -316,10 +389,7 @@ impl HeaviestSubtreeForkChoice {
                 .expect("child must exist in `self.fork_infos`");
 
             // Don't count children currently marked as invalid
-            if !self
-                .is_candidate_slot(child)
-                .expect("child must exist in tree")
-            {
+            if !self.is_candidate(child).expect("child must exist in tree") {
                 continue;
             }
 
@@ -378,6 +448,34 @@ impl HeaviestSubtreeForkChoice {
             .map(|fork_info| fork_info.stake_voted_at)
     }
 
+    pub fn latest_invalid_ancestor(&self, slot_hash_key: &SlotHashKey) -> Option<Slot> {
+        self.fork_infos
+            .get(slot_hash_key)
+            .map(|fork_info| fork_info.latest_invalid_ancestor)
+            .unwrap_or(None)
+    }
+
+    pub fn is_duplicate_confirmed(&self, slot_hash_key: &SlotHashKey) -> Option<bool> {
+        self.fork_infos
+            .get(slot_hash_key)
+            .map(|fork_info| fork_info.is_duplicate_confirmed())
+    }
+
+    /// Returns if the exact node with the specified key has been explicitly marked as a duplicate
+    /// slot (doesn't count ancestors being marked as duplicate).
+    pub fn is_unconfirmed_duplicate(&self, slot_hash_key: &SlotHashKey) -> Option<bool> {
+        self.fork_infos
+            .get(slot_hash_key)
+            .map(|fork_info| fork_info.is_unconfirmed_duplicate(slot_hash_key.0))
+    }
+
+    /// Returns false if the node or any of its ancestors have been marked as duplicate
+    pub fn is_candidate(&self, slot_hash_key: &SlotHashKey) -> Option<bool> {
+        self.fork_infos
+            .get(slot_hash_key)
+            .map(|fork_info| fork_info.is_candidate())
+    }
+
     fn propagate_new_leaf(
         &mut self,
         slot_hash_key: &SlotHashKey,
@@ -406,42 +504,69 @@ impl HeaviestSubtreeForkChoice {
         }
     }
 
-    fn insert_mark_valid_aggregate_operations(
+    fn insert_aggregate_operations(
         &self,
         update_operations: &mut BTreeMap<(SlotHashKey, UpdateLabel), UpdateOperation>,
         slot_hash_key: SlotHashKey,
     ) {
-        self.do_insert_aggregate_operations(update_operations, true, slot_hash_key);
+        self.do_insert_aggregate_operations_across_ancestors(
+            update_operations,
+            None,
+            slot_hash_key,
+        );
     }
 
-    fn insert_aggregate_operations(
+    #[allow(clippy::map_entry)]
+    fn do_insert_aggregate_operations_across_ancestors(
         &self,
         update_operations: &mut BTreeMap<(SlotHashKey, UpdateLabel), UpdateOperation>,
+        modify_fork_validity: Option<UpdateOperation>,
         slot_hash_key: SlotHashKey,
     ) {
-        self.do_insert_aggregate_operations(update_operations, false, slot_hash_key);
+        for parent_slot_hash_key in self.ancestor_iterator(slot_hash_key) {
+            if !self.do_insert_aggregate_operation(
+                update_operations,
+                &modify_fork_validity,
+                parent_slot_hash_key,
+            ) {
+                // If this parent was already inserted, we assume all the other parents have also
+                // already been inserted. This is to prevent iterating over the parents multiple times
+                // when we are aggregating leaves that have a lot of shared ancestors
+                break;
+            }
+        }
     }
 
     #[allow(clippy::map_entry)]
-    fn do_insert_aggregate_operations(
+    fn do_insert_aggregate_operation(
         &self,
         update_operations: &mut BTreeMap<(SlotHashKey, UpdateLabel), UpdateOperation>,
-        should_mark_valid: bool,
+        modify_fork_validity: &Option<UpdateOperation>,
         slot_hash_key: SlotHashKey,
-    ) {
-        for parent_slot_hash_key in self.ancestor_iterator(slot_hash_key) {
-            let aggregate_label = (parent_slot_hash_key, UpdateLabel::Aggregate);
-            if update_operations.contains_key(&aggregate_label) {
-                break;
-            } else {
-                if should_mark_valid {
-                    update_operations.insert(
-                        (parent_slot_hash_key, UpdateLabel::MarkValid),
-                        UpdateOperation::MarkValid,
-                    );
+    ) -> bool {
+        let aggregate_label = (slot_hash_key, UpdateLabel::Aggregate);
+        if update_operations.contains_key(&aggregate_label) {
+            false
+        } else {
+            if let Some(mark_fork_validity) = modify_fork_validity {
+                match mark_fork_validity {
+                    UpdateOperation::MarkValid(slot) => {
+                        update_operations.insert(
+                            (slot_hash_key, UpdateLabel::MarkValid(*slot)),
+                            UpdateOperation::MarkValid(*slot),
+                        );
+                    }
+                    UpdateOperation::MarkInvalid(slot) => {
+                        update_operations.insert(
+                            (slot_hash_key, UpdateLabel::MarkInvalid(*slot)),
+                            UpdateOperation::MarkInvalid(*slot),
+                        );
+                    }
+                    _ => (),
                 }
-                update_operations.insert(aggregate_label, UpdateOperation::Aggregate);
             }
+            update_operations.insert(aggregate_label, UpdateOperation::Aggregate);
+            true
         }
     }
 
@@ -452,12 +577,18 @@ impl HeaviestSubtreeForkChoice {
     fn aggregate_slot(&mut self, slot_hash_key: SlotHashKey) {
         let mut stake_voted_subtree;
         let mut best_slot_hash_key = slot_hash_key;
+        let mut is_duplicate_confirmed = false;
         if let Some(fork_info) = self.fork_infos.get(&slot_hash_key) {
             stake_voted_subtree = fork_info.stake_voted_at;
             let mut best_child_stake_voted_subtree = 0;
-            let mut best_child_slot = slot_hash_key;
-            for child in &fork_info.children {
-                let child_stake_voted_subtree = self.stake_voted_subtree(child).unwrap();
+            let mut best_child_slot_key = slot_hash_key;
+            for child_key in &fork_info.children {
+                let child_fork_info = self
+                    .fork_infos
+                    .get(child_key)
+                    .expect("Child must exist in fork_info map");
+                let child_stake_voted_subtree = child_fork_info.stake_voted_subtree;
+                is_duplicate_confirmed |= child_fork_info.is_duplicate_confirmed;
 
                 // Child forks that are not candidates still contribute to the weight
                 // of the subtree rooted at `slot_hash_key`. For instance:
@@ -482,19 +613,15 @@ impl HeaviestSubtreeForkChoice {
 
                 // Note: If there's no valid children, then the best slot should default to the
                 // input `slot` itself.
-                if self
-                    .is_candidate_slot(child)
-                    .expect("Child must exist in fork_info map")
-                    && (best_child_slot == slot_hash_key ||
+                if child_fork_info.is_candidate()
+                    && (best_child_slot_key == slot_hash_key ||
                     child_stake_voted_subtree > best_child_stake_voted_subtree ||
                 // tiebreaker by slot height, prioritize earlier slot
-                (child_stake_voted_subtree == best_child_stake_voted_subtree && child < &best_child_slot))
+                (child_stake_voted_subtree == best_child_stake_voted_subtree && child_key < &best_child_slot_key))
                 {
                     best_child_stake_voted_subtree = child_stake_voted_subtree;
-                    best_child_slot = *child;
-                    best_slot_hash_key = self
-                        .best_slot(child)
-                        .expect("`child` must exist in `self.fork_infos`");
+                    best_child_slot_key = *child_key;
+                    best_slot_hash_key = child_fork_info.best_slot;
                 }
             }
         } else {
@@ -502,19 +629,38 @@ impl HeaviestSubtreeForkChoice {
         }
 
         let fork_info = self.fork_infos.get_mut(&slot_hash_key).unwrap();
+        if is_duplicate_confirmed {
+            if !fork_info.is_duplicate_confirmed {
+                info!(
+                    "Fork choice setting {:?} to duplicate confirmed",
+                    slot_hash_key
+                );
+            }
+            fork_info.set_duplicate_confirmed();
+        }
         fork_info.stake_voted_subtree = stake_voted_subtree;
         fork_info.best_slot = best_slot_hash_key;
     }
 
-    fn mark_slot_valid(&mut self, valid_slot_hash_key: (Slot, Hash)) {
-        if let Some(fork_info) = self.fork_infos.get_mut(&valid_slot_hash_key) {
-            if !fork_info.is_candidate {
-                info!(
-                    "marked previously invalid fork starting at slot: {:?} as valid",
-                    valid_slot_hash_key
-                );
+    /// Mark that `valid_slot` on the fork starting at `fork_to_modify` has been marked
+    /// valid. Note we don't need the hash for `valid_slot` because slot number uniquely
+    /// identifies a node on a single fork.
+    fn mark_fork_valid(&mut self, fork_to_modify_key: SlotHashKey, valid_slot: Slot) {
+        if let Some(fork_info_to_modify) = self.fork_infos.get_mut(&fork_to_modify_key) {
+            fork_info_to_modify.update_with_newly_valid_ancestor(&fork_to_modify_key, valid_slot);
+            if fork_to_modify_key.0 == valid_slot {
+                fork_info_to_modify.is_duplicate_confirmed = true;
             }
-            fork_info.is_candidate = true;
+        }
+    }
+
+    /// Mark that `invalid_slot` on the fork starting at `fork_to_modify` has been marked
+    /// invalid. Note we don't need the hash for `invalid_slot` because slot number uniquely
+    /// identifies a node on a single fork.
+    fn mark_fork_invalid(&mut self, fork_to_modify_key: SlotHashKey, invalid_slot: Slot) {
+        if let Some(fork_info_to_modify) = self.fork_infos.get_mut(&fork_to_modify_key) {
+            fork_info_to_modify
+                .update_with_newly_invalid_ancestor(&fork_to_modify_key, invalid_slot);
         }
     }
 
@@ -624,7 +770,7 @@ impl HeaviestSubtreeForkChoice {
             let epoch = epoch_schedule.get_epoch(new_vote_slot_hash.0);
             let stake_update = epoch_stakes
                 .get(&epoch)
-                .map(|epoch_stakes| epoch_stakes.vote_account_stake(&pubkey))
+                .map(|epoch_stakes| epoch_stakes.vote_account_stake(pubkey))
                 .unwrap_or(0);
 
             update_operations
@@ -641,7 +787,12 @@ impl HeaviestSubtreeForkChoice {
         // Iterate through the update operations from greatest to smallest slot
         for ((slot_hash_key, _), operation) in update_operations.into_iter().rev() {
             match operation {
-                UpdateOperation::MarkValid => self.mark_slot_valid(slot_hash_key),
+                UpdateOperation::MarkValid(valid_slot) => {
+                    self.mark_fork_valid(slot_hash_key, valid_slot)
+                }
+                UpdateOperation::MarkInvalid(invalid_slot) => {
+                    self.mark_fork_invalid(slot_hash_key, invalid_slot)
+                }
                 UpdateOperation::Aggregate => self.aggregate_slot(slot_hash_key),
                 UpdateOperation::Add(stake) => self.add_slot_stake(&slot_hash_key, stake),
                 UpdateOperation::Subtract(stake) => self.subtract_slot_stake(&slot_hash_key, stake),
@@ -745,7 +896,7 @@ impl TreeDiff for HeaviestSubtreeForkChoice {
 
     fn children(&self, slot_hash_key: &SlotHashKey) -> Option<&[SlotHashKey]> {
         self.fork_infos
-            .get(&slot_hash_key)
+            .get(slot_hash_key)
             .map(|fork_info| &fork_info.children[..])
     }
 }
@@ -810,35 +961,48 @@ impl ForkChoice for HeaviestSubtreeForkChoice {
 
     fn mark_fork_invalid_candidate(&mut self, invalid_slot_hash_key: &SlotHashKey) {
         info!(
-            "marking fork starting at slot: {:?} invalid candidate",
+            "marking fork starting at: {:?} invalid candidate",
             invalid_slot_hash_key
         );
         let fork_info = self.fork_infos.get_mut(invalid_slot_hash_key);
         if let Some(fork_info) = fork_info {
-            if fork_info.is_candidate {
-                fork_info.is_candidate = false;
-                // Aggregate to find the new best slots excluding this fork
-                let mut update_operations = UpdateOperations::default();
-                self.insert_aggregate_operations(&mut update_operations, *invalid_slot_hash_key);
-                self.process_update_operations(update_operations);
+            // Should not be marking duplicate confirmed blocks as invalid candidates
+            assert!(!fork_info.is_duplicate_confirmed);
+            let mut update_operations = UpdateOperations::default();
+
+            // Notify all the children of this node that a parent was marked as invalid
+            for child_hash_key in self.subtree_diff(*invalid_slot_hash_key, SlotHashKey::default())
+            {
+                self.do_insert_aggregate_operation(
+                    &mut update_operations,
+                    &Some(UpdateOperation::MarkInvalid(invalid_slot_hash_key.0)),
+                    child_hash_key,
+                );
             }
+
+            // Aggregate across all ancestors to find the new best slots excluding this fork
+            self.insert_aggregate_operations(&mut update_operations, *invalid_slot_hash_key);
+            self.process_update_operations(update_operations);
         }
     }
 
     fn mark_fork_valid_candidate(&mut self, valid_slot_hash_key: &SlotHashKey) {
+        info!(
+            "marking fork starting at: {:?} valid candidate",
+            valid_slot_hash_key
+        );
         let mut update_operations = UpdateOperations::default();
-        let fork_info = self.fork_infos.get_mut(valid_slot_hash_key);
-        if let Some(fork_info) = fork_info {
-            // If a bunch of slots on the same fork are confirmed at once, then only the latest
-            // slot will incur this aggregation operation
-            fork_info.is_candidate = true;
-            self.insert_mark_valid_aggregate_operations(
+        // Notify all the children of this node that a parent was marked as valid
+        for child_hash_key in self.subtree_diff(*valid_slot_hash_key, SlotHashKey::default()) {
+            self.do_insert_aggregate_operation(
                 &mut update_operations,
-                *valid_slot_hash_key,
+                &Some(UpdateOperation::MarkValid(valid_slot_hash_key.0)),
+                child_hash_key,
             );
         }
 
-        // Aggregate to find the new best slots including this fork
+        // Aggregate across all ancestors to find the new best slots including this fork
+        self.insert_aggregate_operations(&mut update_operations, *valid_slot_hash_key);
         self.process_update_operations(update_operations);
     }
 }
@@ -1333,7 +1497,7 @@ mod test {
             .chain(std::iter::once(&duplicate_leaves_descended_from_4[1]))
         {
             assert!(heaviest_subtree_fork_choice
-                .children(&duplicate_leaf)
+                .children(duplicate_leaf)
                 .unwrap()
                 .is_empty(),);
         }
@@ -2740,34 +2904,50 @@ mod test {
             (expected_best_slot, Hash::default()),
         );
 
-        // Mark slot 5 as invalid, the best fork should be its ancestor 3,
-        // not the other for at 4.
-        let invalid_candidate = (5, Hash::default());
+        // Simulate a vote on slot 5
+        let last_voted_slot_hash = (5, Hash::default());
+        let mut tower = Tower::new_for_tests(10, 0.9);
+        tower.record_vote(last_voted_slot_hash.0, last_voted_slot_hash.1);
+
+        // The heaviest_slot_on_same_voted_fork() should be 6, descended from 5.
+        assert_eq!(
+            heaviest_subtree_fork_choice
+                .heaviest_slot_on_same_voted_fork(&tower)
+                .unwrap(),
+            (6, Hash::default())
+        );
+
+        // Mark slot 5 as invalid
+        let invalid_candidate = last_voted_slot_hash;
         heaviest_subtree_fork_choice.mark_fork_invalid_candidate(&invalid_candidate);
-        assert_eq!(heaviest_subtree_fork_choice.best_overall_slot().0, 3);
         assert!(!heaviest_subtree_fork_choice
-            .is_candidate_slot(&invalid_candidate)
+            .is_candidate(&invalid_candidate)
             .unwrap());
 
-        // The ancestor is still a candidate
+        // The ancestor 3 is still a candidate
         assert!(heaviest_subtree_fork_choice
-            .is_candidate_slot(&(3, Hash::default()))
+            .is_candidate(&(3, Hash::default()))
             .unwrap());
 
+        // The best fork should be its ancestor 3, not the other fork at 4.
+        assert_eq!(heaviest_subtree_fork_choice.best_overall_slot().0, 3);
+
+        // After marking the last vote in the tower as invalid, `heaviest_slot_on_same_voted_fork()`
+        // should disregard all descendants of that invalid vote
+        assert!(heaviest_subtree_fork_choice
+            .heaviest_slot_on_same_voted_fork(&tower)
+            .is_none());
+
         // Adding another descendant to the invalid candidate won't
         // update the best slot, even if it contains votes
-        let new_leaf_slot7 = 7;
-        heaviest_subtree_fork_choice.add_new_leaf_slot(
-            (new_leaf_slot7, Hash::default()),
-            Some((6, Hash::default())),
-        );
+        let new_leaf7 = (7, Hash::default());
+        heaviest_subtree_fork_choice.add_new_leaf_slot(new_leaf7, Some((6, Hash::default())));
         let invalid_slot_ancestor = 3;
         assert_eq!(
             heaviest_subtree_fork_choice.best_overall_slot().0,
             invalid_slot_ancestor
         );
-        let pubkey_votes: Vec<(Pubkey, SlotHashKey)> =
-            vec![(vote_pubkeys[0], (new_leaf_slot7, Hash::default()))];
+        let pubkey_votes: Vec<(Pubkey, SlotHashKey)> = vec![(vote_pubkeys[0], new_leaf7)];
         assert_eq!(
             heaviest_subtree_fork_choice.add_votes(
                 pubkey_votes.iter(),
@@ -2777,34 +2957,51 @@ mod test {
             (invalid_slot_ancestor, Hash::default()),
         );
 
+        // This shouldn't update the `heaviest_slot_on_same_voted_fork` either
+        assert!(heaviest_subtree_fork_choice
+            .heaviest_slot_on_same_voted_fork(&tower)
+            .is_none());
+
         // Adding a descendant to the ancestor of the invalid candidate *should* update
         // the best slot though, since the ancestor is on the heaviest fork
-        let new_leaf_slot8 = 8;
-        heaviest_subtree_fork_choice.add_new_leaf_slot(
-            (new_leaf_slot8, Hash::default()),
-            Some((invalid_slot_ancestor, Hash::default())),
-        );
-        assert_eq!(
-            heaviest_subtree_fork_choice.best_overall_slot().0,
-            new_leaf_slot8,
-        );
+        let new_leaf8 = (8, Hash::default());
+        heaviest_subtree_fork_choice
+            .add_new_leaf_slot(new_leaf8, Some((invalid_slot_ancestor, Hash::default())));
+        assert_eq!(heaviest_subtree_fork_choice.best_overall_slot(), new_leaf8,);
+        // Should not update the `heaviest_slot_on_same_voted_fork` because the new leaf
+        // is not descended from the last vote
+        assert!(heaviest_subtree_fork_choice
+            .heaviest_slot_on_same_voted_fork(&tower)
+            .is_none());
 
         // If we mark slot a descendant of `invalid_candidate` as valid, then that
         // should also mark `invalid_candidate` as valid, and the best slot should
         // be the leaf of the heaviest fork, `new_leaf_slot`.
         heaviest_subtree_fork_choice.mark_fork_valid_candidate(&invalid_candidate);
         assert!(heaviest_subtree_fork_choice
-            .is_candidate_slot(&invalid_candidate)
+            .is_candidate(&invalid_candidate)
             .unwrap());
         assert_eq!(
-            heaviest_subtree_fork_choice.best_overall_slot().0,
+            heaviest_subtree_fork_choice.best_overall_slot(),
             // Should pick the smaller slot of the two new equally weighted leaves
-            new_leaf_slot7
+            new_leaf7
+        );
+        // Should update the `heaviest_slot_on_same_voted_fork` as well
+        assert_eq!(
+            heaviest_subtree_fork_choice
+                .heaviest_slot_on_same_voted_fork(&tower)
+                .unwrap(),
+            new_leaf7
         );
     }
 
-    #[test]
-    fn test_mark_valid_invalid_forks_duplicate() {
+    fn setup_mark_invalid_forks_duplicate_tests() -> (
+        HeaviestSubtreeForkChoice,
+        Vec<SlotHashKey>,
+        SlotHashKey,
+        Bank,
+        Vec<Pubkey>,
+    ) {
         let (
             mut heaviest_subtree_fork_choice,
             duplicate_leaves_descended_from_4,
@@ -2832,11 +3029,27 @@ mod test {
         // the other branch at slot 5
         let invalid_candidate = (4, Hash::default());
         heaviest_subtree_fork_choice.mark_fork_invalid_candidate(&invalid_candidate);
-
         assert_eq!(
             heaviest_subtree_fork_choice.best_overall_slot(),
             (2, Hash::default())
         );
+        (
+            heaviest_subtree_fork_choice,
+            duplicate_leaves_descended_from_4,
+            invalid_candidate,
+            bank,
+            vote_pubkeys,
+        )
+    }
+
+    #[test]
+    fn test_mark_invalid_then_valid_duplicate() {
+        let (
+            mut heaviest_subtree_fork_choice,
+            duplicate_leaves_descended_from_4,
+            invalid_candidate,
+            ..,
+        ) = setup_mark_invalid_forks_duplicate_tests();
 
         // Marking candidate as valid again will choose the the heaviest leaf of
         // the newly valid branch
@@ -2851,16 +3064,26 @@ mod test {
             heaviest_subtree_fork_choice.best_overall_slot(),
             duplicate_descendant
         );
+    }
 
-        // Mark the current heaviest branch as invalid again
-        heaviest_subtree_fork_choice.mark_fork_invalid_candidate(&invalid_candidate);
+    #[test]
+    fn test_mark_invalid_then_add_new_heavier_duplicate_slot() {
+        let (
+            mut heaviest_subtree_fork_choice,
+            duplicate_leaves_descended_from_4,
+            _invalid_candidate,
+            bank,
+            vote_pubkeys,
+        ) = setup_mark_invalid_forks_duplicate_tests();
 
         // If we add a new version of the duplicate slot that is not descended from the invalid
         // candidate and votes for that duplicate slot, the new duplicate slot should be picked
         // once it has more weight
         let new_duplicate_hash = Hash::default();
+
         // The hash has to be smaller in order for the votes to be counted
         assert!(new_duplicate_hash < duplicate_leaves_descended_from_4[0].1);
+        let duplicate_slot = duplicate_leaves_descended_from_4[0].0;
         let new_duplicate = (duplicate_slot, new_duplicate_hash);
         heaviest_subtree_fork_choice.add_new_leaf_slot(new_duplicate, Some((3, Hash::default())));
 
@@ -2881,6 +3104,285 @@ mod test {
         );
     }
 
+    #[test]
+    fn test_mark_valid_then_descendant_invalid() {
+        let forks = tr(0) / (tr(1) / (tr(2) / (tr(3) / (tr(4) / (tr(5) / tr(6))))));
+        let mut heaviest_subtree_fork_choice = HeaviestSubtreeForkChoice::new_from_tree(forks);
+        let duplicate_confirmed_slot: Slot = 1;
+        let duplicate_confirmed_key = duplicate_confirmed_slot.slot_hash();
+        heaviest_subtree_fork_choice.mark_fork_valid_candidate(&duplicate_confirmed_key);
+
+        for slot_hash_key in heaviest_subtree_fork_choice.fork_infos.keys() {
+            let slot = slot_hash_key.0;
+            if slot <= duplicate_confirmed_slot {
+                assert!(heaviest_subtree_fork_choice
+                    .is_duplicate_confirmed(slot_hash_key)
+                    .unwrap());
+            } else {
+                assert!(!heaviest_subtree_fork_choice
+                    .is_duplicate_confirmed(slot_hash_key)
+                    .unwrap());
+            }
+            assert!(heaviest_subtree_fork_choice
+                .latest_invalid_ancestor(slot_hash_key)
+                .is_none());
+        }
+
+        // Mark a later descendant invalid
+        let invalid_descendant_slot = 5;
+        let invalid_descendant_key = invalid_descendant_slot.slot_hash();
+        heaviest_subtree_fork_choice.mark_fork_invalid_candidate(&invalid_descendant_key);
+        for slot_hash_key in heaviest_subtree_fork_choice.fork_infos.keys() {
+            let slot = slot_hash_key.0;
+            if slot <= duplicate_confirmed_slot {
+                // All ancestors of the duplicate confirmed slot should:
+                // 1) Be duplicate confirmed
+                // 2) Have no invalid ancestors
+                assert!(heaviest_subtree_fork_choice
+                    .is_duplicate_confirmed(slot_hash_key)
+                    .unwrap());
+                assert!(heaviest_subtree_fork_choice
+                    .latest_invalid_ancestor(slot_hash_key)
+                    .is_none());
+            } else if slot >= invalid_descendant_slot {
+                // Anything descended from the invalid slot should:
+                // 1) Not be duplicate confirmed
+                // 2) Should have an invalid ancestor == `invalid_descendant_slot`
+                assert!(!heaviest_subtree_fork_choice
+                    .is_duplicate_confirmed(slot_hash_key)
+                    .unwrap());
+                assert_eq!(
+                    heaviest_subtree_fork_choice
+                        .latest_invalid_ancestor(slot_hash_key)
+                        .unwrap(),
+                    invalid_descendant_slot
+                );
+            } else {
+                // Anything in between the duplicate confirmed slot and the invalid slot should:
+                // 1) Not be duplicate confirmed
+                // 2) Should not have an invalid ancestor
+                assert!(!heaviest_subtree_fork_choice
+                    .is_duplicate_confirmed(slot_hash_key)
+                    .unwrap());
+                assert!(heaviest_subtree_fork_choice
+                    .latest_invalid_ancestor(slot_hash_key)
+                    .is_none());
+            }
+        }
+
+        // Mark later descendant `d` duplicate confirmed where `duplicate_confirmed_slot < d < invalid_descendant_slot`.
+        let later_duplicate_confirmed_slot = 4;
+        assert!(
+            later_duplicate_confirmed_slot > duplicate_confirmed_slot
+                && later_duplicate_confirmed_slot < invalid_descendant_slot
+        );
+        let later_duplicate_confirmed_key = later_duplicate_confirmed_slot.slot_hash();
+        heaviest_subtree_fork_choice.mark_fork_valid_candidate(&later_duplicate_confirmed_key);
+
+        for slot_hash_key in heaviest_subtree_fork_choice.fork_infos.keys() {
+            let slot = slot_hash_key.0;
+            if slot <= later_duplicate_confirmed_slot {
+                // All ancestors of the later_duplicate_confirmed_slot should:
+                // 1) Be duplicate confirmed
+                // 2) Have no invalid ancestors
+                assert!(heaviest_subtree_fork_choice
+                    .is_duplicate_confirmed(slot_hash_key)
+                    .unwrap());
+                assert!(heaviest_subtree_fork_choice
+                    .latest_invalid_ancestor(slot_hash_key)
+                    .is_none());
+            } else if slot >= invalid_descendant_slot {
+                // Anything descended from the invalid slot should:
+                // 1) Not be duplicate confirmed
+                // 2) Should have an invalid ancestor == `invalid_descendant_slot`
+                assert!(!heaviest_subtree_fork_choice
+                    .is_duplicate_confirmed(slot_hash_key)
+                    .unwrap());
+                assert_eq!(
+                    heaviest_subtree_fork_choice
+                        .latest_invalid_ancestor(slot_hash_key)
+                        .unwrap(),
+                    invalid_descendant_slot
+                );
+            } else {
+                // Anything in between the duplicate confirmed slot and the invalid slot should:
+                // 1) Not be duplicate confirmed
+                // 2) Should not have an invalid ancestor
+                assert!(!heaviest_subtree_fork_choice
+                    .is_duplicate_confirmed(slot_hash_key)
+                    .unwrap());
+                assert!(heaviest_subtree_fork_choice
+                    .latest_invalid_ancestor(slot_hash_key)
+                    .is_none());
+            }
+        }
+
+        // Mark all slots duplicate confirmed
+        let last_duplicate_confirmed_slot = 6;
+        let last_duplicate_confirmed_key = last_duplicate_confirmed_slot.slot_hash();
+        heaviest_subtree_fork_choice.mark_fork_valid_candidate(&last_duplicate_confirmed_key);
+        for slot_hash_key in heaviest_subtree_fork_choice.fork_infos.keys() {
+            assert!(heaviest_subtree_fork_choice
+                .is_duplicate_confirmed(slot_hash_key)
+                .unwrap());
+            assert!(heaviest_subtree_fork_choice
+                .latest_invalid_ancestor(slot_hash_key)
+                .is_none());
+        }
+    }
+
+    #[test]
+    #[should_panic]
+    fn test_mark_valid_then_ancestor_invalid() {
+        let forks = tr(0) / (tr(1) / (tr(2) / (tr(3) / (tr(4) / (tr(5) / tr(6))))));
+        let mut heaviest_subtree_fork_choice = HeaviestSubtreeForkChoice::new_from_tree(forks);
+        let duplicate_confirmed_slot: Slot = 4;
+        let duplicate_confirmed_key = duplicate_confirmed_slot.slot_hash();
+        heaviest_subtree_fork_choice.mark_fork_valid_candidate(&duplicate_confirmed_key);
+
+        // Now mark an ancestor of this fork invalid, should panic since this ancestor
+        // was duplicate confirmed by its descendant 4 already
+        heaviest_subtree_fork_choice.mark_fork_invalid_candidate(&3.slot_hash());
+    }
+
+    fn setup_set_unconfirmed_and_confirmed_duplicate_slot_tests(
+        smaller_duplicate_slot: Slot,
+        larger_duplicate_slot: Slot,
+    ) -> HeaviestSubtreeForkChoice {
+        // Create simple fork 0 -> 1 -> 2 -> 3 -> 4 -> 5
+        let forks = tr(0) / (tr(1) / (tr(2) / (tr(3) / (tr(4) / tr(5)))));
+        let mut heaviest_subtree_fork_choice = HeaviestSubtreeForkChoice::new_from_tree(forks);
+
+        // Mark the slots as unconfirmed duplicates
+        heaviest_subtree_fork_choice
+            .mark_fork_invalid_candidate(&smaller_duplicate_slot.slot_hash());
+        heaviest_subtree_fork_choice
+            .mark_fork_invalid_candidate(&larger_duplicate_slot.slot_hash());
+
+        // Correctness checks
+        for slot_hash_key in heaviest_subtree_fork_choice.fork_infos.keys() {
+            let slot = slot_hash_key.0;
+            if slot < smaller_duplicate_slot {
+                assert!(heaviest_subtree_fork_choice
+                    .latest_invalid_ancestor(slot_hash_key)
+                    .is_none());
+            } else if slot < larger_duplicate_slot {
+                assert_eq!(
+                    heaviest_subtree_fork_choice
+                        .latest_invalid_ancestor(slot_hash_key)
+                        .unwrap(),
+                    smaller_duplicate_slot
+                );
+            } else {
+                assert_eq!(
+                    heaviest_subtree_fork_choice
+                        .latest_invalid_ancestor(slot_hash_key)
+                        .unwrap(),
+                    larger_duplicate_slot
+                );
+            }
+        }
+
+        heaviest_subtree_fork_choice
+    }
+
+    #[test]
+    fn test_set_unconfirmed_duplicate_confirm_smaller_slot_first() {
+        let smaller_duplicate_slot = 1;
+        let larger_duplicate_slot = 4;
+        let mut heaviest_subtree_fork_choice =
+            setup_set_unconfirmed_and_confirmed_duplicate_slot_tests(
+                smaller_duplicate_slot,
+                larger_duplicate_slot,
+            );
+
+        // Mark the smaller duplicate slot as confirmed
+        heaviest_subtree_fork_choice.mark_fork_valid_candidate(&smaller_duplicate_slot.slot_hash());
+        for slot_hash_key in heaviest_subtree_fork_choice.fork_infos.keys() {
+            let slot = slot_hash_key.0;
+            if slot < larger_duplicate_slot {
+                // Only slots <= smaller_duplicate_slot have been duplicate confirmed
+                if slot <= smaller_duplicate_slot {
+                    assert!(heaviest_subtree_fork_choice
+                        .is_duplicate_confirmed(slot_hash_key)
+                        .unwrap());
+                } else {
+                    assert!(!heaviest_subtree_fork_choice
+                        .is_duplicate_confirmed(slot_hash_key)
+                        .unwrap());
+                }
+                // The unconfirmed duplicate flag has been cleared on the smaller
+                // descendants because their most recent duplicate ancestor has
+                // been confirmed
+                assert!(heaviest_subtree_fork_choice
+                    .latest_invalid_ancestor(slot_hash_key)
+                    .is_none());
+            } else {
+                assert!(!heaviest_subtree_fork_choice
+                    .is_duplicate_confirmed(slot_hash_key)
+                    .unwrap(),);
+                // The unconfirmed duplicate flag has not been cleared on the smaller
+                // descendants because their most recent duplicate ancestor,
+                // `larger_duplicate_slot` has  not yet been confirmed
+                assert_eq!(
+                    heaviest_subtree_fork_choice
+                        .latest_invalid_ancestor(slot_hash_key)
+                        .unwrap(),
+                    larger_duplicate_slot
+                );
+            }
+        }
+
+        // Mark the larger duplicate slot as confirmed, all slots should no longer
+        // have any unconfirmed duplicate ancestors, and should be marked as duplciate confirmed
+        heaviest_subtree_fork_choice.mark_fork_valid_candidate(&larger_duplicate_slot.slot_hash());
+        for slot_hash_key in heaviest_subtree_fork_choice.fork_infos.keys() {
+            let slot = slot_hash_key.0;
+            // All slots <= the latest duplciate confirmed slot are ancestors of
+            // that slot, so they should all be marked duplicate confirmed
+            assert_eq!(
+                heaviest_subtree_fork_choice
+                    .is_duplicate_confirmed(slot_hash_key)
+                    .unwrap(),
+                slot <= larger_duplicate_slot
+            );
+            assert!(heaviest_subtree_fork_choice
+                .latest_invalid_ancestor(slot_hash_key)
+                .is_none());
+        }
+    }
+
+    #[test]
+    fn test_set_unconfirmed_duplicate_confirm_larger_slot_first() {
+        let smaller_duplicate_slot = 1;
+        let larger_duplicate_slot = 4;
+        let mut heaviest_subtree_fork_choice =
+            setup_set_unconfirmed_and_confirmed_duplicate_slot_tests(
+                smaller_duplicate_slot,
+                larger_duplicate_slot,
+            );
+
+        // Mark the larger duplicate slot as confirmed
+        heaviest_subtree_fork_choice.mark_fork_valid_candidate(&larger_duplicate_slot.slot_hash());
+
+        // All slots should no longer have any unconfirmed duplicate ancestors
+        heaviest_subtree_fork_choice.mark_fork_valid_candidate(&smaller_duplicate_slot.slot_hash());
+        for slot_hash_key in heaviest_subtree_fork_choice.fork_infos.keys() {
+            let slot = slot_hash_key.0;
+            // All slots <= the latest duplciate confirmed slot are ancestors of
+            // that slot, so they should all be marked duplicate confirmed
+            assert_eq!(
+                heaviest_subtree_fork_choice
+                    .is_duplicate_confirmed(slot_hash_key)
+                    .unwrap(),
+                slot <= larger_duplicate_slot
+            );
+            assert!(heaviest_subtree_fork_choice
+                .latest_invalid_ancestor(slot_hash_key)
+                .is_none());
+        }
+    }
+
     fn setup_forks() -> HeaviestSubtreeForkChoice {
         /*
             Build fork structure:
diff --git a/core/src/ledger_cleanup_service.rs b/core/src/ledger_cleanup_service.rs
index 9d081b277f58f6..195601e873f698 100644
--- a/core/src/ledger_cleanup_service.rs
+++ b/core/src/ledger_cleanup_service.rs
@@ -187,7 +187,7 @@ impl LedgerCleanupService {
         *last_purge_slot = root;
 
         let (slots_to_clean, purge_first_slot, lowest_cleanup_slot, total_shreds) =
-            Self::find_slots_to_clean(&blockstore, root, max_ledger_shreds);
+            Self::find_slots_to_clean(blockstore, root, max_ledger_shreds);
 
         if slots_to_clean {
             let purge_complete = Arc::new(AtomicBool::new(false));
@@ -207,11 +207,25 @@ impl LedgerCleanupService {
                     );
 
                     let mut purge_time = Measure::start("purge_slots");
+
                     blockstore.purge_slots(
                         purge_first_slot,
                         lowest_cleanup_slot,
-                        PurgeType::PrimaryIndex,
+                        PurgeType::CompactionFilter,
                     );
+                    // Update only after purge operation.
+                    // Safety: This value can be used by compaction_filters shared via Arc<AtomicU64>.
+                    // Compactions are async and run as a multi-threaded background job. However, this
+                    // shouldn't cause consistency issues for iterators and getters because we have
+                    // already expired all affected keys (older than or equal to lowest_cleanup_slot)
+                    // by the above `purge_slots`. According to the general RocksDB design where SST
+                    // files are immutable, even running iterators aren't affected; the database grabs
+                    // a snapshot of the live set of sst files at iterator's creation.
+                    // Also, we passed the PurgeType::CompactionFilter, meaning no delete_range for
+                    // transaction_status and address_signatures CFs. These are fine because they
+                    // don't require strong consistent view for their operation.
+                    blockstore.set_max_expired_slot(lowest_cleanup_slot);
+
                     purge_time.stop();
                     info!("{}", purge_time);
 
diff --git a/core/src/lib.rs b/core/src/lib.rs
index 89c3aab3f708f5..88fa14dd07a125 100644
--- a/core/src/lib.rs
+++ b/core/src/lib.rs
@@ -9,10 +9,10 @@
 
 pub mod accounts_hash_verifier;
 pub mod banking_stage;
-pub mod bigtable_upload_service;
 pub mod broadcast_stage;
 pub mod cache_block_meta_service;
 pub mod cluster_info_vote_listener;
+pub mod cluster_nodes;
 pub mod cluster_slot_state_verifier;
 pub mod cluster_slots;
 pub mod cluster_slots_service;
@@ -28,8 +28,6 @@ pub mod ledger_cleanup_service;
 pub mod optimistic_confirmation_verifier;
 pub mod outstanding_requests;
 pub mod packet_hasher;
-pub mod poh_recorder;
-pub mod poh_service;
 pub mod progress_map;
 pub mod repair_response;
 pub mod repair_service;
@@ -40,11 +38,7 @@ pub mod request_response;
 mod result;
 pub mod retransmit_stage;
 pub mod rewards_recorder_service;
-pub mod rpc;
-pub mod rpc_health;
-pub mod rpc_service;
 pub mod sample_performance_service;
-pub mod send_transaction_service;
 pub mod serve_repair;
 pub mod serve_repair_service;
 pub mod shred_fetch_stage;
@@ -54,13 +48,13 @@ pub mod sigverify_stage;
 pub mod snapshot_packager_service;
 pub mod test_validator;
 pub mod tpu;
-pub mod transaction_status_service;
 pub mod tree_diff;
 pub mod tvu;
 pub mod unfrozen_gossip_verified_vote_hashes;
 pub mod validator;
 pub mod verified_vote_packets;
 pub mod vote_stake_tracker;
+pub mod voting_service;
 pub mod window_service;
 
 #[macro_use]
@@ -69,10 +63,6 @@ extern crate log;
 #[macro_use]
 extern crate serde_derive;
 
-#[cfg(test)]
-#[macro_use]
-extern crate serde_json;
-
 #[macro_use]
 extern crate solana_metrics;
 
diff --git a/core/src/optimistic_confirmation_verifier.rs b/core/src/optimistic_confirmation_verifier.rs
index 2f27bc2b785cb0..5e53abb342b2c3 100644
--- a/core/src/optimistic_confirmation_verifier.rs
+++ b/core/src/optimistic_confirmation_verifier.rs
@@ -36,7 +36,7 @@ impl OptimisticConfirmationVerifier {
             .into_iter()
             .filter(|(optimistic_slot, optimistic_hash)| {
                 (*optimistic_slot == root && *optimistic_hash != root_bank.hash())
-                    || (!root_ancestors.contains_key(&optimistic_slot) &&
+                    || (!root_ancestors.contains_key(optimistic_slot) &&
                     // In this second part of the `and`, we account for the possibility that
                     // there was some other root `rootX` set in BankForks where:
                     //
@@ -316,7 +316,7 @@ mod test {
             assert!(optimistic_confirmation_verifier.unchecked_slots.is_empty());
 
             // If we know set the root in blockstore, should return nothing
-            blockstore.set_roots(&[1, 3]).unwrap();
+            blockstore.set_roots(vec![1, 3].iter()).unwrap();
             optimistic_confirmation_verifier.add_new_optimistic_confirmed_slots(optimistic_slots);
             assert!(optimistic_confirmation_verifier
                 .verify_for_unrooted_optimistic_slots(&bank7, &blockstore)
diff --git a/core/src/progress_map.rs b/core/src/progress_map.rs
index af29f1fb5f0988..36348ca534090a 100644
--- a/core/src/progress_map.rs
+++ b/core/src/progress_map.rs
@@ -63,6 +63,16 @@ impl ReplaySlotStats {
             ("load_us", self.execute_timings.load_us, i64),
             ("execute_us", self.execute_timings.execute_us, i64),
             ("store_us", self.execute_timings.store_us, i64),
+            (
+                "total_batches_len",
+                self.execute_timings.total_batches_len,
+                i64
+            ),
+            (
+                "num_execute_batches",
+                self.execute_timings.num_execute_batches,
+                i64
+            ),
             (
                 "serialize_us",
                 self.execute_timings.details.serialize_us,
@@ -140,7 +150,6 @@ pub(crate) struct ForkProgress {
     pub(crate) propagated_stats: PropagatedStats,
     pub(crate) replay_stats: ReplaySlotStats,
     pub(crate) replay_progress: ConfirmationProgress,
-    pub(crate) duplicate_stats: DuplicateStats,
     // Note `num_blocks_on_fork` and `num_dropped_blocks_on_fork` only
     // count new blocks replayed since last restart, which won't include
     // blocks already existing in the ledger/before snapshot at start,
@@ -153,7 +162,6 @@ impl ForkProgress {
     pub fn new(
         last_entry: Hash,
         prev_leader_slot: Option<Slot>,
-        duplicate_stats: DuplicateStats,
         validator_stake_info: Option<ValidatorStakeInfo>,
         num_blocks_on_fork: u64,
         num_dropped_blocks_on_fork: u64,
@@ -187,7 +195,6 @@ impl ForkProgress {
             fork_stats: ForkStats::default(),
             replay_stats: ReplaySlotStats::default(),
             replay_progress: ConfirmationProgress::new(last_entry),
-            duplicate_stats,
             num_blocks_on_fork,
             num_dropped_blocks_on_fork,
             propagated_stats: PropagatedStats {
@@ -207,16 +214,14 @@ impl ForkProgress {
         my_pubkey: &Pubkey,
         voting_pubkey: &Pubkey,
         prev_leader_slot: Option<Slot>,
-        duplicate_stats: DuplicateStats,
         num_blocks_on_fork: u64,
         num_dropped_blocks_on_fork: u64,
     ) -> Self {
-        let validator_fork_info = {
+        let validator_stake_info = {
             if bank.collector_id() == my_pubkey {
-                let stake = bank.epoch_vote_account_stake(voting_pubkey);
                 Some(ValidatorStakeInfo::new(
                     *voting_pubkey,
-                    stake,
+                    bank.epoch_vote_account_stake(voting_pubkey),
                     bank.total_epoch_stake(),
                 ))
             } else {
@@ -227,20 +232,11 @@ impl ForkProgress {
         Self::new(
             bank.last_blockhash(),
             prev_leader_slot,
-            duplicate_stats,
-            validator_fork_info,
+            validator_stake_info,
             num_blocks_on_fork,
             num_dropped_blocks_on_fork,
         )
     }
-
-    pub fn is_duplicate_confirmed(&self) -> bool {
-        self.duplicate_stats.is_duplicate_confirmed
-    }
-
-    pub fn set_duplicate_confirmed(&mut self) {
-        self.duplicate_stats.set_duplicate_confirmed();
-    }
 }
 
 #[derive(Debug, Clone, Default)]
@@ -275,38 +271,6 @@ pub(crate) struct PropagatedStats {
     pub(crate) total_epoch_stake: u64,
 }
 
-#[derive(Clone, Default)]
-pub(crate) struct DuplicateStats {
-    latest_unconfirmed_duplicate_ancestor: Option<Slot>,
-    is_duplicate_confirmed: bool,
-}
-
-impl DuplicateStats {
-    pub fn new_with_unconfirmed_duplicate_ancestor(
-        latest_unconfirmed_duplicate_ancestor: Option<Slot>,
-    ) -> Self {
-        Self {
-            latest_unconfirmed_duplicate_ancestor,
-            is_duplicate_confirmed: false,
-        }
-    }
-
-    fn set_duplicate_confirmed(&mut self) {
-        self.is_duplicate_confirmed = true;
-        self.latest_unconfirmed_duplicate_ancestor = None;
-    }
-
-    fn update_with_newly_confirmed_duplicate_ancestor(&mut self, newly_confirmed_ancestor: Slot) {
-        if let Some(latest_unconfirmed_duplicate_ancestor) =
-            self.latest_unconfirmed_duplicate_ancestor
-        {
-            if latest_unconfirmed_duplicate_ancestor <= newly_confirmed_ancestor {
-                self.latest_unconfirmed_duplicate_ancestor = None;
-            }
-        }
-    }
-}
-
 impl PropagatedStats {
     pub fn add_vote_pubkey(&mut self, vote_pubkey: Pubkey, stake: u64) {
         if self.propagated_validators.insert(vote_pubkey) {
@@ -317,7 +281,7 @@ impl PropagatedStats {
     pub fn add_node_pubkey(&mut self, node_pubkey: &Pubkey, bank: &Bank) {
         if !self.propagated_node_ids.contains(node_pubkey) {
             let node_vote_accounts = bank
-                .epoch_vote_accounts_for_node_id(&node_pubkey)
+                .epoch_vote_accounts_for_node_id(node_pubkey)
                 .map(|v| &v.vote_accounts);
 
             if let Some(node_vote_accounts) = node_vote_accounts {
@@ -438,101 +402,6 @@ impl ProgressMap {
         }
     }
 
-    pub fn is_unconfirmed_duplicate(&self, slot: Slot) -> Option<bool> {
-        self.get(&slot).map(|p| {
-            p.duplicate_stats
-                .latest_unconfirmed_duplicate_ancestor
-                .map(|ancestor| ancestor == slot)
-                .unwrap_or(false)
-        })
-    }
-
-    pub fn latest_unconfirmed_duplicate_ancestor(&self, slot: Slot) -> Option<Slot> {
-        self.get(&slot)
-            .map(|p| p.duplicate_stats.latest_unconfirmed_duplicate_ancestor)
-            .unwrap_or(None)
-    }
-
-    pub fn set_unconfirmed_duplicate_slot(&mut self, slot: Slot, descendants: &HashSet<u64>) {
-        if let Some(fork_progress) = self.get_mut(&slot) {
-            if fork_progress.is_duplicate_confirmed() {
-                assert!(fork_progress
-                    .duplicate_stats
-                    .latest_unconfirmed_duplicate_ancestor
-                    .is_none());
-                return;
-            }
-
-            if fork_progress
-                .duplicate_stats
-                .latest_unconfirmed_duplicate_ancestor
-                == Some(slot)
-            {
-                // Already been marked
-                return;
-            }
-            fork_progress
-                .duplicate_stats
-                .latest_unconfirmed_duplicate_ancestor = Some(slot);
-
-            for d in descendants {
-                if let Some(fork_progress) = self.get_mut(&d) {
-                    fork_progress
-                        .duplicate_stats
-                        .latest_unconfirmed_duplicate_ancestor = Some(std::cmp::max(
-                        fork_progress
-                            .duplicate_stats
-                            .latest_unconfirmed_duplicate_ancestor
-                            .unwrap_or(0),
-                        slot,
-                    ));
-                }
-            }
-        }
-    }
-
-    pub fn set_confirmed_duplicate_slot(
-        &mut self,
-        slot: Slot,
-        ancestors: &HashSet<u64>,
-        descendants: &HashSet<u64>,
-    ) {
-        for a in ancestors {
-            if let Some(fork_progress) = self.get_mut(&a) {
-                fork_progress.set_duplicate_confirmed();
-            }
-        }
-
-        if let Some(slot_fork_progress) = self.get_mut(&slot) {
-            // Setting the fields here is nly correct and necessary if the loop above didn't
-            // already do this, so check with an assert.
-            assert!(!ancestors.contains(&slot));
-            let slot_had_unconfirmed_duplicate_ancestor = slot_fork_progress
-                .duplicate_stats
-                .latest_unconfirmed_duplicate_ancestor
-                .is_some();
-            slot_fork_progress.set_duplicate_confirmed();
-
-            if slot_had_unconfirmed_duplicate_ancestor {
-                for d in descendants {
-                    if let Some(descendant_fork_progress) = self.get_mut(&d) {
-                        descendant_fork_progress
-                            .duplicate_stats
-                            .update_with_newly_confirmed_duplicate_ancestor(slot);
-                    }
-                }
-            } else {
-                // Neither this slot `S`, nor earlier ancestors were marked as duplicate,
-                // so this means all descendants either:
-                // 1) Have no duplicate ancestors
-                // 2) Have a duplicate ancestor > `S`
-
-                // In both cases, there's no need to iterate through descendants because
-                // this confirmation on `S` is irrelevant to them.
-            }
-        }
-    }
-
     pub fn my_latest_landed_vote(&self, slot: Slot) -> Option<Slot> {
         self.progress_map
             .get(&slot)
@@ -550,12 +419,6 @@ impl ProgressMap {
             .map(|s| s.fork_stats.is_supermajority_confirmed)
     }
 
-    pub fn is_duplicate_confirmed(&self, slot: Slot) -> Option<bool> {
-        self.progress_map
-            .get(&slot)
-            .map(|s| s.is_duplicate_confirmed())
-    }
-
     pub fn get_bank_prev_leader_slot(&self, bank: &Bank) -> Option<Slot> {
         let parent_slot = bank.parent_slot();
         self.get_propagated_stats(parent_slot)
@@ -598,8 +461,6 @@ impl ProgressMap {
 #[cfg(test)]
 mod test {
     use super::*;
-    use crate::consensus::test::VoteSimulator;
-    use trees::tr;
 
     #[test]
     fn test_add_vote_pubkey() {
@@ -690,21 +551,13 @@ mod test {
     fn test_is_propagated_status_on_construction() {
         // If the given ValidatorStakeInfo == None, then this is not
         // a leader slot and is_propagated == false
-        let progress = ForkProgress::new(
-            Hash::default(),
-            Some(9),
-            DuplicateStats::default(),
-            None,
-            0,
-            0,
-        );
+        let progress = ForkProgress::new(Hash::default(), Some(9), None, 0, 0);
         assert!(!progress.propagated_stats.is_propagated);
 
         // If the stake is zero, then threshold is always achieved
         let progress = ForkProgress::new(
             Hash::default(),
             Some(9),
-            DuplicateStats::default(),
             Some(ValidatorStakeInfo {
                 total_epoch_stake: 0,
                 ..ValidatorStakeInfo::default()
@@ -719,7 +572,6 @@ mod test {
         let progress = ForkProgress::new(
             Hash::default(),
             Some(9),
-            DuplicateStats::default(),
             Some(ValidatorStakeInfo {
                 total_epoch_stake: 2,
                 ..ValidatorStakeInfo::default()
@@ -733,7 +585,6 @@ mod test {
         let progress = ForkProgress::new(
             Hash::default(),
             Some(9),
-            DuplicateStats::default(),
             Some(ValidatorStakeInfo {
                 stake: 1,
                 total_epoch_stake: 2,
@@ -750,7 +601,6 @@ mod test {
         let progress = ForkProgress::new(
             Hash::default(),
             Some(9),
-            DuplicateStats::default(),
             Some(ValidatorStakeInfo::default()),
             0,
             0,
@@ -764,23 +614,12 @@ mod test {
 
         // Insert new ForkProgress for slot 10 (not a leader slot) and its
         // previous leader slot 9 (leader slot)
-        progress_map.insert(
-            10,
-            ForkProgress::new(
-                Hash::default(),
-                Some(9),
-                DuplicateStats::default(),
-                None,
-                0,
-                0,
-            ),
-        );
+        progress_map.insert(10, ForkProgress::new(Hash::default(), Some(9), None, 0, 0));
         progress_map.insert(
             9,
             ForkProgress::new(
                 Hash::default(),
                 None,
-                DuplicateStats::default(),
                 Some(ValidatorStakeInfo::default()),
                 0,
                 0,
@@ -795,17 +634,7 @@ mod test {
         // The previous leader before 8, slot 7, does not exist in
         // progress map, so is_propagated(8) should return true as
         // this implies the parent is rooted
-        progress_map.insert(
-            8,
-            ForkProgress::new(
-                Hash::default(),
-                Some(7),
-                DuplicateStats::default(),
-                None,
-                0,
-                0,
-            ),
-        );
+        progress_map.insert(8, ForkProgress::new(Hash::default(), Some(7), None, 0, 0));
         assert!(progress_map.is_propagated(8));
 
         // If we set the is_propagated = true, is_propagated should return true
@@ -828,157 +657,4 @@ mod test {
             .is_leader_slot = true;
         assert!(!progress_map.is_propagated(10));
     }
-
-    fn setup_set_unconfirmed_and_confirmed_duplicate_slot_tests(
-        smaller_duplicate_slot: Slot,
-        larger_duplicate_slot: Slot,
-    ) -> (ProgressMap, RwLock<BankForks>) {
-        // Create simple fork 0 -> 1 -> 2 -> 3 -> 4 -> 5
-        let forks = tr(0) / (tr(1) / (tr(2) / (tr(3) / (tr(4) / tr(5)))));
-        let mut vote_simulator = VoteSimulator::new(1);
-        vote_simulator.fill_bank_forks(forks, &HashMap::new());
-        let VoteSimulator {
-            mut progress,
-            bank_forks,
-            ..
-        } = vote_simulator;
-        let descendants = bank_forks.read().unwrap().descendants().clone();
-
-        // Mark the slots as unconfirmed duplicates
-        progress.set_unconfirmed_duplicate_slot(
-            smaller_duplicate_slot,
-            &descendants.get(&smaller_duplicate_slot).unwrap(),
-        );
-        progress.set_unconfirmed_duplicate_slot(
-            larger_duplicate_slot,
-            &descendants.get(&larger_duplicate_slot).unwrap(),
-        );
-
-        // Correctness checks
-        for slot in bank_forks.read().unwrap().banks().keys() {
-            if *slot < smaller_duplicate_slot {
-                assert!(progress
-                    .latest_unconfirmed_duplicate_ancestor(*slot)
-                    .is_none());
-            } else if *slot < larger_duplicate_slot {
-                assert_eq!(
-                    progress
-                        .latest_unconfirmed_duplicate_ancestor(*slot)
-                        .unwrap(),
-                    smaller_duplicate_slot
-                );
-            } else {
-                assert_eq!(
-                    progress
-                        .latest_unconfirmed_duplicate_ancestor(*slot)
-                        .unwrap(),
-                    larger_duplicate_slot
-                );
-            }
-        }
-
-        (progress, bank_forks)
-    }
-
-    #[test]
-    fn test_set_unconfirmed_duplicate_confirm_smaller_slot_first() {
-        let smaller_duplicate_slot = 1;
-        let larger_duplicate_slot = 4;
-        let (mut progress, bank_forks) = setup_set_unconfirmed_and_confirmed_duplicate_slot_tests(
-            smaller_duplicate_slot,
-            larger_duplicate_slot,
-        );
-        let descendants = bank_forks.read().unwrap().descendants().clone();
-        let ancestors = bank_forks.read().unwrap().ancestors();
-
-        // Mark the smaller duplicate slot as confirmed
-        progress.set_confirmed_duplicate_slot(
-            smaller_duplicate_slot,
-            &ancestors.get(&smaller_duplicate_slot).unwrap(),
-            &descendants.get(&smaller_duplicate_slot).unwrap(),
-        );
-        for slot in bank_forks.read().unwrap().banks().keys() {
-            if *slot < larger_duplicate_slot {
-                // Only slots <= smaller_duplicate_slot have been duplicate confirmed
-                if *slot <= smaller_duplicate_slot {
-                    assert!(progress.is_duplicate_confirmed(*slot).unwrap());
-                } else {
-                    assert!(!progress.is_duplicate_confirmed(*slot).unwrap());
-                }
-                // The unconfirmed duplicate flag has been cleared on the smaller
-                // descendants because their most recent duplicate ancestor has
-                // been confirmed
-                assert!(progress
-                    .latest_unconfirmed_duplicate_ancestor(*slot)
-                    .is_none());
-            } else {
-                assert!(!progress.is_duplicate_confirmed(*slot).unwrap(),);
-                // The unconfirmed duplicate flag has not been cleared on the smaller
-                // descendants because their most recent duplicate ancestor,
-                // `larger_duplicate_slot` has  not yet been confirmed
-                assert_eq!(
-                    progress
-                        .latest_unconfirmed_duplicate_ancestor(*slot)
-                        .unwrap(),
-                    larger_duplicate_slot
-                );
-            }
-        }
-
-        // Mark the larger duplicate slot as confirmed, all slots should no longer
-        // have any unconfirmed duplicate ancestors, and should be marked as duplciate confirmed
-        progress.set_confirmed_duplicate_slot(
-            larger_duplicate_slot,
-            &ancestors.get(&larger_duplicate_slot).unwrap(),
-            &descendants.get(&larger_duplicate_slot).unwrap(),
-        );
-        for slot in bank_forks.read().unwrap().banks().keys() {
-            // All slots <= the latest duplciate confirmed slot are ancestors of
-            // that slot, so they should all be marked duplicate confirmed
-            assert_eq!(
-                progress.is_duplicate_confirmed(*slot).unwrap(),
-                *slot <= larger_duplicate_slot
-            );
-            assert!(progress
-                .latest_unconfirmed_duplicate_ancestor(*slot)
-                .is_none());
-        }
-    }
-
-    #[test]
-    fn test_set_unconfirmed_duplicate_confirm_larger_slot_first() {
-        let smaller_duplicate_slot = 1;
-        let larger_duplicate_slot = 4;
-        let (mut progress, bank_forks) = setup_set_unconfirmed_and_confirmed_duplicate_slot_tests(
-            smaller_duplicate_slot,
-            larger_duplicate_slot,
-        );
-        let descendants = bank_forks.read().unwrap().descendants().clone();
-        let ancestors = bank_forks.read().unwrap().ancestors();
-
-        // Mark the larger duplicate slot as confirmed
-        progress.set_confirmed_duplicate_slot(
-            larger_duplicate_slot,
-            &ancestors.get(&larger_duplicate_slot).unwrap(),
-            &descendants.get(&larger_duplicate_slot).unwrap(),
-        );
-
-        // All slots should no longer have any unconfirmed duplicate ancestors
-        progress.set_confirmed_duplicate_slot(
-            larger_duplicate_slot,
-            &ancestors.get(&larger_duplicate_slot).unwrap(),
-            &descendants.get(&larger_duplicate_slot).unwrap(),
-        );
-        for slot in bank_forks.read().unwrap().banks().keys() {
-            // All slots <= the latest duplciate confirmed slot are ancestors of
-            // that slot, so they should all be marked duplicate confirmed
-            assert_eq!(
-                progress.is_duplicate_confirmed(*slot).unwrap(),
-                *slot <= larger_duplicate_slot
-            );
-            assert!(progress
-                .latest_unconfirmed_duplicate_ancestor(*slot)
-                .is_none());
-        }
-    }
 }
diff --git a/core/src/repair_service.rs b/core/src/repair_service.rs
index 0bb96983bf2ae1..236499de38fdd5 100644
--- a/core/src/repair_service.rs
+++ b/core/src/repair_service.rs
@@ -5,20 +5,25 @@ use crate::{
     cluster_slots::ClusterSlots,
     outstanding_requests::OutstandingRequests,
     repair_weight::RepairWeight,
+    replay_stage::DUPLICATE_THRESHOLD,
     result::Result,
-    serve_repair::{RepairType, ServeRepair},
+    serve_repair::{RepairType, ServeRepair, REPAIR_PEERS_CACHE_CAPACITY},
 };
 use crossbeam_channel::{Receiver as CrossbeamReceiver, Sender as CrossbeamSender};
+use lru::LruCache;
 use solana_gossip::cluster_info::ClusterInfo;
 use solana_ledger::{
     blockstore::{Blockstore, SlotMeta},
     shred::Nonce,
 };
 use solana_measure::measure::Measure;
-use solana_runtime::{
-    bank::Bank, bank_forks::BankForks, commitment::VOTE_THRESHOLD_SIZE, contains::Contains,
+use solana_runtime::{bank::Bank, bank_forks::BankForks, contains::Contains};
+use solana_sdk::{
+    clock::{BankId, Slot},
+    epoch_schedule::EpochSchedule,
+    pubkey::Pubkey,
+    timing::timestamp,
 };
-use solana_sdk::{clock::Slot, epoch_schedule::EpochSchedule, pubkey::Pubkey, timing::timestamp};
 use std::{
     collections::{HashMap, HashSet},
     iter::Iterator,
@@ -33,6 +38,8 @@ use std::{
 
 pub type DuplicateSlotsResetSender = CrossbeamSender<Slot>;
 pub type DuplicateSlotsResetReceiver = CrossbeamReceiver<Slot>;
+pub type ConfirmedSlotsSender = CrossbeamSender<Vec<Slot>>;
+pub type ConfirmedSlotsReceiver = CrossbeamReceiver<Vec<Slot>>;
 
 pub type OutstandingRepairs = OutstandingRequests<RepairType>;
 
@@ -187,6 +194,7 @@ impl RepairService {
         let mut last_stats = Instant::now();
         let duplicate_slot_repair_statuses: HashMap<Slot, DuplicateSlotRepairStatus> =
             HashMap::new();
+        let mut peers_cache = LruCache::new(REPAIR_PEERS_CACHE_CAPACITY);
 
         loop {
             if exit.load(Ordering::Relaxed) {
@@ -223,7 +231,7 @@ impl RepairService {
 
                 add_votes_elapsed = Measure::start("add_votes");
                 repair_weight.add_votes(
-                    &blockstore,
+                    blockstore,
                     slot_to_vote_pubkeys.into_iter(),
                     root_bank.epoch_stakes_map(),
                     root_bank.epoch_schedule(),
@@ -266,14 +274,13 @@ impl RepairService {
                 )
             };
 
-            let mut cache = HashMap::new();
             let mut send_repairs_elapsed = Measure::start("send_repairs_elapsed");
             let mut outstanding_requests = outstanding_requests.write().unwrap();
             repairs.into_iter().for_each(|repair_request| {
                 if let Ok((to, req)) = serve_repair.repair_request(
-                    &cluster_slots,
+                    cluster_slots,
                     repair_request,
-                    &mut cache,
+                    &mut peers_cache,
                     &mut repair_stats,
                     &repair_info.repair_validators,
                     &mut outstanding_requests,
@@ -487,7 +494,7 @@ impl RepairService {
                 repair_validators,
             );
             if let Some((repair_pubkey, repair_addr)) = status.repair_pubkey_and_addr {
-                let repairs = Self::generate_duplicate_repairs_for_slot(&blockstore, *slot);
+                let repairs = Self::generate_duplicate_repairs_for_slot(blockstore, *slot);
 
                 if let Some(repairs) = repairs {
                     let mut outstanding_requests = outstanding_requests.write().unwrap();
@@ -529,7 +536,7 @@ impl RepairService {
         nonce: Nonce,
     ) -> Result<()> {
         let req =
-            serve_repair.map_repair_request(&repair_type, repair_pubkey, repair_stats, nonce)?;
+            serve_repair.map_repair_request(repair_type, repair_pubkey, repair_stats, nonce)?;
         repair_socket.send_to(&req, to)?;
         Ok(())
     }
@@ -558,7 +565,7 @@ impl RepairService {
 
     #[allow(dead_code)]
     fn process_new_duplicate_slots(
-        new_duplicate_slots: &[Slot],
+        new_duplicate_slots: &[(Slot, BankId)],
         duplicate_slot_repair_statuses: &mut HashMap<Slot, DuplicateSlotRepairStatus>,
         cluster_slots: &ClusterSlots,
         root_bank: &Bank,
@@ -567,16 +574,16 @@ impl RepairService {
         duplicate_slots_reset_sender: &DuplicateSlotsResetSender,
         repair_validators: &Option<HashSet<Pubkey>>,
     ) {
-        for slot in new_duplicate_slots {
+        for (slot, bank_id) in new_duplicate_slots {
             warn!(
-                "Cluster completed slot: {}, dumping our current version and repairing",
+                "Cluster confirmed slot: {}, dumping our current version and repairing",
                 slot
             );
             // Clear the slot signatures from status cache for this slot
             root_bank.clear_slot_signatures(*slot);
 
             // Clear the accounts for this slot
-            root_bank.remove_unrooted_slot(*slot);
+            root_bank.remove_unrooted_slots(&[(*slot, *bank_id)]);
 
             // Clear the slot-related data in blockstore. This will:
             // 1) Clear old shreds allowing new ones to be inserted
@@ -641,7 +648,7 @@ impl RepairService {
                                 })
                                 .sum();
                             if total_completed_slot_stake as f64 / total_stake as f64
-                                > VOTE_THRESHOLD_SIZE
+                                > DUPLICATE_THRESHOLD
                             {
                                 Some(dead_slot)
                             } else {
@@ -669,17 +676,27 @@ impl RepairService {
 mod test {
     use super::*;
     use crossbeam_channel::unbounded;
-    use solana_gossip::cluster_info::Node;
+    use solana_gossip::{cluster_info::Node, contact_info::ContactInfo};
     use solana_ledger::blockstore::{
         make_chaining_slot_entries, make_many_slot_entries, make_slot_entries,
     };
     use solana_ledger::shred::max_ticks_per_n_shreds;
     use solana_ledger::{blockstore::Blockstore, get_tmp_ledger_path};
     use solana_runtime::genesis_utils::{self, GenesisConfigInfo, ValidatorVoteKeypairs};
+    use solana_sdk::signature::Keypair;
     use solana_sdk::signature::Signer;
+    use solana_streamer::socket::SocketAddrSpace;
     use solana_vote_program::vote_transaction;
     use std::collections::HashSet;
 
+    fn new_test_cluster_info(contact_info: ContactInfo) -> ClusterInfo {
+        ClusterInfo::new(
+            contact_info,
+            Arc::new(Keypair::new()),
+            SocketAddrSpace::Unspecified,
+        )
+    }
+
     #[test]
     pub fn test_repair_orphan() {
         let blockstore_path = get_tmp_ledger_path!();
@@ -971,7 +988,8 @@ mod test {
         let blockstore_path = get_tmp_ledger_path!();
         let blockstore = Blockstore::open(&blockstore_path).unwrap();
         let cluster_slots = ClusterSlots::default();
-        let serve_repair = ServeRepair::new_with_invalid_keypair(Node::new_localhost().info);
+        let serve_repair =
+            ServeRepair::new(Arc::new(new_test_cluster_info(Node::new_localhost().info)));
         let mut duplicate_slot_repair_statuses = HashMap::new();
         let dead_slot = 9;
         let receive_socket = &UdpSocket::bind("0.0.0.0:0").unwrap();
@@ -1053,13 +1071,11 @@ mod test {
             Pubkey::default(),
             UdpSocket::bind("0.0.0.0:0").unwrap().local_addr().unwrap(),
         ));
-        let cluster_info = Arc::new(ClusterInfo::new_with_invalid_keypair(
-            Node::new_localhost().info,
-        ));
+        let cluster_info = Arc::new(new_test_cluster_info(Node::new_localhost().info));
         let serve_repair = ServeRepair::new(cluster_info.clone());
         let valid_repair_peer = Node::new_localhost().info;
 
-        // Signal that this peer has completed the dead slot, and is thus
+        // Signal that this peer has confirmed the dead slot, and is thus
         // a valid target for repair
         let dead_slot = 9;
         let cluster_slots = ClusterSlots::default();
@@ -1115,7 +1131,8 @@ mod test {
         let blockstore_path = get_tmp_ledger_path!();
         let blockstore = Blockstore::open(&blockstore_path).unwrap();
         let cluster_slots = ClusterSlots::default();
-        let serve_repair = ServeRepair::new_with_invalid_keypair(Node::new_localhost().info);
+        let serve_repair =
+            ServeRepair::new(Arc::new(new_test_cluster_info(Node::new_localhost().info)));
         let mut duplicate_slot_repair_statuses = HashMap::new();
         let duplicate_slot = 9;
 
@@ -1138,6 +1155,7 @@ mod test {
         );
         let bank0 = Arc::new(Bank::new(&genesis_config));
         let bank9 = Bank::new_from_parent(&bank0, &Pubkey::default(), duplicate_slot);
+        let duplicate_bank_id = bank9.bank_id();
         let old_balance = bank9.get_balance(&keypairs.node_keypair.pubkey());
         bank9
             .transfer(10_000, &mint_keypair, &keypairs.node_keypair.pubkey())
@@ -1155,7 +1173,7 @@ mod test {
         assert!(bank9.get_signature_status(&vote_tx.signatures[0]).is_some());
 
         RepairService::process_new_duplicate_slots(
-            &[duplicate_slot],
+            &[(duplicate_slot, duplicate_bank_id)],
             &mut duplicate_slot_repair_statuses,
             &cluster_slots,
             &bank9,
diff --git a/core/src/repair_weight.rs b/core/src/repair_weight.rs
index 26cce442e1519a..fe080518a50369 100644
--- a/core/src/repair_weight.rs
+++ b/core/src/repair_weight.rs
@@ -495,7 +495,7 @@ impl RepairWeight {
         for ((slot, _), _) in all_slots {
             *self
                 .slot_to_tree
-                .get_mut(&slot)
+                .get_mut(slot)
                 .expect("Nodes in tree must exist in `self.slot_to_tree`") = root2;
         }
     }
@@ -521,9 +521,9 @@ impl RepairWeight {
     fn sort_by_stake_weight_slot(slot_stake_voted: &mut Vec<(Slot, u64)>) {
         slot_stake_voted.sort_by(|(slot, stake_voted), (slot_, stake_voted_)| {
             if stake_voted == stake_voted_ {
-                slot.cmp(&slot_)
+                slot.cmp(slot_)
             } else {
-                stake_voted.cmp(&stake_voted_).reverse()
+                stake_voted.cmp(stake_voted_).reverse()
             }
         });
     }
@@ -757,7 +757,7 @@ mod test {
         );
 
         for slot in &[8, 10, 11] {
-            assert_eq!(*repair_weight.slot_to_tree.get(&slot).unwrap(), 8);
+            assert_eq!(*repair_weight.slot_to_tree.get(slot).unwrap(), 8);
         }
         for slot in 0..=1 {
             assert_eq!(*repair_weight.slot_to_tree.get(&slot).unwrap(), 0);
@@ -772,7 +772,7 @@ mod test {
         );
 
         for slot in &[8, 10, 11] {
-            assert_eq!(*repair_weight.slot_to_tree.get(&slot).unwrap(), 0);
+            assert_eq!(*repair_weight.slot_to_tree.get(slot).unwrap(), 0);
         }
         assert_eq!(repair_weight.trees.len(), 1);
         assert!(repair_weight.trees.contains_key(&0));
@@ -1088,10 +1088,10 @@ mod test {
         let purged_slots = vec![0, 1, 2, 4, 8, 10];
         let mut expected_unrooted_len = 0;
         for purged_slot in &purged_slots {
-            assert!(!repair_weight.slot_to_tree.contains_key(&purged_slot));
-            assert!(!repair_weight.trees.contains_key(&purged_slot));
+            assert!(!repair_weight.slot_to_tree.contains_key(purged_slot));
+            assert!(!repair_weight.trees.contains_key(purged_slot));
             if *purged_slot > 3 {
-                assert!(repair_weight.unrooted_slots.contains(&purged_slot));
+                assert!(repair_weight.unrooted_slots.contains(purged_slot));
                 expected_unrooted_len += 1;
             }
         }
diff --git a/core/src/repair_weighted_traversal.rs b/core/src/repair_weighted_traversal.rs
index 534ef4841d16af..8b6cd0ceb4e8cc 100644
--- a/core/src/repair_weighted_traversal.rs
+++ b/core/src/repair_weighted_traversal.rs
@@ -101,7 +101,7 @@ pub fn get_best_repair_shreds<'a>(
                         let new_repairs = RepairService::generate_repairs_for_slot(
                             blockstore,
                             slot,
-                            &slot_meta,
+                            slot_meta,
                             max_repairs - repairs.len(),
                         );
                         repairs.extend(new_repairs);
diff --git a/core/src/replay_stage.rs b/core/src/replay_stage.rs
index 401434f2b29562..45cd78306c3846 100644
--- a/core/src/replay_stage.rs
+++ b/core/src/replay_stage.rs
@@ -8,6 +8,7 @@ use crate::{
     },
     cluster_slot_state_verifier::*,
     cluster_slots::ClusterSlots,
+    cluster_slots_service::ClusterSlotsUpdateSender,
     commitment_service::{AggregateCommitmentService, CommitmentAggregationData},
     consensus::{
         ComputedBankState, Stake, SwitchForkDecision, Tower, VotedStakes, SWITCH_FORK_THRESHOLD,
@@ -15,12 +16,12 @@ use crate::{
     fork_choice::{ForkChoice, SelectVoteAndResetForkResult},
     heaviest_subtree_fork_choice::HeaviestSubtreeForkChoice,
     latest_validator_votes_for_frozen_banks::LatestValidatorVotesForFrozenBanks,
-    poh_recorder::{PohRecorder, GRACE_TICKS_FACTOR, MAX_GRACE_SLOTS},
-    progress_map::{DuplicateStats, ForkProgress, ProgressMap, PropagatedStats},
+    progress_map::{ForkProgress, ProgressMap, PropagatedStats},
     repair_service::DuplicateSlotsResetReceiver,
     result::Result,
     rewards_recorder_service::RewardsRecorderSender,
     unfrozen_gossip_verified_vote_hashes::UnfrozenGossipVerifiedVoteHashes,
+    voting_service::VoteOp,
     window_service::DuplicateSlotReceiver,
 };
 use solana_client::rpc_response::SlotUpdate;
@@ -34,6 +35,7 @@ use solana_ledger::{
 };
 use solana_measure::measure::Measure;
 use solana_metrics::inc_new_counter_info;
+use solana_poh::poh_recorder::{PohRecorder, GRACE_TICKS_FACTOR, MAX_GRACE_SLOTS};
 use solana_rpc::{
     optimistically_confirmed_bank_tracker::{BankNotification, BankNotificationSender},
     rpc_subscriptions::RpcSubscriptions,
@@ -137,6 +139,10 @@ pub struct ReplayTiming {
     start_leader_elapsed: u64,
     reset_bank_elapsed: u64,
     voting_elapsed: u64,
+    vote_push_us: u64,
+    vote_send_us: u64,
+    generate_vote_us: u64,
+    update_commitment_cache_us: u64,
     select_forks_elapsed: u64,
     compute_slot_stats_elapsed: u64,
     generate_new_bank_forks_elapsed: u64,
@@ -190,6 +196,17 @@ impl ReplayTiming {
         let now = timestamp();
         let elapsed_ms = now - self.last_print;
         if elapsed_ms > 1000 {
+            datapoint_info!(
+                "replay-loop-voting-stats",
+                ("vote_push_us", self.vote_push_us, i64),
+                ("vote_send_us", self.vote_send_us, i64),
+                ("generate_vote_us", self.generate_vote_us, i64),
+                (
+                    "update_commitment_cache_us",
+                    self.update_commitment_cache_us,
+                    i64
+                ),
+            );
             datapoint_info!(
                 "replay-loop-timing-stats",
                 ("total_elapsed_us", elapsed_ms * 1000, i64),
@@ -292,6 +309,8 @@ impl ReplayStage {
         replay_vote_sender: ReplayVoteSender,
         gossip_duplicate_confirmed_slots_receiver: GossipDuplicateConfirmedSlotsReceiver,
         gossip_verified_vote_hash_receiver: GossipVerifiedVoteHashReceiver,
+        cluster_slots_update_sender: ClusterSlotsUpdateSender,
+        voting_sender: Sender<VoteOp>,
     ) -> Self {
         let ReplayStageConfig {
             my_pubkey,
@@ -337,9 +356,10 @@ impl ReplayStage {
                 let mut partition_exists = false;
                 let mut skipped_slots_info = SkippedSlotsInfo::default();
                 let mut replay_timing = ReplayTiming::default();
-                let mut gossip_duplicate_confirmed_slots: GossipDuplicateConfirmedSlots = GossipDuplicateConfirmedSlots::default();
-                let mut unfrozen_gossip_verified_vote_hashes: UnfrozenGossipVerifiedVoteHashes = UnfrozenGossipVerifiedVoteHashes::default();
-                let mut latest_validator_votes_for_frozen_banks: LatestValidatorVotesForFrozenBanks = LatestValidatorVotesForFrozenBanks::default();
+                let mut duplicate_slots_tracker = DuplicateSlotsTracker::default();
+                let mut gossip_duplicate_confirmed_slots = GossipDuplicateConfirmedSlots::default();
+                let mut unfrozen_gossip_verified_vote_hashes = UnfrozenGossipVerifiedVoteHashes::default();
+                let mut latest_validator_votes_for_frozen_banks = LatestValidatorVotesForFrozenBanks::default();
                 let mut voted_signatures = Vec::new();
                 let mut has_new_vote_been_rooted = !wait_for_vote_to_start_leader;
                 let mut last_vote_refresh_time = LastVoteRefreshTime {
@@ -382,11 +402,11 @@ impl ReplayStage {
                         &bank_notification_sender,
                         &rewards_recorder_sender,
                         &subscriptions,
+                        &mut duplicate_slots_tracker,
                         &gossip_duplicate_confirmed_slots,
-                        &ancestors,
-                        &descendants,
                         &mut unfrozen_gossip_verified_vote_hashes,
                         &mut latest_validator_votes_for_frozen_banks,
+                        &cluster_slots_update_sender,
                     );
                     replay_active_banks_time.stop();
 
@@ -408,12 +428,11 @@ impl ReplayStage {
                     let mut process_gossip_duplicate_confirmed_slots_time = Measure::start("process_gossip_duplicate_confirmed_slots");
                     Self::process_gossip_duplicate_confirmed_slots(
                         &gossip_duplicate_confirmed_slots_receiver,
+                        &mut duplicate_slots_tracker,
                         &mut gossip_duplicate_confirmed_slots,
                         &bank_forks,
                         &mut progress,
                         &mut heaviest_subtree_fork_choice,
-                        &ancestors,
-                        &descendants,
                     );
                     process_gossip_duplicate_confirmed_slots_time.stop();
 
@@ -437,10 +456,9 @@ impl ReplayStage {
                     if !tpu_has_bank {
                         Self::process_duplicate_slots(
                             &duplicate_slots_receiver,
+                            &mut duplicate_slots_tracker,
                             &gossip_duplicate_confirmed_slots,
                             &bank_forks,
-                            &ancestors,
-                            &descendants,
                             &mut progress,
                             &mut heaviest_subtree_fork_choice,
                         );
@@ -484,7 +502,7 @@ impl ReplayStage {
                             &bank_forks,
                         );
 
-                        Self::mark_slots_confirmed(&confirmed_forks, &bank_forks, &mut progress, &ancestors, &descendants, &mut heaviest_subtree_fork_choice);
+                        Self::mark_slots_confirmed(&confirmed_forks, &bank_forks, &mut progress, &mut duplicate_slots_tracker, &mut heaviest_subtree_fork_choice);
                     }
                     compute_slot_stats_time.stop();
 
@@ -495,7 +513,16 @@ impl ReplayStage {
 
                     if let Some(heaviest_bank_on_same_voted_fork) = heaviest_bank_on_same_voted_fork.as_ref() {
                         if let Some(my_latest_landed_vote) = progress.my_latest_landed_vote(heaviest_bank_on_same_voted_fork.slot()) {
-                            Self::refresh_last_vote(&mut tower, &cluster_info, heaviest_bank_on_same_voted_fork, &poh_recorder, my_latest_landed_vote, &vote_account, &authorized_voter_keypairs.read().unwrap(), &mut voted_signatures, has_new_vote_been_rooted, &mut last_vote_refresh_time);
+                            Self::refresh_last_vote(&mut tower, &cluster_info,
+                                                    heaviest_bank_on_same_voted_fork,
+                                                    my_latest_landed_vote,
+                                                    &vote_account,
+                                                    &authorized_voter_keypairs.read().unwrap(),
+                                                    &mut voted_signatures,
+                                                    has_new_vote_been_rooted, &mut
+                                                    last_vote_refresh_time,
+                                                    &voting_sender,
+                                                    );
                         }
                     }
 
@@ -513,6 +540,7 @@ impl ReplayStage {
                         &progress,
                         &mut tower,
                         &latest_validator_votes_for_frozen_banks,
+                        &heaviest_subtree_fork_choice,
                     );
                     select_vote_and_reset_forks_time.stop();
 
@@ -551,8 +579,7 @@ impl ReplayStage {
                         }
 
                         Self::handle_votable_bank(
-                            &vote_bank,
-                            &poh_recorder,
+                            vote_bank,
                             switch_fork_decision,
                             &bank_forks,
                             &mut tower,
@@ -569,10 +596,13 @@ impl ReplayStage {
                             &block_commitment_cache,
                             &mut heaviest_subtree_fork_choice,
                             &bank_notification_sender,
+                            &mut duplicate_slots_tracker,
                             &mut gossip_duplicate_confirmed_slots,
                             &mut unfrozen_gossip_verified_vote_hashes,
                             &mut voted_signatures,
                             &mut has_new_vote_been_rooted,
+                            &mut replay_timing,
+                            &voting_sender,
                         );
                     };
                     voting_time.stop();
@@ -741,12 +771,7 @@ impl ReplayStage {
             )
         };
 
-        Self::initialize_progress_and_fork_choice(
-            &root_bank,
-            frozen_banks,
-            &my_pubkey,
-            &vote_account,
-        )
+        Self::initialize_progress_and_fork_choice(&root_bank, frozen_banks, my_pubkey, vote_account)
     }
 
     pub(crate) fn initialize_progress_and_fork_choice(
@@ -762,20 +787,9 @@ impl ReplayStage {
         // Initialize progress map with any root banks
         for bank in &frozen_banks {
             let prev_leader_slot = progress.get_bank_prev_leader_slot(bank);
-            let duplicate_stats = DuplicateStats::new_with_unconfirmed_duplicate_ancestor(
-                progress.latest_unconfirmed_duplicate_ancestor(bank.parent_slot()),
-            );
             progress.insert(
                 bank.slot(),
-                ForkProgress::new_from_bank(
-                    bank,
-                    &my_pubkey,
-                    &vote_account,
-                    prev_leader_slot,
-                    duplicate_stats,
-                    0,
-                    0,
-                ),
+                ForkProgress::new_from_bank(bank, my_pubkey, vote_account, prev_leader_slot, 0, 0),
             );
         }
         let root = root_bank.slot();
@@ -841,12 +855,6 @@ impl ReplayStage {
             // Clear the duplicate banks from BankForks
             {
                 let mut w_bank_forks = bank_forks.write().unwrap();
-                // Purging should have already been taken care of by logic
-                // in repair_service, so make sure drop implementation doesn't
-                // run
-                if let Some(b) = w_bank_forks.get(*d) {
-                    b.skip_drop.store(true, Ordering::Relaxed)
-                }
                 w_bank_forks.remove(*d);
             }
         }
@@ -872,7 +880,7 @@ impl ReplayStage {
             .expect("must exist based on earlier check")
         {
             descendants
-                .get_mut(&a)
+                .get_mut(a)
                 .expect("If exists in ancestor map must exist in descendants map")
                 .retain(|d| *d != slot && !slot_descendants.contains(d));
         }
@@ -882,9 +890,9 @@ impl ReplayStage {
 
         // Purge all the descendants of this slot from both maps
         for descendant in slot_descendants {
-            ancestors.remove(&descendant).expect("must exist");
+            ancestors.remove(descendant).expect("must exist");
             descendants
-                .remove(&descendant)
+                .remove(descendant)
                 .expect("must exist based on earlier check");
         }
         descendants
@@ -898,12 +906,11 @@ impl ReplayStage {
     // for duplicate slot recovery.
     fn process_gossip_duplicate_confirmed_slots(
         gossip_duplicate_confirmed_slots_receiver: &GossipDuplicateConfirmedSlotsReceiver,
+        duplicate_slots_tracker: &mut DuplicateSlotsTracker,
         gossip_duplicate_confirmed_slots: &mut GossipDuplicateConfirmedSlots,
         bank_forks: &RwLock<BankForks>,
         progress: &mut ProgressMap,
         fork_choice: &mut HeaviestSubtreeForkChoice,
-        ancestors: &HashMap<Slot, HashSet<Slot>>,
-        descendants: &HashMap<Slot, HashSet<Slot>>,
     ) {
         let root = bank_forks.read().unwrap().root();
         for new_confirmed_slots in gossip_duplicate_confirmed_slots_receiver.try_iter() {
@@ -926,9 +933,8 @@ impl ReplayStage {
                         .unwrap()
                         .get(confirmed_slot)
                         .map(|b| b.hash()),
+                    duplicate_slots_tracker,
                     gossip_duplicate_confirmed_slots,
-                    ancestors,
-                    descendants,
                     progress,
                     fork_choice,
                     SlotStateUpdate::DuplicateConfirmed,
@@ -959,34 +965,32 @@ impl ReplayStage {
     // Checks for and handle forks with duplicate slots.
     fn process_duplicate_slots(
         duplicate_slots_receiver: &DuplicateSlotReceiver,
+        duplicate_slots_tracker: &mut DuplicateSlotsTracker,
         gossip_duplicate_confirmed_slots: &GossipDuplicateConfirmedSlots,
         bank_forks: &RwLock<BankForks>,
-        ancestors: &HashMap<Slot, HashSet<Slot>>,
-        descendants: &HashMap<Slot, HashSet<Slot>>,
         progress: &mut ProgressMap,
         fork_choice: &mut HeaviestSubtreeForkChoice,
     ) {
-        let duplicate_slots: Vec<Slot> = duplicate_slots_receiver.try_iter().collect();
+        let new_duplicate_slots: Vec<Slot> = duplicate_slots_receiver.try_iter().collect();
         let (root_slot, bank_hashes) = {
             let r_bank_forks = bank_forks.read().unwrap();
-            let bank_hashes: Vec<Option<Hash>> = duplicate_slots
+            let bank_hashes: Vec<Option<Hash>> = new_duplicate_slots
                 .iter()
-                .map(|slot| r_bank_forks.get(*slot).map(|bank| bank.hash()))
+                .map(|duplicate_slot| r_bank_forks.get(*duplicate_slot).map(|bank| bank.hash()))
                 .collect();
 
             (r_bank_forks.root(), bank_hashes)
         };
-
-        for (duplicate_slot, bank_hash) in duplicate_slots.into_iter().zip(bank_hashes.into_iter())
+        for (duplicate_slot, bank_hash) in
+            new_duplicate_slots.into_iter().zip(bank_hashes.into_iter())
         {
             // WindowService should only send the signal once per slot
             check_slot_agrees_with_cluster(
                 duplicate_slot,
                 root_slot,
                 bank_hash,
+                duplicate_slots_tracker,
                 gossip_duplicate_confirmed_slots,
-                ancestors,
-                descendants,
                 progress,
                 fork_choice,
                 SlotStateUpdate::Duplicate,
@@ -1135,7 +1139,8 @@ impl ReplayStage {
             );
 
             if !Self::check_propagation_for_start_leader(poh_slot, parent_slot, progress_map) {
-                let latest_unconfirmed_leader_slot = progress_map.get_latest_leader_slot(parent_slot).expect("In order for propagated check to fail, latest leader must exist in progress map");
+                let latest_unconfirmed_leader_slot = progress_map.get_latest_leader_slot(parent_slot)
+                    .expect("In order for propagated check to fail, latest leader must exist in progress map");
                 if poh_slot != skipped_slots_info.last_skipped_slot {
                     datapoint_info!(
                         "replay_stage-skip_leader_slot",
@@ -1150,15 +1155,21 @@ impl ReplayStage {
                     progress_map.log_propagated_stats(latest_unconfirmed_leader_slot, bank_forks);
                     skipped_slots_info.last_skipped_slot = poh_slot;
                 }
-                let bank = bank_forks.read().unwrap().get(latest_unconfirmed_leader_slot)
-                .expect("In order for propagated check to fail, latest leader must exist in progress map, and thus also in BankForks").clone();
+                let bank = bank_forks
+                    .read()
+                    .unwrap()
+                    .get(latest_unconfirmed_leader_slot)
+                    .expect(
+                        "In order for propagated check to fail, \
+                            latest leader must exist in progress map, and thus also in BankForks",
+                    )
+                    .clone();
 
                 // Signal retransmit
                 if Self::should_retransmit(poh_slot, &mut skipped_slots_info.last_retransmit_slot) {
                     datapoint_info!("replay_stage-retransmit", ("slot", bank.slot(), i64),);
-                    retransmit_slots_sender
-                        .send(vec![(bank.slot(), bank.clone())].into_iter().collect())
-                        .unwrap();
+                    let _ = retransmit_slots_sender
+                        .send(vec![(bank.slot(), bank.clone())].into_iter().collect());
                 }
                 return;
             }
@@ -1225,9 +1236,8 @@ impl ReplayStage {
         root: Slot,
         err: &BlockstoreProcessorError,
         subscriptions: &Arc<RpcSubscriptions>,
+        duplicate_slots_tracker: &mut DuplicateSlotsTracker,
         gossip_duplicate_confirmed_slots: &GossipDuplicateConfirmedSlots,
-        ancestors: &HashMap<Slot, HashSet<Slot>>,
-        descendants: &HashMap<Slot, HashSet<Slot>>,
         progress: &mut ProgressMap,
         heaviest_subtree_fork_choice: &mut HeaviestSubtreeForkChoice,
     ) {
@@ -1268,9 +1278,8 @@ impl ReplayStage {
             slot,
             root,
             Some(bank.hash()),
+            duplicate_slots_tracker,
             gossip_duplicate_confirmed_slots,
-            ancestors,
-            descendants,
             progress,
             heaviest_subtree_fork_choice,
             SlotStateUpdate::Dead,
@@ -1280,7 +1289,6 @@ impl ReplayStage {
     #[allow(clippy::too_many_arguments)]
     fn handle_votable_bank(
         bank: &Arc<Bank>,
-        poh_recorder: &Arc<Mutex<PohRecorder>>,
         switch_fork_decision: &SwitchForkDecision,
         bank_forks: &Arc<RwLock<BankForks>>,
         tower: &mut Tower,
@@ -1297,10 +1305,13 @@ impl ReplayStage {
         block_commitment_cache: &Arc<RwLock<BlockCommitmentCache>>,
         heaviest_subtree_fork_choice: &mut HeaviestSubtreeForkChoice,
         bank_notification_sender: &Option<BankNotificationSender>,
+        duplicate_slots_tracker: &mut DuplicateSlotsTracker,
         gossip_duplicate_confirmed_slots: &mut GossipDuplicateConfirmedSlots,
         unfrozen_gossip_verified_vote_hashes: &mut UnfrozenGossipVerifiedVoteHashes,
         vote_signatures: &mut Vec<Signature>,
         has_new_vote_been_rooted: &mut bool,
+        replay_timing: &mut ReplayTiming,
+        voting_sender: &Sender<VoteOp>,
     ) {
         if bank.is_empty() {
             inc_new_counter_info!("replay_stage-voted_empty_bank", 1);
@@ -1330,7 +1341,7 @@ impl ReplayStage {
             // get dropped.
             leader_schedule_cache.set_root(rooted_banks.last().unwrap());
             blockstore
-                .set_roots(&rooted_slots)
+                .set_roots(rooted_slots.iter())
                 .expect("Ledger set roots failed");
             let highest_confirmed_root = Some(
                 block_commitment_cache
@@ -1340,11 +1351,12 @@ impl ReplayStage {
             );
             Self::handle_new_root(
                 new_root,
-                &bank_forks,
+                bank_forks,
                 progress,
                 accounts_background_request_sender,
                 highest_confirmed_root,
                 heaviest_subtree_fork_choice,
+                duplicate_slots_tracker,
                 gossip_duplicate_confirmed_slots,
                 unfrozen_gossip_verified_vote_hashes,
                 has_new_vote_been_rooted,
@@ -1364,22 +1376,27 @@ impl ReplayStage {
             info!("new root {}", new_root);
         }
 
+        let mut update_commitment_cache_time = Measure::start("update_commitment_cache");
         Self::update_commitment_cache(
             bank.clone(),
             bank_forks.read().unwrap().root(),
             progress.get_fork_stats(bank.slot()).unwrap().total_stake,
             lockouts_sender,
         );
+        update_commitment_cache_time.stop();
+        replay_timing.update_commitment_cache_us += update_commitment_cache_time.as_us();
+
         Self::push_vote(
             cluster_info,
             bank,
-            poh_recorder,
             vote_account_pubkey,
             authorized_voter_keypairs,
             tower,
             switch_fork_decision,
             vote_signatures,
             *has_new_vote_been_rooted,
+            replay_timing,
+            voting_sender,
         );
     }
 
@@ -1445,7 +1462,7 @@ impl ReplayStage {
         let vote_ix = switch_fork_decision
             .to_vote_instruction(
                 vote,
-                &vote_account_pubkey,
+                vote_account_pubkey,
                 &authorized_voter_keypair.pubkey(),
             )
             .expect("Switch threshold failure should not lead to voting");
@@ -1473,13 +1490,13 @@ impl ReplayStage {
         tower: &mut Tower,
         cluster_info: &ClusterInfo,
         heaviest_bank_on_same_fork: &Bank,
-        poh_recorder: &Mutex<PohRecorder>,
         my_latest_landed_vote: Slot,
         vote_account_pubkey: &Pubkey,
         authorized_voter_keypairs: &[Arc<Keypair>],
         vote_signatures: &mut Vec<Signature>,
         has_new_vote_been_rooted: bool,
         last_vote_refresh_time: &mut LastVoteRefreshTime,
+        voting_sender: &Sender<VoteOp>,
     ) {
         let last_voted_slot = tower.last_voted_slot();
         if last_voted_slot.is_none() {
@@ -1493,7 +1510,12 @@ impl ReplayStage {
             && last_vote_refresh_time.last_print_time.elapsed().as_secs() >= 1
         {
             last_vote_refresh_time.last_print_time = Instant::now();
-            info!("Last landed vote for slot {} in bank {} is greater than the current last vote for slot: {} tracked by Tower", my_latest_landed_vote, heaviest_bank_on_same_fork.slot(), last_voted_slot);
+            info!(
+                "Last landed vote for slot {} in bank {} is greater than the current last vote for slot: {} tracked by Tower",
+                my_latest_landed_vote,
+                heaviest_bank_on_same_fork.slot(),
+                last_voted_slot
+            );
         }
         if my_latest_landed_vote >= last_voted_slot
             || heaviest_bank_on_same_fork
@@ -1531,26 +1553,30 @@ impl ReplayStage {
                 ("target_bank_slot", heaviest_bank_on_same_fork.slot(), i64),
                 ("target_bank_hash", hash_string, String),
             );
-            let _ = cluster_info.send_vote(
-                &vote_tx,
-                crate::banking_stage::next_leader_tpu(cluster_info, poh_recorder),
-            );
-            cluster_info.refresh_vote(vote_tx, last_voted_slot);
+            voting_sender
+                .send(VoteOp::RefreshVote {
+                    tx: vote_tx,
+                    last_voted_slot,
+                })
+                .unwrap_or_else(|err| warn!("Error: {:?}", err));
             last_vote_refresh_time.last_refresh_time = Instant::now();
         }
     }
 
+    #[allow(clippy::too_many_arguments)]
     fn push_vote(
         cluster_info: &ClusterInfo,
         bank: &Bank,
-        poh_recorder: &Mutex<PohRecorder>,
         vote_account_pubkey: &Pubkey,
         authorized_voter_keypairs: &[Arc<Keypair>],
         tower: &mut Tower,
         switch_fork_decision: &SwitchForkDecision,
         vote_signatures: &mut Vec<Signature>,
         has_new_vote_been_rooted: bool,
+        replay_timing: &mut ReplayTiming,
+        voting_sender: &Sender<VoteOp>,
     ) {
+        let mut generate_time = Measure::start("generate_vote");
         let vote_tx = Self::generate_vote_tx(
             &cluster_info.keypair,
             bank,
@@ -1561,13 +1587,18 @@ impl ReplayStage {
             vote_signatures,
             has_new_vote_been_rooted,
         );
+        generate_time.stop();
+        replay_timing.generate_vote_us += generate_time.as_us();
         if let Some(vote_tx) = vote_tx {
             tower.refresh_last_vote_tx_blockhash(vote_tx.message.recent_blockhash);
-            let _ = cluster_info.send_vote(
-                &vote_tx,
-                crate::banking_stage::next_leader_tpu(cluster_info, poh_recorder),
-            );
-            cluster_info.push_vote(&tower.tower_slots(), vote_tx);
+
+            let tower_slots = tower.tower_slots();
+            voting_sender
+                .send(VoteOp::PushVote {
+                    tx: vote_tx,
+                    tower_slots,
+                })
+                .unwrap_or_else(|err| warn!("Error: {:?}", err));
         }
     }
 
@@ -1592,9 +1623,9 @@ impl ReplayStage {
         leader_schedule_cache: &LeaderScheduleCache,
     ) {
         let next_leader_slot = leader_schedule_cache.next_leader_slot(
-            &my_pubkey,
+            my_pubkey,
             bank.slot(),
-            &bank,
+            bank,
             Some(blockstore),
             GRACE_TICKS_FACTOR * MAX_GRACE_SLOTS,
         );
@@ -1633,11 +1664,11 @@ impl ReplayStage {
         bank_notification_sender: &Option<BankNotificationSender>,
         rewards_recorder_sender: &Option<RewardsRecorderSender>,
         subscriptions: &Arc<RpcSubscriptions>,
+        duplicate_slots_tracker: &mut DuplicateSlotsTracker,
         gossip_duplicate_confirmed_slots: &GossipDuplicateConfirmedSlots,
-        ancestors: &HashMap<Slot, HashSet<Slot>>,
-        descendants: &HashMap<Slot, HashSet<Slot>>,
         unfrozen_gossip_verified_vote_hashes: &mut UnfrozenGossipVerifiedVoteHashes,
         latest_validator_votes_for_frozen_banks: &mut LatestValidatorVotesForFrozenBanks,
+        cluster_slots_update_sender: &ClusterSlotsUpdateSender,
     ) -> bool {
         let mut did_complete_bank = false;
         let mut tx_count = 0;
@@ -1665,21 +1696,15 @@ impl ReplayStage {
                 (num_blocks_on_fork, num_dropped_blocks_on_fork)
             };
 
-            // New children adopt the same latest duplicate ancestor as their parent.
-            let duplicate_stats = DuplicateStats::new_with_unconfirmed_duplicate_ancestor(
-                progress.latest_unconfirmed_duplicate_ancestor(bank.parent_slot()),
-            );
-
             // Insert a progress entry even for slots this node is the leader for, so that
             // 1) confirm_forks can report confirmation, 2) we can cache computations about
             // this bank in `select_forks()`
             let bank_progress = &mut progress.entry(bank.slot()).or_insert_with(|| {
                 ForkProgress::new_from_bank(
                     &bank,
-                    &my_pubkey,
+                    my_pubkey,
                     vote_account,
                     prev_leader_slot,
-                    duplicate_stats,
                     num_blocks_on_fork,
                     num_dropped_blocks_on_fork,
                 )
@@ -1688,7 +1713,7 @@ impl ReplayStage {
                 let root_slot = bank_forks.read().unwrap().root();
                 let replay_result = Self::replay_blockstore_into_bank(
                     &bank,
-                    &blockstore,
+                    blockstore,
                     bank_progress,
                     transaction_status_sender,
                     replay_vote_sender,
@@ -1704,9 +1729,8 @@ impl ReplayStage {
                             root_slot,
                             &err,
                             subscriptions,
+                            duplicate_slots_tracker,
                             gossip_duplicate_confirmed_slots,
-                            ancestors,
-                            descendants,
                             progress,
                             heaviest_subtree_fork_choice,
                         );
@@ -1725,12 +1749,16 @@ impl ReplayStage {
                 );
                 did_complete_bank = true;
                 info!("bank frozen: {}", bank.slot());
+                let _ = cluster_slots_update_sender.send(vec![*bank_slot]);
                 if let Some(transaction_status_sender) = transaction_status_sender {
                     transaction_status_sender.send_transaction_status_freeze_message(&bank);
                 }
                 bank.freeze();
                 let bank_hash = bank.hash();
                 assert_ne!(bank_hash, Hash::default());
+                // Needs to be updated before `check_slot_agrees_with_cluster()` so that
+                // any updates in `check_slot_agrees_with_cluster()` on fork choice take
+                // effect
                 heaviest_subtree_fork_choice.add_new_leaf_slot(
                     (bank.slot(), bank.hash()),
                     Some((bank.parent_slot(), bank.parent_hash())),
@@ -1739,9 +1767,8 @@ impl ReplayStage {
                     bank.slot(),
                     bank_forks.read().unwrap().root(),
                     Some(bank.hash()),
+                    duplicate_slots_tracker,
                     gossip_duplicate_confirmed_slots,
-                    ancestors,
-                    descendants,
                     progress,
                     heaviest_subtree_fork_choice,
                     SlotStateUpdate::Frozen,
@@ -1766,7 +1793,7 @@ impl ReplayStage {
                         );
                     }
                 }
-                Self::record_rewards(&bank, &rewards_recorder_sender);
+                Self::record_rewards(&bank, rewards_recorder_sender);
             } else {
                 trace!(
                     "bank {} not completed tick_height: {}, max_tick_height: {}",
@@ -1810,14 +1837,14 @@ impl ReplayStage {
                         my_vote_pubkey,
                         bank_slot,
                         bank.vote_accounts().into_iter(),
-                        &ancestors,
+                        ancestors,
                         |slot| progress.get_hash(slot),
                         latest_validator_votes_for_frozen_banks,
                     );
                     // Notify any listeners of the votes found in this newly computed
                     // bank
                     heaviest_subtree_fork_choice.compute_bank_stats(
-                        &bank,
+                        bank,
                         tower,
                         latest_validator_votes_for_frozen_banks,
                     );
@@ -1955,6 +1982,7 @@ impl ReplayStage {
         progress: &ProgressMap,
         tower: &mut Tower,
         latest_validator_votes_for_frozen_banks: &LatestValidatorVotesForFrozenBanks,
+        fork_choice: &HeaviestSubtreeForkChoice,
     ) -> SelectVoteAndResetForkResult {
         // Try to vote on the actual heaviest fork. If the heaviest bank is
         // locked out or fails the threshold check, the validator will:
@@ -1973,14 +2001,15 @@ impl ReplayStage {
         let selected_fork = {
             let switch_fork_decision = tower.check_switch_threshold(
                 heaviest_bank.slot(),
-                &ancestors,
-                &descendants,
-                &progress,
+                ancestors,
+                descendants,
+                progress,
                 heaviest_bank.total_epoch_stake(),
                 heaviest_bank
                     .epoch_vote_accounts(heaviest_bank.epoch())
                     .expect("Bank epoch vote accounts must contain entry for the bank's own epoch"),
                 latest_validator_votes_for_frozen_banks,
+                fork_choice,
             );
 
             match switch_fork_decision {
@@ -2220,7 +2249,7 @@ impl ReplayStage {
                 .contains(vote_pubkey);
             leader_propagated_stats.add_vote_pubkey(
                 *vote_pubkey,
-                leader_bank.epoch_vote_account_stake(&vote_pubkey),
+                leader_bank.epoch_vote_account_stake(vote_pubkey),
             );
             !exists
         });
@@ -2249,8 +2278,7 @@ impl ReplayStage {
         confirmed_forks: &[Slot],
         bank_forks: &RwLock<BankForks>,
         progress: &mut ProgressMap,
-        ancestors: &HashMap<Slot, HashSet<Slot>>,
-        descendants: &HashMap<Slot, HashSet<Slot>>,
+        duplicate_slots_tracker: &mut DuplicateSlotsTracker,
         fork_choice: &mut HeaviestSubtreeForkChoice,
     ) {
         let (root_slot, bank_hashes) = {
@@ -2265,19 +2293,18 @@ impl ReplayStage {
         for (slot, bank_hash) in confirmed_forks.iter().zip(bank_hashes.into_iter()) {
             // This case should be guaranteed as false by confirm_forks()
             if let Some(false) = progress.is_supermajority_confirmed(*slot) {
-                // Because supermajority confirmation will iterate through all ancestors/descendants
-                // in `check_slot_agrees_with_cluster`, only incur this cost if the slot wasn't already
+                // Because supermajority confirmation will iterate through and update the
+                // subtree in fork choice, only incur this cost if the slot wasn't already
                 // confirmed
                 progress.set_supermajority_confirmed_slot(*slot);
                 check_slot_agrees_with_cluster(
                     *slot,
                     root_slot,
                     bank_hash,
+                    duplicate_slots_tracker,
                     // Don't need to pass the gossip confirmed slots since `slot`
                     // is already marked as confirmed in progress
                     &BTreeMap::new(),
-                    ancestors,
-                    descendants,
                     progress,
                     fork_choice,
                     SlotStateUpdate::DuplicateConfirmed,
@@ -2328,6 +2355,7 @@ impl ReplayStage {
         accounts_background_request_sender: &AbsRequestSender,
         highest_confirmed_root: Option<Slot>,
         heaviest_subtree_fork_choice: &mut HeaviestSubtreeForkChoice,
+        duplicate_slots_tracker: &mut DuplicateSlotsTracker,
         gossip_duplicate_confirmed_slots: &mut GossipDuplicateConfirmedSlots,
         unfrozen_gossip_verified_vote_hashes: &mut UnfrozenGossipVerifiedVoteHashes,
         has_new_vote_been_rooted: &mut bool,
@@ -2353,6 +2381,10 @@ impl ReplayStage {
         }
         progress.handle_new_root(&r_bank_forks);
         heaviest_subtree_fork_choice.set_root((new_root, r_bank_forks.root_bank().hash()));
+        let mut slots_ge_root = duplicate_slots_tracker.split_off(&new_root);
+        // duplicate_slots_tracker now only contains entries >= `new_root`
+        std::mem::swap(duplicate_slots_tracker, &mut slots_ge_root);
+
         let mut slots_ge_root = gossip_duplicate_confirmed_slots.split_off(&new_root);
         // gossip_confirmed_slots now only contains entries >= `new_root`
         std::mem::swap(gossip_duplicate_confirmed_slots, &mut slots_ge_root);
@@ -2470,22 +2502,21 @@ impl ReplayStage {
 }
 
 #[cfg(test)]
-pub(crate) mod tests {
+mod tests {
     use super::*;
     use crate::{
         consensus::test::{initialize_state, VoteSimulator},
         consensus::Tower,
         progress_map::ValidatorStakeInfo,
         replay_stage::ReplayStage,
-        transaction_status_service::TransactionStatusService,
     };
     use crossbeam_channel::unbounded;
     use solana_gossip::{cluster_info::Node, crds::Cursor};
     use solana_ledger::{
         blockstore::make_slot_entries,
         blockstore::{entries_to_test_shreds, BlockstoreError},
-        blockstore_processor, create_new_tmp_ledger,
-        entry::{self, next_entry, Entry},
+        create_new_tmp_ledger,
+        entry::{self, Entry},
         genesis_utils::{create_genesis_config, create_genesis_config_with_leader},
         get_tmp_ledger_path,
         shred::{
@@ -2493,11 +2524,14 @@ pub(crate) mod tests {
             SIZE_OF_COMMON_SHRED_HEADER, SIZE_OF_DATA_SHRED_HEADER, SIZE_OF_DATA_SHRED_PAYLOAD,
         },
     };
-    use solana_rpc::optimistically_confirmed_bank_tracker::OptimisticallyConfirmedBank;
+    use solana_rpc::{
+        optimistically_confirmed_bank_tracker::OptimisticallyConfirmedBank,
+        rpc::create_test_transactions_and_populate_blockstore,
+    };
     use solana_runtime::{
         accounts_background_service::AbsRequestSender,
         commitment::BlockCommitment,
-        genesis_utils::{self, GenesisConfigInfo, ValidatorVoteKeypairs},
+        genesis_utils::{GenesisConfigInfo, ValidatorVoteKeypairs},
     };
     use solana_sdk::{
         clock::NUM_CONSECUTIVE_LEADER_SLOTS,
@@ -2506,25 +2540,27 @@ pub(crate) mod tests {
         instruction::InstructionError,
         packet::PACKET_DATA_SIZE,
         poh_config::PohConfig,
-        signature::{Keypair, Signature, Signer},
+        signature::{Keypair, Signer},
         system_transaction,
         transaction::TransactionError,
     };
+    use solana_streamer::socket::SocketAddrSpace;
     use solana_transaction_status::TransactionWithStatusMeta;
     use solana_vote_program::{
         vote_state::{VoteState, VoteStateVersions},
         vote_transaction,
     };
+    use std::sync::mpsc::channel;
     use std::{
         fs::remove_dir_all,
         iter,
         sync::{atomic::AtomicU64, Arc, RwLock},
     };
-    use trees::tr;
+    use trees::{tr, Tree};
 
     #[test]
     fn test_is_partition_detected() {
-        let VoteSimulator { bank_forks, .. } = setup_forks();
+        let (VoteSimulator { bank_forks, .. }, _) = setup_default_forks(1);
         let ancestors = bank_forks.read().unwrap().ancestors();
         // Last vote 1 is an ancestor of the heaviest slot 3, no partition
         assert!(!ReplayStage::is_partition_detected(&ancestors, 1, 3));
@@ -2541,8 +2577,8 @@ pub(crate) mod tests {
     struct ReplayBlockstoreComponents {
         blockstore: Arc<Blockstore>,
         validator_node_to_vote_keys: HashMap<Pubkey, Pubkey>,
-        validator_authorized_voter_keypairs: HashMap<Pubkey, ValidatorVoteKeypairs>,
-        my_vote_pubkey: Pubkey,
+        validator_keypairs: HashMap<Pubkey, ValidatorVoteKeypairs>,
+        my_pubkey: Pubkey,
         progress: ProgressMap,
         cluster_info: ClusterInfo,
         leader_schedule_cache: Arc<LeaderScheduleCache>,
@@ -2552,64 +2588,53 @@ pub(crate) mod tests {
         rpc_subscriptions: Arc<RpcSubscriptions>,
     }
 
-    fn replay_blockstore_components() -> ReplayBlockstoreComponents {
+    fn replay_blockstore_components(forks: Option<Tree<Slot>>) -> ReplayBlockstoreComponents {
         // Setup blockstore
-        let ledger_path = get_tmp_ledger_path!();
-        let blockstore = Arc::new(
-            Blockstore::open(&ledger_path).expect("Expected to be able to open database ledger"),
-        );
-        let validator_authorized_voter_keypairs: Vec<_> =
-            (0..20).map(|_| ValidatorVoteKeypairs::new_rand()).collect();
-
-        let validator_node_to_vote_keys: HashMap<Pubkey, Pubkey> =
-            validator_authorized_voter_keypairs
-                .iter()
-                .map(|v| (v.node_keypair.pubkey(), v.vote_keypair.pubkey()))
-                .collect();
-        let GenesisConfigInfo { genesis_config, .. } =
-            genesis_utils::create_genesis_config_with_vote_accounts(
-                10_000,
-                &validator_authorized_voter_keypairs,
-                vec![100; validator_authorized_voter_keypairs.len()],
-            );
+        let (vote_simulator, blockstore) =
+            setup_forks_from_tree(forks.unwrap_or_else(|| tr(0)), 20);
 
-        let bank0 = Bank::new(&genesis_config);
+        let VoteSimulator {
+            validator_keypairs,
+            progress,
+            bank_forks,
+            ..
+        } = vote_simulator;
 
-        // ProgressMap
-        let mut progress = ProgressMap::default();
-        progress.insert(
-            0,
-            ForkProgress::new_from_bank(
-                &bank0,
-                bank0.collector_id(),
-                &Pubkey::default(),
-                None,
-                DuplicateStats::default(),
-                0,
-                0,
-            ),
-        );
+        let blockstore = Arc::new(blockstore);
+        let bank_forks = Arc::new(bank_forks);
+        let validator_node_to_vote_keys: HashMap<Pubkey, Pubkey> = validator_keypairs
+            .iter()
+            .map(|(_, keypairs)| {
+                (
+                    keypairs.node_keypair.pubkey(),
+                    keypairs.vote_keypair.pubkey(),
+                )
+            })
+            .collect();
 
         // ClusterInfo
-        let my_keypairs = &validator_authorized_voter_keypairs[0];
+        let my_keypairs = validator_keypairs.values().next().unwrap();
         let my_pubkey = my_keypairs.node_keypair.pubkey();
         let cluster_info = ClusterInfo::new(
             Node::new_localhost_with_pubkey(&my_pubkey).info,
             Arc::new(Keypair::from_bytes(&my_keypairs.node_keypair.to_bytes()).unwrap()),
+            SocketAddrSpace::Unspecified,
         );
         assert_eq!(my_pubkey, cluster_info.id());
 
         // Leader schedule cache
-        let leader_schedule_cache = Arc::new(LeaderScheduleCache::new_from_bank(&bank0));
+        let root_bank = bank_forks.read().unwrap().root_bank();
+        let leader_schedule_cache = Arc::new(LeaderScheduleCache::new_from_bank(&root_bank));
 
         // PohRecorder
+        let working_bank = bank_forks.read().unwrap().working_bank();
         let poh_recorder = Mutex::new(
             PohRecorder::new(
-                bank0.tick_height(),
-                bank0.last_blockhash(),
-                bank0.slot(),
+                working_bank.tick_height(),
+                working_bank.last_blockhash(),
+                working_bank.slot(),
                 None,
-                bank0.ticks_per_slot(),
+                working_bank.ticks_per_slot(),
                 &Pubkey::default(),
                 &blockstore,
                 &leader_schedule_cache,
@@ -2619,14 +2644,11 @@ pub(crate) mod tests {
             .0,
         );
 
-        // BankForks
-        let bank_forks = Arc::new(RwLock::new(BankForks::new(bank0)));
-
         // Tower
         let my_vote_pubkey = my_keypairs.vote_keypair.pubkey();
         let tower = Tower::new_from_bankforks(
             &bank_forks.read().unwrap(),
-            &ledger_path,
+            blockstore.ledger_path(),
             &cluster_info.id(),
             &my_vote_pubkey,
         );
@@ -2642,17 +2664,11 @@ pub(crate) mod tests {
             optimistically_confirmed_bank,
         ));
 
-        let validator_authorized_voter_keypairs: HashMap<Pubkey, ValidatorVoteKeypairs> =
-            validator_authorized_voter_keypairs
-                .into_iter()
-                .map(|keys| (keys.vote_keypair.pubkey(), keys))
-                .collect();
-
         ReplayBlockstoreComponents {
             blockstore,
             validator_node_to_vote_keys,
-            validator_authorized_voter_keypairs,
-            my_vote_pubkey,
+            validator_keypairs,
+            my_pubkey,
             progress,
             cluster_info,
             leader_schedule_cache,
@@ -2673,7 +2689,7 @@ pub(crate) mod tests {
             leader_schedule_cache,
             rpc_subscriptions,
             ..
-        } = replay_blockstore_components();
+        } = replay_blockstore_components(None);
 
         // Insert a non-root bank so that the propagation logic will update this
         // bank
@@ -2688,10 +2704,9 @@ pub(crate) mod tests {
                 &bank1,
                 bank1.collector_id(),
                 validator_node_to_vote_keys
-                    .get(&bank1.collector_id())
+                    .get(bank1.collector_id())
                     .unwrap(),
                 Some(0),
-                DuplicateStats::default(),
                 0,
                 0,
             ),
@@ -2788,11 +2803,11 @@ pub(crate) mod tests {
 
         let mut progress = ProgressMap::default();
         for i in 0..=root {
-            progress.insert(
-                i,
-                ForkProgress::new(Hash::default(), None, DuplicateStats::default(), None, 0, 0),
-            );
+            progress.insert(i, ForkProgress::new(Hash::default(), None, None, 0, 0));
         }
+
+        let mut duplicate_slots_tracker: DuplicateSlotsTracker =
+            vec![root - 1, root, root + 1].into_iter().collect();
         let mut gossip_duplicate_confirmed_slots: GossipDuplicateConfirmedSlots =
             vec![root - 1, root, root + 1]
                 .into_iter()
@@ -2812,6 +2827,7 @@ pub(crate) mod tests {
             &AbsRequestSender::default(),
             None,
             &mut heaviest_subtree_fork_choice,
+            &mut duplicate_slots_tracker,
             &mut gossip_duplicate_confirmed_slots,
             &mut unfrozen_gossip_verified_vote_hashes,
             &mut true,
@@ -2821,6 +2837,10 @@ pub(crate) mod tests {
         assert_eq!(progress.len(), 1);
         assert!(progress.get(&root).is_some());
         // root - 1 is filtered out
+        assert_eq!(
+            duplicate_slots_tracker.into_iter().collect::<Vec<Slot>>(),
+            vec![root, root + 1]
+        );
         assert_eq!(
             gossip_duplicate_confirmed_slots
                 .keys()
@@ -2869,10 +2889,7 @@ pub(crate) mod tests {
         let mut heaviest_subtree_fork_choice = HeaviestSubtreeForkChoice::new((root, root_hash));
         let mut progress = ProgressMap::default();
         for i in 0..=root {
-            progress.insert(
-                i,
-                ForkProgress::new(Hash::default(), None, DuplicateStats::default(), None, 0, 0),
-            );
+            progress.insert(i, ForkProgress::new(Hash::default(), None, None, 0, 0));
         }
         ReplayStage::handle_new_root(
             root,
@@ -2881,6 +2898,7 @@ pub(crate) mod tests {
             &AbsRequestSender::default(),
             Some(confirmed_root),
             &mut heaviest_subtree_fork_choice,
+            &mut DuplicateSlotsTracker::default(),
             &mut GossipDuplicateConfirmedSlots::default(),
             &mut UnfrozenGossipVerifiedVoteHashes::default(),
             &mut true,
@@ -2943,7 +2961,7 @@ pub(crate) mod tests {
                 &bad_hash,
                 hashes_per_tick.saturating_sub(1),
                 vec![system_transaction::transfer(
-                    &genesis_keypair,
+                    genesis_keypair,
                     &keypair2.pubkey(),
                     2,
                     blockhash,
@@ -3060,8 +3078,7 @@ pub(crate) mod tests {
             let mut entries =
                 entry::create_ticks(bank.ticks_per_slot(), hashes_per_tick, blockhash);
             let last_entry_hash = entries.last().unwrap().hash;
-            let tx =
-                system_transaction::transfer(&genesis_keypair, &keypair.pubkey(), 2, blockhash);
+            let tx = system_transaction::transfer(genesis_keypair, &keypair.pubkey(), 2, blockhash);
             let trailing_entry = entry::next_entry(&last_entry_hash, 1, vec![tx]);
             entries.push(trailing_entry);
             entries_to_test_shreds(entries, slot, slot.saturating_sub(1), true, 0)
@@ -3127,9 +3144,9 @@ pub(crate) mod tests {
             let bank0 = bank_forks.working_bank();
             let mut progress = ProgressMap::default();
             let last_blockhash = bank0.last_blockhash();
-            let mut bank0_progress = progress.entry(bank0.slot()).or_insert_with(|| {
-                ForkProgress::new(last_blockhash, None, DuplicateStats::default(), None, 0, 0)
-            });
+            let mut bank0_progress = progress
+                .entry(bank0.slot())
+                .or_insert_with(|| ForkProgress::new(last_blockhash, None, None, 0, 0));
             let shreds = shred_to_insert(&mint_keypair, bank0.clone());
             blockstore.insert_shreds(shreds, None, false).unwrap();
             let block_commitment_cache = Arc::new(RwLock::new(BlockCommitmentCache::default()));
@@ -3141,7 +3158,7 @@ pub(crate) mod tests {
                 &mut bank0_progress,
                 None,
                 &replay_vote_sender,
-                &&VerifyRecyclers::default(),
+                &VerifyRecyclers::default(),
             );
 
             let subscriptions = Arc::new(RpcSubscriptions::new(
@@ -3157,9 +3174,8 @@ pub(crate) mod tests {
                     0,
                     err,
                     &subscriptions,
-                    &BTreeMap::new(),
-                    &HashMap::new(),
-                    &HashMap::new(),
+                    &mut DuplicateSlotsTracker::default(),
+                    &GossipDuplicateConfirmedSlots::default(),
                     &mut progress,
                     &mut HeaviestSubtreeForkChoice::new((0, Hash::default())),
                 );
@@ -3182,12 +3198,12 @@ pub(crate) mod tests {
     #[test]
     fn test_replay_commitment_cache() {
         fn leader_vote(vote_slot: Slot, bank: &Arc<Bank>, pubkey: &Pubkey) {
-            let mut leader_vote_account = bank.get_account(&pubkey).unwrap();
+            let mut leader_vote_account = bank.get_account(pubkey).unwrap();
             let mut vote_state = VoteState::from(&leader_vote_account).unwrap();
             vote_state.process_slot_vote_unchecked(vote_slot);
             let versioned = VoteStateVersions::new_current(vote_state);
             VoteState::to(&versioned, &mut leader_vote_account).unwrap();
-            bank.store_account(&pubkey, &leader_vote_account);
+            bank.store_account(pubkey, &leader_vote_account);
         }
 
         let leader_pubkey = solana_sdk::pubkey::new_rand();
@@ -3297,68 +3313,6 @@ pub(crate) mod tests {
         );
     }
 
-    pub fn create_test_transactions_and_populate_blockstore(
-        keypairs: Vec<&Keypair>,
-        previous_slot: Slot,
-        bank: Arc<Bank>,
-        blockstore: Arc<Blockstore>,
-        max_complete_transaction_status_slot: Arc<AtomicU64>,
-    ) -> Vec<Signature> {
-        let mint_keypair = keypairs[0];
-        let keypair1 = keypairs[1];
-        let keypair2 = keypairs[2];
-        let keypair3 = keypairs[3];
-        let slot = bank.slot();
-        let blockhash = bank.confirmed_last_blockhash().0;
-
-        // Generate transactions for processing
-        // Successful transaction
-        let success_tx =
-            system_transaction::transfer(&mint_keypair, &keypair1.pubkey(), 2, blockhash);
-        let success_signature = success_tx.signatures[0];
-        let entry_1 = next_entry(&blockhash, 1, vec![success_tx]);
-        // Failed transaction, InstructionError
-        let ix_error_tx =
-            system_transaction::transfer(&keypair2, &keypair3.pubkey(), 10, blockhash);
-        let ix_error_signature = ix_error_tx.signatures[0];
-        let entry_2 = next_entry(&entry_1.hash, 1, vec![ix_error_tx]);
-        // Failed transaction
-        let fail_tx =
-            system_transaction::transfer(&mint_keypair, &keypair2.pubkey(), 2, Hash::default());
-        let entry_3 = next_entry(&entry_2.hash, 1, vec![fail_tx]);
-        let mut entries = vec![entry_1, entry_2, entry_3];
-
-        let shreds = entries_to_test_shreds(entries.clone(), slot, previous_slot, true, 0);
-        blockstore.insert_shreds(shreds, None, false).unwrap();
-        blockstore.set_roots(&[slot]).unwrap();
-
-        let (transaction_status_sender, transaction_status_receiver) = unbounded();
-        let (replay_vote_sender, _replay_vote_receiver) = unbounded();
-        let transaction_status_service = TransactionStatusService::new(
-            transaction_status_receiver,
-            max_complete_transaction_status_slot,
-            blockstore,
-            &Arc::new(AtomicBool::new(false)),
-        );
-
-        // Check that process_entries successfully writes can_commit transactions statuses, and
-        // that they are matched properly by get_rooted_block
-        let _result = blockstore_processor::process_entries(
-            &bank,
-            &mut entries,
-            true,
-            Some(&TransactionStatusSender {
-                sender: transaction_status_sender,
-                enable_cpi_and_log_storage: false,
-            }),
-            Some(&replay_vote_sender),
-        );
-
-        transaction_status_service.join().unwrap();
-
-        vec![success_signature, ix_error_signature]
-    }
-
     #[test]
     fn test_write_persist_transaction_status() {
         let GenesisConfigInfo {
@@ -3490,14 +3444,7 @@ pub(crate) mod tests {
         bank_forks.write().unwrap().insert(bank1);
         progress.insert(
             1,
-            ForkProgress::new(
-                bank0.last_blockhash(),
-                None,
-                DuplicateStats::default(),
-                None,
-                0,
-                0,
-            ),
+            ForkProgress::new(bank0.last_blockhash(), None, None, 0, 0),
         );
         let ancestors = bank_forks.read().unwrap().ancestors();
         let mut frozen_banks: Vec<_> = bank_forks
@@ -3793,7 +3740,7 @@ pub(crate) mod tests {
         success_index: usize,
     ) {
         let stake = 10_000;
-        let (bank_forks, _, _) = initialize_state(&all_keypairs, stake);
+        let (bank_forks, _, _) = initialize_state(all_keypairs, stake);
         let root_bank = bank_forks.root_bank();
         let mut propagated_stats = PropagatedStats {
             total_epoch_stake: stake * all_keypairs.len() as u64,
@@ -3924,7 +3871,6 @@ pub(crate) mod tests {
             ForkProgress::new(
                 Hash::default(),
                 Some(9),
-                DuplicateStats::default(),
                 Some(ValidatorStakeInfo {
                     total_epoch_stake,
                     ..ValidatorStakeInfo::default()
@@ -3938,7 +3884,6 @@ pub(crate) mod tests {
             ForkProgress::new(
                 Hash::default(),
                 Some(8),
-                DuplicateStats::default(),
                 Some(ValidatorStakeInfo {
                     total_epoch_stake,
                     ..ValidatorStakeInfo::default()
@@ -4021,7 +3966,6 @@ pub(crate) mod tests {
                 ForkProgress::new(
                     Hash::default(),
                     Some(prev_leader_slot),
-                    DuplicateStats::default(),
                     {
                         if i % 2 == 0 {
                             Some(ValidatorStakeInfo {
@@ -4101,7 +4045,6 @@ pub(crate) mod tests {
             let mut fork_progress = ForkProgress::new(
                 Hash::default(),
                 Some(prev_leader_slot),
-                DuplicateStats::default(),
                 Some(ValidatorStakeInfo {
                     total_epoch_stake,
                     ..ValidatorStakeInfo::default()
@@ -4161,7 +4104,7 @@ pub(crate) mod tests {
         // should succeed
         progress_map.insert(
             parent_slot,
-            ForkProgress::new(Hash::default(), None, DuplicateStats::default(), None, 0, 0),
+            ForkProgress::new(Hash::default(), None, None, 0, 0),
         );
         assert!(ReplayStage::check_propagation_for_start_leader(
             poh_slot,
@@ -4177,7 +4120,6 @@ pub(crate) mod tests {
             ForkProgress::new(
                 Hash::default(),
                 None,
-                DuplicateStats::default(),
                 Some(ValidatorStakeInfo::default()),
                 0,
                 0,
@@ -4204,21 +4146,13 @@ pub(crate) mod tests {
         let previous_leader_slot = parent_slot - 1;
         progress_map.insert(
             parent_slot,
-            ForkProgress::new(
-                Hash::default(),
-                Some(previous_leader_slot),
-                DuplicateStats::default(),
-                None,
-                0,
-                0,
-            ),
+            ForkProgress::new(Hash::default(), Some(previous_leader_slot), None, 0, 0),
         );
         progress_map.insert(
             previous_leader_slot,
             ForkProgress::new(
                 Hash::default(),
                 None,
-                DuplicateStats::default(),
                 Some(ValidatorStakeInfo::default()),
                 0,
                 0,
@@ -4279,7 +4213,6 @@ pub(crate) mod tests {
             ForkProgress::new(
                 Hash::default(),
                 None,
-                DuplicateStats::default(),
                 Some(ValidatorStakeInfo::default()),
                 0,
                 0,
@@ -4315,7 +4248,6 @@ pub(crate) mod tests {
             ForkProgress::new(
                 Hash::default(),
                 None,
-                DuplicateStats::default(),
                 Some(ValidatorStakeInfo::default()),
                 0,
                 0,
@@ -4339,7 +4271,6 @@ pub(crate) mod tests {
             ForkProgress::new(
                 Hash::default(),
                 None,
-                DuplicateStats::default(),
                 Some(ValidatorStakeInfo::default()),
                 0,
                 0,
@@ -4354,11 +4285,12 @@ pub(crate) mod tests {
 
     #[test]
     fn test_purge_unconfirmed_duplicate_slot() {
+        let (vote_simulator, _) = setup_default_forks(2);
         let VoteSimulator {
             bank_forks,
             mut progress,
             ..
-        } = setup_forks();
+        } = vote_simulator;
         let mut descendants = bank_forks.read().unwrap().descendants().clone();
         let mut ancestors = bank_forks.read().unwrap().ancestors();
 
@@ -4418,7 +4350,7 @@ pub(crate) mod tests {
 
     #[test]
     fn test_purge_ancestors_descendants() {
-        let VoteSimulator { bank_forks, .. } = setup_forks();
+        let (VoteSimulator { bank_forks, .. }, _) = setup_default_forks(1);
 
         // Purge branch rooted at slot 2
         let mut descendants = bank_forks.read().unwrap().descendants().clone();
@@ -4443,7 +4375,7 @@ pub(crate) mod tests {
         ));
         assert!(check_map_eq(
             &descendants,
-            &bank_forks.read().unwrap().descendants()
+            bank_forks.read().unwrap().descendants()
         ));
 
         // Try to purge the root
@@ -4476,7 +4408,7 @@ pub(crate) mod tests {
             bank_forks,
             leader_schedule_cache,
             ..
-        } = replay_blockstore_components();
+        } = replay_blockstore_components(None);
 
         let root_bank = bank_forks.read().unwrap().root_bank();
         let my_pubkey = leader_schedule_cache
@@ -4582,26 +4514,24 @@ pub(crate) mod tests {
 
         // Record the vote for 4
         tower.record_bank_vote(
-            &bank_forks.read().unwrap().get(4).unwrap(),
+            bank_forks.read().unwrap().get(4).unwrap(),
             &Pubkey::default(),
         );
 
         // Mark 4 as duplicate, 3 should be the heaviest slot, but should not be votable
         // because of lockout
         blockstore.store_duplicate_slot(4, vec![], vec![]).unwrap();
-        let ancestors = bank_forks.read().unwrap().ancestors();
-        let descendants = bank_forks.read().unwrap().descendants().clone();
-        let mut gossip_duplicate_confirmed_slots = BTreeMap::new();
+        let mut duplicate_slots_tracker = DuplicateSlotsTracker::default();
+        let mut gossip_duplicate_confirmed_slots = GossipDuplicateConfirmedSlots::default();
         let bank4_hash = bank_forks.read().unwrap().get(4).unwrap().hash();
         assert_ne!(bank4_hash, Hash::default());
         check_slot_agrees_with_cluster(
             4,
             bank_forks.read().unwrap().root(),
             Some(bank4_hash),
+            &mut duplicate_slots_tracker,
             &gossip_duplicate_confirmed_slots,
-            &ancestors,
-            &descendants,
-            &mut progress,
+            &progress,
             &mut vote_simulator.heaviest_subtree_fork_choice,
             SlotStateUpdate::Duplicate,
         );
@@ -4618,18 +4548,15 @@ pub(crate) mod tests {
 
         // Now mark 2, an ancestor of 4, as duplicate
         blockstore.store_duplicate_slot(2, vec![], vec![]).unwrap();
-        let ancestors = bank_forks.read().unwrap().ancestors();
-        let descendants = bank_forks.read().unwrap().descendants().clone();
         let bank2_hash = bank_forks.read().unwrap().get(2).unwrap().hash();
         assert_ne!(bank2_hash, Hash::default());
         check_slot_agrees_with_cluster(
             2,
             bank_forks.read().unwrap().root(),
             Some(bank2_hash),
+            &mut duplicate_slots_tracker,
             &gossip_duplicate_confirmed_slots,
-            &ancestors,
-            &descendants,
-            &mut progress,
+            &progress,
             &mut vote_simulator.heaviest_subtree_fork_choice,
             SlotStateUpdate::Duplicate,
         );
@@ -4654,10 +4581,9 @@ pub(crate) mod tests {
             4,
             bank_forks.read().unwrap().root(),
             Some(bank4_hash),
+            &mut duplicate_slots_tracker,
             &gossip_duplicate_confirmed_slots,
-            &ancestors,
-            &descendants,
-            &mut progress,
+            &progress,
             &mut vote_simulator.heaviest_subtree_fork_choice,
             SlotStateUpdate::DuplicateConfirmed,
         );
@@ -4676,13 +4602,16 @@ pub(crate) mod tests {
 
     #[test]
     fn test_gossip_vote_doesnt_affect_fork_choice() {
-        let VoteSimulator {
-            bank_forks,
-            mut heaviest_subtree_fork_choice,
-            mut latest_validator_votes_for_frozen_banks,
-            vote_pubkeys,
-            ..
-        } = setup_forks();
+        let (
+            VoteSimulator {
+                bank_forks,
+                mut heaviest_subtree_fork_choice,
+                mut latest_validator_votes_for_frozen_banks,
+                vote_pubkeys,
+                ..
+            },
+            _,
+        ) = setup_default_forks(1);
 
         let vote_pubkey = vote_pubkeys[0];
         let mut unfrozen_gossip_verified_vote_hashes = UnfrozenGossipVerifiedVoteHashes::default();
@@ -4718,14 +4647,14 @@ pub(crate) mod tests {
     #[test]
     fn test_replay_stage_refresh_last_vote() {
         let ReplayBlockstoreComponents {
-            mut validator_authorized_voter_keypairs,
+            mut validator_keypairs,
             cluster_info,
             poh_recorder,
             bank_forks,
             mut tower,
-            my_vote_pubkey,
+            my_pubkey,
             ..
-        } = replay_blockstore_components();
+        } = replay_blockstore_components(None);
 
         let mut last_vote_refresh_time = LastVoteRefreshTime {
             last_refresh_time: Instant::now(),
@@ -4735,11 +4664,9 @@ pub(crate) mod tests {
         let mut voted_signatures = vec![];
 
         let my_vote_keypair = vec![Arc::new(
-            validator_authorized_voter_keypairs
-                .remove(&my_vote_pubkey)
-                .unwrap()
-                .vote_keypair,
+            validator_keypairs.remove(&my_pubkey).unwrap().vote_keypair,
         )];
+        let my_vote_pubkey = my_vote_keypair[0].pubkey();
         let bank0 = bank_forks.read().unwrap().get(0).unwrap().clone();
 
         fn fill_bank_with_ticks(bank: &Bank) {
@@ -4751,6 +4678,7 @@ pub(crate) mod tests {
                 }
             }
         }
+        let (voting_sender, voting_receiver) = channel();
 
         // Simulate landing a vote for slot 0 landing in slot 1
         let bank1 = Arc::new(Bank::new_from_parent(&bank0, &Pubkey::default(), 1));
@@ -4759,14 +4687,20 @@ pub(crate) mod tests {
         ReplayStage::push_vote(
             &cluster_info,
             &bank0,
-            &poh_recorder,
             &my_vote_pubkey,
             &my_vote_keypair,
             &mut tower,
             &SwitchForkDecision::SameFork,
             &mut voted_signatures,
             has_new_vote_been_rooted,
+            &mut ReplayTiming::default(),
+            &voting_sender,
         );
+        let vote_info = voting_receiver
+            .recv_timeout(Duration::from_secs(1))
+            .unwrap();
+        crate::voting_service::VotingService::handle_vote(&cluster_info, &poh_recorder, vote_info);
+
         let mut cursor = Cursor::default();
         let (_, votes) = cluster_info.get_votes(&mut cursor);
         assert_eq!(votes.len(), 1);
@@ -4787,13 +4721,13 @@ pub(crate) mod tests {
                 &mut tower,
                 &cluster_info,
                 refresh_bank,
-                &poh_recorder,
-                Tower::last_voted_slot_in_bank(&refresh_bank, &my_vote_pubkey).unwrap(),
+                Tower::last_voted_slot_in_bank(refresh_bank, &my_vote_pubkey).unwrap(),
                 &my_vote_pubkey,
                 &my_vote_keypair,
                 &mut voted_signatures,
                 has_new_vote_been_rooted,
                 &mut last_vote_refresh_time,
+                &voting_sender,
             );
 
             // No new votes have been submitted to gossip
@@ -4810,14 +4744,19 @@ pub(crate) mod tests {
         ReplayStage::push_vote(
             &cluster_info,
             &bank1,
-            &poh_recorder,
             &my_vote_pubkey,
             &my_vote_keypair,
             &mut tower,
             &SwitchForkDecision::SameFork,
             &mut voted_signatures,
             has_new_vote_been_rooted,
+            &mut ReplayTiming::default(),
+            &voting_sender,
         );
+        let vote_info = voting_receiver
+            .recv_timeout(Duration::from_secs(1))
+            .unwrap();
+        crate::voting_service::VotingService::handle_vote(&cluster_info, &poh_recorder, vote_info);
         let (_, votes) = cluster_info.get_votes(&mut cursor);
         assert_eq!(votes.len(), 1);
         let vote_tx = &votes[0];
@@ -4831,14 +4770,15 @@ pub(crate) mod tests {
             &mut tower,
             &cluster_info,
             &bank2,
-            &poh_recorder,
             Tower::last_voted_slot_in_bank(&bank2, &my_vote_pubkey).unwrap(),
             &my_vote_pubkey,
             &my_vote_keypair,
             &mut voted_signatures,
             has_new_vote_been_rooted,
             &mut last_vote_refresh_time,
+            &voting_sender,
         );
+
         // No new votes have been submitted to gossip
         let (_, votes) = cluster_info.get_votes(&mut cursor);
         assert!(votes.is_empty());
@@ -4867,14 +4807,19 @@ pub(crate) mod tests {
             &mut tower,
             &cluster_info,
             &expired_bank,
-            &poh_recorder,
             Tower::last_voted_slot_in_bank(&expired_bank, &my_vote_pubkey).unwrap(),
             &my_vote_pubkey,
             &my_vote_keypair,
             &mut voted_signatures,
             has_new_vote_been_rooted,
             &mut last_vote_refresh_time,
+            &voting_sender,
         );
+        let vote_info = voting_receiver
+            .recv_timeout(Duration::from_secs(1))
+            .unwrap();
+        crate::voting_service::VotingService::handle_vote(&cluster_info, &poh_recorder, vote_info);
+
         assert!(last_vote_refresh_time.last_refresh_time > clone_refresh_time);
         let (_, votes) = cluster_info.get_votes(&mut cursor);
         assert_eq!(votes.len(), 1);
@@ -4923,14 +4868,15 @@ pub(crate) mod tests {
             &mut tower,
             &cluster_info,
             &expired_bank_sibling,
-            &poh_recorder,
             Tower::last_voted_slot_in_bank(&expired_bank_sibling, &my_vote_pubkey).unwrap(),
             &my_vote_pubkey,
             &my_vote_keypair,
             &mut voted_signatures,
             has_new_vote_been_rooted,
             &mut last_vote_refresh_time,
+            &voting_sender,
         );
+
         let (_, votes) = cluster_info.get_votes(&mut cursor);
         assert!(votes.is_empty());
         assert_eq!(
@@ -4968,12 +4914,12 @@ pub(crate) mod tests {
             progress,
             &VoteTracker::default(),
             &ClusterSlots::default(),
-            &bank_forks,
+            bank_forks,
             heaviest_subtree_fork_choice,
             latest_validator_votes_for_frozen_banks,
         );
         let (heaviest_bank, heaviest_bank_on_same_fork) = heaviest_subtree_fork_choice
-            .select_forks(&frozen_banks, &tower, &progress, &ancestors, bank_forks);
+            .select_forks(&frozen_banks, tower, progress, ancestors, bank_forks);
         assert!(heaviest_bank_on_same_fork.is_none());
         let SelectVoteAndResetForkResult {
             vote_bank,
@@ -4982,11 +4928,12 @@ pub(crate) mod tests {
         } = ReplayStage::select_vote_and_reset_forks(
             &heaviest_bank,
             heaviest_bank_on_same_fork.as_ref(),
-            &ancestors,
-            &descendants,
+            ancestors,
+            descendants,
             progress,
             tower,
             latest_validator_votes_for_frozen_banks,
+            heaviest_subtree_fork_choice,
         );
         (
             vote_bank.map(|(b, _)| b.slot()),
@@ -4994,7 +4941,16 @@ pub(crate) mod tests {
         )
     }
 
-    fn setup_forks() -> VoteSimulator {
+    fn setup_forks_from_tree(tree: Tree<Slot>, num_keys: usize) -> (VoteSimulator, Blockstore) {
+        let mut vote_simulator = VoteSimulator::new(num_keys);
+        vote_simulator.fill_bank_forks(tree.clone(), &HashMap::new());
+        let ledger_path = get_tmp_ledger_path!();
+        let blockstore = Blockstore::open(&ledger_path).unwrap();
+        blockstore.add_tree(tree, false, true, 2, Hash::default());
+        (vote_simulator, blockstore)
+    }
+
+    fn setup_default_forks(num_keys: usize) -> (VoteSimulator, Blockstore) {
         /*
             Build fork structure:
 
@@ -5009,12 +4965,9 @@ pub(crate) mod tests {
                       |
                     slot 6
         */
-        let forks = tr(0) / (tr(1) / (tr(2) / (tr(4))) / (tr(3) / (tr(5) / (tr(6)))));
-
-        let mut vote_simulator = VoteSimulator::new(1);
-        vote_simulator.fill_bank_forks(forks, &HashMap::new());
 
-        vote_simulator
+        let tree = tr(0) / (tr(1) / (tr(2) / (tr(4))) / (tr(3) / (tr(5) / (tr(6)))));
+        setup_forks_from_tree(tree, num_keys)
     }
 
     fn check_map_eq<K: Eq + std::hash::Hash + std::fmt::Debug, T: PartialEq + std::fmt::Debug>(
diff --git a/core/src/result.rs b/core/src/result.rs
index 8dbce74de77ded..5fafca2ee1bed7 100644
--- a/core/src/result.rs
+++ b/core/src/result.rs
@@ -6,18 +6,18 @@ use solana_ledger::blockstore;
 #[derive(Debug)]
 pub enum Error {
     Io(std::io::Error),
-    RecvError(std::sync::mpsc::RecvError),
-    CrossbeamRecvTimeoutError(crossbeam_channel::RecvTimeoutError),
-    ReadyTimeoutError,
-    RecvTimeoutError(std::sync::mpsc::RecvTimeoutError),
-    CrossbeamSendError,
-    TryCrossbeamSendError,
+    Recv(std::sync::mpsc::RecvError),
+    CrossbeamRecvTimeout(crossbeam_channel::RecvTimeoutError),
+    ReadyTimeout,
+    RecvTimeout(std::sync::mpsc::RecvTimeoutError),
+    CrossbeamSend,
+    TryCrossbeamSend,
     Serialize(std::boxed::Box<bincode::ErrorKind>),
-    ClusterInfoError(cluster_info::ClusterInfoError),
-    SendError,
-    BlockstoreError(blockstore::BlockstoreError),
-    WeightedIndexError(rand::distributions::weighted::WeightedError),
-    GossipError(GossipError),
+    ClusterInfo(cluster_info::ClusterInfoError),
+    Send,
+    Blockstore(blockstore::BlockstoreError),
+    WeightedIndex(rand::distributions::weighted::WeightedError),
+    Gossip(GossipError),
 }
 
 pub type Result<T> = std::result::Result<T, Error>;
@@ -32,42 +32,42 @@ impl std::error::Error for Error {}
 
 impl std::convert::From<std::sync::mpsc::RecvError> for Error {
     fn from(e: std::sync::mpsc::RecvError) -> Error {
-        Error::RecvError(e)
+        Error::Recv(e)
     }
 }
 impl std::convert::From<crossbeam_channel::RecvTimeoutError> for Error {
     fn from(e: crossbeam_channel::RecvTimeoutError) -> Error {
-        Error::CrossbeamRecvTimeoutError(e)
+        Error::CrossbeamRecvTimeout(e)
     }
 }
 impl std::convert::From<crossbeam_channel::ReadyTimeoutError> for Error {
     fn from(_e: crossbeam_channel::ReadyTimeoutError) -> Error {
-        Error::ReadyTimeoutError
+        Error::ReadyTimeout
     }
 }
 impl std::convert::From<std::sync::mpsc::RecvTimeoutError> for Error {
     fn from(e: std::sync::mpsc::RecvTimeoutError) -> Error {
-        Error::RecvTimeoutError(e)
+        Error::RecvTimeout(e)
     }
 }
 impl std::convert::From<cluster_info::ClusterInfoError> for Error {
     fn from(e: cluster_info::ClusterInfoError) -> Error {
-        Error::ClusterInfoError(e)
+        Error::ClusterInfo(e)
     }
 }
 impl<T> std::convert::From<crossbeam_channel::SendError<T>> for Error {
     fn from(_e: crossbeam_channel::SendError<T>) -> Error {
-        Error::CrossbeamSendError
+        Error::CrossbeamSend
     }
 }
 impl<T> std::convert::From<crossbeam_channel::TrySendError<T>> for Error {
     fn from(_e: crossbeam_channel::TrySendError<T>) -> Error {
-        Error::TryCrossbeamSendError
+        Error::TryCrossbeamSend
     }
 }
 impl<T> std::convert::From<std::sync::mpsc::SendError<T>> for Error {
     fn from(_e: std::sync::mpsc::SendError<T>) -> Error {
-        Error::SendError
+        Error::Send
     }
 }
 impl std::convert::From<std::io::Error> for Error {
@@ -82,17 +82,17 @@ impl std::convert::From<std::boxed::Box<bincode::ErrorKind>> for Error {
 }
 impl std::convert::From<blockstore::BlockstoreError> for Error {
     fn from(e: blockstore::BlockstoreError) -> Error {
-        Error::BlockstoreError(e)
+        Error::Blockstore(e)
     }
 }
 impl std::convert::From<rand::distributions::weighted::WeightedError> for Error {
     fn from(e: rand::distributions::weighted::WeightedError) -> Error {
-        Error::WeightedIndexError(e)
+        Error::WeightedIndex(e)
     }
 }
 impl std::convert::From<GossipError> for Error {
     fn from(e: GossipError) -> Error {
-        Error::GossipError(e)
+        Error::Gossip(e)
     }
 }
 
@@ -116,12 +116,12 @@ mod tests {
 
     #[test]
     fn from_test() {
-        assert_matches!(Error::from(RecvError {}), Error::RecvError(_));
+        assert_matches!(Error::from(RecvError {}), Error::Recv(_));
         assert_matches!(
             Error::from(RecvTimeoutError::Timeout),
-            Error::RecvTimeoutError(_)
+            Error::RecvTimeout(_)
         );
-        assert_matches!(send_error(), Err(Error::SendError));
+        assert_matches!(send_error(), Err(Error::Send));
         let ioe = io::Error::new(io::ErrorKind::NotFound, "hi");
         assert_matches!(Error::from(ioe), Error::Io(_));
     }
diff --git a/core/src/retransmit_stage.rs b/core/src/retransmit_stage.rs
index 3ebfaf56a1eda4..50f837e1c1625b 100644
--- a/core/src/retransmit_stage.rs
+++ b/core/src/retransmit_stage.rs
@@ -3,21 +3,18 @@
 
 use crate::{
     cluster_info_vote_listener::VerifiedVoteReceiver,
+    cluster_nodes::ClusterNodes,
     cluster_slots::ClusterSlots,
-    cluster_slots_service::ClusterSlotsService,
+    cluster_slots_service::{ClusterSlotsService, ClusterSlotsUpdateReceiver},
     completed_data_sets_service::CompletedDataSetsSender,
-    repair_service::DuplicateSlotsResetSender,
-    repair_service::RepairInfo,
+    repair_service::{DuplicateSlotsResetSender, RepairInfo},
     result::{Error, Result},
     window_service::{should_retransmit_and_persist, WindowService},
 };
 use crossbeam_channel::{Receiver, Sender};
 use lru::LruCache;
 use solana_client::rpc_response::SlotUpdate;
-use solana_gossip::{
-    cluster_info::{compute_retransmit_peers, ClusterInfo, DATA_PLANE_FANOUT},
-    contact_info::ContactInfo,
-};
+use solana_gossip::cluster_info::{ClusterInfo, DATA_PLANE_FANOUT};
 use solana_ledger::shred::{get_shred_slot_index_type, ShredFetchStats};
 use solana_ledger::{
     blockstore::{Blockstore, CompletedSlotsReceiver},
@@ -34,7 +31,6 @@ use solana_runtime::{bank::Bank, bank_forks::BankForks};
 use solana_sdk::{clock::Slot, epoch_schedule::EpochSchedule, pubkey::Pubkey, timing::timestamp};
 use solana_streamer::streamer::PacketReceiver;
 use std::{
-    cmp,
     collections::hash_set::HashSet,
     collections::{BTreeMap, BTreeSet, HashMap},
     net::UdpSocket,
@@ -218,12 +214,6 @@ fn update_retransmit_stats(
     }
 }
 
-#[derive(Default)]
-struct EpochStakesCache {
-    peers: Vec<ContactInfo>,
-    stakes_and_index: Vec<(u64, usize)>,
-}
-
 use crate::packet_hasher::PacketHasher;
 // Map of shred (slot, index, is_data) => list of hash values seen for that key.
 pub type ShredFilter = LruCache<(Slot, u32, bool), Vec<u64>>;
@@ -284,33 +274,6 @@ fn check_if_first_shred_received(
     }
 }
 
-// Drops shred slot leader from retransmit peers.
-// TODO: decide which bank should be used here.
-fn get_retransmit_peers(
-    self_pubkey: Pubkey,
-    shred_slot: Slot,
-    leader_schedule_cache: &LeaderScheduleCache,
-    bank: &Bank,
-    stakes_cache: &EpochStakesCache,
-) -> Vec<(u64 /*stakes*/, usize /*index*/)> {
-    match leader_schedule_cache.slot_leader_at(shred_slot, Some(bank)) {
-        None => {
-            error!("unknown leader for shred slot");
-            stakes_cache.stakes_and_index.clone()
-        }
-        Some(pubkey) if pubkey == self_pubkey => {
-            error!("retransmit from slot leader: {}", pubkey);
-            stakes_cache.stakes_and_index.clone()
-        }
-        Some(pubkey) => stakes_cache
-            .stakes_and_index
-            .iter()
-            .filter(|(_, i)| stakes_cache.peers[*i].id != pubkey)
-            .copied()
-            .collect(),
-    }
-}
-
 #[allow(clippy::too_many_arguments)]
 fn retransmit(
     bank_forks: &RwLock<BankForks>,
@@ -320,7 +283,7 @@ fn retransmit(
     sock: &UdpSocket,
     id: u32,
     stats: &RetransmitStats,
-    epoch_stakes_cache: &RwLock<EpochStakesCache>,
+    cluster_nodes: &RwLock<ClusterNodes<RetransmitStage>>,
     last_peer_update: &AtomicU64,
     shreds_received: &Mutex<ShredFilterAndHasher>,
     max_slots: &MaxSlots,
@@ -358,24 +321,22 @@ fn retransmit(
         && last_peer_update.compare_and_swap(last, now, Ordering::Relaxed) == last
     {
         let epoch_staked_nodes = r_bank.epoch_staked_nodes(bank_epoch);
-        let (peers, stakes_and_index) =
-            cluster_info.sorted_retransmit_peers_and_stakes(epoch_staked_nodes.as_ref());
-        {
-            let mut epoch_stakes_cache = epoch_stakes_cache.write().unwrap();
-            epoch_stakes_cache.peers = peers;
-            epoch_stakes_cache.stakes_and_index = stakes_and_index;
-        }
+        *cluster_nodes.write().unwrap() = ClusterNodes::<RetransmitStage>::new(
+            cluster_info,
+            &epoch_staked_nodes.unwrap_or_default(),
+        );
         {
             let mut sr = shreds_received.lock().unwrap();
             sr.0.clear();
             sr.1.reset();
         }
     }
-    let r_epoch_stakes_cache = epoch_stakes_cache.read().unwrap();
-    let mut peers_len = 0;
+    let cluster_nodes = cluster_nodes.read().unwrap();
+    let peers_len = cluster_nodes.num_peers();
     epoch_cache_update.stop();
 
     let my_id = cluster_info.id();
+    let socket_addr_space = cluster_info.socket_addr_space();
     let mut discard_total = 0;
     let mut repair_total = 0;
     let mut retransmit_total = 0;
@@ -412,50 +373,18 @@ fn retransmit(
         }
 
         let mut compute_turbine_peers = Measure::start("turbine_start");
-        let stakes_and_index = get_retransmit_peers(
-            my_id,
-            shred_slot,
-            leader_schedule_cache,
-            r_bank.deref(),
-            r_epoch_stakes_cache.deref(),
-        );
-        let (my_index, shuffled_stakes_and_index) = ClusterInfo::shuffle_peers_and_index(
-            &my_id,
-            &r_epoch_stakes_cache.peers,
-            &stakes_and_index,
-            packet.meta.seed,
-        );
+        let slot_leader = leader_schedule_cache.slot_leader_at(shred_slot, Some(r_bank.deref()));
+        let (neighbors, children) =
+            cluster_nodes.get_retransmit_peers(packet.meta.seed, DATA_PLANE_FANOUT, slot_leader);
         // If the node is on the critical path (i.e. the first node in each
         // neighborhood), then we expect that the packet arrives at tvu socket
         // as opposed to tvu-forwards. If this is not the case, then the
         // turbine broadcast/retransmit tree is mismatched across nodes.
-        if packet.meta.forward == (my_index % DATA_PLANE_FANOUT == 0) {
+        let anchor_node = neighbors[0].id == my_id;
+        if packet.meta.forward == anchor_node {
+            // TODO: Consider forwarding the packet to the root node here.
             retransmit_tree_mismatch += 1;
         }
-        peers_len = cmp::max(peers_len, shuffled_stakes_and_index.len());
-        // split off the indexes, we don't need the stakes anymore
-        let indexes: Vec<_> = shuffled_stakes_and_index
-            .into_iter()
-            .map(|(_, index)| index)
-            .collect();
-        debug_assert_eq!(my_id, r_epoch_stakes_cache.peers[indexes[my_index]].id);
-
-        let (neighbors, children) = compute_retransmit_peers(DATA_PLANE_FANOUT, my_index, &indexes);
-        let neighbors: Vec<_> = neighbors
-            .into_iter()
-            .filter_map(|index| {
-                let peer = &r_epoch_stakes_cache.peers[index];
-                if peer.id == my_id {
-                    None
-                } else {
-                    Some(peer)
-                }
-            })
-            .collect();
-        let children: Vec<_> = children
-            .into_iter()
-            .map(|index| &r_epoch_stakes_cache.peers[index])
-            .collect();
         compute_turbine_peers.stop();
         compute_turbine_peers_total += compute_turbine_peers.as_us();
 
@@ -465,10 +394,27 @@ fn retransmit(
             .or_default() += 1;
 
         let mut retransmit_time = Measure::start("retransmit_to");
-        if !packet.meta.forward {
-            ClusterInfo::retransmit_to(&neighbors, packet, sock, true)?;
+        // If the node is on the critical path (i.e. the first node in each
+        // neighborhood), it should send the packet to tvu socket of its
+        // children and also tvu_forward socket of its neighbors. Otherwise it
+        // should only forward to tvu_forward socket of its children.
+        if anchor_node {
+            // First neighbor is this node itself, so skip it.
+            ClusterInfo::retransmit_to(
+                &neighbors[1..],
+                packet,
+                sock,
+                /*forward socket=*/ true,
+                socket_addr_space,
+            );
         }
-        ClusterInfo::retransmit_to(&children, packet, sock, packet.meta.forward)?;
+        ClusterInfo::retransmit_to(
+            &children,
+            packet,
+            sock,
+            !anchor_node, // send to forward socket!
+            socket_addr_space,
+        );
         retransmit_time.stop();
         retransmit_total += retransmit_time.as_us();
     }
@@ -531,7 +477,7 @@ pub fn retransmitter(
             let r = r.clone();
             let cluster_info = cluster_info.clone();
             let stats = stats.clone();
-            let epoch_stakes_cache = Arc::new(RwLock::new(EpochStakesCache::default()));
+            let cluster_nodes = Arc::default();
             let last_peer_update = Arc::new(AtomicU64::new(0));
             let shreds_received = shreds_received.clone();
             let max_slots = max_slots.clone();
@@ -551,7 +497,7 @@ pub fn retransmitter(
                             &sockets[s],
                             s as u32,
                             &stats,
-                            &epoch_stakes_cache,
+                            &cluster_nodes,
                             &last_peer_update,
                             &shreds_received,
                             &max_slots,
@@ -559,8 +505,8 @@ pub fn retransmitter(
                             &rpc_subscriptions,
                         ) {
                             match e {
-                                Error::RecvTimeoutError(RecvTimeoutError::Disconnected) => break,
-                                Error::RecvTimeoutError(RecvTimeoutError::Timeout) => (),
+                                Error::RecvTimeout(RecvTimeoutError::Disconnected) => break,
+                                Error::RecvTimeout(RecvTimeoutError::Timeout) => (),
                                 _ => {
                                     inc_new_counter_error!("streamer-retransmit-error", 1, 1);
                                 }
@@ -592,7 +538,8 @@ impl RetransmitStage {
         repair_socket: Arc<UdpSocket>,
         verified_receiver: Receiver<Vec<Packets>>,
         exit: &Arc<AtomicBool>,
-        completed_slots_receivers: [CompletedSlotsReceiver; 2],
+        rpc_completed_slots_receiver: CompletedSlotsReceiver,
+        cluster_slots_update_receiver: ClusterSlotsUpdateReceiver,
         epoch_schedule: EpochSchedule,
         cfg: Option<Arc<AtomicBool>>,
         shred_version: u16,
@@ -618,8 +565,6 @@ impl RetransmitStage {
             rpc_subscriptions.clone(),
         );
 
-        let [rpc_completed_slots_receiver, cluster_completed_slots_receiver] =
-            completed_slots_receivers;
         let rpc_completed_slots_hdl =
             RpcCompletedSlotsService::spawn(rpc_completed_slots_receiver, rpc_subscriptions);
         let cluster_slots_service = ClusterSlotsService::new(
@@ -627,7 +572,7 @@ impl RetransmitStage {
             cluster_slots.clone(),
             bank_forks.clone(),
             cluster_info.clone(),
-            cluster_completed_slots_receiver,
+            cluster_slots_update_receiver,
             exit.clone(),
         );
 
@@ -700,6 +645,8 @@ mod tests {
     use solana_ledger::shred::Shred;
     use solana_net_utils::find_available_port_in_range;
     use solana_perf::packet::{Packet, Packets};
+    use solana_sdk::signature::Keypair;
+    use solana_streamer::socket::SocketAddrSpace;
     use std::net::{IpAddr, Ipv4Addr};
 
     #[test]
@@ -709,6 +656,7 @@ mod tests {
         let (ledger_path, _blockhash) = create_new_tmp_ledger!(&genesis_config);
         let blockstore = Blockstore::open(&ledger_path).unwrap();
         let opts = ProcessOptions {
+            accounts_db_test_hash_calculation: true,
             full_leader_cache: true,
             ..ProcessOptions::default()
         };
@@ -728,9 +676,18 @@ mod tests {
             .unwrap()
             .local_addr()
             .unwrap();
-
-        let other = ContactInfo::new_localhost(&solana_sdk::pubkey::new_rand(), 0);
-        let cluster_info = ClusterInfo::new_with_invalid_keypair(other);
+        // This fixes the order of nodes returned by shuffle_peers_and_index,
+        // and makes turbine retransmit tree deterministic for the purpose of
+        // the test.
+        let other = std::iter::repeat_with(solana_sdk::pubkey::new_rand)
+            .find(|pk| me.id < *pk)
+            .unwrap();
+        let other = ContactInfo::new_localhost(&other, 0);
+        let cluster_info = ClusterInfo::new(
+            other,
+            Arc::new(Keypair::new()),
+            SocketAddrSpace::Unspecified,
+        );
         cluster_info.insert_info(me);
 
         let retransmit_socket = Arc::new(vec![UdpSocket::bind("0.0.0.0:0").unwrap()]);
diff --git a/core/src/rewards_recorder_service.rs b/core/src/rewards_recorder_service.rs
index ef0ad1795851e5..65c66fe49aa66c 100644
--- a/core/src/rewards_recorder_service.rs
+++ b/core/src/rewards_recorder_service.rs
@@ -55,6 +55,7 @@ impl RewardsRecorderService {
                 lamports: reward_info.lamports,
                 post_balance: reward_info.post_balance,
                 reward_type: Some(reward_info.reward_type),
+                commission: reward_info.commission,
             })
             .collect();
 
diff --git a/core/src/serve_repair.rs b/core/src/serve_repair.rs
index 03e8d3f91f9012..2a8acf75e80172 100644
--- a/core/src/serve_repair.rs
+++ b/core/src/serve_repair.rs
@@ -6,7 +6,11 @@ use crate::{
     result::{Error, Result},
 };
 use bincode::serialize;
-use rand::distributions::{Distribution, WeightedIndex};
+use lru::LruCache;
+use rand::{
+    distributions::{Distribution, WeightedError, WeightedIndex},
+    Rng,
+};
 use solana_gossip::{
     cluster_info::{ClusterInfo, ClusterInfoError},
     contact_info::ContactInfo,
@@ -27,7 +31,7 @@ use solana_sdk::{
 };
 use solana_streamer::streamer::{PacketReceiver, PacketSender};
 use std::{
-    collections::{hash_map::Entry, HashMap, HashSet},
+    collections::HashSet,
     net::SocketAddr,
     sync::atomic::{AtomicBool, Ordering},
     sync::{Arc, RwLock},
@@ -37,6 +41,10 @@ use std::{
 
 /// the number of slots to respond with when responding to `Orphan` requests
 pub const MAX_ORPHAN_REPAIR_RESPONSES: usize = 10;
+// Number of slots to cache their respective repair peers and sampling weights.
+pub(crate) const REPAIR_PEERS_CACHE_CAPACITY: usize = 128;
+// Limit cache entries ttl in order to avoid re-using outdated data.
+const REPAIR_PEERS_CACHE_TTL: Duration = Duration::from_secs(10);
 
 #[derive(Serialize, Deserialize, Debug, Clone, Copy, Hash, PartialEq, Eq)]
 pub enum RepairType {
@@ -107,16 +115,40 @@ pub struct ServeRepair {
     cluster_info: Arc<ClusterInfo>,
 }
 
-type RepairCache = HashMap<Slot, (Vec<ContactInfo>, WeightedIndex<u64>)>;
+// Cache entry for repair peers for a slot.
+pub(crate) struct RepairPeers {
+    asof: Instant,
+    peers: Vec<(Pubkey, /*ContactInfo.serve_repair:*/ SocketAddr)>,
+    weighted_index: WeightedIndex<u64>,
+}
 
-impl ServeRepair {
-    /// Without a valid keypair gossip will not function. Only useful for tests.
-    pub fn new_with_invalid_keypair(contact_info: ContactInfo) -> Self {
-        Self::new(Arc::new(ClusterInfo::new_with_invalid_keypair(
-            contact_info,
-        )))
+impl RepairPeers {
+    fn new(asof: Instant, peers: &[ContactInfo], weights: &[u64]) -> Result<Self> {
+        if peers.is_empty() {
+            return Err(Error::from(ClusterInfoError::NoPeers));
+        }
+        if peers.len() != weights.len() {
+            return Err(Error::from(WeightedError::InvalidWeight));
+        }
+        let weighted_index = WeightedIndex::new(weights)?;
+        let peers = peers
+            .iter()
+            .map(|peer| (peer.id, peer.serve_repair))
+            .collect();
+        Ok(Self {
+            asof,
+            peers,
+            weighted_index,
+        })
     }
 
+    fn sample<R: Rng>(&self, rng: &mut R) -> (Pubkey, SocketAddr) {
+        let index = self.weighted_index.sample(rng);
+        self.peers[index]
+    }
+}
+
+impl ServeRepair {
     pub fn new(cluster_info: Arc<ClusterInfo>) -> Self {
         let (keypair, my_info) = { (cluster_info.keypair.clone(), cluster_info.my_contact_info()) };
         Self {
@@ -171,7 +203,7 @@ impl ServeRepair {
                         Self::run_window_request(
                             recycler,
                             from,
-                            &from_addr,
+                            from_addr,
                             blockstore,
                             &me.read().unwrap().my_info,
                             *slot,
@@ -186,7 +218,7 @@ impl ServeRepair {
                     (
                         Self::run_highest_window_request(
                             recycler,
-                            &from_addr,
+                            from_addr,
                             blockstore,
                             *slot,
                             *highest_index,
@@ -200,7 +232,7 @@ impl ServeRepair {
                     (
                         Self::run_orphan(
                             recycler,
-                            &from_addr,
+                            from_addr,
                             blockstore,
                             *slot,
                             MAX_ORPHAN_REPAIR_RESPONSES,
@@ -256,7 +288,7 @@ impl ServeRepair {
 
         let mut time = Measure::start("repair::handle_packets");
         for reqs in reqs_v {
-            Self::handle_packets(obj, &recycler, blockstore, reqs, response_sender, stats);
+            Self::handle_packets(obj, recycler, blockstore, reqs, response_sender, stats);
         }
         time.stop();
         if total_packets >= *max_packets {
@@ -323,7 +355,7 @@ impl ServeRepair {
                         &mut max_packets,
                     );
                     match result {
-                        Err(Error::RecvTimeoutError(_)) | Ok(_) => {}
+                        Err(Error::RecvTimeout(_)) | Ok(_) => {}
                         Err(err) => info!("repair listener error: {:?}", err),
                     };
                     if exit.load(Ordering::Relaxed) {
@@ -396,11 +428,11 @@ impl ServeRepair {
         Ok(out)
     }
 
-    pub fn repair_request(
+    pub(crate) fn repair_request(
         &self,
         cluster_slots: &ClusterSlots,
         repair_request: RepairType,
-        cache: &mut RepairCache,
+        peers_cache: &mut LruCache<Slot, RepairPeers>,
         repair_stats: &mut RepairStats,
         repair_validators: &Option<HashSet<Pubkey>>,
         outstanding_requests: &mut OutstandingRepairs,
@@ -408,25 +440,21 @@ impl ServeRepair {
         // find a peer that appears to be accepting replication and has the desired slot, as indicated
         // by a valid tvu port location
         let slot = repair_request.slot();
-        let (repair_peers, weighted_index) = match cache.entry(slot) {
-            Entry::Occupied(entry) => entry.into_mut(),
-            Entry::Vacant(entry) => {
-                let repair_peers = self.repair_peers(&repair_validators, slot);
-                if repair_peers.is_empty() {
-                    return Err(Error::from(ClusterInfoError::NoPeers));
-                }
+        let repair_peers = match peers_cache.get(&slot) {
+            Some(entry) if entry.asof.elapsed() < REPAIR_PEERS_CACHE_TTL => entry,
+            _ => {
+                peers_cache.pop(&slot);
+                let repair_peers = self.repair_peers(repair_validators, slot);
                 let weights = cluster_slots.compute_weights(slot, &repair_peers);
-                debug_assert_eq!(weights.len(), repair_peers.len());
-                let weighted_index = WeightedIndex::new(weights)?;
-                entry.insert((repair_peers, weighted_index))
+                let repair_peers = RepairPeers::new(Instant::now(), &repair_peers, &weights)?;
+                peers_cache.put(slot, repair_peers);
+                peers_cache.get(&slot).unwrap()
             }
         };
-        let n = weighted_index.sample(&mut rand::thread_rng());
-        let addr = repair_peers[n].serve_repair; // send the request to the peer's serve_repair port
+        let (peer, addr) = repair_peers.sample(&mut rand::thread_rng());
         let nonce =
             outstanding_requests.add_request(repair_request, solana_sdk::timing::timestamp());
-        let repair_peer_id = repair_peers[n].id;
-        let out = self.map_repair_request(&repair_request, &repair_peer_id, repair_stats, nonce)?;
+        let out = self.map_repair_request(&repair_request, &peer, repair_stats, nonce)?;
         Ok((addr, out))
     }
 
@@ -515,7 +543,7 @@ impl ServeRepair {
 
             if let Some(packet) = packet {
                 inc_new_counter_debug!("serve_repair-window-request-ledger", 1);
-                return Some(Packets::new_with_recycler_data(
+                return Some(Packets::new_unpinned_with_recycler_data(
                     recycler,
                     "run_window_request",
                     vec![packet],
@@ -555,7 +583,7 @@ impl ServeRepair {
                 from_addr,
                 nonce,
             )?;
-            return Some(Packets::new_with_recycler_data(
+            return Some(Packets::new_unpinned_with_recycler_data(
                 recycler,
                 "run_highest_window_request",
                 vec![packet],
@@ -572,7 +600,7 @@ impl ServeRepair {
         max_responses: usize,
         nonce: Nonce,
     ) -> Option<Packets> {
-        let mut res = Packets::new_with_recycler(recycler.clone(), 64, "run_orphan");
+        let mut res = Packets::new_unpinned_with_recycler(recycler.clone(), 64, "run_orphan");
         if let Some(blockstore) = blockstore {
             // Try to find the next "n" parent slots of the input slot
             while let Ok(Some(meta)) = blockstore.meta(slot) {
@@ -617,7 +645,8 @@ mod tests {
         shred::{max_ticks_per_n_shreds, Shred},
     };
     use solana_perf::packet::Packet;
-    use solana_sdk::{hash::Hash, pubkey::Pubkey, timing::timestamp};
+    use solana_sdk::{hash::Hash, pubkey::Pubkey, signature::Keypair, timing::timestamp};
+    use solana_streamer::socket::SocketAddrSpace;
 
     #[test]
     fn test_run_highest_window_request() {
@@ -762,22 +791,30 @@ mod tests {
         Blockstore::destroy(&ledger_path).expect("Expected successful database destruction");
     }
 
+    fn new_test_cluster_info(contact_info: ContactInfo) -> ClusterInfo {
+        ClusterInfo::new(
+            contact_info,
+            Arc::new(Keypair::new()),
+            SocketAddrSpace::Unspecified,
+        )
+    }
+
     #[test]
     fn window_index_request() {
         let cluster_slots = ClusterSlots::default();
         let me = ContactInfo::new_localhost(&solana_sdk::pubkey::new_rand(), timestamp());
-        let cluster_info = Arc::new(ClusterInfo::new_with_invalid_keypair(me));
+        let cluster_info = Arc::new(new_test_cluster_info(me));
         let serve_repair = ServeRepair::new(cluster_info.clone());
         let mut outstanding_requests = OutstandingRepairs::default();
         let rv = serve_repair.repair_request(
             &cluster_slots,
             RepairType::Shred(0, 0),
-            &mut HashMap::new(),
+            &mut LruCache::new(100),
             &mut RepairStats::default(),
             &None,
             &mut outstanding_requests,
         );
-        assert_matches!(rv, Err(Error::ClusterInfoError(ClusterInfoError::NoPeers)));
+        assert_matches!(rv, Err(Error::ClusterInfo(ClusterInfoError::NoPeers)));
 
         let serve_repair_addr = socketaddr!([127, 0, 0, 1], 1243);
         let nxt = ContactInfo {
@@ -800,7 +837,7 @@ mod tests {
             .repair_request(
                 &cluster_slots,
                 RepairType::Shred(0, 0),
-                &mut HashMap::new(),
+                &mut LruCache::new(100),
                 &mut RepairStats::default(),
                 &None,
                 &mut outstanding_requests,
@@ -834,7 +871,7 @@ mod tests {
                 .repair_request(
                     &cluster_slots,
                     RepairType::Shred(0, 0),
-                    &mut HashMap::new(),
+                    &mut LruCache::new(100),
                     &mut RepairStats::default(),
                     &None,
                     &mut outstanding_requests,
@@ -993,7 +1030,7 @@ mod tests {
     fn test_repair_with_repair_validators() {
         let cluster_slots = ClusterSlots::default();
         let me = ContactInfo::new_localhost(&solana_sdk::pubkey::new_rand(), timestamp());
-        let cluster_info = Arc::new(ClusterInfo::new_with_invalid_keypair(me.clone()));
+        let cluster_info = Arc::new(new_test_cluster_info(me.clone()));
 
         // Insert two peers on the network
         let contact_info2 =
@@ -1015,7 +1052,7 @@ mod tests {
                 .repair_request(
                     &cluster_slots,
                     RepairType::Shred(0, 0),
-                    &mut HashMap::new(),
+                    &mut LruCache::new(100),
                     &mut RepairStats::default(),
                     &trusted_validators,
                     &mut OutstandingRepairs::default(),
@@ -1032,7 +1069,7 @@ mod tests {
             .repair_request(
                 &cluster_slots,
                 RepairType::Shred(0, 0),
-                &mut HashMap::new(),
+                &mut LruCache::new(100),
                 &mut RepairStats::default(),
                 &trusted_validators,
                 &mut OutstandingRepairs::default(),
@@ -1053,7 +1090,7 @@ mod tests {
             .repair_request(
                 &cluster_slots,
                 RepairType::Shred(0, 0),
-                &mut HashMap::new(),
+                &mut LruCache::new(100),
                 &mut RepairStats::default(),
                 &None,
                 &mut OutstandingRepairs::default(),
diff --git a/core/src/serve_repair_service.rs b/core/src/serve_repair_service.rs
index f2ef152e9c263e..70ce3f2e671502 100644
--- a/core/src/serve_repair_service.rs
+++ b/core/src/serve_repair_service.rs
@@ -1,7 +1,7 @@
 use crate::serve_repair::ServeRepair;
 use solana_ledger::blockstore::Blockstore;
 use solana_perf::recycler::Recycler;
-use solana_streamer::streamer;
+use solana_streamer::{socket::SocketAddrSpace, streamer};
 use std::net::UdpSocket;
 use std::sync::atomic::AtomicBool;
 use std::sync::mpsc::channel;
@@ -17,6 +17,7 @@ impl ServeRepairService {
         serve_repair: &Arc<RwLock<ServeRepair>>,
         blockstore: Option<Arc<Blockstore>>,
         serve_repair_socket: UdpSocket,
+        socket_addr_space: SocketAddrSpace,
         exit: &Arc<AtomicBool>,
     ) -> Self {
         let (request_sender, request_receiver) = channel();
@@ -28,15 +29,20 @@ impl ServeRepairService {
         );
         let t_receiver = streamer::receiver(
             serve_repair_socket.clone(),
-            &exit,
+            exit,
             request_sender,
             Recycler::default(),
             "serve_repair_receiver",
             1,
+            false,
         );
         let (response_sender, response_receiver) = channel();
-        let t_responder =
-            streamer::responder("serve-repairs", serve_repair_socket, response_receiver);
+        let t_responder = streamer::responder(
+            "serve-repairs",
+            serve_repair_socket,
+            response_receiver,
+            socket_addr_space,
+        );
         let t_listen = ServeRepair::listen(
             serve_repair.clone(),
             blockstore,
diff --git a/core/src/shred_fetch_stage.rs b/core/src/shred_fetch_stage.rs
index b7946b54d16a5b..50a53160743727 100644
--- a/core/src/shred_fetch_stage.rs
+++ b/core/src/shred_fetch_stage.rs
@@ -145,11 +145,12 @@ impl ShredFetchStage {
             .map(|s| {
                 streamer::receiver(
                     s,
-                    &exit,
+                    exit,
                     packet_sender.clone(),
                     recycler.clone(),
                     "packet_modifier",
                     1,
+                    true,
                 )
             })
             .collect();
@@ -173,7 +174,7 @@ impl ShredFetchStage {
 
         let (mut tvu_threads, tvu_filter) = Self::packet_modifier(
             sockets,
-            &exit,
+            exit,
             sender.clone(),
             recycler.clone(),
             bank_forks.clone(),
@@ -183,7 +184,7 @@ impl ShredFetchStage {
 
         let (tvu_forwards_threads, fwd_thread_hdl) = Self::packet_modifier(
             forward_sockets,
-            &exit,
+            exit,
             sender.clone(),
             recycler.clone(),
             bank_forks.clone(),
@@ -193,7 +194,7 @@ impl ShredFetchStage {
 
         let (repair_receiver, repair_handler) = Self::packet_modifier(
             vec![repair_socket],
-            &exit,
+            exit,
             sender.clone(),
             recycler,
             bank_forks,
diff --git a/core/src/sigverify_stage.rs b/core/src/sigverify_stage.rs
index ff153b0bbe445a..91354a843e3af3 100644
--- a/core/src/sigverify_stage.rs
+++ b/core/src/sigverify_stage.rs
@@ -24,10 +24,10 @@ const RECV_BATCH_MAX_GPU: usize = 5_000;
 #[derive(Error, Debug)]
 pub enum SigVerifyServiceError {
     #[error("send packets batch error")]
-    SendError(#[from] SendError<Vec<Packets>>),
+    Send(#[from] SendError<Vec<Packets>>),
 
     #[error("streamer error")]
-    StreamerError(#[from] StreamerError),
+    Streamer(#[from] StreamerError),
 }
 
 type Result<T> = std::result::Result<T, SigVerifyServiceError>;
@@ -126,13 +126,13 @@ impl SigVerifyStage {
             .spawn(move || loop {
                 if let Err(e) = Self::verifier(&packet_receiver, &verified_sender, id, &verifier) {
                     match e {
-                        SigVerifyServiceError::StreamerError(StreamerError::RecvTimeoutError(
+                        SigVerifyServiceError::Streamer(StreamerError::RecvTimeout(
                             RecvTimeoutError::Disconnected,
                         )) => break,
-                        SigVerifyServiceError::StreamerError(StreamerError::RecvTimeoutError(
+                        SigVerifyServiceError::Streamer(StreamerError::RecvTimeout(
                             RecvTimeoutError::Timeout,
                         )) => (),
-                        SigVerifyServiceError::SendError(_) => {
+                        SigVerifyServiceError::Send(_) => {
                             break;
                         }
                         _ => error!("{:?}", e),
diff --git a/core/src/test_validator.rs b/core/src/test_validator.rs
index 9c6ec773e56ffb..86fcfd738e1b7e 100644
--- a/core/src/test_validator.rs
+++ b/core/src/test_validator.rs
@@ -1,12 +1,10 @@
 use {
-    crate::{
-        rpc::JsonRpcConfig,
-        validator::{Validator, ValidatorConfig, ValidatorExit, ValidatorStartProgress},
-    },
+    crate::validator::{Validator, ValidatorConfig, ValidatorStartProgress},
     solana_client::rpc_client::RpcClient,
     solana_gossip::{cluster_info::Node, gossip_service::discover_cluster, socketaddr},
     solana_ledger::{blockstore::create_new_ledger, create_new_tmp_ledger},
     solana_net_utils::PortRange,
+    solana_rpc::rpc::JsonRpcConfig,
     solana_runtime::{
         bank_forks::{ArchiveFormat, SnapshotConfig, SnapshotVersion},
         genesis_utils::create_genesis_config_with_leader_ex,
@@ -18,6 +16,7 @@ use {
         clock::{Slot, DEFAULT_MS_PER_SLOT},
         commitment_config::CommitmentConfig,
         epoch_schedule::EpochSchedule,
+        exit::Exit,
         fee_calculator::{FeeCalculator, FeeRateGovernor},
         hash::Hash,
         native_token::sol_to_lamports,
@@ -25,6 +24,7 @@ use {
         rent::Rent,
         signature::{read_keypair_file, write_keypair_file, Keypair, Signer},
     },
+    solana_streamer::socket::SocketAddrSpace,
     std::{
         collections::HashMap,
         fs::remove_dir_all,
@@ -70,7 +70,7 @@ impl Default for TestValidatorNodeConfig {
 pub struct TestValidatorGenesis {
     fee_rate_governor: FeeRateGovernor,
     ledger_path: Option<PathBuf>,
-    rent: Rent,
+    pub rent: Rent,
     rpc_config: JsonRpcConfig,
     rpc_ports: Option<(u16, u16)>, // (JsonRpc, JsonRpcPubSub), None == random ports
     warp_slot: Option<Slot>,
@@ -79,7 +79,7 @@ pub struct TestValidatorGenesis {
     programs: Vec<ProgramInfo>,
     epoch_schedule: Option<EpochSchedule>,
     node_config: TestValidatorNodeConfig,
-    pub validator_exit: Arc<RwLock<ValidatorExit>>,
+    pub validator_exit: Arc<RwLock<Exit>>,
     pub start_progress: Arc<RwLock<ValidatorStartProgress>>,
     pub authorized_voter_keypairs: Arc<RwLock<Vec<Arc<Keypair>>>>,
     pub max_ledger_shreds: Option<u64>,
@@ -264,8 +264,9 @@ impl TestValidatorGenesis {
     pub fn start_with_mint_address(
         &self,
         mint_address: Pubkey,
+        socket_addr_space: SocketAddrSpace,
     ) -> Result<TestValidator, Box<dyn std::error::Error>> {
-        TestValidator::start(mint_address, self)
+        TestValidator::start(mint_address, self, socket_addr_space)
     }
 
     /// Start a test validator
@@ -275,8 +276,21 @@ impl TestValidatorGenesis {
     ///
     /// This function panics on initialization failure.
     pub fn start(&self) -> (TestValidator, Keypair) {
+        self.start_with_socket_addr_space(SocketAddrSpace::new(/*allow_private_addr=*/ true))
+    }
+
+    /// Start a test validator with the given `SocketAddrSpace`
+    ///
+    /// Returns a new `TestValidator` as well as the keypair for the mint account that will receive tokens
+    /// created at genesis.
+    ///
+    /// This function panics on initialization failure.
+    pub fn start_with_socket_addr_space(
+        &self,
+        socket_addr_space: SocketAddrSpace,
+    ) -> (TestValidator, Keypair) {
         let mint_keypair = Keypair::new();
-        TestValidator::start(mint_keypair.pubkey(), self)
+        TestValidator::start(mint_keypair.pubkey(), self, socket_addr_space)
             .map(|test_validator| (test_validator, mint_keypair))
             .expect("Test validator failed to start")
     }
@@ -298,7 +312,11 @@ impl TestValidator {
     /// Faucet optional.
     ///
     /// This function panics on initialization failure.
-    pub fn with_no_fees(mint_address: Pubkey, faucet_addr: Option<SocketAddr>) -> Self {
+    pub fn with_no_fees(
+        mint_address: Pubkey,
+        faucet_addr: Option<SocketAddr>,
+        socket_addr_space: SocketAddrSpace,
+    ) -> Self {
         TestValidatorGenesis::default()
             .fee_rate_governor(FeeRateGovernor::new(0, 0))
             .rent(Rent {
@@ -307,7 +325,7 @@ impl TestValidator {
                 ..Rent::default()
             })
             .faucet_addr(faucet_addr)
-            .start_with_mint_address(mint_address)
+            .start_with_mint_address(mint_address, socket_addr_space)
             .expect("validator start failed")
     }
 
@@ -319,6 +337,7 @@ impl TestValidator {
         mint_address: Pubkey,
         target_lamports_per_signature: u64,
         faucet_addr: Option<SocketAddr>,
+        socket_addr_space: SocketAddrSpace,
     ) -> Self {
         TestValidatorGenesis::default()
             .fee_rate_governor(FeeRateGovernor::new(target_lamports_per_signature, 0))
@@ -328,7 +347,7 @@ impl TestValidator {
                 ..Rent::default()
             })
             .faucet_addr(faucet_addr)
-            .start_with_mint_address(mint_address)
+            .start_with_mint_address(mint_address, socket_addr_space)
             .expect("validator start failed")
     }
 
@@ -431,6 +450,7 @@ impl TestValidator {
     fn start(
         mint_address: Pubkey,
         config: &TestValidatorGenesis,
+        socket_addr_space: SocketAddrSpace,
     ) -> Result<Self, Box<dyn std::error::Error>> {
         let preserve_ledger = config.ledger_path.is_some();
         let ledger_path = TestValidator::initialize_ledger(mint_address, config)?;
@@ -514,11 +534,12 @@ impl TestValidator {
             &validator_config,
             true, // should_check_duplicate_instance
             config.start_progress.clone(),
+            socket_addr_space,
         ));
 
         // Needed to avoid panics in `solana-responder-gossip` in tests that create a number of
         // test validators concurrently...
-        discover_cluster(&gossip, 1)
+        discover_cluster(&gossip, 1, socket_addr_space)
             .map_err(|err| format!("TestValidator startup failed: {:?}", err))?;
 
         // This is a hack to delay until the fees are non-zero for test consistency
diff --git a/core/src/tpu.rs b/core/src/tpu.rs
index 23ddea5490c6e6..dc97a0f595e8c6 100644
--- a/core/src/tpu.rs
+++ b/core/src/tpu.rs
@@ -9,13 +9,13 @@ use crate::{
         VerifiedVoteSender, VoteTracker,
     },
     fetch_stage::FetchStage,
-    poh_recorder::{PohRecorder, WorkingBankEntry},
     sigverify::TransactionSigVerifier,
     sigverify_stage::SigVerifyStage,
 };
 use crossbeam_channel::unbounded;
 use solana_gossip::cluster_info::ClusterInfo;
 use solana_ledger::{blockstore::Blockstore, blockstore_processor::TransactionStatusSender};
+use solana_poh::poh_recorder::{PohRecorder, WorkingBankEntry};
 use solana_rpc::{
     optimistically_confirmed_bank_tracker::BankNotificationSender,
     rpc_subscriptions::RpcSubscriptions,
@@ -74,9 +74,9 @@ impl Tpu {
         let fetch_stage = FetchStage::new_with_sender(
             transactions_sockets,
             tpu_forwards_sockets,
-            &exit,
+            exit,
             &packet_sender,
-            &poh_recorder,
+            poh_recorder,
             tpu_coalesce_ms,
         );
         let (verified_sender, verified_receiver) = unbounded();
@@ -88,10 +88,10 @@ impl Tpu {
 
         let (verified_vote_packets_sender, verified_vote_packets_receiver) = unbounded();
         let cluster_info_vote_listener = ClusterInfoVoteListener::new(
-            &exit,
+            exit,
             cluster_info.clone(),
             verified_vote_packets_sender,
-            &poh_recorder,
+            poh_recorder,
             vote_tracker,
             bank_forks,
             subscriptions.clone(),
@@ -104,7 +104,7 @@ impl Tpu {
         );
 
         let banking_stage = BankingStage::new(
-            &cluster_info,
+            cluster_info,
             poh_recorder,
             verified_receiver,
             verified_vote_packets_receiver,
@@ -117,7 +117,7 @@ impl Tpu {
             cluster_info.clone(),
             entry_receiver,
             retransmit_slots_receiver,
-            &exit,
+            exit,
             blockstore,
             shred_version,
         );
diff --git a/core/src/tvu.rs b/core/src/tvu.rs
index 8f1bd381fd6b58..718095d10f9f26 100644
--- a/core/src/tvu.rs
+++ b/core/src/tvu.rs
@@ -13,7 +13,6 @@ use crate::{
     completed_data_sets_service::CompletedDataSetsSender,
     consensus::Tower,
     ledger_cleanup_service::LedgerCleanupService,
-    poh_recorder::PohRecorder,
     replay_stage::{ReplayStage, ReplayStageConfig},
     retransmit_stage::RetransmitStage,
     rewards_recorder_service::RewardsRecorderSender,
@@ -21,6 +20,7 @@ use crate::{
     sigverify_shreds::ShredSigVerifier,
     sigverify_stage::SigVerifyStage,
     snapshot_packager_service::PendingSnapshotPackage,
+    voting_service::VotingService,
 };
 use crossbeam_channel::unbounded;
 use solana_gossip::cluster_info::ClusterInfo;
@@ -29,6 +29,7 @@ use solana_ledger::{
     blockstore_processor::TransactionStatusSender,
     leader_schedule_cache::LeaderScheduleCache,
 };
+use solana_poh::poh_recorder::PohRecorder;
 use solana_rpc::{
     max_slots::MaxSlots, optimistically_confirmed_bank_tracker::BankNotificationSender,
     rpc_subscriptions::RpcSubscriptions,
@@ -37,6 +38,7 @@ use solana_runtime::{
     accounts_background_service::{
         AbsRequestHandler, AbsRequestSender, AccountsBackgroundService, SnapshotRequestHandler,
     },
+    accounts_db::AccountShrinkThreshold,
     bank_forks::{BankForks, SnapshotConfig},
     commitment::BlockCommitmentCache,
     vote_sender_types::ReplayVoteSender,
@@ -65,6 +67,7 @@ pub struct Tvu {
     ledger_cleanup_service: Option<LedgerCleanupService>,
     accounts_background_service: AccountsBackgroundService,
     accounts_hash_verifier: AccountsHashVerifier,
+    voting_service: VotingService,
 }
 
 pub struct Sockets {
@@ -88,6 +91,7 @@ pub struct TvuConfig {
     pub rocksdb_compaction_interval: Option<u64>,
     pub rocksdb_max_compaction_jitter: Option<u64>,
     pub wait_for_vote_to_start_leader: bool,
+    pub accounts_shrink_ratio: AccountShrinkThreshold,
 }
 
 impl Tvu {
@@ -111,7 +115,7 @@ impl Tvu {
         tower: Tower,
         leader_schedule_cache: &Arc<LeaderScheduleCache>,
         exit: &Arc<AtomicBool>,
-        completed_slots_receivers: [CompletedSlotsReceiver; 2],
+        completed_slots_receiver: CompletedSlotsReceiver,
         block_commitment_cache: Arc<RwLock<BlockCommitmentCache>>,
         cfg: Option<Arc<AtomicBool>>,
         transaction_status_sender: Option<TransactionStatusSender>,
@@ -150,7 +154,7 @@ impl Tvu {
             repair_socket.clone(),
             &fetch_sender,
             Some(bank_forks.clone()),
-            &exit,
+            exit,
         );
 
         let (verified_sender, verified_receiver) = unbounded();
@@ -165,16 +169,18 @@ impl Tvu {
         let compaction_interval = tvu_config.rocksdb_compaction_interval;
         let max_compaction_jitter = tvu_config.rocksdb_max_compaction_jitter;
         let (duplicate_slots_sender, duplicate_slots_receiver) = unbounded();
+        let (cluster_slots_update_sender, cluster_slots_update_receiver) = unbounded();
         let retransmit_stage = RetransmitStage::new(
             bank_forks.clone(),
             leader_schedule_cache,
             blockstore.clone(),
-            &cluster_info,
+            cluster_info,
             Arc::new(retransmit_sockets),
             repair_socket,
             verified_receiver,
             &exit,
-            completed_slots_receivers,
+            completed_slots_receiver,
+            cluster_slots_update_receiver,
             *bank_forks.read().unwrap().working_bank().epoch_schedule(),
             cfg,
             tvu_config.shred_version,
@@ -208,7 +214,7 @@ impl Tvu {
             accounts_hash_receiver,
             pending_snapshot_package,
             exit,
-            &cluster_info,
+            cluster_info,
             tvu_config.trusted_validators.clone(),
             tvu_config.halt_on_trusted_validators_accounts_hash_mismatch,
             tvu_config.accounts_hash_fault_injection_slots,
@@ -272,6 +278,10 @@ impl Tvu {
             wait_for_vote_to_start_leader: tvu_config.wait_for_vote_to_start_leader,
         };
 
+        let (voting_sender, voting_receiver) = channel();
+        let voting_service =
+            VotingService::new(voting_receiver, cluster_info.clone(), poh_recorder.clone());
+
         let replay_stage = ReplayStage::new(
             replay_stage_config,
             blockstore.clone(),
@@ -288,6 +298,8 @@ impl Tvu {
             replay_vote_sender,
             gossip_confirmed_slots_receiver,
             gossip_verified_vote_hash_receiver,
+            cluster_slots_update_sender,
+            voting_sender,
         );
 
         let ledger_cleanup_service = tvu_config.max_ledger_shreds.map(|max_ledger_shreds| {
@@ -295,7 +307,7 @@ impl Tvu {
                 ledger_cleanup_slot_receiver,
                 blockstore.clone(),
                 max_ledger_shreds,
-                &exit,
+                exit,
                 compaction_interval,
                 max_compaction_jitter,
             )
@@ -303,7 +315,7 @@ impl Tvu {
 
         let accounts_background_service = AccountsBackgroundService::new(
             bank_forks.clone(),
-            &exit,
+            exit,
             accounts_background_request_handler,
             tvu_config.accounts_db_caching_enabled,
             tvu_config.test_hash_calculation,
@@ -318,6 +330,7 @@ impl Tvu {
             ledger_cleanup_service,
             accounts_background_service,
             accounts_hash_verifier,
+            voting_service,
         }
     }
 
@@ -331,6 +344,7 @@ impl Tvu {
         self.accounts_background_service.join()?;
         self.replay_stage.join()?;
         self.accounts_hash_verifier.join()?;
+        self.voting_service.join()?;
         Ok(())
     }
 }
@@ -338,7 +352,6 @@ impl Tvu {
 #[cfg(test)]
 pub mod tests {
     use super::*;
-    use crate::banking_stage::create_test_recorder;
     use serial_test::serial;
     use solana_gossip::cluster_info::{ClusterInfo, Node};
     use solana_ledger::{
@@ -346,8 +359,11 @@ pub mod tests {
         create_new_tmp_ledger,
         genesis_utils::{create_genesis_config, GenesisConfigInfo},
     };
+    use solana_poh::poh_recorder::create_test_recorder;
     use solana_rpc::optimistically_confirmed_bank_tracker::OptimisticallyConfirmedBank;
     use solana_runtime::bank::Bank;
+    use solana_sdk::signature::{Keypair, Signer};
+    use solana_streamer::socket::SocketAddrSpace;
     use std::sync::atomic::Ordering;
 
     #[ignore]
@@ -365,7 +381,11 @@ pub mod tests {
         let bank_forks = BankForks::new(Bank::new(&genesis_config));
 
         //start cluster_info1
-        let cluster_info1 = ClusterInfo::new_with_invalid_keypair(target1.info.clone());
+        let cluster_info1 = ClusterInfo::new(
+            target1.info.clone(),
+            Arc::new(Keypair::new()),
+            SocketAddrSpace::Unspecified,
+        );
         cluster_info1.insert_info(leader.info);
         let cref1 = Arc::new(cluster_info1);
 
@@ -373,7 +393,7 @@ pub mod tests {
         let BlockstoreSignals {
             blockstore,
             ledger_signal_receiver,
-            completed_slots_receivers,
+            completed_slots_receiver,
             ..
         } = Blockstore::open_with_signal(&blockstore_path, None, true)
             .expect("Expected to successfully open ledger");
@@ -417,7 +437,7 @@ pub mod tests {
             tower,
             &leader_schedule_cache,
             &exit,
-            completed_slots_receivers,
+            completed_slots_receiver,
             block_commitment_cache,
             None,
             None,
diff --git a/core/src/unfrozen_gossip_verified_vote_hashes.rs b/core/src/unfrozen_gossip_verified_vote_hashes.rs
index 4640e01e72a2c4..30d944754c889a 100644
--- a/core/src/unfrozen_gossip_verified_vote_hashes.rs
+++ b/core/src/unfrozen_gossip_verified_vote_hashes.rs
@@ -116,7 +116,7 @@ mod tests {
             if *unfrozen_vote_slot >= frozen_vote_slot {
                 let vote_hashes_map = unfrozen_gossip_verified_vote_hashes
                     .votes_per_slot
-                    .get(&unfrozen_vote_slot)
+                    .get(unfrozen_vote_slot)
                     .unwrap();
                 assert_eq!(vote_hashes_map.len(), num_duplicate_hashes);
                 for pubkey_votes in vote_hashes_map.values() {
diff --git a/core/src/validator.rs b/core/src/validator.rs
index df80c95d1929d9..da83da7b472a56 100644
--- a/core/src/validator.rs
+++ b/core/src/validator.rs
@@ -6,18 +6,13 @@ use crate::{
     cluster_info_vote_listener::VoteTracker,
     completed_data_sets_service::CompletedDataSetsService,
     consensus::{reconcile_blockstore_roots_with_tower, Tower},
-    poh_recorder::{PohRecorder, GRACE_TICKS_FACTOR, MAX_GRACE_SLOTS},
-    poh_service::{self, PohService},
     rewards_recorder_service::{RewardsRecorderSender, RewardsRecorderService},
-    rpc::JsonRpcConfig,
-    rpc_service::JsonRpcService,
     sample_performance_service::SamplePerformanceService,
     serve_repair::ServeRepair,
     serve_repair_service::ServeRepairService,
     sigverify,
     snapshot_packager_service::{PendingSnapshotPackage, SnapshotPackagerService},
     tpu::{Tpu, DEFAULT_TPU_COALESCE_MS},
-    transaction_status_service::TransactionStatusService,
     tvu::{Sockets, Tvu, TvuConfig},
 };
 use crossbeam_channel::{bounded, unbounded};
@@ -41,15 +36,23 @@ use solana_ledger::{
 };
 use solana_measure::measure::Measure;
 use solana_metrics::datapoint_info;
+use solana_poh::{
+    poh_recorder::{PohRecorder, GRACE_TICKS_FACTOR, MAX_GRACE_SLOTS},
+    poh_service::{self, PohService},
+};
 use solana_rpc::{
     max_slots::MaxSlots,
     optimistically_confirmed_bank_tracker::{
         OptimisticallyConfirmedBank, OptimisticallyConfirmedBankTracker,
     },
+    rpc::JsonRpcConfig,
     rpc_pubsub_service::{PubSubConfig, PubSubService},
+    rpc_service::JsonRpcService,
     rpc_subscriptions::RpcSubscriptions,
+    transaction_status_service::TransactionStatusService,
 };
 use solana_runtime::{
+    accounts_db::AccountShrinkThreshold,
     accounts_index::AccountSecondaryIndexes,
     bank::Bank,
     bank_forks::{BankForks, SnapshotConfig},
@@ -59,6 +62,7 @@ use solana_runtime::{
 use solana_sdk::{
     clock::Slot,
     epoch_schedule::MAX_LEADER_SCHEDULE_EPOCH_OFFSET,
+    exit::Exit,
     genesis_config::GenesisConfig,
     hash::Hash,
     pubkey::Pubkey,
@@ -66,11 +70,10 @@ use solana_sdk::{
     signature::{Keypair, Signer},
     timing::timestamp,
 };
+use solana_streamer::socket::SocketAddrSpace;
 use solana_vote_program::vote_state::VoteState;
-use std::time::Instant;
 use std::{
     collections::HashSet,
-    fmt,
     net::SocketAddr,
     ops::Deref,
     path::{Path, PathBuf},
@@ -78,7 +81,7 @@ use std::{
     sync::mpsc::Receiver,
     sync::{Arc, Mutex, RwLock},
     thread::{sleep, Builder},
-    time::Duration,
+    time::{Duration, Instant},
 };
 
 const MAX_COMPLETED_DATA_SETS_IN_CHANNEL: usize = 100_000;
@@ -117,7 +120,6 @@ pub struct ValidatorConfig {
     pub max_genesis_archive_unpacked_size: u64,
     pub wal_recovery_mode: Option<BlockstoreRecoveryMode>,
     pub poh_verify: bool, // Perform PoH verification during blockstore processing at boo
-    pub cuda: bool,
     pub require_tower: bool,
     pub tower_path: Option<PathBuf>,
     pub debug_keys: Option<Arc<HashSet<Pubkey>>>,
@@ -133,10 +135,12 @@ pub struct ValidatorConfig {
     pub accounts_db_caching_enabled: bool,
     pub warp_slot: Option<Slot>,
     pub accounts_db_test_hash_calculation: bool,
+    pub accounts_db_skip_shrink: bool,
     pub accounts_db_use_index_hash_calculation: bool,
     pub tpu_coalesce_ms: u64,
-    pub validator_exit: Arc<RwLock<ValidatorExit>>,
+    pub validator_exit: Arc<RwLock<Exit>>,
     pub no_wait_for_vote_to_start_leader: bool,
+    pub accounts_shrink_ratio: AccountShrinkThreshold,
 }
 
 impl Default for ValidatorConfig {
@@ -173,7 +177,6 @@ impl Default for ValidatorConfig {
             max_genesis_archive_unpacked_size: MAX_GENESIS_ARCHIVE_UNPACKED_SIZE,
             wal_recovery_mode: None,
             poh_verify: true,
-            cuda: false,
             require_tower: false,
             tower_path: None,
             debug_keys: None,
@@ -189,10 +192,12 @@ impl Default for ValidatorConfig {
             accounts_db_caching_enabled: false,
             warp_slot: None,
             accounts_db_test_hash_calculation: false,
+            accounts_db_skip_shrink: false,
             accounts_db_use_index_hash_calculation: true,
             tpu_coalesce_ms: DEFAULT_TPU_COALESCE_MS,
-            validator_exit: Arc::new(RwLock::new(ValidatorExit::default())),
+            validator_exit: Arc::new(RwLock::new(Exit::default())),
             no_wait_for_vote_to_start_leader: true,
+            accounts_shrink_ratio: AccountShrinkThreshold::default(),
         }
     }
 }
@@ -223,35 +228,6 @@ impl Default for ValidatorStartProgress {
     }
 }
 
-#[derive(Default)]
-pub struct ValidatorExit {
-    exited: bool,
-    exits: Vec<Box<dyn FnOnce() + Send + Sync>>,
-}
-
-impl ValidatorExit {
-    pub fn register_exit(&mut self, exit: Box<dyn FnOnce() + Send + Sync>) {
-        if self.exited {
-            exit();
-        } else {
-            self.exits.push(exit);
-        }
-    }
-
-    pub fn exit(&mut self) {
-        self.exited = true;
-        for exit in self.exits.drain(..) {
-            exit();
-        }
-    }
-}
-
-impl fmt::Debug for ValidatorExit {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f, "{} exits", self.exits.len())
-    }
-}
-
 #[derive(Default)]
 struct TransactionHistoryServices {
     transaction_status_sender: Option<TransactionStatusSender>,
@@ -264,7 +240,7 @@ struct TransactionHistoryServices {
 }
 
 pub struct Validator {
-    validator_exit: Arc<RwLock<ValidatorExit>>,
+    validator_exit: Arc<RwLock<Exit>>,
     json_rpc_service: Option<JsonRpcService>,
     pubsub_service: Option<PubSubService>,
     optimistically_confirmed_bank_tracker: Option<OptimisticallyConfirmedBankTracker>,
@@ -298,6 +274,7 @@ pub(crate) fn abort() -> ! {
 }
 
 impl Validator {
+    #[allow(clippy::too_many_arguments)]
     pub fn new(
         mut node: Node,
         identity_keypair: &Arc<Keypair>,
@@ -308,6 +285,7 @@ impl Validator {
         config: &ValidatorConfig,
         should_check_duplicate_instance: bool,
         start_progress: Arc<RwLock<ValidatorStartProgress>>,
+        socket_addr_space: SocketAddrSpace,
     ) -> Self {
         let id = identity_keypair.pubkey();
         assert_eq!(id, node.info.id);
@@ -324,8 +302,6 @@ impl Validator {
             }
         }
 
-        report_target_features();
-
         for cluster_entrypoint in &cluster_entrypoints {
             info!("entrypoint: {:?}", cluster_entrypoint);
         }
@@ -387,7 +363,7 @@ impl Validator {
             bank_forks,
             blockstore,
             ledger_signal_receiver,
-            completed_slots_receivers,
+            completed_slots_receiver,
             leader_schedule_cache,
             snapshot_hash,
             TransactionHistoryServices {
@@ -409,6 +385,7 @@ impl Validator {
             &exit,
             config.enforce_ulimit_nofile,
             &start_progress,
+            config.no_poh_speed_test,
         );
 
         *start_progress.write().unwrap() = ValidatorStartProgress::StartingServices;
@@ -457,7 +434,11 @@ impl Validator {
             }
         }
 
-        let mut cluster_info = ClusterInfo::new(node.info.clone(), identity_keypair.clone());
+        let mut cluster_info = ClusterInfo::new(
+            node.info.clone(),
+            identity_keypair.clone(),
+            socket_addr_space,
+        );
         cluster_info.set_contact_debug_interval(config.contact_debug_interval);
         cluster_info.set_entrypoints(cluster_entrypoints);
         cluster_info.restore_contact_info(ledger_path, config.contact_save_interval);
@@ -530,10 +511,16 @@ impl Validator {
             optimistically_confirmed_bank_tracker,
             bank_notification_sender,
         ) = if let Some((rpc_addr, rpc_pubsub_addr)) = config.rpc_addrs {
-            if ContactInfo::is_valid_address(&node.info.rpc) {
-                assert!(ContactInfo::is_valid_address(&node.info.rpc_pubsub));
+            if ContactInfo::is_valid_address(&node.info.rpc, &socket_addr_space) {
+                assert!(ContactInfo::is_valid_address(
+                    &node.info.rpc_pubsub,
+                    &socket_addr_space
+                ));
             } else {
-                assert!(!ContactInfo::is_valid_address(&node.info.rpc_pubsub));
+                assert!(!ContactInfo::is_valid_address(
+                    &node.info.rpc_pubsub,
+                    &socket_addr_space
+                ));
             }
             let (bank_notification_sender, bank_notification_receiver) = unbounded();
             (
@@ -594,9 +581,13 @@ impl Validator {
             *start_progress.write().unwrap() = ValidatorStartProgress::Halted;
             std::thread::park();
         }
-
-        let ip_echo_server = node.sockets.ip_echo.map(solana_net_utils::ip_echo_server);
-
+        let ip_echo_server = match node.sockets.ip_echo {
+            None => None,
+            Some(tcp_listener) => Some(solana_net_utils::ip_echo_server(
+                tcp_listener,
+                Some(node.info.shred_version),
+            )),
+        };
         let gossip_service = GossipService::new(
             &cluster_info,
             Some(bank_forks.clone()),
@@ -610,6 +601,7 @@ impl Validator {
             &serve_repair,
             Some(blockstore.clone()),
             node.sockets.serve_repair,
+            socket_addr_space,
             &exit,
         );
 
@@ -640,10 +632,6 @@ impl Validator {
                 (None, None)
             };
 
-        if !config.no_poh_speed_test {
-            check_poh_speed(&genesis_config, None);
-        }
-
         let waited_for_supermajority = if let Ok(waited) = wait_for_supermajority(
             config,
             &bank,
@@ -719,7 +707,7 @@ impl Validator {
             tower,
             &leader_schedule_cache,
             &exit,
-            completed_slots_receivers,
+            completed_slots_receiver,
             block_commitment_cache,
             config.enable_partition.clone(),
             transaction_status_sender.clone(),
@@ -748,6 +736,7 @@ impl Validator {
                 rocksdb_compaction_interval: config.rocksdb_compaction_interval,
                 rocksdb_max_compaction_jitter: config.rocksdb_compaction_interval,
                 wait_for_vote_to_start_leader,
+                accounts_shrink_ratio: config.accounts_shrink_ratio,
             },
             &max_slots,
         );
@@ -986,7 +975,7 @@ fn post_process_restored_tower(
         })
         .unwrap_or_else(|err| {
             let voting_has_been_active =
-                active_vote_account_exists_in_bank(&bank_forks.working_bank(), &vote_account);
+                active_vote_account_exists_in_bank(&bank_forks.working_bank(), vote_account);
             if !err.is_file_missing() {
                 datapoint_error!(
                     "tower_error",
@@ -1019,10 +1008,10 @@ fn post_process_restored_tower(
             }
 
             Tower::new_from_bankforks(
-                &bank_forks,
+                bank_forks,
                 tower_path,
-                &validator_identity,
-                &vote_account,
+                validator_identity,
+                vote_account,
             )
         })
 }
@@ -1037,12 +1026,13 @@ fn new_banks_from_ledger(
     exit: &Arc<AtomicBool>,
     enforce_ulimit_nofile: bool,
     start_progress: &Arc<RwLock<ValidatorStartProgress>>,
+    no_poh_speed_test: bool,
 ) -> (
     GenesisConfig,
     BankForks,
     Arc<Blockstore>,
     Receiver<bool>,
-    [CompletedSlotsReceiver; 2],
+    CompletedSlotsReceiver,
     LeaderScheduleCache,
     Option<(Slot, Hash)>,
     TransactionHistoryServices,
@@ -1070,10 +1060,14 @@ fn new_banks_from_ledger(
         }
     }
 
+    if !no_poh_speed_test {
+        check_poh_speed(&genesis_config, None);
+    }
+
     let BlockstoreSignals {
         mut blockstore,
         ledger_signal_receiver,
-        completed_slots_receivers,
+        completed_slots_receiver,
         ..
     } = Blockstore::open_with_signal(
         ledger_path,
@@ -1085,9 +1079,9 @@ fn new_banks_from_ledger(
 
     let tower_path = config.tower_path.as_deref().unwrap_or(ledger_path);
 
-    let restored_tower = Tower::restore(tower_path, &validator_identity);
+    let restored_tower = Tower::restore(tower_path, validator_identity);
     if let Ok(tower) = &restored_tower {
-        reconcile_blockstore_roots_with_tower(&tower, &blockstore).unwrap_or_else(|err| {
+        reconcile_blockstore_roots_with_tower(tower, &blockstore).unwrap_or_else(|err| {
             error!("Failed to reconcile blockstore with tower: {:?}", err);
             abort()
         });
@@ -1119,6 +1113,9 @@ fn new_banks_from_ledger(
         debug_keys: config.debug_keys.clone(),
         account_indexes: config.account_indexes.clone(),
         accounts_db_caching_enabled: config.accounts_db_caching_enabled,
+        shrink_ratio: config.accounts_shrink_ratio,
+        accounts_db_test_hash_calculation: config.accounts_db_test_hash_calculation,
+        accounts_db_skip_shrink: config.accounts_db_skip_shrink,
         ..blockstore_processor::ProcessOptions::default()
     };
 
@@ -1188,7 +1185,7 @@ fn new_banks_from_ledger(
             None,
             &snapshot_config.snapshot_package_output_path,
             snapshot_config.archive_format,
-            Some(&bank_forks.root_bank().get_thread_pool()),
+            Some(bank_forks.root_bank().get_thread_pool()),
             snapshot_config.maximum_snapshots_to_retain,
         )
         .unwrap_or_else(|err| {
@@ -1200,9 +1197,9 @@ fn new_banks_from_ledger(
 
     let tower = post_process_restored_tower(
         restored_tower,
-        &validator_identity,
-        &vote_account,
-        &config,
+        validator_identity,
+        vote_account,
+        config,
         tower_path,
         &bank_forks,
     );
@@ -1225,7 +1222,7 @@ fn new_banks_from_ledger(
         bank_forks,
         blockstore,
         ledger_signal_receiver,
-        completed_slots_receivers,
+        completed_slots_receiver,
         leader_schedule_cache,
         snapshot_hash,
         transaction_history_services,
@@ -1407,7 +1404,7 @@ fn wait_for_supermajority(
             );
         }
 
-        let gossip_stake_percent = get_stake_percent_in_gossip(&bank, &cluster_info, i % 10 == 0);
+        let gossip_stake_percent = get_stake_percent_in_gossip(bank, cluster_info, i % 10 == 0);
 
         if gossip_stake_percent >= WAIT_FOR_SUPERMAJORITY_THRESHOLD_PERCENT {
             break;
@@ -1422,7 +1419,26 @@ fn wait_for_supermajority(
     Ok(true)
 }
 
-fn report_target_features() {
+fn is_rosetta_emulated() -> bool {
+    #[cfg(target_os = "macos")]
+    {
+        use std::str::FromStr;
+        std::process::Command::new("sysctl")
+            .args(&["-in", "sysctl.proc_translated"])
+            .output()
+            .map_err(|_| ())
+            .and_then(|output| String::from_utf8(output.stdout).map_err(|_| ()))
+            .and_then(|stdout| u8::from_str(stdout.trim()).map_err(|_| ()))
+            .map(|enabled| enabled == 1)
+            .unwrap_or(false)
+    }
+    #[cfg(not(target_os = "macos"))]
+    {
+        false
+    }
+}
+
+pub fn report_target_features() {
     warn!(
         "CUDA is {}abled",
         if solana_perf::perf_libs::api().is_some() {
@@ -1432,35 +1448,47 @@ fn report_target_features() {
         }
     );
 
-    // We exclude Mac OS here to be compatible with computers that have Mac M1 chips.
-    // For these computers, one must install rust/cargo/brew etc. using Rosetta 2,
-    // which allows them to run software targeted for x86_64 on an aarch64.
-    // Hence the code below will run on these machines (target_arch="x86_64")
-    // if we don't exclude with target_os="macos".
-    //
-    // It's going to require more more work to get Solana building
-    // on Mac M1's without Rosetta,
-    // and when that happens we should remove this
-    // (the feature flag for code targeting that is target_arch="aarch64")
-    #[cfg(all(
-        any(target_arch = "x86", target_arch = "x86_64"),
-        not(target_os = "macos")
-    ))]
-    {
-        // Validator binaries built on a machine with AVX support will generate invalid opcodes
-        // when run on machines without AVX causing a non-obvious process abort.  Instead detect
-        // the mismatch and error cleanly.
-        if is_x86_feature_detected!("avx") {
-            info!("AVX detected");
-        } else {
-            error!(
-                "Your machine does not have AVX support, please rebuild from source on your machine"
-            );
-            abort();
-        }
+    if !is_rosetta_emulated() {
+        unsafe { check_avx() };
+        unsafe { check_avx2() };
+    }
+}
+
+// Validator binaries built on a machine with AVX support will generate invalid opcodes
+// when run on machines without AVX causing a non-obvious process abort.  Instead detect
+// the mismatch and error cleanly.
+#[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
+#[target_feature(enable = "avx")]
+unsafe fn check_avx() {
+    if is_x86_feature_detected!("avx") {
+        info!("AVX detected");
+    } else {
+        error!(
+            "Incompatible CPU detected: missing AVX support. Please build from source on the target"
+        );
+        abort();
     }
 }
 
+#[cfg(not(any(target_arch = "x86", target_arch = "x86_64")))]
+unsafe fn check_avx() {}
+
+#[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
+#[target_feature(enable = "avx2")]
+unsafe fn check_avx2() {
+    if is_x86_feature_detected!("avx2") {
+        info!("AVX2 detected");
+    } else {
+        error!(
+            "Incompatible CPU detected: missing AVX2 support. Please build from source on the target"
+        );
+        abort();
+    }
+}
+
+#[cfg(not(any(target_arch = "x86", target_arch = "x86_64")))]
+unsafe fn check_avx2() {}
+
 // Get the activated stake percentage (based on the provided bank) that is visible in gossip
 fn get_stake_percent_in_gossip(bank: &Bank, cluster_info: &ClusterInfo, log: bool) -> u64 {
     let mut online_stake = 0;
@@ -1603,6 +1631,7 @@ mod tests {
             &config,
             true, // should_check_duplicate_instance
             start_progress.clone(),
+            SocketAddrSpace::Unspecified,
         );
         assert_eq!(
             *start_progress.read().unwrap(),
@@ -1636,9 +1665,11 @@ mod tests {
             }
             drop(blockstore);
 
+            // this purges and compacts all slots greater than or equal to 5
             backup_and_clear_blockstore(&blockstore_path, 5, 2);
 
             let blockstore = Blockstore::open(&blockstore_path).unwrap();
+            // assert that slots less than 5 aren't affected
             assert!(blockstore.meta(4).unwrap().unwrap().next_slots.is_empty());
             for i in 5..10 {
                 assert!(blockstore
@@ -1679,6 +1710,7 @@ mod tests {
                     &config,
                     true, // should_check_duplicate_instance
                     Arc::new(RwLock::new(ValidatorStartProgress::default())),
+                    SocketAddrSpace::Unspecified,
                 )
             })
             .collect();
@@ -1704,6 +1736,7 @@ mod tests {
         let cluster_info = ClusterInfo::new(
             ContactInfo::new_localhost(&node_keypair.pubkey(), timestamp()),
             node_keypair,
+            SocketAddrSpace::Unspecified,
         );
 
         let (genesis_config, _mint_keypair) = create_genesis_config(1);
diff --git a/core/src/verified_vote_packets.rs b/core/src/verified_vote_packets.rs
index f401af38a27e05..772aac1775ec31 100644
--- a/core/src/verified_vote_packets.rs
+++ b/core/src/verified_vote_packets.rs
@@ -15,17 +15,25 @@ impl VerifiedVotePackets {
         &mut self,
         vote_packets_receiver: &VerifiedLabelVotePacketsReceiver,
         last_update_version: &mut u64,
+        would_be_leader: bool,
     ) -> Result<()> {
         let timer = Duration::from_millis(200);
         let vote_packets = vote_packets_receiver.recv_timeout(timer)?;
         *last_update_version += 1;
-        for (label, slot, packet) in vote_packets {
-            self.0.insert(label, (*last_update_version, slot, packet));
-        }
-        while let Ok(vote_packets) = vote_packets_receiver.try_recv() {
+        if would_be_leader {
             for (label, slot, packet) in vote_packets {
                 self.0.insert(label, (*last_update_version, slot, packet));
             }
+        } else {
+            self.0.clear();
+            self.0.shrink_to_fit();
+        }
+        while let Ok(vote_packets) = vote_packets_receiver.try_recv() {
+            if would_be_leader {
+                for (label, slot, packet) in vote_packets {
+                    self.0.insert(label, (*last_update_version, slot, packet));
+                }
+            }
         }
         Ok(())
     }
@@ -137,7 +145,7 @@ mod tests {
         s.send(vec![(label1.clone(), 42, later_packets)]).unwrap();
         let mut verified_vote_packets = VerifiedVotePackets(HashMap::new());
         verified_vote_packets
-            .receive_and_process_vote_packets(&r, &mut update_version)
+            .receive_and_process_vote_packets(&r, &mut update_version, true)
             .unwrap();
 
         // Test timestamps for same batch are the same
@@ -171,7 +179,7 @@ mod tests {
         s.send(vec![(label2.clone(), 51, Packets::default())])
             .unwrap();
         verified_vote_packets
-            .receive_and_process_vote_packets(&r, &mut update_version)
+            .receive_and_process_vote_packets(&r, &mut update_version, true)
             .unwrap();
         let update_version2 = verified_vote_packets.get_vote_packets(&label2).unwrap().0;
         assert!(update_version2 > update_version1);
@@ -179,8 +187,8 @@ mod tests {
         // Test empty doesn't bump the version
         let before = update_version;
         assert_matches!(
-            verified_vote_packets.receive_and_process_vote_packets(&r, &mut update_version),
-            Err(Error::CrossbeamRecvTimeoutError(RecvTimeoutError::Timeout))
+            verified_vote_packets.receive_and_process_vote_packets(&r, &mut update_version, true),
+            Err(Error::CrossbeamRecvTimeout(RecvTimeoutError::Timeout))
         );
         assert_eq!(before, update_version);
     }
diff --git a/core/src/voting_service.rs b/core/src/voting_service.rs
new file mode 100644
index 00000000000000..4dcf8bf59fdd1e
--- /dev/null
+++ b/core/src/voting_service.rs
@@ -0,0 +1,79 @@
+use solana_gossip::cluster_info::ClusterInfo;
+use solana_poh::poh_recorder::PohRecorder;
+use solana_sdk::{clock::Slot, transaction::Transaction};
+use std::{
+    sync::{mpsc::Receiver, Arc, Mutex},
+    thread::{self, Builder, JoinHandle},
+};
+
+pub enum VoteOp {
+    PushVote {
+        tx: Transaction,
+        tower_slots: Vec<Slot>,
+    },
+    RefreshVote {
+        tx: Transaction,
+        last_voted_slot: Slot,
+    },
+}
+
+impl VoteOp {
+    fn tx(&self) -> &Transaction {
+        match self {
+            VoteOp::PushVote { tx, tower_slots: _ } => tx,
+            VoteOp::RefreshVote {
+                tx,
+                last_voted_slot: _,
+            } => tx,
+        }
+    }
+}
+
+pub struct VotingService {
+    thread_hdl: JoinHandle<()>,
+}
+
+impl VotingService {
+    pub fn new(
+        vote_receiver: Receiver<VoteOp>,
+        cluster_info: Arc<ClusterInfo>,
+        poh_recorder: Arc<Mutex<PohRecorder>>,
+    ) -> Self {
+        let thread_hdl = Builder::new()
+            .name("sol-vote-service".to_string())
+            .spawn(move || {
+                for vote_op in vote_receiver.iter() {
+                    Self::handle_vote(&cluster_info, &poh_recorder, vote_op);
+                }
+            })
+            .unwrap();
+        Self { thread_hdl }
+    }
+
+    pub fn handle_vote(
+        cluster_info: &ClusterInfo,
+        poh_recorder: &Mutex<PohRecorder>,
+        vote_op: VoteOp,
+    ) {
+        let _ = cluster_info.send_vote(
+            vote_op.tx(),
+            crate::banking_stage::next_leader_tpu(cluster_info, poh_recorder),
+        );
+
+        match vote_op {
+            VoteOp::PushVote { tx, tower_slots } => {
+                cluster_info.push_vote(&tower_slots, tx);
+            }
+            VoteOp::RefreshVote {
+                tx,
+                last_voted_slot,
+            } => {
+                cluster_info.refresh_vote(tx, last_voted_slot);
+            }
+        }
+    }
+
+    pub fn join(self) -> thread::Result<()> {
+        self.thread_hdl.join()
+    }
+}
diff --git a/core/src/window_service.rs b/core/src/window_service.rs
index eac0b4c55b55f7..c34238d500f5ee 100644
--- a/core/src/window_service.rs
+++ b/core/src/window_service.rs
@@ -134,7 +134,7 @@ fn verify_repair(
         .map(|repair_meta| {
             outstanding_requests.register_response(
                 repair_meta.nonce,
-                &shred,
+                shred,
                 solana_sdk::timing::timestamp(),
             )
         })
@@ -153,7 +153,7 @@ fn prune_shreds_invalid_repair(
         let mut outstanding_requests = outstanding_requests.write().unwrap();
         shreds.retain(|shred| {
             let should_keep = (
-                verify_repair(&mut outstanding_requests, &shred, &repair_infos[i]),
+                verify_repair(&mut outstanding_requests, shred, &repair_infos[i]),
                 i += 1,
             )
                 .0;
@@ -188,9 +188,14 @@ where
     }
 
     prune_shreds_invalid_repair(&mut shreds, &mut repair_infos, outstanding_requests);
+    let repairs: Vec<_> = repair_infos
+        .iter()
+        .map(|repair_info| repair_info.is_some())
+        .collect();
 
     let (completed_data_sets, inserted_indices) = blockstore.insert_shreds_handle_duplicate(
         shreds,
+        repairs,
         Some(leader_schedule_cache),
         false,
         &handle_duplicate,
@@ -582,12 +587,12 @@ impl WindowService {
         H: Fn(),
     {
         match e {
-            Error::CrossbeamRecvTimeoutError(RecvTimeoutError::Disconnected) => true,
-            Error::CrossbeamRecvTimeoutError(RecvTimeoutError::Timeout) => {
+            Error::CrossbeamRecvTimeout(RecvTimeoutError::Disconnected) => true,
+            Error::CrossbeamRecvTimeout(RecvTimeoutError::Timeout) => {
                 handle_timeout();
                 false
             }
-            Error::CrossbeamSendError => true,
+            Error::CrossbeamSend => true,
             _ => {
                 handle_error();
                 error!("thread {:?} error {:?}", thread::current().name(), e);
@@ -621,6 +626,7 @@ mod test {
         signature::{Keypair, Signer},
         timing::timestamp,
     };
+    use solana_streamer::socket::SocketAddrSpace;
     use std::sync::Arc;
 
     fn local_entries_to_shred(
@@ -630,7 +636,7 @@ mod test {
         keypair: &Arc<Keypair>,
     ) -> Vec<Shred> {
         let shredder = Shredder::new(slot, parent, keypair.clone(), 0, 0).unwrap();
-        shredder.entries_to_shreds(&entries, true, 0).0
+        shredder.entries_to_shreds(entries, true, 0).0
     }
 
     #[test]
@@ -771,7 +777,11 @@ mod test {
         assert!(!blockstore.has_duplicate_shreds_in_slot(duplicate_shred_slot));
         let keypair = Keypair::new();
         let contact_info = ContactInfo::new_localhost(&keypair.pubkey(), timestamp());
-        let cluster_info = ClusterInfo::new(contact_info, Arc::new(keypair));
+        let cluster_info = ClusterInfo::new(
+            contact_info,
+            Arc::new(keypair),
+            SocketAddrSpace::Unspecified,
+        );
         run_check_duplicate(
             &cluster_info,
             &blockstore,
diff --git a/core/tests/client.rs b/core/tests/client.rs
index 66d3a1ccc530fb..8fe1c04776f1a7 100644
--- a/core/tests/client.rs
+++ b/core/tests/client.rs
@@ -18,6 +18,7 @@ use solana_sdk::{
     signature::{Keypair, Signer},
     system_transaction,
 };
+use solana_streamer::socket::SocketAddrSpace;
 use std::{
     net::{IpAddr, SocketAddr},
     sync::{
@@ -34,7 +35,8 @@ fn test_rpc_client() {
     solana_logger::setup();
 
     let alice = Keypair::new();
-    let test_validator = TestValidator::with_no_fees(alice.pubkey(), None);
+    let test_validator =
+        TestValidator::with_no_fees(alice.pubkey(), None, SocketAddrSpace::Unspecified);
 
     let bob_pubkey = solana_sdk::pubkey::new_rand();
 
diff --git a/core/tests/fork-selection.rs b/core/tests/fork-selection.rs
index 23396a10d9d16f..cfeda12228486a 100644
--- a/core/tests/fork-selection.rs
+++ b/core/tests/fork-selection.rs
@@ -188,7 +188,7 @@ impl Tower {
             .delayed_votes
             .iter()
             .enumerate()
-            .map(|(i, v)| (*scores.get(&v).unwrap_or(&0), v.time, i))
+            .map(|(i, v)| (*scores.get(v).unwrap_or(&0), v.time, i))
             .collect();
         // highest score, latest vote first
         best.sort_unstable();
@@ -542,7 +542,7 @@ fn test_with_partitions(
             let mut scores: HashMap<Vote, usize> = HashMap::new();
             towers.iter().for_each(|n| {
                 n.delayed_votes.iter().for_each(|v| {
-                    *scores.entry(v.clone()).or_insert(0) += n.score(&v, &fork_tree);
+                    *scores.entry(v.clone()).or_insert(0) += n.score(v, &fork_tree);
                 })
             });
             for tower in towers.iter_mut() {
diff --git a/core/tests/ledger_cleanup.rs b/core/tests/ledger_cleanup.rs
index 5e6258415ff187..69778edefa6152 100644
--- a/core/tests/ledger_cleanup.rs
+++ b/core/tests/ledger_cleanup.rs
@@ -39,6 +39,8 @@ mod tests {
         pub cleanup_blockstore: bool,
         pub emit_cpu_info: bool,
         pub assert_compaction: bool,
+        pub compaction_interval: Option<u64>,
+        pub no_compaction: bool,
     }
 
     #[derive(Clone, Copy, Debug)]
@@ -154,6 +156,11 @@ mod tests {
         let emit_cpu_info = read_env("EMIT_CPU_INFO", true);
         // set default to `true` once compaction is merged
         let assert_compaction = read_env("ASSERT_COMPACTION", false);
+        let compaction_interval = match read_env("COMPACTION_INTERVAL", 0) {
+            maybe_zero if maybe_zero == 0 => None,
+            non_zero => Some(non_zero),
+        };
+        let no_compaction = read_env("NO_COMPACTION", false);
 
         BenchmarkConfig {
             benchmark_slots,
@@ -166,6 +173,8 @@ mod tests {
             cleanup_blockstore,
             emit_cpu_info,
             assert_compaction,
+            compaction_interval,
+            no_compaction,
         }
     }
 
@@ -211,8 +220,13 @@ mod tests {
     fn test_ledger_cleanup_compaction() {
         solana_logger::setup();
         let blockstore_path = get_tmp_ledger_path!();
-        let blockstore = Arc::new(Blockstore::open(&blockstore_path).unwrap());
+        let mut blockstore = Blockstore::open(&blockstore_path).unwrap();
         let config = get_benchmark_config();
+        if config.no_compaction {
+            blockstore.set_no_compaction(true);
+        }
+        let blockstore = Arc::new(blockstore);
+
         eprintln!("BENCHMARK CONFIG: {:?}", config);
         eprintln!("LEDGER_PATH: {:?}", &blockstore_path);
 
@@ -223,6 +237,8 @@ mod tests {
         let stop_size_bytes = config.stop_size_bytes;
         let stop_size_iterations = config.stop_size_iterations;
         let pre_generate_data = config.pre_generate_data;
+        let compaction_interval = config.compaction_interval;
+
         let batches = benchmark_slots / batch_size;
 
         let (sender, receiver) = channel();
@@ -232,7 +248,7 @@ mod tests {
             blockstore.clone(),
             max_ledger_shreds,
             &exit,
-            None,
+            compaction_interval,
             None,
         );
 
diff --git a/core/tests/rpc.rs b/core/tests/rpc.rs
index ee8291f8d150a5..7a6771ed010db2 100644
--- a/core/tests/rpc.rs
+++ b/core/tests/rpc.rs
@@ -6,8 +6,10 @@ use reqwest::{self, header::CONTENT_TYPE};
 use serde_json::{json, Value};
 use solana_account_decoder::UiAccount;
 use solana_client::{
+    client_error::{ClientErrorKind, Result as ClientResult},
     rpc_client::RpcClient,
     rpc_config::{RpcAccountInfoConfig, RpcSignatureSubscribeConfig},
+    rpc_request::RpcError,
     rpc_response::{Response, RpcSignatureResult, SlotUpdate},
     tpu_client::{TpuClient, TpuClientConfig},
 };
@@ -21,6 +23,7 @@ use solana_sdk::{
     system_transaction,
     transaction::Transaction,
 };
+use solana_streamer::socket::SocketAddrSpace;
 use solana_transaction_status::TransactionStatus;
 use std::{
     collections::HashSet,
@@ -58,7 +61,8 @@ fn test_rpc_send_tx() {
     solana_logger::setup();
 
     let alice = Keypair::new();
-    let test_validator = TestValidator::with_no_fees(alice.pubkey(), None);
+    let test_validator =
+        TestValidator::with_no_fees(alice.pubkey(), None, SocketAddrSpace::Unspecified);
     let rpc_url = test_validator.rpc_url();
 
     let bob_pubkey = solana_sdk::pubkey::new_rand();
@@ -122,7 +126,8 @@ fn test_rpc_invalid_requests() {
     solana_logger::setup();
 
     let alice = Keypair::new();
-    let test_validator = TestValidator::with_no_fees(alice.pubkey(), None);
+    let test_validator =
+        TestValidator::with_no_fees(alice.pubkey(), None, SocketAddrSpace::Unspecified);
     let rpc_url = test_validator.rpc_url();
 
     let bob_pubkey = solana_sdk::pubkey::new_rand();
@@ -153,7 +158,8 @@ fn test_rpc_invalid_requests() {
 fn test_rpc_slot_updates() {
     solana_logger::setup();
 
-    let test_validator = TestValidator::with_no_fees(Pubkey::new_unique(), None);
+    let test_validator =
+        TestValidator::with_no_fees(Pubkey::new_unique(), None, SocketAddrSpace::Unspecified);
 
     // Create the pub sub runtime
     let rt = Runtime::new().unwrap();
@@ -218,7 +224,8 @@ fn test_rpc_subscriptions() {
     solana_logger::setup();
 
     let alice = Keypair::new();
-    let test_validator = TestValidator::with_no_fees(alice.pubkey(), None);
+    let test_validator =
+        TestValidator::with_no_fees(alice.pubkey(), None, SocketAddrSpace::Unspecified);
 
     let transactions_socket = UdpSocket::bind("0.0.0.0:0").unwrap();
     transactions_socket.connect(test_validator.tpu()).unwrap();
@@ -385,7 +392,8 @@ fn test_rpc_subscriptions() {
 fn test_tpu_send_transaction() {
     let mint_keypair = Keypair::new();
     let mint_pubkey = mint_keypair.pubkey();
-    let test_validator = TestValidator::with_no_fees(mint_pubkey, None);
+    let test_validator =
+        TestValidator::with_no_fees(mint_pubkey, None, SocketAddrSpace::Unspecified);
     let rpc_client = Arc::new(RpcClient::new_with_commitment(
         test_validator.rpc_url(),
         CommitmentConfig::processed(),
@@ -414,3 +422,34 @@ fn test_tpu_send_transaction() {
         }
     }
 }
+
+#[test]
+fn deserialize_rpc_error() -> ClientResult<()> {
+    solana_logger::setup();
+
+    let alice = Keypair::new();
+    let validator = TestValidator::with_no_fees(alice.pubkey(), None, SocketAddrSpace::Unspecified);
+    let rpc_client = RpcClient::new(validator.rpc_url());
+
+    let bob = Keypair::new();
+    let lamports = 50;
+    let (recent_blockhash, _) = rpc_client.get_recent_blockhash()?;
+    let mut tx = system_transaction::transfer(&alice, &bob.pubkey(), lamports, recent_blockhash);
+
+    // This will cause an error
+    tx.signatures.clear();
+
+    let err = rpc_client.send_transaction(&tx);
+    let err = err.unwrap_err();
+
+    match err.kind {
+        ClientErrorKind::RpcError(RpcError::RpcRequestError { .. }) => {
+            // This is what used to happen
+            panic!()
+        }
+        ClientErrorKind::RpcError(RpcError::RpcResponseError { .. }) => Ok(()),
+        _ => {
+            panic!()
+        }
+    }
+}
diff --git a/core/tests/snapshots.rs b/core/tests/snapshots.rs
index 05b00b261887ba..bc0a52bb6bd515 100644
--- a/core/tests/snapshots.rs
+++ b/core/tests/snapshots.rs
@@ -60,6 +60,7 @@ mod tests {
         signature::{Keypair, Signer},
         system_transaction,
     };
+    use solana_streamer::socket::SocketAddrSpace;
     use std::{
         collections::HashSet,
         fs,
@@ -106,6 +107,8 @@ mod tests {
                 None,
                 AccountSecondaryIndexes::default(),
                 false,
+                accounts_db::AccountShrinkThreshold::default(),
+                false,
             );
             bank0.freeze();
             let mut bank_forks = BankForks::new(bank0);
@@ -145,8 +148,9 @@ mod tests {
 
         let old_last_bank = old_bank_forks.get(old_last_slot).unwrap();
 
-        let deserialized_bank = snapshot_utils::bank_from_archive(
-            &account_paths,
+        let check_hash_calculation = false;
+        let (deserialized_bank, _timing) = snapshot_utils::bank_from_archive(
+            account_paths,
             &[],
             &old_bank_forks
                 .snapshot_config
@@ -165,6 +169,9 @@ mod tests {
             AccountSecondaryIndexes::default(),
             false,
             None,
+            accounts_db::AccountShrinkThreshold::default(),
+            check_hash_calculation,
+            false,
         )
         .unwrap();
 
@@ -211,7 +218,7 @@ mod tests {
         };
         for slot in 0..last_slot {
             let mut bank = Bank::new_from_parent(&bank_forks[slot], &Pubkey::default(), slot + 1);
-            f(&mut bank, &mint_keypair);
+            f(&mut bank, mint_keypair);
             let bank = bank_forks.insert(bank);
             // Set root to make sure we don't end up with too many account storage entries
             // and to allow snapshotting of bank and the purging logic on status_cache to
@@ -220,7 +227,7 @@ mod tests {
                 // set_root should send a snapshot request
                 bank_forks.set_root(bank.slot(), &request_sender, None);
                 bank.update_accounts_hash();
-                snapshot_request_handler.handle_snapshot_requests(false, false, false);
+                snapshot_request_handler.handle_snapshot_requests(false, false, false, 0);
             }
         }
 
@@ -245,7 +252,7 @@ mod tests {
         .unwrap();
         let snapshot_package = snapshot_utils::process_accounts_package_pre(
             snapshot_package,
-            Some(&last_bank.get_thread_pool()),
+            Some(last_bank.get_thread_pool()),
         );
         snapshot_utils::archive_snapshot_package(
             &snapshot_package,
@@ -272,12 +279,12 @@ mod tests {
             |bank, mint_keypair| {
                 let key1 = Keypair::new().pubkey();
                 let tx =
-                    system_transaction::transfer(&mint_keypair, &key1, 1, bank.last_blockhash());
+                    system_transaction::transfer(mint_keypair, &key1, 1, bank.last_blockhash());
                 assert_eq!(bank.process_transaction(&tx), Ok(()));
 
                 let key2 = Keypair::new().pubkey();
                 let tx =
-                    system_transaction::transfer(&mint_keypair, &key2, 0, bank.last_blockhash());
+                    system_transaction::transfer(mint_keypair, &key2, 0, bank.last_blockhash());
                 assert_eq!(bank.process_transaction(&tx), Ok(()));
 
                 bank.freeze();
@@ -289,7 +296,7 @@ mod tests {
     fn goto_end_of_slot(bank: &mut Bank) {
         let mut tick_hash = bank.last_blockhash();
         loop {
-            tick_hash = hashv(&[&tick_hash.as_ref(), &[42]]);
+            tick_hash = hashv(&[tick_hash.as_ref(), &[42]]);
             bank.register_tick(&tick_hash);
             if tick_hash == bank.last_blockhash() {
                 bank.freeze();
@@ -344,7 +351,7 @@ mod tests {
             );
             let slot = bank.slot();
             let key1 = Keypair::new().pubkey();
-            let tx = system_transaction::transfer(&mint_keypair, &key1, 1, genesis_config.hash());
+            let tx = system_transaction::transfer(mint_keypair, &key1, 1, genesis_config.hash());
             assert_eq!(bank.process_transaction(&tx), Ok(()));
             bank.squash();
             let accounts_hash = bank.update_accounts_hash();
@@ -363,9 +370,9 @@ mod tests {
             snapshot_utils::snapshot_bank(
                 &bank,
                 vec![],
-                &package_sender,
-                &snapshot_path,
-                &snapshot_package_output_path,
+                package_sender,
+                snapshot_path,
+                snapshot_package_output_path,
                 snapshot_config.snapshot_version,
                 &snapshot_config.archive_format,
                 None,
@@ -423,7 +430,7 @@ mod tests {
 
         // Purge all the outdated snapshots, including the ones needed to generate the package
         // currently sitting in the channel
-        snapshot_utils::purge_old_snapshots(&snapshot_path);
+        snapshot_utils::purge_old_snapshots(snapshot_path);
         assert!(snapshot_utils::get_snapshot_paths(&snapshots_dir)
             .into_iter()
             .map(|path| path.slot)
@@ -437,7 +444,11 @@ mod tests {
         // channel hold hard links to these deleted snapshots. We verify this is the case below.
         let exit = Arc::new(AtomicBool::new(false));
 
-        let cluster_info = Arc::new(ClusterInfo::new_with_invalid_keypair(ContactInfo::default()));
+        let cluster_info = Arc::new(ClusterInfo::new(
+            ContactInfo::default(),
+            Arc::new(Keypair::new()),
+            SocketAddrSpace::Unspecified,
+        ));
 
         let pending_snapshot_package = PendingSnapshotPackage::default();
         let snapshot_packager_service = SnapshotPackagerService::new(
@@ -570,14 +581,14 @@ mod tests {
                 (MAX_CACHE_ENTRIES * 2 + 1) as u64,
                 |bank, mint_keypair| {
                     let tx = system_transaction::transfer(
-                        &mint_keypair,
+                        mint_keypair,
                         &key1,
                         1,
                         bank.parent().unwrap().last_blockhash(),
                     );
                     assert_eq!(bank.process_transaction(&tx), Ok(()));
                     let tx = system_transaction::transfer(
-                        &mint_keypair,
+                        mint_keypair,
                         &key2,
                         1,
                         bank.parent().unwrap().last_blockhash(),
diff --git a/crate-features/Cargo.toml b/crate-features/Cargo.toml
index 98788197f7e7a2..e5893d460ef028 100644
--- a/crate-features/Cargo.toml
+++ b/crate-features/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "solana-crate-features"
-version = "1.7.0"
+version = "1.7.11"
 description = "Solana Crate Features"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
diff --git a/docs/docusaurus.config.js b/docs/docusaurus.config.js
index 9baac67783b00f..7a04e68d635316 100644
--- a/docs/docusaurus.config.js
+++ b/docs/docusaurus.config.js
@@ -88,10 +88,6 @@ module.exports = {
               label: "Introduction",
               to: "introduction",
             },
-            {
-              label: "Tour de SOL",
-              to: "tour-de-sol",
-            },
           ],
         },
         {
diff --git a/docs/i18n/zh/docusaurus-plugin-content-docs/current/clusters.md b/docs/i18n/zh/docusaurus-plugin-content-docs/current/clusters.md
index 05c7fcb8946201..a1a7e5ebfa7d90 100644
--- a/docs/i18n/zh/docusaurus-plugin-content-docs/current/clusters.md
+++ b/docs/i18n/zh/docusaurus-plugin-content-docs/current/clusters.md
@@ -56,7 +56,6 @@ $ solana-validator \
 ## Testnet（测试网）
 
 - Testnet是我们在实时群集上重点测试最新发布功能的地方，尤其侧重于网络性能，稳定性和验证程序行为。
-- 集群[Tour de SOL](tour-de-sol.md)计划在Testnet上运行，在该计划中，我们接受恶意行为和对网络的攻击，以帮助我们发现和消除错误或网络漏洞。
 - Testnet代币**不是真实的**
 - Testnet可能会重置账本。
 - Testnet包括用于空投的代币水龙头，用于应用程序测试
diff --git a/docs/i18n/zh/docusaurus-plugin-content-docs/current/tour-de-sol.md b/docs/i18n/zh/docusaurus-plugin-content-docs/current/tour-de-sol.md
deleted file mode 100644
index 381e36e68c23a3..00000000000000
--- a/docs/i18n/zh/docusaurus-plugin-content-docs/current/tour-de-sol.md
+++ /dev/null
@@ -1,11 +0,0 @@
----
-title: 介绍
----
-
-## 欢迎！
-
-本指南包括了关于如何参加 Solana Tour de SOL 的信息。 遇到困难？ 需要提出看法？ 请发邮件到 ryan@solana.com
-
-### [了解更多关于 Tour de SOL 的信息](https://solana.com/tds/)
-
-如果您还没有注册，请先在 [https://solana.com/tds/](https://solana.com/tds/) 填写表格。
diff --git a/docs/i18n/zh/docusaurus-plugin-content-docs/current/tour-de-sol/participation/README.md b/docs/i18n/zh/docusaurus-plugin-content-docs/current/tour-de-sol/participation/README.md
deleted file mode 100644
index 9882d83fb2c35d..00000000000000
--- a/docs/i18n/zh/docusaurus-plugin-content-docs/current/tour-de-sol/participation/README.md
+++ /dev/null
@@ -1 +0,0 @@
-# 参与方法
diff --git a/docs/i18n/zh/docusaurus-plugin-content-docs/current/tour-de-sol/participation/steps-to-create-a-validator.md b/docs/i18n/zh/docusaurus-plugin-content-docs/current/tour-de-sol/participation/steps-to-create-a-validator.md
deleted file mode 100644
index fa190ee2a4d065..00000000000000
--- a/docs/i18n/zh/docusaurus-plugin-content-docs/current/tour-de-sol/participation/steps-to-create-a-validator.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-title: 创建验证节点的步骤
----
-
-要创建Solana验证节点，请遵循针对[Testnet集群](../../clusters.md)的常规[验证节点工作流程](../../running-validator/validator-start.md)。
-
-请注意，运行每个Epoch的进程都会自动质押到Testnet验证节点。 如果您的验证节点运行正常，则将在两天内质押生效(如果长时间离线则自动取消质押)。
diff --git a/docs/i18n/zh/docusaurus-plugin-content-docs/current/tour-de-sol/participation/validator-public-key-registration.md b/docs/i18n/zh/docusaurus-plugin-content-docs/current/tour-de-sol/participation/validator-public-key-registration.md
deleted file mode 100644
index 3b94d7095a286e..00000000000000
--- a/docs/i18n/zh/docusaurus-plugin-content-docs/current/tour-de-sol/participation/validator-public-key-registration.md
+++ /dev/null
@@ -1,44 +0,0 @@
----
-title: 创建验证节点公钥
----
-
-您需要先注册才能参加到网络中。 请查看 [注册信息](../registration/how-to-register.md)。
-
-为了获得 SOL 奖励，您需要在keybase.io帐户下发布验证者的身份公共密钥。
-
-## **生成密钥对**
-
-1. 如果还没有密钥对，请运行以下命令来为验证节点生成一个：
-
-   ```bash
-     solana-keygen new -o ~/validator-keypair.json
-   ```
-
-2. 现在可以运行以下命令查看身份公共密钥：
-
-   ```bash
-     solana-keygen pubkey ~/validator-keypair.json
-   ```
-
-> 注意：“validator-keypair.json”文件也是您的 \(ed25519\) 私钥。
-
-验证节点身份密钥独特识别了您在网络中的验证节点。 **备份此信息至关重要。**
-
-如果您不备份此信息，那么如果您无法访问验证节点的话，将无法对其进行恢复。 如果发生这种情况，您将失去SOL TOO的奖励。
-
-要备份您的验证节点识别密钥， **请备份您的"validator-keypair.json" 文件到一个安全位置。**
-
-## 将您的Solana公钥链接到Keybase帐户
-
-您必须将Solana pubkey链接到Keybase.io帐户。 以下说明介绍了如何通过在服务器上安装Keybase来执行此操作。
-
-1. 在您的机器上安装[Keybase](https://keybase.io/download)。
-2. 登录到服务器上的Keybase帐户。 如果您还没有Keybase帐户，请先创建一个。 以下是基本的[Keybase CLI命令列表](https://keybase.io/docs/command_line/basics)。
-3. 在公用文件夹中创建一个Solana目录：`mkdir /keybase/public/<KEYBASE_USERNAME>/solana`
-4. 在Keybase公共文件夹中按以下格式创建一个空文件，来发布验证者的身份公共密钥：`/keybase/public/<KEYBASE_USERNAME>/solana/validator-<BASE58_PUBKEY>`。 例如：
-
-   ```bash
-     touch /keybase/public/<KEYBASE_USERNAME>/solana/validator-<BASE58_PUBKEY>
-   ```
-
-5. 要检查公钥是否已成功发布，请确保您在 `https://keybase.pub/<KEYBASE_USERNAME>/solana/validator-<BASE58_PUBKEY>` 看到它。
diff --git a/docs/i18n/zh/docusaurus-plugin-content-docs/current/tour-de-sol/participation/validator-technical-requirements.md b/docs/i18n/zh/docusaurus-plugin-content-docs/current/tour-de-sol/participation/validator-technical-requirements.md
deleted file mode 100644
index 388edfa685556e..00000000000000
--- a/docs/i18n/zh/docusaurus-plugin-content-docs/current/tour-de-sol/participation/validator-technical-requirements.md
+++ /dev/null
@@ -1,11 +0,0 @@
----
-title: 运行验证节点的要求
----
-
-## 硬件
-
-请参考 [建议的硬件配置](../../running-validator/validator-reqs.md)。
-
-## 软件
-
-- 我们在Ubuntu 04/18上进行开发和运行。 在Ubuntu 04/16上运行时，某些用户会遇到一些问题
diff --git a/docs/i18n/zh/docusaurus-plugin-content-docs/current/tour-de-sol/registration/README.md b/docs/i18n/zh/docusaurus-plugin-content-docs/current/tour-de-sol/registration/README.md
deleted file mode 100644
index 6dbeaf5bc3e081..00000000000000
--- a/docs/i18n/zh/docusaurus-plugin-content-docs/current/tour-de-sol/registration/README.md
+++ /dev/null
@@ -1 +0,0 @@
-# 注册
diff --git a/docs/i18n/zh/docusaurus-plugin-content-docs/current/tour-de-sol/registration/confidentiality.md b/docs/i18n/zh/docusaurus-plugin-content-docs/current/tour-de-sol/registration/confidentiality.md
deleted file mode 100644
index 86dec1328712b0..00000000000000
--- a/docs/i18n/zh/docusaurus-plugin-content-docs/current/tour-de-sol/registration/confidentiality.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-title: 保密规定
----
-
-请参看****第 8 章[** TOUR DE SOL 参与规则的 **](https://drive.google.com/file/d/15ueLG6VJoQ5Hx4rnpjFeuL3pG5DbrBbE/view) ** 保密规定。**
-
-Solana 无意在 Tour de SOL 共享任何机密信息。 我们将会通过口头、电子邮件等方式将信息分享出去。 除非明确地调出信息，否则不应将信息视为机密信息，我们欢迎您的分享。
diff --git a/docs/i18n/zh/docusaurus-plugin-content-docs/current/tour-de-sol/registration/how-to-register.md b/docs/i18n/zh/docusaurus-plugin-content-docs/current/tour-de-sol/registration/how-to-register.md
deleted file mode 100644
index 20b8d8a902642c..00000000000000
--- a/docs/i18n/zh/docusaurus-plugin-content-docs/current/tour-de-sol/registration/how-to-register.md
+++ /dev/null
@@ -1,25 +0,0 @@
----
-title: 如何注册
----
-
-#### 1) 注册表
-
-[请在此提交注册表](https://forms.gle/gQYLozj5u7yKU3HG6)
-
-#### 2) KYC/AML(通过 Coinlist)
-
-[请在这里注册 KYC/AML + 参与协议](https://tsm.coinlist.co/solana-staking)
-
-_如果您先前已经完成了 SLP 或 TdS 的 KYC/AML，那么同一个实体/个人就不需要这个步骤了。 我们不接受美国 实体或个人。_
-
-#### 3) 加入我们的Discord
-
-所有 Tour de SOL 验证程序**都需要**加入，因为这是我们的主要通信渠道：https://discord.gg/N3mqAfa
-
-### 下一步
-
-- 查看我们的文档来熟悉如何[运行一个验证节点](../../running-validator.md)
-
-- 完成注册后，您将收到一封电子邮件，说明您要完成了注册流程。
-
-- 在 Discord 上相见！
diff --git a/docs/i18n/zh/docusaurus-plugin-content-docs/current/tour-de-sol/registration/rewards.md b/docs/i18n/zh/docusaurus-plugin-content-docs/current/tour-de-sol/registration/rewards.md
deleted file mode 100644
index 653dc850955d73..00000000000000
--- a/docs/i18n/zh/docusaurus-plugin-content-docs/current/tour-de-sol/registration/rewards.md
+++ /dev/null
@@ -1,29 +0,0 @@
----
-title: 奖励
----
-
-## 奖励计算 <a id="how-are-rewards-calculated"></a>
-
-奖励将根据 [论坛的这个帖子](https://forums.solana.com/t/tour-de-sol-stage-1-preliminary-compensation-design/79) 和 [这个表格](https://docs.google.com/spreadsheets/d/11puBSw2THdO4wU-uyDEic-D03jg4ZAooVpcZU0w_4gI/edit#gid=218406032) 中描述的奖励规则来计算。
-
-另外请查看 [TOUR DE SOL 参与条款](https://drive.google.com/file/d/15ueLG6VJoQ5Hx4rnpjFeuL3pG5DbrBbE/view) 中的“2\(f\) Tour de Sol 详情”，来了解更多奖励详情。
-
-## 领取奖励的要求 <a id="what-are-the-requirements-to-receive-rewards"></a>
-
-参与者必须已经签署 Tour de SOL 参与协议，并通过 CoinList 平台以个人身份通过KYC/AML，并在参加之前填写了W-8 BEN或W-9纳税表格\(取决于您的居住地\) 来参与到 Tour 中。 完成注册后，参与者可以参加到任何一个和所有的阶段。 最终注册日期将分阶段公开宣布。
-
-最后，参与者必须签署Solana的标准[代币协议](https://drive.google.com/open?id=1O4cEUZzeSNoVcncbHcEegAqPgjT-7hcy)。 代币协议将在奖励发放日期之前由Solana提供。
-
-另外请参阅 [TOUR DE SOL 参与条款](https://drive.google.com/file/d/15ueLG6VJoQ5Hx4rnpjFeuL3pG5DbrBbE/view) 中的“2\(i\) & 2\(j\) Tour de Sol 详情”部分，了解与领取奖励有关的更多详情。
-
-## 税务要求 <a id="what-are-the-tax-implications-of-the-rewards"></a>
-
-参与者正在与Solana签订服务协议，并获得与服务相关的酌情奖励。 他们不被视为公司的全职员工，因此如果适用的话，Solana会收集W-9和W-8 BEN表格以支持纳税报告义务。 Solana建议参与者咨询税务会计师，以了解任何潜在的税务要求。
-
-此外，如 [TOUR DE SOL 参与条款](https://drive.google.com/file/d/15ueLG6VJoQ5Hx4rnpjFeuL3pG5DbrBbE/view) 第2i、2k和10c节所述：
-
-> 2i - 要获得任何SOL奖励，参与者必须签署公司的SOL奖励协议标准格式，其中包括作为SOL奖励发行的管理SOL所有权和使用的条款和条件，包括但不限于适用的锁定证券法、黑名单日期和纳税报告信息要求。
-
-> 2k - 要获得任何SOL奖励，入围者必须签署公司的SOL奖励协议标准格式，其中包括作为SOL奖励发行的用于管理SOL所有权和使用的条款和条件，包括但不限于适用的锁定证券法、黑名单日期和纳税报告信息要求。
-
-> 10c - 您有责任遵守适用于任何协议的交易的所有法律和法规，包括但不限于《商品交易法》以及美国 商品期货交易委员会\(“CFTC”\)颁布的法规，美国 证券交易委员会\(“SEC”\) 颁布的联邦证券法律和法规以及适用于您从公司收取的任何报酬的税法。
diff --git a/docs/i18n/zh/docusaurus-plugin-content-docs/current/tour-de-sol/registration/terms-of-participation.md b/docs/i18n/zh/docusaurus-plugin-content-docs/current/tour-de-sol/registration/terms-of-participation.md
deleted file mode 100644
index 320bdea36cb32f..00000000000000
--- a/docs/i18n/zh/docusaurus-plugin-content-docs/current/tour-de-sol/registration/terms-of-participation.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: 参与条款
----
-
-详情请查看官方 [TOUR DE SOL 参与条款](https://drive.google.com/a/solana.com/file/d/15ueLG6VJoQ5Hx4rnpjFeuL3pG5DbrBbE/view?usp=sharing)。
diff --git a/docs/i18n/zh/docusaurus-plugin-content-docs/current/tour-de-sol/registration/validator-registration-and-rewards-faq.md b/docs/i18n/zh/docusaurus-plugin-content-docs/current/tour-de-sol/registration/validator-registration-and-rewards-faq.md
deleted file mode 100644
index 5aa0df3cf382d6..00000000000000
--- a/docs/i18n/zh/docusaurus-plugin-content-docs/current/tour-de-sol/registration/validator-registration-and-rewards-faq.md
+++ /dev/null
@@ -1,53 +0,0 @@
----
-title: 注册常见问题
----
-
-对于任何参与问题，[TOUR DE SOL 参与条款](https://drive.google.com/a/solana.com/file/d/15ueLG6VJoQ5Hx4rnpjFeuL3pG5DbrBbE/view?usp=sharing) 都应被视为权威资料。
-
-## 注册是强制性的吗？
-
-是的。 注册是强制的。 注册正在进行中， 我们每月主办为期一个月的 Tour de SOL，新的参加者需要等到下一阶段开始时才能进入。 [注册信息在这里](how-to-register.md)。
-
-## 谁有资格参加？
-
-详情请见 [TOUR DE SOL Participation terms](https://drive.google.com/a/solana.com/file/d/15ueLG6VJoQ5Hx4rnpjFeuL3pG5DbrBbE/view?usp=sharing) 的“参与资格 1；KYC 要求”。
-
-## 我是否必须完成KYC/AML认证才能参与？
-
-是的。 完成KYC/AML是强制性的。 如果你在第一阶段前没有完成这个进程，你就无法参加到 Tour de SOL。
-
-我们已经与 Coinlist 合作管理 Tour de SOL 的 KYC/AML。 您可以在这里找到 [参与教程](https://docs.google.com/presentation/d/1gz8e34piUzzwzCMKwVrKKbZiPXV64Uq2-Izt4-VcMR4/)，[在这里完成认证](https://docs.google.com/presentation/d/1gz8e34piUzzwzCMKwVrKKbZiPXV64Uq2-Izt4-VcMR4/edit#slide=id.g5dff17f5e5_0_44)。
-
-## 我作为 Tour de Sol 参与者的责任是什么？
-
-详情请查看 [TOR DE SOL 参与条款中](https://drive.google.com/file/d/15ueLG6VJoQ5Hx4rnpjFeuL3pG5DbrBbE/view) 的“2c Tour de SOL详情”。
-
-### 如何计算“Tour de Sol 活跃 Tour 事件时间的 50%”责任？
-
-为了有资格在给定阶段获得奖励，验证者必须在该阶段 &gt;= 50％的位置中提交投票。
-
-如果验证者无法为某个阶段提交 &gt;= 50％的投票，但仍然认为他们应该在该阶段获得奖励，那么他们可以向Solana提出重新考虑的请求。
-
-## Tour de Sol 测试代币与 Solana 主网代币之间是否有关系？
-
-没有。 详情请查看 [TOR DE SOL 参与条款中](https://drive.google.com/file/d/15ueLG6VJoQ5Hx4rnpjFeuL3pG5DbrBbE/view) 的“2d Tour de SOL Details”。
-
-## 验证节点会被取消 Tour de Sol 资格吗？
-
-会的。 如果某个验证节点从事违禁行为和/或未能提供上述第\#4点所述的最低限度服务，那么它将被取消资格。
-
-另见 [ TOUR DE SOL 参与条款](https://drive.google.com/file/d/15ueLG6VJoQ5Hx4rnpjFeuL3pG5DbrBbE/view) 的“4 违禁行为”，来详细地查看违禁行为。
-
-### 更多关于违禁行为的问题：
-
-#### 如“ 4 禁止行为”一节所述，有在居住地管辖范围以外的其他管辖区提供 Tour 服务的例子吗？ 是否意味着服务器必须放在我居住地的管辖范围内？
-
-不是的。 服务器可以位于与参与者的居住地不同的其他管辖区中。 签署[TOUR DE SOL 参与条款](https://drive.google.com/file/d/15ueLG6VJoQ5Hx4rnpjFeuL3pG5DbrBbE/view)后，参与者已同意：如果居住在美国，他们就在美国提供服务；如果不在美国境内，他们就从美国境外提供服务。
-
-## 奖励是怎么计算的？
-
-详情请查看 [奖励部分](rewards.md)。
-
-## 我们怎么知道能否公开分享哪些信息？
-
-请查看 [保密协议](confidentiality.md)。
diff --git a/docs/i18n/zh/docusaurus-plugin-content-docs/current/tour-de-sol/submitting-bugs.md b/docs/i18n/zh/docusaurus-plugin-content-docs/current/tour-de-sol/submitting-bugs.md
deleted file mode 100644
index 04df217326c074..00000000000000
--- a/docs/i18n/zh/docusaurus-plugin-content-docs/current/tour-de-sol/submitting-bugs.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-title: 提交 Bug
----
-
-请在[此Github代码库中的issue](https://github.com/solana-labs/solana/issues)提交所有的漏洞和反馈。
-
-由于[Discord频道](useful-links.md)的信息流比较快，因此其中报告的问题很可能会在信息流中丢失。 在Github代码库中归档问题是确保记录并解决问题的唯一方法。
diff --git a/docs/i18n/zh/docusaurus-plugin-content-docs/current/tour-de-sol/useful-links.md b/docs/i18n/zh/docusaurus-plugin-content-docs/current/tour-de-sol/useful-links.md
deleted file mode 100644
index 6ef11c50f149ba..00000000000000
--- a/docs/i18n/zh/docusaurus-plugin-content-docs/current/tour-de-sol/useful-links.md
+++ /dev/null
@@ -1,15 +0,0 @@
----
-title: 有用的链接 & 讨论
-description: 阅读本指南以后
----
-
-- [网络浏览器](http://explorer.solana.com/)
-- [TdS 性能指示板](https://metrics.solana.com:3000/d/monitor-edge/cluster-telemetry-edge?refresh=1m&from=now-15m&to=now&var-testnet=tds)
-- 验证节点频道
-  - [\#validator-support](https://discord.gg/rZsenD) 通用群组用于讨论 Tour de SOL 故障以外的验证节点相关疑问。
-  - [\#tourdesol-validators](https://discord.gg/BdujK2) 群组供 Tour de SOL 参与者进行交流。
-  - [\#tourdesol-annound](https://discord.gg/Q5TxEC)，关于 Tour de SOL 关键信息的唯一官方发布频道。
-- [核心软件代码库](https://github.com/solana-labs/solana)
-- [在此仓库中提交 bug 和反馈](https://github.com/solana-labs/solana/issues)
-
-> 找不到您想要的东西？ 请发送电子邮件到 ryan@solana.com 或在 Discord 联系 @rshea\#2622。
diff --git a/docs/i18n/zh/docusaurus-theme-classic/footer.json b/docs/i18n/zh/docusaurus-theme-classic/footer.json
index fd2962f254ba4a..0dc706b81a56b8 100644
--- a/docs/i18n/zh/docusaurus-theme-classic/footer.json
+++ b/docs/i18n/zh/docusaurus-theme-classic/footer.json
@@ -15,10 +15,6 @@
     "message": "介绍",
     "description": "The label of footer link with label=Introduction linking to introduction"
   },
-  "link.item.label.Tour de SOL": {
-    "message": "Tour de SOL",
-    "description": "The label of footer link with label=Tour de SOL linking to tour-de-sol"
-  },
   "link.item.label.Discord": {
     "message": "Discord",
     "description": "The label of footer link with label=Discord linking to https://discordapp.com/invite/pquxPsq"
@@ -39,4 +35,4 @@
     "message": "Copyright © 2021 Solana Foundation",
     "description": "The footer copyright"
   }
-}
\ No newline at end of file
+}
diff --git a/docs/sidebars.js b/docs/sidebars.js
index f53d3cb07bea49..0106f9e9370b1b 100644
--- a/docs/sidebars.js
+++ b/docs/sidebars.js
@@ -101,35 +101,6 @@ module.exports = {
       "running-validator/validator-stake",
       "running-validator/validator-monitor",
       "running-validator/validator-info",
-      {
-        type: "category",
-        label: "Incenvitized Testnet",
-        items: [
-          "tour-de-sol",
-          {
-            type: "category",
-            label: "Registration",
-            items: [
-              "tour-de-sol/registration/how-to-register",
-              "tour-de-sol/registration/terms-of-participation",
-              "tour-de-sol/registration/rewards",
-              "tour-de-sol/registration/confidentiality",
-              "tour-de-sol/registration/validator-registration-and-rewards-faq",
-            ],
-          },
-          {
-            type: "category",
-            label: "Participation",
-            items: [
-              "tour-de-sol/participation/validator-technical-requirements",
-              "tour-de-sol/participation/validator-public-key-registration",
-              "tour-de-sol/participation/steps-to-create-a-validator",
-            ],
-          },
-          "tour-de-sol/useful-links",
-          "tour-de-sol/submitting-bugs",
-        ],
-      },
       "running-validator/validator-troubleshoot",
     ],
     Clusters: [
@@ -213,22 +184,23 @@ module.exports = {
         label: "Accepted",
         items: [
           "proposals/accepted-design-proposals",
+          "proposals/bankless-leader",
+          "proposals/block-confirmation",
+          "proposals/cluster-test-framework",
+          "proposals/embedding-move",
+          "proposals/interchain-transaction-verification",
           "proposals/ledger-replication-to-implement",
           "proposals/optimistic-confirmation-and-slashing",
-          "proposals/vote-signing-to-implement",
-          "proposals/cluster-test-framework",
-          "proposals/validator-proposal",
+          "proposals/optimistic_confirmation",
+          "proposals/rip-curl",
+          "proposals/rust-clients",
           "proposals/simple-payment-and-state-verification",
-          "proposals/interchain-transaction-verification",
-          "proposals/snapshot-verification",
-          "proposals/bankless-leader",
           "proposals/slashing",
+          "proposals/snapshot-verification",
           "proposals/tick-verification",
-          "proposals/block-confirmation",
-          "proposals/rust-clients",
-          "proposals/optimistic_confirmation",
-          "proposals/embedding-move",
-          "proposals/rip-curl",
+          "proposals/transactions-v2",
+          "proposals/validator-proposal",
+          "proposals/vote-signing-to-implement",
         ],
       },
     ],
diff --git a/docs/src/cluster/bench-tps.md b/docs/src/cluster/bench-tps.md
index 938b220a581fec..e5b805fcd8fe5a 100644
--- a/docs/src/cluster/bench-tps.md
+++ b/docs/src/cluster/bench-tps.md
@@ -123,7 +123,7 @@ This will dump all the threads stack traces into gdb.txt
 In this example the client connects to our public testnet. To run validators on the testnet you would need to open udp ports `8000-10000`.
 
 ```bash
-NDEBUG=1 ./multinode-demo/bench-tps.sh --entrypoint devnet.solana.com:8001 --faucet devnet.solana.com:9900 --duration 60 --tx_count 50
+NDEBUG=1 ./multinode-demo/bench-tps.sh --entrypoint entrypoint.devnet.solana.com:8001 --faucet api.devnet.solana.com:9900 --duration 60 --tx_count 50
 ```
 
 You can observe the effects of your client's transactions on our [metrics dashboard](https://metrics.solana.com:3000/d/monitor/cluster-telemetry?var-testnet=devnet)
diff --git a/docs/src/cluster/leader-rotation.md b/docs/src/cluster/leader-rotation.md
index aa71c76f2cf5bb..a52cbb7eafc465 100644
--- a/docs/src/cluster/leader-rotation.md
+++ b/docs/src/cluster/leader-rotation.md
@@ -19,7 +19,7 @@ Without a partition lasting longer than an epoch, the cluster will work as follo
 
 For example:
 
-The epoch duration is 100 slots. The root fork is updated from fork computed at slot height 99 to a fork computed at slot height 102. Forks with slots at height 100, 101 were skipped because of failures. The new leader schedule is computed using fork at slot height 102. It is active from slot 200 until it is updated again.
+Let's assume an epoch duration of 100 slots, which in reality is magnitudes higher. The root fork is updated from fork computed at slot height 99 to a fork computed at slot height 102. Forks with slots at height 100, 101 were skipped because of failures. The new leader schedule is computed using fork at slot height 102. It is active from slot 200 until it is updated again.
 
 No inconsistency can exist because every validator that is voting with the cluster has skipped 100 and 101 when its root passes 102. All validators, regardless of voting pattern, would be committing to a root that is either 102, or a descendant of 102.
 
diff --git a/docs/src/clusters.md b/docs/src/clusters.md
index 09e5f935ed89b3..ce78456f387d59 100644
--- a/docs/src/clusters.md
+++ b/docs/src/clusters.md
@@ -44,27 +44,32 @@ solana config set --url https://api.devnet.solana.com
 $ solana-validator \
     --identity validator-keypair.json \
     --vote-account vote-account-keypair.json \
-    --trusted-validator dv1LfzJvDF7S1fBKpFgKoKXK5yoSosmkAdfbxBo1GqJ \
-    --no-untrusted-rpc \
+    --known-validator dv1ZAGvdsz5hHLwWXsVnM94hWf1pjbKVau1QVkaMJ92 \
+    --known-validator dv2eQHeP4RFrJZ6UeiZWoc3XTtmtZCUKxxCApCDcRNV \
+    --known-validator dv4ACNkpYPcE3aKmYDqZm9G5EB3J4MRoeE7WNDRBVJB \
+    --known-validator dv3qDFk1DTF36Z62bNvrCXe9sKATA6xvVy6A798xxAS \
+    --only-known-rpc \
     --ledger ledger \
     --rpc-port 8899 \
     --dynamic-port-range 8000-8010 \
     --entrypoint entrypoint.devnet.solana.com:8001 \
+    --entrypoint entrypoint2.devnet.solana.com:8001 \
+    --entrypoint entrypoint3.devnet.solana.com:8001 \
+    --entrypoint entrypoint4.devnet.solana.com:8001 \
+    --entrypoint entrypoint5.devnet.solana.com:8001 \
     --expected-genesis-hash EtWTRABZaYq6iMfeYKouRu166VU2xqa1wcaWoxPkrZBG \
     --wal-recovery-mode skip_any_corrupted_record \
     --limit-ledger-size
 ```
 
-The `--trusted-validator`s is operated by Solana
+The [`--known-validator`s](running-validator/validator-start.md#known-validators)
+are operated by Solana Labs
 
 ## Testnet
 
 - Testnet is where we stress test recent release features on a live
   cluster, particularly focused on network performance, stability and validator
   behavior.
-- [Tour de SOL](tour-de-sol.md) initiative runs on Testnet, where we
-  encourage malicious behavior and attacks on the network to help us find and
-  squash bugs or network vulnerabilities.
 - Testnet tokens are **not real**
 - Testnet may be subject to ledger resets.
 - Testnet includes a token faucet for airdrops for application testing
@@ -91,11 +96,11 @@ solana config set --url https://api.testnet.solana.com
 $ solana-validator \
     --identity validator-keypair.json \
     --vote-account vote-account-keypair.json \
-    --trusted-validator 5D1fNXzvv5NjV1ysLjirC4WY92RNsVH18vjmcszZd8on \
-    --trusted-validator 7XSY3MrYnK8vq693Rju17bbPkCN3Z7KvvfvJx4kdrsSY \
-    --trusted-validator Ft5fbkqNa76vnsjYNwjDZUXoTWpP7VYm3mtsaQckQADN \
-    --trusted-validator 9QxCLckBiJc783jnMvXZubK4wH86Eqqvashtrwvcsgkv \
-    --no-untrusted-rpc \
+    --known-validator 5D1fNXzvv5NjV1ysLjirC4WY92RNsVH18vjmcszZd8on \
+    --known-validator 7XSY3MrYnK8vq693Rju17bbPkCN3Z7KvvfvJx4kdrsSY \
+    --known-validator Ft5fbkqNa76vnsjYNwjDZUXoTWpP7VYm3mtsaQckQADN \
+    --known-validator 9QxCLckBiJc783jnMvXZubK4wH86Eqqvashtrwvcsgkv \
+    --only-known-rpc \
     --ledger ledger \
     --rpc-port 8899 \
     --dynamic-port-range 8000-8010 \
@@ -107,17 +112,16 @@ $ solana-validator \
     --limit-ledger-size
 ```
 
-The identity of the `--trusted-validator`s are:
+The identities of the
+[`--known-validator`s](running-validator/validator-start.md#known-validators) are:
 
-- `5D1fNXzvv5NjV1ysLjirC4WY92RNsVH18vjmcszZd8on` - Solana Foundation (testnet.solana.com)
-- `7XSY3MrYnK8vq693Rju17bbPkCN3Z7KvvfvJx4kdrsSY` - Solana Foundation (Break RPC node)
+- `5D1fNXzvv5NjV1ysLjirC4WY92RNsVH18vjmcszZd8on` - Solana Labs (testnet.solana.com)
 - `Ft5fbkqNa76vnsjYNwjDZUXoTWpP7VYm3mtsaQckQADN` - Certus One
 - `9QxCLckBiJc783jnMvXZubK4wH86Eqqvashtrwvcsgkv` - Algo|Stake
 
 ## Mainnet Beta
 
 A permissionless, persistent cluster for early token holders and launch partners.
-Currently, rewards and inflation are disabled.
 
 - Tokens that are issued on Mainnet Beta are **real** SOL
 - If you have paid money to purchase/be issued tokens, such as through our
@@ -146,11 +150,11 @@ solana config set --url https://api.mainnet-beta.solana.com
 $ solana-validator \
     --identity ~/validator-keypair.json \
     --vote-account ~/vote-account-keypair.json \
-    --trusted-validator 7Np41oeYqPefeNQEHSv1UDhYrehxin3NStELsSKCT4K2 \
-    --trusted-validator GdnSyH3YtwcxFvQrVVJMm1JhTS4QVX7MFsX56uJLUfiZ \
-    --trusted-validator DE1bawNcRJB9rVm3buyMVfr8mBEoyyu73NBovf2oXJsJ \
-    --trusted-validator CakcnaRDHka2gXyfbEd2d3xsvkJkqsLw2akB3zsN1D2S \
-    --no-untrusted-rpc \
+    --known-validator 7Np41oeYqPefeNQEHSv1UDhYrehxin3NStELsSKCT4K2 \
+    --known-validator GdnSyH3YtwcxFvQrVVJMm1JhTS4QVX7MFsX56uJLUfiZ \
+    --known-validator DE1bawNcRJB9rVm3buyMVfr8mBEoyyu73NBovf2oXJsJ \
+    --known-validator CakcnaRDHka2gXyfbEd2d3xsvkJkqsLw2akB3zsN1D2S \
+    --only-known-rpc \
     --ledger ledger \
     --rpc-port 8899 \
     --private-rpc \
@@ -165,4 +169,5 @@ $ solana-validator \
     --limit-ledger-size
 ```
 
-All four `--trusted-validator`s are operated by Solana
+All four [`--known-validator`s](running-validator/validator-start.md#known-validators)
+are operated by Solana Labs
diff --git a/docs/src/developing/backwards-compatibility.md b/docs/src/developing/backwards-compatibility.md
index d16d245e90c201..9f26ad03f87116 100644
--- a/docs/src/developing/backwards-compatibility.md
+++ b/docs/src/developing/backwards-compatibility.md
@@ -31,7 +31,7 @@ updates of a particular `MINOR` version release.
 #### Release Channels
 
 - `edge` software that contains cutting-edge features with no backward compatibility policy
-- `beta` software that runs on the Solana Tour de SOL testnet cluster
+- `beta` software that runs on the Solana Testnet cluster
 - `stable` software that run on the Solana Mainnet Beta and Devnet clusters
 
 #### Major Releases (x.0.0)
@@ -43,7 +43,7 @@ that were enabled in the previous `MAJOR` version.
 #### Minor Releases (1.x.0)
 
 New features and proposal implementations are added to _new_ `MINOR` version
-releases (e.g. 1.4.0) and are first run on Solana's Tour de SOL testnet cluster. While running
+releases (e.g. 1.4.0) and are first run on Solana's Testnet cluster. While running
 on the testnet, `MINOR` versions are considered to be in the `beta` release channel. After
 those changes have been patched as needed and proven to be reliable, the `MINOR` version will
 be upgraded to the `stable` release channel and deployed to the Mainnet Beta cluster.
diff --git a/docs/src/developing/clients/jsonrpc-api.md b/docs/src/developing/clients/jsonrpc-api.md
index c1c4cd312504fa..a88d2bd40c9565 100644
--- a/docs/src/developing/clients/jsonrpc-api.md
+++ b/docs/src/developing/clients/jsonrpc-api.md
@@ -55,6 +55,7 @@ gives a convenient interface for the RPC methods.
 - [getSlotLeader](jsonrpc-api.md#getslotleader)
 - [getSlotLeaders](jsonrpc-api.md#getslotleaders)
 - [getStakeActivation](jsonrpc-api.md#getstakeactivation)
+- [getSnapshotSlot](jsonrpc-api.md#getsnapshotslot)
 - [getSupply](jsonrpc-api.md#getsupply)
 - [getTokenAccountBalance](jsonrpc-api.md#gettokenaccountbalance)
 - [getTokenAccountsByDelegate](jsonrpc-api.md#gettokenaccountsbydelegate)
@@ -81,6 +82,15 @@ gives a convenient interface for the RPC methods.
   - [slotSubscribe](jsonrpc-api.md#slotsubscribe)
   - [slotUnsubscribe](jsonrpc-api.md#slotunsubscribe)
 
+### Unstable Methods
+
+Unstable methods may see breaking changes in patch releases and may not be supported in perpetuity.
+
+- [slotsUpdatesSubscribe](jsonrpc-api.md#slotsupdatessubscribe---unstable)
+- [slotsUpdatesUnsubscribe](jsonrpc-api.md#slotsupdatesunsubscribe)
+- [voteSubscribe](jsonrpc-api.md#votesubscribe---unstable-disabled-by-default)
+- [voteUnsubscribe](jsonrpc-api.md#voteunsubscribe)
+
 ### Deprecated Methods
 
 - [getConfirmedBlock](jsonrpc-api.md#getconfirmedblock)
@@ -195,11 +205,11 @@ health-check mechanism for use by load balancers or other network
 infrastructure. This request will always return a HTTP 200 OK response with a body of
 "ok", "behind" or "unknown" based on the following conditions:
 
-1. If one or more `--trusted-validator` arguments are provided to `solana-validator`, "ok" is returned
+1. If one or more `--known-validator` arguments are provided to `solana-validator`, "ok" is returned
    when the node has within `HEALTH_CHECK_SLOT_DISTANCE` slots of the highest
-   trusted validator, otherwise "behind". "unknown" is returned when no slot
-   information from trusted validators is not yet available.
-2. "ok" is always returned if no trusted validators are provided.
+   known validator, otherwise "behind". "unknown" is returned when no slot
+   information from known validators is not yet available.
+2. "ok" is always returned if no known validators are provided.
 
 ## JSON RPC API Reference
 
@@ -350,7 +360,7 @@ Result:
 ### getBlock
 
 **NEW: This method is only available in solana-core v1.7 or newer. Please use
-[getBlock](jsonrpc-api.md#getblock) for solana-core v1.6**
+[getConfirmedBlock](jsonrpc-api.md#getconfirmedblock) for solana-core v1.6**
 
 Returns identity and transaction information about a confirmed block in the ledger
 
@@ -393,6 +403,7 @@ The result field will be an object with the following fields:
     - `lamports: <i64>`- number of reward lamports credited or debited by the account, as a i64
     - `postBalance: <u64>` - account balance in lamports after the reward was applied
     - `rewardType: <string|undefined>` - type of reward: "fee", "rent", "voting", "staking"
+    - `commission: <u8|undefined>` - vote account commission when the reward was credited, only present for voting and staking rewards
   - `blockTime: <i64 | null>` - estimated production time, as Unix timestamp (seconds since the Unix epoch). null if not available
   - `blockHeight: <u64 | null>` - the number of blocks beneath this block
 
@@ -1184,10 +1195,10 @@ Result:
 
 Returns the current health of the node.
 
-If one or more `--trusted-validator` arguments are provided to
+If one or more `--known-validator` arguments are provided to
 `solana-validator`, "ok" is returned when the node has within
-`HEALTH_CHECK_SLOT_DISTANCE` slots of the highest trusted validator, otherwise
-an error is returned.  "ok" is always returned if no trusted validators are
+`HEALTH_CHECK_SLOT_DISTANCE` slots of the highest known validator, otherwise
+an error is returned.  "ok" is always returned if no known validators are
 provided.
 
 #### Parameters:
@@ -1363,6 +1374,7 @@ The result field will be a JSON array with the following fields:
 - `effectiveSlot: <u64>`, the slot in which the rewards are effective
 - `amount: <u64>`, reward amount in lamports
 - `postBalance: <u64>`, post balance of the account in lamports
+- `commission: <u8|undefined>` - vote account commission when the reward was credited
 
 #### Example
 
@@ -1374,7 +1386,7 @@ curl http://localhost:8899 -X POST -H "Content-Type: application/json" -d '
     "id": 1,
     "method": "getInflationReward",
     "params": [
-       ["6dmNQ5jwLeLk5REvio1JcMshcbvkYMwy26sJ8pbkvStu", "BGsqMegLpV6n6Ve146sSX2dTjUMj3M92HnU8BbNRMhF2"], 2
+       ["6dmNQ5jwLeLk5REvio1JcMshcbvkYMwy26sJ8pbkvStu", "BGsqMegLpV6n6Ve146sSX2dTjUMj3M92HnU8BbNRMhF2"], {"epoch": 2}
     ]
   }
 '
@@ -2235,7 +2247,7 @@ Result:
 
 ### getSlot
 
-Returns the current slot the node is processing
+Returns the slot that has reached the [given or default commitment level](jsonrpc-api.md#configuring-state-commitment)
 
 #### Parameters:
 
@@ -2401,7 +2413,9 @@ Returns information about the current supply.
 
 #### Parameters:
 
-- `<object>` - (optional) [Commitment](jsonrpc-api.md#configuring-state-commitment)
+- `<object>` - (optional) Configuration object containing the following optional fields:
+  - (optional) [Commitment](jsonrpc-api.md#configuring-state-commitment)
+  - (optional) `excludeNonCirculatingAccountsList: <bool>` - exclude non circulating accounts list from response
 
 #### Results:
 
@@ -2410,7 +2424,7 @@ The result will be an RpcResponse JSON object with `value` equal to a JSON objec
 - `total: <u64>` - Total supply in lamports
 - `circulating: <u64>` - Circulating supply in lamports
 - `nonCirculating: <u64>` - Non-circulating supply in lamports
-- `nonCirculatingAccounts: <array>` - an array of account addresses of non-circulating accounts, as strings
+- `nonCirculatingAccounts: <array>` - an array of account addresses of non-circulating accounts, as strings. If `excludeNonCirculatingAccountsList` is enabled, the returned array will be empty.
 
 #### Example:
 
@@ -2463,6 +2477,9 @@ The result will be an RpcResponse JSON object with `value` equal to a JSON objec
 - `uiAmount: <number | null>` - the balance, using mint-prescribed decimals **DEPRECATED**
 - `uiAmountString: <string>` - the balance as a string, using mint-prescribed decimals
 
+For more details on returned data: The
+[Token Balances Structure](jsonrpc-api.md#token-balances-structure) response from [getBlock](jsonrpc-api.md#getblock) follows a similar structure.
+
 #### Example:
 
 Request:
@@ -2519,6 +2536,8 @@ The result will be an RpcResponse JSON object with `value` equal to an array of
    - `executable: <bool>`, boolean indicating if the account contains a program \(and is strictly read-only\)
    - `rentEpoch: <u64>`, the epoch at which this account will next owe rent, as u64
 
+When the data is requested with the `jsonParsed` encoding a format similar to that of the [Token Balances Structure](jsonrpc-api.md#token-balances-structure) can be expected inside the structure, both for the `tokenAmount` and the `delegatedAmount`, with the latter being an optional object.
+
 #### Example:
 
 ```bash
@@ -2553,7 +2572,6 @@ Result:
         "data": {
           "program": "spl-token",
           "parsed": {
-            "accountType": "account",
             "info": {
               "tokenAmount": {
                 "amount": "1",
@@ -2562,13 +2580,20 @@ Result:
                 "uiAmountString": "0.1",
               },
               "delegate": "4Nd1mBQtrMJVYVfKf2PJy9NZUZdTAsp7D4xWLs4gDB4T",
-              "delegatedAmount": 1,
-              "isInitialized": true,
+              "delegatedAmount": {
+                "amount": "1",
+                "decimals": 1,
+                "uiAmount": 0.1,
+                "uiAmountString": "0.1",
+              },
+              "state": "initialized",
               "isNative": false,
               "mint": "3wyAj7Rt1TWVPZVteFJPLa26JmLvdb1CAKEFZm3NY75E",
               "owner": "CnPoSPKXu7wJqxe59Fs72tkBeALovhsCxYeFwPCQH9TD"
-            }
-          }
+            },
+            "type": "account"
+          },
+          "space": 165
         },
         "executable": false,
         "lamports": 1726080,
@@ -2609,6 +2634,8 @@ The result will be an RpcResponse JSON object with `value` equal to an array of
    - `executable: <bool>`, boolean indicating if the account contains a program \(and is strictly read-only\)
    - `rentEpoch: <u64>`, the epoch at which this account will next owe rent, as u64
 
+When the data is requested with the `jsonParsed` encoding a format similar to that of the [Token Balances Structure](jsonrpc-api.md#token-balances-structure) can be expected inside the structure, both for the `tokenAmount` and the `delegatedAmount`, with the latter being an optional object.
+
 #### Example:
 
 ```bash
@@ -2651,14 +2678,21 @@ Result:
                 "uiAmount": 0.1,
                 "uiAmountString": "0.1",
               },
-              "delegate": null,
-              "delegatedAmount": 1,
-              "isInitialized": true,
+              "delegate": "4Nd1mBQtrMJVYVfKf2PJy9NZUZdTAsp7D4xWLs4gDB4T",
+              "delegatedAmount": {
+                "amount": "1",
+                "decimals": 1,
+                "uiAmount": 0.1,
+                "uiAmountString": "0.1",
+              },
+              "state": "initialized",
               "isNative": false,
               "mint": "3wyAj7Rt1TWVPZVteFJPLa26JmLvdb1CAKEFZm3NY75E",
               "owner": "4Qkev8aNZcqFNSRhQzwyLMFSsi94jHqE8WNVTJzTP99F"
-            }
-          }
+            },
+            "type": "account"
+          },
+          "space": 165
         },
         "executable": false,
         "lamports": 1726080,
@@ -2811,6 +2845,7 @@ Returns transaction details for a confirmed transaction
       - `lamports: <i64>`- number of reward lamports credited or debited by the account, as a i64
       - `postBalance: <u64>` - account balance in lamports after the reward was applied
       - `rewardType: <string>` - type of reward: currently only "rent", other types may be added in the future
+      - `commission: <u8|undefined>` - vote account commission when the reward was credited, only present for voting and staking rewards
 
 
 #### Example:
@@ -3004,7 +3039,7 @@ curl http://localhost:8899 -X POST -H "Content-Type: application/json" -d '
 
 Result:
 ```json
-{"jsonrpc":"2.0","result":{"solana-core": "1.7.0"},"id":1}
+{"jsonrpc":"2.0","result":{"solana-core": "1.7.11"},"id":1}
 ```
 
 ### getVoteAccounts
@@ -3016,6 +3051,8 @@ Returns the account info and associated stake for all the voting accounts in the
 - `<object>` - (optional) Configuration object containing the following field:
   - (optional) [Commitment](jsonrpc-api.md#configuring-state-commitment)
   - (optional) `votePubkey: <string>` - Only return results for this validator vote address (base-58 encoded)
+  - (optional) `keepUnstakedDelinquents: <bool>` - Do not filter out delinquent validators with no stake
+  - (optional) `delinquentSlotDistance: <u64>` - Specify the number of slots behind the tip that a validator must fall to be considered delinquent. **NOTE:** For the sake of consistency between ecosystem products, _it is **not** recommended that this argument be specified._
 
 #### Results:
 
@@ -3364,6 +3401,8 @@ Result:
 
 #### Notification Format:
 
+The notification format is the same as seen in the [getAccountInfo](jsonrpc-api.md#getAccountInfo) RPC HTTP method.
+
 Base58 encoding:
 ```json
 {
@@ -3496,7 +3535,14 @@ Result:
 
 #### Notification Format:
 
-Base58 encoding:
+The notification will be an RpcResponse JSON object with value equal to:
+
+- `signature: <string>` - The transaction signature base58 encoded.
+- `err: <object | null>` - Error if transaction failed, null if transaction succeeded. [TransactionError definitions](https://github.com/solana-labs/solana/blob/master/sdk/src/transaction.rs#L24)
+- `logs: <array | null>` - Array of log messages the transaction instructions output during execution, null if simulation failed before the transaction was able to execute (for example due to an invalid blockhash or signature verification failure)
+
+Example:
+
 ```json
 {
   "jsonrpc": "2.0",
@@ -3536,7 +3582,6 @@ Unsubscribe from transaction logging
 Request:
 ```json
 {"jsonrpc":"2.0", "id":1, "method":"logsUnsubscribe", "params":[0]}
-
 ```
 
 Result:
@@ -3613,6 +3658,8 @@ Result:
 
 #### Notification Format:
 
+The notification format is a <b>single</b> program account object as seen in the [getProgramAccounts](jsonrpc-api.md#getProgramAccounts) RPC HTTP method.
+
 Base58 encoding:
 ```json
 {
@@ -3747,7 +3794,12 @@ Result:
 ```
 
 #### Notification Format:
-```bash
+
+The notification will be an RpcResponse JSON object with value containing an object with:
+- `err: <object | null>` - Error if transaction failed, null if transaction succeeded. [TransactionError definitions](https://github.com/solana-labs/solana/blob/master/sdk/src/transaction.rs#L24)
+
+Example:
+```json
 {
   "jsonrpc": "2.0",
   "method": "signatureNotification",
@@ -3817,7 +3869,14 @@ Result:
 
 #### Notification Format:
 
-```bash
+The notification will be an object with the following fields:
+
+- `parent: <u64>` - The parent slot
+- `root: <u64>` - The current root slot
+- `slot: <u64>` - The newly set slot value
+
+Example:
+```json
 {
   "jsonrpc": "2.0",
   "method": "slotNotification",
@@ -3857,6 +3916,92 @@ Result:
 {"jsonrpc": "2.0","result": true,"id": 1}
 ```
 
+### slotsUpdatesSubscribe - Unstable
+
+**This subscription is unstable; the format of this subscription may change in
+the future and it may not always be supported**
+
+Subscribe to receive a notification from the validator on a variety of updates
+on every slot
+
+#### Parameters:
+
+None
+
+#### Results:
+
+- `integer` - subscription id \(needed to unsubscribe\)
+
+#### Example:
+
+Request:
+```json
+{"jsonrpc":"2.0", "id":1, "method":"slotsUpdatesSubscribe"}
+
+```
+
+Result:
+```json
+{"jsonrpc": "2.0","result": 0,"id": 1}
+```
+
+#### Notification Format:
+
+The notification will be an object with the following fields:
+
+- `parent: <u64>` - The parent slot
+- `slot: <u64>` - The newly updated slot
+- `timestamp: <i64>` - The Unix timestamp of the update
+- `type: <string>` - The update type, one of:
+  - "firstShredReceived"
+  - "completed"
+  - "createdBank"
+  - "frozen"
+  - "dead"
+  - "optimisticConfirmation"
+  - "root"
+
+```bash
+{
+  "jsonrpc": "2.0",
+  "method": "slotsUpdatesNotification",
+  "params": {
+    "result": {
+      "parent": 75,
+      "slot": 76,
+      "timestamp": 1625081266243,
+      "type": "optimisticConfirmation"
+    },
+    "subscription": 0
+  }
+}
+```
+
+### slotsUpdatesUnsubscribe
+
+Unsubscribe from slot-update notifications
+
+#### Parameters:
+
+- `<integer>` - subscription id to cancel
+
+#### Results:
+
+- `<bool>` - unsubscribe success message
+
+#### Example:
+
+Request:
+```json
+{"jsonrpc":"2.0", "id":1, "method":"slotsUpdatesUnsubscribe", "params":[0]}
+
+```
+
+Result:
+```json
+{"jsonrpc": "2.0","result": true,"id": 1}
+```
+
 ### rootSubscribe
 
 Subscribe to receive notification anytime a new root is set by the validator.
@@ -3886,7 +4031,7 @@ Result:
 
 The result is the latest root slot number.
 
-```bash
+```json
 {
   "jsonrpc": "2.0",
   "method": "rootNotification",
@@ -3955,7 +4100,10 @@ Result:
 
 #### Notification Format:
 
-The result is the latest vote, containing its hash, a list of voted slots, and an optional timestamp.
+The notification will be an object with the following fields:
+- `hash: <string>` - The vote hash
+- `slots: <array>` - The slots covered by the vote, as an array of u64 integers
+- `timestamp: <i64 | null>` - The timestamp of the vote
 
 ```json
 {
@@ -4044,6 +4192,7 @@ The result field will be an object with the following fields:
     - `lamports: <i64>`- number of reward lamports credited or debited by the account, as a i64
     - `postBalance: <u64>` - account balance in lamports after the reward was applied
     - `rewardType: <string|undefined>` - type of reward: "fee", "rent", "voting", "staking"
+    - `commission: <u8|undefined>` - vote account commission when the reward was credited, only present for voting and staking rewards
   - `blockTime: <i64 | null>` - estimated production time, as Unix timestamp (seconds since the Unix epoch). null if not available
 
 #### Example:
@@ -4187,9 +4336,9 @@ Result:
 ```
 
 For more details on returned data:
-[Transaction Structure](jsonrpc-api.md#transactionstructure)
-[Inner Instructions Structure](jsonrpc-api.md#innerinstructionsstructure)
-[Token Balances Structure](jsonrpc-api.md#tokenbalancesstructure)
+[Transaction Structure](jsonrpc-api.md#transaction-structure)
+[Inner Instructions Structure](jsonrpc-api.md#inner-instructions-structure)
+[Token Balances Structure](jsonrpc-api.md#token-balances-structure)
 
 ### getConfirmedBlocks
 
diff --git a/docs/src/developing/on-chain-programs/overview.md b/docs/src/developing/on-chain-programs/overview.md
index b24f953d652a8c..e9cd7bd6150e23 100644
--- a/docs/src/developing/on-chain-programs/overview.md
+++ b/docs/src/developing/on-chain-programs/overview.md
@@ -94,7 +94,7 @@ attempts to use a float operation that is not supported, the runtime will report
 an unresolved symbol error.
 
 Float operations are performed via software libraries, specifically LLVM's float
-builtins. Due to be software emulated they consume more compute units than
+builtins. Due to the software emulated they consume more compute units than
 integer operations. In general, fixed point operations are recommended where
 possible.
 
@@ -108,7 +108,7 @@ To run the test, sync the repo, and run:
 
 Recent results show the float operations take more instructions compared to
 integers equivalents. Fixed point implementations may vary but will also be
-less then the float equivalents:
+less than the float equivalents:
 
 ```
          u64   f32
diff --git a/docs/src/developing/programming-model/accounts.md b/docs/src/developing/programming-model/accounts.md
index 283252806e6d08..2c60c6373ac8d2 100644
--- a/docs/src/developing/programming-model/accounts.md
+++ b/docs/src/developing/programming-model/accounts.md
@@ -5,14 +5,14 @@ title: "Accounts"
 ## Storing State between Transactions
 
 If the program needs to store state between transactions, it does so using
-_accounts_. Accounts are similar to files in operating systems such as Linux.
-Like a file, an account may hold arbitrary data and that data persists beyond
+_accounts_. Accounts are similar to files in operating systems such as Linux in
+that they may hold arbitrary data that persists beyond
 the lifetime of a program. Also like a file, an account includes metadata that
 tells the runtime who is allowed to access the data and how.
 
 Unlike a file, the account includes metadata for the lifetime of the file. That
-lifetime is expressed in "tokens", which is a number of fractional native
-tokens, called _lamports_. Accounts are held in validator memory and pay
+lifetime is expressed by a number of fractional native
+tokens called _lamports_. Accounts are held in validator memory and pay
 ["rent"](#rent) to stay there. Each validator periodically scans all accounts
 and collects rent. Any account that drops to zero lamports is purged. Accounts
 can also be marked [rent-exempt](#rent-exemption) if they contain a sufficient
@@ -24,10 +24,10 @@ uses an _address_ to look up an account. The address is a 256-bit public key.
 ## Signers
 
 Transactions may include digital [signatures](terminology.md#signature)
-corresponding to the accounts' public keys referenced by the transaction. When a
-corresponding digital signature is present it signifies that the holder of the
-account's private key signed and thus "authorized" the transaction and the
-account is then referred to as a _signer_. Whether an account is a signer or not
+corresponding to the accounts' public keys referenced by the transaction. Such
+signatures signify that the holder of the
+account's private key signed and thus "authorized" the transaction.  In this case,
+the account is referred to as a _signer_. Whether an account is a signer or not
 is communicated to the program as part of the account's metadata. Programs can
 then use that information to make authority decisions.
 
@@ -41,21 +41,22 @@ modify a read-only account, the transaction is rejected by the runtime.
 
 ## Executable
 
-If an account is marked "executable" in its metadata then it is considered a
-program which can be executed by including the account's public key an
+If an account is marked "executable" in its metadata, then it is considered a
+program which can be executed by including the account's public key in an
 instruction's [program id](transactions.md#program-id). Accounts are marked as
 executable during a successful program deployment process by the loader that
-owns the account. For example, during BPF program deployment, once the loader
-has determined that the BPF bytecode in the account's data is valid, the loader
+owns the account. When a program is deployed to the execution engine (BPF deployment),
+the loader determines that the bytecode in the account's data is valid.
+If so, the loader
 permanently marks the program account as executable. Once executable, the
 runtime enforces that the account's data (the program) is immutable.
 
 ## Creating
 
-To create an account a client generates a _keypair_ and registers its public key
-using the `SystemProgram::CreateAccount` instruction with preallocated a fixed
-storage size in bytes. The current maximum size of an account's data is 10
-megabytes.
+To create an account, a client generates a _keypair_ and registers its public key
+using the `SystemProgram::CreateAccount` instruction with a fixed
+storage size in bytes preallocated.
+The current maximum size of an account's data is 10 megabytes.
 
 An account address can be any arbitrary 256 bit value, and there are mechanisms
 for advanced users to create derived addresses
@@ -64,13 +65,15 @@ for advanced users to create derived addresses
 
 Accounts that have never been created via the system program can also be passed
 to programs. When an instruction references an account that hasn't been
-previously created the program will be passed an account that is owned by the
-system program, has zero lamports, and zero data. But, the account will reflect
-whether it is a signer of the transaction or not and therefore can be used as an
+previously created, the program will be passed an account with no data and zero lamports
+that is owned by the system program.
+
+Such newly created accounts reflect
+whether they sign the transaction and therefore can be used as an
 authority. Authorities in this context convey to the program that the holder of
 the private key associated with the account's public key signed the transaction.
 The account's public key may be known to the program or recorded in another
-account and signify some kind of ownership or authority over an asset or
+account, signifying some kind of ownership or authority over an asset or
 operation the program controls or performs.
 
 ## Ownership and Assignment to Programs
@@ -89,19 +92,22 @@ data and credit the account.
 For security purposes, it is recommended that programs check the validity of any
 account it reads but does not modify.
 
-The security model enforces that an account's data can only be modified by the
-account's `Owner` program. Doing so allows the program to trust that the data
-passed to them via accounts they own will be in a known and valid state. The
-runtime enforces this by rejecting any transaction containing a program that
-attempts to write to an account it does not own. But, there are also cases
-where a program may merely read an account they think they own and assume the
-data has only been written by themselves and thus is valid. But anyone can
-issues instructions to a program, and the runtime does not know that those
-accounts are expected to be owned by the program. Therefore a malicious user
+This is because a malicious user
 could create accounts with arbitrary data and then pass these accounts to the
-program in the place of a valid account. The arbitrary data could be crafted in
+program in place of valid accounts. The arbitrary data could be crafted in
 a way that leads to unexpected or harmful program behavior.
 
+The security model enforces that an account's data can only be modified by the
+account's `Owner` program. This allows the program to trust that the data
+passed to them via accounts they own. The
+runtime enforces this by rejecting any transaction containing a program that
+attempts to write to an account it does not own.
+
+If a program were to not check account validity, it might read an account
+it thinks it owns but doesn't.  Anyone can
+issue instructions to a program, and the runtime does not know that those
+accounts are expected to be owned by the program.
+
 To check an account's validity, the program should either check the account's
 address against a known value or check that the account is indeed owned
 correctly (usually owned by the program itself).
@@ -109,6 +115,7 @@ correctly (usually owned by the program itself).
 One example is when programs use a sysvar account. Unless the program checks the
 account's address or owner, it's impossible to be sure whether it's a real and
 valid sysvar account merely by successful deserialization of the account's data.
+
 Accordingly, the Solana SDK [checks the sysvar account's validity during
 deserialization](https://github.com/solana-labs/solana/blob/a95675a7ce1651f7b59443eb146b356bc4b3f374/sdk/program/src/sysvar/mod.rs#L65).
 A alternative and safer way to read a sysvar is via the sysvar's [`get()`
@@ -116,15 +123,14 @@ function](https://github.com/solana-labs/solana/blob/64bfc14a75671e4ec3fe969ded0
 which doesn't require these checks.
 
 If the program always modifies the account in question, the address/owner check
-isn't required because modifying an unowned (could be the malicious account with
-the wrong owner) will be rejected by the runtime, and the containing transaction
-will be thrown out.
+isn't required because modifying an unowned account will be rejected by the runtime,
+and the containing transaction will be thrown out.
 
 ## Rent
 
 Keeping accounts alive on Solana incurs a storage cost called _rent_ because the
-cluster must actively maintain the data to process any future transactions on
-it. This is different from Bitcoin and Ethereum, where storing accounts doesn't
+blockchain cluster must actively maintain the data to process any future transactions.
+This is different from Bitcoin and Ethereum, where storing accounts doesn't
 incur any costs.
 
 The rent is debited from an account's balance by the runtime upon the first
@@ -190,8 +196,8 @@ if the transferred lamports are less than or equal to 2,439.
 ### Rent exemption
 
 Alternatively, an account can be made entirely exempt from rent collection by
-depositing at least 2 years-worth of rent. This is checked every time an
-account's balance is reduced and rent is immediately debited once the balance
+depositing at least 2 years worth of rent. This is checked every time an
+account's balance is reduced, and rent is immediately debited once the balance
 goes below the minimum amount.
 
 Program executable accounts are required by the runtime to be rent-exempt to
diff --git a/docs/src/developing/programming-model/calling-between-programs.md b/docs/src/developing/programming-model/calling-between-programs.md
index 0dd75952829cbe..18a95cbd49fdc1 100644
--- a/docs/src/developing/programming-model/calling-between-programs.md
+++ b/docs/src/developing/programming-model/calling-between-programs.md
@@ -240,7 +240,7 @@ pub fn find_program_address(
 
 Clients can use the `create_program_address` function to generate a destination
 address. In this example, we assume that
-`create_program_address(&[&["escrow]], &escrow_program_id)` generates a valid
+`create_program_address(&[&["escrow"]], &escrow_program_id)` generates a valid
 program address that is off the curve.
 
 ```rust,ignore
diff --git a/docs/src/developing/programming-model/transactions.md b/docs/src/developing/programming-model/transactions.md
index 72c85a5c278c04..efb60e879d7402 100644
--- a/docs/src/developing/programming-model/transactions.md
+++ b/docs/src/developing/programming-model/transactions.md
@@ -139,7 +139,7 @@ accounts are permanently marked as executable by the loader once they are
 successfully deployed. The runtime will reject transactions that specify programs
 that are not executable.
 
-Unlike on-chain programs, [Native Programs](developing/runtime-facilities/programs)
+Unlike on-chain programs, [Native Programs](developing/runtime-facilities/programs.md)
 are handled differently in that they are built directly into the Solana runtime.
 
 ### Accounts
diff --git a/docs/src/developing/runtime-facilities/programs.md b/docs/src/developing/runtime-facilities/programs.md
index 74cda44ee06285..c66afe9841fb20 100644
--- a/docs/src/developing/runtime-facilities/programs.md
+++ b/docs/src/developing/runtime-facilities/programs.md
@@ -41,7 +41,7 @@ Create and manage accounts representing stake and rewards for delegations to
 validators.
 
 - Program id: `Stake11111111111111111111111111111111111111`
-- Instructions: [StakeInstruction](https://docs.rs/solana-stake-program/VERSION_FOR_DOCS_RS/solana_stake_program/stake_instruction/enum.StakeInstruction.html)
+- Instructions: [StakeInstruction](https://docs.rs/solana-sdk/VERSION_FOR_DOCS_RS/solana_sdk/stake/instruction/enum.StakeInstruction.html)
 
 ## Vote Program
 
diff --git a/docs/src/developing/runtime-facilities/sysvars.md b/docs/src/developing/runtime-facilities/sysvars.md
index 6eb4265fadaef3..3b5ed443ae33ab 100644
--- a/docs/src/developing/runtime-facilities/sysvars.md
+++ b/docs/src/developing/runtime-facilities/sysvars.md
@@ -17,6 +17,12 @@ The first is to query the sysvar at runtime via the sysvar's `get()` function:
 let clock = Clock::get()
 ```
 
+The following sysvars support `get`:
+- Clock
+- EpochSchedule
+- Fees
+- Rent
+
 The second is to pass the sysvar to the program as an account by including its address as one of the accounts in the `Instruction` and then deserializing the data during execution.  Access to sysvars accounts is
 always _readonly_.
 
@@ -91,7 +97,9 @@ other instructions in the same transaction. Read more information on
 ## RecentBlockhashes
 
 The RecentBlockhashes sysvar contains the active recent blockhashes as well as
-their associated fee calculators. It is updated every slot.
+their associated fee calculators. It is updated every slot. Entries are ordered
+by descending block height, so the first entry holds the most recent block hash,
+and the last entry holds an old block hash.
 
 - Address: `SysvarRecentB1ockHashes11111111111111111111`
 - Layout:
diff --git a/docs/src/history.md b/docs/src/history.md
index 608afd301b7d12..b4ea570d904497 100644
--- a/docs/src/history.md
+++ b/docs/src/history.md
@@ -46,8 +46,8 @@ people were confused about whether they were the same project. The Loom team
 decided it would rebrand. They chose the name Solana, a nod to a small beach
 town North of San Diego called Solana Beach, where Anatoly, Greg and Stephen
 lived and surfed for three years when they worked for Qualcomm. On March 28th,
-the team created the Solana Labs GitHub organization and renamed Greg's
-prototype Silk to Solana.
+the team created the Solana GitHub organization and renamed Greg's prototype
+Silk to Solana.
 
 In June of 2018, the team scaled up the technology to run on cloud-based
 networks and on July 19th, published a 50-node, permissioned, public testnet
diff --git a/docs/src/implemented-proposals/ed_overview/ed_storage_rent_economics.md b/docs/src/implemented-proposals/ed_overview/ed_storage_rent_economics.md
index f19246a2730cf3..8abd88ad2c5247 100644
--- a/docs/src/implemented-proposals/ed_overview/ed_storage_rent_economics.md
+++ b/docs/src/implemented-proposals/ed_overview/ed_storage_rent_economics.md
@@ -8,7 +8,7 @@ Storage rent can be paid via one of two methods:
 
 Method 1: Set it and forget it
 
-With this approach, accounts with two-years worth of rent deposits secured are exempt from network rent charges. By maintaining this minimum-balance, the broader network benefits from reduced liquidity and the account holder can trust that their `Account::data` will be retained for continual access/usage.
+With this approach, accounts with two-years worth of rent deposits secured are exempt from network rent charges. By maintaining this minimum-balance, the broader network benefits from reduced liquidity and the account holder can rest assured that their `Account::data` will be retained for continual access/usage.
 
 Method 2: Pay per byte
 
diff --git a/docs/src/implemented-proposals/ed_overview/ed_validation_client_economics/ed_vce_validation_stake_delegation.md b/docs/src/implemented-proposals/ed_overview/ed_validation_client_economics/ed_vce_validation_stake_delegation.md
index 2ea3d3120cae6b..64ab8779260f52 100644
--- a/docs/src/implemented-proposals/ed_overview/ed_validation_client_economics/ed_vce_validation_stake_delegation.md
+++ b/docs/src/implemented-proposals/ed_overview/ed_validation_client_economics/ed_vce_validation_stake_delegation.md
@@ -23,6 +23,6 @@ Running a Solana validation-client required relatively modest upfront hardware c
 
 **Table 2** example high-end hardware setup for running a Solana client.
 
-Despite the low-barrier to entry as a validation-client, from a capital investment perspective, as in any developing economy, there will be much opportunity and need for trusted validation services as evidenced by node reliability, UX/UI, APIs and other software accessibility tools. Additionally, although Solana’s validator node startup costs are nominal when compared to similar networks, they may still be somewhat restrictive for some potential participants. In the spirit of developing a true decentralized, permissionless network, these interested parties can become involved in the Solana network/economy via delegation of previously acquired tokens with a reliable validation node to earn a portion of the interest generated.
+Despite the low-barrier to entry as a validation-client, from a capital investment perspective, as in any developing economy, there will be much opportunity and need for competent validation services as evidenced by node reliability, UX/UI, APIs and other software accessibility tools. Additionally, although Solana’s validator node startup costs are nominal when compared to similar networks, they may still be somewhat restrictive for some potential participants. In the spirit of developing a true decentralized, permissionless network, these interested parties can become involved in the Solana network/economy via delegation of previously acquired tokens with a reliable validation node to earn a portion of the interest generated.
 
 Delegation of tokens to validation-clients provides a way for passive Solana token holders to become part of the active Solana economy and earn interest rates proportional to the interest rate generated by the delegated validation-client. Additionally, this feature intends to create a healthy validation-client market, with potential validation-client nodes competing to build reliable, transparent and profitable delegation services.
diff --git a/docs/src/implemented-proposals/installer.md b/docs/src/implemented-proposals/installer.md
index 12fb2742dff82b..a32b59c183da7c 100644
--- a/docs/src/implemented-proposals/installer.md
+++ b/docs/src/implemented-proposals/installer.md
@@ -4,7 +4,7 @@ title: Cluster Software Installation and Updates
 
 Currently users are required to build the solana cluster software themselves from the git repository and manually update it, which is error prone and inconvenient.
 
-This document proposes an easy to use software install and updater that can be used to deploy pre-built binaries for supported platforms. Users may elect to use binaries supplied by Solana or any other party they trust. Deployment of updates is managed using an on-chain update manifest program.
+This document proposes an easy to use software install and updater that can be used to deploy pre-built binaries for supported platforms. Users may elect to use binaries supplied by Solana or any other party provider. Deployment of updates is managed using an on-chain update manifest program.
 
 ## Motivating Examples
 
diff --git a/docs/src/implemented-proposals/staking-rewards.md b/docs/src/implemented-proposals/staking-rewards.md
index f82d6594fe19dd..2d23555b1daf45 100644
--- a/docs/src/implemented-proposals/staking-rewards.md
+++ b/docs/src/implemented-proposals/staking-rewards.md
@@ -48,7 +48,7 @@ To become a Solana validator, one must deposit/lock-up some amount of SOL in a c
 
   initial deposit.
 
-Solana's trustless sense of time and ordering provided by its PoH data structure, along with its [turbine](https://www.youtube.com/watch?v=qt_gDRXHrHQ&t=1s) data broadcast and transmission design, should provide sub-second transaction confirmation times that scale with the log of the number of nodes in the cluster. This means we shouldn't have to restrict the number of validating nodes with a prohibitive 'minimum deposits' and expect nodes to be able to become validators with nominal amounts of SOL staked. At the same time, Solana's focus on high-throughput should create incentive for validation clients to provide high-performant and reliable hardware. Combined with potential a minimum network speed threshold to join as a validation-client, we expect a healthy validation delegation market to emerge. To this end, Solana's testnet will lead into a "Tour de SOL" validation-client competition, focusing on throughput and uptime to rank and reward testnet validators.
+Solana's trustless sense of time and ordering provided by its PoH data structure, along with its [turbine](https://www.youtube.com/watch?v=qt_gDRXHrHQ&t=1s) data broadcast and transmission design, should provide sub-second transaction confirmation times that scale with the log of the number of nodes in the cluster. This means we shouldn't have to restrict the number of validating nodes with a prohibitive 'minimum deposits' and expect nodes to be able to become validators with nominal amounts of SOL staked. At the same time, Solana's focus on high-throughput should create incentive for validation clients to provide high-performant and reliable hardware. Combined with potential a minimum network speed threshold to join as a validation-client, we expect a healthy validation delegation market to emerge.
 
 ## Penalties
 
diff --git a/docs/src/inflation/terminology.md b/docs/src/inflation/terminology.md
index 5b60018e559a17..796547df0495f4 100644
--- a/docs/src/inflation/terminology.md
+++ b/docs/src/inflation/terminology.md
@@ -24,14 +24,14 @@ A deterministic description of token issuance over time. The Solana Foundation i
 
 The inflation rate actually observed on the Solana network after accounting for other factors that might decrease the _Total Current Supply_. Note that it is not possible for tokens to be created outside of what is described by the _Inflation Schedule_.
 
-- While the _Inflation Schedule_ determines how the protocol issues SOL, this neglects the concurrent elimination of tokens in the ecosystem due to various factors. The primary token burning mechanism is the burning of a portion of each transaction fee. While $100\%$ of each transaction fee is currently being destroyed, it is planned on reducing this burn rate to $50\%$ of each transaction fee, with the remaining fee to be retained by the validator that processes the transaction.
+- While the _Inflation Schedule_ determines how the protocol issues SOL, this neglects the concurrent elimination of tokens in the ecosystem due to various factors. The primary token burning mechanism is the burning of a portion of each transaction fee. $50\%$ of each transaction fee is burned, with the remaining fee retained by the validator that processes the transaction.
 - Additional factors such as loss of private keys and slashing events should also be considered in a holistic analysis of the _Effective Inflation Rate_. For example, it’s estimated that $10-20\%$ of all BTC have been lost and are unrecoverable and that networks may experience similar yearly losses at the rate of $1-2\%$.
 
 ### Staking Yield [%]
 
 The rate of return (aka _interest_) earned on SOL staked on the network. It is often quoted as an annualized rate (e.g. "the network _staking yield_ is currently $10\%$ per year").
 
-- _Staking yield_ is of great interest to validators and token-holders holders who wish to delegate their tokens to avoid token dilution due to inflation (the extent of which is discussed below).
+- _Staking yield_ is of great interest to validators and token holders who wish to delegate their tokens to avoid token dilution due to inflation (the extent of which is discussed below).
 - $100\%$ of inflationary issuances are to be distributed to staked token-holders in proportion to their staked SOL and to validators who charge a commission on the rewards earned by their delegated SOL..
   - There may be future consideration for an additional split of inflation issuance with the introduction of _Archivers_ into the economy. _Archivers_ are network participants who provide a decentralized storage service and should also be incentivized with token distribution from inflation issuances for this service. - Similarly, early designs specified a fixed percentage of inflationary issuance to be delivered to the Foundation treasury for operational expenses and future grants. However, inflation will be launching without any portion allocated to the Foundation.
 - _Staking yield_ can be calculated from the _Inflation Schedule_ along with the fraction of the _Total Current Supply_ that is staked at any given time. The explicit relationship is given by:
diff --git a/docs/src/integrations/exchange.md b/docs/src/integrations/exchange.md
index b5eba2c33a7594..49f5f161ff0b19 100644
--- a/docs/src/integrations/exchange.md
+++ b/docs/src/integrations/exchange.md
@@ -13,8 +13,8 @@ operations with a bundled monitoring tool.
 
 This setup enables you:
 
-- to have a trusted gateway to the Solana mainnet-beta cluster to get data and
-  submit withdrawal transactions
+- to have a self-administered gateway to the Solana mainnet-beta cluster to get
+  data and submit withdrawal transactions
 - to have full control over how much historical block data is retained
 - to maintain your service availability even if one node fails
 
@@ -30,14 +30,15 @@ To run an api node:
 ```bash
 solana-validator \
   --ledger <LEDGER_PATH> \
+  --identity <VALIDATOR_IDENTITY_KEYPAIR> \
   --entrypoint <CLUSTER_ENTRYPOINT> \
   --expected-genesis-hash <EXPECTED_GENESIS_HASH> \
   --rpc-port 8899 \
   --no-voting \
   --enable-rpc-transaction-history \
   --limit-ledger-size \
-  --trusted-validator <VALIDATOR_ADDRESS> \
-  --no-untrusted-rpc
+  --known-validator <VALIDATOR_ADDRESS> \
+  --only-known-rpc
 ```
 
 Customize `--ledger` to your desired ledger storage location, and `--rpc-port` to the port you want to expose.
@@ -55,7 +56,7 @@ default limit value used by `--limit-ledger-size`. More information about
 selecting a custom limit value is [available
 here](https://github.com/solana-labs/solana/blob/583cec922b6107e0f85c7e14cb5e642bc7dfb340/core/src/ledger_cleanup_service.rs#L15-L26).
 
-Specifying one or more `--trusted-validator` parameters can protect you from booting from a malicious snapshot. [More on the value of booting with trusted validators](../running-validator/validator-start.md#trusted-validators)
+Specifying one or more `--known-validator` parameters can protect you from booting from a malicious snapshot. [More on the value of booting with known validators](../running-validator/validator-start.md#known-validators)
 
 Optional parameters to consider:
 
@@ -96,7 +97,7 @@ announcement. For security-related releases, more urgent action may be needed.
 ### Ledger Continuity
 
 By default, each of your nodes will boot from a snapshot provided by one of your
-trusted validators. This snapshot reflects the current state of the chain, but
+known validators. This snapshot reflects the current state of the chain, but
 does not contain the complete historical ledger. If one of your node exits and
 boots from a new snapshot, there may be a gap in the ledger on that node. In
 order to prevent this issue, add the `--no-snapshot-fetch` parameter to your
@@ -111,7 +112,7 @@ It is important to note that the amount of historical ledger available to your
 nodes from the rest of the network is limited at any point in time. Once
 operational if your validators experience significant downtime they may not be
 able to catch up to the network and will need to download a new snapshot from a
-trusted validator. In doing so your validators will now have a gap in its
+known validator. In doing so your validators will now have a gap in its
 historical ledger data that cannot be filled.
 
 ### Minimizing Validator Port Exposure
diff --git a/docs/src/introduction.md b/docs/src/introduction.md
index b4b6d57ff3bcd7..7494a51f95d6cf 100644
--- a/docs/src/introduction.md
+++ b/docs/src/introduction.md
@@ -8,11 +8,11 @@ Solana is an open source project implementing a new, high-performance, permissio
 
 ## Why Solana?
 
-It is possible for a centralized database to process 710,000 transactions per second on a standard gigabit network if the transactions are, on average, no more than 176 bytes. A centralized database can also replicate itself and maintain high availability without significantly compromising that transaction rate using the distributed system technique known as Optimistic Concurrency Control [\[H.T.Kung, J.T.Robinson (1981)\]](http://citeseerx.ist.psu.edu/viewdoc/summary?doi=10.1.1.65.4735). At Solana, we are demonstrating that these same theoretical limits apply just as well to blockchain on an adversarial network. The key ingredient? Finding a way to share time when nodes cannot trust one-another. Once nodes can trust time, suddenly ~40 years of distributed systems research becomes applicable to blockchain!
+It is possible for a centralized database to process 710,000 transactions per second on a standard gigabit network if the transactions are, on average, no more than 176 bytes. A centralized database can also replicate itself and maintain high availability without significantly compromising that transaction rate using the distributed system technique known as Optimistic Concurrency Control [\[H.T.Kung, J.T.Robinson (1981)\]](http://citeseerx.ist.psu.edu/viewdoc/summary?doi=10.1.1.65.4735). At Solana, we are demonstrating that these same theoretical limits apply just as well to blockchain on an adversarial network. The key ingredient? Finding a way to share time when nodes cannot rely upon one-another. Once nodes can rely upon time, suddenly ~40 years of distributed systems research becomes applicable to blockchain!
 
 > Perhaps the most striking difference between algorithms obtained by our method and ones based upon timeout is that using timeout produces a traditional distributed algorithm in which the processes operate asynchronously, while our method produces a globally synchronous one in which every process does the same thing at (approximately) the same time. Our method seems to contradict the whole purpose of distributed processing, which is to permit different processes to operate independently and perform different functions. However, if a distributed system is really a single system, then the processes must be synchronized in some way. Conceptually, the easiest way to synchronize processes is to get them all to do the same thing at the same time. Therefore, our method is used to implement a kernel that performs the necessary synchronization--for example, making sure that two different processes do not try to modify a file at the same time. Processes might spend only a small fraction of their time executing the synchronizing kernel; the rest of the time, they can operate independently--e.g., accessing different files. This is an approach we have advocated even when fault-tolerance is not required. The method's basic simplicity makes it easier to understand the precise properties of a system, which is crucial if one is to know just how fault-tolerant the system is. [\[L.Lamport (1984)\]](http://citeseerx.ist.psu.edu/viewdoc/summary?doi=10.1.1.71.1078)
 
-Furthermore, and much to our surprise, it can be implemented using a mechanism that has existed in Bitcoin since day one. The Bitcoin feature is called nLocktime and it can be used to postdate transactions using block height instead of a timestamp. As a Bitcoin client, you would use block height instead of a timestamp if you don't trust the network. Block height turns out to be an instance of what's being called a Verifiable Delay Function in cryptography circles. It's a cryptographically secure way to say time has passed. In Solana, we use a far more granular verifiable delay function, a SHA 256 hash chain, to checkpoint the ledger and coordinate consensus. With it, we implement Optimistic Concurrency Control and are now well en route towards that theoretical limit of 710,000 transactions per second.
+Furthermore, and much to our surprise, it can be implemented using a mechanism that has existed in Bitcoin since day one. The Bitcoin feature is called nLocktime and it can be used to postdate transactions using block height instead of a timestamp. As a Bitcoin client, you would use block height instead of a timestamp if you don't rely upon the network. Block height turns out to be an instance of what's being called a Verifiable Delay Function in cryptography circles. It's a cryptographically secure way to say time has passed. In Solana, we use a far more granular verifiable delay function, a SHA 256 hash chain, to checkpoint the ledger and coordinate consensus. With it, we implement Optimistic Concurrency Control and are now well en route towards that theoretical limit of 710,000 transactions per second.
 
 ## Documentation Overview
 
diff --git a/docs/src/pages/index.js b/docs/src/pages/index.js
index 7bfa03c893c0ab..c170abc99c5b02 100644
--- a/docs/src/pages/index.js
+++ b/docs/src/pages/index.js
@@ -105,24 +105,6 @@ function Home() {
         {features && features.length > 0 && (
           <section className={styles.features}>
             <div className="container">
-              <div className="alert alert--primary" role="alert">
-                <b>Announcing the Solana Season Hackathon</b>
-                <br />
-                Jumpstart your next project on Solana & join the fastest growing
-                ecosystem in crypto
-                <br />
-                <p align="right">
-                  <a
-                    href="https://solana.com/solanaszn"
-                    rel="noopener noreferrer"
-                    target="_blank"
-                  >
-                    <button className="button button--outline button--secondary">
-                      Register Now
-                    </button>
-                  </a>
-                </p>
-              </div>
               <div className="row cards__container">
                 {features.map((props, idx) => (
                   <Feature key={idx} {...props} />
diff --git a/docs/src/proposals/rip-curl.md b/docs/src/proposals/rip-curl.md
index 23b7247d2bde17..8e2ab9707a39b7 100644
--- a/docs/src/proposals/rip-curl.md
+++ b/docs/src/proposals/rip-curl.md
@@ -17,7 +17,7 @@ static content and less appealing for transaction processing. The clients poll
 for transaction status instead of being notified, giving the false impression
 of higher confirmation times. Furthermore, what clients can poll for is
 limited, preventing them from making reasonable real-time decisions, such as
-recognizing a transaction is confirmed as soon as particular, trusted
+recognizing a transaction is confirmed as soon as particular, known
 validators vote on it.
 
 ## Proposed Solution
diff --git a/docs/src/proposals/transactions-v2.md b/docs/src/proposals/transactions-v2.md
new file mode 100644
index 00000000000000..6e4dfa930a5d8e
--- /dev/null
+++ b/docs/src/proposals/transactions-v2.md
@@ -0,0 +1,302 @@
+# Transactions v2 - Address maps
+
+## Problem
+
+Messages transmitted to Solana validators must not exceed the IPv6 MTU size to
+ensure fast and reliable network transmission of cluster info over UDP.
+Solana's networking stack uses a conservative MTU size of 1280 bytes which,
+after accounting for headers, leaves 1232 bytes for packet data like serialized
+transactions.
+
+Developers building applications on Solana must design their on-chain program
+interfaces within the above transaction size limit constraint. One common
+work-around is to store state temporarily on-chain and consume that state in
+later transactions. This is the approach used by the BPF loader program for
+deploying Solana programs.
+
+However, this workaround doesn't work well when developers compose many on-chain
+programs in a single atomic transaction. With more composition comes more
+account inputs, each of which takes up 32 bytes. There is currently no available
+workaround for increasing the number of accounts used in a single transaction
+since each transaction must list all accounts that it needs to properly lock
+accounts for parallel execution. Therefore the current cap is about 35 accounts
+after accounting for signatures and other transaction metadata.
+
+## Proposed Solution
+
+Introduce a new on-chain program which stores account address maps and add a new
+transaction format which supports concise account references through the
+on-chain address maps.
+
+### Address Map Program
+
+Here we describe a program-based solution to the problem, whereby a protocol
+developer or end-user can create collections of related addresses on-chain for
+concise use in a transaction's account inputs. This approach is similar to page
+tables used in operating systems to succinctly map virtual addresses to physical
+memory.
+
+After addresses are stored on-chain in an address map account, they may be
+succinctly referenced in a transaction using a 1-byte u8 index rather than a
+full 32-byte address. This will require a new transaction format to make use of
+these succinct references as well as runtime handling for looking up and loading
+accounts from the on-chain mappings.
+
+#### State
+
+Address map accounts must be rent-exempt but may be closed with a one epoch
+deactivation period. Address maps must be activated before use.
+
+Since transactions use a u8 offset to look up mapped addresses, accounts can
+store up to 2^8 addresses each. Anyone may create an address map account of any
+size as long as its big enough to store the necessary metadata. In addition to
+stored addresses, address map accounts must also track the latest count of
+stored addresses and an authority which must be a present signer for all
+appended map entries.
+
+Map additions require one slot to activate so each map should track how many
+addresses are still pending activation in their on-chain state:
+
+```rust
+struct AddressMap {
+  // authority must sign for each addition and to close the map account
+  authority: Pubkey,
+  // record a deactivation epoch to help validators know when to remove
+  // the map from their caches.
+  deactivation_epoch: Epoch,
+  // entries may not be modified once activated
+  activated: bool,
+  // list of entries, max capacity of u8::MAX
+  entries: Vec<Pubkey>,
+}
+```
+
+#### Cleanup
+
+Once an address map gets stale and is no longer used, it can be reclaimed by the
+authority withdrawing lamports but the remaining balance must be greater than
+two epochs of rent. This ensures that it takes at least one full epoch to
+deactivate a map.
+
+Maps may not be recreated because each new map must be created at a derived
+address using a monotonically increasing counter as a derivation seed.
+
+#### Cost
+
+Since address map accounts require caching and special handling in the runtime,
+they should incur higher costs for storage. Cost structure design will be added
+later.
+
+### Versioned Transactions
+
+In order to allow accounts to be referenced more succinctly, the structure of
+serialized transactions must be modified. The new transaction format should not
+affect transaction processing in the Solana VM beyond the increased capacity for
+accounts and program invocations. Invoked programs will be unaware of which
+transaction format was used.
+
+The new transaction format must be distinguished from the current transaction
+format. Current transactions can fit at most 19 signatures (64-bytes each) but
+the message header encodes `num_required_signatures` as a `u8`. Since the upper
+bit of the `u8` will never be set for a valid transaction, we can enable it to
+denote whether a transaction should be decoded with the versioned format or not.
+
+#### New Transaction Format
+
+```rust
+#[derive(Serialize, Deserialize)]
+pub struct Transaction {
+    #[serde(with = "short_vec")]
+    pub signatures: Vec<Signature>,
+    /// The message to sign.
+    pub message: Message,
+}
+
+// Uses custom serialization. If the first bit is set, a versioned message is
+// encoded starting from the next byte. If the first bit is not set, all bytes
+// are used to encode the original unversioned `Message` format.
+pub enum Message {
+  Unversioned(UnversionedMessage),
+  Versioned(VersionedMessage),
+}
+
+// use bincode varint encoding to use u8 instead of u32 for enum tags
+#[derive(Serialize, Deserialize)]
+pub enum VersionedMessage {
+  Current(Box<MessageV2>)
+}
+
+#[derive(Serialize, Deserialize)]
+pub struct MessageV2 {
+  // unchanged
+  pub header: MessageHeader,
+
+  // unchanged
+  #[serde(with = "short_vec")]
+  pub account_keys: Vec<Pubkey>,
+
+  /// The last `address_maps.len()` number of readonly unsigned account_keys
+  /// should be loaded as address maps
+  #[serde(with = "short_vec")]
+  pub address_maps: Vec<AddressMap>,
+
+  // unchanged
+  pub recent_blockhash: Hash,
+
+  // unchanged. Account indices are still `u8` encoded so the max number of accounts
+  // in account_keys + address_maps is limited to 256.
+  #[serde(with = "short_vec")]
+  pub instructions: Vec<CompiledInstruction>,
+}
+
+#[derive(Serialize, Deserialize)]
+pub struct AddressMap {
+  /// The last num_readonly_entries of entries are read-only
+  pub num_readonly_entries: u8,
+
+  /// List of map entries to load
+  #[serde(with = "short_vec")]
+  pub entries: Vec<u8>,
+}
+```
+
+#### Size changes
+
+- 1 byte for `prefix` field
+- 1 byte for version enum discriminant
+- 1 byte for `address_maps` length
+- Each map requires 2 bytes for `entries` length and `num_readonly`
+- Each map entry is 1 byte (u8)
+
+#### Cost changes
+
+Using an address map in a transaction should incur an extra cost due to
+the extra work validators need to do to load and cache them.
+
+#### Metadata changes
+
+Each account accessed via an address map should be stored in the transaction
+metadata for quick reference. This will avoid the need for clients to make
+multiple RPC round trips to fetch all accounts referenced in a v2 transaction.
+It will also make it easier to use the ledger tool to analyze account access
+patterns.
+
+#### RPC changes
+
+Fetched transaction responses will likely require a new version field to
+indicate to clients which transaction structure to use for deserialization.
+Clients using pre-existing RPC methods will receive error responses when
+attempting to fetch a versioned transaction which will indicate that they
+must upgrade.
+
+The RPC API should also support an option for returning fully expanded
+transactions to abstract away the address map details from downstream clients.
+
+### Limitations
+
+- Max of 256 accounts may be specified in a transaction because u8 is used by compiled
+instructions to index into transaction message account keys.
+- Address maps can hold up to 256 addresses because references to map entries
+are encoded as `u8` in transactions.
+- Transaction signers may not be referenced with an address map, the full
+address of each signer must be serialized in the transaction. This ensures that
+the performance of transaction signature checks is not affected.
+- Hardware wallets will probably not be able to display details about accounts
+referenced through address maps due to inability to verify on-chain data.
+- Only single level address maps can be used. Recursive maps will not be supported.
+
+## Security Concerns
+
+### Resource consumption
+
+Enabling more account inputs in a transaction allows for more program
+invocations, write-locks, and data reads / writes. Before address maps are
+enabled, transaction-wide compute limits and increased costs for write locks and
+data reads are required.
+
+### Front running
+
+If the addresses listed within an address map account are modifiable, front
+running attacks could modify which mapped accounts are resolved for a later
+transaction. For this reason, we propose that any stored address is immutable
+and that address map accounts themselves may not be recreated.
+
+Additionally, a malicious actor could try to fork the chain immediately after a
+new address map account is added to a block. If successful, they could add a
+different unexpected map entry in the fork. In order to deter this attack,
+clients should wait for address maps to be finalized before using them in a
+transaction.  Clients may also append integrity check instructions to the
+transaction which verify that the correct accounts are used.
+
+### Denial of service
+
+Address map accounts will be read very frequently and will therefore be a
+more high profile target for denial of service attacks through write locks
+similar to sysvar accounts.
+
+For this reason, special handling should be given to address map lookups.
+Address maps lookups should not be affected by account read/write locks.
+
+### Duplicate accounts
+
+Transactions may not load an account more than once whether directly through
+`account_keys` or indirectly through `address_maps`.
+
+## Other Proposals
+
+1) Account prefixes
+
+Needing to pre-register accounts in an on-chain address map is cumbersome
+because it adds an extra step for transaction processing. Instead, Solana
+transactions could use variable length address prefixes to specify accounts.
+These prefix shortcuts can save on data usage without needing to setup on-chain
+state.
+
+However, this model requires nodes to keep a mapping of prefixes to active account
+addresses. Attackers can create accounts with the same prefix as a popular account
+to disrupt transactions.
+
+2) Transaction builder program
+
+Solana can provide a new on-chain program which allows "Big" transactions to be
+constructed on-chain by normal transactions. Once the transaction is
+constructed, a final "Execute" transaction can trigger a node to process the big
+transaction as a normal transaction without needing to fit it into an MTU sized
+packet.
+
+The UX of this approach is tricky. A user could in theory sign a big transaction
+but it wouldn't be great if they had to use their wallet to sign multiple
+transactions to build that transaction that they already signed and approved. This
+could be a use-case for transaction relay services, though. A user could pay a
+relayer to construct the large pre-signed transaction on-chain for them.
+
+In order to prevent the large transaction from being reconstructed and replayed,
+its message hash will need to be added to the status cache when executed.
+
+3) Epoch account indexes
+
+Similarly to leader schedule calculation, validators could create a global index
+of the most accessed accounts in the previous epoch and make that index
+available to transactions in the following epoch.
+
+This approach has a downside of only updating the index at epoch boundaries
+which means there would be a few day delay before popular new accounts could be
+referenced. It also needs to be consistently generated by all validators by
+using some criteria like adding accounts in order by access count.
+
+4) Address lists
+
+Extend the transaction structure to support addresses that, when loaded, expand
+to a list of addresses. After expansion, all account inputs are concatenated to
+form a single list of account keys which can be indexed into by instructions.
+Address lists would likely need to be immutable to prevent attacks. They would
+also need to be limited in length to limit resource consumption.
+
+This proposal can be thought of a special case of the proposed index account
+approach. Since the full account list would be expanded, there's no need to add
+additional offsets that use up the limited space in a serialized transaction.
+However, the expected size of an address list may need to be encoded into the
+transaction to aid the sanitization of account indexes.  We would also need to
+encode how many addresses in the list should be loaded as readonly vs
+read-write. Lastly, special attention must be given to watch out for addresses
+that exist in multiple account lists.
diff --git a/docs/src/running-validator.md b/docs/src/running-validator.md
index fd6699ca58e15d..177cbdb19de0bb 100644
--- a/docs/src/running-validator.md
+++ b/docs/src/running-validator.md
@@ -2,6 +2,6 @@
 title: Running a Validator
 ---
 
-This section describes how run a Solana validator node.
+This section describes how to run a Solana validator node.
 
-There are several clusters available to connect to, see [choosing a Cluster](cli/choose-a-cluster.md) for an overview of each.
+There are several clusters available to connect to; see [choosing a Cluster](cli/choose-a-cluster.md) for an overview of each.
diff --git a/docs/src/running-validator/restart-cluster.md b/docs/src/running-validator/restart-cluster.md
index 1772c148504172..caf48b4f8a6726 100644
--- a/docs/src/running-validator/restart-cluster.md
+++ b/docs/src/running-validator/restart-cluster.md
@@ -54,9 +54,9 @@ Post something like the following to #announcements (adjusting the text as appro
 >   --hard-fork SLOT_X                  # <-- NEW! IMPORTANT! REMOVE AFTER THIS RESTART
 >   --no-snapshot-fetch                 # <-- NEW! IMPORTANT! REMOVE AFTER THIS RESTART
 >   --entrypoint entrypoint.testnet.solana.com:8001
->   --trusted-validator 5D1fNXzvv5NjV1ysLjirC4WY92RNsVH18vjmcszZd8on
+>   --known-validator 5D1fNXzvv5NjV1ysLjirC4WY92RNsVH18vjmcszZd8on
 >   --expected-genesis-hash 4uhcVJyU9pJkvQyS88uRDiswHXSCkY3zQawwpjk2NsNY
->   --no-untrusted-rpc
+>   --only-known-rpc
 >   --limit-ledger-size
 >   ...                                # <-- your other --identity/--vote-account/etc arguments
 > ```
@@ -68,9 +68,9 @@ Post something like the following to #announcements (adjusting the text as appro
 >   --wait-for-supermajority SLOT_X     # <-- NEW! IMPORTANT! REMOVE AFTER THIS RESTART
 >   --expected-bank-hash NEW_BANK_HASH  # <-- NEW! IMPORTANT! REMOVE AFTER THIS RESTART
 >   --entrypoint entrypoint.testnet.solana.com:8001
->   --trusted-validator 5D1fNXzvv5NjV1ysLjirC4WY92RNsVH18vjmcszZd8on
+>   --known-validator 5D1fNXzvv5NjV1ysLjirC4WY92RNsVH18vjmcszZd8on
 >   --expected-genesis-hash 4uhcVJyU9pJkvQyS88uRDiswHXSCkY3zQawwpjk2NsNY
->   --no-untrusted-rpc
+>   --only-known-rpc
 >   --limit-ledger-size
 >   ...                                # <-- your other --identity/--vote-account/etc arguments
 > ```
diff --git a/docs/src/running-validator/validator-reqs.md b/docs/src/running-validator/validator-reqs.md
index fc1559a06e1602..0ab295e6e14844 100644
--- a/docs/src/running-validator/validator-reqs.md
+++ b/docs/src/running-validator/validator-reqs.md
@@ -85,12 +85,29 @@ releases at [solanalabs/solana](https://hub.docker.com/r/solanalabs/solana).
 - We build and run on Ubuntu 20.04.
 - See [Installing Solana](../cli/install-solana-cli-tools.md) for the current Solana software release.
 
-Be sure to ensure that the machine used is not behind a residential NAT to avoid
-NAT traversal issues. A cloud-hosted machine works best. **Ensure that IP ports 8000 through 10000 are not blocked for Internet inbound and outbound traffic.**
-
 Prebuilt binaries are available for Linux x86_64 on CPUs supporting AVX2 \(Ubuntu 20.04 recommended\).
 MacOS or WSL users may build from source.
 
+## Networking
+Internet service should be at least 300Mbit/s symmetric, commercial. 1GBit/s preferred
+
+### Port Forwarding
+The following ports need to be open to the internet for both inbound and outbound
+
+It is not recommended to run a validator behind a NAT. Operators who choose to
+do so should be comfortable configuring their networking equipment and debugging
+any traversal issues on their own.
+
+#### Required
+- 8000-10000 TCP/UDP - P2P protocols (gossip, turbine, repair, etc). This can
+be limited to any free 11 port range with `--dynamic-port-range`
+
+#### Optional
+For security purposes, it is not suggested that the following ports be open to
+the internet on staked, mainnet-beta validators.
+- 8899 TCP - JSONRPC over HTTP. Change with `--rpc-port RPC_PORT``
+- 8900 TCP - JSONRPC over Websockets. Derived. Uses `RPC_PORT + 1`
+
 ## GPU Requirements
 
 CUDA is required to make use of the GPU on your system. The provided Solana
diff --git a/docs/src/running-validator/validator-start.md b/docs/src/running-validator/validator-start.md
index 37049ca571abf4..b25df957388904 100644
--- a/docs/src/running-validator/validator-start.md
+++ b/docs/src/running-validator/validator-start.md
@@ -60,7 +60,7 @@ the latest recommended settings are applied.
 To run it:
 
 ```bash
-sudo solana-sys-tuner --user $(whoami) > sys-tuner.log 2>&1 &
+sudo $(command -v solana-sys-tuner) --user $(whoami) > sys-tuner.log 2>&1 &
 ```
 
 #### Manual
@@ -89,7 +89,7 @@ sudo sysctl -p /etc/sysctl.d/20-solana-udp-buffers.conf
 ```bash
 sudo bash -c "cat >/etc/sysctl.d/20-solana-mmaps.conf <<EOF
 # Increase memory mapped files limit
-vm.max_map_count = 700000
+vm.max_map_count = 1000000
 EOF"
 ```
 
@@ -100,14 +100,14 @@ sudo sysctl -p /etc/sysctl.d/20-solana-mmaps.conf
 Add
 
 ```
-LimitNOFILE=700000
+LimitNOFILE=1000000
 ```
 
 to the `[Service]` section of your systemd service file, if you use one,
 otherwise add
 
 ```
-DefaultLimitNOFILE=700000
+DefaultLimitNOFILE=1000000
 ```
 
 to the `[Manager]` section of `/etc/systemd/system.conf`.
@@ -119,7 +119,7 @@ sudo systemctl daemon-reload
 ```bash
 sudo bash -c "cat >/etc/security/limits.d/90-solana-nofiles.conf <<EOF
 # Increase process file descriptor count limit
-* - nofile 700000
+* - nofile 1000000
 EOF"
 ```
 
@@ -258,15 +258,15 @@ solana create-vote-account ~/vote-account-keypair.json ~/validator-keypair.json
 
 Read more about [creating and managing a vote account](vote-accounts.md).
 
-## Trusted validators
+## Known validators
 
-If you know and trust other validator nodes, you can specify this on the command line with the `--trusted-validator <PUBKEY>`
-argument to `solana-validator`. You can specify multiple ones by repeating the argument `--trusted-validator <PUBKEY1> --trusted-validator <PUBKEY2>`.
-This has two effects, one is when the validator is booting with `--no-untrusted-rpc`, it will only ask that set of
-trusted nodes for downloading genesis and snapshot data. Another is that in combination with the `--halt-on-trusted-validator-hash-mismatch` option,
-it will monitor the merkle root hash of the entire accounts state of other trusted nodes on gossip and if the hashes produce any mismatch,
+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,
+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 trusted
+the validator publishes the hash on is tied to the snapshot interval. For the feature to be effective, all validators in the known
 set should be set to the same snapshot interval value or multiples of the same.
 
 It is highly recommended you use these options to prevent malicious snapshot state download or
@@ -349,7 +349,7 @@ Type=simple
 Restart=always
 RestartSec=1
 User=sol
-LimitNOFILE=700000
+LimitNOFILE=1000000
 LogRateLimitIntervalSec=0
 Environment="PATH=/bin:/usr/bin:/home/sol/.local/share/solana/install/active_release/bin"
 ExecStart=/home/sol/bin/validator.sh
@@ -358,8 +358,13 @@ ExecStart=/home/sol/bin/validator.sh
 WantedBy=multi-user.target
 ```
 
-Now create `/home/sol/bin/validator.sh` to include the desired `solana-validator`
-command-line. Ensure that running `/home/sol/bin/validator.sh` manually starts
+Now create `/home/sol/bin/validator.sh` to include the desired
+`solana-validator` command-line. Ensure that the 'exec' command is used to
+start the validator process (i.e. "exec solana-validator ...").  This is
+important because without it, logrotate will end up killing the validator
+every time the logs are rotated.
+
+Ensure that running `/home/sol/bin/validator.sh` manually starts
 the validator as expected. Don't forget to mark it executable with `chmod +x /home/sol/bin/validator.sh`
 
 Start the service with:
@@ -416,6 +421,12 @@ sudo cp logrotate.sol /etc/logrotate.d/sol
 systemctl restart logrotate.service
 ```
 
+As mentioned earlier, be sure that if you use logrotate, any script you create
+which starts the solana validator process uses "exec" to do so (example: "exec
+solana-validator ..."); otherwise, when logrotate sends its signal to the
+validator, the enclosing script will die and take the validator process with
+it.
+
 ### Disable port checks to speed up restarts
 
 Once your validator is operating normally, you can reduce the time it takes to
diff --git a/docs/src/running-validator/validator-troubleshoot.md b/docs/src/running-validator/validator-troubleshoot.md
index 3afb484098630c..28e1679b95b713 100644
--- a/docs/src/running-validator/validator-troubleshoot.md
+++ b/docs/src/running-validator/validator-troubleshoot.md
@@ -11,12 +11,7 @@ testnet participants, [https://discord.gg/pquxPsq](https://discord.gg/pquxPsq).
 - [Testnet Metrics Dashboard](https://metrics.solana.com:3000/d/monitor-edge/cluster-telemetry-edge?refresh=60s&orgId=2)
 - Validator chat channels
   - [\#validator-support](https://discord.gg/rZsenD) General support channel for any Validator related queries.
-  - [\#tourdesol](https://discord.gg/BdujK2) Discussion and support channel for Tour de SOL participants ([What is Tour de SOL?](https://solana.com/tds/)).
-  - [\#tourdesol-announcements](https://discord.gg/Q5TxEC) The single source of truth for critical information relating to Tour de SOL
-  - [\#tourdesol-stage0](https://discord.gg/Xf8tES) Discussion for events within Tour de SOL Stage 0. Stage 0 includes all the dry-run
+  - [\#testnet-announcements](https://discord.gg/Q5TxEC) The single source of truth for critical information relating Testnet
 - [Core software repo](https://github.com/solana-labs/solana)
-- [Tour de SOL Docs](https://docs.solana.com/tour-de-sol)
-- [TdS repo](https://github.com/solana-labs/tour-de-sol)
-- [TdS metrics dashboard](https://metrics.solana.com:3000/d/monitor-edge/cluster-telemetry-edge?refresh=1m&from=now-15m&to=now&var-testnet=tds)
 
 Can't find what you're looking for? Send an email to ryan@solana.com or reach out to @rshea\#2622 on Discord.
diff --git a/docs/src/running-validator/vote-accounts.md b/docs/src/running-validator/vote-accounts.md
index 2d559f485c03fd..f948abc95a7143 100644
--- a/docs/src/running-validator/vote-accounts.md
+++ b/docs/src/running-validator/vote-accounts.md
@@ -165,6 +165,24 @@ change the validator identity. The follow steps assume that
    to modify the validator identity in your vote account
 4. Restart your validator with the new identity keypair for the `--identity` argument
 
+**Additional steps are required if your validator has stake.**  The leader
+schedule is computed two epochs in advance. Therefore if your old validator
+identity was in the leader schedule, it will remain in the leader schedule for
+up to two epochs after the validator identity change. If extra steps are not
+taken your validator will produce no blocks until your new validator identity is
+added to the leader schedule.
+
+After your validator is restarted with the new identity keypair, per step 4,
+start a second non-voting validator on a different machine with the old identity keypair
+without providing the `--vote-account` argument.
+
+This temporary validator should be run for two full epochs. During this time it will:
+* Produce blocks for the remaining slots that are assigned to your old validator identity
+* Receive the transaction fees and rent rewards for your old validator identity
+
+It is safe to stop this temporary validator when your old validator identity is
+no longer listed in the `solana leader-schedule` output.
+
 ### Vote Account Authorized Voter
 
 The _vote authority_ keypair may only be changed at epoch boundaries and
diff --git a/docs/src/staking.md b/docs/src/staking.md
index 05352e60a7cb0d..7a4cc60a2f1c22 100644
--- a/docs/src/staking.md
+++ b/docs/src/staking.md
@@ -6,57 +6,51 @@ _Note before reading: All references to increases in values are in absolute
 terms with regards to balance of SOL.
 This document makes no suggestion as to the monetary value of SOL at any time._
 
-Staking your SOL tokens on Solana is the best way you can help secure the world's
-highest-performing blockchain network, and
-[earn rewards](implemented-proposals/staking-rewards.md) for doing so!
+By staking your SOL tokens, you help secure the network and
+[earn rewards](implemented-proposals/staking-rewards.md) while doing so.
 
-Solana is a Proof-of-Stake (PoS) network with delegations, which means that
-anyone who holds SOL tokens can choose to delegate some of their SOL to one or
-more validators, who process transactions and run the network.
+You can stake by delegating your tokens to validators who process transactions and run the network.
 
 Delegating stake is a shared-risk shared-reward financial model that may provide
 returns to holders of tokens delegated for a long period.
 This is achieved by aligning the financial incentives of the token-holders
 (delegators) and the validators to whom they delegate.
 
-The more stake a validator has delegated to them, the more often this validator
+The more stake delegated to a validator, the more often this validator
 is chosen to write new transactions to the ledger. The more transactions
-the validator writes, the more rewards they and their delegators earn.
+the validator writes, the more rewards the validator and its delegators earn.
 Validators who configure their systems to be able to process more transactions
-at a time not only earn proportionally more rewards for doing so, they also
-keep the network running as fast and as smoothly as possible.
+earn proportionally more rewards and
+because they keep the network running as fast and as smoothly as possible.
 
 Validators incur costs by running and maintaining their systems, and this is
 passed on to delegators in the form of a fee collected as a percentage of
-rewards earned. This fee is known as a _commission_. As validators earn more
+rewards earned. This fee is known as a _commission_. Since validators earn more
 rewards the more stake is delegated to them, they may compete with one another
-to offer the lowest commission for their services, in order to attract more
-delegated stake.
+to offer the lowest commission for their services.
 
-There is a risk of loss of tokens when staking, through a process known as
+You risk losing tokens when staking through a process known as
 _slashing_. Slashing involves the removal and destruction of a portion of a
 validator's delegated stake in response to intentional malicious behavior,
 such as creating invalid transactions or censoring certain types of transactions
 or network participants.
 
-If a validator is slashed, all token holders who have delegated stake to that
-validator will lose a portion of their delegation. While this means an immediate
+When a validator is slashed, all token holders who have delegated stake to that
+validator lose a portion of their delegation. While this means an immediate
 loss for the token holder, it also is a loss of future rewards for the validator
 due to their reduced total delegation. More details on the slashing roadmap can
 be found
 [here](proposals/optimistic-confirmation-and-slashing.md#slashing-roadmap).
 
-It is the goal of the network rewards and slashing to align both validators'
-and token holders' financial incentives, which in turn help keeps the network
-secure, robust and performing at its best.
+Rewards and slashing align validator and token holder interests which helps keep the network
+secure, robust and performant.
+
 
 ## How do I stake my SOL tokens?
 
-In order to stake tokens on Solana, you first will need to transfer some SOL
-into a wallet that supports staking, then follow the steps or instructions
-provided by the wallet to create a stake account and delegate your stake.
-Different wallets will vary slightly in their process for this but the general
-description is below.
+You can stake SOL by moving your tokens
+into a wallet that supports staking.   The wallet provides steps to create a stake account
+and do the delegation.
 
 #### Supported Wallets
 
@@ -81,22 +75,14 @@ Staking operations are supported by the following wallet solutions:
 
 #### Create a Stake Account
 
-A stake account is a different type of account from a wallet address
-that is used to simply send and receive SOL tokens to other addresses. If you
-have received SOL in a wallet address you control, you can use some of
-these tokens to create and fund a new stake account, which will have a different
-address than the wallet you used to create it.
-Depending on which wallet you are using the steps to create a stake account
-may vary slightly. Not all wallets support stake accounts, see
-[Supported Wallets](#supported-wallets).
+Follow the wallet's instructions for creating a staking account.  This account
+will be of a different type than one used to simply send and receive tokens.
 
 #### Select a Validator
 
-After a stake account is created, you will likely want to delegate the SOL
-to a validator node. Below are a few places where you can get information about
-the validators who are currently participating in running the network.
-The Solana Labs team and the Solana Foundation do not recommend any particular
-validator.
+Follow the wallet's instructions for selecting a validator.  You can get
+information about potentially performant validators from the links below.
+The Solana Foundation does not recommend any particular validator.
 
 The Mainnet Beta validators introduce themselves and their services on this
 Solana Forum thread:
@@ -116,13 +102,11 @@ To view block production statistics, use the Solana command-line tools:
 - `solana block-production`
 
 The Solana team does not make recommendations on how to interpret this
-information. Potential delegators should do their own due diligence.
+information. Do your own due diligence.
 
 #### Delegate your Stake
 
-Once you have decided to which validator or validators you will delegate, use
-a supported wallet to delegate your stake account to the validator's vote
-account address.
+Follow the wallet's instructions for delegating your to your chosen validator.
 
 ## Stake Account Details
 
diff --git a/docs/src/storage_rent_economics.md b/docs/src/storage_rent_economics.md
index 986467da8c4531..8405c8906f3a29 100644
--- a/docs/src/storage_rent_economics.md
+++ b/docs/src/storage_rent_economics.md
@@ -8,7 +8,7 @@ Storage rent can be paid via one of two methods:
 
 Method 1: Set it and forget it
 
-With this approach, accounts with two-years worth of rent deposits secured are exempt from network rent charges. By maintaining this minimum-balance, the broader network benefits from reduced liquidity and the account holder can trust that their `Account::data` will be retained for continual access/usage.
+With this approach, accounts with two-years worth of rent deposits secured are exempt from network rent charges. By maintaining this minimum-balance, the broader network benefits from reduced liquidity and the account holder can rest assured that their `Account::data` will be retained for continual access/usage.
 
 Method 2: Pay per byte
 
diff --git a/docs/src/tour-de-sol.md b/docs/src/tour-de-sol.md
deleted file mode 100644
index 20700728ff3061..00000000000000
--- a/docs/src/tour-de-sol.md
+++ /dev/null
@@ -1,11 +0,0 @@
----
-title: Introduction
----
-
-## Welcome!
-
-This guide contains information about how to participate in Solana's Tour de SOL. Questions? Comments? Keep on reading!
-
-### Learn more about Tour de SOL
-
-If you haven't registered yet, complete the form at [https://solana.com/validator-registration/](https://solana.com/validator-registration/) first.
diff --git a/docs/src/tour-de-sol/participation/README.md b/docs/src/tour-de-sol/participation/README.md
deleted file mode 100644
index 60e27ea9d15249..00000000000000
--- a/docs/src/tour-de-sol/participation/README.md
+++ /dev/null
@@ -1 +0,0 @@
-# Participation
diff --git a/docs/src/tour-de-sol/participation/steps-to-create-a-validator.md b/docs/src/tour-de-sol/participation/steps-to-create-a-validator.md
deleted file mode 100644
index ecb56d1a32f58b..00000000000000
--- a/docs/src/tour-de-sol/participation/steps-to-create-a-validator.md
+++ /dev/null
@@ -1,11 +0,0 @@
----
-title: Steps to create a validator
----
-
-To create a Solana validator, follow the normal [validator workflow](../../running-validator/validator-start.md)
-targeting the [Testnet cluster](../../clusters.md).
-
-Note that Testnet validators are automatically staked by a process that runs
-every Epoch. If your validator is running correctly then in a couple of days it
-will be staked (and automatically destaked if offline for a prolonged period of
-time).
diff --git a/docs/src/tour-de-sol/participation/validator-public-key-registration.md b/docs/src/tour-de-sol/participation/validator-public-key-registration.md
deleted file mode 100644
index 1826aa6fa2dfea..00000000000000
--- a/docs/src/tour-de-sol/participation/validator-public-key-registration.md
+++ /dev/null
@@ -1,45 +0,0 @@
----
-title: Create a validator public key
----
-
-In order to participate you need to first register. See [Registration info](../registration/how-to-register.md).
-
-In order to obtain your allotment of SOL you need to publish your
-validator's identity public key under your keybase.io account.
-
-## **Generate Keypair**
-
-1. If you haven't already, generate your validator's identity keypair by running:
-
-   ```bash
-     solana-keygen new -o ~/validator-keypair.json
-   ```
-
-2. The identity public key can now be viewed by running:
-
-   ```bash
-     solana-keygen pubkey ~/validator-keypair.json
-   ```
-
-> Note: The "validator-keypair.json” file is also your \(ed25519\) private key.
-
-Your validator identity keypair uniquely identifies your validator within the network. **It is crucial to back-up this information.**
-
-If you don’t back up this information, you WILL NOT BE ABLE TO RECOVER YOUR VALIDATOR, if you lose access to it. If this happens, YOU WILL LOSE YOUR ALLOCATION OF SOL TOO.
-
-To back-up your validator identify keypair, **back-up your "validator-keypair.json” file to a secure location.**
-
-## Link your Solana pubkey to a Keybase account
-
-You must link your Solana pubkey to a Keybase.io account. The following instructions describe how to do that by installing Keybase on your server.
-
-1. Install [Keybase](https://keybase.io/download) on your machine.
-2. Log in to your Keybase account on your server. Create a Keybase account first if you don’t already have one. Here’s a [list of basic Keybase CLI commands](https://keybase.io/docs/command_line/basics).
-3. Create a Solana directory in your public file folder: `mkdir /keybase/public/<KEYBASE_USERNAME>/solana`
-4. Publish your validator's identity public key by creating an empty file in your Keybase public file folder in the following format: `/keybase/public/<KEYBASE_USERNAME>/solana/validator-<BASE58_PUBKEY>`. For example:
-
-   ```bash
-     touch /keybase/public/<KEYBASE_USERNAME>/solana/validator-<BASE58_PUBKEY>
-   ```
-
-5. To check your public key was published, ensure you can successfully browse to `https://keybase.pub/<KEYBASE_USERNAME>/solana/validator-<BASE58_PUBKEY>`
diff --git a/docs/src/tour-de-sol/participation/validator-technical-requirements.md b/docs/src/tour-de-sol/participation/validator-technical-requirements.md
deleted file mode 100644
index 9e824b4899df6b..00000000000000
--- a/docs/src/tour-de-sol/participation/validator-technical-requirements.md
+++ /dev/null
@@ -1,11 +0,0 @@
----
-title: Requirements to run a validator
----
-
-## Hardware
-
-See [suggested hardware configuration here](../../running-validator/validator-reqs.md).
-
-## Software
-
-- We build and run on Ubuntu 20.04
diff --git a/docs/src/tour-de-sol/registration/README.md b/docs/src/tour-de-sol/registration/README.md
deleted file mode 100644
index 9c3eb458fa44d7..00000000000000
--- a/docs/src/tour-de-sol/registration/README.md
+++ /dev/null
@@ -1 +0,0 @@
-# Registration
diff --git a/docs/src/tour-de-sol/registration/confidentiality.md b/docs/src/tour-de-sol/registration/confidentiality.md
deleted file mode 100644
index 17b65a40077942..00000000000000
--- a/docs/src/tour-de-sol/registration/confidentiality.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-title: Confidentiality
----
-
-**Section 8 of the** [**TOUR DE SOL PARTICIPATION TERMS**](https://drive.google.com/file/d/15ueLG6VJoQ5Hx4rnpjFeuL3pG5DbrBbE/view) **references confidentiality.**
-
-Solana doesn’t intend to share any confidential information during the Tour de SOL. However, if we do, it will be called out as such within our communications verbally, by email, etc. Unless information is specifically called out as such, the information should not be considered confidential and we welcome you to share it.
diff --git a/docs/src/tour-de-sol/registration/how-to-register.md b/docs/src/tour-de-sol/registration/how-to-register.md
deleted file mode 100644
index 2ba86281aebd66..00000000000000
--- a/docs/src/tour-de-sol/registration/how-to-register.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-title: How To Register
----
-
-For registration, KYC, and the participation agreement, please visit the
-validator registration page on the Solana.com website:
-
-https://solana.com/validator-registration
diff --git a/docs/src/tour-de-sol/registration/rewards.md b/docs/src/tour-de-sol/registration/rewards.md
deleted file mode 100644
index e61cf447175ecb..00000000000000
--- a/docs/src/tour-de-sol/registration/rewards.md
+++ /dev/null
@@ -1,31 +0,0 @@
----
-title: Compensation
----
-
-## Compensation Calculation
-
-Compensation will be calculated according to the compensation design described in [this forum post](https://forums.solana.com/t/tour-de-sol-updates-to-tour-de-sol-and-bug-bounty-compensation-structure/1132).
-
-Please also see section “2\(f\) Tour de Sol Details” of the [TOUR DE SOL PARTICIPATION TERMS](https://drive.google.com/file/d/15ueLG6VJoQ5Hx4rnpjFeuL3pG5DbrBbE/view) for additional compensation details.
-
-## Requirements to Receive Rewards
-
-Participants must have signed the Tour de SOL participation agreement,
-passed KYC/AML , as well as filled out the W-8 BEN or W-9 tax form
-\(depending on your residency\) prior to participating in the Tour.
-
-A participant may participate in any and all stages that begin after they
-complete registration. The final registrations dates will be announced
-publicly on a stage-by-stage basis.
-
-## Tax Implications
-
-Participants are entering into a service agreement with Solana with discretionary compensation associated with the services. They are not considered to be a full-time employee of the company and therefore Solana is collecting W-9 and W-8 BEN forms in order to support tax reporting obligations, if applicable. Solana recommends participants consult with a tax accountant to understand any potential tax implications.
-
-Also, as stated in Sections 2i, 2k and 10c of the [TOUR DE SOL PARTICIPATION TERMS](https://drive.google.com/file/d/15ueLG6VJoQ5Hx4rnpjFeuL3pG5DbrBbE/view):
-
-> 2i - To receive any SOL Reward, a Finalist must sign the Company’s standard form of SOL Reward Agreement which will include the terms and conditions governing the ownership and use of the SOL that are issued as the SOL Reward, including but not limited to applicable lockups required by securities laws, blackout dates and tax reporting information.
-
-> 2k - To receive any SOL Reward, a Finalist must sign the Company’s standard form of SOL Reward Agreement which will include the terms and conditions governing the ownership and use of the SOL that are issued as the SOL Reward, including but not limited to applicable lockups required by securities laws, blackout dates and tax reporting information.
-
-> 10c - You are responsible for complying with all laws and regulations applicable to your transactions on any Protocol, including, but not limited to, the Commodity Exchange Act and the regulations promulgated thereunder by the U.S. Commodity Futures Trading Commission \(“CFTC”\), the federal securities laws and the regulations promulgated thereunder by the U.S. Securities and Exchange Commission \(“SEC”\), and the tax laws applicable to any remuneration received by you from Company.
diff --git a/docs/src/tour-de-sol/registration/terms-of-participation.md b/docs/src/tour-de-sol/registration/terms-of-participation.md
deleted file mode 100644
index e04053a752a6df..00000000000000
--- a/docs/src/tour-de-sol/registration/terms-of-participation.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Terms of Participation
----
-
-Please see the official [TOUR DE SOL PARTICIPATION TERMS](https://drive.google.com/a/solana.com/file/d/15ueLG6VJoQ5Hx4rnpjFeuL3pG5DbrBbE/view?usp=sharing) for complete details.
diff --git a/docs/src/tour-de-sol/registration/validator-registration-and-rewards-faq.md b/docs/src/tour-de-sol/registration/validator-registration-and-rewards-faq.md
deleted file mode 100644
index 0e37e8294a3626..00000000000000
--- a/docs/src/tour-de-sol/registration/validator-registration-and-rewards-faq.md
+++ /dev/null
@@ -1,49 +0,0 @@
----
-title: Registration FAQ
----
-
-The [TOUR DE SOL PARTICIPATION TERMS](https://drive.google.com/a/solana.com/file/d/15ueLG6VJoQ5Hx4rnpjFeuL3pG5DbrBbE/view?usp=sharing) should be considered the authoritative resource for any participation questions.
-
-## Is registration mandatory?
-
-Yes. Registration is mandatory. Registration is rolling, we host month-long Tour de SOL stages on a monthly basis and new participants will need to wait until the start of the next stage to be on-boarded. [Registration information lives here](how-to-register.md).
-
-## Who’s eligible to participate?
-
-Please see section “1 Eligibility; KYC Requirements” of the [TOUR DE SOL PARTICIPATION TERMS](https://drive.google.com/a/solana.com/file/d/15ueLG6VJoQ5Hx4rnpjFeuL3pG5DbrBbE/view?usp=sharing) for details.
-
-## Do I have to complete the KYC/AML process to participate?
-
-Yes. Completing the KYC/AML process is mandatory.
-
-## What are my responsibilities as a Tour de Sol participant?
-
-Please see section “2c Tour de SOL Details” of the [TOUR DE SOL PARTICIPATION TERMS](https://drive.google.com/file/d/15ueLG6VJoQ5Hx4rnpjFeuL3pG5DbrBbE/view) for details.
-
-## How is the “90% of the active Tour event time” responsibility calculated?
-
-To be eligible for rewards in a given stage, a validator must submit votes in &gt;= 90% of that stage’s slots.
-
-## Is there a relationship between the Tour de Sol testnet tokens and Solana mainnet tokens?
-
-No. Please see section ”2d Tour de SOL Details” of the [TOUR DE SOL PARTICIPATION TERMS](https://drive.google.com/file/d/15ueLG6VJoQ5Hx4rnpjFeuL3pG5DbrBbE/view) for details.
-
-## Can a validator be disqualified from the Tour de Sol?
-
-Yes. A validator be disqualified from the Tour de SOL if they engage in prohibited conduct and/or fails to provide the minimum level of services described in question \#4 above.
-
-Please also see Section “4 Prohibited Conduct” of the [TOUR DE SOL PARTICIPATION TERMS](https://drive.google.com/file/d/15ueLG6VJoQ5Hx4rnpjFeuL3pG5DbrBbE/view) for a more detailed description of prohibited conduct.
-
-### More questions related to Prohibited Conduct:
-
-#### As referenced in section “4 Prohibited Conduct”, what would be an example of providing Tour Services from a jurisdiction other than the jurisdiction of my residence? Does this mean my server has to reside in the jurisdiction of my residence?
-
-No. Servers can be in other jurisdictions that differ from a participant’s residency. By signing the [TOUR DE SOL PARTICIPATION TERMS](https://drive.google.com/file/d/15ueLG6VJoQ5Hx4rnpjFeuL3pG5DbrBbE/view) the participant has represented that they are delivering their services from the US if they reside there or from outside the US if they are not residing within the US.
-
-## How are rewards calculated?
-
-Please see the [Rewards section](rewards.md) for details
-
-## How will we know what information we can and cannot share publicly?
-
-Please see [Confidentiality](confidentiality.md).
diff --git a/docs/src/tour-de-sol/submitting-bugs.md b/docs/src/tour-de-sol/submitting-bugs.md
deleted file mode 100644
index f8450d686588f2..00000000000000
--- a/docs/src/tour-de-sol/submitting-bugs.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-title: Submitting Bugs
----
-
-Please submit all bugs and feedback as [issues in this Github repo](https://github.com/solana-labs/solana/issues).
-
-Given the fast pace of communication in the [Discord channels](useful-links.md), it’s likely issues reported in them may be lost in the information flow. Filing the issues in the Github repo is the only way to ensure the issues get logged and addressed.
diff --git a/docs/src/tour-de-sol/useful-links.md b/docs/src/tour-de-sol/useful-links.md
deleted file mode 100644
index fd52798bf695c9..00000000000000
--- a/docs/src/tour-de-sol/useful-links.md
+++ /dev/null
@@ -1,15 +0,0 @@
----
-title: Useful Links & Discussion
-description: Where to go after you've read this guide
----
-
-- [Network Explorer](http://explorer.solana.com/)
-- [TdS metrics dashboard](https://metrics.solana.com:3000/d/monitor-edge/cluster-telemetry-edge?refresh=1m&from=now-15m&to=now&var-testnet=tds)
-- [Core software repo](https://github.com/solana-labs/solana)
-- [Submit bugs and feedback in this repo](https://github.com/solana-labs/solana/issues)
-
-### Validator Discussions
-
-The Solana Discord server is where all the action happens. Join the server by
-visiting https://solana.com/discord. Check out the "Testnet (Tour de SOL)" channel
-group.
diff --git a/docs/src/wallet-guide/apps.md b/docs/src/wallet-guide/apps.md
index 552287acdb93f6..54788d05460a92 100644
--- a/docs/src/wallet-guide/apps.md
+++ b/docs/src/wallet-guide/apps.md
@@ -46,3 +46,19 @@ viewed at any later time in the app by following these steps:
 be used to send and receive SOL tokens.
 
 _Note: Coin98 does not support stake accounts or staking operations_
+
+## Zelcore
+
+[Zelcore](https://zelcore.io) is a multi-currency wallet now supporting SOL and all Solana tokens (SPL). Each Zelcore account has 3 separate addresses for each asset.
+Store, transact, connect to dapps, and (soon) DEX trade in a single app and hold SOL tokens alongside BTC, ETH, and 270+ other cryptos.
+
+Zelcore is available for [Desktop](https://zelcore.io), [iOS](https://apps.apple.com/us/app/zelcore/id1436296839), and [Android](https://play.google.com/store/apps/details?id=com.zelcash.zelcore&hl=en_US&gl=US). One account for all your cryptos, all your devices.
+
+Zelcore also uses a custom Sollet-based wallet adapter solution so users can connect to all their dapps with a single browser tab to keep things tidy.
+
+__**DEVS**__: integrate Zelcore wallet into your products by implementing Sollet solution using "link.zelcore.io" as connection URL.
+
+### Zelcore Wallet Security
+Zelcore utilizes a username/password schema to derive private keys for all assets. Security layers include blockchain-based 2FA PIN, mobile device biometrics, and passphrases to allow users to set up as much or as little security as they like. All hashing functions done on-device, and no login/account info is stored nor transmitted off your device. The private keys only exist on-device while logged in, upon logging out there is no digital footprint left of your PKs.
+
+**Treat your username, password, d2FA PIN, passphrases, etc. with utmost care, just like your private keys. Never give these to anyone!**
diff --git a/docs/src/wallet-guide/paper-wallet.md b/docs/src/wallet-guide/paper-wallet.md
index 83c1e6b3f0c910..4b3e93c90a929a 100644
--- a/docs/src/wallet-guide/paper-wallet.md
+++ b/docs/src/wallet-guide/paper-wallet.md
@@ -82,6 +82,7 @@ For full usage details run:
 solana-keygen new --help
 ```
 
+
 ### Public Key Derivation
 
 Public keys can be derived from a seed phrase and a passphrase if you choose to
@@ -107,11 +108,17 @@ solana-keygen pubkey prompt:// --skip-seed-phrase-validation
 ```
 
 After entering your seed phrase with `solana-keygen pubkey prompt://` the console
-will display a string of base-58 character. This is the base _wallet address_
+will display a string of base-58 character. This is the [derived](#hierarchical-derivation) solana BIP44 _wallet address_
 associated with your seed phrase.
 
 > Copy the derived address to a USB stick for easy usage on networked computers
 
+If needed, you can access the legacy, raw keypair's pubkey by instead passing the `ASK` keyword:
+
+```bash
+solana-keygen pubkey ASK
+```
+
 > A common next step is to [check the balance](#checking-account-balance) of the account associated with a public key
 
 For full usage details run:
diff --git a/dos/Cargo.toml b/dos/Cargo.toml
index 2e98c29bc506bc..56c937f01a4030 100644
--- a/dos/Cargo.toml
+++ b/dos/Cargo.toml
@@ -2,7 +2,7 @@
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 edition = "2018"
 name = "solana-dos"
-version = "1.7.0"
+version = "1.7.11"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
@@ -14,16 +14,17 @@ clap = "2.33.1"
 log = "0.4.11"
 rand = "0.7.0"
 rayon = "1.5.0"
-solana-clap-utils = { path = "../clap-utils", version = "=1.7.0" }
-solana-core = { path = "../core", version = "=1.7.0" }
-solana-gossip = { path = "../gossip", version = "=1.7.0" }
-solana-ledger = { path = "../ledger", version = "=1.7.0" }
-solana-logger = { path = "../logger", version = "=1.7.0" }
-solana-net-utils = { path = "../net-utils", version = "=1.7.0" }
-solana-runtime = { path = "../runtime", version = "=1.7.0" }
-solana-sdk = { path = "../sdk", version = "=1.7.0" }
-solana-version = { path = "../version", version = "=1.7.0" }
-solana-client = { path = "../client", version = "=1.7.0" }
+solana-clap-utils = { path = "../clap-utils", version = "=1.7.11" }
+solana-core = { path = "../core", version = "=1.7.11" }
+solana-gossip = { path = "../gossip", version = "=1.7.11" }
+solana-ledger = { path = "../ledger", version = "=1.7.11" }
+solana-logger = { path = "../logger", version = "=1.7.11" }
+solana-net-utils = { path = "../net-utils", version = "=1.7.11" }
+solana-runtime = { path = "../runtime", version = "=1.7.11" }
+solana-sdk = { path = "../sdk", version = "=1.7.11" }
+solana-streamer = { path = "../streamer", version = "=1.7.11" }
+solana-version = { path = "../version", version = "=1.7.11" }
+solana-client = { path = "../client", version = "=1.7.11" }
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
diff --git a/dos/src/main.rs b/dos/src/main.rs
index 891f9c9fa3fc6b..14ddbbd0080958 100644
--- a/dos/src/main.rs
+++ b/dos/src/main.rs
@@ -6,6 +6,7 @@ use solana_client::rpc_client::RpcClient;
 use solana_core::serve_repair::RepairProtocol;
 use solana_gossip::{contact_info::ContactInfo, gossip_service::discover};
 use solana_sdk::pubkey::Pubkey;
+use solana_streamer::socket::SocketAddrSpace;
 use std::net::{SocketAddr, UdpSocket};
 use std::process::exit;
 use std::str::FromStr;
@@ -96,14 +97,14 @@ fn run_dos(
                     let res = rpc_client
                         .as_ref()
                         .unwrap()
-                        .get_account(&Pubkey::from_str(&data_input.as_ref().unwrap()).unwrap());
+                        .get_account(&Pubkey::from_str(data_input.as_ref().unwrap()).unwrap());
                     if res.is_err() {
                         error_count += 1;
                     }
                 }
                 "get_program_accounts" => {
                     let res = rpc_client.as_ref().unwrap().get_program_accounts(
-                        &Pubkey::from_str(&data_input.as_ref().unwrap()).unwrap(),
+                        &Pubkey::from_str(data_input.as_ref().unwrap()).unwrap(),
                     );
                     if res.is_err() {
                         error_count += 1;
@@ -197,6 +198,13 @@ fn main() {
                 .long("skip-gossip")
                 .help("Just use entrypoint address directly"),
         )
+        .arg(
+            Arg::with_name("allow_private_addr")
+                .long("allow-private-addr")
+                .takes_value(false)
+                .help("Allow contacting private ip addresses")
+                .hidden(true),
+        )
         .get_matches();
 
     let mut entrypoint_addr = SocketAddr::from(([127, 0, 0, 1], 8001));
@@ -216,6 +224,7 @@ fn main() {
     let mut nodes = vec![];
     if !skip_gossip {
         info!("Finding cluster entry: {:?}", entrypoint_addr);
+        let socket_addr_space = SocketAddrSpace::new(matches.is_present("allow_private_addr"));
         let (gossip_nodes, _validators) = discover(
             None, // keypair
             Some(&entrypoint_addr),
@@ -225,6 +234,7 @@ fn main() {
             Some(&entrypoint_addr),  // find_node_by_gossip_addr
             None,                    // my_gossip_addr
             0,                       // my_shred_version
+            socket_addr_space,
         )
         .unwrap_or_else(|err| {
             eprintln!("Failed to discover {} node: {:?}", entrypoint_addr, err);
diff --git a/download-utils/Cargo.toml b/download-utils/Cargo.toml
index c04d32a3d80830..808f808fd5d7e6 100644
--- a/download-utils/Cargo.toml
+++ b/download-utils/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "solana-download-utils"
-version = "1.7.0"
+version = "1.7.11"
 description = "Solana Download Utils"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -11,13 +11,13 @@ edition = "2018"
 
 [dependencies]
 bzip2 = "0.3.3"
-console = "0.11.3"
+console = "0.14.1"
 indicatif = "0.15.0"
 log = "0.4.11"
 reqwest = { version = "0.11.2", default-features = false, features = ["blocking", "rustls-tls", "json"] }
-solana-sdk = { path = "../sdk", version = "=1.7.0" }
-solana-runtime = { path = "../runtime", version = "=1.7.0" }
-tar = "0.4.28"
+solana-sdk = { path = "../sdk", version = "=1.7.11" }
+solana-runtime = { path = "../runtime", version = "=1.7.11" }
+tar = "0.4.37"
 
 [lib]
 crate-type = ["lib"]
diff --git a/download-utils/src/lib.rs b/download-utils/src/lib.rs
index da31b0d3434562..3fda667deab027 100644
--- a/download-utils/src/lib.rs
+++ b/download-utils/src/lib.rs
@@ -258,6 +258,7 @@ pub fn download_snapshot<'a, 'b>(
         ArchiveFormat::TarZstd,
         ArchiveFormat::TarGzip,
         ArchiveFormat::TarBzip2,
+        ArchiveFormat::Tar, // `solana-test-validator` creates uncompressed snapshots
     ] {
         let desired_snapshot_package = snapshot_utils::get_snapshot_archive_path(
             snapshot_output_dir.to_path_buf(),
@@ -269,7 +270,7 @@ pub fn download_snapshot<'a, 'b>(
             return Ok(());
         }
 
-        if download_file(
+        match download_file(
             &format!(
                 "http://{}/{}",
                 rpc_addr,
@@ -282,11 +283,13 @@ pub fn download_snapshot<'a, 'b>(
             &desired_snapshot_package,
             use_progress_bar,
             progress_notify_callback,
-        )
-        .is_ok()
-        {
-            return Ok(());
+        ) {
+            Ok(()) => return Ok(()),
+            Err(err) => info!("{}", err),
         }
     }
-    Err("Snapshot couldn't be downloaded".to_string())
+    Err(format!(
+        "Failed to download a snapshot for slot {} from {}",
+        desired_snapshot_hash.0, rpc_addr
+    ))
 }
diff --git a/faucet/Cargo.toml b/faucet/Cargo.toml
index 1488ebd25261a0..44488f66fc5c75 100644
--- a/faucet/Cargo.toml
+++ b/faucet/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "solana-faucet"
-version = "1.7.0"
+version = "1.7.11"
 description = "Solana Faucet"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -16,12 +16,12 @@ clap = "2.33"
 log = "0.4.11"
 serde = "1.0.122"
 serde_derive = "1.0.103"
-solana-clap-utils = { path = "../clap-utils", version = "=1.7.0" }
-solana-cli-config = { path = "../cli-config", version = "=1.7.0" }
-solana-logger = { path = "../logger", version = "=1.7.0" }
-solana-metrics = { path = "../metrics", version = "=1.7.0" }
-solana-sdk = { path = "../sdk", version = "=1.7.0" }
-solana-version = { path = "../version", version = "=1.7.0" }
+solana-clap-utils = { path = "../clap-utils", version = "=1.7.11" }
+solana-cli-config = { path = "../cli-config", version = "=1.7.11" }
+solana-logger = { path = "../logger", version = "=1.7.11" }
+solana-metrics = { path = "../metrics", version = "=1.7.11" }
+solana-sdk = { path = "../sdk", version = "=1.7.11" }
+solana-version = { path = "../version", version = "=1.7.11" }
 spl-memo = { version = "=3.0.1", features = ["no-entrypoint"] }
 thiserror = "1.0"
 tokio = { version = "1", features = ["full"] }
diff --git a/faucet/src/faucet.rs b/faucet/src/faucet.rs
index c2831ee627d926..b253a6543567ef 100644
--- a/faucet/src/faucet.rs
+++ b/faucet/src/faucet.rs
@@ -654,7 +654,7 @@ mod tests {
     #[test]
     fn test_process_faucet_request() {
         let to = solana_sdk::pubkey::new_rand();
-        let blockhash = Hash::new(&to.as_ref());
+        let blockhash = Hash::new(to.as_ref());
         let lamports = 50;
         let req = FaucetRequest::GetAirdrop {
             lamports,
@@ -679,6 +679,6 @@ mod tests {
         assert_eq!(expected_vec_with_length, response_vec);
 
         let bad_bytes = "bad bytes".as_bytes();
-        assert!(faucet.process_faucet_request(&bad_bytes, ip).is_err());
+        assert!(faucet.process_faucet_request(bad_bytes, ip).is_err());
     }
 }
diff --git a/faucet/tests/local-faucet.rs b/faucet/tests/local-faucet.rs
index 841255274365ff..8629c68ac25dfe 100644
--- a/faucet/tests/local-faucet.rs
+++ b/faucet/tests/local-faucet.rs
@@ -12,7 +12,7 @@ fn test_local_faucet() {
     let keypair = Keypair::new();
     let to = solana_sdk::pubkey::new_rand();
     let lamports = 50;
-    let blockhash = Hash::new(&to.as_ref());
+    let blockhash = Hash::new(to.as_ref());
     let create_instruction = system_instruction::transfer(&keypair.pubkey(), &to, lamports);
     let message = Message::new(&[create_instruction], Some(&keypair.pubkey()));
     let expected_tx = Transaction::new(&[&keypair], message, blockhash);
diff --git a/fetch-spl.sh b/fetch-spl.sh
index 3f419fcd843bae..cf0f2b41232964 100755
--- a/fetch-spl.sh
+++ b/fetch-spl.sh
@@ -38,10 +38,10 @@ fetch_program() {
 
 }
 
-fetch_program token 3.1.0 TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA BPFLoader2111111111111111111111111111111111
+fetch_program token 3.2.0 TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA BPFLoader2111111111111111111111111111111111
 fetch_program memo  1.0.0 Memo1UhkJRfHyvLMcVucJwxXeuD728EqVDDwQDxFMNo BPFLoader1111111111111111111111111111111111
 fetch_program memo  3.0.0 MemoSq4gqABAXKb96qnH8TysNcWxMyWCqXgDLGmfcHr BPFLoader2111111111111111111111111111111111
-fetch_program associated-token-account 1.0.1 ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL BPFLoader2111111111111111111111111111111111
+fetch_program associated-token-account 1.0.3 ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL BPFLoader2111111111111111111111111111111111
 fetch_program feature-proposal 1.0.0 Feat1YXHhH6t1juaWF74WLcfv4XoNocjXA6sPWHNgAse BPFLoader2111111111111111111111111111111111
 
 echo "${genesis_args[@]}" > spl-genesis-args.sh
diff --git a/frozen-abi/Cargo.toml b/frozen-abi/Cargo.toml
index 5d425e3de93708..efba2cbd2b51af 100644
--- a/frozen-abi/Cargo.toml
+++ b/frozen-abi/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "solana-frozen-abi"
-version = "1.7.0"
+version = "1.7.11"
 description = "Solana Frozen ABI"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -16,11 +16,11 @@ log = "0.4.11"
 serde = "1.0.122"
 serde_derive = "1.0.103"
 sha2 = "0.9.2"
-solana-frozen-abi-macro = { path = "macro", version = "=1.7.0" }
+solana-frozen-abi-macro = { path = "macro", version = "=1.7.11" }
 thiserror = "1.0"
 
 [target.'cfg(not(target_arch = "bpf"))'.dependencies]
-solana-logger = { path = "../logger", version = "=1.7.0" }
+solana-logger = { path = "../logger", version = "=1.7.11" }
 generic-array = { version = "0.14.3", default-features = false, features = ["serde", "more_lengths"]}
 memmap2 = "0.1.0"
 
diff --git a/frozen-abi/macro/Cargo.toml b/frozen-abi/macro/Cargo.toml
index eaf31a2c375927..837369e3231be1 100644
--- a/frozen-abi/macro/Cargo.toml
+++ b/frozen-abi/macro/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "solana-frozen-abi-macro"
-version = "1.7.0"
+version = "1.7.11"
 description = "Solana Frozen ABI Macro"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
diff --git a/frozen-abi/macro/src/lib.rs b/frozen-abi/macro/src/lib.rs
index bd285a826c9acc..ee0a4fdf2b448a 100644
--- a/frozen-abi/macro/src/lib.rs
+++ b/frozen-abi/macro/src/lib.rs
@@ -224,7 +224,7 @@ fn do_derive_abi_enum_visitor(input: ItemEnum) -> TokenStream {
         if filter_serde_attrs(&variant.attrs) {
             continue;
         };
-        let sample_variant = quote_sample_variant(&type_name, &ty_generics, &variant);
+        let sample_variant = quote_sample_variant(type_name, &ty_generics, variant);
         variant_count = if let Some(variant_count) = variant_count.checked_add(1) {
             variant_count
         } else {
@@ -319,7 +319,7 @@ fn test_mod_name(type_name: &Ident) -> Ident {
 #[cfg(RUSTC_WITH_SPECIALIZATION)]
 fn frozen_abi_type_alias(input: ItemType, expected_digest: &str) -> TokenStream {
     let type_name = &input.ident;
-    let test = quote_for_test(&test_mod_name(type_name), type_name, &expected_digest);
+    let test = quote_for_test(&test_mod_name(type_name), type_name, expected_digest);
     let result = quote! {
         #input
         #test
@@ -330,7 +330,7 @@ fn frozen_abi_type_alias(input: ItemType, expected_digest: &str) -> TokenStream
 #[cfg(RUSTC_WITH_SPECIALIZATION)]
 fn frozen_abi_struct_type(input: ItemStruct, expected_digest: &str) -> TokenStream {
     let type_name = &input.ident;
-    let test = quote_for_test(&test_mod_name(type_name), type_name, &expected_digest);
+    let test = quote_for_test(&test_mod_name(type_name), type_name, expected_digest);
     let result = quote! {
         #input
         #test
@@ -387,7 +387,7 @@ fn quote_sample_variant(
 #[cfg(RUSTC_WITH_SPECIALIZATION)]
 fn frozen_abi_enum_type(input: ItemEnum, expected_digest: &str) -> TokenStream {
     let type_name = &input.ident;
-    let test = quote_for_test(&test_mod_name(type_name), type_name, &expected_digest);
+    let test = quote_for_test(&test_mod_name(type_name), type_name, expected_digest);
     let result = quote! {
         #input
         #test
diff --git a/frozen-abi/src/abi_example.rs b/frozen-abi/src/abi_example.rs
index ebb74e31ca2ada..b9bb57b3641914 100644
--- a/frozen-abi/src/abi_example.rs
+++ b/frozen-abi/src/abi_example.rs
@@ -468,7 +468,7 @@ impl<T: Serialize + ?Sized + AbiEnumVisitor> AbiEnumVisitor for &T {
     default fn visit_for_abi(&self, digester: &mut AbiDigester) -> DigestResult {
         info!("AbiEnumVisitor for (&default): {}", type_name::<T>());
         // Don't call self.visit_for_abi(...) to avoid the infinite recursion!
-        T::visit_for_abi(&self, digester)
+        T::visit_for_abi(self, digester)
     }
 }
 
diff --git a/genesis-utils/Cargo.toml b/genesis-utils/Cargo.toml
index e555908cff4c63..5be6cb9410f062 100644
--- a/genesis-utils/Cargo.toml
+++ b/genesis-utils/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "solana-genesis-utils"
-version = "1.7.0"
+version = "1.7.11"
 description = "Solana Genesis Utils"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -10,9 +10,9 @@ documentation = "https://docs.rs/solana-download-utils"
 edition = "2018"
 
 [dependencies]
-solana-sdk = { path = "../sdk", version = "=1.7.0" }
-solana-download-utils = { path = "../download-utils", version = "=1.7.0" }
-solana-runtime = { path = "../runtime", version = "=1.7.0" }
+solana-sdk = { path = "../sdk", version = "=1.7.11" }
+solana-download-utils = { path = "../download-utils", version = "=1.7.11" }
+solana-runtime = { path = "../runtime", version = "=1.7.11" }
 
 [lib]
 crate-type = ["lib"]
diff --git a/genesis-utils/src/lib.rs b/genesis-utils/src/lib.rs
index 1efb26aedd3bf7..513da409ad20cd 100644
--- a/genesis-utils/src/lib.rs
+++ b/genesis-utils/src/lib.rs
@@ -28,7 +28,7 @@ fn load_local_genesis(
     ledger_path: &std::path::Path,
     expected_genesis_hash: Option<Hash>,
 ) -> Result<GenesisConfig, String> {
-    let existing_genesis = GenesisConfig::load(&ledger_path)
+    let existing_genesis = GenesisConfig::load(ledger_path)
         .map_err(|err| format!("Failed to load genesis config: {}", err))?;
     check_genesis_hash(&existing_genesis, expected_genesis_hash)?;
 
@@ -54,12 +54,12 @@ pub fn download_then_check_genesis_hash(
     {
         unpack_genesis_archive(
             &tmp_genesis_package,
-            &ledger_path,
+            ledger_path,
             max_genesis_archive_unpacked_size,
         )
         .map_err(|err| format!("Failed to unpack downloaded genesis config: {}", err))?;
 
-        let downloaded_genesis = GenesisConfig::load(&ledger_path)
+        let downloaded_genesis = GenesisConfig::load(ledger_path)
             .map_err(|err| format!("Failed to load downloaded genesis config: {}", err))?;
 
         check_genesis_hash(&downloaded_genesis, expected_genesis_hash)?;
diff --git a/genesis/Cargo.toml b/genesis/Cargo.toml
index 851f1b50846efe..95f1009c024d6b 100644
--- a/genesis/Cargo.toml
+++ b/genesis/Cargo.toml
@@ -3,7 +3,7 @@ authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 edition = "2018"
 name = "solana-genesis"
 description = "Blockchain, Rebuilt for Scale"
-version = "1.7.0"
+version = "1.7.11"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
@@ -16,17 +16,16 @@ chrono = "0.4"
 serde = "1.0.122"
 serde_json = "1.0.56"
 serde_yaml = "0.8.13"
-solana-budget-program = { path = "../programs/budget", version = "=1.7.0" }
-solana-clap-utils = { path = "../clap-utils", version = "=1.7.0" }
-solana-cli-config = { path = "../cli-config", version = "=1.7.0" }
-solana-exchange-program = { path = "../programs/exchange", version = "=1.7.0" }
-solana-ledger = { path = "../ledger", version = "=1.7.0" }
-solana-logger = { path = "../logger", version = "=1.7.0" }
-solana-runtime = { path = "../runtime", version = "=1.7.0" }
-solana-sdk = { path = "../sdk", version = "=1.7.0" }
-solana-stake-program = { path = "../programs/stake", version = "=1.7.0" }
-solana-version = { path = "../version", version = "=1.7.0" }
-solana-vote-program = { path = "../programs/vote", version = "=1.7.0" }
+solana-clap-utils = { path = "../clap-utils", version = "=1.7.11" }
+solana-cli-config = { path = "../cli-config", version = "=1.7.11" }
+solana-exchange-program = { path = "../programs/exchange", version = "=1.7.11" }
+solana-ledger = { path = "../ledger", version = "=1.7.11" }
+solana-logger = { path = "../logger", version = "=1.7.11" }
+solana-runtime = { path = "../runtime", version = "=1.7.11" }
+solana-sdk = { path = "../sdk", version = "=1.7.11" }
+solana-stake-program = { path = "../programs/stake", version = "=1.7.11" }
+solana-version = { path = "../version", version = "=1.7.11" }
+solana-vote-program = { path = "../programs/vote", version = "=1.7.11" }
 tempfile = "3.1.0"
 
 [[bin]]
diff --git a/genesis/src/genesis_accounts.rs b/genesis/src/genesis_accounts.rs
index 61abf74d27d7e1..7bf3504402c8e0 100644
--- a/genesis/src/genesis_accounts.rs
+++ b/genesis/src/genesis_accounts.rs
@@ -231,20 +231,20 @@ pub fn add_genesis_accounts(genesis_config: &mut GenesisConfig, mut issued_lampo
 
     issued_lamports += add_stakes(
         genesis_config,
-        &CREATOR_STAKER_INFOS,
+        CREATOR_STAKER_INFOS,
         &UNLOCKS_HALF_AT_9_MONTHS,
     ) + add_stakes(
         genesis_config,
-        &SERVICE_STAKER_INFOS,
+        SERVICE_STAKER_INFOS,
         &UNLOCKS_ALL_AT_9_MONTHS,
     ) + add_stakes(
         genesis_config,
-        &FOUNDATION_STAKER_INFOS,
+        FOUNDATION_STAKER_INFOS,
         &UNLOCKS_ALL_DAY_ZERO,
-    ) + add_stakes(genesis_config, &GRANTS_STAKER_INFOS, &UNLOCKS_ALL_DAY_ZERO)
+    ) + add_stakes(genesis_config, GRANTS_STAKER_INFOS, &UNLOCKS_ALL_DAY_ZERO)
         + add_stakes(
             genesis_config,
-            &COMMUNITY_STAKER_INFOS,
+            COMMUNITY_STAKER_INFOS,
             &UNLOCKS_ALL_DAY_ZERO,
         );
 
diff --git a/genesis/src/main.rs b/genesis/src/main.rs
index d86d38668e76e4..2fb7498337d1ad 100644
--- a/genesis/src/main.rs
+++ b/genesis/src/main.rs
@@ -1,8 +1,6 @@
 //! A command-line executable for generating the chain's genesis config.
 #![allow(clippy::integer_arithmetic)]
 
-#[macro_use]
-extern crate solana_budget_program;
 #[macro_use]
 extern crate solana_exchange_program;
 
@@ -28,9 +26,10 @@ use solana_sdk::{
     pubkey::Pubkey,
     rent::Rent,
     signature::{Keypair, Signer},
+    stake::state::StakeState,
     system_program, timing,
 };
-use solana_stake_program::stake_state::{self, StakeState};
+use solana_stake_program::stake_state;
 use solana_vote_program::vote_state::{self, VoteState};
 use std::{
     collections::HashMap,
@@ -492,7 +491,7 @@ fn main() -> Result<(), Box<dyn error::Error>> {
     );
 
     let native_instruction_processors = if cluster_type == ClusterType::Development {
-        vec![solana_budget_program!(), solana_exchange_program!()]
+        vec![solana_exchange_program!()]
     } else {
         vec![]
     };
@@ -535,9 +534,9 @@ fn main() -> Result<(), Box<dyn error::Error>> {
         );
 
         let vote_account = vote_state::create_account_with_authorized(
-            &identity_pubkey,
-            &identity_pubkey,
-            &identity_pubkey,
+            identity_pubkey,
+            identity_pubkey,
+            identity_pubkey,
             commission,
             VoteState::get_rent_exempt_reserve(&rent).max(1),
         );
@@ -547,8 +546,8 @@ fn main() -> Result<(), Box<dyn error::Error>> {
             stake_state::create_account(
                 bootstrap_stake_authorized_pubkey
                     .as_ref()
-                    .unwrap_or(&identity_pubkey),
-                &vote_pubkey,
+                    .unwrap_or(identity_pubkey),
+                vote_pubkey,
                 &vote_account,
                 &rent,
                 bootstrap_validator_stake_lamports,
@@ -783,7 +782,7 @@ mod tests {
             let pubkey = &pubkey_str.parse().unwrap();
             assert_eq!(
                 b64_account.balance,
-                genesis_config.accounts[&pubkey].lamports,
+                genesis_config.accounts[pubkey].lamports,
             );
         }
 
diff --git a/genesis/src/stakes.rs b/genesis/src/stakes.rs
index db9104b7ebf8ef..ca2b8da4d9791b 100644
--- a/genesis/src/stakes.rs
+++ b/genesis/src/stakes.rs
@@ -1,15 +1,22 @@
 //! stakes generator
-use crate::{
-    address_generator::AddressGenerator,
-    unlocks::{UnlockInfo, Unlocks},
-};
-use solana_sdk::{
-    account::Account, clock::Slot, genesis_config::GenesisConfig, pubkey::Pubkey, system_program,
-    timing::years_as_slots,
-};
-use solana_stake_program::{
-    self,
-    stake_state::{create_lockup_stake_account, Authorized, Lockup, StakeState},
+use {
+    crate::{
+        address_generator::AddressGenerator,
+        unlocks::{UnlockInfo, Unlocks},
+    },
+    solana_sdk::{
+        account::Account,
+        clock::Slot,
+        genesis_config::GenesisConfig,
+        pubkey::Pubkey,
+        stake::{
+            self,
+            state::{Authorized, Lockup, StakeState},
+        },
+        system_program,
+        timing::years_as_slots,
+    },
+    solana_stake_program::stake_state::create_lockup_stake_account,
 };
 
 #[derive(Debug)]
@@ -98,8 +105,7 @@ pub fn create_and_add_stakes(
         genesis_config.ticks_per_slot,
     );
 
-    let mut address_generator =
-        AddressGenerator::new(&authorized.staker, &solana_stake_program::id());
+    let mut address_generator = AddressGenerator::new(&authorized.staker, &stake::program::id());
 
     let stake_rent_reserve = StakeState::get_rent_exempt_reserve(&genesis_config.rent);
 
diff --git a/gossip/Cargo.toml b/gossip/Cargo.toml
index 459c5220c53c4e..d85e2fb9d9da4b 100644
--- a/gossip/Cargo.toml
+++ b/gossip/Cargo.toml
@@ -3,7 +3,7 @@ authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 edition = "2018"
 name = "solana-gossip"
 description = "Blockchain, Rebuilt for Scale"
-version = "1.7.0"
+version = "1.7.11"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
@@ -18,6 +18,7 @@ indexmap = { version = "1.5", features = ["rayon"] }
 itertools = "0.9.0"
 log = "0.4.11"
 lru = "0.6.1"
+matches = "0.1.8"
 num-traits = "0.2"
 rand = "0.7.0"
 rand_chacha = "0.2.2"
@@ -25,22 +26,22 @@ rayon = "1.5.0"
 serde = "1.0.122"
 serde_bytes = "0.11"
 serde_derive = "1.0.103"
-solana-clap-utils = { path = "../clap-utils", version = "=1.7.0" }
-solana-client = { path = "../client", version = "=1.7.0" }
-solana-frozen-abi = { path = "../frozen-abi", version = "=1.7.0" }
-solana-frozen-abi-macro = { path = "../frozen-abi/macro", version = "=1.7.0" }
-solana-ledger = { path = "../ledger", version = "=1.7.0" }
-solana-logger = { path = "../logger", version = "=1.7.0" }
-solana-measure = { path = "../measure", version = "=1.7.0" }
-solana-metrics = { path = "../metrics", version = "=1.7.0" }
-solana-net-utils = { path = "../net-utils", version = "=1.7.0" }
-solana-perf = { path = "../perf", version = "=1.7.0" }
-solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "=1.7.0" }
-solana-runtime = { path = "../runtime", version = "=1.7.0" }
-solana-streamer = { path = "../streamer", version = "=1.7.0" }
-solana-sdk = { path = "../sdk", version = "=1.7.0" }
-solana-version = { path = "../version", version = "=1.7.0" }
-solana-vote-program = { path = "../programs/vote", version = "=1.7.0" }
+solana-clap-utils = { path = "../clap-utils", version = "=1.7.11" }
+solana-client = { path = "../client", version = "=1.7.11" }
+solana-frozen-abi = { path = "../frozen-abi", version = "=1.7.11" }
+solana-frozen-abi-macro = { path = "../frozen-abi/macro", version = "=1.7.11" }
+solana-ledger = { path = "../ledger", version = "=1.7.11" }
+solana-logger = { path = "../logger", version = "=1.7.11" }
+solana-measure = { path = "../measure", version = "=1.7.11" }
+solana-metrics = { path = "../metrics", version = "=1.7.11" }
+solana-net-utils = { path = "../net-utils", version = "=1.7.11" }
+solana-perf = { path = "../perf", version = "=1.7.11" }
+solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "=1.7.11" }
+solana-runtime = { path = "../runtime", version = "=1.7.11" }
+solana-streamer = { path = "../streamer", version = "=1.7.11" }
+solana-sdk = { path = "../sdk", version = "=1.7.11" }
+solana-version = { path = "../version", version = "=1.7.11" }
+solana-vote-program = { path = "../programs/vote", version = "=1.7.11" }
 thiserror = "1.0"
 
 [dev-dependencies]
diff --git a/gossip/benches/weighted_shuffle.rs b/gossip/benches/weighted_shuffle.rs
new file mode 100644
index 00000000000000..37097f3e626921
--- /dev/null
+++ b/gossip/benches/weighted_shuffle.rs
@@ -0,0 +1,39 @@
+#![feature(test)]
+
+extern crate test;
+
+use {
+    rand::{Rng, SeedableRng},
+    rand_chacha::ChaChaRng,
+    solana_gossip::weighted_shuffle::{weighted_shuffle, WeightedShuffle},
+    std::iter::repeat_with,
+    test::Bencher,
+};
+
+fn make_weights<R: Rng>(rng: &mut R) -> Vec<u64> {
+    repeat_with(|| rng.gen_range(1, 100)).take(1000).collect()
+}
+
+#[bench]
+fn bench_weighted_shuffle_old(bencher: &mut Bencher) {
+    let mut seed = [0u8; 32];
+    let mut rng = rand::thread_rng();
+    let weights = make_weights(&mut rng);
+    bencher.iter(|| {
+        rng.fill(&mut seed[..]);
+        weighted_shuffle(&weights, seed);
+    });
+}
+
+#[bench]
+fn bench_weighted_shuffle_new(bencher: &mut Bencher) {
+    let mut seed = [0u8; 32];
+    let mut rng = rand::thread_rng();
+    let weights = make_weights(&mut rng);
+    bencher.iter(|| {
+        rng.fill(&mut seed[..]);
+        WeightedShuffle::new(&mut ChaChaRng::from_seed(seed), &weights)
+            .unwrap()
+            .collect::<Vec<_>>()
+    });
+}
diff --git a/gossip/src/cluster_info.rs b/gossip/src/cluster_info.rs
index d1889e2f8ec941..856144606bf998 100644
--- a/gossip/src/cluster_info.rs
+++ b/gossip/src/cluster_info.rs
@@ -14,9 +14,11 @@
 //! Bank needs to provide an interface for us to query the stake weight
 use {
     crate::{
-        cluster_info_metrics::{submit_gossip_stats, Counter, GossipStats, ScopedTimer},
+        cluster_info_metrics::{
+            submit_gossip_stats, Counter, GossipStats, ScopedTimer, TimedGuard,
+        },
         contact_info::ContactInfo,
-        crds::Cursor,
+        crds::{Crds, Cursor},
         crds_gossip::CrdsGossip,
         crds_gossip_error::CrdsGossipError,
         crds_gossip_pull::{CrdsFilter, ProcessPullStats, CRDS_GOSSIP_PULL_CRDS_TIMEOUT_MS},
@@ -29,7 +31,7 @@ use {
         gossip_error::GossipError,
         ping_pong::{self, PingCache, Pong},
         socketaddr, socketaddr_any,
-        weighted_shuffle::weighted_shuffle,
+        weighted_shuffle::WeightedShuffle,
     },
     bincode::{serialize, serialized_size},
     itertools::Itertools,
@@ -62,6 +64,7 @@ use {
     solana_streamer::{
         packet,
         sendmmsg::multicast,
+        socket::SocketAddrSpace,
         streamer::{PacketReceiver, PacketSender},
     },
     solana_vote_program::vote_state::MAX_LOCKOUT_HISTORY,
@@ -73,11 +76,12 @@ use {
         io::BufReader,
         iter::repeat,
         net::{IpAddr, Ipv4Addr, SocketAddr, TcpListener, UdpSocket},
-        ops::{Deref, DerefMut, Div},
+        ops::{Deref, Div},
         path::{Path, PathBuf},
         result::Result,
         sync::{
             atomic::{AtomicBool, Ordering},
+            mpsc::{Receiver, RecvTimeoutError, Sender},
             {Arc, Mutex, RwLock, RwLockReadGuard, RwLockWriteGuard},
         },
         thread::{sleep, Builder, JoinHandle},
@@ -136,78 +140,6 @@ pub enum ClusterInfoError {
     BadGossipAddress,
 }
 
-struct GossipWriteLock<'a> {
-    gossip: RwLockWriteGuard<'a, CrdsGossip>,
-    timer: Measure,
-    counter: &'a Counter,
-}
-
-impl<'a> GossipWriteLock<'a> {
-    fn new(
-        gossip: RwLockWriteGuard<'a, CrdsGossip>,
-        label: &'static str,
-        counter: &'a Counter,
-    ) -> Self {
-        Self {
-            gossip,
-            timer: Measure::start(label),
-            counter,
-        }
-    }
-}
-
-impl<'a> Deref for GossipWriteLock<'a> {
-    type Target = RwLockWriteGuard<'a, CrdsGossip>;
-    fn deref(&self) -> &Self::Target {
-        &self.gossip
-    }
-}
-
-impl<'a> DerefMut for GossipWriteLock<'a> {
-    fn deref_mut(&mut self) -> &mut Self::Target {
-        &mut self.gossip
-    }
-}
-
-impl<'a> Drop for GossipWriteLock<'a> {
-    fn drop(&mut self) {
-        self.counter.add_measure(&mut self.timer);
-    }
-}
-
-struct GossipReadLock<'a> {
-    gossip: RwLockReadGuard<'a, CrdsGossip>,
-    timer: Measure,
-    counter: &'a Counter,
-}
-
-impl<'a> GossipReadLock<'a> {
-    fn new(
-        gossip: RwLockReadGuard<'a, CrdsGossip>,
-        label: &'static str,
-        counter: &'a Counter,
-    ) -> Self {
-        Self {
-            gossip,
-            timer: Measure::start(label),
-            counter,
-        }
-    }
-}
-
-impl<'a> Deref for GossipReadLock<'a> {
-    type Target = RwLockReadGuard<'a, CrdsGossip>;
-    fn deref(&self) -> &Self::Target {
-        &self.gossip
-    }
-}
-
-impl<'a> Drop for GossipReadLock<'a> {
-    fn drop(&mut self) {
-        self.counter.add_measure(&mut self.timer);
-    }
-}
-
 pub struct ClusterInfo {
     /// The network
     pub gossip: RwLock<CrdsGossip>,
@@ -226,16 +158,11 @@ pub struct ClusterInfo {
     contact_save_interval: u64,  // milliseconds, 0 = disabled
     instance: NodeInstance,
     contact_info_path: PathBuf,
-}
-
-impl Default for ClusterInfo {
-    fn default() -> Self {
-        Self::new_with_invalid_keypair(ContactInfo::default())
-    }
+    socket_addr_space: SocketAddrSpace,
 }
 
 #[derive(Clone, Debug, Default, Deserialize, Serialize, AbiExample)]
-struct PruneData {
+pub(crate) struct PruneData {
     /// Pubkey of the node that sent this prune data
     pubkey: Pubkey,
     /// Pubkeys of nodes that should be pruned
@@ -264,7 +191,7 @@ impl PruneData {
             destination: Pubkey::new_unique(),
             wallclock,
         };
-        prune_data.sign(&self_keypair);
+        prune_data.sign(self_keypair);
         prune_data
     }
 }
@@ -329,7 +256,7 @@ pub(crate) type Ping = ping_pong::Ping<[u8; GOSSIP_PING_TOKEN_SIZE]>;
 #[frozen_abi(digest = "GANv3KVkTYF84kmg1bAuWEZd9MaiYzPquuu13hup3379")]
 #[derive(Serialize, Deserialize, Debug, AbiEnumVisitor, AbiExample)]
 #[allow(clippy::large_enum_variant)]
-enum Protocol {
+pub(crate) enum Protocol {
     /// Gossip protocol messages
     PullRequest(CrdsFilter, CrdsValue),
     PullResponse(Pubkey, Vec<CrdsValue>),
@@ -460,12 +387,11 @@ fn retain_staked(values: &mut Vec<CrdsValue>, stakes: &HashMap<Pubkey, u64>) {
 }
 
 impl ClusterInfo {
-    /// Without a valid keypair gossip will not function. Only useful for tests.
-    pub fn new_with_invalid_keypair(contact_info: ContactInfo) -> Self {
-        Self::new(contact_info, Arc::new(Keypair::new()))
-    }
-
-    pub fn new(contact_info: ContactInfo, keypair: Arc<Keypair>) -> Self {
+    pub fn new(
+        contact_info: ContactInfo,
+        keypair: Arc<Keypair>,
+        socket_addr_space: SocketAddrSpace,
+    ) -> Self {
         let id = contact_info.id;
         let me = Self {
             gossip: RwLock::new(CrdsGossip::default()),
@@ -485,12 +411,8 @@ impl ClusterInfo {
             instance: NodeInstance::new(&mut thread_rng(), id, timestamp()),
             contact_info_path: PathBuf::default(),
             contact_save_interval: 0, // disabled
+            socket_addr_space,
         };
-        {
-            let mut gossip = me.gossip.write().unwrap();
-            gossip.set_self(&id);
-            gossip.set_shred_version(me.my_shred_version());
-        }
         me.insert_self();
         me.push_self(&HashMap::new(), None);
         me
@@ -498,8 +420,7 @@ impl ClusterInfo {
 
     // Should only be used by tests and simulations
     pub fn clone_with_id(&self, new_id: &Pubkey) -> Self {
-        let mut gossip = self.gossip.read().unwrap().mock_clone();
-        gossip.id = *new_id;
+        let gossip = self.gossip.read().unwrap().mock_clone();
         let mut my_contact_info = self.my_contact_info.read().unwrap().clone();
         my_contact_info.id = *new_id;
         ClusterInfo {
@@ -522,6 +443,7 @@ impl ClusterInfo {
             instance: NodeInstance::new(&mut thread_rng(), *new_id, timestamp()),
             contact_info_path: PathBuf::default(),
             contact_save_interval: 0, // disabled
+            ..*self
         }
     }
 
@@ -529,6 +451,10 @@ impl ClusterInfo {
         self.contact_debug_interval = new;
     }
 
+    pub fn socket_addr_space(&self) -> &SocketAddrSpace {
+        &self.socket_addr_space
+    }
+
     fn push_self(
         &self,
         stakes: &HashMap<Pubkey, u64>,
@@ -547,10 +473,18 @@ impl ClusterInfo {
             .lock()
             .unwrap()
             .extend(entries);
-        self.gossip
-            .write()
-            .unwrap()
-            .refresh_push_active_set(stakes, gossip_validators);
+        let ContactInfo {
+            id: self_pubkey,
+            shred_version,
+            ..
+        } = *self.my_contact_info.read().unwrap();
+        self.gossip.write().unwrap().refresh_push_active_set(
+            &self_pubkey,
+            shred_version,
+            stakes,
+            gossip_validators,
+            &self.socket_addr_space,
+        );
     }
 
     // TODO kill insert_info, only used by tests
@@ -713,14 +647,15 @@ impl ClusterInfo {
         self.my_contact_info.read().unwrap().shred_version
     }
 
-    pub fn lookup_epoch_slots(&self, ix: EpochSlotsIndex) -> EpochSlots {
-        let label = CrdsValueLabel::EpochSlots(ix, self.id());
+    fn lookup_epoch_slots(&self, ix: EpochSlotsIndex) -> EpochSlots {
+        let self_pubkey = self.id();
+        let label = CrdsValueLabel::EpochSlots(ix, self_pubkey);
         let gossip = self.gossip.read().unwrap();
         let entry = gossip.crds.get(&label);
         entry
             .and_then(|v| v.value.epoch_slots())
             .cloned()
-            .unwrap_or_else(|| EpochSlots::new(self.id(), timestamp()))
+            .unwrap_or_else(|| EpochSlots::new(self_pubkey, timestamp()))
     }
 
     pub fn rpc_info_trace(&self) -> String {
@@ -731,7 +666,7 @@ impl ClusterInfo {
             .all_peers()
             .into_iter()
             .filter_map(|(node, last_updated)| {
-                if !ContactInfo::is_valid_address(&node.rpc) {
+                if !ContactInfo::is_valid_address(&node.rpc, &self.socket_addr_space) {
                     return None;
                 }
 
@@ -742,8 +677,8 @@ impl ClusterInfo {
                     return None;
                 }
 
-                fn addr_to_string(default_ip: &IpAddr, addr: &SocketAddr) -> String {
-                    if ContactInfo::is_valid_address(addr) {
+                let addr_to_string = |default_ip: &IpAddr, addr: &SocketAddr| -> String {
+                    if ContactInfo::is_valid_address(addr, &self.socket_addr_space) {
                         if &addr.ip() == default_ip {
                             addr.port().to_string()
                         } else {
@@ -752,7 +687,7 @@ impl ClusterInfo {
                     } else {
                         "none".to_string()
                     }
-                }
+                };
 
                 let rpc_addr = node.rpc.ip();
                 Some(format!(
@@ -796,7 +731,7 @@ impl ClusterInfo {
             .all_peers()
             .into_iter()
             .filter_map(|(node, last_updated)| {
-                let is_spy_node = Self::is_spy_node(&node);
+                let is_spy_node = Self::is_spy_node(&node, &self.socket_addr_space);
                 if is_spy_node {
                     total_spy_nodes = total_spy_nodes.saturating_add(1);
                 }
@@ -809,8 +744,8 @@ impl ClusterInfo {
                     if is_spy_node {
                         shred_spy_nodes = shred_spy_nodes.saturating_add(1);
                     }
-                    fn addr_to_string(default_ip: &IpAddr, addr: &SocketAddr) -> String {
-                        if ContactInfo::is_valid_address(addr) {
+                    let addr_to_string = |default_ip: &IpAddr, addr: &SocketAddr| -> String {
+                        if ContactInfo::is_valid_address(addr, &self.socket_addr_space) {
                             if &addr.ip() == default_ip {
                                 addr.port().to_string()
                             } else {
@@ -819,11 +754,11 @@ impl ClusterInfo {
                         } else {
                             "none".to_string()
                         }
-                    }
+                    };
                     let ip_addr = node.gossip.ip();
                     Some(format!(
                         "{:15} {:2}| {:5} | {:44} |{:^9}| {:5}| {:5}| {:5}| {:5}| {:5}| {:5}| {:5}| {}\n",
-                        if ContactInfo::is_valid_address(&node.gossip) {
+                        if ContactInfo::is_valid_address(&node.gossip, &self.socket_addr_space) {
                             ip_addr.to_string()
                         } else {
                             "none".to_string()
@@ -874,20 +809,20 @@ impl ClusterInfo {
         )
     }
 
-    pub fn push_lowest_slot(&self, id: Pubkey, min: Slot) {
-        let now = timestamp();
-        let last = self
-            .gossip
-            .read()
-            .unwrap()
-            .crds
-            .get(&CrdsValueLabel::LowestSlot(self.id()))
-            .and_then(|x| x.value.lowest_slot())
-            .map(|x| x.lowest)
-            .unwrap_or(0);
+    pub fn push_lowest_slot(&self, min: Slot) {
+        let self_pubkey = self.id();
+        let last = {
+            let gossip = self.gossip.read().unwrap();
+            gossip
+                .crds
+                .get_lowest_slot(self_pubkey)
+                .map(|x| x.lowest)
+                .unwrap_or_default()
+        };
         if min > last {
+            let now = timestamp();
             let entry = CrdsValue::new_signed(
-                CrdsData::LowestSlot(0, LowestSlot::new(id, min, now)),
+                CrdsData::LowestSlot(0, LowestSlot::new(self_pubkey, min, now)),
                 &self.keypair,
             );
             self.local_message_pending_push_queue
@@ -897,6 +832,8 @@ impl ClusterInfo {
         }
     }
 
+    // TODO: If two threads call into this function then epoch_slot_index has a
+    // race condition and the threads will overwrite each other in crds table.
     pub fn push_epoch_slots(&self, mut update: &[Slot]) {
         let current_slots: Vec<_> = {
             let gossip =
@@ -933,42 +870,49 @@ impl ClusterInfo {
             Some((_wallclock, _slot, index)) => *index,
             None => 0,
         };
+        let self_pubkey = self.id();
+        let mut entries = Vec::default();
         while !update.is_empty() {
             let ix = (epoch_slot_index % crds_value::MAX_EPOCH_SLOTS) as u8;
             let now = timestamp();
             let mut slots = if !reset {
                 self.lookup_epoch_slots(ix)
             } else {
-                EpochSlots::new(self.id(), now)
+                EpochSlots::new(self_pubkey, now)
             };
             let n = slots.fill(update, now);
             update = &update[n..];
             if n > 0 {
-                let entry = CrdsValue::new_signed(CrdsData::EpochSlots(ix, slots), &self.keypair);
-                self.local_message_pending_push_queue
-                    .lock()
-                    .unwrap()
-                    .push(entry);
+                let epoch_slots = CrdsData::EpochSlots(ix, slots);
+                let entry = CrdsValue::new_signed(epoch_slots, &self.keypair);
+                entries.push(entry);
             }
             epoch_slot_index += 1;
             reset = true;
         }
+        let mut gossip = self.gossip.write().unwrap();
+        let now = timestamp();
+        for entry in entries {
+            if let Err(err) = gossip.crds.insert(entry, now) {
+                error!("push_epoch_slots failed: {:?}", err);
+            }
+        }
     }
 
     fn time_gossip_read_lock<'a>(
         &'a self,
         label: &'static str,
         counter: &'a Counter,
-    ) -> GossipReadLock<'a> {
-        GossipReadLock::new(self.gossip.read().unwrap(), label, counter)
+    ) -> TimedGuard<'a, RwLockReadGuard<CrdsGossip>> {
+        TimedGuard::new(self.gossip.read().unwrap(), label, counter)
     }
 
     fn time_gossip_write_lock<'a>(
         &'a self,
         label: &'static str,
         counter: &'a Counter,
-    ) -> GossipWriteLock<'a> {
-        GossipWriteLock::new(self.gossip.write().unwrap(), label, counter)
+    ) -> TimedGuard<'a, RwLockWriteGuard<CrdsGossip>> {
+        TimedGuard::new(self.gossip.write().unwrap(), label, counter)
     }
 
     pub fn push_message(&self, message: CrdsValue) {
@@ -1011,10 +955,10 @@ impl ClusterInfo {
         let vote = Vote::new(self_pubkey, vote, now);
         let vote = CrdsData::Vote(vote_index, vote);
         let vote = CrdsValue::new_signed(vote, &self.keypair);
-        self.gossip
-            .write()
-            .unwrap()
-            .process_push_message(&self_pubkey, vec![vote], now);
+        let mut gossip = self.gossip.write().unwrap();
+        if let Err(err) = gossip.crds.insert(vote, now) {
+            error!("push_vote failed: {:?}", err);
+        }
     }
 
     pub fn push_vote(&self, tower: &[Slot], vote: Transaction) {
@@ -1165,10 +1109,16 @@ impl ClusterInfo {
             .map(map)
     }
 
+    /// Returns epoch-slots inserted since the given cursor.
+    /// Excludes entries from nodes with unkown or different shred version.
     pub fn get_epoch_slots(&self, cursor: &mut Cursor) -> Vec<EpochSlots> {
+        let self_shred_version = Some(self.my_shred_version());
         let gossip = self.gossip.read().unwrap();
         let entries = gossip.crds.get_epoch_slots(cursor);
         entries
+            .filter(|entry| {
+                gossip.crds.get_shred_version(&entry.value.pubkey()) == self_shred_version
+            })
             .map(|entry| match &entry.value.data {
                 CrdsData::EpochSlots(_, slots) => slots.clone(),
                 _ => panic!("this should not happen!"),
@@ -1177,38 +1127,28 @@ impl ClusterInfo {
     }
 
     pub fn get_node_version(&self, pubkey: &Pubkey) -> Option<solana_version::Version> {
-        let version = self
-            .gossip
-            .read()
-            .unwrap()
-            .crds
-            .get(&CrdsValueLabel::Version(*pubkey))
-            .map(|x| x.value.version())
-            .flatten()
-            .map(|version| version.version.clone());
-
-        if version.is_none() {
-            self.gossip
-                .read()
-                .unwrap()
-                .crds
-                .get(&CrdsValueLabel::LegacyVersion(*pubkey))
-                .map(|x| x.value.legacy_version())
-                .flatten()
-                .map(|version| version.version.clone().into())
-        } else {
-            version
+        let gossip = self.gossip.read().unwrap();
+        let version = gossip.crds.get(&CrdsValueLabel::Version(*pubkey));
+        if let Some(version) = version.and_then(|v| v.value.version()) {
+            return Some(version.version.clone());
         }
+        let version = gossip.crds.get(&CrdsValueLabel::LegacyVersion(*pubkey))?;
+        let version = version.value.legacy_version()?;
+        Some(version.version.clone().into())
     }
 
     /// all validators that have a valid rpc port regardless of `shred_version`.
     pub fn all_rpc_peers(&self) -> Vec<ContactInfo> {
+        let self_pubkey = self.id();
         self.gossip
             .read()
             .unwrap()
             .crds
             .get_nodes_contact_info()
-            .filter(|x| x.id != self.id() && ContactInfo::is_valid_address(&x.rpc))
+            .filter(|x| {
+                x.id != self_pubkey
+                    && ContactInfo::is_valid_address(&x.rpc, &self.socket_addr_space)
+            })
             .cloned()
             .collect()
     }
@@ -1232,17 +1172,23 @@ impl ClusterInfo {
             .crds
             .get_nodes_contact_info()
             // shred_version not considered for gossip peers (ie, spy nodes do not set shred_version)
-            .filter(|x| x.id != me && ContactInfo::is_valid_address(&x.gossip))
+            .filter(|x| {
+                x.id != me && ContactInfo::is_valid_address(&x.gossip, &self.socket_addr_space)
+            })
             .cloned()
             .collect()
     }
 
     /// all validators that have a valid tvu port regardless of `shred_version`.
     pub fn all_tvu_peers(&self) -> Vec<ContactInfo> {
+        let self_pubkey = self.id();
         self.time_gossip_read_lock("all_tvu_peers", &self.stats.all_tvu_peers)
             .crds
             .get_nodes_contact_info()
-            .filter(|x| ContactInfo::is_valid_address(&x.tvu) && x.id != self.id())
+            .filter(|x| {
+                ContactInfo::is_valid_address(&x.tvu, &self.socket_addr_space)
+                    && x.id != self_pubkey
+            })
             .cloned()
             .collect()
     }
@@ -1257,7 +1203,7 @@ impl ClusterInfo {
             .filter(|node| {
                 node.id != self_pubkey
                     && node.shred_version == self_shred_version
-                    && ContactInfo::is_valid_address(&node.tvu)
+                    && ContactInfo::is_valid_tvu_address(&node.tvu)
             })
             .cloned()
             .collect()
@@ -1275,7 +1221,7 @@ impl ClusterInfo {
             nodes
                 .into_iter()
                 .filter(|node| {
-                    ContactInfo::is_valid_address(&node.serve_repair)
+                    ContactInfo::is_valid_address(&node.serve_repair, &self.socket_addr_space)
                         && match gossip.crds.get_lowest_slot(node.id) {
                             None => true, // fallback to legacy behavior
                             Some(lowest_slot) => lowest_slot.lowest <= slot,
@@ -1287,94 +1233,24 @@ impl ClusterInfo {
         nodes
     }
 
-    fn is_spy_node(contact_info: &ContactInfo) -> bool {
-        !ContactInfo::is_valid_address(&contact_info.tpu)
-            || !ContactInfo::is_valid_address(&contact_info.gossip)
-            || !ContactInfo::is_valid_address(&contact_info.tvu)
-    }
-
-    fn sorted_stakes_with_index(
-        peers: &[ContactInfo],
-        stakes: Option<&HashMap<Pubkey, u64>>,
-    ) -> Vec<(u64, usize)> {
-        let stakes_and_index: Vec<_> = peers
-            .iter()
-            .enumerate()
-            .map(|(i, c)| {
-                // For stake weighted shuffle a valid weight is atleast 1. Weight 0 is
-                // assumed to be missing entry. So let's make sure stake weights are atleast 1
-                let stake = 1.max(
-                    stakes
-                        .as_ref()
-                        .map_or(1, |stakes| *stakes.get(&c.id).unwrap_or(&1)),
-                );
-                (stake, i)
-            })
-            .sorted_by(|(l_stake, l_info), (r_stake, r_info)| {
-                if r_stake == l_stake {
-                    peers[*r_info].id.cmp(&peers[*l_info].id)
-                } else {
-                    r_stake.cmp(&l_stake)
-                }
-            })
-            .collect();
-
-        stakes_and_index
-    }
-
-    fn stake_weighted_shuffle(
-        stakes_and_index: &[(u64, usize)],
-        seed: [u8; 32],
-    ) -> Vec<(u64, usize)> {
-        let stake_weights: Vec<_> = stakes_and_index.iter().map(|(w, _)| *w).collect();
-
-        let shuffle = weighted_shuffle(&stake_weights, seed);
-
-        shuffle.iter().map(|x| stakes_and_index[*x]).collect()
-    }
-
-    // Return sorted_retransmit_peers(including self) and their stakes
-    pub fn sorted_retransmit_peers_and_stakes(
-        &self,
-        stakes: Option<&HashMap<Pubkey, u64>>,
-    ) -> (Vec<ContactInfo>, Vec<(u64, usize)>) {
-        let mut peers = self.tvu_peers();
-        // insert "self" into this list for the layer and neighborhood computation
-        peers.push(self.my_contact_info());
-        let stakes_and_index = ClusterInfo::sorted_stakes_with_index(&peers, stakes);
-        (peers, stakes_and_index)
-    }
-
-    /// Return sorted Retransmit peers and index of `Self.id()` as if it were in that list
-    pub fn shuffle_peers_and_index(
-        id: &Pubkey,
-        peers: &[ContactInfo],
-        stakes_and_index: &[(u64, usize)],
-        seed: [u8; 32],
-    ) -> (usize, Vec<(u64, usize)>) {
-        let shuffled_stakes_and_index = ClusterInfo::stake_weighted_shuffle(stakes_and_index, seed);
-        let self_index = shuffled_stakes_and_index
-            .iter()
-            .enumerate()
-            .find_map(|(i, (_stake, index))| {
-                if peers[*index].id == *id {
-                    Some(i)
-                } else {
-                    None
-                }
-            })
-            .unwrap();
-        (self_index, shuffled_stakes_and_index)
+    fn is_spy_node(contact_info: &ContactInfo, socket_addr_space: &SocketAddrSpace) -> bool {
+        !ContactInfo::is_valid_address(&contact_info.tpu, socket_addr_space)
+            || !ContactInfo::is_valid_address(&contact_info.gossip, socket_addr_space)
+            || !ContactInfo::is_valid_address(&contact_info.tvu, socket_addr_space)
     }
 
     /// compute broadcast table
     pub fn tpu_peers(&self) -> Vec<ContactInfo> {
+        let self_pubkey = self.id();
         self.gossip
             .read()
             .unwrap()
             .crds
             .get_nodes_contact_info()
-            .filter(|x| x.id != self.id() && ContactInfo::is_valid_address(&x.tpu))
+            .filter(|x| {
+                x.id != self_pubkey
+                    && ContactInfo::is_valid_address(&x.tpu, &self.socket_addr_space)
+            })
             .cloned()
             .collect()
     }
@@ -1387,33 +1263,44 @@ impl ClusterInfo {
         packet: &Packet,
         s: &UdpSocket,
         forwarded: bool,
-    ) -> Result<(), GossipError> {
+        socket_addr_space: &SocketAddrSpace,
+    ) {
         trace!("retransmit orders {}", peers.len());
         let dests: Vec<_> = if forwarded {
             peers
                 .iter()
                 .map(|peer| &peer.tvu_forwards)
-                .filter(|addr| ContactInfo::is_valid_address(addr))
+                .filter(|addr| ContactInfo::is_valid_address(addr, socket_addr_space))
                 .collect()
         } else {
-            peers.iter().map(|peer| &peer.tvu).collect()
+            peers
+                .iter()
+                .map(|peer| &peer.tvu)
+                .filter(|addr| socket_addr_space.check(addr))
+                .collect()
         };
-        let mut sent = 0;
-        while sent < dests.len() {
-            match multicast(s, &packet.data[..packet.meta.size], &dests[sent..]) {
-                Ok(n) => sent += n,
-                Err(e) => {
-                    inc_new_counter_error!(
-                        "cluster_info-retransmit-send_to_error",
-                        dests.len() - sent,
-                        1
-                    );
-                    error!("retransmit result {:?}", e);
-                    return Err(GossipError::Io(e));
+        let mut dests = &dests[..];
+        let data = &packet.data[..packet.meta.size];
+        while !dests.is_empty() {
+            match multicast(s, data, dests) {
+                Ok(n) => dests = &dests[n..],
+                Err(err) => {
+                    inc_new_counter_error!("cluster_info-retransmit-send_to_error", dests.len(), 1);
+                    error!("retransmit multicast: {:?}", err);
+                    break;
                 }
             }
         }
-        Ok(())
+        let mut errs = 0;
+        for dest in dests {
+            if let Err(err) = s.send_to(data, dest) {
+                error!("retransmit send: {}, {:?}", dest, err);
+                errs += 1;
+            }
+        }
+        if errs != 0 {
+            inc_new_counter_error!("cluster_info-retransmit-error", errs, 1);
+        }
     }
 
     fn insert_self(&self) {
@@ -1532,12 +1419,14 @@ impl ClusterInfo {
             match gossip.new_pull_request(
                 thread_pool,
                 self.keypair.deref(),
+                self.my_shred_version(),
                 now,
                 gossip_validators,
                 stakes,
                 MAX_BLOOM_SIZE,
                 &self.ping_cache,
                 &mut pings,
+                &self.socket_addr_space,
             ) {
                 Err(_) => Vec::default(),
                 Ok((peer, filters)) => vec![(peer, filters)],
@@ -1576,7 +1465,10 @@ impl ClusterInfo {
     pub fn flush_push_queue(&self) {
         let pending_push_messages = self.drain_push_queue();
         let mut gossip = self.gossip.write().unwrap();
-        gossip.process_push_message(&self.id, pending_push_messages, timestamp());
+        let now = timestamp();
+        for entry in pending_push_messages {
+            let _ = gossip.crds.insert(entry, now);
+        }
     }
     fn new_push_requests(
         &self,
@@ -1626,7 +1518,7 @@ impl ClusterInfo {
         generate_pull_requests: bool,
         require_stake_for_gossip: bool,
     ) -> Vec<(SocketAddr, Protocol)> {
-        self.trim_crds_table(CRDS_UNIQUE_PUBKEY_CAPACITY, &stakes);
+        self.trim_crds_table(CRDS_UNIQUE_PUBKEY_CAPACITY, stakes);
         // This will flush local pending push messages before generating
         // pull-request bloom filters, preventing pull responses to return the
         // same values back to the node itself. Note that packets will arrive
@@ -1637,7 +1529,7 @@ impl ClusterInfo {
             .add_relaxed(out.len() as u64);
         if generate_pull_requests {
             let (pings, pull_requests) =
-                self.new_pull_requests(&thread_pool, gossip_validators, stakes);
+                self.new_pull_requests(thread_pool, gossip_validators, stakes);
             self.stats
                 .packets_sent_pull_requests_count
                 .add_relaxed(pull_requests.len() as u64);
@@ -1706,10 +1598,6 @@ impl ClusterInfo {
                     entrypoint.shred_version, entrypoint.id
                 );
                 self.my_contact_info.write().unwrap().shred_version = entrypoint.shred_version;
-                self.gossip
-                    .write()
-                    .unwrap()
-                    .set_shred_version(entrypoint.shred_version);
             }
         }
         self.my_shred_version() != 0
@@ -1724,14 +1612,15 @@ impl ClusterInfo {
         bank_forks: Option<&RwLock<BankForks>>,
         stakes: &HashMap<Pubkey, u64>,
     ) {
+        let self_pubkey = self.id();
         let epoch_duration = get_epoch_duration(bank_forks);
         let timeouts = {
             let gossip = self.gossip.read().unwrap();
-            gossip.make_timeouts(stakes, epoch_duration)
+            gossip.make_timeouts(self_pubkey, stakes, epoch_duration)
         };
         let num_purged = self
             .time_gossip_write_lock("purge", &self.stats.purge)
-            .purge(thread_pool, timestamp(), &timeouts);
+            .purge(&self_pubkey, thread_pool, timestamp(), &timeouts);
         inc_new_counter_info!("cluster_info-purge-count", num_purged);
     }
 
@@ -1749,11 +1638,14 @@ impl ClusterInfo {
             .map(|k| k.id)
             .chain(std::iter::once(self.id))
             .collect();
+        self.stats.trim_crds_table.add_relaxed(1);
         let mut gossip = self.gossip.write().unwrap();
         match gossip.crds.trim(cap, &keep, stakes, timestamp()) {
             Err(err) => {
                 self.stats.trim_crds_table_failed.add_relaxed(1);
-                error!("crds table trim failed: {:?}", err);
+                // TODO: Stakes are comming from the root-bank. Debug why/when
+                // they are empty/zero.
+                debug!("crds table trim failed: {:?}", err);
             }
             Ok(num_purged) => {
                 self.stats
@@ -1769,9 +1661,8 @@ impl ClusterInfo {
         bank_forks: Option<Arc<RwLock<BankForks>>>,
         sender: PacketSender,
         gossip_validators: Option<HashSet<Pubkey>>,
-        exit: &Arc<AtomicBool>,
+        exit: Arc<AtomicBool>,
     ) -> JoinHandle<()> {
-        let exit = exit.clone();
         let thread_pool = ThreadPoolBuilder::new()
             .num_threads(std::cmp::min(get_thread_count(), 8))
             .thread_name(|i| format!("ClusterInfo::gossip-{}", i))
@@ -1874,11 +1765,13 @@ impl ClusterInfo {
         );
         let mut prune_message_timeout = 0;
         let mut bad_prune_destination = 0;
+        let self_pubkey = self.id();
         {
             let gossip = self.time_gossip_read_lock("process_prune", &self.stats.process_prune);
             let now = timestamp();
             for (from, data) in messages {
                 match gossip.process_prune_msg(
+                    &self_pubkey,
                     &from,
                     &data.destination,
                     &data.prunes,
@@ -1918,7 +1811,6 @@ impl ClusterInfo {
             return;
         }
         let self_pubkey = self.id();
-        let self_shred_version = self.my_shred_version();
         let requests: Vec<_> = thread_pool.install(|| {
             requests
                 .into_par_iter()
@@ -1930,17 +1822,7 @@ impl ClusterInfo {
                         inc_new_counter_debug!("cluster_info-window-request-loopback", 1);
                         false
                     }
-                    Some(caller) => {
-                        if self_shred_version != 0
-                            && caller.shred_version != 0
-                            && caller.shred_version != self_shred_version
-                        {
-                            self.stats.skip_pull_shred_version.add_relaxed(1);
-                            false
-                        } else {
-                            true
-                        }
-                    }
+                    Some(_) => true,
                 })
                 .map(|(from_addr, filter, caller)| PullData {
                     from_addr,
@@ -1953,8 +1835,13 @@ impl ClusterInfo {
             self.stats
                 .pull_requests_count
                 .add_relaxed(requests.len() as u64);
-            let response =
-                self.handle_pull_requests(recycler, requests, stakes, require_stake_for_gossip);
+            let response = self.handle_pull_requests(
+                thread_pool,
+                recycler,
+                requests,
+                stakes,
+                require_stake_for_gossip,
+            );
             if !response.is_empty() {
                 self.stats
                     .packets_sent_pull_responses_count
@@ -2013,7 +1900,7 @@ impl ClusterInfo {
         // incoming pull-requests, pings are also sent to request.from_addr (as
         // opposed to caller.gossip address).
         move |request| {
-            ContactInfo::is_valid_address(&request.from_addr) && {
+            ContactInfo::is_valid_address(&request.from_addr, &self.socket_addr_space) && {
                 let node = (request.caller.pubkey(), request.from_addr);
                 *cache.entry(node).or_insert_with(|| hard_check(node))
             }
@@ -2024,6 +1911,7 @@ impl ClusterInfo {
     // and tries to send back to them the values it detects are missing.
     fn handle_pull_requests(
         &self,
+        thread_pool: &ThreadPool,
         recycler: &PacketsRecycler,
         requests: Vec<PullData>,
         stakes: &HashMap<Pubkey, u64>,
@@ -2036,7 +1924,8 @@ impl ClusterInfo {
             .process_pull_requests(callers.cloned(), timestamp());
         let output_size_limit =
             self.update_data_budget(stakes.len()) / PULL_RESPONSE_MIN_SERIALIZED_SIZE;
-        let mut packets = Packets::new_with_recycler(recycler.clone(), 64, "handle_pull_requests");
+        let mut packets =
+            Packets::new_unpinned_with_recycler(recycler.clone(), 64, "handle_pull_requests");
         let (caller_and_filters, addrs): (Vec<_>, Vec<_>) = {
             let mut rng = rand::thread_rng();
             let check_pull_request =
@@ -2055,7 +1944,7 @@ impl ClusterInfo {
                 "generate_pull_responses",
                 &self.stats.generate_pull_responses,
             )
-            .generate_pull_responses(&caller_and_filters, output_size_limit, now);
+            .generate_pull_responses(thread_pool, &caller_and_filters, output_size_limit, now);
         if require_stake_for_gossip {
             for resp in &mut pull_responses {
                 retain_staked(resp, stakes);
@@ -2086,11 +1975,8 @@ impl ClusterInfo {
         if responses.is_empty() {
             return packets;
         }
-        let shuffle = {
-            let mut seed = [0; 32];
-            rand::thread_rng().fill(&mut seed[..]);
-            weighted_shuffle(&scores, seed).into_iter()
-        };
+        let mut rng = rand::thread_rng();
+        let shuffle = WeightedShuffle::new(&mut rng, &scores).unwrap();
         let mut total_bytes = 0;
         let mut sent = 0;
         for (addr, response) in shuffle.map(|i| &responses[i]) {
@@ -2178,9 +2064,10 @@ impl ClusterInfo {
                 .reduce(HashMap::new, merge)
         });
         if !responses.is_empty() {
+            let self_pubkey = self.id();
             let timeouts = {
                 let gossip = self.gossip.read().unwrap();
-                gossip.make_timeouts(&stakes, epoch_duration)
+                gossip.make_timeouts(self_pubkey, stakes, epoch_duration)
             };
             for (from, data) in responses {
                 self.handle_pull_response(&from, data, &timeouts);
@@ -2192,22 +2079,11 @@ impl ClusterInfo {
     fn handle_pull_response(
         &self,
         from: &Pubkey,
-        mut crds_values: Vec<CrdsValue>,
+        crds_values: Vec<CrdsValue>,
         timeouts: &HashMap<Pubkey, u64>,
     ) -> (usize, usize, usize) {
         let len = crds_values.len();
         trace!("PullResponse me: {} from: {} len={}", self.id, from, len);
-        let shred_version = self
-            .lookup_contact_info(from, |ci| ci.shred_version)
-            .unwrap_or(0);
-        Self::filter_by_shred_version(
-            from,
-            &mut crds_values,
-            shred_version,
-            self.my_shred_version(),
-        );
-        let filtered_len = crds_values.len();
-
         let mut pull_stats = ProcessPullStats::default();
         let (filtered_pulls, filtered_pulls_expired_timeout, failed_inserts) = self
             .time_gossip_read_lock("filter_pull_resp", &self.stats.filter_pull_response)
@@ -2227,14 +2103,8 @@ impl ClusterInfo {
                     &mut pull_stats,
                 );
         }
-
-        self.stats
-            .skip_pull_response_shred_version
-            .add_relaxed((len - filtered_len) as u64);
         self.stats.process_pull_response_count.add_relaxed(1);
-        self.stats
-            .process_pull_response_len
-            .add_relaxed(filtered_len as u64);
+        self.stats.process_pull_response_len.add_relaxed(len as u64);
         self.stats
             .process_pull_response_timeout
             .add_relaxed(pull_stats.timeout_count as u64);
@@ -2255,23 +2125,6 @@ impl ClusterInfo {
         )
     }
 
-    fn filter_by_shred_version(
-        from: &Pubkey,
-        crds_values: &mut Vec<CrdsValue>,
-        shred_version: u16,
-        my_shred_version: u16,
-    ) {
-        // Always run filter on spies
-        if my_shred_version != 0 && shred_version != my_shred_version {
-            // Allow someone to update their own ContactInfo so they
-            // can change shred versions if needed.
-            crds_values.retain(|crds_value| match &crds_value.data {
-                CrdsData::ContactInfo(contact_info) => contact_info.id == *from,
-                _ => false,
-            });
-        }
-    }
-
     fn handle_batch_ping_messages<I>(
         &self,
         pings: I,
@@ -2308,7 +2161,7 @@ impl ClusterInfo {
             None
         } else {
             let packets =
-                Packets::new_with_recycler_data(recycler, "handle_ping_messages", packets);
+                Packets::new_unpinned_with_recycler_data(recycler, "handle_ping_messages", packets);
             Some(packets)
         }
     }
@@ -2344,44 +2197,10 @@ impl ClusterInfo {
         self.stats
             .push_message_count
             .add_relaxed(messages.len() as u64);
-        // Obtain shred versions of the origins.
-        let shred_versions: Vec<_> = {
-            let gossip = self.gossip.read().unwrap();
-            messages
-                .iter()
-                .map(|(from, _)| match gossip.crds.get_contact_info(*from) {
-                    None => 0,
-                    Some(info) => info.shred_version,
-                })
-                .collect()
-        };
-        // Filter out data if the origin has different shred version.
-        let self_shred_version = self.my_shred_version();
         let num_crds_values: u64 = messages.iter().map(|(_, data)| data.len() as u64).sum();
-        let messages: Vec<_> = messages
-            .into_iter()
-            .zip(shred_versions)
-            .filter_map(|((from, mut crds_values), shred_version)| {
-                Self::filter_by_shred_version(
-                    &from,
-                    &mut crds_values,
-                    shred_version,
-                    self_shred_version,
-                );
-                if crds_values.is_empty() {
-                    None
-                } else {
-                    Some((from, crds_values))
-                }
-            })
-            .collect();
-        let num_filtered_crds_values = messages.iter().map(|(_, data)| data.len() as u64).sum();
         self.stats
             .push_message_value_count
-            .add_relaxed(num_filtered_crds_values);
-        self.stats
-            .skip_push_message_shred_version
-            .add_relaxed(num_crds_values - num_filtered_crds_values);
+            .add_relaxed(num_crds_values);
         // Origins' pubkeys of upserted crds values.
         let origins: HashSet<_> = {
             let mut gossip =
@@ -2395,9 +2214,10 @@ impl ClusterInfo {
                 .collect()
         };
         // Generate prune messages.
+        let self_pubkey = self.id();
         let prunes = self
             .time_gossip_write_lock("prune_received_cache", &self.stats.prune_received_cache)
-            .prune_received_cache(origins, stakes);
+            .prune_received_cache(&self_pubkey, origins, stakes);
         let prunes: Vec<(Pubkey /*from*/, Vec<Pubkey> /*origins*/)> = prunes
             .into_iter()
             .flat_map(|(from, prunes)| {
@@ -2447,7 +2267,7 @@ impl ClusterInfo {
         let new_push_requests = self.new_push_requests(stakes, require_stake_for_gossip);
         inc_new_counter_debug!("cluster_info-push_message-pushes", new_push_requests.len());
         for (address, request) in new_push_requests {
-            if ContactInfo::is_valid_address(&address) {
+            if ContactInfo::is_valid_address(&address, &self.socket_addr_space) {
                 match Packet::from_data(Some(&address), &request) {
                     Ok(packet) => packets.packets.push(packet),
                     Err(err) => error!("failed to write push-request packet: {:?}", err),
@@ -2494,7 +2314,7 @@ impl ClusterInfo {
 
     fn process_packets(
         &self,
-        packets: VecDeque<Packet>,
+        packets: VecDeque<(/*from:*/ SocketAddr, Protocol)>,
         thread_pool: &ThreadPool,
         recycler: &PacketsRecycler,
         response_sender: &PacketSender,
@@ -2504,24 +2324,28 @@ impl ClusterInfo {
         should_check_duplicate_instance: bool,
     ) -> Result<(), GossipError> {
         let _st = ScopedTimer::from(&self.stats.process_gossip_packets_time);
-        self.stats
-            .packets_received_count
-            .add_relaxed(packets.len() as u64);
-        let packets: Vec<_> = thread_pool.install(|| {
+        // Filter out values if the shred-versions are different.
+        let self_shred_version = self.my_shred_version();
+        let packets = if self_shred_version == 0 {
             packets
-                .into_par_iter()
-                .filter_map(|packet| {
-                    let protocol: Protocol =
-                        limited_deserialize(&packet.data[..packet.meta.size]).ok()?;
-                    protocol.sanitize().ok()?;
-                    let protocol = protocol.par_verify()?;
-                    Some((packet.meta.addr(), protocol))
-                })
-                .collect()
-        });
-        self.stats
-            .packets_received_verified_count
-            .add_relaxed(packets.len() as u64);
+        } else {
+            let gossip = self.gossip.read().unwrap();
+            thread_pool.install(|| {
+                packets
+                    .into_par_iter()
+                    .with_min_len(1024)
+                    .filter_map(|(from, msg)| {
+                        let msg = filter_on_shred_version(
+                            msg,
+                            self_shred_version,
+                            &gossip.crds,
+                            &self.stats,
+                        )?;
+                        Some((from, msg))
+                    })
+                    .collect()
+            })
+        };
         // Check if there is a duplicate instance of
         // this node with more recent timestamp.
         let check_duplicate_instance = |values: &[CrdsValue]| {
@@ -2606,12 +2430,54 @@ impl ClusterInfo {
         Ok(())
     }
 
+    // Consumes packets received from the socket, deserializing, sanitizing and
+    // verifying them and then sending them down the channel for the actual
+    // handling of requests/messages.
+    fn run_socket_consume(
+        &self,
+        receiver: &PacketReceiver,
+        sender: &Sender<Vec<(/*from:*/ SocketAddr, Protocol)>>,
+        thread_pool: &ThreadPool,
+    ) -> Result<(), GossipError> {
+        const RECV_TIMEOUT: Duration = Duration::from_secs(1);
+        let packets: Vec<_> = receiver.recv_timeout(RECV_TIMEOUT)?.packets.into();
+        let mut packets = VecDeque::from(packets);
+        for payload in receiver.try_iter() {
+            packets.extend(payload.packets.iter().cloned());
+            let excess_count = packets.len().saturating_sub(MAX_GOSSIP_TRAFFIC);
+            if excess_count > 0 {
+                packets.drain(0..excess_count);
+                self.stats
+                    .gossip_packets_dropped_count
+                    .add_relaxed(excess_count as u64);
+            }
+        }
+        self.stats
+            .packets_received_count
+            .add_relaxed(packets.len() as u64);
+        let verify_packet = |packet: Packet| {
+            let data = &packet.data[..packet.meta.size];
+            let protocol: Protocol = limited_deserialize(data).ok()?;
+            protocol.sanitize().ok()?;
+            let protocol = protocol.par_verify()?;
+            Some((packet.meta.addr(), protocol))
+        };
+        let packets: Vec<_> = {
+            let _st = ScopedTimer::from(&self.stats.verify_gossip_packets_time);
+            thread_pool.install(|| packets.into_par_iter().filter_map(verify_packet).collect())
+        };
+        self.stats
+            .packets_received_verified_count
+            .add_relaxed(packets.len() as u64);
+        Ok(sender.send(packets)?)
+    }
+
     /// Process messages from the network
     fn run_listen(
         &self,
         recycler: &PacketsRecycler,
         bank_forks: Option<&RwLock<BankForks>>,
-        requests_receiver: &PacketReceiver,
+        receiver: &Receiver<Vec<(/*from:*/ SocketAddr, Protocol)>>,
         response_sender: &PacketSender,
         thread_pool: &ThreadPool,
         last_print: &mut Instant,
@@ -2619,10 +2485,9 @@ impl ClusterInfo {
     ) -> Result<(), GossipError> {
         const RECV_TIMEOUT: Duration = Duration::from_secs(1);
         const SUBMIT_GOSSIP_STATS_INTERVAL: Duration = Duration::from_secs(2);
-        let packets: Vec<_> = requests_receiver.recv_timeout(RECV_TIMEOUT)?.packets.into();
-        let mut packets = VecDeque::from(packets);
-        while let Ok(packet) = requests_receiver.try_recv() {
-            packets.extend(packet.packets.iter().cloned());
+        let mut packets = VecDeque::from(receiver.recv_timeout(RECV_TIMEOUT)?);
+        for payload in receiver.try_iter() {
+            packets.extend(payload);
             let excess_count = packets.len().saturating_sub(MAX_GOSSIP_TRAFFIC);
             if excess_count > 0 {
                 packets.drain(0..excess_count);
@@ -2659,25 +2524,52 @@ impl ClusterInfo {
         Ok(())
     }
 
-    pub fn listen(
+    pub(crate) fn start_socket_consume_thread(
+        self: Arc<Self>,
+        receiver: PacketReceiver,
+        sender: Sender<Vec<(/*from:*/ SocketAddr, Protocol)>>,
+        exit: Arc<AtomicBool>,
+    ) -> JoinHandle<()> {
+        let thread_pool = ThreadPoolBuilder::new()
+            .num_threads(get_thread_count().min(8))
+            .thread_name(|i| format!("gossip-consume-{}", i))
+            .build()
+            .unwrap();
+        let run_consume = move || {
+            while !exit.load(Ordering::Relaxed) {
+                match self.run_socket_consume(&receiver, &sender, &thread_pool) {
+                    Err(GossipError::RecvTimeoutError(RecvTimeoutError::Disconnected)) => break,
+                    Err(GossipError::RecvTimeoutError(RecvTimeoutError::Timeout)) => (),
+                    // A send operation can only fail if the receiving end of a
+                    // channel is disconnected.
+                    Err(GossipError::SendError) => break,
+                    Err(err) => error!("gossip consume: {}", err),
+                    Ok(()) => (),
+                }
+            }
+        };
+        let thread_name = String::from("gossip-consume");
+        Builder::new().name(thread_name).spawn(run_consume).unwrap()
+    }
+
+    pub(crate) fn listen(
         self: Arc<Self>,
         bank_forks: Option<Arc<RwLock<BankForks>>>,
-        requests_receiver: PacketReceiver,
+        requests_receiver: Receiver<Vec<(/*from:*/ SocketAddr, Protocol)>>,
         response_sender: PacketSender,
         should_check_duplicate_instance: bool,
-        exit: &Arc<AtomicBool>,
+        exit: Arc<AtomicBool>,
     ) -> JoinHandle<()> {
-        let exit = exit.clone();
+        let mut last_print = Instant::now();
         let recycler = PacketsRecycler::default();
+        let thread_pool = ThreadPoolBuilder::new()
+            .num_threads(get_thread_count().min(8))
+            .thread_name(|i| format!("sol-gossip-work-{}", i))
+            .build()
+            .unwrap();
         Builder::new()
             .name("solana-listen".to_string())
             .spawn(move || {
-                let thread_pool = ThreadPoolBuilder::new()
-                    .num_threads(std::cmp::min(get_thread_count(), 8))
-                    .thread_name(|i| format!("sol-gossip-work-{}", i))
-                    .build()
-                    .unwrap();
-                let mut last_print = Instant::now();
                 while !exit.load(Ordering::Relaxed) {
                     if let Err(err) = self.run_listen(
                         &recycler,
@@ -2689,7 +2581,8 @@ impl ClusterInfo {
                         should_check_duplicate_instance,
                     ) {
                         match err {
-                            GossipError::RecvTimeoutError(_) => {
+                            GossipError::RecvTimeoutError(RecvTimeoutError::Disconnected) => break,
+                            GossipError::RecvTimeoutError(RecvTimeoutError::Timeout) => {
                                 let table_size = self.gossip.read().unwrap().crds.len();
                                 debug!(
                                     "{}: run_listen timeout, table size: {}",
@@ -2703,7 +2596,7 @@ impl ClusterInfo {
                                     self.id()
                                 );
                                 exit.store(true, Ordering::Relaxed);
-                                // TODO: Pass through ValidatorExit here so
+                                // TODO: Pass through Exit here so
                                 // that this will exit cleanly.
                                 std::process::exit(1);
                             }
@@ -3024,22 +2917,79 @@ pub fn push_messages_to_peer(
     messages: Vec<CrdsValue>,
     self_id: Pubkey,
     peer_gossip: SocketAddr,
+    socket_addr_space: &SocketAddrSpace,
 ) -> Result<(), GossipError> {
     let reqs: Vec<_> = ClusterInfo::split_gossip_messages(PUSH_MESSAGE_MAX_PAYLOAD_SIZE, messages)
         .map(move |payload| (peer_gossip, Protocol::PushMessage(self_id, payload)))
         .collect();
     let packets = to_packets_with_destination(PacketsRecycler::default(), &reqs);
     let sock = UdpSocket::bind("0.0.0.0:0").unwrap();
-    packet::send_to(&packets, &sock)?;
+    packet::send_to(&packets, &sock, socket_addr_space)?;
     Ok(())
 }
 
-pub fn stake_weight_peers(
-    peers: &mut Vec<ContactInfo>,
-    stakes: Option<&HashMap<Pubkey, u64>>,
-) -> Vec<(u64, usize)> {
-    peers.dedup();
-    ClusterInfo::sorted_stakes_with_index(peers, stakes)
+// Filters out values from nodes with different shred-version.
+fn filter_on_shred_version(
+    mut msg: Protocol,
+    self_shred_version: u16,
+    crds: &Crds,
+    stats: &GossipStats,
+) -> Option<Protocol> {
+    let filter_values = |from: &Pubkey, values: &mut Vec<CrdsValue>, skipped_counter: &Counter| {
+        let num_values = values.len();
+        if crds.get_shred_version(from) == Some(self_shred_version) {
+            // Retain values with the same shred-vesion, or those which are
+            // contact-info so that shred-versions can be updated.
+            values.retain(|value| match &value.data {
+                CrdsData::ContactInfo(_) => true,
+                _ => crds.get_shred_version(&value.pubkey()) == Some(self_shred_version),
+            })
+        } else {
+            // Only allow node to update its own contact info in case their
+            // shred-version changes.
+            values.retain(|value| match &value.data {
+                CrdsData::ContactInfo(node) => node.id == *from,
+                _ => false,
+            })
+        }
+        let num_skipped = num_values - values.len();
+        if num_skipped != 0 {
+            skipped_counter.add_relaxed(num_skipped as u64);
+        }
+    };
+    match &mut msg {
+        Protocol::PullRequest(_, caller) => match &caller.data {
+            // Allow spy nodes with shred-verion == 0 to pull from other nodes.
+            CrdsData::ContactInfo(node)
+                if node.shred_version == 0 || node.shred_version == self_shred_version =>
+            {
+                Some(msg)
+            }
+            _ => {
+                stats.skip_pull_shred_version.add_relaxed(1);
+                None
+            }
+        },
+        Protocol::PullResponse(from, values) => {
+            filter_values(from, values, &stats.skip_pull_response_shred_version);
+            if values.is_empty() {
+                None
+            } else {
+                Some(msg)
+            }
+        }
+        Protocol::PushMessage(from, values) => {
+            filter_values(from, values, &stats.skip_push_message_shred_version);
+            if values.is_empty() {
+                None
+            } else {
+                Some(msg)
+            }
+        }
+        Protocol::PruneMessage(_, _) | Protocol::PingMessage(_) | Protocol::PongMessage(_) => {
+            Some(msg)
+        }
+    }
 }
 
 #[cfg(test)]
@@ -3068,20 +3018,30 @@ mod tests {
     fn test_gossip_node() {
         //check that a gossip nodes always show up as spies
         let (node, _, _) = ClusterInfo::spy_node(&solana_sdk::pubkey::new_rand(), 0);
-        assert!(ClusterInfo::is_spy_node(&node));
+        assert!(ClusterInfo::is_spy_node(
+            &node,
+            &SocketAddrSpace::Unspecified
+        ));
         let (node, _, _) = ClusterInfo::gossip_node(
             &solana_sdk::pubkey::new_rand(),
             &"1.1.1.1:1111".parse().unwrap(),
             0,
         );
-        assert!(ClusterInfo::is_spy_node(&node));
+        assert!(ClusterInfo::is_spy_node(
+            &node,
+            &SocketAddrSpace::Unspecified
+        ));
     }
 
     #[test]
     fn test_handle_pull() {
         solana_logger::setup();
         let node = Node::new_localhost();
-        let cluster_info = Arc::new(ClusterInfo::new_with_invalid_keypair(node.info));
+        let cluster_info = Arc::new(ClusterInfo::new(
+            node.info,
+            Arc::new(Keypair::new()),
+            SocketAddrSpace::Unspecified,
+        ));
 
         let entrypoint_pubkey = solana_sdk::pubkey::new_rand();
         let data = test_crds_values(entrypoint_pubkey);
@@ -3138,6 +3098,7 @@ mod tests {
         let cluster_info = ClusterInfo::new(
             ContactInfo::new_localhost(&this_node.pubkey(), timestamp()),
             this_node.clone(),
+            SocketAddrSpace::Unspecified,
         );
         let remote_nodes: Vec<(Keypair, SocketAddr)> =
             repeat_with(|| new_rand_remote_node(&mut rng))
@@ -3192,6 +3153,7 @@ mod tests {
         let cluster_info = ClusterInfo::new(
             ContactInfo::new_localhost(&this_node.pubkey(), timestamp()),
             this_node.clone(),
+            SocketAddrSpace::Unspecified,
         );
         let remote_nodes: Vec<(Keypair, SocketAddr)> =
             repeat_with(|| new_rand_remote_node(&mut rng))
@@ -3237,59 +3199,6 @@ mod tests {
         vec![entrypoint_crdsvalue]
     }
 
-    #[test]
-    fn test_filter_shred_version() {
-        let from = solana_sdk::pubkey::new_rand();
-        let my_shred_version = 1;
-        let other_shred_version = 1;
-
-        // Allow same shred_version
-        let mut values = test_crds_values(from);
-        ClusterInfo::filter_by_shred_version(
-            &from,
-            &mut values,
-            other_shred_version,
-            my_shred_version,
-        );
-        assert_eq!(values.len(), 1);
-
-        // Allow shred_version=0.
-        let other_shred_version = 0;
-        ClusterInfo::filter_by_shred_version(
-            &from,
-            &mut values,
-            other_shred_version,
-            my_shred_version,
-        );
-        assert_eq!(values.len(), 1);
-
-        // Change to sender's ContactInfo version, allow that.
-        let other_shred_version = 2;
-        ClusterInfo::filter_by_shred_version(
-            &from,
-            &mut values,
-            other_shred_version,
-            my_shred_version,
-        );
-        assert_eq!(values.len(), 1);
-
-        let snapshot_hash_data = CrdsValue::new_unsigned(CrdsData::SnapshotHashes(SnapshotHash {
-            from: solana_sdk::pubkey::new_rand(),
-            hashes: vec![],
-            wallclock: 0,
-        }));
-        values.push(snapshot_hash_data);
-        // Change to sender's ContactInfo version, allow that.
-        let other_shred_version = 2;
-        ClusterInfo::filter_by_shred_version(
-            &from,
-            &mut values,
-            other_shred_version,
-            my_shred_version,
-        );
-        assert_eq!(values.len(), 1);
-    }
-
     #[test]
     fn test_max_snapshot_hashes_with_push_messages() {
         let mut rng = rand::thread_rng();
@@ -3405,23 +3314,32 @@ mod tests {
         //check that gossip doesn't try to push to invalid addresses
         let node = Node::new_localhost();
         let (spy, _, _) = ClusterInfo::spy_node(&solana_sdk::pubkey::new_rand(), 0);
-        let cluster_info = Arc::new(ClusterInfo::new_with_invalid_keypair(node.info));
+        let cluster_info = Arc::new(ClusterInfo::new(
+            node.info,
+            Arc::new(Keypair::new()),
+            SocketAddrSpace::Unspecified,
+        ));
         cluster_info.insert_info(spy);
-        cluster_info
-            .gossip
-            .write()
-            .unwrap()
-            .refresh_push_active_set(&HashMap::new(), None);
+        {
+            let mut gossip = cluster_info.gossip.write().unwrap();
+            gossip.refresh_push_active_set(
+                &cluster_info.id(),
+                cluster_info.my_shred_version(),
+                &HashMap::new(), // stakes
+                None,            // gossip validators
+                &SocketAddrSpace::Unspecified,
+            );
+        }
         let reqs = cluster_info.generate_new_gossip_requests(
             &thread_pool,
-            None, // gossip_validators
-            &HashMap::new(),
-            true,  // generate_pull_requests
-            false, // require_stake_for_gossip
+            None,            // gossip_validators
+            &HashMap::new(), // stakes
+            true,            // generate_pull_requests
+            false,           // require_stake_for_gossip
         );
         //assert none of the addrs are invalid.
         reqs.iter().all(|(addr, _)| {
-            let res = ContactInfo::is_valid_address(addr);
+            let res = ContactInfo::is_valid_address(addr, &SocketAddrSpace::Unspecified);
             assert!(res);
             res
         });
@@ -3430,14 +3348,19 @@ mod tests {
     #[test]
     fn test_cluster_info_new() {
         let d = ContactInfo::new_localhost(&solana_sdk::pubkey::new_rand(), timestamp());
-        let cluster_info = ClusterInfo::new_with_invalid_keypair(d.clone());
+        let cluster_info = ClusterInfo::new(
+            d.clone(),
+            Arc::new(Keypair::new()),
+            SocketAddrSpace::Unspecified,
+        );
         assert_eq!(d.id, cluster_info.id());
     }
 
     #[test]
     fn insert_info_test() {
         let d = ContactInfo::new_localhost(&solana_sdk::pubkey::new_rand(), timestamp());
-        let cluster_info = ClusterInfo::new_with_invalid_keypair(d);
+        let cluster_info =
+            ClusterInfo::new(d, Arc::new(Keypair::new()), SocketAddrSpace::Unspecified);
         let d = ContactInfo::new_localhost(&solana_sdk::pubkey::new_rand(), timestamp());
         let label = CrdsValueLabel::ContactInfo(d.id);
         cluster_info.insert_info(d);
@@ -3516,18 +3439,27 @@ mod tests {
         let peer_keypair = Keypair::new();
         let contact_info = ContactInfo::new_localhost(&keypair.pubkey(), 0);
         let peer = ContactInfo::new_localhost(&peer_keypair.pubkey(), 0);
-        let cluster_info = ClusterInfo::new(contact_info, Arc::new(keypair));
+        let cluster_info = ClusterInfo::new(
+            contact_info,
+            Arc::new(keypair),
+            SocketAddrSpace::Unspecified,
+        );
         cluster_info
             .ping_cache
             .lock()
             .unwrap()
             .mock_pong(peer.id, peer.gossip, Instant::now());
         cluster_info.insert_info(peer);
-        cluster_info
-            .gossip
-            .write()
-            .unwrap()
-            .refresh_push_active_set(&HashMap::new(), None);
+        {
+            let mut gossip = cluster_info.gossip.write().unwrap();
+            gossip.refresh_push_active_set(
+                &cluster_info.id(),
+                cluster_info.my_shred_version(),
+                &HashMap::new(), // stakes
+                None,            // gossip validators
+                &SocketAddrSpace::Unspecified,
+            );
+        }
         //check that all types of gossip messages are signed correctly
         let push_messages = cluster_info
             .gossip
@@ -3548,12 +3480,14 @@ mod tests {
             .new_pull_request(
                 &thread_pool,
                 cluster_info.keypair.deref(),
+                cluster_info.my_shred_version(),
                 timestamp(),
                 None,
                 &HashMap::new(),
                 MAX_BLOOM_SIZE,
                 &cluster_info.ping_cache,
                 &mut pings,
+                &cluster_info.socket_addr_space,
             )
             .ok()
             .unwrap();
@@ -3563,7 +3497,11 @@ mod tests {
     fn test_refresh_vote() {
         let keys = Keypair::new();
         let contact_info = ContactInfo::new_localhost(&keys.pubkey(), 0);
-        let cluster_info = ClusterInfo::new_with_invalid_keypair(contact_info);
+        let cluster_info = ClusterInfo::new(
+            contact_info,
+            Arc::new(Keypair::new()),
+            SocketAddrSpace::Unspecified,
+        );
 
         // Construct and push a vote for some other slot
         let unrefresh_slot = 5;
@@ -3579,7 +3517,6 @@ mod tests {
             None,            // payer
         );
         cluster_info.push_vote(&unrefresh_tower, unrefresh_tx.clone());
-        cluster_info.flush_push_queue();
         let mut cursor = Cursor::default();
         let (_, votes) = cluster_info.get_votes(&mut cursor);
         assert_eq!(votes, vec![unrefresh_tx.clone()]);
@@ -3601,7 +3538,6 @@ mod tests {
         // Trying to refresh vote when it doesn't yet exist in gossip
         // shouldn't add the vote
         cluster_info.refresh_vote(refresh_tx.clone(), refresh_slot);
-        cluster_info.flush_push_queue();
         let (_, votes) = cluster_info.get_votes(&mut cursor);
         assert_eq!(votes, vec![]);
         let (_, votes) = cluster_info.get_votes(&mut Cursor::default());
@@ -3610,7 +3546,6 @@ mod tests {
 
         // Push the new vote for `refresh_slot`
         cluster_info.push_vote(&refresh_tower, refresh_tx.clone());
-        cluster_info.flush_push_queue();
 
         // Should be two votes in gossip
         let (_, votes) = cluster_info.get_votes(&mut Cursor::default());
@@ -3636,8 +3571,6 @@ mod tests {
             );
             cluster_info.refresh_vote(latest_refresh_tx.clone(), refresh_slot);
         }
-        cluster_info.flush_push_queue();
-
         // The diff since `max_ts` should only be the latest refreshed vote
         let (_, votes) = cluster_info.get_votes(&mut cursor);
         assert_eq!(votes.len(), 1);
@@ -3655,7 +3588,11 @@ mod tests {
         let mut rng = rand::thread_rng();
         let keys = Keypair::new();
         let contact_info = ContactInfo::new_localhost(&keys.pubkey(), 0);
-        let cluster_info = ClusterInfo::new_with_invalid_keypair(contact_info);
+        let cluster_info = ClusterInfo::new(
+            contact_info,
+            Arc::new(Keypair::new()),
+            SocketAddrSpace::Unspecified,
+        );
 
         // make sure empty crds is handled correctly
         let mut cursor = Cursor::default();
@@ -3678,7 +3615,6 @@ mod tests {
         );
         let tower = vec![7]; // Last slot in the vote.
         cluster_info.push_vote(&tower, tx.clone());
-        cluster_info.flush_push_queue();
 
         let (labels, votes) = cluster_info.get_votes(&mut cursor);
         assert_eq!(votes, vec![tx]);
@@ -3727,7 +3663,11 @@ mod tests {
         let mut rng = rand::thread_rng();
         let keys = Keypair::new();
         let contact_info = ContactInfo::new_localhost(&keys.pubkey(), 0);
-        let cluster_info = ClusterInfo::new_with_invalid_keypair(contact_info);
+        let cluster_info = ClusterInfo::new(
+            contact_info,
+            Arc::new(Keypair::new()),
+            SocketAddrSpace::Unspecified,
+        );
         let mut tower = Vec::new();
         for k in 0..MAX_LOCKOUT_HISTORY {
             let slot = k as Slot;
@@ -3773,11 +3713,14 @@ mod tests {
     fn test_push_epoch_slots() {
         let keys = Keypair::new();
         let contact_info = ContactInfo::new_localhost(&keys.pubkey(), 0);
-        let cluster_info = ClusterInfo::new_with_invalid_keypair(contact_info);
+        let cluster_info = ClusterInfo::new(
+            contact_info,
+            Arc::new(Keypair::new()),
+            SocketAddrSpace::Unspecified,
+        );
         let slots = cluster_info.get_epoch_slots(&mut Cursor::default());
         assert!(slots.is_empty());
         cluster_info.push_epoch_slots(&[0]);
-        cluster_info.flush_push_queue();
 
         let mut cursor = Cursor::default();
         let slots = cluster_info.get_epoch_slots(&mut cursor);
@@ -3785,6 +3728,43 @@ mod tests {
 
         let slots = cluster_info.get_epoch_slots(&mut cursor);
         assert!(slots.is_empty());
+
+        // Test with different shred versions.
+        let mut rng = rand::thread_rng();
+        let node_pubkey = Pubkey::new_unique();
+        let mut node = ContactInfo::new_rand(&mut rng, Some(node_pubkey));
+        node.shred_version = 42;
+        let epoch_slots = EpochSlots::new_rand(&mut rng, Some(node_pubkey));
+        let entries = vec![
+            CrdsValue::new_unsigned(CrdsData::ContactInfo(node)),
+            CrdsValue::new_unsigned(CrdsData::EpochSlots(0, epoch_slots)),
+        ];
+        {
+            let mut gossip = cluster_info.gossip.write().unwrap();
+            for entry in entries {
+                assert!(gossip.crds.insert(entry, /*now=*/ 0).is_ok());
+            }
+        }
+        // Should exclude other node's epoch-slot because of different
+        // shred-version.
+        let slots = cluster_info.get_epoch_slots(&mut Cursor::default());
+        assert_eq!(slots.len(), 1);
+        assert_eq!(slots[0].from, cluster_info.id);
+        // Match shred versions.
+        {
+            let mut node = cluster_info.my_contact_info.write().unwrap();
+            node.shred_version = 42;
+        }
+        cluster_info.push_self(
+            &HashMap::default(), // stakes
+            None,                // gossip validators
+        );
+        cluster_info.flush_push_queue();
+        // Should now include both epoch slots.
+        let slots = cluster_info.get_epoch_slots(&mut Cursor::default());
+        assert_eq!(slots.len(), 2);
+        assert_eq!(slots[0].from, cluster_info.id);
+        assert_eq!(slots[1].from, node_pubkey);
     }
 
     #[test]
@@ -3794,6 +3774,7 @@ mod tests {
         let cluster_info = ClusterInfo::new(
             ContactInfo::new_localhost(&node_keypair.pubkey(), timestamp()),
             node_keypair,
+            SocketAddrSpace::Unspecified,
         );
         let entrypoint_pubkey = solana_sdk::pubkey::new_rand();
         let entrypoint = ContactInfo::new_localhost(&entrypoint_pubkey, timestamp());
@@ -3818,6 +3799,7 @@ mod tests {
         let timeouts = {
             let gossip = cluster_info.gossip.read().unwrap();
             gossip.make_timeouts(
+                cluster_info.id(),
                 &HashMap::default(), // stakes,
                 Duration::from_millis(gossip.pull.crds_timeout),
             )
@@ -3946,7 +3928,11 @@ mod tests {
     #[test]
     fn test_tvu_peers_and_stakes() {
         let d = ContactInfo::new_localhost(&Pubkey::new(&[0; 32]), timestamp());
-        let cluster_info = ClusterInfo::new_with_invalid_keypair(d.clone());
+        let cluster_info = ClusterInfo::new(
+            d.clone(),
+            Arc::new(Keypair::new()),
+            SocketAddrSpace::Unspecified,
+        );
         let mut stakes = HashMap::new();
 
         // no stake
@@ -3978,15 +3964,6 @@ mod tests {
         assert_ne!(contact_info.shred_version, d.shred_version);
         cluster_info.insert_info(contact_info);
         stakes.insert(id4, 10);
-
-        let mut peers = cluster_info.tvu_peers();
-        let peers_and_stakes = stake_weight_peers(&mut peers, Some(&stakes));
-        assert_eq!(peers.len(), 2);
-        assert_eq!(peers[0].id, id);
-        assert_eq!(peers[1].id, id2);
-        assert_eq!(peers_and_stakes.len(), 2);
-        assert_eq!(peers_and_stakes[0].0, 10);
-        assert_eq!(peers_and_stakes[1].0, 1);
     }
 
     #[test]
@@ -3996,6 +3973,7 @@ mod tests {
         let cluster_info = ClusterInfo::new(
             ContactInfo::new_localhost(&node_keypair.pubkey(), timestamp()),
             node_keypair,
+            SocketAddrSpace::Unspecified,
         );
         let entrypoint_pubkey = solana_sdk::pubkey::new_rand();
         let mut entrypoint = ContactInfo::new_localhost(&entrypoint_pubkey, timestamp());
@@ -4051,6 +4029,7 @@ mod tests {
         let cluster_info = ClusterInfo::new(
             ContactInfo::new_localhost(&node_keypair.pubkey(), timestamp()),
             node_keypair,
+            SocketAddrSpace::Unspecified,
         );
         for i in 0..10 {
             // make these invalid for the upcoming repair request
@@ -4126,6 +4105,7 @@ mod tests {
         let cluster_info = ClusterInfo::new(
             ContactInfo::new_localhost(&node_keypair.pubkey(), timestamp()),
             node_keypair,
+            SocketAddrSpace::Unspecified,
         );
         let mut range: Vec<Slot> = vec![];
         //random should be hard to compress
@@ -4134,9 +4114,7 @@ mod tests {
             range.push(last + rand::thread_rng().gen_range(1, 32));
         }
         cluster_info.push_epoch_slots(&range[..16000]);
-        cluster_info.flush_push_queue();
         cluster_info.push_epoch_slots(&range[16000..]);
-        cluster_info.flush_push_queue();
         let slots = cluster_info.get_epoch_slots(&mut Cursor::default());
         let slots: Vec<_> = slots.iter().flat_map(|x| x.to_slots(0)).collect();
         assert_eq!(slots, range);
@@ -4175,6 +4153,7 @@ mod tests {
         let cluster_info = Arc::new(ClusterInfo::new(
             ContactInfo::new_localhost(&node_keypair.pubkey(), timestamp()),
             node_keypair,
+            SocketAddrSpace::Unspecified,
         ));
         assert_eq!(cluster_info.my_shred_version(), 0);
 
@@ -4258,6 +4237,7 @@ mod tests {
                 contact_info
             },
             node_keypair,
+            SocketAddrSpace::Unspecified,
         ));
         assert_eq!(cluster_info.my_shred_version(), 2);
 
@@ -4429,7 +4409,11 @@ mod tests {
     #[ignore] // TODO: debug why this is flaky on buildkite!
     fn test_pull_request_time_pruning() {
         let node = Node::new_localhost();
-        let cluster_info = Arc::new(ClusterInfo::new_with_invalid_keypair(node.info));
+        let cluster_info = Arc::new(ClusterInfo::new(
+            node.info,
+            Arc::new(Keypair::new()),
+            SocketAddrSpace::Unspecified,
+        ));
         let entrypoint_pubkey = solana_sdk::pubkey::new_rand();
         let entrypoint = ContactInfo::new_localhost(&entrypoint_pubkey, timestamp());
         cluster_info.set_entrypoint(entrypoint);
diff --git a/gossip/src/cluster_info_metrics.rs b/gossip/src/cluster_info_metrics.rs
index baac2f54384dda..b3c228ed6f8592 100644
--- a/gossip/src/cluster_info_metrics.rs
+++ b/gossip/src/cluster_info_metrics.rs
@@ -4,6 +4,7 @@ use {
     solana_sdk::pubkey::Pubkey,
     std::{
         collections::HashMap,
+        ops::{Deref, DerefMut},
         sync::{
             atomic::{AtomicU64, Ordering},
             RwLock,
@@ -28,6 +29,12 @@ impl Counter {
     }
 }
 
+pub(crate) struct TimedGuard<'a, T> {
+    guard: T,
+    timer: Measure,
+    counter: &'a Counter,
+}
+
 pub(crate) struct ScopedTimer<'a> {
     clock: Instant,
     metric: &'a AtomicU64,
@@ -52,6 +59,35 @@ impl Drop for ScopedTimer<'_> {
     }
 }
 
+impl<'a, T> TimedGuard<'a, T> {
+    pub(crate) fn new(guard: T, label: &'static str, counter: &'a Counter) -> Self {
+        Self {
+            guard,
+            timer: Measure::start(label),
+            counter,
+        }
+    }
+}
+
+impl<'a, T> Deref for TimedGuard<'a, T> {
+    type Target = T;
+    fn deref(&self) -> &Self::Target {
+        &self.guard
+    }
+}
+
+impl<'a, T> DerefMut for TimedGuard<'a, T> {
+    fn deref_mut(&mut self) -> &mut Self::Target {
+        &mut self.guard
+    }
+}
+
+impl<'a, T> Drop for TimedGuard<'a, T> {
+    fn drop(&mut self) {
+        self.counter.add_measure(&mut self.timer);
+    }
+}
+
 #[derive(Default)]
 pub(crate) struct GossipStats {
     pub(crate) all_tvu_peers: Counter,
@@ -115,9 +151,11 @@ pub(crate) struct GossipStats {
     pub(crate) skip_pull_response_shred_version: Counter,
     pub(crate) skip_pull_shred_version: Counter,
     pub(crate) skip_push_message_shred_version: Counter,
+    pub(crate) trim_crds_table: Counter,
     pub(crate) trim_crds_table_failed: Counter,
     pub(crate) trim_crds_table_purged_values_count: Counter,
     pub(crate) tvu_peers: Counter,
+    pub(crate) verify_gossip_packets_time: Counter,
 }
 
 pub(crate) fn submit_gossip_stats(
@@ -171,6 +209,11 @@ pub(crate) fn submit_gossip_stats(
             stats.process_gossip_packets_time.clear(),
             i64
         ),
+        (
+            "verify_gossip_packets_time",
+            stats.verify_gossip_packets_time.clear(),
+            i64
+        ),
         (
             "handle_batch_ping_messages_time",
             stats.handle_batch_ping_messages_time.clear(),
@@ -392,6 +435,7 @@ pub(crate) fn submit_gossip_stats(
             stats.require_stake_for_gossip_unknown_stakes.clear(),
             i64
         ),
+        ("trim_crds_table", stats.trim_crds_table.clear(), i64),
         (
             "trim_crds_table_failed",
             stats.trim_crds_table_failed.clear(),
diff --git a/gossip/src/contact_info.rs b/gossip/src/contact_info.rs
index 6471c30dac00d6..30ec785ef4cc71 100644
--- a/gossip/src/contact_info.rs
+++ b/gossip/src/contact_info.rs
@@ -7,6 +7,7 @@ use {
         signature::{Keypair, Signer},
         timing::timestamp,
     },
+    solana_streamer::socket::SocketAddrSpace,
     std::net::{IpAddr, SocketAddr},
 };
 
@@ -105,7 +106,7 @@ impl ContactInfo {
     }
 
     /// New random ContactInfo for tests and simulations.
-    pub(crate) fn new_rand<R: rand::Rng>(rng: &mut R, pubkey: Option<Pubkey>) -> Self {
+    pub fn new_rand<R: rand::Rng>(rng: &mut R, pubkey: Option<Pubkey>) -> Self {
         let delay = 10 * 60 * 1000; // 10 minutes
         let now = timestamp() - delay + rng.gen_range(0, 2 * delay);
         let pubkey = pubkey.unwrap_or_else(solana_sdk::pubkey::new_rand);
@@ -143,14 +144,14 @@ impl ContactInfo {
         }
 
         let tpu = *bind_addr;
-        let gossip = next_port(&bind_addr, 1);
-        let tvu = next_port(&bind_addr, 2);
-        let tpu_forwards = next_port(&bind_addr, 3);
-        let tvu_forwards = next_port(&bind_addr, 4);
-        let repair = next_port(&bind_addr, 5);
+        let gossip = next_port(bind_addr, 1);
+        let tvu = next_port(bind_addr, 2);
+        let tpu_forwards = next_port(bind_addr, 3);
+        let tvu_forwards = next_port(bind_addr, 4);
+        let repair = next_port(bind_addr, 5);
         let rpc = SocketAddr::new(bind_addr.ip(), rpc_port::DEFAULT_RPC_PORT);
         let rpc_pubsub = SocketAddr::new(bind_addr.ip(), rpc_port::DEFAULT_RPC_PUBSUB_PORT);
-        let serve_repair = next_port(&bind_addr, 6);
+        let serve_repair = next_port(bind_addr, 6);
         Self {
             id: *pubkey,
             gossip,
@@ -193,16 +194,29 @@ impl ContactInfo {
     /// port must not be 0
     /// ip must be specified and not multicast
     /// loopback ip is only allowed in tests
-    pub fn is_valid_address(addr: &SocketAddr) -> bool {
+    // Keeping this for now not to break tvu-peers and turbine shuffle order of
+    // nodes when arranging nodes on retransmit tree. Private IP addresses in
+    // turbine are filtered out just before sending packets.
+    pub(crate) fn is_valid_tvu_address(addr: &SocketAddr) -> bool {
         (addr.port() != 0) && Self::is_valid_ip(addr.ip())
     }
 
+    // TODO: Replace this entirely with streamer SocketAddrSpace.
+    pub fn is_valid_address(addr: &SocketAddr, socket_addr_space: &SocketAddrSpace) -> bool {
+        Self::is_valid_tvu_address(addr) && socket_addr_space.check(addr)
+    }
+
     pub fn client_facing_addr(&self) -> (SocketAddr, SocketAddr) {
         (self.rpc, self.tpu)
     }
 
-    pub fn valid_client_facing_addr(&self) -> Option<(SocketAddr, SocketAddr)> {
-        if ContactInfo::is_valid_address(&self.rpc) && ContactInfo::is_valid_address(&self.tpu) {
+    pub fn valid_client_facing_addr(
+        &self,
+        socket_addr_space: &SocketAddrSpace,
+    ) -> Option<(SocketAddr, SocketAddr)> {
+        if ContactInfo::is_valid_address(&self.rpc, socket_addr_space)
+            && ContactInfo::is_valid_address(&self.tpu, socket_addr_space)
+        {
             Some((self.rpc, self.tpu))
         } else {
             None
@@ -217,13 +231,25 @@ mod tests {
     #[test]
     fn test_is_valid_address() {
         let bad_address_port = socketaddr!("127.0.0.1:0");
-        assert!(!ContactInfo::is_valid_address(&bad_address_port));
+        assert!(!ContactInfo::is_valid_address(
+            &bad_address_port,
+            &SocketAddrSpace::Unspecified
+        ));
         let bad_address_unspecified = socketaddr!(0, 1234);
-        assert!(!ContactInfo::is_valid_address(&bad_address_unspecified));
+        assert!(!ContactInfo::is_valid_address(
+            &bad_address_unspecified,
+            &SocketAddrSpace::Unspecified
+        ));
         let bad_address_multicast = socketaddr!([224, 254, 0, 0], 1234);
-        assert!(!ContactInfo::is_valid_address(&bad_address_multicast));
+        assert!(!ContactInfo::is_valid_address(
+            &bad_address_multicast,
+            &SocketAddrSpace::Unspecified
+        ));
         let loopback = socketaddr!("127.0.0.1:1234");
-        assert!(ContactInfo::is_valid_address(&loopback));
+        assert!(ContactInfo::is_valid_address(
+            &loopback,
+            &SocketAddrSpace::Unspecified
+        ));
         //        assert!(!ContactInfo::is_valid_ip_internal(loopback.ip(), false));
     }
 
@@ -306,11 +332,19 @@ mod tests {
     #[test]
     fn test_valid_client_facing() {
         let mut ci = ContactInfo::default();
-        assert_eq!(ci.valid_client_facing_addr(), None);
+        assert_eq!(
+            ci.valid_client_facing_addr(&SocketAddrSpace::Unspecified),
+            None
+        );
         ci.tpu = socketaddr!("127.0.0.1:123");
-        assert_eq!(ci.valid_client_facing_addr(), None);
+        assert_eq!(
+            ci.valid_client_facing_addr(&SocketAddrSpace::Unspecified),
+            None
+        );
         ci.rpc = socketaddr!("127.0.0.1:234");
-        assert!(ci.valid_client_facing_addr().is_some());
+        assert!(ci
+            .valid_client_facing_addr(&SocketAddrSpace::Unspecified)
+            .is_some());
     }
 
     #[test]
diff --git a/gossip/src/crds.rs b/gossip/src/crds.rs
index bd197647aa3bc6..fcba2230c681e7 100644
--- a/gossip/src/crds.rs
+++ b/gossip/src/crds.rs
@@ -35,6 +35,7 @@ use {
         map::{rayon::ParValues, Entry, IndexMap},
         set::IndexSet,
     },
+    matches::debug_assert_matches,
     rayon::{prelude::*, ThreadPool},
     solana_sdk::{
         hash::{hash, Hash},
@@ -66,6 +67,8 @@ pub struct Crds {
     entries: BTreeMap<u64 /*insert order*/, usize /*index*/>,
     // Hash of recently purged values.
     purged: VecDeque<(Hash, u64 /*timestamp*/)>,
+    // Mapping from nodes' pubkeys to their respective shred-version.
+    shred_versions: HashMap<Pubkey, u16>,
 }
 
 #[derive(PartialEq, Debug)]
@@ -125,6 +128,7 @@ impl Default for Crds {
             records: HashMap::default(),
             entries: BTreeMap::default(),
             purged: VecDeque::default(),
+            shred_versions: HashMap::default(),
         }
     }
 }
@@ -173,9 +177,10 @@ impl Crds {
             Entry::Vacant(entry) => {
                 let entry_index = entry.index();
                 self.shards.insert(entry_index, &value);
-                match value.value.data {
-                    CrdsData::ContactInfo(_) => {
+                match &value.value.data {
+                    CrdsData::ContactInfo(node) => {
                         self.nodes.insert(entry_index);
+                        self.shred_versions.insert(pubkey, node.shred_version);
                     }
                     CrdsData::Vote(_, _) => {
                         self.votes.insert(value.ordinal, entry_index);
@@ -195,7 +200,13 @@ impl Crds {
                 let entry_index = entry.index();
                 self.shards.remove(entry_index, entry.get());
                 self.shards.insert(entry_index, &value);
-                match value.value.data {
+                match &value.value.data {
+                    CrdsData::ContactInfo(node) => {
+                        self.shred_versions.insert(pubkey, node.shred_version);
+                        // self.nodes does not need to be updated since the
+                        // entry at this index was and stays contact-info.
+                        debug_assert_matches!(entry.get().value.data, CrdsData::ContactInfo(_));
+                    }
                     CrdsData::Vote(_, _) => {
                         self.votes.remove(&entry.get().ordinal);
                         self.votes.insert(value.ordinal, entry_index);
@@ -239,6 +250,10 @@ impl Crds {
         self.table.get(&label)?.value.contact_info()
     }
 
+    pub(crate) fn get_shred_version(&self, pubkey: &Pubkey) -> Option<u16> {
+        self.shred_versions.get(pubkey).copied()
+    }
+
     pub fn get_lowest_slot(&self, pubkey: Pubkey) -> Option<&LowestSlot> {
         let lable = CrdsValueLabel::LowestSlot(pubkey);
         self.table.get(&lable)?.value.lowest_slot()
@@ -391,22 +406,20 @@ impl Crds {
         // returns crds labels of old values to be evicted.
         let evict = |pubkey, index: &IndexSet<usize>| {
             let timeout = timeouts.get(pubkey).copied().unwrap_or(default_timeout);
-            let local_timestamp = {
-                let origin = CrdsValueLabel::ContactInfo(*pubkey);
-                match self.table.get(&origin) {
-                    Some(origin) => origin.local_timestamp,
-                    None => 0,
+            // If the origin's contact-info hasn't expired yet then preserve
+            // all associated values.
+            let origin = CrdsValueLabel::ContactInfo(*pubkey);
+            if let Some(origin) = self.table.get(&origin) {
+                if now < origin.local_timestamp.saturating_add(timeout) {
+                    return vec![];
                 }
-            };
+            }
+            // Otherwise check each value's timestamp individually.
             index
                 .into_iter()
                 .filter_map(|ix| {
                     let (label, value) = self.table.get_index(*ix).unwrap();
-                    let expiry_timestamp = value
-                        .local_timestamp
-                        .max(local_timestamp)
-                        .saturating_add(timeout);
-                    if expiry_timestamp <= now {
+                    if value.local_timestamp.saturating_add(timeout) <= now {
                         Some(label.clone())
                     } else {
                         None
@@ -451,6 +464,7 @@ impl Crds {
         records_entry.get_mut().swap_remove(&index);
         if records_entry.get().is_empty() {
             records_entry.remove();
+            self.shred_versions.remove(&pubkey);
         }
         // If index == self.table.len(), then the removed entry was the last
         // entry in the table, in which case no other keys were modified.
@@ -519,7 +533,7 @@ impl Crds {
         stakes: &HashMap<Pubkey, u64>,
         now: u64,
     ) -> Result</*num purged:*/ usize, CrdsError> {
-        if stakes.is_empty() {
+        if stakes.values().all(|&stake| stake == 0) {
             return Err(CrdsError::UnknownStakes);
         }
         let mut keys: Vec<_> = self
@@ -546,17 +560,20 @@ impl Crds {
 }
 
 #[cfg(test)]
-mod test {
+mod tests {
     use {
         super::*,
         crate::{
             contact_info::ContactInfo,
-            crds_value::{new_rand_timestamp, NodeInstance},
+            crds_value::{new_rand_timestamp, NodeInstance, SnapshotHash},
         },
         rand::{thread_rng, Rng, SeedableRng},
         rand_chacha::ChaChaRng,
         rayon::ThreadPoolBuilder,
-        solana_sdk::signature::{Keypair, Signer},
+        solana_sdk::{
+            signature::{Keypair, Signer},
+            timing::timestamp,
+        },
         std::{collections::HashSet, iter::repeat_with},
     };
 
@@ -1019,6 +1036,53 @@ mod test {
         assert!(crds.records.is_empty());
     }
 
+    #[test]
+    fn test_get_shred_version() {
+        let mut rng = rand::thread_rng();
+        let pubkey = Pubkey::new_unique();
+        let mut crds = Crds::default();
+        assert_eq!(crds.get_shred_version(&pubkey), None);
+        // Initial insertion of a node with shred version:
+        let mut node = ContactInfo::new_rand(&mut rng, Some(pubkey));
+        let wallclock = node.wallclock;
+        node.shred_version = 42;
+        let node = CrdsData::ContactInfo(node);
+        let node = CrdsValue::new_unsigned(node);
+        assert_eq!(crds.insert(node, timestamp()), Ok(()));
+        assert_eq!(crds.get_shred_version(&pubkey), Some(42));
+        // An outdated  value should not update shred-version:
+        let mut node = ContactInfo::new_rand(&mut rng, Some(pubkey));
+        node.wallclock = wallclock - 1; // outdated.
+        node.shred_version = 8;
+        let node = CrdsData::ContactInfo(node);
+        let node = CrdsValue::new_unsigned(node);
+        assert_eq!(crds.insert(node, timestamp()), Err(CrdsError::InsertFailed));
+        assert_eq!(crds.get_shred_version(&pubkey), Some(42));
+        // Update shred version:
+        let mut node = ContactInfo::new_rand(&mut rng, Some(pubkey));
+        node.wallclock = wallclock + 1; // so that it overrides the prev one.
+        node.shred_version = 8;
+        let node = CrdsData::ContactInfo(node);
+        let node = CrdsValue::new_unsigned(node);
+        assert_eq!(crds.insert(node, timestamp()), Ok(()));
+        assert_eq!(crds.get_shred_version(&pubkey), Some(8));
+        // Add other crds values with the same pubkey.
+        let val = SnapshotHash::new_rand(&mut rng, Some(pubkey));
+        let val = CrdsData::SnapshotHashes(val);
+        let val = CrdsValue::new_unsigned(val);
+        assert_eq!(crds.insert(val, timestamp()), Ok(()));
+        assert_eq!(crds.get_shred_version(&pubkey), Some(8));
+        // Remove contact-info. Shred version should stay there since there
+        // are still values associated with the pubkey.
+        crds.remove(&CrdsValueLabel::ContactInfo(pubkey), timestamp());
+        assert_eq!(crds.get_contact_info(pubkey), None);
+        assert_eq!(crds.get_shred_version(&pubkey), Some(8));
+        // Remove the remaining entry with the same pubkey.
+        crds.remove(&CrdsValueLabel::SnapshotHashes(pubkey), timestamp());
+        assert_eq!(crds.get_records(&pubkey).count(), 0);
+        assert_eq!(crds.get_shred_version(&pubkey), None);
+    }
+
     #[test]
     #[allow(clippy::needless_collect)]
     fn test_drop() {
diff --git a/gossip/src/crds_gossip.rs b/gossip/src/crds_gossip.rs
index 18c7991f3bbeff..f45125e6445dd7 100644
--- a/gossip/src/crds_gossip.rs
+++ b/gossip/src/crds_gossip.rs
@@ -24,6 +24,7 @@ use {
         signature::{Keypair, Signer},
         timing::timestamp,
     },
+    solana_streamer::socket::SocketAddrSpace,
     std::{
         collections::{HashMap, HashSet},
         net::SocketAddr,
@@ -32,45 +33,25 @@ use {
     },
 };
 
+#[derive(Default)]
 pub struct CrdsGossip {
     pub crds: Crds,
-    pub id: Pubkey,
-    pub shred_version: u16,
     pub push: CrdsGossipPush,
     pub pull: CrdsGossipPull,
 }
 
-impl Default for CrdsGossip {
-    fn default() -> Self {
-        CrdsGossip {
-            crds: Crds::default(),
-            id: Pubkey::default(),
-            shred_version: 0,
-            push: CrdsGossipPush::default(),
-            pull: CrdsGossipPull::default(),
-        }
-    }
-}
-
 impl CrdsGossip {
-    pub fn set_self(&mut self, id: &Pubkey) {
-        self.id = *id;
-    }
-    pub fn set_shred_version(&mut self, shred_version: u16) {
-        self.shred_version = shred_version;
-    }
-
     /// process a push message to the network
-    /// Returns origins' pubkeys of upserted values.
+    /// Returns unique origins' pubkeys of upserted values.
     pub fn process_push_message(
         &mut self,
         from: &Pubkey,
         values: Vec<CrdsValue>,
         now: u64,
-    ) -> Vec<Pubkey> {
+    ) -> HashSet<Pubkey> {
         values
             .into_iter()
-            .flat_map(|val| {
+            .filter_map(|val| {
                 let origin = val.pubkey();
                 self.push
                     .process_push_message(&mut self.crds, from, val, now)
@@ -83,18 +64,18 @@ impl CrdsGossip {
     /// remove redundant paths in the network
     pub fn prune_received_cache<I>(
         &mut self,
+        self_pubkey: &Pubkey,
         origins: I, // Unique pubkeys of crds values' owners.
         stakes: &HashMap<Pubkey, u64>,
     ) -> HashMap</*gossip peer:*/ Pubkey, /*origins:*/ Vec<Pubkey>>
     where
         I: IntoIterator<Item = Pubkey>,
     {
-        let self_pubkey = self.id;
         origins
             .into_iter()
             .flat_map(|origin| {
                 self.push
-                    .prune_received_cache(&self_pubkey, &origin, stakes)
+                    .prune_received_cache(self_pubkey, &origin, stakes)
                     .into_iter()
                     .zip(std::iter::repeat(origin))
             })
@@ -106,8 +87,9 @@ impl CrdsGossip {
         pending_push_messages: Vec<CrdsValue>,
         now: u64,
     ) -> HashMap<Pubkey, Vec<CrdsValue>> {
-        let self_pubkey = self.id;
-        self.process_push_message(&self_pubkey, pending_push_messages, now);
+        for entry in pending_push_messages {
+            let _ = self.crds.insert(entry, now);
+        }
         self.push.new_push_messages(&self.crds, now)
     }
 
@@ -161,21 +143,24 @@ impl CrdsGossip {
         } else {
             offset
         };
-        let entries = chunks
-            .enumerate()
-            .map(|(k, chunk)| {
-                let index = (offset + k as DuplicateShredIndex) % MAX_DUPLICATE_SHREDS;
-                let data = CrdsData::DuplicateShred(index, chunk);
-                CrdsValue::new_signed(data, keypair)
-            })
-            .collect();
-        self.process_push_message(&pubkey, entries, timestamp());
+        let entries = chunks.enumerate().map(|(k, chunk)| {
+            let index = (offset + k as DuplicateShredIndex) % MAX_DUPLICATE_SHREDS;
+            let data = CrdsData::DuplicateShred(index, chunk);
+            CrdsValue::new_signed(data, keypair)
+        });
+        let now = timestamp();
+        for entry in entries {
+            if let Err(err) = self.crds.insert(entry, now) {
+                error!("push_duplicate_shred faild: {:?}", err);
+            }
+        }
         Ok(())
     }
 
     /// add the `from` to the peer's filter of nodes
     pub fn process_prune_msg(
         &self,
+        self_pubkey: &Pubkey,
         peer: &Pubkey,
         destination: &Pubkey,
         origin: &[Pubkey],
@@ -186,8 +171,8 @@ impl CrdsGossip {
         if expired {
             return Err(CrdsGossipError::PruneMessageTimeout);
         }
-        if self.id == *destination {
-            self.push.process_prune_msg(&self.id, peer, origin);
+        if self_pubkey == destination {
+            self.push.process_prune_msg(self_pubkey, peer, origin);
             Ok(())
         } else {
             Err(CrdsGossipError::BadPruneDestination)
@@ -198,43 +183,51 @@ impl CrdsGossip {
     /// * ratio - number of actives to rotate
     pub fn refresh_push_active_set(
         &mut self,
+        self_pubkey: &Pubkey,
+        self_shred_version: u16,
         stakes: &HashMap<Pubkey, u64>,
         gossip_validators: Option<&HashSet<Pubkey>>,
+        socket_addr_space: &SocketAddrSpace,
     ) {
         self.push.refresh_push_active_set(
             &self.crds,
             stakes,
             gossip_validators,
-            &self.id,
-            self.shred_version,
+            self_pubkey,
+            self_shred_version,
             self.crds.num_nodes(),
             CRDS_GOSSIP_NUM_ACTIVE,
+            socket_addr_space,
         )
     }
 
     /// generate a random request
+    #[allow(clippy::too_many_arguments)]
     pub fn new_pull_request(
         &self,
         thread_pool: &ThreadPool,
         self_keypair: &Keypair,
+        self_shred_version: u16,
         now: u64,
         gossip_validators: Option<&HashSet<Pubkey>>,
         stakes: &HashMap<Pubkey, u64>,
         bloom_size: usize,
         ping_cache: &Mutex<PingCache>,
         pings: &mut Vec<(SocketAddr, Ping)>,
+        socket_addr_space: &SocketAddrSpace,
     ) -> Result<(ContactInfo, Vec<CrdsFilter>), CrdsGossipError> {
         self.pull.new_pull_request(
             thread_pool,
             &self.crds,
             self_keypair,
-            self.shred_version,
+            self_shred_version,
             now,
             gossip_validators,
             stakes,
             bloom_size,
             ping_cache,
             pings,
+            socket_addr_space,
         )
     }
 
@@ -250,18 +243,23 @@ impl CrdsGossip {
     where
         I: IntoIterator<Item = CrdsValue>,
     {
-        self.pull
-            .process_pull_requests(&mut self.crds, callers, now);
+        CrdsGossipPull::process_pull_requests(&mut self.crds, callers, now);
     }
 
     pub fn generate_pull_responses(
         &self,
+        thread_pool: &ThreadPool,
         filters: &[(CrdsValue, CrdsFilter)],
         output_size_limit: usize, // Limit number of crds values returned.
         now: u64,
     ) -> Vec<Vec<CrdsValue>> {
-        self.pull
-            .generate_pull_responses(&self.crds, filters, output_size_limit, now)
+        CrdsGossipPull::generate_pull_responses(
+            thread_pool,
+            &self.crds,
+            filters,
+            output_size_limit,
+            now,
+        )
     }
 
     pub fn filter_pull_responses(
@@ -302,14 +300,16 @@ impl CrdsGossip {
 
     pub fn make_timeouts(
         &self,
+        self_pubkey: Pubkey,
         stakes: &HashMap<Pubkey, u64>,
         epoch_duration: Duration,
     ) -> HashMap<Pubkey, u64> {
-        self.pull.make_timeouts(self.id, stakes, epoch_duration)
+        self.pull.make_timeouts(self_pubkey, stakes, epoch_duration)
     }
 
     pub fn purge(
         &mut self,
+        self_pubkey: &Pubkey,
         thread_pool: &ThreadPool,
         now: u64,
         timeouts: &HashMap<Pubkey, u64>,
@@ -321,11 +321,9 @@ impl CrdsGossip {
         }
         if now > self.pull.crds_timeout {
             //sanity check
-            assert_eq!(timeouts[&self.id], std::u64::MAX);
+            assert_eq!(timeouts[self_pubkey], std::u64::MAX);
             assert!(timeouts.contains_key(&Pubkey::default()));
-            rv = self
-                .pull
-                .purge_active(thread_pool, &mut self.crds, now, &timeouts);
+            rv = CrdsGossipPull::purge_active(thread_pool, &mut self.crds, now, timeouts);
         }
         self.crds
             .trim_purged(now.saturating_sub(5 * self.pull.crds_timeout));
@@ -339,7 +337,6 @@ impl CrdsGossip {
             crds: self.crds.clone(),
             push: self.push.mock_clone(),
             pull: self.pull.mock_clone(),
-            ..*self
         }
     }
 }
@@ -371,11 +368,8 @@ mod test {
 
     #[test]
     fn test_prune_errors() {
-        let mut crds_gossip = CrdsGossip {
-            id: Pubkey::new(&[0; 32]),
-            ..CrdsGossip::default()
-        };
-        let id = crds_gossip.id;
+        let mut crds_gossip = CrdsGossip::default();
+        let id = Pubkey::new(&[0; 32]);
         let ci = ContactInfo::new_localhost(&Pubkey::new(&[1; 32]), 0);
         let prune_pubkey = Pubkey::new(&[2; 32]);
         crds_gossip
@@ -385,10 +379,17 @@ mod test {
                 0,
             )
             .unwrap();
-        crds_gossip.refresh_push_active_set(&HashMap::new(), None);
+        crds_gossip.refresh_push_active_set(
+            &id,
+            0,               // shred version
+            &HashMap::new(), // stakes
+            None,            // gossip validators
+            &SocketAddrSpace::Unspecified,
+        );
         let now = timestamp();
         //incorrect dest
         let mut res = crds_gossip.process_prune_msg(
+            &id,
             &ci.id,
             &Pubkey::new(hash(&[1; 32]).as_ref()),
             &[prune_pubkey],
@@ -397,11 +398,25 @@ mod test {
         );
         assert_eq!(res.err(), Some(CrdsGossipError::BadPruneDestination));
         //correct dest
-        res = crds_gossip.process_prune_msg(&ci.id, &id, &[prune_pubkey], now, now);
+        res = crds_gossip.process_prune_msg(
+            &id,             // self_pubkey
+            &ci.id,          // peer
+            &id,             // destination
+            &[prune_pubkey], // origins
+            now,
+            now,
+        );
         res.unwrap();
         //test timeout
         let timeout = now + crds_gossip.push.prune_timeout * 2;
-        res = crds_gossip.process_prune_msg(&ci.id, &id, &[prune_pubkey], now, timeout);
+        res = crds_gossip.process_prune_msg(
+            &id,             // self_pubkey
+            &ci.id,          // peer
+            &id,             // destination
+            &[prune_pubkey], // origins
+            now,
+            timeout,
+        );
         assert_eq!(res.err(), Some(CrdsGossipError::PruneMessageTimeout));
     }
 }
diff --git a/gossip/src/crds_gossip_pull.rs b/gossip/src/crds_gossip_pull.rs
index d01e8887d2224e..3b84fe6c61a991 100644
--- a/gossip/src/crds_gossip_pull.rs
+++ b/gossip/src/crds_gossip_pull.rs
@@ -13,18 +13,15 @@ use {
     crate::{
         cluster_info::{Ping, CRDS_UNIQUE_PUBKEY_CAPACITY},
         contact_info::ContactInfo,
-        crds::Crds,
+        crds::{Crds, VersionedCrdsValue},
         crds_gossip::{get_stake, get_weight},
         crds_gossip_error::CrdsGossipError,
         crds_value::CrdsValue,
         ping_pong::PingCache,
+        weighted_shuffle::WeightedShuffle,
     },
-    itertools::Itertools,
     lru::LruCache,
-    rand::{
-        distributions::{Distribution, WeightedIndex},
-        Rng,
-    },
+    rand::Rng,
     rayon::{prelude::*, ThreadPool},
     solana_runtime::bloom::{AtomicBloom, Bloom},
     solana_sdk::{
@@ -32,12 +29,16 @@ use {
         pubkey::Pubkey,
         signature::{Keypair, Signer},
     },
+    solana_streamer::socket::SocketAddrSpace,
     std::{
         collections::{HashMap, HashSet, VecDeque},
         convert::TryInto,
         iter::repeat_with,
         net::SocketAddr,
-        sync::Mutex,
+        sync::{
+            atomic::{AtomicI64, AtomicUsize, Ordering},
+            Mutex,
+        },
         time::{Duration, Instant},
     },
 };
@@ -77,7 +78,8 @@ impl solana_sdk::sanitize::Sanitize for CrdsFilter {
 }
 
 impl CrdsFilter {
-    pub fn new_rand(num_items: usize, max_bytes: usize) -> Self {
+    #[cfg(test)]
+    pub(crate) fn new_rand(num_items: usize, max_bytes: usize) -> Self {
         let max_bits = (max_bytes * 8) as f64;
         let max_items = Self::max_items(max_bits, FALSE_RATE, KEYS);
         let mask_bits = Self::mask_bits(num_items as f64, max_items as f64);
@@ -210,7 +212,7 @@ impl Default for CrdsGossipPull {
 impl CrdsGossipPull {
     /// generate a random request
     #[allow(clippy::too_many_arguments)]
-    pub fn new_pull_request(
+    pub(crate) fn new_pull_request(
         &self,
         thread_pool: &ThreadPool,
         crds: &Crds,
@@ -222,6 +224,7 @@ impl CrdsGossipPull {
         bloom_size: usize,
         ping_cache: &Mutex<PingCache>,
         pings: &mut Vec<(SocketAddr, Ping)>,
+        socket_addr_space: &SocketAddrSpace,
     ) -> Result<(ContactInfo, Vec<CrdsFilter>), CrdsGossipError> {
         let (weights, peers): (Vec<_>, Vec<_>) = self
             .pull_options(
@@ -231,19 +234,17 @@ impl CrdsGossipPull {
                 now,
                 gossip_validators,
                 stakes,
+                socket_addr_space,
             )
             .into_iter()
             .unzip();
         if peers.is_empty() {
             return Err(CrdsGossipError::NoPeers);
         }
-        let mut peers = {
-            let mut rng = rand::thread_rng();
-            let num_samples = peers.len() * 2;
-            let index = WeightedIndex::new(weights).unwrap();
-            let sample_peer = move || peers[index.sample(&mut rng)];
-            repeat_with(sample_peer).take(num_samples)
-        };
+        let mut rng = rand::thread_rng();
+        let mut peers = WeightedShuffle::new(&mut rng, &weights)
+            .unwrap()
+            .map(|i| peers[i]);
         let peer = {
             let mut rng = rand::thread_rng();
             let mut ping_cache = ping_cache.lock().unwrap();
@@ -275,7 +276,8 @@ impl CrdsGossipPull {
         now: u64,
         gossip_validators: Option<&HashSet<Pubkey>>,
         stakes: &HashMap<Pubkey, u64>,
-    ) -> Vec<(f32, &'a ContactInfo)> {
+        socket_addr_space: &SocketAddrSpace,
+    ) -> Vec<(u64, &'a ContactInfo)> {
         let mut rng = rand::thread_rng();
         let active_cutoff = now.saturating_sub(PULL_ACTIVE_TIMEOUT_MS);
         crds.get_nodes()
@@ -294,7 +296,7 @@ impl CrdsGossipPull {
             })
             .filter(|v| {
                 v.id != *self_id
-                    && ContactInfo::is_valid_address(&v.gossip)
+                    && ContactInfo::is_valid_address(&v.gossip, socket_addr_space)
                     && (self_shred_version == 0 || self_shred_version == v.shred_version)
                     && gossip_validators
                         .map_or(true, |gossip_validators| gossip_validators.contains(&v.id))
@@ -309,7 +311,9 @@ impl CrdsGossipPull {
                 let since = (now.saturating_sub(req_time).min(3600 * 1000) / 1024) as u32;
                 let stake = get_stake(&item.id, stakes);
                 let weight = get_weight(max_weight, since, stake);
-                (weight, item)
+                // Weights are bounded by max_weight defined above.
+                // So this type-cast should be safe.
+                ((weight * 100.0) as u64, item)
             })
             .collect()
     }
@@ -318,12 +322,12 @@ impl CrdsGossipPull {
     /// This is used for weighted random selection during `new_pull_request`
     /// It's important to use the local nodes request creation time as the weight
     /// instead of the response received time otherwise failed nodes will increase their weight.
-    pub fn mark_pull_request_creation_time(&mut self, from: Pubkey, now: u64) {
+    pub(crate) fn mark_pull_request_creation_time(&mut self, from: Pubkey, now: u64) {
         self.pull_request_time.put(from, now);
     }
 
     /// process a pull request
-    pub fn process_pull_requests<I>(&mut self, crds: &mut Crds, callers: I, now: u64)
+    pub(crate) fn process_pull_requests<I>(crds: &mut Crds, callers: I, now: u64)
     where
         I: IntoIterator<Item = CrdsValue>,
     {
@@ -335,14 +339,14 @@ impl CrdsGossipPull {
     }
 
     /// Create gossip responses to pull requests
-    pub fn generate_pull_responses(
-        &self,
+    pub(crate) fn generate_pull_responses(
+        thread_pool: &ThreadPool,
         crds: &Crds,
         requests: &[(CrdsValue, CrdsFilter)],
         output_size_limit: usize, // Limit number of crds values returned.
         now: u64,
     ) -> Vec<Vec<CrdsValue>> {
-        self.filter_crds_values(crds, requests, output_size_limit, now)
+        Self::filter_crds_values(thread_pool, crds, requests, output_size_limit, now)
     }
 
     // Checks if responses should be inserted and
@@ -351,7 +355,7 @@ impl CrdsGossipPull {
     //  .0 => responses that update the owner timestamp
     //  .1 => responses that do not update the owner timestamp
     //  .2 => hash value of outdated values which will fail to insert.
-    pub fn filter_pull_responses(
+    pub(crate) fn filter_pull_responses(
         &self,
         crds: &Crds,
         timeouts: &HashMap<Pubkey, u64>,
@@ -397,7 +401,7 @@ impl CrdsGossipPull {
     }
 
     /// process a vec of pull responses
-    pub fn process_pull_responses(
+    pub(crate) fn process_pull_responses(
         &mut self,
         crds: &mut Crds,
         from: &Pubkey,
@@ -429,7 +433,7 @@ impl CrdsGossipPull {
             .extend(failed_inserts.into_iter().zip(std::iter::repeat(now)));
     }
 
-    pub fn purge_failed_inserts(&mut self, now: u64) {
+    pub(crate) fn purge_failed_inserts(&mut self, now: u64) {
         if FAILED_INSERTS_RETENTION_MS < now {
             let cutoff = now - FAILED_INSERTS_RETENTION_MS;
             let outdated = self
@@ -475,10 +479,10 @@ impl CrdsGossipPull {
 
     /// filter values that fail the bloom filter up to max_bytes
     fn filter_crds_values(
-        &self,
+        thread_pool: &ThreadPool,
         crds: &Crds,
         filters: &[(CrdsValue, CrdsFilter)],
-        mut output_size_limit: usize, // Limit number of crds values returned.
+        output_size_limit: usize, // Limit number of crds values returned.
         now: u64,
     ) -> Vec<Vec<CrdsValue>> {
         let msg_timeout = CRDS_GOSSIP_PULL_CRDS_TIMEOUT_MS;
@@ -486,46 +490,56 @@ impl CrdsGossipPull {
         //skip filters from callers that are too old
         let caller_wallclock_window =
             now.saturating_sub(msg_timeout)..now.saturating_add(msg_timeout);
-        let mut dropped_requests = 0;
-        let mut total_skipped = 0;
-        let ret: Vec<_> = filters
-            .iter()
-            .map(|(caller, filter)| {
-                if output_size_limit == 0 {
-                    return None;
-                }
-                let caller_wallclock = caller.wallclock();
-                if !caller_wallclock_window.contains(&caller_wallclock) {
-                    dropped_requests += 1;
-                    return Some(vec![]);
+        let dropped_requests = AtomicUsize::default();
+        let total_skipped = AtomicUsize::default();
+        let output_size_limit = output_size_limit.try_into().unwrap_or(i64::MAX);
+        let output_size_limit = AtomicI64::new(output_size_limit);
+        let apply_filter = |caller: &CrdsValue, filter: &CrdsFilter| {
+            if output_size_limit.load(Ordering::Relaxed) <= 0 {
+                return Vec::default();
+            }
+            let caller_wallclock = caller.wallclock();
+            if !caller_wallclock_window.contains(&caller_wallclock) {
+                dropped_requests.fetch_add(1, Ordering::Relaxed);
+                return Vec::default();
+            }
+            let caller_pubkey = caller.pubkey();
+            let caller_wallclock = caller_wallclock.checked_add(jitter).unwrap_or(0);
+            let pred = |entry: &&VersionedCrdsValue| {
+                debug_assert!(filter.test_mask(&entry.value_hash));
+                // Skip values that are too new.
+                if entry.value.wallclock() > caller_wallclock {
+                    total_skipped.fetch_add(1, Ordering::Relaxed);
+                    false
+                } else {
+                    !filter.filter_contains(&entry.value_hash)
+                        && (entry.value.pubkey() != caller_pubkey
+                            || entry.value.should_force_push(&caller_pubkey))
                 }
-                let caller_wallclock = caller_wallclock.checked_add(jitter).unwrap_or(0);
-                let out: Vec<_> = crds
-                    .filter_bitmask(filter.mask, filter.mask_bits)
-                    .filter_map(|item| {
-                        debug_assert!(filter.test_mask(&item.value_hash));
-                        //skip values that are too new
-                        if item.value.wallclock() > caller_wallclock {
-                            total_skipped += 1;
-                            None
-                        } else if filter.filter_contains(&item.value_hash) {
-                            None
-                        } else {
-                            Some(item.value.clone())
-                        }
-                    })
-                    .take(output_size_limit)
-                    .collect();
-                output_size_limit -= out.len();
-                Some(out)
-            })
-            .while_some()
-            .collect();
+            };
+            let out: Vec<_> = crds
+                .filter_bitmask(filter.mask, filter.mask_bits)
+                .filter(pred)
+                .map(|entry| entry.value.clone())
+                .take(output_size_limit.load(Ordering::Relaxed).max(0) as usize)
+                .collect();
+            output_size_limit.fetch_sub(out.len() as i64, Ordering::Relaxed);
+            out
+        };
+        let ret: Vec<_> = thread_pool.install(|| {
+            filters
+                .par_iter()
+                .map(|(caller, filter)| apply_filter(caller, filter))
+                .collect()
+        });
         inc_new_counter_info!(
             "gossip_filter_crds_values-dropped_requests",
-            dropped_requests + filters.len() - ret.len()
+            dropped_requests.into_inner()
+        );
+        inc_new_counter_info!(
+            "gossip_filter_crds_values-dropped_values",
+            total_skipped.into_inner()
         );
-        inc_new_counter_info!("gossip_filter_crds_values-dropped_values", total_skipped);
         ret
     }
 
@@ -553,8 +567,7 @@ impl CrdsGossipPull {
     }
 
     /// Purge values from the crds that are older then `active_timeout`
-    pub fn purge_active(
-        &mut self,
+    pub(crate) fn purge_active(
         thread_pool: &ThreadPool,
         crds: &mut Crds,
         now: u64,
@@ -569,7 +582,7 @@ impl CrdsGossipPull {
 
     /// For legacy tests
     #[cfg(test)]
-    pub fn process_pull_response(
+    fn process_pull_response(
         &mut self,
         crds: &mut Crds,
         from: &Pubkey,
@@ -689,7 +702,15 @@ pub(crate) mod tests {
             stakes.insert(id, i * 100);
         }
         let now = 1024;
-        let mut options = node.pull_options(&crds, &me.label().pubkey(), 0, now, None, &stakes);
+        let mut options = node.pull_options(
+            &crds,
+            &me.label().pubkey(),
+            0,
+            now,
+            None,
+            &stakes,
+            &SocketAddrSpace::Unspecified,
+        );
         assert!(!options.is_empty());
         options.sort_by(|(weight_l, _), (weight_r, _)| weight_r.partial_cmp(weight_l).unwrap());
         // check that the highest stake holder is also the heaviest weighted.
@@ -739,7 +760,15 @@ pub(crate) mod tests {
 
         // shred version 123 should ignore nodes with versions 0 and 456
         let options = node
-            .pull_options(&crds, &me.label().pubkey(), 123, 0, None, &stakes)
+            .pull_options(
+                &crds,
+                &me.label().pubkey(),
+                123,
+                0,
+                None,
+                &stakes,
+                &SocketAddrSpace::Unspecified,
+            )
             .iter()
             .map(|(_, c)| c.id)
             .collect::<Vec<_>>();
@@ -749,7 +778,15 @@ pub(crate) mod tests {
 
         // spy nodes will see all
         let options = node
-            .pull_options(&crds, &spy.label().pubkey(), 0, 0, None, &stakes)
+            .pull_options(
+                &crds,
+                &spy.label().pubkey(),
+                0,
+                0,
+                None,
+                &stakes,
+                &SocketAddrSpace::Unspecified,
+            )
             .iter()
             .map(|(_, c)| c.id)
             .collect::<Vec<_>>();
@@ -789,6 +826,7 @@ pub(crate) mod tests {
             0,
             Some(&gossip_validators),
             &stakes,
+            &SocketAddrSpace::Unspecified,
         );
         assert!(options.is_empty());
 
@@ -801,6 +839,7 @@ pub(crate) mod tests {
             0,
             Some(&gossip_validators),
             &stakes,
+            &SocketAddrSpace::Unspecified,
         );
         assert!(options.is_empty());
 
@@ -813,6 +852,7 @@ pub(crate) mod tests {
             0,
             Some(&gossip_validators),
             &stakes,
+            &SocketAddrSpace::Unspecified,
         );
         assert_eq!(options.len(), 1);
         assert_eq!(options[0].1.id, node_123.pubkey());
@@ -913,7 +953,7 @@ pub(crate) mod tests {
             &node_keypair.pubkey(),
             0,
         )));
-        let node = CrdsGossipPull::default();
+        let mut node = CrdsGossipPull::default();
         let mut pings = Vec::new();
         let ping_cache = Mutex::new(PingCache::new(
             Duration::from_secs(20 * 60), // ttl
@@ -931,6 +971,7 @@ pub(crate) mod tests {
                 PACKET_DATA_SIZE,
                 &ping_cache,
                 &mut pings,
+                &SocketAddrSpace::Unspecified,
             ),
             Err(CrdsGossipError::NoPeers)
         );
@@ -948,28 +989,53 @@ pub(crate) mod tests {
                 PACKET_DATA_SIZE,
                 &ping_cache,
                 &mut pings,
+                &SocketAddrSpace::Unspecified,
             ),
             Err(CrdsGossipError::NoPeers)
         );
-        let new = ContactInfo::new_localhost(&solana_sdk::pubkey::new_rand(), 0);
+        let now = 1625029781069;
+        let new = ContactInfo::new_localhost(&solana_sdk::pubkey::new_rand(), now);
         ping_cache
             .lock()
             .unwrap()
             .mock_pong(new.id, new.gossip, Instant::now());
         let new = CrdsValue::new_unsigned(CrdsData::ContactInfo(new));
-        crds.insert(new.clone(), 0).unwrap();
+        crds.insert(new.clone(), now).unwrap();
         let req = node.new_pull_request(
             &thread_pool,
             &crds,
             &node_keypair,
             0,
+            now,
+            None,
+            &HashMap::new(),
+            PACKET_DATA_SIZE,
+            &ping_cache,
+            &mut pings,
+            &SocketAddrSpace::Unspecified,
+        );
+        let (peer, _) = req.unwrap();
+        assert_eq!(peer, *new.contact_info().unwrap());
+
+        node.mark_pull_request_creation_time(new.contact_info().unwrap().id, now);
+        let offline = ContactInfo::new_localhost(&solana_sdk::pubkey::new_rand(), now);
+        let offline = CrdsValue::new_unsigned(CrdsData::ContactInfo(offline));
+        crds.insert(offline, now).unwrap();
+        let req = node.new_pull_request(
+            &thread_pool,
+            &crds,
+            &node_keypair,
             0,
+            now,
             None,
             &HashMap::new(),
             PACKET_DATA_SIZE,
             &ping_cache,
             &mut pings,
+            &SocketAddrSpace::Unspecified,
         );
+        // Even though the offline node should have higher weight, we shouldn't request from it
+        // until we receive a ping.
         let (peer, _) = req.unwrap();
         assert_eq!(peer, *new.contact_info().unwrap());
     }
@@ -1021,6 +1087,7 @@ pub(crate) mod tests {
                     PACKET_DATA_SIZE, // bloom_size
                     &ping_cache,
                     &mut pings,
+                    &SocketAddrSpace::Unspecified,
                 )
                 .unwrap();
             peer
@@ -1098,17 +1165,18 @@ pub(crate) mod tests {
             PACKET_DATA_SIZE,
             &Mutex::new(ping_cache),
             &mut pings,
+            &SocketAddrSpace::Unspecified,
         );
 
         let mut dest_crds = Crds::default();
-        let dest = CrdsGossipPull::default();
         let (_, filters) = req.unwrap();
         let mut filters: Vec<_> = filters.into_iter().map(|f| (caller.clone(), f)).collect();
-        let rsp = dest.generate_pull_responses(
+        let rsp = CrdsGossipPull::generate_pull_responses(
+            &thread_pool,
             &dest_crds,
             &filters,
-            /*output_size_limit=*/ usize::MAX,
-            0,
+            usize::MAX, // output_size_limit
+            0,          // now
         );
 
         assert_eq!(rsp[0].len(), 0);
@@ -1122,11 +1190,12 @@ pub(crate) mod tests {
             .unwrap();
 
         //should skip new value since caller is to old
-        let rsp = dest.generate_pull_responses(
+        let rsp = CrdsGossipPull::generate_pull_responses(
+            &thread_pool,
             &dest_crds,
             &filters,
-            /*output_size_limit=*/ usize::MAX,
-            CRDS_GOSSIP_PULL_MSG_TIMEOUT_MS,
+            usize::MAX,                      // output_size_limit
+            CRDS_GOSSIP_PULL_MSG_TIMEOUT_MS, // now
         );
         assert_eq!(rsp[0].len(), 0);
         assert_eq!(filters.len(), MIN_NUM_BLOOM_FILTERS);
@@ -1140,10 +1209,11 @@ pub(crate) mod tests {
                 .map(|(_, filter)| (caller.clone(), filter.clone()))
                 .collect::<Vec<_>>()
         });
-        let rsp = dest.generate_pull_responses(
+        let rsp = CrdsGossipPull::generate_pull_responses(
+            &thread_pool,
             &dest_crds,
             &filters,
-            /*output_size_limit=*/ usize::MAX,
+            usize::MAX, // output_size_limit
             CRDS_GOSSIP_PULL_MSG_TIMEOUT_MS,
         );
         assert_eq!(rsp.len(), 2 * MIN_NUM_BLOOM_FILTERS);
@@ -1186,19 +1256,20 @@ pub(crate) mod tests {
             PACKET_DATA_SIZE,
             &Mutex::new(ping_cache),
             &mut pings,
+            &SocketAddrSpace::Unspecified,
         );
 
         let mut dest_crds = Crds::default();
-        let mut dest = CrdsGossipPull::default();
         let (_, filters) = req.unwrap();
         let filters: Vec<_> = filters.into_iter().map(|f| (caller.clone(), f)).collect();
-        let rsp = dest.generate_pull_responses(
+        let rsp = CrdsGossipPull::generate_pull_responses(
+            &thread_pool,
             &dest_crds,
             &filters,
-            /*output_size_limit=*/ usize::MAX,
-            0,
+            usize::MAX, // output_size_limit
+            0,          // now
         );
-        dest.process_pull_requests(
+        CrdsGossipPull::process_pull_requests(
             &mut dest_crds,
             filters.into_iter().map(|(caller, _)| caller),
             1,
@@ -1229,7 +1300,6 @@ pub(crate) mod tests {
         let new = CrdsValue::new_unsigned(CrdsData::ContactInfo(new));
         node_crds.insert(new, 0).unwrap();
 
-        let mut dest = CrdsGossipPull::default();
         let mut dest_crds = Crds::default();
         let new_id = solana_sdk::pubkey::new_rand();
         let new = ContactInfo::new_localhost(&new_id, 1);
@@ -1261,16 +1331,18 @@ pub(crate) mod tests {
                 PACKET_DATA_SIZE,
                 &ping_cache,
                 &mut pings,
+                &SocketAddrSpace::Unspecified,
             );
             let (_, filters) = req.unwrap();
             let filters: Vec<_> = filters.into_iter().map(|f| (caller.clone(), f)).collect();
-            let rsp = dest.generate_pull_responses(
+            let rsp = CrdsGossipPull::generate_pull_responses(
+                &thread_pool,
                 &dest_crds,
                 &filters,
-                /*output_size_limit=*/ usize::MAX,
-                0,
+                usize::MAX, // output_size_limit
+                0,          // now
             );
-            dest.process_pull_requests(
+            CrdsGossipPull::process_pull_requests(
                 &mut dest_crds,
                 filters.into_iter().map(|(caller, _)| caller),
                 0,
@@ -1313,7 +1385,7 @@ pub(crate) mod tests {
         )));
         let node_label = entry.label();
         let node_pubkey = node_label.pubkey();
-        let mut node = CrdsGossipPull::default();
+        let node = CrdsGossipPull::default();
         node_crds.insert(entry, 0).unwrap();
         let old = CrdsValue::new_unsigned(CrdsData::ContactInfo(ContactInfo::new_localhost(
             &solana_sdk::pubkey::new_rand(),
@@ -1329,7 +1401,7 @@ pub(crate) mod tests {
         );
         // purge
         let timeouts = node.make_timeouts(node_pubkey, &HashMap::new(), Duration::default());
-        node.purge_active(&thread_pool, &mut node_crds, node.crds_timeout, &timeouts);
+        CrdsGossipPull::purge_active(&thread_pool, &mut node_crds, node.crds_timeout, &timeouts);
 
         //verify self is still valid after purge
         assert_eq!(
diff --git a/gossip/src/crds_gossip_push.rs b/gossip/src/crds_gossip_push.rs
index 8daa532d9bf869..4639dca4795476 100644
--- a/gossip/src/crds_gossip_push.rs
+++ b/gossip/src/crds_gossip_push.rs
@@ -16,7 +16,7 @@ use {
         crds_gossip::{get_stake, get_weight},
         crds_gossip_error::CrdsGossipError,
         crds_value::CrdsValue,
-        weighted_shuffle::weighted_shuffle,
+        weighted_shuffle::WeightedShuffle,
     },
     bincode::serialized_size,
     indexmap::map::IndexMap,
@@ -24,6 +24,7 @@ use {
     rand::{seq::SliceRandom, Rng},
     solana_runtime::bloom::{AtomicBloom, Bloom},
     solana_sdk::{packet::PACKET_DATA_SIZE, pubkey::Pubkey, timing::timestamp},
+    solana_streamer::socket::SocketAddrSpace,
     std::{
         cmp,
         collections::{HashMap, HashSet},
@@ -98,7 +99,7 @@ impl CrdsGossipPush {
         ((CRDS_GOSSIP_PRUNE_STAKE_THRESHOLD_PCT * min_path_stake as f64).round() as u64).max(1)
     }
 
-    pub fn prune_received_cache(
+    pub(crate) fn prune_received_cache(
         &mut self,
         self_pubkey: &Pubkey,
         origin: &Pubkey,
@@ -119,6 +120,7 @@ impl CrdsGossipPush {
         if peer_stake_total < prune_stake_threshold {
             return Vec::new();
         }
+        let mut rng = rand::thread_rng();
         let shuffled_staked_peers = {
             let peers: Vec<_> = peers
                 .iter()
@@ -126,11 +128,9 @@ impl CrdsGossipPush {
                 .filter_map(|(peer, _)| Some((*peer, *stakes.get(peer)?)))
                 .filter(|(_, stake)| *stake > 0)
                 .collect();
-            let mut seed = [0; 32];
-            rand::thread_rng().fill(&mut seed[..]);
             let weights: Vec<_> = peers.iter().map(|(_, stake)| *stake).collect();
-            weighted_shuffle(&weights, seed)
-                .into_iter()
+            WeightedShuffle::new(&mut rng, &weights)
+                .unwrap()
                 .map(move |i| peers[i])
         };
         let mut keep = HashSet::new();
@@ -165,7 +165,7 @@ impl CrdsGossipPush {
     }
 
     /// process a push message to the network
-    pub fn process_push_message(
+    pub(crate) fn process_push_message(
         &mut self,
         crds: &mut Crds,
         from: &Pubkey,
@@ -255,7 +255,7 @@ impl CrdsGossipPush {
 
     /// refresh the push active set
     /// * ratio - active_set.len()/ratio is the number of actives to rotate
-    pub fn refresh_push_active_set(
+    pub(crate) fn refresh_push_active_set(
         &mut self,
         crds: &Crds,
         stakes: &HashMap<Pubkey, u64>,
@@ -264,6 +264,7 @@ impl CrdsGossipPush {
         self_shred_version: u16,
         network_size: usize,
         ratio: usize,
+        socket_addr_space: &SocketAddrSpace,
     ) {
         const BLOOM_FALSE_RATE: f64 = 0.1;
         const BLOOM_MAX_BITS: usize = 1024 * 8 * 4;
@@ -277,10 +278,11 @@ impl CrdsGossipPush {
         let (weights, peers): (Vec<_>, Vec<_>) = self
             .push_options(
                 crds,
-                &self_id,
+                self_id,
                 self_shred_version,
                 stakes,
                 gossip_validators,
+                socket_addr_space,
             )
             .into_iter()
             .unzip();
@@ -288,11 +290,7 @@ impl CrdsGossipPush {
             return;
         }
         let num_bloom_items = MIN_NUM_BLOOM_ITEMS.max(network_size);
-        let shuffle = {
-            let mut seed = [0; 32];
-            rng.fill(&mut seed[..]);
-            weighted_shuffle(&weights, seed).into_iter()
-        };
+        let shuffle = WeightedShuffle::new(&mut rng, &weights).unwrap();
         for peer in shuffle.map(|i| peers[i].id) {
             if new_items.len() >= need {
                 break;
@@ -326,7 +324,8 @@ impl CrdsGossipPush {
         self_shred_version: u16,
         stakes: &HashMap<Pubkey, u64>,
         gossip_validators: Option<&HashSet<Pubkey>>,
-    ) -> Vec<(f32, &'a ContactInfo)> {
+        socket_addr_space: &SocketAddrSpace,
+    ) -> Vec<(u64, &'a ContactInfo)> {
         let now = timestamp();
         let mut rng = rand::thread_rng();
         let max_weight = u16::MAX as f32 - 1.0;
@@ -347,7 +346,7 @@ impl CrdsGossipPush {
             })
             .filter(|info| {
                 info.id != *self_id
-                    && ContactInfo::is_valid_address(&info.gossip)
+                    && ContactInfo::is_valid_address(&info.gossip, socket_addr_space)
                     && self_shred_version == info.shred_version
                     && gossip_validators.map_or(true, |gossip_validators| {
                         gossip_validators.contains(&info.id)
@@ -362,13 +361,15 @@ impl CrdsGossipPush {
                 let since = (now.saturating_sub(last_pushed_to).min(3600 * 1000) / 1024) as u32;
                 let stake = get_stake(&info.id, stakes);
                 let weight = get_weight(max_weight, since, stake);
-                (weight, info)
+                // Weights are bounded by max_weight defined above.
+                // So this type-cast should be safe.
+                ((weight * 100.0) as u64, info)
             })
             .collect()
     }
 
     /// purge received push message cache
-    pub fn purge_old_received_cache(&mut self, min_time: u64) {
+    pub(crate) fn purge_old_received_cache(&mut self, min_time: u64) {
         self.received_cache.retain(|_, v| {
             v.retain(|_, (_, t)| *t > min_time);
             !v.is_empty()
@@ -556,7 +557,16 @@ mod test {
         )));
 
         assert_eq!(crds.insert(value1.clone(), now), Ok(()));
-        push.refresh_push_active_set(&crds, &HashMap::new(), None, &Pubkey::default(), 0, 1, 1);
+        push.refresh_push_active_set(
+            &crds,
+            &HashMap::new(),
+            None,
+            &Pubkey::default(),
+            0,
+            1,
+            1,
+            &SocketAddrSpace::Unspecified,
+        );
 
         assert!(push.active_set.get(&value1.label().pubkey()).is_some());
         let value2 = CrdsValue::new_unsigned(CrdsData::ContactInfo(ContactInfo::new_localhost(
@@ -566,7 +576,16 @@ mod test {
         assert!(push.active_set.get(&value2.label().pubkey()).is_none());
         assert_eq!(crds.insert(value2.clone(), now), Ok(()));
         for _ in 0..30 {
-            push.refresh_push_active_set(&crds, &HashMap::new(), None, &Pubkey::default(), 0, 1, 1);
+            push.refresh_push_active_set(
+                &crds,
+                &HashMap::new(),
+                None,
+                &Pubkey::default(),
+                0,
+                1,
+                1,
+                &SocketAddrSpace::Unspecified,
+            );
             if push.active_set.get(&value2.label().pubkey()).is_some() {
                 break;
             }
@@ -579,7 +598,16 @@ mod test {
             ));
             assert_eq!(crds.insert(value2.clone(), now), Ok(()));
         }
-        push.refresh_push_active_set(&crds, &HashMap::new(), None, &Pubkey::default(), 0, 1, 1);
+        push.refresh_push_active_set(
+            &crds,
+            &HashMap::new(),
+            None,
+            &Pubkey::default(),
+            0,
+            1,
+            1,
+            &SocketAddrSpace::Unspecified,
+        );
         assert_eq!(push.active_set.len(), push.num_active);
     }
     #[test]
@@ -599,7 +627,14 @@ mod test {
             stakes.insert(id, i * 100);
             push.last_pushed_to.put(id, time);
         }
-        let mut options = push.push_options(&crds, &Pubkey::default(), 0, &stakes, None);
+        let mut options = push.push_options(
+            &crds,
+            &Pubkey::default(),
+            0,
+            &stakes,
+            None,
+            &SocketAddrSpace::Unspecified,
+        );
         assert!(!options.is_empty());
         options.sort_by(|(weight_l, _), (weight_r, _)| weight_r.partial_cmp(weight_l).unwrap());
         // check that the highest stake holder is also the heaviest weighted.
@@ -650,7 +685,14 @@ mod test {
 
         // shred version 123 should ignore nodes with versions 0 and 456
         let options = node
-            .push_options(&crds, &me.label().pubkey(), 123, &stakes, None)
+            .push_options(
+                &crds,
+                &me.label().pubkey(),
+                123,
+                &stakes,
+                None,
+                &SocketAddrSpace::Unspecified,
+            )
             .iter()
             .map(|(_, c)| c.id)
             .collect::<Vec<_>>();
@@ -660,7 +702,14 @@ mod test {
 
         // spy nodes should not push to people on different shred versions
         let options = node
-            .push_options(&crds, &spy.label().pubkey(), 0, &stakes, None)
+            .push_options(
+                &crds,
+                &spy.label().pubkey(),
+                0,
+                &stakes,
+                None,
+                &SocketAddrSpace::Unspecified,
+            )
             .iter()
             .map(|(_, c)| c.id)
             .collect::<Vec<_>>();
@@ -697,6 +746,7 @@ mod test {
             0,
             &stakes,
             Some(&gossip_validators),
+            &SocketAddrSpace::Unspecified,
         );
 
         assert!(options.is_empty());
@@ -709,6 +759,7 @@ mod test {
             0,
             &stakes,
             Some(&gossip_validators),
+            &SocketAddrSpace::Unspecified,
         );
         assert!(options.is_empty());
 
@@ -720,6 +771,7 @@ mod test {
             0,
             &stakes,
             Some(&gossip_validators),
+            &SocketAddrSpace::Unspecified,
         );
 
         assert_eq!(options.len(), 1);
@@ -736,7 +788,16 @@ mod test {
             0,
         )));
         assert_eq!(crds.insert(peer.clone(), now), Ok(()));
-        push.refresh_push_active_set(&crds, &HashMap::new(), None, &Pubkey::default(), 0, 1, 1);
+        push.refresh_push_active_set(
+            &crds,
+            &HashMap::new(),
+            None,
+            &Pubkey::default(),
+            0,
+            1,
+            1,
+            &SocketAddrSpace::Unspecified,
+        );
 
         let new_msg = CrdsValue::new_unsigned(CrdsData::ContactInfo(ContactInfo::new_localhost(
             &solana_sdk::pubkey::new_rand(),
@@ -771,7 +832,16 @@ mod test {
             push.process_push_message(&mut crds, &Pubkey::default(), peers[2].clone(), now),
             Ok(())
         );
-        push.refresh_push_active_set(&crds, &HashMap::new(), None, &Pubkey::default(), 0, 1, 1);
+        push.refresh_push_active_set(
+            &crds,
+            &HashMap::new(),
+            None,
+            &Pubkey::default(),
+            0,
+            1,
+            1,
+            &SocketAddrSpace::Unspecified,
+        );
 
         // push 3's contact info to 1 and 2 and 3
         let expected: HashMap<_, _> = vec![
@@ -793,7 +863,16 @@ mod test {
             0,
         )));
         assert_eq!(crds.insert(peer.clone(), 0), Ok(()));
-        push.refresh_push_active_set(&crds, &HashMap::new(), None, &Pubkey::default(), 0, 1, 1);
+        push.refresh_push_active_set(
+            &crds,
+            &HashMap::new(),
+            None,
+            &Pubkey::default(),
+            0,
+            1,
+            1,
+            &SocketAddrSpace::Unspecified,
+        );
 
         let new_msg = CrdsValue::new_unsigned(CrdsData::ContactInfo(ContactInfo::new_localhost(
             &solana_sdk::pubkey::new_rand(),
@@ -820,7 +899,16 @@ mod test {
             0,
         )));
         assert_eq!(crds.insert(peer, 0), Ok(()));
-        push.refresh_push_active_set(&crds, &HashMap::new(), None, &Pubkey::default(), 0, 1, 1);
+        push.refresh_push_active_set(
+            &crds,
+            &HashMap::new(),
+            None,
+            &Pubkey::default(),
+            0,
+            1,
+            1,
+            &SocketAddrSpace::Unspecified,
+        );
 
         let mut ci = ContactInfo::new_localhost(&solana_sdk::pubkey::new_rand(), 0);
         ci.wallclock = 1;
diff --git a/gossip/src/crds_value.rs b/gossip/src/crds_value.rs
index 02c1b623b6a456..1c951b9ff31408 100644
--- a/gossip/src/crds_value.rs
+++ b/gossip/src/crds_value.rs
@@ -71,7 +71,7 @@ impl Signable for CrdsValue {
 
     fn verify(&self) -> bool {
         self.get_signature()
-            .verify(&self.pubkey().as_ref(), self.signable_data().borrow())
+            .verify(self.pubkey().as_ref(), self.signable_data().borrow())
     }
 }
 
@@ -83,7 +83,7 @@ impl Signable for CrdsValue {
 pub enum CrdsData {
     ContactInfo(ContactInfo),
     Vote(VoteIndex, Vote),
-    LowestSlot(u8, LowestSlot),
+    LowestSlot(/*DEPRECATED:*/ u8, LowestSlot),
     SnapshotHashes(SnapshotHash),
     AccountsHashes(SnapshotHash),
     EpochSlots(EpochSlotsIndex, EpochSlots),
@@ -853,9 +853,9 @@ mod test {
         wrong_keypair: &Keypair,
     ) {
         assert!(!value.verify());
-        value.sign(&correct_keypair);
+        value.sign(correct_keypair);
         assert!(value.verify());
-        value.sign(&wrong_keypair);
+        value.sign(wrong_keypair);
         assert!(!value.verify());
         serialize_deserialize_value(value, correct_keypair);
     }
diff --git a/gossip/src/deprecated.rs b/gossip/src/deprecated.rs
index 57a7a8315cb237..120c69ffc1f53c 100644
--- a/gossip/src/deprecated.rs
+++ b/gossip/src/deprecated.rs
@@ -1,4 +1,11 @@
-use solana_sdk::clock::Slot;
+use {
+    crate::{
+        cluster_info::ClusterInfo, contact_info::ContactInfo, weighted_shuffle::weighted_shuffle,
+    },
+    itertools::Itertools,
+    solana_sdk::{clock::Slot, pubkey::Pubkey},
+    std::collections::HashMap,
+};
 
 #[derive(Serialize, Deserialize, Clone, Debug, PartialEq, AbiExample, AbiEnumVisitor)]
 enum CompressionType {
@@ -19,3 +26,74 @@ pub(crate) struct EpochIncompleteSlots {
     compression: CompressionType,
     compressed_list: Vec<u8>,
 }
+
+// Legacy methods copied for testing backward compatibility.
+
+pub fn sorted_retransmit_peers_and_stakes(
+    cluster_info: &ClusterInfo,
+    stakes: Option<&HashMap<Pubkey, u64>>,
+) -> (Vec<ContactInfo>, Vec<(u64, usize)>) {
+    let mut peers = cluster_info.tvu_peers();
+    // insert "self" into this list for the layer and neighborhood computation
+    peers.push(cluster_info.my_contact_info());
+    let stakes_and_index = sorted_stakes_with_index(&peers, stakes);
+    (peers, stakes_and_index)
+}
+
+pub fn sorted_stakes_with_index(
+    peers: &[ContactInfo],
+    stakes: Option<&HashMap<Pubkey, u64>>,
+) -> Vec<(u64, usize)> {
+    let stakes_and_index: Vec<_> = peers
+        .iter()
+        .enumerate()
+        .map(|(i, c)| {
+            // For stake weighted shuffle a valid weight is atleast 1. Weight 0 is
+            // assumed to be missing entry. So let's make sure stake weights are atleast 1
+            let stake = 1.max(
+                stakes
+                    .as_ref()
+                    .map_or(1, |stakes| *stakes.get(&c.id).unwrap_or(&1)),
+            );
+            (stake, i)
+        })
+        .sorted_by(|(l_stake, l_info), (r_stake, r_info)| {
+            if r_stake == l_stake {
+                peers[*r_info].id.cmp(&peers[*l_info].id)
+            } else {
+                r_stake.cmp(l_stake)
+            }
+        })
+        .collect();
+
+    stakes_and_index
+}
+
+pub fn shuffle_peers_and_index(
+    id: &Pubkey,
+    peers: &[ContactInfo],
+    stakes_and_index: &[(u64, usize)],
+    seed: [u8; 32],
+) -> (usize, Vec<(u64, usize)>) {
+    let shuffled_stakes_and_index = stake_weighted_shuffle(stakes_and_index, seed);
+    let self_index = shuffled_stakes_and_index
+        .iter()
+        .enumerate()
+        .find_map(|(i, (_stake, index))| {
+            if peers[*index].id == *id {
+                Some(i)
+            } else {
+                None
+            }
+        })
+        .unwrap();
+    (self_index, shuffled_stakes_and_index)
+}
+
+fn stake_weighted_shuffle(stakes_and_index: &[(u64, usize)], seed: [u8; 32]) -> Vec<(u64, usize)> {
+    let stake_weights: Vec<_> = stakes_and_index.iter().map(|(w, _)| *w).collect();
+
+    let shuffle = weighted_shuffle(&stake_weights, seed);
+
+    shuffle.iter().map(|x| stakes_and_index[*x]).collect()
+}
diff --git a/gossip/src/gossip_service.rs b/gossip/src/gossip_service.rs
index 4dbc6a50c72a7d..9924d0f8a49a16 100644
--- a/gossip/src/gossip_service.rs
+++ b/gossip/src/gossip_service.rs
@@ -13,6 +13,7 @@ use {
         pubkey::Pubkey,
         signature::{Keypair, Signer},
     },
+    solana_streamer::socket::SocketAddrSpace,
     solana_streamer::streamer,
     std::{
         collections::HashSet,
@@ -47,32 +48,55 @@ impl GossipService {
             &cluster_info.id(),
             gossip_socket.local_addr().unwrap()
         );
+        let socket_addr_space = *cluster_info.socket_addr_space();
         let t_receiver = streamer::receiver(
             gossip_socket.clone(),
-            &exit,
+            exit,
             request_sender,
             Recycler::default(),
             "gossip_receiver",
             1,
+            false,
+        );
+        let (consume_sender, listen_receiver) = channel();
+        // https://github.com/rust-lang/rust/issues/39364#issuecomment-634545136
+        let _consume_sender = consume_sender.clone();
+        let t_socket_consume = cluster_info.clone().start_socket_consume_thread(
+            request_receiver,
+            consume_sender,
+            exit.clone(),
         );
         let (response_sender, response_receiver) = channel();
-        let t_responder = streamer::responder("gossip", gossip_socket, response_receiver);
-        let t_listen = ClusterInfo::listen(
-            cluster_info.clone(),
+        let t_listen = cluster_info.clone().listen(
             bank_forks.clone(),
-            request_receiver,
+            listen_receiver,
             response_sender.clone(),
             should_check_duplicate_instance,
-            exit,
+            exit.clone(),
         );
-        let t_gossip = ClusterInfo::gossip(
-            cluster_info.clone(),
+        let t_gossip = cluster_info.clone().gossip(
             bank_forks,
             response_sender,
             gossip_validators,
-            exit,
+            exit.clone(),
         );
-        let thread_hdls = vec![t_receiver, t_responder, t_listen, t_gossip];
+        // To work around:
+        // https://github.com/rust-lang/rust/issues/54267
+        // responder thread should start after response_sender.clone(). see:
+        // https://github.com/rust-lang/rust/issues/39364#issuecomment-381446873
+        let t_responder = streamer::responder(
+            "gossip",
+            gossip_socket,
+            response_receiver,
+            socket_addr_space,
+        );
+        let thread_hdls = vec![
+            t_receiver,
+            t_responder,
+            t_socket_consume,
+            t_listen,
+            t_gossip,
+        ];
         Self { thread_hdls }
     }
 
@@ -88,6 +112,7 @@ impl GossipService {
 pub fn discover_cluster(
     entrypoint: &SocketAddr,
     num_nodes: usize,
+    socket_addr_space: SocketAddrSpace,
 ) -> std::io::Result<Vec<ContactInfo>> {
     const DISCOVER_CLUSTER_TIMEOUT: Duration = Duration::from_secs(120);
     let (_all_peers, validators) = discover(
@@ -99,6 +124,7 @@ pub fn discover_cluster(
         None, // find_node_by_gossip_addr
         None, // my_gossip_addr
         0,    // my_shred_version
+        socket_addr_space,
     )?;
     Ok(validators)
 }
@@ -112,6 +138,7 @@ pub fn discover(
     find_node_by_gossip_addr: Option<&SocketAddr>,
     my_gossip_addr: Option<&SocketAddr>,
     my_shred_version: u16,
+    socket_addr_space: SocketAddrSpace,
 ) -> std::io::Result<(
     Vec<ContactInfo>, // all gossip peers
     Vec<ContactInfo>, // tvu peers (validators)
@@ -126,6 +153,7 @@ pub fn discover(
         my_gossip_addr,
         my_shred_version,
         true, // should_check_duplicate_instance,
+        socket_addr_space,
     );
 
     let id = spy_ref.id();
@@ -134,9 +162,8 @@ pub fn discover(
     if let Some(my_gossip_addr) = my_gossip_addr {
         info!("Gossip Address: {:?}", my_gossip_addr);
     }
-
-    let _ip_echo_server = ip_echo.map(solana_net_utils::ip_echo_server);
-
+    let _ip_echo_server = ip_echo
+        .map(|tcp_listener| solana_net_utils::ip_echo_server(tcp_listener, Some(my_shred_version)));
     let (met_criteria, elapsed, all_peers, tvu_peers) = spy(
         spy_ref.clone(),
         num_nodes,
@@ -173,28 +200,31 @@ pub fn discover(
 }
 
 /// Creates a ThinClient per valid node
-pub fn get_clients(nodes: &[ContactInfo]) -> Vec<ThinClient> {
+pub fn get_clients(nodes: &[ContactInfo], socket_addr_space: &SocketAddrSpace) -> Vec<ThinClient> {
     nodes
         .iter()
-        .filter_map(ContactInfo::valid_client_facing_addr)
+        .filter_map(|node| ContactInfo::valid_client_facing_addr(node, socket_addr_space))
         .map(|addrs| create_client(addrs, VALIDATOR_PORT_RANGE))
         .collect()
 }
 
 /// Creates a ThinClient by selecting a valid node at random
-pub fn get_client(nodes: &[ContactInfo]) -> ThinClient {
+pub fn get_client(nodes: &[ContactInfo], socket_addr_space: &SocketAddrSpace) -> ThinClient {
     let nodes: Vec<_> = nodes
         .iter()
-        .filter_map(ContactInfo::valid_client_facing_addr)
+        .filter_map(|node| ContactInfo::valid_client_facing_addr(node, socket_addr_space))
         .collect();
     let select = thread_rng().gen_range(0, nodes.len());
     create_client(nodes[select], VALIDATOR_PORT_RANGE)
 }
 
-pub fn get_multi_client(nodes: &[ContactInfo]) -> (ThinClient, usize) {
+pub fn get_multi_client(
+    nodes: &[ContactInfo],
+    socket_addr_space: &SocketAddrSpace,
+) -> (ThinClient, usize) {
     let addrs: Vec<_> = nodes
         .iter()
-        .filter_map(ContactInfo::valid_client_facing_addr)
+        .filter_map(|node| ContactInfo::valid_client_facing_addr(node, socket_addr_space))
         .collect();
     let rpc_addrs: Vec<_> = addrs.iter().map(|addr| addr.0).collect();
     let tpu_addrs: Vec<_> = addrs.iter().map(|addr| addr.1).collect();
@@ -285,13 +315,14 @@ fn make_gossip_node(
     gossip_addr: Option<&SocketAddr>,
     shred_version: u16,
     should_check_duplicate_instance: bool,
+    socket_addr_space: SocketAddrSpace,
 ) -> (GossipService, Option<TcpListener>, Arc<ClusterInfo>) {
     let (node, gossip_socket, ip_echo) = if let Some(gossip_addr) = gossip_addr {
         ClusterInfo::gossip_node(&keypair.pubkey(), gossip_addr, shred_version)
     } else {
         ClusterInfo::spy_node(&keypair.pubkey(), shred_version)
     };
-    let cluster_info = ClusterInfo::new(node, keypair);
+    let cluster_info = ClusterInfo::new(node, keypair, socket_addr_space);
     if let Some(entrypoint) = entrypoint {
         cluster_info.set_entrypoint(ContactInfo::new_gossip_entry_point(entrypoint));
     }
@@ -302,7 +333,7 @@ fn make_gossip_node(
         gossip_socket,
         None,
         should_check_duplicate_instance,
-        &exit,
+        exit,
     );
     (gossip_service, ip_echo, cluster_info)
 }
@@ -321,7 +352,11 @@ mod tests {
     fn test_exit() {
         let exit = Arc::new(AtomicBool::new(false));
         let tn = Node::new_localhost();
-        let cluster_info = ClusterInfo::new_with_invalid_keypair(tn.info.clone());
+        let cluster_info = ClusterInfo::new(
+            tn.info.clone(),
+            Arc::new(Keypair::new()),
+            SocketAddrSpace::Unspecified,
+        );
         let c = Arc::new(cluster_info);
         let d = GossipService::new(
             &c,
@@ -344,7 +379,11 @@ mod tests {
         let contact_info = ContactInfo::new_localhost(&keypair.pubkey(), 0);
         let peer0_info = ContactInfo::new_localhost(&peer0, 0);
         let peer1_info = ContactInfo::new_localhost(&peer1, 0);
-        let cluster_info = ClusterInfo::new(contact_info, Arc::new(keypair));
+        let cluster_info = ClusterInfo::new(
+            contact_info,
+            Arc::new(keypair),
+            SocketAddrSpace::Unspecified,
+        );
         cluster_info.insert_info(peer0_info.clone());
         cluster_info.insert_info(peer1_info);
 
diff --git a/gossip/src/lib.rs b/gossip/src/lib.rs
index 7562674a0cd861..e5b2d7ccce8e4e 100644
--- a/gossip/src/lib.rs
+++ b/gossip/src/lib.rs
@@ -13,7 +13,7 @@ pub mod crds_gossip_push;
 pub mod crds_shards;
 pub mod crds_value;
 pub mod data_budget;
-mod deprecated;
+pub mod deprecated;
 pub mod duplicate_shred;
 pub mod epoch_slots;
 pub mod gossip_error;
diff --git a/gossip/src/main.rs b/gossip/src/main.rs
index 20f667ef24dbe2..3499e1eb6d996b 100644
--- a/gossip/src/main.rs
+++ b/gossip/src/main.rs
@@ -11,6 +11,7 @@ use {
     },
     solana_gossip::{contact_info::ContactInfo, gossip_service::discover},
     solana_sdk::pubkey::Pubkey,
+    solana_streamer::socket::SocketAddrSpace,
     std::{
         error,
         net::{IpAddr, Ipv4Addr, SocketAddr},
@@ -32,6 +33,13 @@ fn parse_matches() -> ArgMatches<'static> {
         .about(crate_description!())
         .version(solana_version::version!())
         .setting(AppSettings::SubcommandRequiredElseHelp)
+        .arg(
+            Arg::with_name("allow_private_addr")
+                .long("allow-private-addr")
+                .takes_value(false)
+                .help("Allow contacting private ip addresses")
+                .hidden(true),
+        )
         .subcommand(
             SubCommand::with_name("rpc-url")
                 .about("Get an RPC URL for the cluster")
@@ -224,8 +232,9 @@ fn process_spy(matches: &ArgMatches) -> std::io::Result<()> {
     let pubkey = matches
         .value_of("node_pubkey")
         .map(|pubkey_str| pubkey_str.parse::<Pubkey>().unwrap());
+    let socket_addr_space = SocketAddrSpace::new(matches.is_present("allow_private_addr"));
     let shred_version = value_t_or_exit!(matches, "shred_version", u16);
-    let identity_keypair = keypair_of(&matches, "identity").map(Arc::new);
+    let identity_keypair = keypair_of(matches, "identity").map(Arc::new);
 
     let entrypoint_addr = parse_entrypoint(matches);
 
@@ -251,6 +260,7 @@ fn process_spy(matches: &ArgMatches) -> std::io::Result<()> {
         None,               // find_node_by_gossip_addr
         Some(&gossip_addr), // my_gossip_addr
         shred_version,
+        socket_addr_space,
     )?;
 
     process_spy_results(timeout, validators, num_nodes, num_nodes_exactly, pubkey);
@@ -270,9 +280,10 @@ fn parse_entrypoint(matches: &ArgMatches) -> Option<SocketAddr> {
 fn process_rpc_url(matches: &ArgMatches) -> std::io::Result<()> {
     let any = matches.is_present("any");
     let all = matches.is_present("all");
-    let entrypoint_addr = parse_entrypoint(&matches);
+    let entrypoint_addr = parse_entrypoint(matches);
     let timeout = value_t_or_exit!(matches, "timeout", u64);
     let shred_version = value_t_or_exit!(matches, "shred_version", u16);
+    let socket_addr_space = SocketAddrSpace::new(matches.is_present("allow_private_addr"));
     let (_all_peers, validators) = discover(
         None, // keypair
         entrypoint_addr.as_ref(),
@@ -282,13 +293,14 @@ fn process_rpc_url(matches: &ArgMatches) -> std::io::Result<()> {
         entrypoint_addr.as_ref(), // find_node_by_gossip_addr
         None,                     // my_gossip_addr
         shred_version,
+        socket_addr_space,
     )?;
 
     let rpc_addrs: Vec<_> = validators
         .iter()
         .filter_map(|contact_info| {
             if (any || all || Some(contact_info.gossip) == entrypoint_addr)
-                && ContactInfo::is_valid_address(&contact_info.rpc)
+                && ContactInfo::is_valid_address(&contact_info.rpc, &socket_addr_space)
             {
                 return Some(contact_info.rpc);
             }
diff --git a/gossip/src/weighted_shuffle.rs b/gossip/src/weighted_shuffle.rs
index 62e2d18eb692ff..63ba440f30168f 100644
--- a/gossip/src/weighted_shuffle.rs
+++ b/gossip/src/weighted_shuffle.rs
@@ -2,12 +2,138 @@
 
 use {
     itertools::Itertools,
-    num_traits::{FromPrimitive, ToPrimitive},
-    rand::{Rng, SeedableRng},
+    num_traits::{CheckedAdd, FromPrimitive, ToPrimitive},
+    rand::{
+        distributions::uniform::{SampleUniform, UniformSampler},
+        Rng, SeedableRng,
+    },
     rand_chacha::ChaChaRng,
-    std::{iter, ops::Div},
+    std::{
+        iter,
+        ops::{AddAssign, Div, Sub, SubAssign},
+    },
 };
 
+#[derive(Debug)]
+pub enum WeightedShuffleError<T> {
+    NegativeWeight(T),
+    SumOverflow,
+}
+
+/// Implements an iterator where indices are shuffled according to their
+/// weights:
+///   - Returned indices are unique in the range [0, weights.len()).
+///   - Higher weighted indices tend to appear earlier proportional to their
+///     weight.
+///   - Zero weighted indices are excluded. Therefore the iterator may have
+///     count less than weights.len().
+pub struct WeightedShuffle<'a, R, T> {
+    arr: Vec<T>,    // Underlying array implementing binary indexed tree.
+    sum: T,         // Current sum of weights, excluding already selected indices.
+    rng: &'a mut R, // Random number generator.
+}
+
+// The implementation uses binary indexed tree:
+// https://en.wikipedia.org/wiki/Fenwick_tree
+// to maintain cumulative sum of weights excluding already selected indices
+// over self.arr.
+impl<'a, R: Rng, T> WeightedShuffle<'a, R, T>
+where
+    T: Copy + Default + PartialOrd + AddAssign + CheckedAdd,
+{
+    /// Returns error if:
+    ///   - any of the weights are negative.
+    ///   - sum of weights overflows.
+    pub fn new(rng: &'a mut R, weights: &[T]) -> Result<Self, WeightedShuffleError<T>> {
+        let size = weights.len() + 1;
+        let zero = <T as Default>::default();
+        let mut arr = vec![zero; size];
+        let mut sum = zero;
+        for (mut k, &weight) in (1usize..).zip(weights) {
+            #[allow(clippy::neg_cmp_op_on_partial_ord)]
+            // weight < zero does not work for NaNs.
+            if !(weight >= zero) {
+                return Err(WeightedShuffleError::NegativeWeight(weight));
+            }
+            sum = sum
+                .checked_add(&weight)
+                .ok_or(WeightedShuffleError::SumOverflow)?;
+            while k < size {
+                arr[k] += weight;
+                k += k & k.wrapping_neg();
+            }
+        }
+        Ok(Self { arr, sum, rng })
+    }
+}
+
+impl<'a, R, T> WeightedShuffle<'a, R, T>
+where
+    T: Copy + Default + PartialOrd + AddAssign + SubAssign + Sub<Output = T>,
+{
+    // Returns cumulative sum of current weights upto index k (inclusive).
+    fn cumsum(&self, mut k: usize) -> T {
+        let mut out = <T as Default>::default();
+        while k != 0 {
+            out += self.arr[k];
+            k ^= k & k.wrapping_neg();
+        }
+        out
+    }
+
+    // Removes given weight at index k.
+    fn remove(&mut self, mut k: usize, weight: T) {
+        self.sum -= weight;
+        let size = self.arr.len();
+        while k < size {
+            self.arr[k] -= weight;
+            k += k & k.wrapping_neg();
+        }
+    }
+
+    // Returns smallest index such that self.cumsum(k) > val,
+    // along with its respective weight.
+    fn search(&self, val: T) -> (/*index:*/ usize, /*weight:*/ T) {
+        let zero = <T as Default>::default();
+        debug_assert!(val >= zero);
+        debug_assert!(val < self.sum);
+        let mut lo = (/*index:*/ 0, /*cumsum:*/ zero);
+        let mut hi = (self.arr.len() - 1, self.sum);
+        while lo.0 + 1 < hi.0 {
+            let k = lo.0 + (hi.0 - lo.0) / 2;
+            let sum = self.cumsum(k);
+            if sum <= val {
+                lo = (k, sum);
+            } else {
+                hi = (k, sum);
+            }
+        }
+        debug_assert!(lo.1 <= val);
+        debug_assert!(hi.1 > val);
+        (hi.0, hi.1 - lo.1)
+    }
+}
+
+impl<'a, R: Rng, T> Iterator for WeightedShuffle<'a, R, T>
+where
+    T: Copy + Default + PartialOrd + AddAssign + SampleUniform + SubAssign + Sub<Output = T>,
+{
+    type Item = usize;
+
+    fn next(&mut self) -> Option<Self::Item> {
+        let zero = <T as Default>::default();
+        #[allow(clippy::neg_cmp_op_on_partial_ord)]
+        // self.sum <= zero does not work for NaNs.
+        if !(self.sum > zero) {
+            return None;
+        }
+        let sample = <T as SampleUniform>::Sampler::sample_single(zero, self.sum, &mut self.rng);
+        let (index, weight) = WeightedShuffle::search(self, sample);
+        self.remove(index, weight);
+        Some(index - 1)
+    }
+}
+
 /// Returns a list of indexes shuffled based on the input weights
 /// Note - The sum of all weights must not exceed `u64::MAX`
 pub fn weighted_shuffle<T>(weights: &[T], seed: [u8; 32]) -> Vec<usize>
@@ -67,6 +193,31 @@ pub fn weighted_best(weights_and_indexes: &[(u64, usize)], seed: [u8; 32]) -> us
 #[cfg(test)]
 mod tests {
     use super::*;
+    use std::{convert::TryInto, iter::repeat_with};
+
+    fn weighted_shuffle_slow<R>(rng: &mut R, mut weights: Vec<u64>) -> Vec<usize>
+    where
+        R: Rng,
+    {
+        let mut shuffle = Vec::with_capacity(weights.len());
+        loop {
+            let high: u64 = weights.iter().sum();
+            if high == 0 {
+                break shuffle;
+            }
+            let sample = rng.gen_range(0, high);
+            let index = weights
+                .iter()
+                .scan(0, |acc, &w| {
+                    *acc += w;
+                    Some(*acc)
+                })
+                .position(|acc| sample < acc)
+                .unwrap();
+            shuffle.push(index);
+            weights[index] = 0;
+        }
+    }
 
     #[test]
     fn test_weighted_shuffle_iterator() {
@@ -133,4 +284,56 @@ mod tests {
         let best_index = weighted_best(&weights_and_indexes, [0x5b; 32]);
         assert_eq!(best_index, 2);
     }
+
+    // Asserts that each index is selected proportional to its weight.
+    #[test]
+    fn test_weighted_shuffle_sanity() {
+        let seed: Vec<_> = (1..).step_by(3).take(32).collect();
+        let seed: [u8; 32] = seed.try_into().unwrap();
+        let mut rng = ChaChaRng::from_seed(seed);
+        let weights = [1, 1000, 10, 100];
+        let mut counts = [0; 4];
+        for _ in 0..100000 {
+            let mut shuffle = WeightedShuffle::new(&mut rng, &weights).unwrap();
+            counts[shuffle.next().unwrap()] += 1;
+            let _ = shuffle.count(); // consume the rest.
+        }
+        assert_eq!(counts, [101, 90113, 891, 8895]);
+    }
+
+    #[test]
+    fn test_weighted_shuffle_hard_coded() {
+        let weights = [
+            78, 70, 38, 27, 21, 0, 82, 42, 21, 77, 77, 17, 4, 50, 96, 83, 33, 16, 72,
+        ];
+        let seed = [48u8; 32];
+        let mut rng = ChaChaRng::from_seed(seed);
+        let shuffle: Vec<_> = WeightedShuffle::new(&mut rng, &weights).unwrap().collect();
+        assert_eq!(
+            shuffle,
+            [2, 11, 16, 0, 13, 14, 15, 10, 1, 9, 7, 6, 12, 18, 4, 17, 3, 8]
+        );
+        let seed = [37u8; 32];
+        let mut rng = ChaChaRng::from_seed(seed);
+        let shuffle: Vec<_> = WeightedShuffle::new(&mut rng, &weights).unwrap().collect();
+        assert_eq!(
+            shuffle,
+            [17, 3, 14, 13, 6, 10, 15, 16, 9, 2, 4, 1, 0, 7, 8, 18, 11, 12]
+        );
+    }
+
+    #[test]
+    fn test_weighted_shuffle_match_slow() {
+        let mut rng = rand::thread_rng();
+        let weights: Vec<u64> = repeat_with(|| rng.gen_range(0, 1000)).take(997).collect();
+        for _ in 0..10 {
+            let mut seed = [0u8; 32];
+            rng.fill(&mut seed[..]);
+            let mut rng = ChaChaRng::from_seed(seed);
+            let shuffle: Vec<_> = WeightedShuffle::new(&mut rng, &weights).unwrap().collect();
+            let mut rng = ChaChaRng::from_seed(seed);
+            let shuffle_slow = weighted_shuffle_slow(&mut rng, weights.clone());
+            assert_eq!(shuffle, shuffle_slow,);
+        }
+    }
 }
diff --git a/gossip/tests/cluster_info.rs b/gossip/tests/cluster_info.rs
index 921a842c321791..231c2399cd86e5 100644
--- a/gossip/tests/cluster_info.rs
+++ b/gossip/tests/cluster_info.rs
@@ -5,8 +5,10 @@ use {
     solana_gossip::{
         cluster_info::{compute_retransmit_peers, ClusterInfo},
         contact_info::ContactInfo,
+        deprecated::{shuffle_peers_and_index, sorted_retransmit_peers_and_stakes},
     },
-    solana_sdk::pubkey::Pubkey,
+    solana_sdk::{pubkey::Pubkey, signer::keypair::Keypair},
+    solana_streamer::socket::SocketAddrSpace,
     std::{
         collections::{HashMap, HashSet},
         sync::{
@@ -78,7 +80,11 @@ fn run_simulation(stakes: &[u64], fanout: usize) {
 
     // describe the leader
     let leader_info = ContactInfo::new_localhost(&solana_sdk::pubkey::new_rand(), 0);
-    let cluster_info = ClusterInfo::new_with_invalid_keypair(leader_info.clone());
+    let cluster_info = ClusterInfo::new(
+        leader_info.clone(),
+        Arc::new(Keypair::new()),
+        SocketAddrSpace::Unspecified,
+    );
 
     // setup staked nodes
     let mut staked_nodes = HashMap::new();
@@ -118,14 +124,13 @@ fn run_simulation(stakes: &[u64], fanout: usize) {
         .map(|i| {
             let mut seed = [0; 32];
             seed[0..4].copy_from_slice(&i.to_le_bytes());
+            // TODO: Ideally these should use the new methods in
+            // solana_core::cluster_nodes, however that would add build
+            // dependency on solana_core which is not desired.
             let (peers, stakes_and_index) =
-                cluster_info.sorted_retransmit_peers_and_stakes(Some(&staked_nodes));
-            let (_, shuffled_stakes_and_indexes) = ClusterInfo::shuffle_peers_and_index(
-                &cluster_info.id(),
-                &peers,
-                &stakes_and_index,
-                seed,
-            );
+                sorted_retransmit_peers_and_stakes(&cluster_info, Some(&staked_nodes));
+            let (_, shuffled_stakes_and_indexes) =
+                shuffle_peers_and_index(&cluster_info.id(), &peers, &stakes_and_index, seed);
             shuffled_stakes_and_indexes
                 .into_iter()
                 .map(|(_, i)| peers[i].clone())
diff --git a/gossip/tests/crds_gossip.rs b/gossip/tests/crds_gossip.rs
index da4c30191ba7ed..564b6a7e28ac6d 100644
--- a/gossip/tests/crds_gossip.rs
+++ b/gossip/tests/crds_gossip.rs
@@ -21,6 +21,7 @@ use {
         signature::{Keypair, Signer},
         timing::timestamp,
     },
+    solana_streamer::socket::SocketAddrSpace,
     std::{
         collections::{HashMap, HashSet},
         ops::Deref,
@@ -116,11 +117,9 @@ fn star_network_create(num: usize) -> Network {
             let node_keypair = Arc::new(Keypair::new());
             let contact_info = ContactInfo::new_localhost(&node_keypair.pubkey(), 0);
             let new = CrdsValue::new_unsigned(CrdsData::ContactInfo(contact_info.clone()));
-            let id = new.label().pubkey();
             let mut node = CrdsGossip::default();
             node.crds.insert(new.clone(), timestamp()).unwrap();
             node.crds.insert(entry.clone(), timestamp()).unwrap();
-            node.set_self(&id);
             let node = Node::new(node_keypair, contact_info, Arc::new(Mutex::new(node)));
             (new.label().pubkey(), node)
         })
@@ -128,7 +127,6 @@ fn star_network_create(num: usize) -> Network {
     let mut node = CrdsGossip::default();
     let id = entry.label().pubkey();
     node.crds.insert(entry, timestamp()).unwrap();
-    node.set_self(&id);
     let node = Node::new(node_keypair, contact_info, Arc::new(Mutex::new(node)));
     network.insert(id, node);
     Network::new(network)
@@ -141,18 +139,14 @@ fn rstar_network_create(num: usize) -> Network {
     let mut origin = CrdsGossip::default();
     let id = entry.label().pubkey();
     origin.crds.insert(entry, timestamp()).unwrap();
-    origin.set_self(&id);
     let mut network: HashMap<_, _> = (1..num)
         .map(|_| {
             let node_keypair = Arc::new(Keypair::new());
             let contact_info = ContactInfo::new_localhost(&node_keypair.pubkey(), 0);
             let new = CrdsValue::new_unsigned(CrdsData::ContactInfo(contact_info.clone()));
-            let id = new.label().pubkey();
             let mut node = CrdsGossip::default();
             node.crds.insert(new.clone(), timestamp()).unwrap();
             origin.crds.insert(new.clone(), timestamp()).unwrap();
-            node.set_self(&id);
-
             let node = Node::new(node_keypair, contact_info, Arc::new(Mutex::new(node)));
             (new.label().pubkey(), node)
         })
@@ -168,10 +162,8 @@ fn ring_network_create(num: usize) -> Network {
             let node_keypair = Arc::new(Keypair::new());
             let contact_info = ContactInfo::new_localhost(&node_keypair.pubkey(), 0);
             let new = CrdsValue::new_unsigned(CrdsData::ContactInfo(contact_info.clone()));
-            let id = new.label().pubkey();
             let mut node = CrdsGossip::default();
             node.crds.insert(new.clone(), timestamp()).unwrap();
-            node.set_self(&id);
             let node = Node::new(node_keypair, contact_info, Arc::new(Mutex::new(node)));
             (new.label().pubkey(), node)
         })
@@ -180,7 +172,7 @@ fn ring_network_create(num: usize) -> Network {
     for k in 0..keys.len() {
         let start_info = {
             let start = &network[&keys[k]];
-            let start_id = start.lock().unwrap().id;
+            let start_id = keys[k];
             let label = CrdsValueLabel::ContactInfo(start_id);
             let gossip = start.gossip.lock().unwrap();
             gossip.crds.get(&label).unwrap().value.clone()
@@ -202,10 +194,8 @@ fn connected_staked_network_create(stakes: &[u64]) -> Network {
             let node_keypair = Arc::new(Keypair::new());
             let contact_info = ContactInfo::new_localhost(&node_keypair.pubkey(), 0);
             let new = CrdsValue::new_unsigned(CrdsData::ContactInfo(contact_info.clone()));
-            let id = new.label().pubkey();
             let mut node = CrdsGossip::default();
             node.crds.insert(new.clone(), timestamp()).unwrap();
-            node.set_self(&id);
             let node = Node::staked(
                 node_keypair,
                 contact_info,
@@ -221,15 +211,14 @@ fn connected_staked_network_create(stakes: &[u64]) -> Network {
         .iter()
         .map(|k| {
             let start = &network[k].lock().unwrap();
-            let start_id = start.id;
-            let start_label = CrdsValueLabel::ContactInfo(start_id);
+            let start_label = CrdsValueLabel::ContactInfo(*k);
             start.crds.get(&start_label).unwrap().value.clone()
         })
         .collect();
-    for end in network.values_mut() {
+    for (end_pubkey, end) in network.iter_mut() {
         for k in 0..keys.len() {
             let mut end = end.lock().unwrap();
-            if keys[k] != end.id {
+            if keys[k] != *end_pubkey {
                 let start_info = start_entries[k].clone();
                 end.crds.insert(start_info, timestamp()).unwrap();
             }
@@ -240,7 +229,7 @@ fn connected_staked_network_create(stakes: &[u64]) -> Network {
 
 fn network_simulator_pull_only(thread_pool: &ThreadPool, network: &mut Network) {
     let num = network.len();
-    let (converged, bytes_tx) = network_run_pull(&thread_pool, network, 0, num * 2, 0.9);
+    let (converged, bytes_tx) = network_run_pull(thread_pool, network, 0, num * 2, 0.9);
     trace!(
         "network_simulator_pull_{}: converged: {} total_bytes: {}",
         num,
@@ -253,14 +242,19 @@ fn network_simulator_pull_only(thread_pool: &ThreadPool, network: &mut Network)
 fn network_simulator(thread_pool: &ThreadPool, network: &mut Network, max_convergance: f64) {
     let num = network.len();
     // run for a small amount of time
-    let (converged, bytes_tx) = network_run_pull(&thread_pool, network, 0, 10, 1.0);
+    let (converged, bytes_tx) = network_run_pull(thread_pool, network, 0, 10, 1.0);
     trace!("network_simulator_push_{}: converged: {}", num, converged);
     // make sure there is someone in the active set
     let network_values: Vec<Node> = network.values().cloned().collect();
     network_values.par_iter().for_each(|node| {
-        node.lock()
-            .unwrap()
-            .refresh_push_active_set(&HashMap::new(), None);
+        let node_pubkey = node.keypair.pubkey();
+        node.lock().unwrap().refresh_push_active_set(
+            &node_pubkey,
+            0,               // shred version
+            &HashMap::new(), // stakes
+            None,            // gossip validators
+            &SocketAddrSpace::Unspecified,
+        );
     });
     let mut total_bytes = bytes_tx;
     let mut ts = timestamp();
@@ -271,8 +265,9 @@ fn network_simulator(thread_pool: &ThreadPool, network: &mut Network, max_conver
         ts += 1000;
         // push a message to the network
         network_values.par_iter().for_each(|locked_node| {
+            let node_pubkey = locked_node.keypair.pubkey();
             let node = &mut locked_node.lock().unwrap();
-            let label = CrdsValueLabel::ContactInfo(node.id);
+            let label = CrdsValueLabel::ContactInfo(node_pubkey);
             let entry = node.crds.get(&label).unwrap();
             let mut m = entry.value.contact_info().cloned().unwrap();
             m.wallclock = now;
@@ -292,7 +287,7 @@ fn network_simulator(thread_pool: &ThreadPool, network: &mut Network, max_conver
             bytes_tx
         );
         // pull for a bit
-        let (converged, bytes_tx) = network_run_pull(&thread_pool, network, start, end, 1.0);
+        let (converged, bytes_tx) = network_run_pull(thread_pool, network, start, end, 1.0);
         total_bytes += bytes_tx;
         trace!(
             "network_simulator_push_{}: converged: {} bytes: {} total_bytes: {}",
@@ -327,13 +322,15 @@ fn network_run_push(
         let requests: Vec<_> = network_values
             .par_iter()
             .map(|node| {
+                let node_pubkey = node.keypair.pubkey();
                 let mut node_lock = node.lock().unwrap();
                 let timeouts = node_lock.make_timeouts(
+                    node_pubkey,
                     &HashMap::default(), // stakes
                     Duration::from_millis(node_lock.pull.crds_timeout),
                 );
-                node_lock.purge(thread_pool, now, &timeouts);
-                (node_lock.id, node_lock.new_push_messages(vec![], now))
+                node_lock.purge(&node_pubkey, thread_pool, now, &timeouts);
+                (node_pubkey, node_lock.new_push_messages(vec![], now))
             })
             .collect();
         let transfered: Vec<_> = requests
@@ -356,7 +353,14 @@ fn network_run_push(
                         .collect();
                     let prunes_map = network
                         .get(&to)
-                        .map(|node| node.lock().unwrap().prune_received_cache(origins, &stakes))
+                        .map(|node| {
+                            let node_pubkey = node.keypair.pubkey();
+                            node.lock().unwrap().prune_received_cache(
+                                &node_pubkey,
+                                origins,
+                                &stakes,
+                            )
+                        })
                         .unwrap();
 
                     for (from, prune_set) in prunes_map {
@@ -371,11 +375,19 @@ fn network_run_push(
                         network
                             .get(&from)
                             .map(|node| {
+                                let node_pubkey = node.keypair.pubkey();
                                 let node = node.lock().unwrap();
-                                let destination = node.id;
+                                let destination = node_pubkey;
                                 let now = timestamp();
-                                node.process_prune_msg(&to, &destination, &prune_keys, now, now)
-                                    .unwrap()
+                                node.process_prune_msg(
+                                    &node_pubkey,
+                                    &to,
+                                    &destination,
+                                    &prune_keys,
+                                    now,
+                                    now,
+                                )
+                                .unwrap()
                             })
                             .unwrap();
                     }
@@ -399,9 +411,14 @@ fn network_run_push(
         }
         if now % CRDS_GOSSIP_PUSH_MSG_TIMEOUT_MS == 0 && now > 0 {
             network_values.par_iter().for_each(|node| {
-                node.lock()
-                    .unwrap()
-                    .refresh_push_active_set(&HashMap::new(), None);
+                let node_pubkey = node.keypair.pubkey();
+                node.lock().unwrap().refresh_push_active_set(
+                    &node_pubkey,
+                    0,               // shred version
+                    &HashMap::new(), // stakes
+                    None,            // gossip validators
+                    &SocketAddrSpace::Unspecified,
+                );
             });
         }
         total = network_values
@@ -466,25 +483,28 @@ fn network_run_pull(
                         .lock()
                         .unwrap()
                         .new_pull_request(
-                            &thread_pool,
+                            thread_pool,
                             from.keypair.deref(),
+                            0, // shred version.
                             now,
                             None,
                             &HashMap::new(),
                             cluster_info::MAX_BLOOM_SIZE,
                             from.ping_cache.deref(),
                             &mut pings,
+                            &SocketAddrSpace::Unspecified,
                         )
                         .ok()?;
+                    let from_pubkey = from.keypair.pubkey();
                     let gossip = from.gossip.lock().unwrap();
-                    let label = CrdsValueLabel::ContactInfo(gossip.id);
+                    let label = CrdsValueLabel::ContactInfo(from_pubkey);
                     let self_info = gossip.crds.get(&label).unwrap().value.clone();
                     Some((peer.id, filters, self_info))
                 })
                 .collect()
         };
         let transfered: Vec<_> = requests
-            .into_par_iter()
+            .into_iter()
             .map(|(to, filters, caller_info)| {
                 let mut bytes: usize = 0;
                 let mut msgs: usize = 0;
@@ -507,8 +527,9 @@ fn network_run_pull(
                             .lock()
                             .unwrap()
                             .generate_pull_responses(
+                                thread_pool,
                                 &filters,
-                                /*output_size_limit=*/ usize::MAX,
+                                usize::MAX, // output_size_limit
                                 now,
                             )
                             .into_iter()
@@ -676,11 +697,8 @@ fn test_star_network_large_push() {
 }
 #[test]
 fn test_prune_errors() {
-    let mut crds_gossip = CrdsGossip {
-        id: Pubkey::new(&[0; 32]),
-        ..CrdsGossip::default()
-    };
-    let id = crds_gossip.id;
+    let mut crds_gossip = CrdsGossip::default();
+    let id = Pubkey::new(&[0; 32]);
     let ci = ContactInfo::new_localhost(&Pubkey::new(&[1; 32]), 0);
     let prune_pubkey = Pubkey::new(&[2; 32]);
     crds_gossip
@@ -690,22 +708,43 @@ fn test_prune_errors() {
             0,
         )
         .unwrap();
-    crds_gossip.refresh_push_active_set(&HashMap::new(), None);
+    crds_gossip.refresh_push_active_set(
+        &id,
+        0,               // shred version
+        &HashMap::new(), // stakes
+        None,            // gossip validators
+        &SocketAddrSpace::Unspecified,
+    );
     let now = timestamp();
     //incorrect dest
     let mut res = crds_gossip.process_prune_msg(
-        &ci.id,
-        &Pubkey::new(hash(&[1; 32]).as_ref()),
-        &[prune_pubkey],
+        &id,                                   // self_pubkey
+        &ci.id,                                // peer
+        &Pubkey::new(hash(&[1; 32]).as_ref()), // destination
+        &[prune_pubkey],                       // origins
         now,
         now,
     );
     assert_eq!(res.err(), Some(CrdsGossipError::BadPruneDestination));
     //correct dest
-    res = crds_gossip.process_prune_msg(&ci.id, &id, &[prune_pubkey], now, now);
+    res = crds_gossip.process_prune_msg(
+        &id,             // self_pubkey
+        &ci.id,          // peer
+        &id,             // destination
+        &[prune_pubkey], // origins
+        now,
+        now,
+    );
     res.unwrap();
     //test timeout
     let timeout = now + crds_gossip.push.prune_timeout * 2;
-    res = crds_gossip.process_prune_msg(&ci.id, &id, &[prune_pubkey], now, timeout);
+    res = crds_gossip.process_prune_msg(
+        &id,             // self_pubkey
+        &ci.id,          // peer
+        &id,             // destination
+        &[prune_pubkey], // origins
+        now,
+        timeout,
+    );
     assert_eq!(res.err(), Some(CrdsGossipError::PruneMessageTimeout));
 }
diff --git a/gossip/tests/gossip.rs b/gossip/tests/gossip.rs
index 970a9c58b968c4..b565a1e04cca4b 100644
--- a/gossip/tests/gossip.rs
+++ b/gossip/tests/gossip.rs
@@ -18,6 +18,7 @@ use {
         timing::timestamp,
         transaction::Transaction,
     },
+    solana_streamer::socket::SocketAddrSpace,
     solana_vote_program::{vote_instruction, vote_state::Vote},
     std::{
         net::UdpSocket,
@@ -33,7 +34,11 @@ use {
 fn test_node(exit: &Arc<AtomicBool>) -> (Arc<ClusterInfo>, GossipService, UdpSocket) {
     let keypair = Arc::new(Keypair::new());
     let mut test_node = Node::new_localhost_with_pubkey(&keypair.pubkey());
-    let cluster_info = Arc::new(ClusterInfo::new(test_node.info.clone(), keypair));
+    let cluster_info = Arc::new(ClusterInfo::new(
+        test_node.info.clone(),
+        keypair,
+        SocketAddrSpace::Unspecified,
+    ));
     let gossip_service = GossipService::new(
         &cluster_info,
         None,
@@ -56,7 +61,11 @@ fn test_node_with_bank(
     bank_forks: Arc<RwLock<BankForks>>,
 ) -> (Arc<ClusterInfo>, GossipService, UdpSocket) {
     let mut test_node = Node::new_localhost_with_pubkey(&node_keypair.pubkey());
-    let cluster_info = Arc::new(ClusterInfo::new(test_node.info.clone(), node_keypair));
+    let cluster_info = Arc::new(ClusterInfo::new(
+        test_node.info.clone(),
+        node_keypair,
+        SocketAddrSpace::Unspecified,
+    ));
     let gossip_service = GossipService::new(
         &cluster_info,
         Some(bank_forks),
@@ -209,7 +218,13 @@ pub fn cluster_info_retransmit() {
     p.meta.size = 10;
     let peers = c1.tvu_peers();
     let retransmit_peers: Vec<_> = peers.iter().collect();
-    ClusterInfo::retransmit_to(&retransmit_peers, &p, &tn1, false).unwrap();
+    ClusterInfo::retransmit_to(
+        &retransmit_peers,
+        &p,
+        &tn1,
+        false,
+        &SocketAddrSpace::Unspecified,
+    );
     let res: Vec<_> = [tn1, tn2, tn3]
         .into_par_iter()
         .map(|s| {
diff --git a/install/Cargo.toml b/install/Cargo.toml
index 101b854f35dfa8..9976677eab52df 100644
--- a/install/Cargo.toml
+++ b/install/Cargo.toml
@@ -3,7 +3,7 @@ authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 edition = "2018"
 name = "solana-install"
 description = "The solana cluster software installer"
-version = "1.7.0"
+version = "1.7.11"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
@@ -15,7 +15,7 @@ bincode = "1.3.1"
 bzip2 = "0.3.3"
 chrono = { version = "0.4.11", features = ["serde"] }
 clap = { version = "2.33.1" }
-console = "0.11.3"
+console = "0.14.1"
 ctrlc = { version = "3.1.5", features = ["termination"] }
 dirs-next = "2.0.0"
 indicatif = "0.15.0"
@@ -25,14 +25,14 @@ reqwest = { version = "0.11.2", default-features = false, features = ["blocking"
 serde = { version = "1.0.122", features = ["derive"] }
 serde_json = "1.0.62"
 serde_yaml = "0.8.13"
-solana-clap-utils = { path = "../clap-utils", version = "=1.7.0" }
-solana-client = { path = "../client", version = "=1.7.0" }
-solana-config-program = { path = "../programs/config", version = "=1.7.0" }
-solana-logger = { path = "../logger", version = "=1.7.0" }
-solana-sdk = { path = "../sdk", version = "=1.7.0" }
-solana-version = { path = "../version", version = "=1.7.0" }
+solana-clap-utils = { path = "../clap-utils", version = "=1.7.11" }
+solana-client = { path = "../client", version = "=1.7.11" }
+solana-config-program = { path = "../programs/config", version = "=1.7.11" }
+solana-logger = { path = "../logger", version = "=1.7.11" }
+solana-sdk = { path = "../sdk", version = "=1.7.11" }
+solana-version = { path = "../version", version = "=1.7.11" }
 semver = "0.9.0"
-tar = "0.4.28"
+tar = "0.4.37"
 tempfile = "3.1.0"
 url = "2.1.1"
 
diff --git a/install/src/command.rs b/install/src/command.rs
index efe7d7bc0e4843..b8e92843519daa 100644
--- a/install/src/command.rs
+++ b/install/src/command.rs
@@ -548,7 +548,7 @@ pub fn init(
     init_or_update(config_file, true, false)?;
 
     let path_modified = if !no_modify_path {
-        add_to_path(&config.active_release_bin_dir().to_str().unwrap())
+        add_to_path(config.active_release_bin_dir().to_str().unwrap())
     } else {
         false
     };
@@ -613,10 +613,10 @@ pub fn info(config_file: &str, local_info_only: bool, eval: bool) -> Result<(),
         return Ok(());
     }
 
-    println_name_value("Configuration:", &config_file);
+    println_name_value("Configuration:", config_file);
     println_name_value(
         "Active release directory:",
-        &config.active_release_dir().to_str().unwrap_or("?"),
+        config.active_release_dir().to_str().unwrap_or("?"),
     );
 
     fn print_release_version(config: &Config) {
@@ -633,14 +633,14 @@ pub fn info(config_file: &str, local_info_only: bool, eval: bool) -> Result<(),
     if let Some(explicit_release) = &config.explicit_release {
         match explicit_release {
             ExplicitRelease::Semver(release_semver) => {
-                println_name_value(&format!("{}Release version:", BULLET), &release_semver);
+                println_name_value(&format!("{}Release version:", BULLET), release_semver);
                 println_name_value(
                     &format!("{}Release URL:", BULLET),
                     &github_release_download_url(release_semver),
                 );
             }
             ExplicitRelease::Channel(release_channel) => {
-                println_name_value(&format!("{}Release channel:", BULLET), &release_channel);
+                println_name_value(&format!("{}Release channel:", BULLET), release_channel);
                 println_name_value(
                     &format!("{}Release URL:", BULLET),
                     &release_channel_download_url(release_channel),
@@ -659,7 +659,7 @@ pub fn info(config_file: &str, local_info_only: bool, eval: bool) -> Result<(),
             Some(ref update_manifest) => {
                 println_name_value("Installed version:", "");
                 print_release_version(&config);
-                print_update_manifest(&update_manifest);
+                print_update_manifest(update_manifest);
             }
             None => {
                 println_name_value("Installed version:", "None");
diff --git a/install/src/lib.rs b/install/src/lib.rs
index 188cdfcd061b5f..f79bdfcf1954dc 100644
--- a/install/src/lib.rs
+++ b/install/src/lib.rs
@@ -18,7 +18,7 @@ mod stop_process;
 mod update_manifest;
 
 pub fn is_semver(semver: &str) -> Result<(), String> {
-    match semver::Version::parse(&semver) {
+    match semver::Version::parse(semver) {
         Ok(_) => Ok(()),
         Err(err) => Err(format!("{:?}", err)),
     }
@@ -60,10 +60,10 @@ pub fn explicit_release_of(
 
 fn handle_init(matches: &ArgMatches<'_>, config_file: &str) -> Result<(), String> {
     let json_rpc_url = matches.value_of("json_rpc_url").unwrap();
-    let update_manifest_pubkey = pubkey_of(&matches, "update_manifest_pubkey");
+    let update_manifest_pubkey = pubkey_of(matches, "update_manifest_pubkey");
     let data_dir = matches.value_of("data_dir").unwrap();
     let no_modify_path = matches.is_present("no_modify_path");
-    let explicit_release = explicit_release_of(&matches, "explicit_release");
+    let explicit_release = explicit_release_of(matches, "explicit_release");
 
     if update_manifest_pubkey.is_none() && explicit_release.is_none() {
         Err(format!(
@@ -98,7 +98,7 @@ pub fn main() -> Result<(), String> {
                 .global(true)
                 .help("Configuration file to use");
             match *defaults::CONFIG_FILE {
-                Some(ref config_file) => arg.default_value(&config_file),
+                Some(ref config_file) => arg.default_value(config_file),
                 None => arg.required(true),
             }
         })
@@ -115,7 +115,7 @@ pub fn main() -> Result<(), String> {
                         .required(true)
                         .help("Directory to store install data");
                     match *defaults::DATA_DIR {
-                        Some(ref data_dir) => arg.default_value(&data_dir),
+                        Some(ref data_dir) => arg.default_value(data_dir),
                         None => arg,
                     }
                 })
@@ -181,7 +181,7 @@ pub fn main() -> Result<(), String> {
                         .required(true)
                         .help("Keypair file of the account that funds the deployment");
                     match *defaults::USER_KEYPAIR {
-                        Some(ref config_file) => arg.default_value(&config_file),
+                        Some(ref config_file) => arg.default_value(config_file),
                         None => arg,
                     }
                 })
@@ -242,7 +242,7 @@ pub fn main() -> Result<(), String> {
     let config_file = matches.value_of("config_file").unwrap();
 
     match matches.subcommand() {
-        ("init", Some(matches)) => handle_init(&matches, &config_file),
+        ("init", Some(matches)) => handle_init(matches, config_file),
         ("info", Some(matches)) => {
             let local_info_only = matches.is_present("local_info_only");
             let eval = matches.is_present("eval");
@@ -290,7 +290,7 @@ pub fn main_init() -> Result<(), String> {
                 .takes_value(true)
                 .help("Configuration file to use");
             match *defaults::CONFIG_FILE {
-                Some(ref config_file) => arg.default_value(&config_file),
+                Some(ref config_file) => arg.default_value(config_file),
                 None => arg.required(true),
             }
         })
@@ -303,7 +303,7 @@ pub fn main_init() -> Result<(), String> {
                 .required(true)
                 .help("Directory to store install data");
             match *defaults::DATA_DIR {
-                Some(ref data_dir) => arg.default_value(&data_dir),
+                Some(ref data_dir) => arg.default_value(data_dir),
                 None => arg,
             }
         })
@@ -342,5 +342,5 @@ pub fn main_init() -> Result<(), String> {
         .get_matches();
 
     let config_file = matches.value_of("config_file").unwrap();
-    handle_init(&matches, &config_file)
+    handle_init(&matches, config_file)
 }
diff --git a/keygen/Cargo.toml b/keygen/Cargo.toml
index 00604f11575b63..09012d98c1a51c 100644
--- a/keygen/Cargo.toml
+++ b/keygen/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "solana-keygen"
-version = "1.7.0"
+version = "1.7.11"
 description = "Solana key generation utility"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -14,11 +14,11 @@ bs58 = "0.3.1"
 clap = "2.33"
 dirs-next = "2.0.0"
 num_cpus = "1.13.0"
-solana-clap-utils = { path = "../clap-utils", version = "=1.7.0" }
-solana-cli-config = { path = "../cli-config", version = "=1.7.0" }
-solana-remote-wallet = { path = "../remote-wallet", version = "=1.7.0" }
-solana-sdk = { path = "../sdk", version = "=1.7.0" }
-solana-version = { path = "../version", version = "=1.7.0" }
+solana-clap-utils = { path = "../clap-utils", version = "=1.7.11" }
+solana-cli-config = { path = "../cli-config", version = "=1.7.11" }
+solana-remote-wallet = { path = "../remote-wallet", version = "=1.7.11" }
+solana-sdk = { path = "../sdk", version = "=1.7.11" }
+solana-version = { path = "../version", version = "=1.7.11" }
 tiny-bip39 = "0.7.0"
 
 [[bin]]
diff --git a/keygen/src/keygen.rs b/keygen/src/keygen.rs
index a30e5c47cafa44..c7c962a58aa850 100644
--- a/keygen/src/keygen.rs
+++ b/keygen/src/keygen.rs
@@ -106,9 +106,6 @@ fn no_outfile_arg<'a, 'b>() -> Arg<'a, 'b> {
     Arg::with_name(NO_OUTFILE_ARG.name)
         .long(NO_OUTFILE_ARG.long)
         .conflicts_with_all(&["outfile", "silent"])
-        // Require a seed phrase to avoid generating a keypair
-        // but having no way to get the private key
-        .requires("use_mnemonic")
         .help(NO_OUTFILE_ARG.help)
 }
 
@@ -121,7 +118,6 @@ impl KeyGenerationCommonArgs for App<'_, '_> {
         self.arg(word_count_arg())
             .arg(language_arg())
             .arg(no_passphrase_arg())
-            .arg(no_outfile_arg())
     }
 }
 
@@ -157,9 +153,9 @@ fn output_keypair(
 ) -> Result<(), Box<dyn error::Error>> {
     if outfile == STDOUT_OUTFILE_TOKEN {
         let mut stdout = std::io::stdout();
-        write_keypair(&keypair, &mut stdout)?;
+        write_keypair(keypair, &mut stdout)?;
     } else {
-        write_keypair_file(&keypair, outfile)?;
+        write_keypair_file(keypair, outfile)?;
         println!("Wrote {} keypair to {}", source, outfile);
     }
     Ok(())
@@ -346,7 +342,7 @@ fn main() -> Result<(), Box<dyn error::Error>> {
                 .global(true)
                 .help("Configuration file to use");
             if let Some(ref config_file) = *CONFIG_FILE {
-                arg.default_value(&config_file)
+                arg.default_value(config_file)
             } else {
                 arg
             }
@@ -395,6 +391,7 @@ fn main() -> Result<(), Box<dyn error::Error>> {
                         .help("Do not display seed phrase. Useful when piping output to other programs that prompt for user input, like gpg"),
                 )
                 .key_generation_common_args()
+                .arg(no_outfile_arg())
         )
         .subcommand(
             SubCommand::with_name("grind")
@@ -450,6 +447,12 @@ fn main() -> Result<(), Box<dyn error::Error>> {
                         .help("Generate using a mnemonic key phrase.  Expect a significant slowdown in this mode"),
                 )
                 .key_generation_common_args()
+                .arg(
+                    no_outfile_arg()
+                    // Require a seed phrase to avoid generating a keypair
+                    // but having no way to get the private key
+                    .requires("use_mnemonic")
+                )
         )
         .subcommand(
             SubCommand::with_name("pubkey")
@@ -536,7 +539,7 @@ fn do_main(matches: &ArgMatches<'_>) -> Result<(), Box<dyn error::Error>> {
 
             if matches.is_present("outfile") {
                 let outfile = matches.value_of("outfile").unwrap();
-                check_for_overwrite(&outfile, &matches);
+                check_for_overwrite(outfile, matches);
                 write_pubkey_file(outfile, pubkey)?;
             } else {
                 println!("{}", pubkey);
@@ -555,7 +558,7 @@ fn do_main(matches: &ArgMatches<'_>) -> Result<(), Box<dyn error::Error>> {
 
             match outfile {
                 Some(STDOUT_OUTFILE_TOKEN) => (),
-                Some(outfile) => check_for_overwrite(&outfile, &matches),
+                Some(outfile) => check_for_overwrite(outfile, matches),
                 None => (),
             }
 
@@ -574,7 +577,7 @@ fn do_main(matches: &ArgMatches<'_>) -> Result<(), Box<dyn error::Error>> {
             let keypair = keypair_from_seed(seed.as_bytes())?;
 
             if let Some(outfile) = outfile {
-                output_keypair(&keypair, &outfile, "new")
+                output_keypair(&keypair, outfile, "new")
                     .map_err(|err| format!("Unable to write {}: {}", outfile, err))?;
             }
 
@@ -597,7 +600,7 @@ fn do_main(matches: &ArgMatches<'_>) -> Result<(), Box<dyn error::Error>> {
             };
 
             if outfile != STDOUT_OUTFILE_TOKEN {
-                check_for_overwrite(&outfile, &matches);
+                check_for_overwrite(outfile, matches);
             }
 
             let keypair_name = "recover";
@@ -607,7 +610,7 @@ fn do_main(matches: &ArgMatches<'_>) -> Result<(), Box<dyn error::Error>> {
                 let skip_validation = matches.is_present(SKIP_SEED_PHRASE_VALIDATION_ARG.name);
                 keypair_from_seed_phrase(keypair_name, skip_validation, true, None, true)?
             };
-            output_keypair(&keypair, &outfile, "recovered")?;
+            output_keypair(&keypair, outfile, "recovered")?;
         }
         ("grind", Some(matches)) => {
             let ignore_case = matches.is_present("ignore_case");
diff --git a/ledger-tool/Cargo.toml b/ledger-tool/Cargo.toml
index 47a7b5e7440ba8..9692bbe9ec30aa 100644
--- a/ledger-tool/Cargo.toml
+++ b/ledger-tool/Cargo.toml
@@ -3,7 +3,7 @@ authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 edition = "2018"
 name = "solana-ledger-tool"
 description = "Blockchain, Rebuilt for Scale"
-version = "1.7.0"
+version = "1.7.11"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
@@ -23,23 +23,23 @@ regex = "1"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0.56"
 serde_yaml = "0.8.13"
-solana-clap-utils = { path = "../clap-utils", version = "=1.7.0" }
-solana-cli-output = { path = "../cli-output", version = "=1.7.0" }
-solana-ledger = { path = "../ledger", version = "=1.7.0" }
-solana-logger = { path = "../logger", version = "=1.7.0" }
-solana-measure = { path = "../measure", version = "=1.7.0" }
-solana-runtime = { path = "../runtime", version = "=1.7.0" }
-solana-sdk = { path = "../sdk", version = "=1.7.0" }
-solana-stake-program = { path = "../programs/stake", version = "=1.7.0" }
-solana-storage-bigtable = { path = "../storage-bigtable", version = "=1.7.0" }
-solana-transaction-status = { path = "../transaction-status", version = "=1.7.0" }
-solana-version = { path = "../version", version = "=1.7.0" }
-solana-vote-program = { path = "../programs/vote", version = "=1.7.0" }
+solana-clap-utils = { path = "../clap-utils", version = "=1.7.11" }
+solana-cli-output = { path = "../cli-output", version = "=1.7.11" }
+solana-ledger = { path = "../ledger", version = "=1.7.11" }
+solana-logger = { path = "../logger", version = "=1.7.11" }
+solana-measure = { path = "../measure", version = "=1.7.11" }
+solana-runtime = { path = "../runtime", version = "=1.7.11" }
+solana-sdk = { path = "../sdk", version = "=1.7.11" }
+solana-stake-program = { path = "../programs/stake", version = "=1.7.11" }
+solana-storage-bigtable = { path = "../storage-bigtable", version = "=1.7.11" }
+solana-transaction-status = { path = "../transaction-status", version = "=1.7.11" }
+solana-version = { path = "../version", version = "=1.7.11" }
+solana-vote-program = { path = "../programs/vote", version = "=1.7.11" }
 tempfile = "3.1.0"
 tokio = { version = "1", features = ["full"] }
 
 [dev-dependencies]
-assert_cmd = "1.0"
+assert_cmd = "2.0"
 
 [target."cfg(unix)".dependencies]
 signal-hook = "0.1.15"
diff --git a/ledger-tool/src/bigtable.rs b/ledger-tool/src/bigtable.rs
index 38c387404319e7..b856ef13114ab3 100644
--- a/ledger-tool/src/bigtable.rs
+++ b/ledger-tool/src/bigtable.rs
@@ -385,18 +385,7 @@ pub fn bigtable_process_command(ledger_path: &Path, matches: &ArgMatches<'_>) {
     let runtime = tokio::runtime::Runtime::new().unwrap();
 
     let verbose = matches.is_present("verbose");
-    let output_format = matches
-        .value_of("output_format")
-        .map(|value| match value {
-            "json" => OutputFormat::Json,
-            "json-compact" => OutputFormat::JsonCompact,
-            _ => unreachable!(),
-        })
-        .unwrap_or(if verbose {
-            OutputFormat::DisplayVerbose
-        } else {
-            OutputFormat::Display
-        });
+    let output_format = OutputFormat::from_matches(matches, "output_format", verbose);
 
     let future = match matches.subcommand() {
         ("upload", Some(arg_matches)) => {
@@ -405,7 +394,7 @@ pub fn bigtable_process_command(ledger_path: &Path, matches: &ArgMatches<'_>) {
             let allow_missing_metadata = arg_matches.is_present("allow_missing_metadata");
             let force_reupload = arg_matches.is_present("force_reupload");
             let blockstore =
-                crate::open_blockstore(&ledger_path, AccessType::TryPrimaryThenSecondary, None);
+                crate::open_blockstore(ledger_path, AccessType::TryPrimaryThenSecondary, None);
 
             runtime.block_on(upload(
                 blockstore,
diff --git a/ledger-tool/src/main.rs b/ledger-tool/src/main.rs
index 7f69d0fb7e7087..9aa14f8a5cd99b 100644
--- a/ledger-tool/src/main.rs
+++ b/ledger-tool/src/main.rs
@@ -33,8 +33,6 @@ use solana_runtime::{
 use solana_sdk::{
     account::{AccountSharedData, ReadableAccount, WritableAccount},
     clock::{Epoch, Slot},
-    feature::{self, Feature},
-    feature_set,
     genesis_config::{ClusterType, GenesisConfig},
     hash::Hash,
     inflation::Inflation,
@@ -42,9 +40,10 @@ use solana_sdk::{
     pubkey::Pubkey,
     rent::Rent,
     shred_version::compute_shred_version,
+    stake::{self, state::StakeState},
     system_program,
 };
-use solana_stake_program::stake_state::{self, PointValue, StakeState};
+use solana_stake_program::stake_state::{self, PointValue};
 use solana_vote_program::{
     self,
     vote_state::{self, VoteState},
@@ -76,14 +75,14 @@ fn output_slot_rewards(blockstore: &Blockstore, slot: Slot, method: &LedgerOutpu
             if !rewards.is_empty() {
                 println!("  Rewards:");
                 println!(
-                    "    {:<44}  {:^15}  {:<15}  {:<20}",
-                    "Address", "Type", "Amount", "New Balance"
+                    "    {:<44}  {:^15}  {:<15}  {:<20}  {:>10}",
+                    "Address", "Type", "Amount", "New Balance", "Commission",
                 );
 
                 for reward in rewards {
                     let sign = if reward.lamports < 0 { "-" } else { "" };
                     println!(
-                        "    {:<44}  {:^15}  {:<15}  {}",
+                        "    {:<44}  {:^15}  {:<15}  {}   {}",
                         reward.pubkey,
                         if let Some(reward_type) = reward.reward_type {
                             format!("{}", reward_type)
@@ -95,7 +94,11 @@ fn output_slot_rewards(blockstore: &Blockstore, slot: Slot, method: &LedgerOutpu
                             sign,
                             lamports_to_sol(reward.lamports.abs() as u64)
                         ),
-                        format!("◎{:<18.9}", lamports_to_sol(reward.post_balance))
+                        format!("◎{:<18.9}", lamports_to_sol(reward.post_balance)),
+                        reward
+                            .commission
+                            .map(|commission| format!("{:>9}%", commission))
+                            .unwrap_or_else(|| "    -".to_string())
                     );
                 }
             }
@@ -133,7 +136,7 @@ fn output_entry(
                     .map(|transaction_status| transaction_status.into());
 
                 solana_cli_output::display::println_transaction(
-                    &transaction,
+                    transaction,
                     &transaction_status,
                     "      ",
                     None,
@@ -452,7 +455,7 @@ fn graph_forks(bank_forks: &BankForks, include_all_votes: bool) -> String {
     let mut lowest_total_stake = 0;
     for (node_pubkey, (last_vote_slot, vote_state, stake, total_stake)) in &last_votes {
         all_votes.entry(*node_pubkey).and_modify(|validator_votes| {
-            validator_votes.remove(&last_vote_slot);
+            validator_votes.remove(last_vote_slot);
         });
 
         dot.push(format!(
@@ -472,7 +475,7 @@ fn graph_forks(bank_forks: &BankForks, include_all_votes: bool) -> String {
         dot.push(format!(
             r#"  "last vote {}" -> "{}" [style=dashed,label="latest vote"];"#,
             node_pubkey,
-            if styled_slots.contains(&last_vote_slot) {
+            if styled_slots.contains(last_vote_slot) {
                 last_vote_slot.to_string()
             } else {
                 if *last_vote_slot < lowest_last_vote_slot {
@@ -519,7 +522,7 @@ fn graph_forks(bank_forks: &BankForks, include_all_votes: bool) -> String {
                     r#"  "{} vote {}" -> "{}" [style=dotted,label="vote"];"#,
                     node_pubkey,
                     vote_slot,
-                    if styled_slots.contains(&vote_slot) {
+                    if styled_slots.contains(vote_slot) {
                         vote_slot.to_string()
                     } else {
                         "...".to_string()
@@ -711,8 +714,8 @@ fn load_bank_forks(
     };
 
     bank_forks_utils::load(
-        &genesis_config,
-        &blockstore,
+        genesis_config,
+        blockstore,
         account_paths,
         None,
         snapshot_config.as_ref(),
@@ -729,7 +732,8 @@ fn open_genesis_config_by(ledger_path: &Path, matches: &ArgMatches<'_>) -> Genes
 }
 
 fn assert_capitalization(bank: &Bank) {
-    assert!(bank.calculate_and_verify_capitalization());
+    let debug_verify = true;
+    assert!(bank.calculate_and_verify_capitalization(debug_verify));
 }
 
 #[allow(clippy::cognitive_complexity)]
@@ -831,7 +835,7 @@ fn main() {
         .long("maximum-snapshots-to-retain")
         .value_name("NUMBER")
         .takes_value(true)
-        .default_value(&default_max_snapshot_to_retain)
+        .default_value(default_max_snapshot_to_retain)
         .help("Maximum number of snapshots to hold on to during snapshot purge");
 
     let rent = Rent::default();
@@ -1272,14 +1276,6 @@ fn main() {
                     .possible_values(&["pico", "full", "none"])
                     .help("Overwrite inflation when warping"),
             )
-            .arg(
-                Arg::with_name("enable_stake_program_v2")
-                    .required(false)
-                    .long("enable-stake-program-v2")
-                    .takes_value(false)
-                    .help("Enable stake program v2 (several inflation-related staking \
-                           bugs are feature-gated behind this)"),
-            )
             .arg(
                 Arg::with_name("recalculate_capitalization")
                     .required(false)
@@ -1857,14 +1853,14 @@ fn main() {
             let remove_stake_accounts = arg_matches.is_present("remove_stake_accounts");
             let new_hard_forks = hardforks_of(arg_matches, "hard_forks");
 
-            let faucet_pubkey = pubkey_of(&arg_matches, "faucet_pubkey");
+            let faucet_pubkey = pubkey_of(arg_matches, "faucet_pubkey");
             let faucet_lamports = value_t!(arg_matches, "faucet_lamports", u64).unwrap_or(0);
 
             let rent_burn_percentage = value_t!(arg_matches, "rent_burn_percentage", u8);
             let hashes_per_tick = arg_matches.value_of("hashes_per_tick");
 
             let bootstrap_stake_authorized_pubkey =
-                pubkey_of(&arg_matches, "bootstrap_stake_authorized_pubkey");
+                pubkey_of(arg_matches, "bootstrap_stake_authorized_pubkey");
             let bootstrap_validator_lamports =
                 value_t_or_exit!(arg_matches, "bootstrap_validator_lamports", u64);
             let bootstrap_validator_stake_lamports =
@@ -1878,9 +1874,9 @@ fn main() {
                 );
                 exit(1);
             }
-            let bootstrap_validator_pubkeys = pubkeys_of(&arg_matches, "bootstrap_validator");
+            let bootstrap_validator_pubkeys = pubkeys_of(arg_matches, "bootstrap_validator");
             let accounts_to_remove =
-                pubkeys_of(&arg_matches, "accounts_to_remove").unwrap_or_default();
+                pubkeys_of(arg_matches, "accounts_to_remove").unwrap_or_default();
             let snapshot_version =
                 arg_matches
                     .value_of("snapshot_version")
@@ -1971,7 +1967,8 @@ fn main() {
 
                     if remove_stake_accounts {
                         for (address, mut account) in bank
-                            .get_program_accounts(&solana_stake_program::id())
+                            .get_program_accounts(&stake::program::id())
+                            .unwrap()
                             .into_iter()
                         {
                             account.set_lamports(0);
@@ -2005,6 +2002,7 @@ fn main() {
                         // Delete existing vote accounts
                         for (address, mut account) in bank
                             .get_program_accounts(&solana_vote_program::id())
+                            .unwrap()
                             .into_iter()
                         {
                             account.set_lamports(0);
@@ -2033,9 +2031,9 @@ fn main() {
                             );
 
                             let vote_account = vote_state::create_account_with_authorized(
-                                &identity_pubkey,
-                                &identity_pubkey,
-                                &identity_pubkey,
+                                identity_pubkey,
+                                identity_pubkey,
+                                identity_pubkey,
                                 100,
                                 VoteState::get_rent_exempt_reserve(&rent).max(1),
                             );
@@ -2045,8 +2043,8 @@ fn main() {
                                 &stake_state::create_account(
                                     bootstrap_stake_authorized_pubkey
                                         .as_ref()
-                                        .unwrap_or(&identity_pubkey),
-                                    &vote_pubkey,
+                                        .unwrap_or(identity_pubkey),
+                                    vote_pubkey,
                                     &vote_account,
                                     &rent,
                                     bootstrap_validator_stake_lamports,
@@ -2166,6 +2164,7 @@ fn main() {
 
                     let accounts: BTreeMap<_, _> = bank
                         .get_all_accounts_with_modified_slots()
+                        .unwrap()
                         .into_iter()
                         .filter(|(pubkey, _account, _slot)| {
                             include_sysvars || !solana_sdk::sysvar::is_sysvar_id(pubkey)
@@ -2272,95 +2271,6 @@ fn main() {
                             .lazy_rent_collection
                             .store(true, std::sync::atomic::Ordering::Relaxed);
 
-                        let feature_account_balance = std::cmp::max(
-                            genesis_config.rent.minimum_balance(Feature::size_of()),
-                            1,
-                        );
-                        if arg_matches.is_present("enable_stake_program_v2") {
-                            let mut force_enabled_count = 0;
-                            if base_bank
-                                .get_account(&feature_set::stake_program_v2::id())
-                                .is_none()
-                            {
-                                base_bank.store_account(
-                                    &feature_set::stake_program_v2::id(),
-                                    &feature::create_account(
-                                        &Feature { activated_at: None },
-                                        feature_account_balance,
-                                    ),
-                                );
-                                force_enabled_count += 1;
-                            }
-                            if base_bank
-                                .get_account(&feature_set::rewrite_stake::id())
-                                .is_none()
-                            {
-                                base_bank.store_account(
-                                    &feature_set::rewrite_stake::id(),
-                                    &feature::create_account(
-                                        &Feature { activated_at: None },
-                                        feature_account_balance,
-                                    ),
-                                );
-                                force_enabled_count += 1;
-                            }
-
-                            if force_enabled_count == 0 {
-                                warn!("Already stake_program_v2 is activated (or scheduled)");
-                            }
-
-                            let mut store_failed_count = 0;
-                            if force_enabled_count >= 1 {
-                                if base_bank
-                                    .get_account(&feature_set::secp256k1_program_enabled::id())
-                                    .is_some()
-                                {
-                                    // steal some lamports from the pretty old feature not to affect
-                                    // capitalizaion, which doesn't affect inflation behavior!
-                                    base_bank.store_account(
-                                        &feature_set::secp256k1_program_enabled::id(),
-                                        &AccountSharedData::default(),
-                                    );
-                                    force_enabled_count -= 1;
-                                } else {
-                                    store_failed_count += 1;
-                                }
-                            }
-
-                            if force_enabled_count >= 1 {
-                                if base_bank
-                                    .get_account(&feature_set::instructions_sysvar_enabled::id())
-                                    .is_some()
-                                {
-                                    // steal some lamports from the pretty old feature not to affect
-                                    // capitalizaion, which doesn't affect inflation behavior!
-                                    base_bank.store_account(
-                                        &feature_set::instructions_sysvar_enabled::id(),
-                                        &AccountSharedData::default(),
-                                    );
-                                    force_enabled_count -= 1;
-                                } else {
-                                    store_failed_count += 1;
-                                }
-                            }
-                            assert_eq!(force_enabled_count, store_failed_count);
-                            if store_failed_count >= 1 {
-                                // we have no choice; maybe locally created blank cluster with
-                                // not-Development cluster type.
-                                let old_cap = base_bank.set_capitalization();
-                                let new_cap = base_bank.capitalization();
-                                warn!(
-                                    "Skewing capitalization a bit to enable stake_program_v2 as \
-                                     requested: increasing {} from {} to {}",
-                                    feature_account_balance, old_cap, new_cap,
-                                );
-                                assert_eq!(
-                                    old_cap + feature_account_balance * store_failed_count,
-                                    new_cap
-                                );
-                            }
-                        }
-
                         #[derive(Default, Debug)]
                         struct PointDetail {
                             epoch: Epoch,
@@ -2471,7 +2381,7 @@ fn main() {
                             }
                         };
                         let warped_bank = Bank::new_from_parent_with_tracer(
-                            &base_bank,
+                            base_bank,
                             base_bank.collector_id(),
                             next_epoch,
                             tracer,
@@ -2488,7 +2398,7 @@ fn main() {
 
                         println!("Slot: {} => {}", base_bank.slot(), warped_bank.slot());
                         println!("Epoch: {} => {}", base_bank.epoch(), warped_bank.epoch());
-                        assert_capitalization(&base_bank);
+                        assert_capitalization(base_bank);
                         assert_capitalization(&warped_bank);
                         let interest_per_epoch = ((warped_bank.capitalization() as f64)
                             / (base_bank.capitalization() as f64)
@@ -2516,7 +2426,7 @@ fn main() {
                                     pubkey,
                                     account,
                                     base_bank
-                                        .get_account(&pubkey)
+                                        .get_account(pubkey)
                                         .map(|a| a.lamports())
                                         .unwrap_or_default(),
                                 )
@@ -2715,7 +2625,7 @@ fn main() {
                             );
                         }
 
-                        assert_capitalization(&bank);
+                        assert_capitalization(bank);
                         println!("Inflation: {:?}", bank.inflation());
                         println!("RentCollector: {:?}", bank.rent_collector());
                         println!("Capitalization: {}", Sol(bank.capitalization()));
@@ -2912,10 +2822,12 @@ fn main() {
                 eprintln!("{} slots to be rooted", roots_to_fix.len());
                 for chunk in roots_to_fix.chunks(100) {
                     eprintln!("{:?}", chunk);
-                    blockstore.set_roots(&roots_to_fix).unwrap_or_else(|err| {
-                        eprintln!("Unable to set roots {:?}: {}", roots_to_fix, err);
-                        exit(1);
-                    });
+                    blockstore
+                        .set_roots(roots_to_fix.iter())
+                        .unwrap_or_else(|err| {
+                            eprintln!("Unable to set roots {:?}: {}", roots_to_fix, err);
+                            exit(1);
+                        });
                 }
             } else {
                 println!(
diff --git a/ledger-tool/tests/basic.rs b/ledger-tool/tests/basic.rs
index c9ccf9ae690cd1..4cda481e6ed358 100644
--- a/ledger-tool/tests/basic.rs
+++ b/ledger-tool/tests/basic.rs
@@ -39,11 +39,11 @@ fn nominal() {
     let ledger_path = ledger_path.to_str().unwrap();
 
     // Basic validation
-    let output = run_ledger_tool(&["-l", &ledger_path, "verify"]);
+    let output = run_ledger_tool(&["-l", ledger_path, "verify"]);
     assert!(output.status.success());
 
     // Print everything
-    let output = run_ledger_tool(&["-l", &ledger_path, "print", "-vvv"]);
+    let output = run_ledger_tool(&["-l", ledger_path, "print", "-vvv"]);
     assert!(output.status.success());
     assert_eq!(count_newlines(&output.stdout), ticks + meta_lines);
 }
diff --git a/ledger/Cargo.toml b/ledger/Cargo.toml
index 157377b5ca07d9..ef34661928e2ac 100644
--- a/ledger/Cargo.toml
+++ b/ledger/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "solana-ledger"
-version = "1.7.0"
+version = "1.7.11"
 description = "Solana ledger"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -13,7 +13,7 @@ edition = "2018"
 bincode = "1.3.1"
 byteorder = "1.3.4"
 chrono = { version = "0.4.11", features = ["serde"] }
-chrono-humanize = "0.1.1"
+chrono-humanize = "0.2.1"
 crossbeam-channel = "0.4"
 dlopen_derive = "0.1.4"
 dlopen = "0.1.8"
@@ -26,48 +26,53 @@ lazy_static = "1.4.0"
 libc = "0.2.81"
 log = { version = "0.4.11" }
 num_cpus = "1.13.0"
-prost = "0.7.0"
+prost = "0.8.0"
 rand = "0.7.0"
 rand_chacha = "0.2.2"
 rayon = "1.5.0"
-reed-solomon-erasure = { version = "4.0.2", features = ["simd-accel"] }
 serde = "1.0.122"
-serde_bytes = "0.11.4"
+serde_bytes = "0.11.5"
 sha2 = "0.9.2"
-solana-bpf-loader-program = { path = "../programs/bpf_loader", version = "=1.7.0" }
-solana-frozen-abi = { path = "../frozen-abi", version = "=1.7.0" }
-solana-frozen-abi-macro = { path = "../frozen-abi/macro", version = "=1.7.0" }
-solana-transaction-status = { path = "../transaction-status", version = "=1.7.0" }
-solana-logger = { path = "../logger", version = "=1.7.0" }
-solana-measure = { path = "../measure", version = "=1.7.0" }
-solana-merkle-tree = { path = "../merkle-tree", version = "=1.7.0" }
-solana-metrics = { path = "../metrics", version = "=1.7.0" }
-solana-perf = { path = "../perf", version = "=1.7.0" }
-solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "=1.7.0" }
-solana-runtime = { path = "../runtime", version = "=1.7.0" }
-solana-sdk = { path = "../sdk", version = "=1.7.0" }
-solana-stake-program = { path = "../programs/stake", version = "=1.7.0" }
-solana-storage-bigtable = { path = "../storage-bigtable", version = "=1.7.0" }
-solana-storage-proto = { path = "../storage-proto", version = "=1.7.0" }
-solana-vote-program = { path = "../programs/vote", version = "=1.7.0" }
+solana-bpf-loader-program = { path = "../programs/bpf_loader", version = "=1.7.11" }
+solana-frozen-abi = { path = "../frozen-abi", version = "=1.7.11" }
+solana-frozen-abi-macro = { path = "../frozen-abi/macro", version = "=1.7.11" }
+solana-transaction-status = { path = "../transaction-status", version = "=1.7.11" }
+solana-logger = { path = "../logger", version = "=1.7.11" }
+solana-measure = { path = "../measure", version = "=1.7.11" }
+solana-merkle-tree = { path = "../merkle-tree", version = "=1.7.11" }
+solana-metrics = { path = "../metrics", version = "=1.7.11" }
+solana-perf = { path = "../perf", version = "=1.7.11" }
+solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "=1.7.11" }
+solana-runtime = { path = "../runtime", version = "=1.7.11" }
+solana-sdk = { path = "../sdk", version = "=1.7.11" }
+solana-storage-bigtable = { path = "../storage-bigtable", version = "=1.7.11" }
+solana-storage-proto = { path = "../storage-proto", version = "=1.7.11" }
+solana-vote-program = { path = "../programs/vote", version = "=1.7.11" }
 tempfile = "3.1.0"
 thiserror = "1.0"
 tokio = { version = "1", features = ["full"] }
 tokio-stream = "0.1"
 trees = "0.2.1"
 
+# Disable reed-solomon-erasure/simd-accel feature on aarch64 only since it
+# requires clang to support -march=native.
+[target.'cfg(any(target_arch = "aarch64", target_arch = "aarch64_apple_darwin"))'.dependencies]
+reed-solomon-erasure = { version = "4.0.2" }
+
+[target.'cfg(not(any(target_arch = "aarch64", target_arch = "aarch64_apple_darwin")))'.dependencies]
+reed-solomon-erasure = { version = "4.0.2", features = ["simd-accel"] }
+
 [dependencies.rocksdb]
 # Avoid the vendored bzip2 within rocksdb-sys that can cause linker conflicts
 # when also using the bzip2 crate
-version = "0.15.0"
+version = "0.16.0"
 default-features = false
 features = ["lz4"]
 
 [dev-dependencies]
 assert_matches = "1.3.0"
 matches = "0.1.6"
-solana-account-decoder = { path = "../account-decoder", version = "=1.7.0" }
-solana-budget-program = { path = "../programs/budget", version = "=1.7.0" }
+solana-account-decoder = { path = "../account-decoder", version = "=1.7.11" }
 
 [build-dependencies]
 rustc_version = "0.2"
diff --git a/ledger/benches/protobuf.rs b/ledger/benches/protobuf.rs
index 6b511b2925d216..e0244efa078684 100644
--- a/ledger/benches/protobuf.rs
+++ b/ledger/benches/protobuf.rs
@@ -21,6 +21,7 @@ fn create_rewards() -> Rewards {
             lamports: 42 + i,
             post_balance: std::u64::MAX,
             reward_type: Some(RewardType::Fee),
+            commission: None,
         })
         .collect()
 }
diff --git a/ledger/src/ancestor_iterator.rs b/ledger/src/ancestor_iterator.rs
index 6c8099ce98f053..333974cc05a5da 100644
--- a/ledger/src/ancestor_iterator.rs
+++ b/ledger/src/ancestor_iterator.rs
@@ -60,7 +60,7 @@ mod tests {
     fn test_ancestor_iterator() {
         let blockstore_path = get_tmp_ledger_path!();
         let blockstore = Blockstore::open(&blockstore_path).unwrap();
-        blockstore.set_roots(&[0]).unwrap();
+        blockstore.set_roots(std::iter::once(&0)).unwrap();
         let ticks_per_slot = 5;
 
         /*
diff --git a/ledger/src/bank_forks_utils.rs b/ledger/src/bank_forks_utils.rs
index 0125fa0614dc11..d654f499b7b1e3 100644
--- a/ledger/src/bank_forks_utils.rs
+++ b/ledger/src/bank_forks_utils.rs
@@ -9,7 +9,7 @@ use crate::{
 };
 use log::*;
 use solana_runtime::{
-    bank_forks::{BankForks, SnapshotConfig},
+    bank_forks::{ArchiveFormat, BankForks, SnapshotConfig},
     snapshot_utils,
 };
 use solana_sdk::{clock::Slot, genesis_config::GenesisConfig, hash::Hash};
@@ -21,14 +21,18 @@ pub type LoadResult = result::Result<
 >;
 
 fn to_loadresult(
-    brp: BlockstoreProcessorResult,
-    snapshot_hash: Option<(Slot, Hash)>,
+    bpr: BlockstoreProcessorResult,
+    snapshot_slot_and_hash: Option<(Slot, Hash)>,
 ) -> LoadResult {
-    brp.map(|(bank_forks, leader_schedule_cache)| {
-        (bank_forks, leader_schedule_cache, snapshot_hash)
+    bpr.map(|(bank_forks, leader_schedule_cache)| {
+        (bank_forks, leader_schedule_cache, snapshot_slot_and_hash)
     })
 }
 
+/// Load the banks and accounts
+///
+/// If a snapshot config is given, and a snapshot is found, it will be loaded.  Otherwise, load
+/// from genesis.
 pub fn load(
     genesis_config: &GenesisConfig,
     blockstore: &Blockstore,
@@ -48,76 +52,53 @@ pub fn load(
         fs::create_dir_all(&snapshot_config.snapshot_path)
             .expect("Couldn't create snapshot directory");
 
-        match snapshot_utils::get_highest_snapshot_archive_path(
-            &snapshot_config.snapshot_package_output_path,
-        ) {
-            Some((archive_filename, (archive_slot, archive_snapshot_hash, compression))) => {
-                info!("Loading snapshot package: {:?}", archive_filename);
-                // Fail hard here if snapshot fails to load, don't silently continue
-
-                if account_paths.is_empty() {
-                    error!("Account paths not present when booting from snapshot");
-                    process::exit(1);
-                }
-
-                let deserialized_bank = snapshot_utils::bank_from_archive(
-                    &account_paths,
-                    &process_options.frozen_accounts,
-                    &snapshot_config.snapshot_path,
-                    &archive_filename,
-                    compression,
-                    genesis_config,
-                    process_options.debug_keys.clone(),
-                    Some(&crate::builtins::get(process_options.bpf_jit)),
-                    process_options.account_indexes.clone(),
-                    process_options.accounts_db_caching_enabled,
-                    process_options.limit_load_slot_count_from_snapshot,
-                )
-                .expect("Load from snapshot failed");
-                if let Some(shrink_paths) = shrink_paths {
-                    deserialized_bank.set_shrink_paths(shrink_paths);
-                }
-
-                let deserialized_snapshot_hash = (
-                    deserialized_bank.slot(),
-                    deserialized_bank.get_accounts_hash(),
-                );
-
-                if process_options.accounts_db_test_hash_calculation {
-                    deserialized_bank.update_accounts_hash_with_index_option(false, true);
-                }
-
-                if deserialized_snapshot_hash != (archive_slot, archive_snapshot_hash) {
-                    error!(
-                        "Snapshot has mismatch:\narchive: {:?}\ndeserialized: {:?}",
-                        archive_snapshot_hash, deserialized_snapshot_hash
-                    );
-                    process::exit(1);
-                }
-
-                return to_loadresult(
-                    blockstore_processor::process_blockstore_from_root(
-                        blockstore,
-                        deserialized_bank,
-                        &process_options,
-                        &VerifyRecyclers::default(),
-                        transaction_status_sender,
-                        cache_block_meta_sender,
-                    ),
-                    Some(deserialized_snapshot_hash),
-                );
-            }
-            None => info!("No snapshot package available"),
+        if let Some((archive_filename, (archive_slot, archive_hash, archive_format))) =
+            snapshot_utils::get_highest_snapshot_archive_path(
+                &snapshot_config.snapshot_package_output_path,
+            )
+        {
+            return load_from_snapshot(
+                genesis_config,
+                blockstore,
+                account_paths,
+                shrink_paths,
+                snapshot_config,
+                process_options,
+                transaction_status_sender,
+                cache_block_meta_sender,
+                archive_filename,
+                archive_slot,
+                archive_hash,
+                archive_format,
+            );
+        } else {
+            info!("No snapshot package available; will load from genesis");
         }
     } else {
-        info!("Snapshots disabled");
+        info!("Snapshots disabled; will load from genesis");
     }
 
+    load_from_genesis(
+        genesis_config,
+        blockstore,
+        account_paths,
+        process_options,
+        cache_block_meta_sender,
+    )
+}
+
+fn load_from_genesis(
+    genesis_config: &GenesisConfig,
+    blockstore: &Blockstore,
+    account_paths: Vec<PathBuf>,
+    process_options: ProcessOptions,
+    cache_block_meta_sender: Option<&CacheBlockMetaSender>,
+) -> LoadResult {
     info!("Processing ledger from genesis");
     to_loadresult(
         blockstore_processor::process_blockstore(
-            &genesis_config,
-            &blockstore,
+            genesis_config,
+            blockstore,
             account_paths,
             process_options,
             cache_block_meta_sender,
@@ -125,3 +106,74 @@ pub fn load(
         None,
     )
 }
+
+#[allow(clippy::too_many_arguments)]
+fn load_from_snapshot(
+    genesis_config: &GenesisConfig,
+    blockstore: &Blockstore,
+    account_paths: Vec<PathBuf>,
+    shrink_paths: Option<Vec<PathBuf>>,
+    snapshot_config: &SnapshotConfig,
+    process_options: ProcessOptions,
+    transaction_status_sender: Option<&TransactionStatusSender>,
+    cache_block_meta_sender: Option<&CacheBlockMetaSender>,
+    archive_filename: PathBuf,
+    archive_slot: Slot,
+    archive_hash: Hash,
+    archive_format: ArchiveFormat,
+) -> LoadResult {
+    info!("Loading snapshot package: {:?}", archive_filename);
+
+    // Fail hard here if snapshot fails to load, don't silently continue
+    if account_paths.is_empty() {
+        error!("Account paths not present when booting from snapshot");
+        process::exit(1);
+    }
+
+    let (deserialized_bank, timings) = snapshot_utils::bank_from_archive(
+        &account_paths,
+        &process_options.frozen_accounts,
+        &snapshot_config.snapshot_path,
+        &archive_filename,
+        archive_format,
+        genesis_config,
+        process_options.debug_keys.clone(),
+        Some(&crate::builtins::get(process_options.bpf_jit)),
+        process_options.account_indexes.clone(),
+        process_options.accounts_db_caching_enabled,
+        process_options.limit_load_slot_count_from_snapshot,
+        process_options.shrink_ratio,
+        process_options.accounts_db_test_hash_calculation,
+        process_options.accounts_db_skip_shrink,
+    )
+    .expect("Load from snapshot failed");
+    if let Some(shrink_paths) = shrink_paths {
+        deserialized_bank.set_shrink_paths(shrink_paths);
+    }
+
+    let deserialized_bank_slot_and_hash = (
+        deserialized_bank.slot(),
+        deserialized_bank.get_accounts_hash(),
+    );
+
+    if deserialized_bank_slot_and_hash != (archive_slot, archive_hash) {
+        error!(
+            "Snapshot has mismatch:\narchive: {:?}\ndeserialized: {:?}",
+            archive_hash, deserialized_bank_slot_and_hash
+        );
+        process::exit(1);
+    }
+
+    to_loadresult(
+        blockstore_processor::process_blockstore_from_root(
+            blockstore,
+            deserialized_bank,
+            &process_options,
+            &VerifyRecyclers::default(),
+            transaction_status_sender,
+            cache_block_meta_sender,
+            timings,
+        ),
+        Some(deserialized_bank_slot_and_hash),
+    )
+}
diff --git a/core/src/bigtable_upload_service.rs b/ledger/src/bigtable_upload_service.rs
similarity index 87%
rename from core/src/bigtable_upload_service.rs
rename to ledger/src/bigtable_upload_service.rs
index ee0e6abc5a86e5..ba109bbaa74351 100644
--- a/core/src/bigtable_upload_service.rs
+++ b/ledger/src/bigtable_upload_service.rs
@@ -1,11 +1,13 @@
-use solana_ledger::blockstore::Blockstore;
-use solana_runtime::commitment::BlockCommitmentCache;
-use std::{
-    sync::atomic::{AtomicBool, Ordering},
-    sync::{Arc, RwLock},
-    thread::{self, Builder, JoinHandle},
+use {
+    crate::{bigtable_upload, blockstore::Blockstore},
+    solana_runtime::commitment::BlockCommitmentCache,
+    std::{
+        sync::atomic::{AtomicBool, Ordering},
+        sync::{Arc, RwLock},
+        thread::{self, Builder, JoinHandle},
+    },
+    tokio::runtime::Runtime,
 };
-use tokio::runtime::Runtime;
 
 // Delay uploading the largest confirmed root for this many slots.  This is done in an attempt to
 // ensure that the `CacheBlockMetaService` has had enough time to add the block time for the root
@@ -68,7 +70,7 @@ impl BigTableUploadService {
                 continue;
             }
 
-            let result = runtime.block_on(solana_ledger::bigtable_upload::upload_confirmed_blocks(
+            let result = runtime.block_on(bigtable_upload::upload_confirmed_blocks(
                 blockstore.clone(),
                 bigtable_ledger_storage.clone(),
                 start_slot,
diff --git a/ledger/src/blockstore.rs b/ledger/src/blockstore.rs
index 420aad696719c3..e41f6fe9a20969 100644
--- a/ledger/src/blockstore.rs
+++ b/ledger/src/blockstore.rs
@@ -45,7 +45,7 @@ use std::{
     borrow::Cow,
     cell::RefCell,
     cmp,
-    collections::{HashMap, HashSet},
+    collections::{BTreeMap, HashMap, HashSet},
     convert::TryInto,
     fs,
     io::{Error as IoError, ErrorKind},
@@ -54,8 +54,9 @@ use std::{
     sync::{
         atomic::{AtomicBool, Ordering},
         mpsc::{sync_channel, Receiver, SyncSender, TrySendError},
-        Arc, Mutex, RwLock,
+        Arc, Mutex, RwLock, RwLockWriteGuard,
     },
+    time::Instant,
 };
 use thiserror::Error;
 use trees::{Tree, TreeWalk};
@@ -85,13 +86,15 @@ pub const MAX_TURBINE_DELAY_IN_TICKS: u64 = MAX_TURBINE_PROPAGATION_IN_MS / MS_P
 // (32K shreds per slot * 4 TX per shred * 2.5 slots per sec)
 pub const MAX_DATA_SHREDS_PER_SLOT: usize = 32_768;
 
-pub type CompletedSlotsReceiver = Receiver<Vec<u64>>;
+pub type CompletedSlotsSender = SyncSender<Vec<Slot>>;
+pub type CompletedSlotsReceiver = Receiver<Vec<Slot>>;
 type CompletedRanges = Vec<(u32, u32)>;
 
 #[derive(Clone, Copy)]
 pub enum PurgeType {
     Exact,
     PrimaryIndex,
+    CompactionFilter,
 }
 
 #[derive(Error, Debug)]
@@ -117,10 +120,14 @@ pub struct CompletedDataSetInfo {
 pub struct BlockstoreSignals {
     pub blockstore: Blockstore,
     pub ledger_signal_receiver: Receiver<bool>,
-    pub completed_slots_receivers: [CompletedSlotsReceiver; 2],
+    pub completed_slots_receiver: CompletedSlotsReceiver,
 }
 
 // ledger window
+//
+// NOTE: allowing dead_code only because stubbing bank_hash_cf and program_cost_cf
+// to 1.7 for rocksdb backward compatibility
+#[allow(dead_code)]
 pub struct Blockstore {
     ledger_path: PathBuf,
     db: Arc<Database>,
@@ -140,12 +147,35 @@ pub struct Blockstore {
     blocktime_cf: LedgerColumn<cf::Blocktime>,
     perf_samples_cf: LedgerColumn<cf::PerfSamples>,
     block_height_cf: LedgerColumn<cf::BlockHeight>,
+    program_costs_cf: LedgerColumn<cf::ProgramCosts>,
+    bank_hash_cf: LedgerColumn<cf::BankHash>,
     last_root: Arc<RwLock<Slot>>,
     insert_shreds_lock: Arc<Mutex<()>>,
     pub new_shreds_signals: Vec<SyncSender<bool>>,
-    pub completed_slots_senders: Vec<SyncSender<Vec<Slot>>>,
-    pub lowest_cleanup_slot: Arc<RwLock<u64>>,
+    pub completed_slots_senders: Vec<CompletedSlotsSender>,
+    pub lowest_cleanup_slot: Arc<RwLock<Slot>>,
     no_compaction: bool,
+    slots_stats: Arc<Mutex<SlotsStats>>,
+}
+
+struct SlotsStats {
+    last_cleanup_ts: Instant,
+    stats: BTreeMap<Slot, SlotStats>,
+}
+
+impl Default for SlotsStats {
+    fn default() -> Self {
+        SlotsStats {
+            last_cleanup_ts: Instant::now(),
+            stats: BTreeMap::new(),
+        }
+    }
+}
+
+#[derive(Default)]
+struct SlotStats {
+    num_repaired: usize,
+    num_recovered: usize,
 }
 
 pub struct IndexMetaWorkingSetEntry {
@@ -163,6 +193,13 @@ pub struct SlotMetaWorkingSetEntry {
     did_insert_occur: bool,
 }
 
+#[derive(PartialEq, Debug, Clone)]
+enum ShredSource {
+    Turbine,
+    Repaired,
+    Recovered,
+}
+
 #[derive(Default)]
 pub struct BlockstoreInsertionMetrics {
     pub num_shreds: usize,
@@ -311,6 +348,8 @@ impl Blockstore {
         let blocktime_cf = db.column();
         let perf_samples_cf = db.column();
         let block_height_cf = db.column();
+        let program_costs_cf = db.column();
+        let bank_hash_cf = db.column();
 
         let db = Arc::new(db);
 
@@ -359,12 +398,15 @@ impl Blockstore {
             blocktime_cf,
             perf_samples_cf,
             block_height_cf,
+            program_costs_cf,
+            bank_hash_cf,
             new_shreds_signals: vec![],
             completed_slots_senders: vec![],
             insert_shreds_lock: Arc::new(Mutex::new(())),
             last_root,
             lowest_cleanup_slot: Arc::new(RwLock::new(0)),
             no_compaction: false,
+            slots_stats: Arc::new(Mutex::new(SlotsStats::default())),
         };
         if initialize_transaction_status_index {
             blockstore.initialize_transaction_status_index()?;
@@ -384,18 +426,16 @@ impl Blockstore {
             enforce_ulimit_nofile,
         )?;
         let (ledger_signal_sender, ledger_signal_receiver) = sync_channel(1);
-        let (completed_slots_sender1, completed_slots_receiver1) =
-            sync_channel(MAX_COMPLETED_SLOTS_IN_CHANNEL);
-        let (completed_slots_sender2, completed_slots_receiver2) =
+        let (completed_slots_sender, completed_slots_receiver) =
             sync_channel(MAX_COMPLETED_SLOTS_IN_CHANNEL);
 
         blockstore.new_shreds_signals = vec![ledger_signal_sender];
-        blockstore.completed_slots_senders = vec![completed_slots_sender1, completed_slots_sender2];
+        blockstore.completed_slots_senders = vec![completed_slots_sender];
 
         Ok(BlockstoreSignals {
             blockstore,
             ledger_signal_receiver,
-            completed_slots_receivers: [completed_slots_receiver1, completed_slots_receiver2],
+            completed_slots_receiver,
         })
     }
 
@@ -705,7 +745,7 @@ impl Blockstore {
         for (&(slot, set_index), erasure_meta) in erasure_metas.iter() {
             let index_meta_entry = index_working_set.get_mut(&slot).expect("Index");
             let index = &mut index_meta_entry.index;
-            match erasure_meta.status(&index) {
+            match erasure_meta.status(index) {
                 ErasureMetaStatus::CanRecover => {
                     Self::recover_shreds(
                         index,
@@ -758,6 +798,7 @@ impl Blockstore {
     pub fn insert_shreds_handle_duplicate<F>(
         &self,
         shreds: Vec<Shred>,
+        is_repaired: Vec<bool>,
         leader_schedule: Option<&Arc<LeaderScheduleCache>>,
         is_trusted: bool,
         handle_duplicate: &F,
@@ -766,6 +807,7 @@ impl Blockstore {
     where
         F: Fn(Shred),
     {
+        assert_eq!(shreds.len(), is_repaired.len());
         let mut total_start = Measure::start("Total elapsed");
         let mut start = Measure::start("Blockstore lock");
         let _lock = self.insert_shreds_lock.lock().unwrap();
@@ -787,46 +829,56 @@ impl Blockstore {
         let mut index_meta_time = 0;
         let mut newly_completed_data_sets: Vec<CompletedDataSetInfo> = vec![];
         let mut inserted_indices = Vec::new();
-        shreds.into_iter().enumerate().for_each(|(i, shred)| {
-            if shred.is_data() {
-                let shred_slot = shred.slot();
-                if let Ok(completed_data_sets) = self.check_insert_data_shred(
-                    shred,
-                    &mut erasure_metas,
-                    &mut index_working_set,
-                    &mut slot_meta_working_set,
-                    &mut write_batch,
-                    &mut just_inserted_data_shreds,
-                    &mut index_meta_time,
-                    is_trusted,
-                    handle_duplicate,
-                    leader_schedule,
-                    false,
-                ) {
-                    newly_completed_data_sets.extend(completed_data_sets.into_iter().map(
-                        |(start_index, end_index)| CompletedDataSetInfo {
-                            slot: shred_slot,
-                            start_index,
-                            end_index,
-                        },
-                    ));
-                    inserted_indices.push(i);
-                    num_inserted += 1;
+        shreds
+            .into_iter()
+            .zip(is_repaired.into_iter())
+            .enumerate()
+            .for_each(|(i, (shred, is_repaired))| {
+                if shred.is_data() {
+                    let shred_slot = shred.slot();
+                    let shred_source = if is_repaired {
+                        ShredSource::Repaired
+                    } else {
+                        ShredSource::Turbine
+                    };
+                    if let Ok(completed_data_sets) = self.check_insert_data_shred(
+                        shred,
+                        &mut erasure_metas,
+                        &mut index_working_set,
+                        &mut slot_meta_working_set,
+                        &mut write_batch,
+                        &mut just_inserted_data_shreds,
+                        &mut index_meta_time,
+                        is_trusted,
+                        handle_duplicate,
+                        leader_schedule,
+                        shred_source,
+                    ) {
+                        newly_completed_data_sets.extend(completed_data_sets.into_iter().map(
+                            |(start_index, end_index)| CompletedDataSetInfo {
+                                slot: shred_slot,
+                                start_index,
+                                end_index,
+                            },
+                        ));
+                        inserted_indices.push(i);
+                        num_inserted += 1;
+                    }
+                } else if shred.is_code() {
+                    self.check_cache_coding_shred(
+                        shred,
+                        &mut erasure_metas,
+                        &mut index_working_set,
+                        &mut just_inserted_coding_shreds,
+                        &mut index_meta_time,
+                        handle_duplicate,
+                        is_trusted,
+                        is_repaired,
+                    );
+                } else {
+                    panic!("There should be no other case");
                 }
-            } else if shred.is_code() {
-                self.check_cache_coding_shred(
-                    shred,
-                    &mut erasure_metas,
-                    &mut index_working_set,
-                    &mut just_inserted_coding_shreds,
-                    &mut index_meta_time,
-                    handle_duplicate,
-                    is_trusted,
-                );
-            } else {
-                panic!("There should be no other case");
-            }
-        });
+            });
         start.stop();
 
         let insert_shreds_elapsed = start.as_us();
@@ -838,7 +890,7 @@ impl Blockstore {
         let mut num_recovered_exists = 0;
         if let Some(leader_schedule_cache) = leader_schedule {
             let recovered_data = Self::try_shred_recovery(
-                &db,
+                db,
                 &erasure_metas,
                 &mut index_working_set,
                 &mut just_inserted_data_shreds,
@@ -861,7 +913,7 @@ impl Blockstore {
                             is_trusted,
                             &handle_duplicate,
                             leader_schedule,
-                            true,
+                            ShredSource::Recovered,
                         ) {
                             Err(InsertDataShredError::Exists) => {
                                 num_recovered_exists += 1;
@@ -993,8 +1045,10 @@ impl Blockstore {
         leader_schedule: Option<&Arc<LeaderScheduleCache>>,
         is_trusted: bool,
     ) -> Result<(Vec<CompletedDataSetInfo>, Vec<usize>)> {
+        let shreds_len = shreds.len();
         self.insert_shreds_handle_duplicate(
             shreds,
+            vec![false; shreds_len],
             leader_schedule,
             is_trusted,
             &|_| {},
@@ -1038,6 +1092,7 @@ impl Blockstore {
         index_meta_time: &mut u64,
         handle_duplicate: &F,
         is_trusted: bool,
+        is_repaired: bool,
     ) -> bool
     where
         F: Fn(Shred),
@@ -1105,6 +1160,12 @@ impl Blockstore {
             return false;
         }
 
+        if is_repaired {
+            let mut slots_stats = self.slots_stats.lock().unwrap();
+            let mut e = slots_stats.stats.entry(slot).or_default();
+            e.num_repaired += 1;
+        }
+
         // Should be safe to modify index_meta here. Two cases
         // 1) Recovery happens: Then all inserted erasure metas are removed
         // from just_received_coding_shreds, and nothing will be committed by
@@ -1135,14 +1196,14 @@ impl Blockstore {
             let maybe_shred = self.get_coding_shred(slot, coding_index);
             if let Ok(Some(shred_data)) = maybe_shred {
                 let potential_shred = Shred::new_from_serialized_shred(shred_data).unwrap();
-                if Self::erasure_mismatch(&potential_shred, &shred) {
+                if Self::erasure_mismatch(&potential_shred, shred) {
                     conflicting_shred = Some(potential_shred.payload);
                 }
                 break;
             } else if let Some(potential_shred) =
                 just_received_coding_shreds.get(&(slot, coding_index))
             {
-                if Self::erasure_mismatch(&potential_shred, &shred) {
+                if Self::erasure_mismatch(potential_shred, shred) {
                     conflicting_shred = Some(potential_shred.payload.clone());
                 }
                 break;
@@ -1165,7 +1226,7 @@ impl Blockstore {
         is_trusted: bool,
         handle_duplicate: &F,
         leader_schedule: Option<&Arc<LeaderScheduleCache>>,
-        is_recovered: bool,
+        shred_source: ShredSource,
     ) -> std::result::Result<Vec<(u32, u32)>, InsertDataShredError>
     where
         F: Fn(Shred),
@@ -1183,7 +1244,7 @@ impl Blockstore {
         let slot_meta = &mut slot_meta_entry.new_slot_meta.borrow_mut();
 
         if !is_trusted {
-            if Self::is_data_shred_present(&shred, slot_meta, &index_meta.data()) {
+            if Self::is_data_shred_present(&shred, slot_meta, index_meta.data()) {
                 handle_duplicate(shred);
                 return Err(InsertDataShredError::Exists);
             }
@@ -1208,15 +1269,20 @@ impl Blockstore {
                 just_inserted_data_shreds,
                 &self.last_root,
                 leader_schedule,
-                is_recovered,
+                shred_source.clone(),
             ) {
                 return Err(InsertDataShredError::InvalidShred);
             }
         }
 
         let set_index = u64::from(shred.common_header.fec_set_index);
-        let newly_completed_data_sets =
-            self.insert_data_shred(slot_meta, index_meta.data_mut(), &shred, write_batch)?;
+        let newly_completed_data_sets = self.insert_data_shred(
+            slot_meta,
+            index_meta.data_mut(),
+            &shred,
+            write_batch,
+            shred_source,
+        )?;
         just_inserted_data_shreds.insert((slot, shred_index), shred);
         index_meta_working_set_entry.did_insert_occur = true;
         slot_meta_entry.did_insert_occur = true;
@@ -1295,7 +1361,7 @@ impl Blockstore {
         just_inserted_data_shreds: &HashMap<(u64, u64), Shred>,
         last_root: &RwLock<u64>,
         leader_schedule: Option<&Arc<LeaderScheduleCache>>,
-        is_recovered: bool,
+        shred_source: ShredSource,
     ) -> bool {
         use crate::shred::SHRED_PAYLOAD_SIZE;
         let shred_index = u64::from(shred.index());
@@ -1371,8 +1437,8 @@ impl Blockstore {
                 (
                     "error",
                     format!(
-                        "Leader {:?}, slot {}: received index {} >= slot.last_index {}, is_recovered: {}",
-                        leader_pubkey, slot, shred_index, last_index, is_recovered
+                        "Leader {:?}, slot {}: received index {} >= slot.last_index {}, shred_source: {:?}",
+                        leader_pubkey, slot, shred_index, last_index, shred_source
                     ),
                     String
                 )
@@ -1407,8 +1473,8 @@ impl Blockstore {
                 (
                     "error",
                     format!(
-                        "Leader {:?}, slot {}: received shred_index {} < slot.received {}, is_recovered: {}",
-                        leader_pubkey, slot, shred_index, slot_meta.received, is_recovered
+                        "Leader {:?}, slot {}: received shred_index {} < slot.received {}, shred_source: {:?}",
+                        leader_pubkey, slot, shred_index, slot_meta.received, shred_source
                     ),
                     String
                 )
@@ -1426,6 +1492,7 @@ impl Blockstore {
         data_index: &mut ShredIndex,
         shred: &Shred,
         write_batch: &mut WriteBatch,
+        shred_source: ShredSource,
     ) -> Result<Vec<(u32, u32)>> {
         let slot = shred.slot();
         let index = u64::from(shred.index());
@@ -1474,9 +1541,32 @@ impl Blockstore {
             index as u32,
             new_consumed,
             shred.reference_tick(),
-            &data_index,
+            data_index,
         );
+        if shred_source == ShredSource::Repaired || shred_source == ShredSource::Recovered {
+            let mut slots_stats = self.slots_stats.lock().unwrap();
+            let mut e = slots_stats.stats.entry(slot_meta.slot).or_default();
+            if shred_source == ShredSource::Repaired {
+                e.num_repaired += 1;
+            }
+            if shred_source == ShredSource::Recovered {
+                e.num_recovered += 1;
+            }
+        }
         if slot_meta.is_full() {
+            let (num_repaired, num_recovered) = {
+                let mut slots_stats = self.slots_stats.lock().unwrap();
+                if let Some(e) = slots_stats.stats.remove(&slot_meta.slot) {
+                    if slots_stats.last_cleanup_ts.elapsed().as_secs() > 30 {
+                        let root = self.last_root();
+                        slots_stats.stats = slots_stats.stats.split_off(&root);
+                        slots_stats.last_cleanup_ts = Instant::now();
+                    }
+                    (e.num_repaired, e.num_recovered)
+                } else {
+                    (0, 0)
+                }
+            };
             datapoint_info!(
                 "shred_insert_is_full",
                 (
@@ -1486,6 +1576,8 @@ impl Blockstore {
                 ),
                 ("slot", slot_meta.slot, i64),
                 ("last_index", slot_meta.last_index, i64),
+                ("num_repaired", num_repaired, i64),
+                ("num_recovered", num_recovered, i64),
             );
         }
         trace!("inserted shred into slot {:?} and index {:?}", slot, index);
@@ -1694,7 +1786,7 @@ impl Blockstore {
                 }
                 break;
             }
-            let (current_slot, index) = C::index(&db_iterator.key().expect("Expect a valid key"));
+            let (current_slot, index) = C::index(db_iterator.key().expect("Expect a valid key"));
 
             let current_index = {
                 if current_slot > slot {
@@ -1707,7 +1799,7 @@ impl Blockstore {
             let upper_index = cmp::min(current_index, end_index);
             // the tick that will be used to figure out the timeout for this hole
             let reference_tick = u64::from(Shred::reference_tick_from_data(
-                &db_iterator.value().expect("couldn't read value"),
+                db_iterator.value().expect("couldn't read value"),
             ));
 
             if ticks_since_first_insert < reference_tick + MAX_TURBINE_DELAY_IN_TICKS {
@@ -1956,18 +2048,24 @@ impl Blockstore {
             batch.put::<cf::TransactionStatusIndex>(0, &index0)?;
             Ok(None)
         } else {
-            let result = if index0.frozen && to_slot > index0.max_slot {
-                debug!("Pruning transaction index 0 at slot {}", index0.max_slot);
+            let purge_target_primary_index = if index0.frozen && to_slot > index0.max_slot {
+                info!(
+                    "Pruning expired primary index 0 up to slot {} (max requested: {})",
+                    index0.max_slot, to_slot
+                );
                 Some(0)
             } else if index1.frozen && to_slot > index1.max_slot {
-                debug!("Pruning transaction index 1 at slot {}", index1.max_slot);
+                info!(
+                    "Pruning expired primary index 1 up to slot {} (max requested: {})",
+                    index1.max_slot, to_slot
+                );
                 Some(1)
             } else {
                 None
             };
 
-            if result.is_some() {
-                *w_active_transaction_status_index = if index0.frozen { 0 } else { 1 };
+            if let Some(purge_target_primary_index) = purge_target_primary_index {
+                *w_active_transaction_status_index = purge_target_primary_index;
                 if index0.frozen {
                     index0.max_slot = 0
                 };
@@ -1980,16 +2078,17 @@ impl Blockstore {
                 batch.put::<cf::TransactionStatusIndex>(1, &index1)?;
             }
 
-            Ok(result)
+            Ok(purge_target_primary_index)
         }
     }
 
-    fn get_primary_index(
+    fn get_primary_index_to_write(
         &self,
         slot: Slot,
-        w_active_transaction_status_index: &mut u64,
+        // take WriteGuard to require critical section semantics at call site
+        w_active_transaction_status_index: &RwLockWriteGuard<Slot>,
     ) -> Result<u64> {
-        let i = *w_active_transaction_status_index;
+        let i = **w_active_transaction_status_index;
         let mut index_meta = self.transaction_status_index_cf.get(i)?.unwrap();
         if slot > index_meta.max_slot {
             assert!(!index_meta.frozen);
@@ -2028,9 +2127,10 @@ impl Blockstore {
         let status = status.into();
         // This write lock prevents interleaving issues with the transaction_status_index_cf by gating
         // writes to that column
-        let mut w_active_transaction_status_index =
+        let w_active_transaction_status_index =
             self.active_transaction_status_index.write().unwrap();
-        let primary_index = self.get_primary_index(slot, &mut w_active_transaction_status_index)?;
+        let primary_index =
+            self.get_primary_index_to_write(slot, &w_active_transaction_status_index)?;
         self.transaction_status_cf
             .put_protobuf((primary_index, signature, slot), &status)?;
         for address in writable_keys {
@@ -2048,6 +2148,21 @@ impl Blockstore {
         Ok(())
     }
 
+    fn ensure_lowest_cleanup_slot(&self) -> (std::sync::RwLockReadGuard<Slot>, Slot) {
+        // Ensures consistent result by using lowest_cleanup_slot as the lower bound
+        // for reading columns that do not employ strong read consistency with slot-based
+        // delete_range
+        let lowest_cleanup_slot = self.lowest_cleanup_slot.read().unwrap();
+        let lowest_available_slot = (*lowest_cleanup_slot)
+            .checked_add(1)
+            .expect("overflow from trusted value");
+
+        // Make caller hold this lock properly; otherwise LedgerCleanupService can purge/compact
+        // needed slots here at any given moment.
+        // Blockstore callers, like rpc, can process concurrent read queries
+        (lowest_cleanup_slot, lowest_available_slot)
+    }
+
     // Returns a transaction status, as well as a loop counter for unit testing
     fn get_transaction_status_with_counter(
         &self,
@@ -2055,9 +2170,15 @@ impl Blockstore {
         confirmed_unrooted_slots: &[Slot],
     ) -> Result<(Option<(Slot, TransactionStatusMeta)>, u64)> {
         let mut counter = 0;
+        let (lock, lowest_available_slot) = self.ensure_lowest_cleanup_slot();
+
         for transaction_status_cf_primary_index in 0..=1 {
             let index_iterator = self.transaction_status_cf.iter(IteratorMode::From(
-                (transaction_status_cf_primary_index, signature, 0),
+                (
+                    transaction_status_cf_primary_index,
+                    signature,
+                    lowest_available_slot,
+                ),
                 IteratorDirection::Forward,
             ))?;
             for ((i, sig, slot), _data) in index_iterator {
@@ -2076,6 +2197,8 @@ impl Blockstore {
                 return Ok((status, counter));
             }
         }
+        drop(lock);
+
         Ok((None, counter))
     }
 
@@ -2199,13 +2322,15 @@ impl Blockstore {
         start_slot: Slot,
         end_slot: Slot,
     ) -> Result<Vec<(Slot, Signature)>> {
+        let (lock, lowest_available_slot) = self.ensure_lowest_cleanup_slot();
+
         let mut signatures: Vec<(Slot, Signature)> = vec![];
         for transaction_status_cf_primary_index in 0..=1 {
             let index_iterator = self.address_signatures_cf.iter(IteratorMode::From(
                 (
                     transaction_status_cf_primary_index,
                     pubkey,
-                    start_slot,
+                    start_slot.max(lowest_available_slot),
                     Signature::default(),
                 ),
                 IteratorDirection::Forward,
@@ -2220,6 +2345,7 @@ impl Blockstore {
                 }
             }
         }
+        drop(lock);
         signatures.sort_by(|a, b| a.0.partial_cmp(&b.0).unwrap().then(a.1.cmp(&b.1)));
         Ok(signatures)
     }
@@ -2232,13 +2358,14 @@ impl Blockstore {
         pubkey: Pubkey,
         slot: Slot,
     ) -> Result<Vec<(Slot, Signature)>> {
+        let (lock, lowest_available_slot) = self.ensure_lowest_cleanup_slot();
         let mut signatures: Vec<(Slot, Signature)> = vec![];
         for transaction_status_cf_primary_index in 0..=1 {
             let index_iterator = self.address_signatures_cf.iter(IteratorMode::From(
                 (
                     transaction_status_cf_primary_index,
                     pubkey,
-                    slot,
+                    slot.max(lowest_available_slot),
                     Signature::default(),
                 ),
                 IteratorDirection::Forward,
@@ -2253,6 +2380,7 @@ impl Blockstore {
                 signatures.push((slot, signature));
             }
         }
+        drop(lock);
         signatures.sort_by(|a, b| a.0.partial_cmp(&b.0).unwrap().then(a.1.cmp(&b.1)));
         Ok(signatures)
     }
@@ -2409,7 +2537,7 @@ impl Blockstore {
             address_signatures.extend(
                 signatures
                     .into_iter()
-                    .filter(|(_, signature)| !excluded_signatures.contains(&signature)),
+                    .filter(|(_, signature)| !excluded_signatures.contains(signature)),
             )
         } else {
             address_signatures.append(&mut signatures);
@@ -2492,7 +2620,7 @@ impl Blockstore {
         next_primary_index_iter_timer.stop();
         let mut address_signatures: Vec<(Slot, Signature)> = address_signatures
             .into_iter()
-            .filter(|(_, signature)| !until_excluded_signatures.contains(&signature))
+            .filter(|(_, signature)| !until_excluded_signatures.contains(signature))
             .collect();
         address_signatures.truncate(limit);
 
@@ -2823,9 +2951,11 @@ impl Blockstore {
         }
     }
 
-    pub fn set_roots(&self, rooted_slots: &[u64]) -> Result<()> {
+    pub fn set_roots<'a>(&self, rooted_slots: impl Iterator<Item = &'a Slot>) -> Result<()> {
         let mut write_batch = self.db.batch()?;
+        let mut max_new_rooted_slot = 0;
         for slot in rooted_slots {
+            max_new_rooted_slot = std::cmp::max(max_new_rooted_slot, *slot);
             write_batch.put::<cf::Root>(*slot, &true)?;
         }
 
@@ -2835,7 +2965,7 @@ impl Blockstore {
         if *last_root == std::u64::MAX {
             *last_root = 0;
         }
-        *last_root = cmp::max(*rooted_slots.iter().max().unwrap(), *last_root);
+        *last_root = cmp::max(max_new_rooted_slot, *last_root);
         Ok(())
     }
 
@@ -2970,7 +3100,7 @@ impl Blockstore {
     }
 
     pub fn scan_and_fix_roots(&self, exit: &Arc<AtomicBool>) -> Result<()> {
-        let ancestor_iterator = AncestorIterator::new(self.last_root(), &self)
+        let ancestor_iterator = AncestorIterator::new(self.last_root(), self)
             .take_while(|&slot| slot >= self.lowest_cleanup_slot());
 
         let mut find_missing_roots = Measure::start("find_missing_roots");
@@ -2990,7 +3120,7 @@ impl Blockstore {
                     return Ok(());
                 }
                 trace!("{:?}", chunk);
-                self.set_roots(&roots_to_fix)?;
+                self.set_roots(chunk.iter())?;
             }
         } else {
             debug!(
@@ -3255,8 +3385,8 @@ fn commit_slot_meta_working_set(
         }
         // Check if the working copy of the metadata has changed
         if Some(meta) != meta_backup.as_ref() {
-            should_signal = should_signal || slot_has_updates(meta, &meta_backup);
-            write_batch.put::<cf::SlotMeta>(*slot, &meta)?;
+            should_signal = should_signal || slot_has_updates(meta, meta_backup);
+            write_batch.put::<cf::SlotMeta>(*slot, meta)?;
         }
     }
 
@@ -3407,7 +3537,7 @@ fn handle_chaining_for_slot(
         traverse_children_mut(
             db,
             slot,
-            &meta,
+            meta,
             working_set,
             new_chained_slots,
             slot_function,
@@ -3497,7 +3627,7 @@ pub fn create_new_ledger(
     access_type: AccessType,
 ) -> Result<Hash> {
     Blockstore::destroy(ledger_path)?;
-    genesis_config.write(&ledger_path)?;
+    genesis_config.write(ledger_path)?;
 
     // Fill slot 0 with ticks that link back to the genesis_config to bootstrap the ledger.
     let blockstore = Blockstore::open_with_access_type(ledger_path, access_type, None, false)?;
@@ -3512,7 +3642,7 @@ pub fn create_new_ledger(
     assert!(shreds.last().unwrap().last_in_slot());
 
     blockstore.insert_shreds(shreds, None, false)?;
-    blockstore.set_roots(&[0])?;
+    blockstore.set_roots(std::iter::once(&0))?;
     // Explicitly close the blockstore before we create the archived genesis file
     drop(blockstore);
 
@@ -4531,7 +4661,7 @@ pub mod tests {
         let ledger_path = get_tmp_ledger_path!();
         let BlockstoreSignals {
             blockstore: ledger,
-            completed_slots_receivers: [recvr, _],
+            completed_slots_receiver: recvr,
             ..
         } = Blockstore::open_with_signal(&ledger_path, None, true).unwrap();
         let ledger = Arc::new(ledger);
@@ -4557,7 +4687,7 @@ pub mod tests {
         let ledger_path = get_tmp_ledger_path!();
         let BlockstoreSignals {
             blockstore: ledger,
-            completed_slots_receivers: [recvr, _],
+            completed_slots_receiver: recvr,
             ..
         } = Blockstore::open_with_signal(&ledger_path, None, true).unwrap();
         let ledger = Arc::new(ledger);
@@ -4601,7 +4731,7 @@ pub mod tests {
         let ledger_path = get_tmp_ledger_path!();
         let BlockstoreSignals {
             blockstore: ledger,
-            completed_slots_receivers: [recvr, _],
+            completed_slots_receiver: recvr,
             ..
         } = Blockstore::open_with_signal(&ledger_path, None, true).unwrap();
         let ledger = Arc::new(ledger);
@@ -5382,7 +5512,7 @@ pub mod tests {
                 &HashMap::new(),
                 &last_root,
                 None,
-                false
+                ShredSource::Turbine
             ));
 
             // Ensure that an empty shred (one with no data) would get inserted. Such shreds
@@ -5405,7 +5535,7 @@ pub mod tests {
                 &HashMap::new(),
                 &last_root,
                 None,
-                false
+                ShredSource::Repaired,
             ));
             empty_shred.data_header.size = 0;
             assert!(!blockstore.should_insert_data_shred(
@@ -5414,7 +5544,7 @@ pub mod tests {
                 &HashMap::new(),
                 &last_root,
                 None,
-                false
+                ShredSource::Recovered,
             ));
 
             // Trying to insert another "is_last" shred with index < the received index should fail
@@ -5438,7 +5568,7 @@ pub mod tests {
                 &HashMap::new(),
                 &last_root,
                 None,
-                false
+                ShredSource::Repaired,
             ));
             assert!(blockstore.has_duplicate_shreds_in_slot(0));
 
@@ -5459,7 +5589,7 @@ pub mod tests {
                 &HashMap::new(),
                 &last_root,
                 None,
-                false
+                ShredSource::Repaired,
             ));
         }
         Blockstore::destroy(&blockstore_path).expect("Expected successful database destruction");
@@ -5527,6 +5657,7 @@ pub mod tests {
                     panic!("no dupes");
                 },
                 false,
+                false,
             ));
 
             // insert again fails on dupe
@@ -5542,6 +5673,7 @@ pub mod tests {
                     counter.fetch_add(1, Ordering::Relaxed);
                 },
                 false,
+                false,
             ));
             assert_eq!(counter.load(Ordering::Relaxed), 1);
         }
@@ -5761,7 +5893,7 @@ pub mod tests {
         let chained_slots = vec![0, 2, 4, 7, 12, 15];
         assert_eq!(blockstore.last_root(), 0);
 
-        blockstore.set_roots(&chained_slots).unwrap();
+        blockstore.set_roots(chained_slots.iter()).unwrap();
 
         assert_eq!(blockstore.last_root(), 15);
 
@@ -5778,7 +5910,7 @@ pub mod tests {
         let blockstore_path = get_tmp_ledger_path!();
         let blockstore = Blockstore::open(&blockstore_path).unwrap();
         let roots = vec![2, 4, 7, 12, 15];
-        blockstore.set_roots(&roots).unwrap();
+        blockstore.set_roots(roots.iter()).unwrap();
 
         for i in 0..20 {
             if i < 2 || roots.contains(&i) || i > 15 {
@@ -5947,7 +6079,7 @@ pub mod tests {
         let last_root = 100;
         {
             let blockstore = Blockstore::open(&blockstore_path).unwrap();
-            blockstore.set_roots(&[last_root]).unwrap();
+            blockstore.set_roots(std::iter::once(&last_root)).unwrap();
 
             // Insert will fail, slot < root
             blockstore
@@ -5976,7 +6108,9 @@ pub mod tests {
         ledger.insert_shreds(shreds, None, false).unwrap();
         ledger.insert_shreds(more_shreds, None, false).unwrap();
         ledger.insert_shreds(unrooted_shreds, None, false).unwrap();
-        ledger.set_roots(&[slot - 1, slot, slot + 1]).unwrap();
+        ledger
+            .set_roots(vec![slot - 1, slot, slot + 1].iter())
+            .unwrap();
 
         let parent_meta = SlotMeta {
             parent_slot: std::u64::MAX,
@@ -6531,7 +6665,7 @@ pub mod tests {
             let meta3 = SlotMeta::new(3, 2);
             blockstore.meta_cf.put(3, &meta3).unwrap();
 
-            blockstore.set_roots(&[0, 2]).unwrap();
+            blockstore.set_roots(vec![0, 2].iter()).unwrap();
 
             // Initialize index 0, including:
             //   signature2 in non-root and root,
@@ -6676,6 +6810,176 @@ pub mod tests {
         Blockstore::destroy(&blockstore_path).expect("Expected successful database destruction");
     }
 
+    fn do_test_lowest_cleanup_slot_and_special_cfs(
+        simulate_compaction: bool,
+        simulate_ledger_cleanup_service: bool,
+    ) {
+        solana_logger::setup();
+
+        let blockstore_path = get_tmp_ledger_path!();
+        {
+            let blockstore = Blockstore::open(&blockstore_path).unwrap();
+            // TransactionStatus column opens initialized with one entry at index 2
+            let transaction_status_cf = blockstore.db.column::<cf::TransactionStatus>();
+
+            let pre_balances_vec = vec![1, 2, 3];
+            let post_balances_vec = vec![3, 2, 1];
+            let status = TransactionStatusMeta {
+                status: solana_sdk::transaction::Result::<()>::Ok(()),
+                fee: 42u64,
+                pre_balances: pre_balances_vec,
+                post_balances: post_balances_vec,
+                inner_instructions: Some(vec![]),
+                log_messages: Some(vec![]),
+                pre_token_balances: Some(vec![]),
+                post_token_balances: Some(vec![]),
+                rewards: Some(vec![]),
+            }
+            .into();
+
+            let signature1 = Signature::new(&[2u8; 64]);
+            let signature2 = Signature::new(&[3u8; 64]);
+
+            // Insert rooted slots 0..=3 with no fork
+            let meta0 = SlotMeta::new(0, 0);
+            blockstore.meta_cf.put(0, &meta0).unwrap();
+            let meta1 = SlotMeta::new(1, 0);
+            blockstore.meta_cf.put(1, &meta1).unwrap();
+            let meta2 = SlotMeta::new(2, 1);
+            blockstore.meta_cf.put(2, &meta2).unwrap();
+            let meta3 = SlotMeta::new(3, 2);
+            blockstore.meta_cf.put(3, &meta3).unwrap();
+
+            blockstore.set_roots(vec![0, 1, 2, 3].iter()).unwrap();
+
+            let lowest_cleanup_slot = 1;
+            let lowest_available_slot = lowest_cleanup_slot + 1;
+
+            transaction_status_cf
+                .put_protobuf((0, signature1, lowest_cleanup_slot), &status)
+                .unwrap();
+
+            transaction_status_cf
+                .put_protobuf((0, signature2, lowest_available_slot), &status)
+                .unwrap();
+
+            let address0 = solana_sdk::pubkey::new_rand();
+            let address1 = solana_sdk::pubkey::new_rand();
+            blockstore
+                .write_transaction_status(
+                    lowest_cleanup_slot,
+                    signature1,
+                    vec![&address0],
+                    vec![],
+                    TransactionStatusMeta::default(),
+                )
+                .unwrap();
+            blockstore
+                .write_transaction_status(
+                    lowest_available_slot,
+                    signature2,
+                    vec![&address1],
+                    vec![],
+                    TransactionStatusMeta::default(),
+                )
+                .unwrap();
+
+            let check_for_missing = || {
+                (
+                    blockstore
+                        .get_transaction_status_with_counter(signature1, &[])
+                        .unwrap()
+                        .0
+                        .is_none(),
+                    blockstore
+                        .find_address_signatures_for_slot(address0, lowest_cleanup_slot)
+                        .unwrap()
+                        .is_empty(),
+                    blockstore
+                        .find_address_signatures(address0, lowest_cleanup_slot, lowest_cleanup_slot)
+                        .unwrap()
+                        .is_empty(),
+                )
+            };
+
+            let assert_existing_always = || {
+                let are_existing_always = (
+                    blockstore
+                        .get_transaction_status_with_counter(signature2, &[])
+                        .unwrap()
+                        .0
+                        .is_some(),
+                    !blockstore
+                        .find_address_signatures_for_slot(address1, lowest_available_slot)
+                        .unwrap()
+                        .is_empty(),
+                    !blockstore
+                        .find_address_signatures(
+                            address1,
+                            lowest_available_slot,
+                            lowest_available_slot,
+                        )
+                        .unwrap()
+                        .is_empty(),
+                );
+                assert_eq!(are_existing_always, (true, true, true));
+            };
+
+            let are_missing = check_for_missing();
+            // should never be missing before the conditional compaction & simulation...
+            assert_eq!(are_missing, (false, false, false));
+            assert_existing_always();
+
+            if simulate_compaction {
+                blockstore.set_max_expired_slot(lowest_cleanup_slot);
+                // force compaction filters to run across whole key range.
+                blockstore
+                    .compact_storage(Slot::min_value(), Slot::max_value())
+                    .unwrap();
+            }
+
+            if simulate_ledger_cleanup_service {
+                *blockstore.lowest_cleanup_slot.write().unwrap() = lowest_cleanup_slot;
+            }
+
+            let are_missing = check_for_missing();
+            if simulate_compaction || simulate_ledger_cleanup_service {
+                // ... when either simulation (or both) is effective, we should observe to be missing
+                // consistently
+                assert_eq!(are_missing, (true, true, true));
+            } else {
+                // ... otherwise, we should observe to be existing...
+                assert_eq!(are_missing, (false, false, false));
+            }
+            assert_existing_always();
+        }
+        Blockstore::destroy(&blockstore_path).expect("Expected successful database destruction");
+    }
+
+    #[test]
+    fn test_lowest_cleanup_slot_and_special_cfs_with_compact_with_ledger_cleanup_service_simulation(
+    ) {
+        do_test_lowest_cleanup_slot_and_special_cfs(true, true);
+    }
+
+    #[test]
+    fn test_lowest_cleanup_slot_and_special_cfs_with_compact_without_ledger_cleanup_service_simulation(
+    ) {
+        do_test_lowest_cleanup_slot_and_special_cfs(true, false);
+    }
+
+    #[test]
+    fn test_lowest_cleanup_slot_and_special_cfs_without_compact_with_ledger_cleanup_service_simulation(
+    ) {
+        do_test_lowest_cleanup_slot_and_special_cfs(false, true);
+    }
+
+    #[test]
+    fn test_lowest_cleanup_slot_and_special_cfs_without_compact_without_ledger_cleanup_service_simulation(
+    ) {
+        do_test_lowest_cleanup_slot_and_special_cfs(false, false);
+    }
+
     #[test]
     fn test_get_rooted_transaction() {
         let slot = 2;
@@ -6684,7 +6988,7 @@ pub mod tests {
         let ledger_path = get_tmp_ledger_path!();
         let blockstore = Blockstore::open(&ledger_path).unwrap();
         blockstore.insert_shreds(shreds, None, false).unwrap();
-        blockstore.set_roots(&[slot - 1, slot]).unwrap();
+        blockstore.set_roots(vec![slot - 1, slot].iter()).unwrap();
 
         let expected_transactions: Vec<TransactionWithStatusMeta> = entries
             .iter()
@@ -6872,7 +7176,7 @@ pub mod tests {
     fn test_empty_transaction_status() {
         let blockstore_path = get_tmp_ledger_path!();
         let blockstore = Blockstore::open(&blockstore_path).unwrap();
-        blockstore.set_roots(&[0]).unwrap();
+        blockstore.set_roots(std::iter::once(&0)).unwrap();
         assert_eq!(
             blockstore
                 .get_rooted_transaction(Signature::default())
@@ -6918,7 +7222,7 @@ pub mod tests {
                     )
                     .unwrap();
             }
-            blockstore.set_roots(&[slot0, slot1]).unwrap();
+            blockstore.set_roots(vec![slot0, slot1].iter()).unwrap();
 
             let all0 = blockstore
                 .get_confirmed_signatures_for_address(address0, 0, 50)
@@ -7011,7 +7315,7 @@ pub mod tests {
                     )
                     .unwrap();
             }
-            blockstore.set_roots(&[21, 22, 23, 24]).unwrap();
+            blockstore.set_roots(vec![21, 22, 23, 24].iter()).unwrap();
             let mut past_slot = 0;
             for (slot, _) in blockstore.find_address_signatures(address0, 1, 25).unwrap() {
                 assert!(slot >= past_slot);
@@ -7083,7 +7387,7 @@ pub mod tests {
                     )
                     .unwrap();
             }
-            blockstore.set_roots(&[slot1]).unwrap();
+            blockstore.set_roots(std::iter::once(&slot1)).unwrap();
 
             let slot1_signatures = blockstore
                 .find_address_signatures_for_slot(address0, 1)
@@ -7189,7 +7493,9 @@ pub mod tests {
             }
 
             // Leave one slot unrooted to test only returns confirmed signatures
-            blockstore.set_roots(&[1, 2, 4, 5, 6, 7, 8]).unwrap();
+            blockstore
+                .set_roots(vec![1, 2, 4, 5, 6, 7, 8].iter())
+                .unwrap();
             let highest_confirmed_root = 8;
 
             // Fetch all rooted signatures for address 0 at once...
@@ -8035,6 +8341,7 @@ pub mod tests {
                     lamports: 42 + i,
                     post_balance: std::u64::MAX,
                     reward_type: Some(RewardType::Fee),
+                    commission: None,
                 })
                 .collect();
             let protobuf_rewards: generated::Rewards = rewards.into();
@@ -8101,6 +8408,7 @@ pub mod tests {
                     lamports: -42,
                     post_balance: 42,
                     reward_type: Some(RewardType::Rent),
+                    commission: None,
                 }]),
             };
             let deprecated_status: StoredTransactionStatusMeta = status.clone().into();
diff --git a/ledger/src/blockstore/blockstore_purge.rs b/ledger/src/blockstore/blockstore_purge.rs
index 4fe38a3f4f824a..e847b246742667 100644
--- a/ledger/src/blockstore/blockstore_purge.rs
+++ b/ledger/src/blockstore/blockstore_purge.rs
@@ -32,6 +32,19 @@ impl Blockstore {
         }
     }
 
+    /// Usually this is paired with .purge_slots() but we can't internally call this in
+    /// that function unconditionally. That's because set_max_expired_slot()
+    /// expects to purge older slots by the successive chronological order, while .purge_slots()
+    /// can also be used to purge *future* slots for --hard-fork thing, preserving older
+    /// slots. It'd be quite dangerous to purge older slots in that case.
+    /// So, current legal user of this function is LedgerCleanupService.
+    pub fn set_max_expired_slot(&self, to_slot: Slot) {
+        // convert here from inclusive purged range end to inclusive alive range start to align
+        // with Slot::default() for initial compaction filter behavior consistency
+        let to_slot = to_slot.checked_add(1).unwrap();
+        self.db.set_oldest_slot(to_slot);
+    }
+
     pub fn purge_and_compact_slots(&self, from_slot: Slot, to_slot: Slot) {
         self.purge_slots(from_slot, to_slot, PurgeType::Exact);
         if let Err(e) = self.compact_storage(from_slot, to_slot) {
@@ -122,6 +135,10 @@ impl Blockstore {
             .db
             .delete_range_cf::<cf::SlotMeta>(&mut write_batch, from_slot, to_slot)
             .is_ok()
+            & self
+                .db
+                .delete_range_cf::<cf::BankHash>(&mut write_batch, from_slot, to_slot)
+                .is_ok()
             & self
                 .db
                 .delete_range_cf::<cf::Root>(&mut write_batch, from_slot, to_slot)
@@ -165,6 +182,10 @@ impl Blockstore {
             & self
                 .db
                 .delete_range_cf::<cf::PerfSamples>(&mut write_batch, from_slot, to_slot)
+                .is_ok()
+            & self
+                .db
+                .delete_range_cf::<cf::BlockHeight>(&mut write_batch, from_slot, to_slot)
                 .is_ok();
         let mut w_active_transaction_status_index =
             self.active_transaction_status_index.write().unwrap();
@@ -180,6 +201,13 @@ impl Blockstore {
                     to_slot,
                 )?;
             }
+            PurgeType::CompactionFilter => {
+                // No explicit action is required here because this purge type completely and
+                // indefinitely relies on the proper working of compaction filter for those
+                // special column families, never toggling the primary index from the current
+                // one. Overall, this enables well uniformly distributed writes, resulting
+                // in no spiky periodic huge delete_range for them.
+            }
         }
         delete_range_timer.stop();
         let mut write_timer = Measure::start("write_batch");
@@ -193,6 +221,10 @@ impl Blockstore {
         write_timer.stop();
         purge_stats.delete_range += delete_range_timer.as_us();
         purge_stats.write_batch += write_timer.as_us();
+        // only drop w_active_transaction_status_index after we do db.write(write_batch);
+        // otherwise, readers might be confused with inconsistent state between
+        // self.active_transaction_status_index and RockDb's TransactionStatusIndex contents
+        drop(w_active_transaction_status_index);
         Ok(columns_purged)
     }
 
@@ -236,6 +268,10 @@ impl Blockstore {
                 .orphans_cf
                 .compact_range(from_slot, to_slot)
                 .unwrap_or(false)
+            && self
+                .bank_hash_cf
+                .compact_range(from_slot, to_slot)
+                .unwrap_or(false)
             && self
                 .index_cf
                 .compact_range(from_slot, to_slot)
@@ -263,6 +299,10 @@ impl Blockstore {
             && self
                 .perf_samples_cf
                 .compact_range(from_slot, to_slot)
+                .unwrap_or(false)
+            && self
+                .block_height_cf
+                .compact_range(from_slot, to_slot)
                 .unwrap_or(false);
         compact_timer.stop();
         if !result {
@@ -323,18 +363,26 @@ impl Blockstore {
         w_active_transaction_status_index: &mut u64,
         to_slot: Slot,
     ) -> Result<()> {
-        if let Some(index) = self.toggle_transaction_status_index(
+        if let Some(purged_index) = self.toggle_transaction_status_index(
             write_batch,
             w_active_transaction_status_index,
             to_slot,
         )? {
             *columns_purged &= self
                 .db
-                .delete_range_cf::<cf::TransactionStatus>(write_batch, index, index + 1)
+                .delete_range_cf::<cf::TransactionStatus>(
+                    write_batch,
+                    purged_index,
+                    purged_index + 1,
+                )
                 .is_ok()
                 & self
                     .db
-                    .delete_range_cf::<cf::AddressSignatures>(write_batch, index, index + 1)
+                    .delete_range_cf::<cf::AddressSignatures>(
+                        write_batch,
+                        purged_index,
+                        purged_index + 1,
+                    )
                     .is_ok();
         }
         Ok(())
diff --git a/ledger/src/blockstore_db.rs b/ledger/src/blockstore_db.rs
index b6dd277ea8ac55..72e564006b8568 100644
--- a/ledger/src/blockstore_db.rs
+++ b/ledger/src/blockstore_db.rs
@@ -5,9 +5,13 @@ use log::*;
 use prost::Message;
 pub use rocksdb::Direction as IteratorDirection;
 use rocksdb::{
-    self, ColumnFamily, ColumnFamilyDescriptor, DBIterator, DBRawIterator, DBRecoveryMode,
-    IteratorMode as RocksIteratorMode, Options, WriteBatch as RWriteBatch, DB,
+    self,
+    compaction_filter::CompactionFilter,
+    compaction_filter_factory::{CompactionFilterContext, CompactionFilterFactory},
+    ColumnFamily, ColumnFamilyDescriptor, CompactionDecision, DBIterator, DBRawIterator,
+    DBRecoveryMode, IteratorMode as RocksIteratorMode, Options, WriteBatch as RWriteBatch, DB,
 };
+
 use serde::de::DeserializeOwned;
 use serde::Serialize;
 use solana_runtime::hardened_unpack::UnpackError;
@@ -17,7 +21,17 @@ use solana_sdk::{
     signature::Signature,
 };
 use solana_storage_proto::convert::generated;
-use std::{collections::HashMap, fs, marker::PhantomData, path::Path, sync::Arc};
+use std::{
+    collections::{HashMap, HashSet},
+    ffi::{CStr, CString},
+    fs,
+    marker::PhantomData,
+    path::Path,
+    sync::{
+        atomic::{AtomicU64, Ordering},
+        Arc,
+    },
+};
 use thiserror::Error;
 
 const MAX_WRITE_BUFFER_SIZE: u64 = 256 * 1024 * 1024; // 256MB
@@ -33,6 +47,8 @@ const DUPLICATE_SLOTS_CF: &str = "duplicate_slots";
 const ERASURE_META_CF: &str = "erasure_meta";
 // Column family for orphans data
 const ORPHANS_CF: &str = "orphans";
+/// Column family for bank hashes
+const BANK_HASH_CF: &str = "bank_hashes";
 // Column family for root data
 const ROOT_CF: &str = "root";
 /// Column family for indexes
@@ -57,6 +73,11 @@ const BLOCKTIME_CF: &str = "blocktime";
 const PERF_SAMPLES_CF: &str = "perf_samples";
 /// Column family for BlockHeight
 const BLOCK_HEIGHT_CF: &str = "block_height";
+/// Column family for ProgramCosts
+const PROGRAM_COSTS_CF: &str = "program_costs";
+
+// 1 day is chosen for the same reasoning of DEFAULT_COMPACTION_SLOT_INTERVAL
+const PERIODIC_COMPACTION_SECONDS: u64 = 60 * 60 * 24;
 
 #[derive(Error, Debug)]
 pub enum BlockstoreError {
@@ -114,6 +135,10 @@ pub mod columns {
     /// The erasure meta column
     pub struct ErasureMeta;
 
+    #[derive(Debug)]
+    /// The bank hash column
+    pub struct BankHash;
+
     #[derive(Debug)]
     /// The root column
     pub struct Root;
@@ -157,6 +182,10 @@ pub mod columns {
     #[derive(Debug)]
     /// The block height column
     pub struct BlockHeight;
+
+    #[derive(Debug)]
+    // The program costs column
+    pub struct ProgramCosts;
 }
 
 pub enum AccessType {
@@ -208,8 +237,30 @@ impl From<BlockstoreRecoveryMode> for DBRecoveryMode {
     }
 }
 
+#[derive(Default, Clone, Debug)]
+struct OldestSlot(Arc<AtomicU64>);
+
+impl OldestSlot {
+    pub fn set(&self, oldest_slot: Slot) {
+        // this is independently used for compaction_filter without any data dependency.
+        // also, compaction_filters are created via its factories, creating short-lived copies of
+        // this atomic value for the single job of compaction. So, Relaxed store can be justified
+        // in total
+        self.0.store(oldest_slot, Ordering::Relaxed);
+    }
+
+    pub fn get(&self) -> Slot {
+        // copy from the AtomicU64 as a general precaution so that the oldest_slot can not mutate
+        // across single run of compaction for simpler reasoning although this isn't strict
+        // requirement at the moment
+        // also eventual propagation (very Relaxed) load is Ok, because compaction by nature doesn't
+        // require strictly synchronized semantics in this regard
+        self.0.load(Ordering::Relaxed)
+    }
+}
+
 #[derive(Debug)]
-struct Rocks(rocksdb::DB, ActualAccessType);
+struct Rocks(rocksdb::DB, ActualAccessType, OldestSlot);
 
 impl Rocks {
     fn open(
@@ -217,11 +268,7 @@ impl Rocks {
         access_type: AccessType,
         recovery_mode: Option<BlockstoreRecoveryMode>,
     ) -> Result<Rocks> {
-        use columns::{
-            AddressSignatures, BlockHeight, Blocktime, DeadSlots, DuplicateSlots, ErasureMeta,
-            Index, Orphans, PerfSamples, Rewards, Root, ShredCode, ShredData, SlotMeta,
-            TransactionStatus, TransactionStatusIndex,
-        };
+        use columns::*;
 
         fs::create_dir_all(&path)?;
 
@@ -234,39 +281,83 @@ impl Rocks {
             db_options.set_wal_recovery_mode(recovery_mode.into());
         }
 
+        let oldest_slot = OldestSlot::default();
+
         // Column family names
-        let meta_cf_descriptor =
-            ColumnFamilyDescriptor::new(SlotMeta::NAME, get_cf_options(&access_type));
-        let dead_slots_cf_descriptor =
-            ColumnFamilyDescriptor::new(DeadSlots::NAME, get_cf_options(&access_type));
-        let duplicate_slots_cf_descriptor =
-            ColumnFamilyDescriptor::new(DuplicateSlots::NAME, get_cf_options(&access_type));
-        let erasure_meta_cf_descriptor =
-            ColumnFamilyDescriptor::new(ErasureMeta::NAME, get_cf_options(&access_type));
-        let orphans_cf_descriptor =
-            ColumnFamilyDescriptor::new(Orphans::NAME, get_cf_options(&access_type));
-        let root_cf_descriptor =
-            ColumnFamilyDescriptor::new(Root::NAME, get_cf_options(&access_type));
-        let index_cf_descriptor =
-            ColumnFamilyDescriptor::new(Index::NAME, get_cf_options(&access_type));
-        let shred_data_cf_descriptor =
-            ColumnFamilyDescriptor::new(ShredData::NAME, get_cf_options(&access_type));
-        let shred_code_cf_descriptor =
-            ColumnFamilyDescriptor::new(ShredCode::NAME, get_cf_options(&access_type));
-        let transaction_status_cf_descriptor =
-            ColumnFamilyDescriptor::new(TransactionStatus::NAME, get_cf_options(&access_type));
-        let address_signatures_cf_descriptor =
-            ColumnFamilyDescriptor::new(AddressSignatures::NAME, get_cf_options(&access_type));
-        let transaction_status_index_cf_descriptor =
-            ColumnFamilyDescriptor::new(TransactionStatusIndex::NAME, get_cf_options(&access_type));
-        let rewards_cf_descriptor =
-            ColumnFamilyDescriptor::new(Rewards::NAME, get_cf_options(&access_type));
-        let blocktime_cf_descriptor =
-            ColumnFamilyDescriptor::new(Blocktime::NAME, get_cf_options(&access_type));
-        let perf_samples_cf_descriptor =
-            ColumnFamilyDescriptor::new(PerfSamples::NAME, get_cf_options(&access_type));
-        let block_height_cf_descriptor =
-            ColumnFamilyDescriptor::new(BlockHeight::NAME, get_cf_options(&access_type));
+        let meta_cf_descriptor = ColumnFamilyDescriptor::new(
+            SlotMeta::NAME,
+            get_cf_options::<SlotMeta>(&access_type, &oldest_slot),
+        );
+        let dead_slots_cf_descriptor = ColumnFamilyDescriptor::new(
+            DeadSlots::NAME,
+            get_cf_options::<DeadSlots>(&access_type, &oldest_slot),
+        );
+        let duplicate_slots_cf_descriptor = ColumnFamilyDescriptor::new(
+            DuplicateSlots::NAME,
+            get_cf_options::<DuplicateSlots>(&access_type, &oldest_slot),
+        );
+        let erasure_meta_cf_descriptor = ColumnFamilyDescriptor::new(
+            ErasureMeta::NAME,
+            get_cf_options::<ErasureMeta>(&access_type, &oldest_slot),
+        );
+        let orphans_cf_descriptor = ColumnFamilyDescriptor::new(
+            Orphans::NAME,
+            get_cf_options::<Orphans>(&access_type, &oldest_slot),
+        );
+        let bank_hash_cf_descriptor = ColumnFamilyDescriptor::new(
+            BankHash::NAME,
+            get_cf_options::<BankHash>(&access_type, &oldest_slot),
+        );
+        let root_cf_descriptor = ColumnFamilyDescriptor::new(
+            Root::NAME,
+            get_cf_options::<Root>(&access_type, &oldest_slot),
+        );
+        let index_cf_descriptor = ColumnFamilyDescriptor::new(
+            Index::NAME,
+            get_cf_options::<Index>(&access_type, &oldest_slot),
+        );
+        let shred_data_cf_descriptor = ColumnFamilyDescriptor::new(
+            ShredData::NAME,
+            get_cf_options::<ShredData>(&access_type, &oldest_slot),
+        );
+        let shred_code_cf_descriptor = ColumnFamilyDescriptor::new(
+            ShredCode::NAME,
+            get_cf_options::<ShredCode>(&access_type, &oldest_slot),
+        );
+        let transaction_status_cf_descriptor = ColumnFamilyDescriptor::new(
+            TransactionStatus::NAME,
+            get_cf_options::<TransactionStatus>(&access_type, &oldest_slot),
+        );
+        let address_signatures_cf_descriptor = ColumnFamilyDescriptor::new(
+            AddressSignatures::NAME,
+            get_cf_options::<AddressSignatures>(&access_type, &oldest_slot),
+        );
+        let transaction_status_index_cf_descriptor = ColumnFamilyDescriptor::new(
+            TransactionStatusIndex::NAME,
+            get_cf_options::<TransactionStatusIndex>(&access_type, &oldest_slot),
+        );
+        let rewards_cf_descriptor = ColumnFamilyDescriptor::new(
+            Rewards::NAME,
+            get_cf_options::<Rewards>(&access_type, &oldest_slot),
+        );
+        let blocktime_cf_descriptor = ColumnFamilyDescriptor::new(
+            Blocktime::NAME,
+            get_cf_options::<Blocktime>(&access_type, &oldest_slot),
+        );
+        let perf_samples_cf_descriptor = ColumnFamilyDescriptor::new(
+            PerfSamples::NAME,
+            get_cf_options::<PerfSamples>(&access_type, &oldest_slot),
+        );
+        let block_height_cf_descriptor = ColumnFamilyDescriptor::new(
+            BlockHeight::NAME,
+            get_cf_options::<BlockHeight>(&access_type, &oldest_slot),
+        );
+        let program_costs_cf_descriptor = ColumnFamilyDescriptor::new(
+            ProgramCosts::NAME,
+            get_cf_options::<ProgramCosts>(&access_type, &oldest_slot),
+        );
+        // Don't forget to add to both run_purge_with_stats() and
+        // compact_storage() in ledger/src/blockstore/blockstore_purge.rs!!
 
         let cfs = vec![
             (SlotMeta::NAME, meta_cf_descriptor),
@@ -274,6 +365,7 @@ impl Rocks {
             (DuplicateSlots::NAME, duplicate_slots_cf_descriptor),
             (ErasureMeta::NAME, erasure_meta_cf_descriptor),
             (Orphans::NAME, orphans_cf_descriptor),
+            (BankHash::NAME, bank_hash_cf_descriptor),
             (Root::NAME, root_cf_descriptor),
             (Index::NAME, index_cf_descriptor),
             (ShredData::NAME, shred_data_cf_descriptor),
@@ -288,19 +380,20 @@ impl Rocks {
             (Blocktime::NAME, blocktime_cf_descriptor),
             (PerfSamples::NAME, perf_samples_cf_descriptor),
             (BlockHeight::NAME, block_height_cf_descriptor),
+            (ProgramCosts::NAME, program_costs_cf_descriptor),
         ];
+        let cf_names: Vec<_> = cfs.iter().map(|c| c.0).collect();
 
         // Open the database
         let db = match access_type {
             AccessType::PrimaryOnly | AccessType::PrimaryOnlyForMaintenance => Rocks(
                 DB::open_cf_descriptors(&db_options, path, cfs.into_iter().map(|c| c.1))?,
                 ActualAccessType::Primary,
+                oldest_slot,
             ),
             AccessType::TryPrimaryThenSecondary => {
-                let names: Vec<_> = cfs.iter().map(|c| c.0).collect();
-
                 match DB::open_cf_descriptors(&db_options, path, cfs.into_iter().map(|c| c.1)) {
-                    Ok(db) => Rocks(db, ActualAccessType::Primary),
+                    Ok(db) => Rocks(db, ActualAccessType::Primary, oldest_slot),
                     Err(err) => {
                         let secondary_path = path.join("solana-secondary");
 
@@ -312,23 +405,81 @@ impl Rocks {
                         db_options.set_max_open_files(-1);
 
                         Rocks(
-                            DB::open_cf_as_secondary(&db_options, path, &secondary_path, names)?,
+                            DB::open_cf_as_secondary(
+                                &db_options,
+                                path,
+                                &secondary_path,
+                                cf_names.clone(),
+                            )?,
                             ActualAccessType::Secondary,
+                            oldest_slot,
                         )
                     }
                 }
             }
         };
+        // this is only needed for LedgerCleanupService. so guard with PrimaryOnly (i.e. running solana-validator)
+        if matches!(access_type, AccessType::PrimaryOnly) {
+            for cf_name in cf_names {
+                // these special column families must be excluded from LedgerCleanupService's rocksdb
+                // compactions
+                if excludes_from_compaction(cf_name) {
+                    continue;
+                }
+
+                // This is the crux of our write-stall-free storage cleaning strategy with consistent
+                // state view for higher-layers
+                //
+                // For the consistent view, we commit delete_range on pruned slot range by LedgerCleanupService.
+                // simple story here.
+                //
+                // For actual storage cleaning, we employ RocksDB compaction. But default RocksDB compaction
+                // settings don't work well for us. That's because we're using it rather like a really big
+                // (100 GBs) ring-buffer. RocksDB is basically assuming uniform data write over the key space for
+                // efficient compaction, which isn't true for our use as a ring buffer.
+                //
+                // So, we customize the compaction strategy with 2 combined tweaks:
+                // (1) compaction_filter and (2) shortening its periodic cycles.
+                //
+                // Via the compaction_filter, we finally reclaim previously delete_range()-ed storage occupied
+                // by pruned slots. When compaction_filter is set, each SST files are re-compacted periodically
+                // to hunt for keys newly expired by the compaction_filter re-evaluation. But RocksDb's default
+                // `periodic_compaction_seconds` is 30 days, which is too long for our case. So, we
+                // shorten it to a day (24 hours).
+                //
+                // As we write newer SST files over time at rather consistent rate of speed, this
+                // effectively makes each newly-created ssts be re-compacted for the filter at
+                // well-dispersed different timings.
+                // As a whole, we rewrite the whole dataset at every PERIODIC_COMPACTION_SECONDS,
+                // slowly over the duration of PERIODIC_COMPACTION_SECONDS. So, this results in
+                // amortization.
+                // So, there is a bit inefficiency here because we'll rewrite not-so-old SST files
+                // too. But longer period would introduce higher variance of ledger storage sizes over
+                // the long period. And it's much better than the daily IO spike caused by compact_range() by
+                // previous implementation.
+                //
+                // `ttl` and `compact_range`(`ManualCompaction`), doesn't work nicely. That's
+                // because its original intention is delete_range()s to reclaim disk space. So it tries to merge
+                // them with N+1 SST files all way down to the bottommost SSTs, often leading to vastly large amount
+                // (= all) of invalidated SST files, when combined with newer writes happening at the opposite
+                // edge of the key space. This causes a long and heavy disk IOs and possible write
+                // stall and ultimately, the deadly Replay/Banking stage stall at higher layers.
+                db.0.set_options_cf(
+                    db.cf_handle(cf_name),
+                    &[(
+                        "periodic_compaction_seconds",
+                        &format!("{}", PERIODIC_COMPACTION_SECONDS),
+                    )],
+                )
+                .unwrap();
+            }
+        }
 
         Ok(db)
     }
 
     fn columns(&self) -> Vec<&'static str> {
-        use columns::{
-            AddressSignatures, BlockHeight, Blocktime, DeadSlots, DuplicateSlots, ErasureMeta,
-            Index, Orphans, PerfSamples, Rewards, Root, ShredCode, ShredData, SlotMeta,
-            TransactionStatus, TransactionStatusIndex,
-        };
+        use columns::*;
 
         vec![
             ErasureMeta::NAME,
@@ -336,6 +487,7 @@ impl Rocks {
             DuplicateSlots::NAME,
             Index::NAME,
             Orphans::NAME,
+            BankHash::NAME,
             Root::NAME,
             SlotMeta::NAME,
             ShredData::NAME,
@@ -347,6 +499,7 @@ impl Rocks {
             Blocktime::NAME,
             PerfSamples::NAME,
             BlockHeight::NAME,
+            ProgramCosts::NAME,
         ]
     }
 
@@ -363,7 +516,7 @@ impl Rocks {
     }
 
     fn get_cf(&self, cf: &ColumnFamily, key: &[u8]) -> Result<Option<Vec<u8>>> {
-        let opt = self.0.get_cf(cf, key)?.map(|db_vec| db_vec.to_vec());
+        let opt = self.0.get_cf(cf, key)?;
         Ok(opt)
     }
 
@@ -415,9 +568,13 @@ pub trait Column {
 
     fn key(index: Self::Index) -> Vec<u8>;
     fn index(key: &[u8]) -> Self::Index;
-    fn primary_index(index: Self::Index) -> Slot;
+    // this return Slot or some u64
+    fn primary_index(index: Self::Index) -> u64;
     #[allow(clippy::wrong_self_convention)]
     fn as_index(slot: Slot) -> Self::Index;
+    fn slot(index: Self::Index) -> Slot {
+        Self::primary_index(index)
+    }
 }
 
 pub trait ColumnName {
@@ -491,6 +648,10 @@ impl Column for columns::TransactionStatus {
         index.0
     }
 
+    fn slot(index: Self::Index) -> Slot {
+        index.2
+    }
+
     #[allow(clippy::wrong_self_convention)]
     fn as_index(index: u64) -> Self::Index {
         (index, Signature::default(), 0)
@@ -528,6 +689,10 @@ impl Column for columns::AddressSignatures {
         index.0
     }
 
+    fn slot(index: Self::Index) -> Slot {
+        index.2
+    }
+
     #[allow(clippy::wrong_self_convention)]
     fn as_index(index: u64) -> Self::Index {
         (index, Pubkey::default(), 0, Signature::default())
@@ -555,6 +720,10 @@ impl Column for columns::TransactionStatusIndex {
         index
     }
 
+    fn slot(_index: Self::Index) -> Slot {
+        unimplemented!()
+    }
+
     #[allow(clippy::wrong_self_convention)]
     fn as_index(slot: u64) -> u64 {
         slot
@@ -565,6 +734,14 @@ impl ColumnName for columns::TransactionStatusIndex {
     const NAME: &'static str = TRANSACTION_STATUS_INDEX_CF;
 }
 
+impl SlotColumn for columns::BankHash {}
+impl ColumnName for columns::BankHash {
+    const NAME: &'static str = BANK_HASH_CF;
+}
+impl TypedColumn for columns::BankHash {
+    type Type = blockstore_meta::FrozenHashVersioned;
+}
+
 impl SlotColumn for columns::Rewards {}
 impl ColumnName for columns::Rewards {
     const NAME: &'static str = REWARDS_CF;
@@ -597,6 +774,39 @@ impl TypedColumn for columns::BlockHeight {
     type Type = u64;
 }
 
+impl ColumnName for columns::ProgramCosts {
+    const NAME: &'static str = PROGRAM_COSTS_CF;
+}
+impl TypedColumn for columns::ProgramCosts {
+    type Type = blockstore_meta::ProgramCost;
+}
+impl Column for columns::ProgramCosts {
+    type Index = Pubkey;
+
+    fn key(pubkey: Pubkey) -> Vec<u8> {
+        let mut key = vec![0; 32]; // size_of Pubkey
+        key[0..32].clone_from_slice(&pubkey.as_ref()[0..32]);
+        key
+    }
+
+    fn index(key: &[u8]) -> Self::Index {
+        Pubkey::new(&key[0..32])
+    }
+
+    fn primary_index(_index: Self::Index) -> u64 {
+        unimplemented!()
+    }
+
+    fn slot(_index: Self::Index) -> Slot {
+        unimplemented!()
+    }
+
+    #[allow(clippy::wrong_self_convention)]
+    fn as_index(_index: u64) -> Self::Index {
+        Pubkey::default()
+    }
+}
+
 impl Column for columns::ShredCode {
     type Index = (u64, u64);
 
@@ -855,6 +1065,10 @@ impl Database {
     pub fn is_primary_access(&self) -> bool {
         self.backend.is_primary_access()
     }
+
+    pub fn set_oldest_slot(&self, oldest_slot: Slot) {
+        self.backend.2.set(oldest_slot);
+    }
 }
 
 impl<C> LedgerColumn<C>
@@ -1032,7 +1246,63 @@ impl<'a> WriteBatch<'a> {
     }
 }
 
-fn get_cf_options(access_type: &AccessType) -> Options {
+struct PurgedSlotFilter<C: Column + ColumnName> {
+    oldest_slot: Slot,
+    name: CString,
+    _phantom: PhantomData<C>,
+}
+
+impl<C: Column + ColumnName> CompactionFilter for PurgedSlotFilter<C> {
+    fn filter(&mut self, _level: u32, key: &[u8], _value: &[u8]) -> CompactionDecision {
+        use rocksdb::CompactionDecision::*;
+
+        let slot_in_key = C::slot(C::index(key));
+        // Refer to a comment about periodic_compaction_seconds, especially regarding implicit
+        // periodic execution of compaction_filters
+        if slot_in_key >= self.oldest_slot {
+            Keep
+        } else {
+            Remove
+        }
+    }
+
+    fn name(&self) -> &CStr {
+        &self.name
+    }
+}
+
+struct PurgedSlotFilterFactory<C: Column + ColumnName> {
+    oldest_slot: OldestSlot,
+    name: CString,
+    _phantom: PhantomData<C>,
+}
+
+impl<C: Column + ColumnName> CompactionFilterFactory for PurgedSlotFilterFactory<C> {
+    type Filter = PurgedSlotFilter<C>;
+
+    fn create(&mut self, _context: CompactionFilterContext) -> Self::Filter {
+        let copied_oldest_slot = self.oldest_slot.get();
+        PurgedSlotFilter::<C> {
+            oldest_slot: copied_oldest_slot,
+            name: CString::new(format!(
+                "purged_slot_filter({}, {:?})",
+                C::NAME,
+                copied_oldest_slot
+            ))
+            .unwrap(),
+            _phantom: PhantomData::default(),
+        }
+    }
+
+    fn name(&self) -> &CStr {
+        &self.name
+    }
+}
+
+fn get_cf_options<C: 'static + Column + ColumnName>(
+    access_type: &AccessType,
+    oldest_slot: &OldestSlot,
+) -> Options {
     let mut options = Options::default();
     // 256 * 8 = 2GB. 6 of these columns should take at most 12GB of RAM
     options.set_max_write_buffer_number(8);
@@ -1046,6 +1316,17 @@ fn get_cf_options(access_type: &AccessType) -> Options {
     options.set_level_zero_file_num_compaction_trigger(file_num_compaction_trigger as i32);
     options.set_max_bytes_for_level_base(total_size_base);
     options.set_target_file_size_base(file_size_base);
+
+    // TransactionStatusIndex must be excluded from LedgerCleanupService's rocksdb
+    // compactions....
+    if matches!(access_type, AccessType::PrimaryOnly) && !excludes_from_compaction(C::NAME) {
+        options.set_compaction_filter_factory(PurgedSlotFilterFactory::<C> {
+            oldest_slot: oldest_slot.clone(),
+            name: CString::new(format!("purged_slot_filter_factory({})", C::NAME)).unwrap(),
+            _phantom: PhantomData::default(),
+        });
+    }
+
     if matches!(access_type, AccessType::PrimaryOnlyForMaintenance) {
         options.set_disable_auto_compactions(true);
     }
@@ -1077,3 +1358,79 @@ fn get_db_options(access_type: &AccessType) -> Options {
 
     options
 }
+
+fn excludes_from_compaction(cf_name: &str) -> bool {
+    // list of Column Families must be excluded from compaction:
+    let no_compaction_cfs: HashSet<&'static str> = vec![
+        columns::TransactionStatusIndex::NAME,
+        columns::ProgramCosts::NAME,
+    ]
+    .into_iter()
+    .collect();
+
+    no_compaction_cfs.get(cf_name).is_some()
+}
+
+#[cfg(test)]
+pub mod tests {
+    use super::*;
+    use crate::blockstore_db::columns::ShredData;
+
+    #[test]
+    fn test_compaction_filter() {
+        // this doesn't implement Clone...
+        let dummy_compaction_filter_context = || CompactionFilterContext {
+            is_full_compaction: true,
+            is_manual_compaction: true,
+        };
+        let oldest_slot = OldestSlot::default();
+
+        let mut factory = PurgedSlotFilterFactory::<ShredData> {
+            oldest_slot: oldest_slot.clone(),
+            name: CString::new("test compaction filter").unwrap(),
+            _phantom: PhantomData::default(),
+        };
+        let mut compaction_filter = factory.create(dummy_compaction_filter_context());
+
+        let dummy_level = 0;
+        let key = ShredData::key(ShredData::as_index(0));
+        let dummy_value = vec![];
+
+        // we can't use assert_matches! because CompactionDecision doesn't implement Debug
+        assert!(matches!(
+            compaction_filter.filter(dummy_level, &key, &dummy_value),
+            CompactionDecision::Keep
+        ));
+
+        // mutating oledst_slot doen't affect existing compaction filters...
+        oldest_slot.set(1);
+        assert!(matches!(
+            compaction_filter.filter(dummy_level, &key, &dummy_value),
+            CompactionDecision::Keep
+        ));
+
+        // recreating compaction filter starts to expire the key
+        let mut compaction_filter = factory.create(dummy_compaction_filter_context());
+        assert!(matches!(
+            compaction_filter.filter(dummy_level, &key, &dummy_value),
+            CompactionDecision::Remove
+        ));
+
+        // newer key shouldn't be removed
+        let key = ShredData::key(ShredData::as_index(1));
+        matches!(
+            compaction_filter.filter(dummy_level, &key, &dummy_value),
+            CompactionDecision::Keep
+        );
+    }
+
+    #[test]
+    fn test_excludes_from_compaction() {
+        // currently there are two CFs are excluded from compaction:
+        assert!(excludes_from_compaction(
+            columns::TransactionStatusIndex::NAME
+        ));
+        assert!(excludes_from_compaction(columns::ProgramCosts::NAME));
+        assert!(!excludes_from_compaction("something else"));
+    }
+}
diff --git a/ledger/src/blockstore_meta.rs b/ledger/src/blockstore_meta.rs
index 586a61adb53311..a0a41fcb592d5a 100644
--- a/ledger/src/blockstore_meta.rs
+++ b/ledger/src/blockstore_meta.rs
@@ -1,6 +1,6 @@
 use crate::erasure::ErasureConfig;
 use serde::{Deserialize, Serialize};
-use solana_sdk::clock::Slot;
+use solana_sdk::{clock::Slot, hash::Hash};
 use std::{collections::BTreeSet, ops::RangeBounds};
 
 #[derive(Clone, Debug, Default, Deserialize, Serialize, Eq, PartialEq)]
@@ -75,6 +75,33 @@ pub enum ErasureMetaStatus {
     StillNeed(usize),
 }
 
+#[derive(Deserialize, Serialize, Debug, PartialEq)]
+pub enum FrozenHashVersioned {
+    Current(FrozenHashStatus),
+}
+
+impl FrozenHashVersioned {
+    pub fn frozen_hash(&self) -> Hash {
+        match self {
+            FrozenHashVersioned::Current(frozen_hash_status) => frozen_hash_status.frozen_hash,
+        }
+    }
+
+    pub fn is_duplicate_confirmed(&self) -> bool {
+        match self {
+            FrozenHashVersioned::Current(frozen_hash_status) => {
+                frozen_hash_status.is_duplicate_confirmed
+            }
+        }
+    }
+}
+
+#[derive(Deserialize, Serialize, Debug, PartialEq)]
+pub struct FrozenHashStatus {
+    pub frozen_hash: Hash,
+    pub is_duplicate_confirmed: bool,
+}
+
 impl Index {
     pub(crate) fn new(slot: Slot) -> Self {
         Index {
@@ -253,6 +280,11 @@ pub struct PerfSample {
     pub sample_period_secs: u16,
 }
 
+#[derive(Clone, Debug, Default, Deserialize, Serialize, PartialEq)]
+pub struct ProgramCost {
+    pub cost: u64,
+}
+
 #[cfg(test)]
 mod test {
     use super::*;
diff --git a/ledger/src/blockstore_processor.rs b/ledger/src/blockstore_processor.rs
index f10761d84c53f3..b1799d52f0e390 100644
--- a/ledger/src/blockstore_processor.rs
+++ b/ledger/src/blockstore_processor.rs
@@ -16,6 +16,7 @@ use solana_measure::measure::Measure;
 use solana_metrics::{datapoint_error, inc_new_counter_debug};
 use solana_rayon_threadlimit::get_thread_count;
 use solana_runtime::{
+    accounts_db::AccountShrinkThreshold,
     accounts_index::AccountSecondaryIndexes,
     bank::{
         Bank, ExecuteTimings, InnerInstructionsList, RentDebits, TransactionBalancesSet,
@@ -24,6 +25,7 @@ use solana_runtime::{
     bank_forks::BankForks,
     bank_utils,
     commitment::VOTE_THRESHOLD_SIZE,
+    snapshot_utils::BankFromArchiveTimings,
     transaction_batch::TransactionBatch,
     vote_account::ArcVoteAccount,
     vote_sender_types::ReplayVoteSender,
@@ -110,7 +112,7 @@ fn execute_batch(
     let mut mint_decimals: HashMap<Pubkey, u8> = HashMap::new();
 
     let pre_token_balances = if record_token_balances {
-        collect_token_balances(&bank, &batch, &mut mint_decimals)
+        collect_token_balances(bank, batch, &mut mint_decimals)
     } else {
         vec![]
     };
@@ -137,7 +139,7 @@ fn execute_batch(
     if let Some(transaction_status_sender) = transaction_status_sender {
         let txs = batch.transactions_iter().cloned().collect();
         let post_token_balances = if record_token_balances {
-            collect_token_balances(&bank, &batch, &mut mint_decimals)
+            collect_token_balances(bank, batch, &mut mint_decimals)
         } else {
             vec![]
         };
@@ -193,6 +195,8 @@ fn execute_batches(
             })
         });
 
+    timings.total_batches_len += batches.len();
+    timings.num_execute_batches += 1;
     for timing in new_timings {
         timings.accumulate(&timing);
     }
@@ -325,7 +329,7 @@ fn process_entries_with_callback(
         timings,
     )?;
     for hash in tick_hashes {
-        bank.register_tick(&hash);
+        bank.register_tick(hash);
     }
     Ok(())
 }
@@ -373,6 +377,8 @@ pub struct ProcessOptions {
     pub limit_load_slot_count_from_snapshot: Option<usize>,
     pub allow_dead_slots: bool,
     pub accounts_db_test_hash_calculation: bool,
+    pub accounts_db_skip_shrink: bool,
+    pub shrink_ratio: AccountShrinkThreshold,
 }
 
 pub fn process_blockstore(
@@ -393,13 +399,15 @@ pub fn process_blockstore(
 
     // Setup bank for slot 0
     let bank0 = Bank::new_with_paths(
-        &genesis_config,
+        genesis_config,
         account_paths,
         &opts.frozen_accounts,
         opts.debug_keys.clone(),
         Some(&crate::builtins::get(opts.bpf_jit)),
         opts.account_indexes.clone(),
         opts.accounts_db_caching_enabled,
+        opts.shrink_ratio,
+        false,
     );
     let bank0 = Arc::new(bank0);
     info!("processing ledger for slot 0...");
@@ -418,6 +426,7 @@ pub fn process_blockstore(
         &recyclers,
         None,
         cache_block_meta_sender,
+        BankFromArchiveTimings::default(),
     )
 }
 
@@ -429,6 +438,7 @@ pub(crate) fn process_blockstore_from_root(
     recyclers: &VerifyRecyclers,
     transaction_status_sender: Option<&TransactionStatusSender>,
     cache_block_meta_sender: Option<&CacheBlockMetaSender>,
+    timings: BankFromArchiveTimings,
 ) -> BlockstoreProcessorResult {
     do_process_blockstore_from_root(
         blockstore,
@@ -437,6 +447,7 @@ pub(crate) fn process_blockstore_from_root(
         recyclers,
         transaction_status_sender,
         cache_block_meta_sender,
+        timings,
     )
 }
 
@@ -447,6 +458,7 @@ fn do_process_blockstore_from_root(
     recyclers: &VerifyRecyclers,
     transaction_status_sender: Option<&TransactionStatusSender>,
     cache_block_meta_sender: Option<&CacheBlockMetaSender>,
+    timings: BankFromArchiveTimings,
 ) -> BlockstoreProcessorResult {
     info!("processing ledger from slot {}...", bank.slot());
 
@@ -474,7 +486,7 @@ fn do_process_blockstore_from_root(
     // ensure start_slot is rooted for correct replay
     if blockstore.is_primary_access() {
         blockstore
-            .set_roots(&[start_slot])
+            .set_roots(std::iter::once(&start_slot))
             .expect("Couldn't set root slot on startup");
     } else if !blockstore.is_root(start_slot) {
         panic!("starting slot isn't root and can't update due to being secondary blockstore access: {}", start_slot);
@@ -526,18 +538,45 @@ fn do_process_blockstore_from_root(
     }
     let bank_forks = BankForks::new_from_banks(&initial_forks, root);
 
+    let processing_time = now.elapsed();
+
+    let debug_verify = opts.accounts_db_test_hash_calculation;
+    let mut time_cap = Measure::start("capitalization");
+    // We might be promptly restarted after bad capitalization was detected while creating newer snapshot.
+    // In that case, we're most likely restored from the last good snapshot and replayed up to this root.
+    // So again check here for the bad capitalization to avoid to continue until the next snapshot creation.
+    if !bank_forks
+        .root_bank()
+        .calculate_and_verify_capitalization(debug_verify)
+    {
+        return Err(BlockstoreProcessorError::RootBankWithMismatchedCapitalization(root));
+    }
+    time_cap.stop();
+
     datapoint_info!(
         "process_blockstore_from_root",
-        ("total_time_us", now.elapsed().as_micros(), i64),
+        ("total_time_us", processing_time.as_micros(), i64),
         ("frozen_banks", bank_forks.frozen_banks().len(), i64),
         ("slot", bank_forks.root(), i64),
-        ("forks", initial_forks.len(), i64)
+        ("forks", initial_forks.len(), i64),
+        ("calculate_capitalization_us", time_cap.as_us(), i64),
+        ("untar_us", timings.untar_us, i64),
+        (
+            "rebuild_bank_from_snapshots_us",
+            timings.rebuild_bank_from_snapshots_us,
+            i64
+        ),
+        (
+            "verify_snapshot_bank_us",
+            timings.verify_snapshot_bank_us,
+            i64
+        ),
     );
 
     info!("ledger processing timing: {:?}", timing);
     info!(
         "ledger processed in {}. root slot is {}, {} fork{} at {}, with {} frozen bank{}",
-        HumanTime::from(chrono::Duration::from_std(now.elapsed()).unwrap())
+        HumanTime::from(chrono::Duration::from_std(processing_time).unwrap())
             .to_text_en(Accuracy::Precise, Tense::Present),
         bank_forks.root(),
         initial_forks.len(),
@@ -555,13 +594,6 @@ fn do_process_blockstore_from_root(
     );
     assert!(bank_forks.active_banks().is_empty());
 
-    // We might be promptly restarted after bad capitalization was detected while creating newer snapshot.
-    // In that case, we're most likely restored from the last good snapshot and replayed up to this root.
-    // So again check here for the bad capitalization to avoid to continue until the next snapshot creation.
-    if !bank_forks.root_bank().calculate_and_verify_capitalization() {
-        return Err(BlockstoreProcessorError::RootBankWithMismatchedCapitalization(root));
-    }
-
     Ok((bank_forks, leader_schedule_cache))
 }
 
@@ -760,8 +792,11 @@ pub fn confirm_slot(
     };
 
     let check_start = Instant::now();
-    let check_result =
-        entries.verify_and_hash_transactions(skip_verification, bank.secp256k1_program_enabled());
+    let check_result = entries.verify_and_hash_transactions(
+        skip_verification,
+        bank.libsecp256k1_0_5_upgrade_enabled(),
+        bank.verify_tx_signatures_len_enabled(),
+    );
     if check_result.is_none() {
         warn!("Ledger proof of history failed at slot: {}", slot);
         return Err(BlockError::InvalidEntryHash.into());
@@ -867,9 +902,9 @@ fn process_next_slots(
         // handles any partials
         if next_meta.is_full() {
             let next_bank = Arc::new(Bank::new_from_parent(
-                &bank,
+                bank,
                 &leader_schedule_cache
-                    .slot_leader_at(*next_slot, Some(&bank))
+                    .slot_leader_at(*next_slot, Some(bank))
                     .unwrap(),
                 *next_slot,
             ));
@@ -996,13 +1031,13 @@ fn load_frozen_forks(
                                 if new_root_bank.slot() == *root { break; } // Found the last root in the chain, yay!
                                 assert!(new_root_bank.slot() > *root);
 
-                                rooted_slots.push(new_root_bank.slot());
+                                rooted_slots.push((new_root_bank.slot(), new_root_bank.hash()));
                                 // As noted, the cluster confirmed root should be descended from
                                 // our last root; therefore parent should be set
                                 new_root_bank = new_root_bank.parent().unwrap();
                             }
                             inc_new_counter_info!("load_frozen_forks-cluster-confirmed-root", rooted_slots.len());
-                            blockstore.set_roots(&rooted_slots).expect("Blockstore::set_roots should succeed");
+                            blockstore.set_roots(rooted_slots.iter().map(|(slot, _hash)| slot)).expect("Blockstore::set_roots should succeed");
                             Some(cluster_root_bank)
                         } else {
                             None
@@ -1019,7 +1054,7 @@ fn load_frozen_forks(
                 *root = new_root_bank.slot();
                 last_root = new_root_bank.slot();
 
-                leader_schedule_cache.set_root(&new_root_bank);
+                leader_schedule_cache.set_root(new_root_bank);
                 new_root_bank.squash();
 
                 if last_free.elapsed() > Duration::from_secs(10) {
@@ -1165,7 +1200,7 @@ pub struct TransactionStatusBatch {
     pub balances: TransactionBalancesSet,
     pub token_balances: TransactionTokenBalancesSet,
     pub inner_instructions: Option<Vec<Option<InnerInstructionsList>>>,
-    pub transaction_logs: Option<Vec<TransactionLogMessages>>,
+    pub transaction_logs: Option<Vec<Option<TransactionLogMessages>>>,
     pub rent_debits: Vec<RentDebits>,
 }
 
@@ -1184,7 +1219,7 @@ impl TransactionStatusSender {
         balances: TransactionBalancesSet,
         token_balances: TransactionTokenBalancesSet,
         inner_instructions: Vec<Option<InnerInstructionsList>>,
-        transaction_logs: Vec<TransactionLogMessages>,
+        transaction_logs: Vec<Option<TransactionLogMessages>>,
         rent_debits: Vec<RentDebits>,
     ) {
         let slot = bank.slot();
@@ -1456,6 +1491,7 @@ pub mod tests {
 
         let opts = ProcessOptions {
             poh_verify: true,
+            accounts_db_test_hash_calculation: true,
             ..ProcessOptions::default()
         };
         let (bank_forks, _leader_schedule) =
@@ -1521,6 +1557,7 @@ pub mod tests {
 
         let opts = ProcessOptions {
             poh_verify: true,
+            accounts_db_test_hash_calculation: true,
             ..ProcessOptions::default()
         };
         let (bank_forks, _leader_schedule) =
@@ -1538,6 +1575,7 @@ pub mod tests {
         */
         let opts = ProcessOptions {
             poh_verify: true,
+            accounts_db_test_hash_calculation: true,
             ..ProcessOptions::default()
         };
         fill_blockstore_slot_with_ticks(&blockstore, ticks_per_slot, 3, 0, blockhash);
@@ -1603,10 +1641,11 @@ pub mod tests {
         info!("last_fork1_entry.hash: {:?}", last_fork1_entry_hash);
         info!("last_fork2_entry.hash: {:?}", last_fork2_entry_hash);
 
-        blockstore.set_roots(&[0, 1, 4]).unwrap();
+        blockstore.set_roots(vec![0, 1, 4].iter()).unwrap();
 
         let opts = ProcessOptions {
             poh_verify: true,
+            accounts_db_test_hash_calculation: true,
             ..ProcessOptions::default()
         };
         let (bank_forks, _leader_schedule) =
@@ -1682,10 +1721,11 @@ pub mod tests {
         info!("last_fork1_entry.hash: {:?}", last_fork1_entry_hash);
         info!("last_fork2_entry.hash: {:?}", last_fork2_entry_hash);
 
-        blockstore.set_roots(&[0, 1]).unwrap();
+        blockstore.set_roots(vec![0, 1].iter()).unwrap();
 
         let opts = ProcessOptions {
             poh_verify: true,
+            accounts_db_test_hash_calculation: true,
             ..ProcessOptions::default()
         };
         let (bank_forks, _leader_schedule) =
@@ -1891,15 +1931,18 @@ pub mod tests {
         }
 
         // Set a root on the last slot of the last confirmed epoch
-        let rooted_slots: Vec<_> = (0..=last_slot).collect();
-        blockstore.set_roots(&rooted_slots).unwrap();
+        let rooted_slots: Vec<Slot> = (0..=last_slot).collect();
+        blockstore.set_roots(rooted_slots.iter()).unwrap();
 
         // Set a root on the next slot of the confirmed epoch
-        blockstore.set_roots(&[last_slot + 1]).unwrap();
+        blockstore
+            .set_roots(std::iter::once(&(last_slot + 1)))
+            .unwrap();
 
         // Check that we can properly restart the ledger / leader scheduler doesn't fail
         let opts = ProcessOptions {
             poh_verify: true,
+            accounts_db_test_hash_calculation: true,
             ..ProcessOptions::default()
         };
         let (bank_forks, _leader_schedule) =
@@ -2044,6 +2087,7 @@ pub mod tests {
             .unwrap();
         let opts = ProcessOptions {
             poh_verify: true,
+            accounts_db_test_hash_calculation: true,
             ..ProcessOptions::default()
         };
         let (bank_forks, _leader_schedule) =
@@ -2073,6 +2117,7 @@ pub mod tests {
         let blockstore = Blockstore::open(&ledger_path).unwrap();
         let opts = ProcessOptions {
             poh_verify: true,
+            accounts_db_test_hash_calculation: true,
             ..ProcessOptions::default()
         };
         let (bank_forks, _leader_schedule) =
@@ -2091,6 +2136,7 @@ pub mod tests {
         let blockstore = Blockstore::open(&ledger_path).unwrap();
         let opts = ProcessOptions {
             override_num_threads: Some(1),
+            accounts_db_test_hash_calculation: true,
             ..ProcessOptions::default()
         };
         process_blockstore(&genesis_config, &blockstore, Vec::new(), opts, None).unwrap();
@@ -2107,6 +2153,7 @@ pub mod tests {
         let blockstore = Blockstore::open(&ledger_path).unwrap();
         let opts = ProcessOptions {
             full_leader_cache: true,
+            accounts_db_test_hash_calculation: true,
             ..ProcessOptions::default()
         };
         let (_bank_forks, leader_schedule) =
@@ -2168,6 +2215,7 @@ pub mod tests {
         let opts = ProcessOptions {
             override_num_threads: Some(1),
             entry_callback: Some(entry_callback),
+            accounts_db_test_hash_calculation: true,
             ..ProcessOptions::default()
         };
         process_blockstore(&genesis_config, &blockstore, Vec::new(), opts, None).unwrap();
@@ -2815,12 +2863,13 @@ pub mod tests {
             genesis_config.ticks_per_slot,
             genesis_config.hash(),
         );
-        blockstore.set_roots(&[0, 1]).unwrap();
+        blockstore.set_roots(vec![0, 1].iter()).unwrap();
 
         // Specify halting at slot 0
         let opts = ProcessOptions {
             poh_verify: true,
             dev_halt_at_slot: Some(0),
+            accounts_db_test_hash_calculation: true,
             ..ProcessOptions::default()
         };
         let (bank_forks, _leader_schedule) =
@@ -2865,12 +2914,13 @@ pub mod tests {
             last_hash =
                 fill_blockstore_slot_with_ticks(&blockstore, ticks_per_slot, i + 1, i, last_hash);
         }
-        blockstore.set_roots(&[3, 5]).unwrap();
+        blockstore.set_roots(vec![3, 5].iter()).unwrap();
 
         // Set up bank1
         let bank0 = Arc::new(Bank::new(&genesis_config));
         let opts = ProcessOptions {
             poh_verify: true,
+            accounts_db_test_hash_calculation: true,
             ..ProcessOptions::default()
         };
         let recyclers = VerifyRecyclers::default();
@@ -2890,9 +2940,16 @@ pub mod tests {
         bank1.squash();
 
         // Test process_blockstore_from_root() from slot 1 onwards
-        let (bank_forks, _leader_schedule) =
-            do_process_blockstore_from_root(&blockstore, bank1, &opts, &recyclers, None, None)
-                .unwrap();
+        let (bank_forks, _leader_schedule) = do_process_blockstore_from_root(
+            &blockstore,
+            bank1,
+            &opts,
+            &recyclers,
+            None,
+            None,
+            BankFromArchiveTimings::default(),
+        )
+        .unwrap();
 
         assert_eq!(frozen_bank_slots(&bank_forks), vec![5, 6]);
         assert_eq!(bank_forks.working_bank().slot(), 6);
@@ -3057,13 +3114,15 @@ pub mod tests {
         account_paths: Vec<PathBuf>,
     ) -> EpochSchedule {
         let bank = Bank::new_with_paths(
-            &genesis_config,
+            genesis_config,
             account_paths,
             &[],
             None,
             None,
             AccountSecondaryIndexes::default(),
             false,
+            AccountShrinkThreshold::default(),
+            false,
         );
         *bank.epoch_schedule()
     }
@@ -3236,7 +3295,7 @@ pub mod tests {
         slot_leader_keypair: &Arc<Keypair>,
     ) {
         // Add votes to `last_slot` so that `root` will be confirmed
-        let vote_entry = next_entry(&parent_blockhash, 1, vec![vote_tx]);
+        let vote_entry = next_entry(parent_blockhash, 1, vec![vote_tx]);
         let mut entries = create_ticks(ticks_per_slot, 0, vote_entry.hash);
         entries.insert(0, vote_entry);
         blockstore
@@ -3247,7 +3306,7 @@ pub mod tests {
                 ticks_per_slot,
                 Some(parent_slot),
                 true,
-                &slot_leader_keypair,
+                slot_leader_keypair,
                 entries,
                 0,
             )
@@ -3311,11 +3370,14 @@ pub mod tests {
         blockstore.add_tree(forks, false, true, ticks_per_slot, genesis_config.hash());
 
         if let Some(blockstore_root) = blockstore_root {
-            blockstore.set_roots(&[blockstore_root]).unwrap();
+            blockstore
+                .set_roots(std::iter::once(&blockstore_root))
+                .unwrap();
         }
 
         let opts = ProcessOptions {
             poh_verify: true,
+            accounts_db_test_hash_calculation: true,
             ..ProcessOptions::default()
         };
         let (bank_forks, _leader_schedule) =
diff --git a/ledger/src/entry.rs b/ledger/src/entry.rs
index f918bb37bc63ee..f6dfb77e7c09ba 100644
--- a/ledger/src/entry.rs
+++ b/ledger/src/entry.rs
@@ -359,7 +359,8 @@ pub trait EntrySlice {
     fn verify_and_hash_transactions(
         &self,
         skip_verification: bool,
-        secp256k1_program_enabled: bool,
+        libsecp256k1_0_5_upgrade_enabled: bool,
+        verify_tx_signatures_len: bool,
     ) -> Option<Vec<EntryType<'_>>>;
 }
 
@@ -514,7 +515,8 @@ impl EntrySlice for [Entry] {
     fn verify_and_hash_transactions<'a>(
         &'a self,
         skip_verification: bool,
-        secp256k1_program_enabled: bool,
+        libsecp256k1_0_5_upgrade_enabled: bool,
+        verify_tx_signatures_len: bool,
     ) -> Option<Vec<EntryType<'a>>> {
         let verify_and_hash = |tx: &'a Transaction| -> Option<HashedTransaction<'a>> {
             let message_hash = if !skip_verification {
@@ -522,9 +524,10 @@ impl EntrySlice for [Entry] {
                 if size > PACKET_DATA_SIZE as u64 {
                     return None;
                 }
-                if secp256k1_program_enabled {
-                    // Verify tx precompiles if secp256k1 program is enabled.
-                    tx.verify_precompiles().ok()?;
+                tx.verify_precompiles(libsecp256k1_0_5_upgrade_enabled)
+                    .ok()?;
+                if verify_tx_signatures_len && !tx.verify_signatures_len() {
+                    return None;
                 }
                 tx.verify_and_hash_message().ok()?
             } else {
@@ -682,7 +685,7 @@ impl EntrySlice for [Entry] {
 }
 
 pub fn next_entry_mut(start: &mut Hash, num_hashes: u64, transactions: Vec<Transaction>) -> Entry {
-    let entry = Entry::new(&start, num_hashes, transactions);
+    let entry = Entry::new(start, num_hashes, transactions);
     *start = entry.hash;
     entry
 }
@@ -724,44 +727,20 @@ pub fn next_entry(prev_hash: &Hash, num_hashes: u64, transactions: Vec<Transacti
 mod tests {
     use super::*;
     use crate::entry::Entry;
-    use chrono::prelude::Utc;
-    use solana_budget_program::budget_instruction;
     use solana_sdk::{
         hash::{hash, new_rand as hash_new_rand, Hash},
         message::Message,
         packet::PACKET_DATA_SIZE,
+        pubkey::Pubkey,
         signature::{Keypair, Signer},
-        system_transaction,
+        system_instruction, system_transaction,
         transaction::Transaction,
     };
 
-    fn create_sample_payment(keypair: &Keypair, hash: Hash) -> Transaction {
-        let pubkey = keypair.pubkey();
-        let budget_contract = Keypair::new();
-        let budget_pubkey = budget_contract.pubkey();
-        let ixs = budget_instruction::payment(&pubkey, &pubkey, &budget_pubkey, 1);
-        let message = Message::new(&ixs, Some(&pubkey));
-        Transaction::new(&[keypair, &budget_contract], message, hash)
-    }
-
-    fn create_sample_timestamp(keypair: &Keypair, hash: Hash) -> Transaction {
-        let pubkey = keypair.pubkey();
-        let ix = budget_instruction::apply_timestamp(&pubkey, &pubkey, &pubkey, Utc::now());
-        let message = Message::new(&[ix], Some(&pubkey));
-        Transaction::new(&[keypair], message, hash)
-    }
-
-    fn create_sample_apply_signature(keypair: &Keypair, hash: Hash) -> Transaction {
-        let pubkey = keypair.pubkey();
-        let ix = budget_instruction::apply_signature(&pubkey, &pubkey, &pubkey);
-        let message = Message::new(&[ix], Some(&pubkey));
-        Transaction::new(&[keypair], message, hash)
-    }
-
     #[test]
     fn test_entry_verify() {
         let zero = Hash::default();
-        let one = hash(&zero.as_ref());
+        let one = hash(zero.as_ref());
         assert!(Entry::new_tick(0, &zero).verify(&zero)); // base case, never used
         assert!(!Entry::new_tick(0, &zero).verify(&one)); // base case, bad
         assert!(next_entry(&zero, 1, vec![]).verify(&zero)); // inductive step
@@ -819,23 +798,6 @@ mod tests {
         assert!(e0.verify(&zero));
     }
 
-    #[test]
-    fn test_witness_reorder_attack() {
-        let zero = Hash::default();
-
-        // First, verify entries
-        let keypair = Keypair::new();
-        let tx0 = create_sample_timestamp(&keypair, zero);
-        let tx1 = create_sample_apply_signature(&keypair, zero);
-        let mut e0 = Entry::new(&zero, 0, vec![tx0.clone(), tx1.clone()]);
-        assert!(e0.verify(&zero));
-
-        // Next, swap two witness transactions and ensure verification fails.
-        e0.transactions[0] = tx1; // <-- attack
-        e0.transactions[1] = tx0;
-        assert!(!e0.verify(&zero));
-    }
-
     #[test]
     fn test_next_entry() {
         let zero = Hash::default();
@@ -848,7 +810,7 @@ mod tests {
         assert_eq!(tick.hash, zero);
 
         let keypair = Keypair::new();
-        let tx0 = create_sample_timestamp(&keypair, zero);
+        let tx0 = system_transaction::transfer(&keypair, &Pubkey::new_unique(), 42, zero);
         let entry0 = next_entry(&zero, 1, vec![tx0.clone()]);
         assert_eq!(entry0.num_hashes, 1);
         assert_eq!(entry0.hash, next_hash(&zero, 1, &[tx0]));
@@ -867,7 +829,7 @@ mod tests {
     fn test_verify_slice1() {
         solana_logger::setup();
         let zero = Hash::default();
-        let one = hash(&zero.as_ref());
+        let one = hash(zero.as_ref());
         assert!(vec![][..].verify(&zero)); // base case
         assert!(vec![Entry::new_tick(0, &zero)][..].verify(&zero)); // singleton case 1
         assert!(!vec![Entry::new_tick(0, &zero)][..].verify(&one)); // singleton case 2, bad
@@ -882,8 +844,8 @@ mod tests {
     fn test_verify_slice_with_hashes1() {
         solana_logger::setup();
         let zero = Hash::default();
-        let one = hash(&zero.as_ref());
-        let two = hash(&one.as_ref());
+        let one = hash(zero.as_ref());
+        let two = hash(one.as_ref());
         assert!(vec![][..].verify(&one)); // base case
         assert!(vec![Entry::new_tick(1, &two)][..].verify(&one)); // singleton case 1
         assert!(!vec![Entry::new_tick(1, &two)][..].verify(&two)); // singleton case 2, bad
@@ -902,11 +864,12 @@ mod tests {
     fn test_verify_slice_with_hashes_and_transactions() {
         solana_logger::setup();
         let zero = Hash::default();
-        let one = hash(&zero.as_ref());
-        let two = hash(&one.as_ref());
-        let alice_pubkey = Keypair::new();
-        let tx0 = create_sample_payment(&alice_pubkey, one);
-        let tx1 = create_sample_timestamp(&alice_pubkey, one);
+        let one = hash(zero.as_ref());
+        let two = hash(one.as_ref());
+        let alice_keypair = Keypair::new();
+        let bob_keypair = Keypair::new();
+        let tx0 = system_transaction::transfer(&alice_keypair, &bob_keypair.pubkey(), 1, one);
+        let tx1 = system_transaction::transfer(&bob_keypair, &alice_keypair.pubkey(), 1, one);
         assert!(vec![][..].verify(&one)); // base case
         assert!(vec![next_entry(&one, 1, vec![tx0.clone()])][..].verify(&one)); // singleton case 1
         assert!(!vec![next_entry(&one, 1, vec![tx0.clone()])][..].verify(&two)); // singleton case 2, bad
@@ -925,23 +888,76 @@ mod tests {
         assert!(!bad_ticks.verify(&one)); // inductive step, bad
     }
 
+    #[test]
+    fn test_verify_and_hash_transactions_sig_len() {
+        let mut rng = rand::thread_rng();
+        let recent_blockhash = hash_new_rand(&mut rng);
+        let from_keypair = Keypair::new();
+        let to_keypair = Keypair::new();
+        let from_pubkey = from_keypair.pubkey();
+        let to_pubkey = to_keypair.pubkey();
+
+        enum TestCase {
+            AddSignature,
+            RemoveSignature,
+        }
+
+        let make_transaction = |case: TestCase| {
+            let message = Message::new(
+                &[system_instruction::transfer(&from_pubkey, &to_pubkey, 1)],
+                Some(&from_pubkey),
+            );
+            let mut tx = Transaction::new(&[&from_keypair], message, recent_blockhash);
+            assert_eq!(tx.message.header.num_required_signatures, 1);
+            match case {
+                TestCase::AddSignature => {
+                    let signature = to_keypair.sign_message(&tx.message.serialize());
+                    tx.signatures.push(signature);
+                }
+                TestCase::RemoveSignature => {
+                    tx.signatures.remove(0);
+                }
+            }
+            tx
+        };
+        // No signatures.
+        {
+            let tx = make_transaction(TestCase::RemoveSignature);
+            let entries = vec![next_entry(&recent_blockhash, 1, vec![tx])];
+            assert!(entries[..]
+                .verify_and_hash_transactions(false, false, false)
+                .is_some());
+            assert!(entries[..]
+                .verify_and_hash_transactions(false, false, true)
+                .is_none());
+        }
+        // Too many signatures.
+        {
+            let tx = make_transaction(TestCase::AddSignature);
+            let entries = vec![next_entry(&recent_blockhash, 1, vec![tx])];
+            assert!(entries[..]
+                .verify_and_hash_transactions(false, false, false)
+                .is_some());
+            assert!(entries[..]
+                .verify_and_hash_transactions(false, false, true)
+                .is_none());
+        }
+    }
+
     #[test]
     fn test_verify_and_hash_transactions_packet_data_size() {
         let mut rng = rand::thread_rng();
         let recent_blockhash = hash_new_rand(&mut rng);
         let keypair = Keypair::new();
         let pubkey = keypair.pubkey();
-        let budget_contract = Keypair::new();
-        let budget_pubkey = budget_contract.pubkey();
         let make_transaction = |size| {
             let ixs: Vec<_> = std::iter::repeat_with(|| {
-                budget_instruction::payment(&pubkey, &pubkey, &budget_pubkey, 1)
+                system_instruction::transfer(&pubkey, &Pubkey::new_unique(), 1)
             })
             .take(size)
-            .flat_map(|x| x.into_iter())
             .collect();
             let message = Message::new(&ixs[..], Some(&pubkey));
-            Transaction::new(&[&keypair, &budget_contract], message, recent_blockhash)
+            Transaction::new(&[&keypair], message, recent_blockhash)
         };
         // Small transaction.
         {
@@ -949,27 +965,27 @@ mod tests {
             let entries = vec![next_entry(&recent_blockhash, 1, vec![tx.clone()])];
             assert!(bincode::serialized_size(&tx).unwrap() <= PACKET_DATA_SIZE as u64);
             assert!(entries[..]
-                .verify_and_hash_transactions(false, false)
+                .verify_and_hash_transactions(false, false, false)
                 .is_some());
         }
         // Big transaction.
         {
-            let tx = make_transaction(15);
+            let tx = make_transaction(25);
             let entries = vec![next_entry(&recent_blockhash, 1, vec![tx.clone()])];
             assert!(bincode::serialized_size(&tx).unwrap() > PACKET_DATA_SIZE as u64);
             assert!(entries[..]
-                .verify_and_hash_transactions(false, false)
+                .verify_and_hash_transactions(false, false, false)
                 .is_none());
         }
         // Assert that verify fails as soon as serialized
         // size exceeds packet data size.
-        for size in 1..20 {
+        for size in 1..30 {
             let tx = make_transaction(size);
             let entries = vec![next_entry(&recent_blockhash, 1, vec![tx.clone()])];
             assert_eq!(
                 bincode::serialized_size(&tx).unwrap() <= PACKET_DATA_SIZE as u64,
                 entries[..]
-                    .verify_and_hash_transactions(false, false)
+                    .verify_and_hash_transactions(false, false, false)
                     .is_some(),
             );
         }
diff --git a/ledger/src/leader_schedule_utils.rs b/ledger/src/leader_schedule_utils.rs
index 47df87242824a4..ea21a79b736e7d 100644
--- a/ledger/src/leader_schedule_utils.rs
+++ b/ledger/src/leader_schedule_utils.rs
@@ -63,9 +63,9 @@ fn sort_stakes(stakes: &mut Vec<(Pubkey, u64)>) {
     // Note: Use unstable sort, because we dedup right after to remove the equal elements.
     stakes.sort_unstable_by(|(l_pubkey, l_stake), (r_pubkey, r_stake)| {
         if r_stake == l_stake {
-            r_pubkey.cmp(&l_pubkey)
+            r_pubkey.cmp(l_pubkey)
         } else {
-            r_stake.cmp(&l_stake)
+            r_stake.cmp(l_stake)
         }
     });
 
diff --git a/ledger/src/lib.rs b/ledger/src/lib.rs
index b7542b47df1b15..de49994ede66ee 100644
--- a/ledger/src/lib.rs
+++ b/ledger/src/lib.rs
@@ -5,6 +5,7 @@ extern crate solana_bpf_loader_program;
 
 pub mod bank_forks_utils;
 pub mod bigtable_upload;
+pub mod bigtable_upload_service;
 pub mod block_error;
 #[macro_use]
 pub mod blockstore;
diff --git a/ledger/src/next_slots_iterator.rs b/ledger/src/next_slots_iterator.rs
index 945cdfab337201..f3c67a6cf0c643 100644
--- a/ledger/src/next_slots_iterator.rs
+++ b/ledger/src/next_slots_iterator.rs
@@ -43,7 +43,7 @@ mod tests {
     fn test_next_slots_iterator() {
         let blockstore_path = get_tmp_ledger_path!();
         let blockstore = Blockstore::open(&blockstore_path).unwrap();
-        blockstore.set_roots(&[0]).unwrap();
+        blockstore.set_roots(std::iter::once(&0)).unwrap();
         let ticks_per_slot = 5;
         /*
             Build a blockstore in the ledger with the following fork structure:
diff --git a/ledger/src/poh.rs b/ledger/src/poh.rs
index 0ade8d7a75a444..23521c975900c4 100644
--- a/ledger/src/poh.rs
+++ b/ledger/src/poh.rs
@@ -63,7 +63,7 @@ impl Poh {
         let num_hashes = std::cmp::min(self.remaining_hashes - 1, max_num_hashes);
 
         for _ in 0..num_hashes {
-            self.hash = hash(&self.hash.as_ref());
+            self.hash = hash(self.hash.as_ref());
         }
         self.num_hashes += num_hashes;
         self.remaining_hashes -= num_hashes;
@@ -77,7 +77,7 @@ impl Poh {
             return None; // Caller needs to `tick()` first
         }
 
-        self.hash = hashv(&[&self.hash.as_ref(), &mixin.as_ref()]);
+        self.hash = hashv(&[self.hash.as_ref(), mixin.as_ref()]);
         let num_hashes = self.num_hashes + 1;
         self.num_hashes = 0;
         self.remaining_hashes -= 1;
@@ -89,7 +89,7 @@ impl Poh {
     }
 
     pub fn tick(&mut self) -> Option<PohEntry> {
-        self.hash = hash(&self.hash.as_ref());
+        self.hash = hash(self.hash.as_ref());
         self.num_hashes += 1;
         self.remaining_hashes -= 1;
 
@@ -115,7 +115,7 @@ pub fn compute_hash_time_ns(hashes_sample_size: u64) -> u64 {
     let mut v = Hash::default();
     let start = Instant::now();
     for _ in 0..hashes_sample_size {
-        v = hash(&v.as_ref());
+        v = hash(v.as_ref());
     }
     start.elapsed().as_nanos() as u64
 }
@@ -139,11 +139,11 @@ mod tests {
             assert_ne!(entry.num_hashes, 0);
 
             for _ in 1..entry.num_hashes {
-                current_hash = hash(&current_hash.as_ref());
+                current_hash = hash(current_hash.as_ref());
             }
             current_hash = match mixin {
-                Some(mixin) => hashv(&[&current_hash.as_ref(), &mixin.as_ref()]),
-                None => hash(&current_hash.as_ref()),
+                Some(mixin) => hashv(&[current_hash.as_ref(), mixin.as_ref()]),
+                None => hash(current_hash.as_ref()),
             };
             if current_hash != entry.hash {
                 return false;
@@ -192,9 +192,9 @@ mod tests {
     #[test]
     fn test_poh_verify() {
         let zero = Hash::default();
-        let one = hash(&zero.as_ref());
-        let two = hash(&one.as_ref());
-        let one_with_zero = hashv(&[&zero.as_ref(), &zero.as_ref()]);
+        let one = hash(zero.as_ref());
+        let two = hash(one.as_ref());
+        let one_with_zero = hashv(&[zero.as_ref(), zero.as_ref()]);
 
         let mut poh = Poh::new(zero, None);
         assert!(verify(
@@ -262,7 +262,7 @@ mod tests {
                 (
                     PohEntry {
                         num_hashes: 1,
-                        hash: hash(&one_with_zero.as_ref()),
+                        hash: hash(one_with_zero.as_ref()),
                     },
                     None
                 )
diff --git a/ledger/src/rooted_slot_iterator.rs b/ledger/src/rooted_slot_iterator.rs
index 9bd3b77b73301a..cdc6f1c46efe8f 100644
--- a/ledger/src/rooted_slot_iterator.rs
+++ b/ledger/src/rooted_slot_iterator.rs
@@ -84,7 +84,7 @@ mod tests {
     fn test_rooted_slot_iterator() {
         let blockstore_path = get_tmp_ledger_path!();
         let blockstore = Blockstore::open(&blockstore_path).unwrap();
-        blockstore.set_roots(&[0]).unwrap();
+        blockstore.set_roots(std::iter::once(&0)).unwrap();
         let ticks_per_slot = 5;
         /*
             Build a blockstore in the ledger with the following fork structure:
@@ -131,7 +131,7 @@ mod tests {
             fill_blockstore_slot_with_ticks(&blockstore, ticks_per_slot, 4, fork_point, fork_hash);
 
         // Set a root
-        blockstore.set_roots(&[1, 2, 3]).unwrap();
+        blockstore.set_roots(vec![1, 2, 3].iter()).unwrap();
 
         // Trying to get an iterator on a different fork will error
         assert!(RootedSlotIterator::new(4, &blockstore).is_err());
@@ -196,11 +196,11 @@ mod tests {
         }
 
         // Set roots
-        blockstore.set_roots(&[0, 1, 2, 3]).unwrap();
+        blockstore.set_roots(vec![0, 1, 2, 3].iter()).unwrap();
 
         // Create one post-skip slot at 10, simulating starting from a snapshot
         // at 10
-        blockstore.set_roots(&[10]).unwrap();
+        blockstore.set_roots(std::iter::once(&10)).unwrap();
         // Try to get an iterator from before the skip. The post-skip slot
         // should not return a SlotMeta
         let result: Vec<_> = RootedSlotIterator::new(3, &blockstore)
@@ -214,7 +214,7 @@ mod tests {
         fill_blockstore_slot_with_ticks(&blockstore, ticks_per_slot, 11, 10, Hash::default());
 
         // Set roots
-        blockstore.set_roots(&[11]).unwrap();
+        blockstore.set_roots(std::iter::once(&11)).unwrap();
 
         let result: Vec<_> = RootedSlotIterator::new(0, &blockstore)
             .unwrap()
diff --git a/ledger/src/shred.rs b/ledger/src/shred.rs
index f1d6ff92c9d5e4..8549562ebaed4a 100644
--- a/ledger/src/shred.rs
+++ b/ledger/src/shred.rs
@@ -840,7 +840,7 @@ impl Shredder {
         first_index: usize,
         slot: Slot,
     ) -> std::result::Result<Vec<Shred>, reed_solomon_erasure::Error> {
-        Self::verify_consistent_shred_payload_sizes(&"try_recovery()", &shreds)?;
+        Self::verify_consistent_shred_payload_sizes("try_recovery()", &shreds)?;
         let mut recovered_data = vec![];
         let fec_set_size = num_data + num_coding;
 
@@ -933,7 +933,7 @@ impl Shredder {
     pub fn deshred(shreds: &[Shred]) -> std::result::Result<Vec<u8>, reed_solomon_erasure::Error> {
         use reed_solomon_erasure::Error::TooFewDataShards;
         const SHRED_DATA_OFFSET: usize = SIZE_OF_COMMON_SHRED_HEADER + SIZE_OF_DATA_SHRED_HEADER;
-        Self::verify_consistent_shred_payload_sizes(&"deshred()", shreds)?;
+        Self::verify_consistent_shred_payload_sizes("deshred()", shreds)?;
         let index = shreds.first().ok_or(TooFewDataShards)?.index();
         let aligned = shreds.iter().zip(index..).all(|(s, i)| s.index() == i);
         let data_complete = {
diff --git a/ledger/src/sigverify_shreds.rs b/ledger/src/sigverify_shreds.rs
index 4f6511078a22ad..42ae66d83d97fa 100644
--- a/ledger/src/sigverify_shreds.rs
+++ b/ledger/src/sigverify_shreds.rs
@@ -312,7 +312,7 @@ fn sign_shred_cpu(keypair: &Keypair, packet: &mut Packet) {
     );
     let signature = keypair.sign_message(&packet.data[msg_start..msg_end]);
     trace!("signature {:?}", signature);
-    packet.data[0..sig_end].copy_from_slice(&signature.as_ref());
+    packet.data[0..sig_end].copy_from_slice(signature.as_ref());
 }
 
 pub fn sign_shreds_cpu(keypair: &Keypair, batches: &mut [Packets]) {
@@ -364,7 +364,7 @@ pub fn sign_shreds_gpu(
 
     let mut elems = Vec::new();
     let offset: usize = pinned_keypair.len();
-    let num_keypair_packets = vec_size_in_packets(&pinned_keypair);
+    let num_keypair_packets = vec_size_in_packets(pinned_keypair);
     let mut num_packets = num_keypair_packets;
 
     //should be zero
diff --git a/ledger/src/staking_utils.rs b/ledger/src/staking_utils.rs
index 7b7c24bb968003..3c8df05475777c 100644
--- a/ledger/src/staking_utils.rs
+++ b/ledger/src/staking_utils.rs
@@ -74,13 +74,13 @@ pub(crate) mod tests {
         pubkey::Pubkey,
         signature::{Keypair, Signer},
         signers::Signers,
+        stake::{
+            instruction as stake_instruction,
+            state::{Authorized, Delegation, Lockup, Stake},
+        },
         sysvar::stake_history::{self, StakeHistory},
         transaction::Transaction,
     };
-    use solana_stake_program::{
-        stake_instruction,
-        stake_state::{Authorized, Delegation, Lockup, Stake},
-    };
     use solana_vote_program::{
         vote_instruction,
         vote_state::{VoteInit, VoteState, VoteStateVersions},
@@ -201,10 +201,7 @@ pub(crate) mod tests {
         let result: Vec<_> = epoch_stakes_and_lockouts(&bank, first_leader_schedule_epoch);
         assert_eq!(
             result,
-            vec![(
-                leader_stake.stake(first_leader_schedule_epoch, None, true),
-                None
-            )]
+            vec![(leader_stake.stake(first_leader_schedule_epoch, None), None)]
         );
 
         // epoch stakes and lockouts are saved off for the future epoch, should
@@ -215,14 +212,8 @@ pub(crate) mod tests {
             from_account::<StakeHistory, _>(&bank.get_account(&stake_history::id()).unwrap())
                 .unwrap();
         let mut expected = vec![
-            (
-                leader_stake.stake(bank.epoch(), Some(&stake_history), true),
-                None,
-            ),
-            (
-                other_stake.stake(bank.epoch(), Some(&stake_history), true),
-                None,
-            ),
+            (leader_stake.stake(bank.epoch(), Some(&stake_history)), None),
+            (other_stake.stake(bank.epoch(), Some(&stake_history)), None),
         ];
 
         expected.sort();
diff --git a/local-cluster/Cargo.toml b/local-cluster/Cargo.toml
index c72fab22d1a308..0dc6fde2c20645 100644
--- a/local-cluster/Cargo.toml
+++ b/local-cluster/Cargo.toml
@@ -3,7 +3,7 @@ authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 edition = "2018"
 name = "solana-local-cluster"
 description = "Blockchain, Rebuilt for Scale"
-version = "1.7.0"
+version = "1.7.11"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
@@ -12,26 +12,28 @@ documentation = "https://docs.rs/solana-local-cluster"
 [dependencies]
 crossbeam-channel = "0.4"
 itertools = "0.9.0"
-gag = "0.1.10"
+gag = "1.0.0"
 fs_extra = "1.2.0"
 log = "0.4.11"
 rand = "0.7.0"
 rayon = "1.5.0"
-solana-config-program = { path = "../programs/config", version = "=1.7.0" }
-solana-core = { path = "../core", version = "=1.7.0" }
-solana-client = { path = "../client", version = "=1.7.0" }
-solana-download-utils = { path = "../download-utils", version = "=1.7.0" }
-solana-exchange-program = { path = "../programs/exchange", version = "=1.7.0" }
-solana-faucet = { path = "../faucet", version = "=1.7.0" }
-solana-gossip = { path = "../gossip", version = "=1.7.0" }
-solana-ledger = { path = "../ledger", version = "=1.7.0" }
-solana-logger = { path = "../logger", version = "=1.7.0" }
-solana-runtime = { path = "../runtime", version = "=1.7.0" }
-solana-sdk = { path = "../sdk", version = "=1.7.0" }
-solana-stake-program = { path = "../programs/stake", version = "=1.7.0" }
-solana-vote-program = { path = "../programs/vote", version = "=1.7.0" }
+solana-config-program = { path = "../programs/config", version = "=1.7.11" }
+solana-core = { path = "../core", version = "=1.7.11" }
+solana-client = { path = "../client", version = "=1.7.11" }
+solana-download-utils = { path = "../download-utils", version = "=1.7.11" }
+solana-exchange-program = { path = "../programs/exchange", version = "=1.7.11" }
+solana-faucet = { path = "../faucet", version = "=1.7.11" }
+solana-gossip = { path = "../gossip", version = "=1.7.11" }
+solana-ledger = { path = "../ledger", version = "=1.7.11" }
+solana-logger = { path = "../logger", version = "=1.7.11" }
+solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "=1.7.11" }
+solana-rpc = { path = "../rpc", version = "=1.7.11" }
+solana-runtime = { path = "../runtime", version = "=1.7.11" }
+solana-sdk = { path = "../sdk", version = "=1.7.11" }
+solana-stake-program = { path = "../programs/stake", version = "=1.7.11" }
+solana-streamer = { path = "../streamer", version = "=1.7.11" }
+solana-vote-program = { path = "../programs/vote", version = "=1.7.11" }
 tempfile = "3.1.0"
-solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "=1.7.0" }
 
 [dev-dependencies]
 assert_matches = "1.3.0"
diff --git a/local-cluster/src/cluster.rs b/local-cluster/src/cluster.rs
index fff7d1df907ae7..8211041970cc47 100644
--- a/local-cluster/src/cluster.rs
+++ b/local-cluster/src/cluster.rs
@@ -4,6 +4,7 @@ use solana_core::validator::ValidatorConfig;
 use solana_gossip::{cluster_info::Node, contact_info::ContactInfo};
 use solana_sdk::pubkey::Pubkey;
 use solana_sdk::signature::Keypair;
+use solana_streamer::socket::SocketAddrSpace;
 use std::path::PathBuf;
 use std::sync::Arc;
 
@@ -39,7 +40,12 @@ pub trait Cluster {
     fn get_validator_client(&self, pubkey: &Pubkey) -> Option<ThinClient>;
     fn get_contact_info(&self, pubkey: &Pubkey) -> Option<&ContactInfo>;
     fn exit_node(&mut self, pubkey: &Pubkey) -> ClusterValidatorInfo;
-    fn restart_node(&mut self, pubkey: &Pubkey, cluster_validator_info: ClusterValidatorInfo);
+    fn restart_node(
+        &mut self,
+        pubkey: &Pubkey,
+        cluster_validator_info: ClusterValidatorInfo,
+        socket_addr_space: SocketAddrSpace,
+    );
     fn create_restart_context(
         &mut self,
         pubkey: &Pubkey,
@@ -48,7 +54,13 @@ pub trait Cluster {
     fn restart_node_with_context(
         cluster_validator_info: ClusterValidatorInfo,
         restart_context: (Node, Option<ContactInfo>),
+        socket_addr_space: SocketAddrSpace,
     ) -> ClusterValidatorInfo;
     fn add_node(&mut self, pubkey: &Pubkey, cluster_validator_info: ClusterValidatorInfo);
-    fn exit_restart_node(&mut self, pubkey: &Pubkey, config: ValidatorConfig);
+    fn exit_restart_node(
+        &mut self,
+        pubkey: &Pubkey,
+        config: ValidatorConfig,
+        socket_addr_space: SocketAddrSpace,
+    );
 }
diff --git a/local-cluster/src/cluster_tests.rs b/local-cluster/src/cluster_tests.rs
index e174e4bd8194d4..3e053dd55111ba 100644
--- a/local-cluster/src/cluster_tests.rs
+++ b/local-cluster/src/cluster_tests.rs
@@ -1,13 +1,12 @@
-use log::*;
 /// Cluster independent integration tests
 ///
 /// All tests must start from an entry point and a funding keypair and
 /// discover the rest of the network.
+use log::*;
 use rand::{thread_rng, Rng};
 use rayon::prelude::*;
 use solana_client::thin_client::create_client;
 use solana_core::consensus::VOTE_THRESHOLD_DEPTH;
-use solana_core::validator::ValidatorExit;
 use solana_gossip::{
     cluster_info::VALIDATOR_PORT_RANGE, contact_info::ContactInfo, gossip_service::discover_cluster,
 };
@@ -20,6 +19,7 @@ use solana_sdk::{
     clock::{self, Slot, NUM_CONSECUTIVE_LEADER_SLOTS},
     commitment_config::CommitmentConfig,
     epoch_schedule::MINIMUM_SLOTS_PER_EPOCH,
+    exit::Exit,
     hash::Hash,
     poh_config::PohConfig,
     pubkey::Pubkey,
@@ -28,6 +28,7 @@ use solana_sdk::{
     timing::duration_as_ms,
     transport::TransportError,
 };
+use solana_streamer::socket::SocketAddrSpace;
 use std::{
     collections::{HashMap, HashSet},
     path::Path,
@@ -42,8 +43,10 @@ pub fn spend_and_verify_all_nodes<S: ::std::hash::BuildHasher + Sync + Send>(
     funding_keypair: &Keypair,
     nodes: usize,
     ignore_nodes: HashSet<Pubkey, S>,
+    socket_addr_space: SocketAddrSpace,
 ) {
-    let cluster_nodes = discover_cluster(&entry_point_info.gossip, nodes).unwrap();
+    let cluster_nodes =
+        discover_cluster(&entry_point_info.gossip, nodes, socket_addr_space).unwrap();
     assert!(cluster_nodes.len() >= nodes);
     let ignore_nodes = Arc::new(ignore_nodes);
     cluster_nodes.par_iter().for_each(|ingress_node| {
@@ -63,10 +66,10 @@ pub fn spend_and_verify_all_nodes<S: ::std::hash::BuildHasher + Sync + Send>(
             .get_recent_blockhash_with_commitment(CommitmentConfig::confirmed())
             .unwrap();
         let mut transaction =
-            system_transaction::transfer(&funding_keypair, &random_keypair.pubkey(), 1, blockhash);
+            system_transaction::transfer(funding_keypair, &random_keypair.pubkey(), 1, blockhash);
         let confs = VOTE_THRESHOLD_DEPTH + 1;
         let sig = client
-            .retry_transfer_until_confirmed(&funding_keypair, &mut transaction, 10, confs)
+            .retry_transfer_until_confirmed(funding_keypair, &mut transaction, 10, confs)
             .unwrap();
         for validator in &cluster_nodes {
             if ignore_nodes.contains(&validator.id) {
@@ -114,14 +117,14 @@ pub fn send_many_transactions(
         let transfer_amount = thread_rng().gen_range(1, max_tokens_per_transfer);
 
         let mut transaction = system_transaction::transfer(
-            &funding_keypair,
+            funding_keypair,
             &random_keypair.pubkey(),
             transfer_amount,
             blockhash,
         );
 
         client
-            .retry_transfer(&funding_keypair, &mut transaction, 5)
+            .retry_transfer(funding_keypair, &mut transaction, 5)
             .unwrap();
 
         expected_balances.insert(random_keypair.pubkey(), transfer_amount);
@@ -178,13 +181,15 @@ pub fn sleep_n_epochs(
 
 pub fn kill_entry_and_spend_and_verify_rest(
     entry_point_info: &ContactInfo,
-    entry_point_validator_exit: &Arc<RwLock<ValidatorExit>>,
+    entry_point_validator_exit: &Arc<RwLock<Exit>>,
     funding_keypair: &Keypair,
     nodes: usize,
     slot_millis: u64,
+    socket_addr_space: SocketAddrSpace,
 ) {
     info!("kill_entry_and_spend_and_verify_rest...");
-    let cluster_nodes = discover_cluster(&entry_point_info.gossip, nodes).unwrap();
+    let cluster_nodes =
+        discover_cluster(&entry_point_info.gossip, nodes, socket_addr_space).unwrap();
     assert!(cluster_nodes.len() >= nodes);
     let client = create_client(entry_point_info.client_facing_addr(), VALIDATOR_PORT_RANGE);
     // sleep long enough to make sure we are in epoch 3
@@ -236,7 +241,7 @@ pub fn kill_entry_and_spend_and_verify_rest(
                 .get_recent_blockhash_with_commitment(CommitmentConfig::processed())
                 .unwrap();
             let mut transaction = system_transaction::transfer(
-                &funding_keypair,
+                funding_keypair,
                 &random_keypair.pubkey(),
                 1,
                 blockhash,
@@ -245,7 +250,7 @@ pub fn kill_entry_and_spend_and_verify_rest(
             let confs = VOTE_THRESHOLD_DEPTH + 1;
             let sig = {
                 let sig = client.retry_transfer_until_confirmed(
-                    &funding_keypair,
+                    funding_keypair,
                     &mut transaction,
                     5,
                     confs,
@@ -260,7 +265,7 @@ pub fn kill_entry_and_spend_and_verify_rest(
                 }
             };
             info!("poll_all_nodes_for_signature()");
-            match poll_all_nodes_for_signature(&entry_point_info, &cluster_nodes, &sig, confs) {
+            match poll_all_nodes_for_signature(entry_point_info, &cluster_nodes, &sig, confs) {
                 Err(e) => {
                     info!("poll_all_nodes_for_signature() failed {:?}", e);
                     result = Err(e);
@@ -280,18 +285,23 @@ pub fn check_for_new_roots(num_new_roots: usize, contact_infos: &[ContactInfo],
     let mut last_print = Instant::now();
     let loop_start = Instant::now();
     let loop_timeout = Duration::from_secs(60);
+    let mut num_roots_map = HashMap::new();
     while !done {
         assert!(loop_start.elapsed() < loop_timeout);
+
         for (i, ingress_node) in contact_infos.iter().enumerate() {
             let client = create_client(ingress_node.client_facing_addr(), VALIDATOR_PORT_RANGE);
-            let slot = client.get_slot().unwrap_or(0);
-            roots[i].insert(slot);
-            let min_node = roots.iter().map(|r| r.len()).min().unwrap_or(0);
-            done = min_node >= num_new_roots;
+            let root_slot = client
+                .get_slot_with_commitment(CommitmentConfig::finalized())
+                .unwrap_or(0);
+            roots[i].insert(root_slot);
+            num_roots_map.insert(ingress_node.id, roots[i].len());
+            let num_roots = roots.iter().map(|r| r.len()).min().unwrap();
+            done = num_roots >= num_new_roots;
             if done || last_print.elapsed().as_secs() > 3 {
                 info!(
-                    "{} {} min observed roots {}/16",
-                    test_name, ingress_node.id, min_node
+                    "{} waiting for {} new roots.. observed: {:?}",
+                    test_name, num_new_roots, num_roots_map
                 );
                 last_print = Instant::now();
             }
@@ -372,7 +382,7 @@ fn poll_all_nodes_for_signature(
             continue;
         }
         let client = create_client(validator.client_facing_addr(), VALIDATOR_PORT_RANGE);
-        client.poll_for_signature_confirmation(&sig, confs)?;
+        client.poll_for_signature_confirmation(sig, confs)?;
     }
 
     Ok(())
diff --git a/local-cluster/src/local_cluster.rs b/local-cluster/src/local_cluster.rs
index 080adae3473929..af80e7e51073e1 100644
--- a/local-cluster/src/local_cluster.rs
+++ b/local-cluster/src/local_cluster.rs
@@ -29,13 +29,15 @@ use solana_sdk::{
     poh_config::PohConfig,
     pubkey::Pubkey,
     signature::{Keypair, Signer},
+    stake::{
+        config as stake_config, instruction as stake_instruction,
+        state::{Authorized, Lockup},
+    },
     system_transaction,
     transaction::Transaction,
 };
-use solana_stake_program::{
-    config as stake_config, stake_instruction,
-    stake_state::{Authorized, Lockup, StakeState},
-};
+use solana_stake_program::{config::create_account as create_stake_config_account, stake_state};
+use solana_streamer::socket::SocketAddrSpace;
 use solana_vote_program::{
     vote_instruction,
     vote_state::{VoteInit, VoteState},
@@ -107,6 +109,7 @@ impl LocalCluster {
         num_nodes: usize,
         cluster_lamports: u64,
         lamports_per_node: u64,
+        socket_addr_space: SocketAddrSpace,
     ) -> Self {
         let stakes: Vec<_> = (0..num_nodes).map(|_| lamports_per_node).collect();
         let mut config = ClusterConfig {
@@ -118,10 +121,10 @@ impl LocalCluster {
             ),
             ..ClusterConfig::default()
         };
-        Self::new(&mut config)
+        Self::new(&mut config, socket_addr_space)
     }
 
-    pub fn new(config: &mut ClusterConfig) -> Self {
+    pub fn new(config: &mut ClusterConfig, socket_addr_space: SocketAddrSpace) -> Self {
         assert_eq!(config.validator_configs.len(), config.node_stakes.len());
         let mut validator_keys = {
             if let Some(ref keys) = config.validator_keys {
@@ -190,7 +193,7 @@ impl LocalCluster {
         // Replace staking config
         genesis_config.add_account(
             stake_config::id(),
-            stake_config::create_account(
+            create_stake_config_account(
                 1,
                 &stake_config::Config {
                     warmup_cooldown_rate: 1_000_000_000.0f64,
@@ -218,6 +221,7 @@ impl LocalCluster {
             &leader_config,
             true, // should_check_duplicate_instance
             Arc::new(RwLock::new(ValidatorStartProgress::default())),
+            socket_addr_space,
         );
 
         let mut validators = HashMap::new();
@@ -261,22 +265,35 @@ impl LocalCluster {
                 *stake,
                 key.clone(),
                 node_pubkey_to_vote_key.get(&key.pubkey()).cloned(),
+                socket_addr_space,
             );
         }
 
         let mut listener_config = safe_clone_config(&config.validator_configs[0]);
         listener_config.voting_disabled = true;
         (0..config.num_listeners).for_each(|_| {
-            cluster.add_validator(&listener_config, 0, Arc::new(Keypair::new()), None);
+            cluster.add_validator(
+                &listener_config,
+                0,
+                Arc::new(Keypair::new()),
+                None,
+                socket_addr_space,
+            );
         });
 
         discover_cluster(
             &cluster.entry_point_info.gossip,
             config.node_stakes.len() + config.num_listeners as usize,
+            socket_addr_space,
         )
         .unwrap();
 
-        discover_cluster(&cluster.entry_point_info.gossip, config.node_stakes.len()).unwrap();
+        discover_cluster(
+            &cluster.entry_point_info.gossip,
+            config.node_stakes.len(),
+            socket_addr_space,
+        )
+        .unwrap();
 
         cluster
     }
@@ -304,6 +321,7 @@ impl LocalCluster {
         stake: u64,
         validator_keypair: Arc<Keypair>,
         mut voting_keypair: Option<Arc<Keypair>>,
+        socket_addr_space: SocketAddrSpace,
     ) -> Pubkey {
         let client = create_client(
             self.entry_point_info.client_facing_addr(),
@@ -360,6 +378,7 @@ impl LocalCluster {
             &config,
             true, // should_check_duplicate_instance
             Arc::new(RwLock::new(ValidatorStartProgress::default())),
+            socket_addr_space,
         );
 
         let validator_pubkey = validator_keypair.pubkey();
@@ -399,7 +418,12 @@ impl LocalCluster {
         Self::transfer_with_client(&client, source_keypair, dest_pubkey, lamports)
     }
 
-    pub fn check_for_new_roots(&self, num_new_roots: usize, test_name: &str) {
+    pub fn check_for_new_roots(
+        &self,
+        num_new_roots: usize,
+        test_name: &str,
+        socket_addr_space: SocketAddrSpace,
+    ) {
         let alive_node_contact_infos: Vec<_> = self
             .validators
             .values()
@@ -410,6 +434,7 @@ impl LocalCluster {
         let cluster_nodes = discover_cluster(
             &alive_node_contact_infos[0].gossip,
             alive_node_contact_infos.len(),
+            socket_addr_space,
         )
         .unwrap();
         info!("{} discovered {} nodes", test_name, cluster_nodes.len());
@@ -418,7 +443,12 @@ impl LocalCluster {
         info!("{} done waiting for roots", test_name);
     }
 
-    pub fn check_no_new_roots(&self, num_slots_to_wait: usize, test_name: &str) {
+    pub fn check_no_new_roots(
+        &self,
+        num_slots_to_wait: usize,
+        test_name: &str,
+        socket_addr_space: SocketAddrSpace,
+    ) {
         let alive_node_contact_infos: Vec<_> = self
             .validators
             .values()
@@ -429,6 +459,7 @@ impl LocalCluster {
         let cluster_nodes = discover_cluster(
             &alive_node_contact_infos[0].gossip,
             alive_node_contact_infos.len(),
+            socket_addr_space,
         )
         .unwrap();
         info!("{} discovered {} nodes", test_name, cluster_nodes.len());
@@ -447,8 +478,7 @@ impl LocalCluster {
         let (blockhash, _fee_calculator, _last_valid_slot) = client
             .get_recent_blockhash_with_commitment(CommitmentConfig::processed())
             .unwrap();
-        let mut tx =
-            system_transaction::transfer(&source_keypair, dest_pubkey, lamports, blockhash);
+        let mut tx = system_transaction::transfer(source_keypair, dest_pubkey, lamports, blockhash);
         info!(
             "executing transfer of {} from {} to {}",
             lamports,
@@ -456,7 +486,7 @@ impl LocalCluster {
             *dest_pubkey
         );
         client
-            .retry_transfer(&source_keypair, &mut tx, 10)
+            .retry_transfer(source_keypair, &mut tx, 10)
             .expect("client transfer");
         client
             .wait_for_balance_with_commitment(
@@ -511,7 +541,7 @@ impl LocalCluster {
                     .0,
             );
             client
-                .retry_transfer(&from_account, &mut transaction, 10)
+                .retry_transfer(from_account, &mut transaction, 10)
                 .expect("fund vote");
             client
                 .wait_for_balance_with_commitment(
@@ -568,7 +598,7 @@ impl LocalCluster {
         ) {
             (Ok(Some(stake_account)), Ok(Some(vote_account))) => {
                 match (
-                    StakeState::stake_from(&stake_account),
+                    stake_state::stake_from(&stake_account),
                     VoteState::from(&vote_account),
                 ) {
                     (Some(stake_state), Some(vote_state)) => {
@@ -615,7 +645,7 @@ impl Cluster for LocalCluster {
     }
 
     fn exit_node(&mut self, pubkey: &Pubkey) -> ClusterValidatorInfo {
-        let mut node = self.validators.remove(&pubkey).unwrap();
+        let mut node = self.validators.remove(pubkey).unwrap();
 
         // Shut down the validator
         let mut validator = node.validator.take().expect("Validator must be running");
@@ -630,7 +660,7 @@ impl Cluster for LocalCluster {
         cluster_validator_info: &mut ClusterValidatorInfo,
     ) -> (Node, Option<ContactInfo>) {
         // Update the stored ContactInfo for this node
-        let node = Node::new_localhost_with_pubkey(&pubkey);
+        let node = Node::new_localhost_with_pubkey(pubkey);
         cluster_validator_info.info.contact_info = node.info.clone();
         cluster_validator_info.config.rpc_addrs = Some((node.info.rpc, node.info.rpc_pubsub));
 
@@ -646,10 +676,18 @@ impl Cluster for LocalCluster {
         (node, entry_point_info)
     }
 
-    fn restart_node(&mut self, pubkey: &Pubkey, mut cluster_validator_info: ClusterValidatorInfo) {
+    fn restart_node(
+        &mut self,
+        pubkey: &Pubkey,
+        mut cluster_validator_info: ClusterValidatorInfo,
+        socket_addr_space: SocketAddrSpace,
+    ) {
         let restart_context = self.create_restart_context(pubkey, &mut cluster_validator_info);
-        let cluster_validator_info =
-            Self::restart_node_with_context(cluster_validator_info, restart_context);
+        let cluster_validator_info = Self::restart_node_with_context(
+            cluster_validator_info,
+            restart_context,
+            socket_addr_space,
+        );
         self.add_node(pubkey, cluster_validator_info);
     }
 
@@ -660,6 +698,7 @@ impl Cluster for LocalCluster {
     fn restart_node_with_context(
         mut cluster_validator_info: ClusterValidatorInfo,
         (node, entry_point_info): (Node, Option<ContactInfo>),
+        socket_addr_space: SocketAddrSpace,
     ) -> ClusterValidatorInfo {
         // Restart the node
         let validator_info = &cluster_validator_info.info;
@@ -677,15 +716,21 @@ impl Cluster for LocalCluster {
             &safe_clone_config(&cluster_validator_info.config),
             true, // should_check_duplicate_instance
             Arc::new(RwLock::new(ValidatorStartProgress::default())),
+            socket_addr_space,
         );
         cluster_validator_info.validator = Some(restarted_node);
         cluster_validator_info
     }
 
-    fn exit_restart_node(&mut self, pubkey: &Pubkey, validator_config: ValidatorConfig) {
+    fn exit_restart_node(
+        &mut self,
+        pubkey: &Pubkey,
+        validator_config: ValidatorConfig,
+        socket_addr_space: SocketAddrSpace,
+    ) {
         let mut cluster_validator_info = self.exit_node(pubkey);
         cluster_validator_info.config = validator_config;
-        self.restart_node(pubkey, cluster_validator_info);
+        self.restart_node(pubkey, cluster_validator_info, socket_addr_space);
     }
 
     fn get_contact_info(&self, pubkey: &Pubkey) -> Option<&ContactInfo> {
@@ -708,7 +753,8 @@ mod test {
     fn test_local_cluster_start_and_exit() {
         solana_logger::setup();
         let num_nodes = 1;
-        let cluster = LocalCluster::new_with_equal_stakes(num_nodes, 100, 3);
+        let cluster =
+            LocalCluster::new_with_equal_stakes(num_nodes, 100, 3, SocketAddrSpace::Unspecified);
         assert_eq!(cluster.validators.len(), num_nodes);
     }
 
@@ -728,7 +774,7 @@ mod test {
             stakers_slot_offset: MINIMUM_SLOTS_PER_EPOCH as u64,
             ..ClusterConfig::default()
         };
-        let cluster = LocalCluster::new(&mut config);
+        let cluster = LocalCluster::new(&mut config, SocketAddrSpace::Unspecified);
         assert_eq!(cluster.validators.len(), NUM_NODES);
     }
 }
diff --git a/local-cluster/src/validator_configs.rs b/local-cluster/src/validator_configs.rs
index 782e4d923f7aed..9f804de1fda498 100644
--- a/local-cluster/src/validator_configs.rs
+++ b/local-cluster/src/validator_configs.rs
@@ -1,4 +1,5 @@
-use solana_core::validator::{ValidatorConfig, ValidatorExit};
+use solana_core::validator::ValidatorConfig;
+use solana_sdk::exit::Exit;
 use std::sync::{Arc, RwLock};
 
 pub fn safe_clone_config(config: &ValidatorConfig) -> ValidatorConfig {
@@ -35,7 +36,6 @@ pub fn safe_clone_config(config: &ValidatorConfig) -> ValidatorConfig {
         max_genesis_archive_unpacked_size: config.max_genesis_archive_unpacked_size,
         wal_recovery_mode: config.wal_recovery_mode.clone(),
         poh_verify: config.poh_verify,
-        cuda: config.cuda,
         require_tower: config.require_tower,
         tower_path: config.tower_path.clone(),
         debug_keys: config.debug_keys.clone(),
@@ -50,11 +50,13 @@ pub fn safe_clone_config(config: &ValidatorConfig) -> ValidatorConfig {
         accounts_db_caching_enabled: config.accounts_db_caching_enabled,
         warp_slot: config.warp_slot,
         accounts_db_test_hash_calculation: config.accounts_db_test_hash_calculation,
+        accounts_db_skip_shrink: config.accounts_db_skip_shrink,
         accounts_db_use_index_hash_calculation: config.accounts_db_use_index_hash_calculation,
         tpu_coalesce_ms: config.tpu_coalesce_ms,
-        validator_exit: Arc::new(RwLock::new(ValidatorExit::default())),
+        validator_exit: Arc::new(RwLock::new(Exit::default())),
         poh_hashes_per_batch: config.poh_hashes_per_batch,
         no_wait_for_vote_to_start_leader: config.no_wait_for_vote_to_start_leader,
+        accounts_shrink_ratio: config.accounts_shrink_ratio,
     }
 }
 
diff --git a/local-cluster/tests/local_cluster.rs b/local-cluster/tests/local_cluster.rs
index 7011e1230dd44e..4e1e34eae55d6c 100644
--- a/local-cluster/tests/local_cluster.rs
+++ b/local-cluster/tests/local_cluster.rs
@@ -12,7 +12,7 @@ use solana_client::{
     thin_client::{create_client, ThinClient},
 };
 use solana_core::{
-    broadcast_stage::BroadcastStageType,
+    broadcast_stage::{BroadcastDuplicatesConfig, BroadcastStageType},
     consensus::{Tower, SWITCH_FORK_THRESHOLD, VOTE_THRESHOLD_DEPTH},
     optimistic_confirmation_verifier::OptimisticConfirmationVerifier,
     validator::ValidatorConfig,
@@ -55,6 +55,7 @@ use solana_sdk::{
     timing::timestamp,
     transaction::Transaction,
 };
+use solana_streamer::socket::SocketAddrSpace;
 use solana_vote_program::{
     vote_instruction,
     vote_state::{Vote, MAX_LOCKOUT_HISTORY},
@@ -92,7 +93,7 @@ fn test_ledger_cleanup_service() {
         validator_configs: make_identical_validator_configs(&validator_config, num_nodes),
         ..ClusterConfig::default()
     };
-    let mut cluster = LocalCluster::new(&mut config);
+    let mut cluster = LocalCluster::new(&mut config, SocketAddrSpace::Unspecified);
     // 200ms/per * 100 = 20 seconds, so sleep a little longer than that.
     sleep(Duration::from_secs(60));
 
@@ -101,6 +102,7 @@ fn test_ledger_cleanup_service() {
         &cluster.funding_keypair,
         num_nodes,
         HashSet::new(),
+        SocketAddrSpace::Unspecified,
     );
     cluster.close_preserve_ledgers();
     //check everyone's ledgers and make sure only ~100 slots are stored
@@ -122,12 +124,14 @@ fn test_spend_and_verify_all_nodes_1() {
     solana_logger::setup_with_default(RUST_LOG_FILTER);
     error!("test_spend_and_verify_all_nodes_1");
     let num_nodes = 1;
-    let local = LocalCluster::new_with_equal_stakes(num_nodes, 10_000, 100);
+    let local =
+        LocalCluster::new_with_equal_stakes(num_nodes, 10_000, 100, SocketAddrSpace::Unspecified);
     cluster_tests::spend_and_verify_all_nodes(
         &local.entry_point_info,
         &local.funding_keypair,
         num_nodes,
         HashSet::new(),
+        SocketAddrSpace::Unspecified,
     );
 }
 
@@ -137,12 +141,14 @@ fn test_spend_and_verify_all_nodes_2() {
     solana_logger::setup_with_default(RUST_LOG_FILTER);
     error!("test_spend_and_verify_all_nodes_2");
     let num_nodes = 2;
-    let local = LocalCluster::new_with_equal_stakes(num_nodes, 10_000, 100);
+    let local =
+        LocalCluster::new_with_equal_stakes(num_nodes, 10_000, 100, SocketAddrSpace::Unspecified);
     cluster_tests::spend_and_verify_all_nodes(
         &local.entry_point_info,
         &local.funding_keypair,
         num_nodes,
         HashSet::new(),
+        SocketAddrSpace::Unspecified,
     );
 }
 
@@ -152,12 +158,14 @@ fn test_spend_and_verify_all_nodes_3() {
     solana_logger::setup_with_default(RUST_LOG_FILTER);
     error!("test_spend_and_verify_all_nodes_3");
     let num_nodes = 3;
-    let local = LocalCluster::new_with_equal_stakes(num_nodes, 10_000, 100);
+    let local =
+        LocalCluster::new_with_equal_stakes(num_nodes, 10_000, 100, SocketAddrSpace::Unspecified);
     cluster_tests::spend_and_verify_all_nodes(
         &local.entry_point_info,
         &local.funding_keypair,
         num_nodes,
         HashSet::new(),
+        SocketAddrSpace::Unspecified,
     );
 }
 
@@ -166,7 +174,8 @@ fn test_spend_and_verify_all_nodes_3() {
 fn test_local_cluster_signature_subscribe() {
     solana_logger::setup_with_default(RUST_LOG_FILTER);
     let num_nodes = 2;
-    let cluster = LocalCluster::new_with_equal_stakes(num_nodes, 10_000, 100);
+    let cluster =
+        LocalCluster::new_with_equal_stakes(num_nodes, 10_000, 100, SocketAddrSpace::Unspecified);
     let nodes = cluster.get_node_pubkeys();
 
     // Get non leader
@@ -243,12 +252,14 @@ fn test_spend_and_verify_all_nodes_env_num_nodes() {
         .expect("please set environment variable NUM_NODES")
         .parse()
         .expect("could not parse NUM_NODES as a number");
-    let local = LocalCluster::new_with_equal_stakes(num_nodes, 10_000, 100);
+    let local =
+        LocalCluster::new_with_equal_stakes(num_nodes, 10_000, 100, SocketAddrSpace::Unspecified);
     cluster_tests::spend_and_verify_all_nodes(
         &local.entry_point_info,
         &local.funding_keypair,
         num_nodes,
         HashSet::new(),
+        SocketAddrSpace::Unspecified,
     );
 }
 
@@ -266,7 +277,7 @@ fn test_leader_failure_4() {
         validator_configs: make_identical_validator_configs(&validator_config, num_nodes),
         ..ClusterConfig::default()
     };
-    let local = LocalCluster::new(&mut config);
+    let local = LocalCluster::new(&mut config, SocketAddrSpace::Unspecified);
 
     cluster_tests::kill_entry_and_spend_and_verify_rest(
         &local.entry_point_info,
@@ -279,6 +290,7 @@ fn test_leader_failure_4() {
         &local.funding_keypair,
         num_nodes,
         config.ticks_per_slot * config.poh_config.target_tick_duration.as_millis() as u64,
+        SocketAddrSpace::Unspecified,
     );
 }
 
@@ -368,7 +380,7 @@ fn run_cluster_partition<C>(
         "PARTITION_TEST starting cluster with {:?} partitions slots_per_epoch: {}",
         partitions, config.slots_per_epoch,
     );
-    let mut cluster = LocalCluster::new(&mut config);
+    let mut cluster = LocalCluster::new(&mut config, SocketAddrSpace::Unspecified);
 
     info!("PARTITION_TEST spend_and_verify_all_nodes(), ensure all nodes are caught up");
     cluster_tests::spend_and_verify_all_nodes(
@@ -376,9 +388,15 @@ fn run_cluster_partition<C>(
         &cluster.funding_keypair,
         num_nodes,
         HashSet::new(),
+        SocketAddrSpace::Unspecified,
     );
 
-    let cluster_nodes = discover_cluster(&cluster.entry_point_info.gossip, num_nodes).unwrap();
+    let cluster_nodes = discover_cluster(
+        &cluster.entry_point_info.gossip,
+        num_nodes,
+        SocketAddrSpace::Unspecified,
+    )
+    .unwrap();
 
     // Check epochs have correct number of slots
     info!("PARTITION_TEST sleeping until partition starting condition",);
@@ -425,7 +443,7 @@ fn run_cluster_partition<C>(
 fn test_cluster_partition_1_2() {
     let empty = |_: &mut LocalCluster, _: &mut ()| {};
     let on_partition_resolved = |cluster: &mut LocalCluster, _: &mut ()| {
-        cluster.check_for_new_roots(16, &"PARTITION_TEST");
+        cluster.check_for_new_roots(16, "PARTITION_TEST", SocketAddrSpace::Unspecified);
     };
     run_cluster_partition(
         &[vec![1], vec![1, 1]],
@@ -445,7 +463,7 @@ fn test_cluster_partition_1_2() {
 fn test_cluster_partition_1_1() {
     let empty = |_: &mut LocalCluster, _: &mut ()| {};
     let on_partition_resolved = |cluster: &mut LocalCluster, _: &mut ()| {
-        cluster.check_for_new_roots(16, &"PARTITION_TEST");
+        cluster.check_for_new_roots(16, "PARTITION_TEST", SocketAddrSpace::Unspecified);
     };
     run_cluster_partition(
         &[vec![1], vec![1]],
@@ -465,7 +483,7 @@ fn test_cluster_partition_1_1() {
 fn test_cluster_partition_1_1_1() {
     let empty = |_: &mut LocalCluster, _: &mut ()| {};
     let on_partition_resolved = |cluster: &mut LocalCluster, _: &mut ()| {
-        cluster.check_for_new_roots(16, &"PARTITION_TEST");
+        cluster.check_for_new_roots(16, "PARTITION_TEST", SocketAddrSpace::Unspecified);
     };
     run_cluster_partition(
         &[vec![1], vec![1], vec![1]],
@@ -525,7 +543,7 @@ fn test_kill_heaviest_partition() {
     let on_partition_resolved = |cluster: &mut LocalCluster, _: &mut ()| {
         info!("Killing validator with id: {}", validator_to_kill);
         cluster.exit_node(&validator_to_kill);
-        cluster.check_for_new_roots(16, &"PARTITION_TEST");
+        cluster.check_for_new_roots(16, "PARTITION_TEST", SocketAddrSpace::Unspecified);
     };
     run_cluster_partition(
         &partitions,
@@ -594,7 +612,7 @@ fn run_kill_partition_switch_threshold<C>(
             .iter()
             .map(|validator_to_kill| {
                 info!("Killing validator with id: {}", validator_to_kill);
-                cluster.exit_node(&validator_to_kill)
+                cluster.exit_node(validator_to_kill)
             })
             .collect();
         on_partition_start(
@@ -622,7 +640,7 @@ fn find_latest_replayed_slot_from_ledger(
     mut latest_slot: Slot,
 ) -> (Slot, HashSet<Slot>) {
     loop {
-        let mut blockstore = open_blockstore(&ledger_path);
+        let mut blockstore = open_blockstore(ledger_path);
         // This is kind of a hack because we can't query for new frozen blocks over RPC
         // since the validator is not voting.
         let new_latest_slots: Vec<Slot> = blockstore
@@ -644,7 +662,7 @@ fn find_latest_replayed_slot_from_ledger(
                     break;
                 } else {
                     sleep(Duration::from_millis(50));
-                    blockstore = open_blockstore(&ledger_path);
+                    blockstore = open_blockstore(ledger_path);
                 }
             }
             // Check the slot has been replayed
@@ -666,7 +684,7 @@ fn find_latest_replayed_slot_from_ledger(
                         );
                     } else {
                         sleep(Duration::from_millis(50));
-                        blockstore = open_blockstore(&ledger_path);
+                        blockstore = open_blockstore(ledger_path);
                     }
                 }
             } else {
@@ -870,7 +888,7 @@ fn test_switch_threshold_uses_gossip_votes() {
                     0,
                     crds_value::Vote::new(node_keypair.pubkey(), vote_tx, timestamp()),
                 ),
-                &node_keypair,
+                node_keypair,
             )],
             context
                 .dead_validator_info
@@ -880,6 +898,7 @@ fn test_switch_threshold_uses_gossip_votes() {
                 .keypair
                 .pubkey(),
             heavier_node_gossip,
+            &SocketAddrSpace::Unspecified,
         )
         .unwrap();
 
@@ -962,7 +981,7 @@ fn test_kill_partition_switch_threshold_no_progress() {
         |_: &mut LocalCluster, _: &[Pubkey], _: Vec<ClusterValidatorInfo>, _: &mut ()| {};
     let on_before_partition_resolved = |_: &mut LocalCluster, _: &mut ()| {};
     let on_partition_resolved = |cluster: &mut LocalCluster, _: &mut ()| {
-        cluster.check_no_new_roots(400, &"PARTITION_TEST");
+        cluster.check_no_new_roots(400, "PARTITION_TEST", SocketAddrSpace::Unspecified);
     };
 
     // This kills `max_failures_stake`, so no progress should be made
@@ -1015,7 +1034,7 @@ fn test_kill_partition_switch_threshold_progress() {
         |_: &mut LocalCluster, _: &[Pubkey], _: Vec<ClusterValidatorInfo>, _: &mut ()| {};
     let on_before_partition_resolved = |_: &mut LocalCluster, _: &mut ()| {};
     let on_partition_resolved = |cluster: &mut LocalCluster, _: &mut ()| {
-        cluster.check_for_new_roots(16, &"PARTITION_TEST");
+        cluster.check_for_new_roots(16, "PARTITION_TEST", SocketAddrSpace::Unspecified);
     };
     run_kill_partition_switch_threshold(
         &[&[(failures_stake as usize, 16)]],
@@ -1203,6 +1222,7 @@ fn test_fork_choice_refresh_old_votes() {
             cluster.restart_node(
                 &context.smallest_validator_key,
                 context.alive_stake3_info.take().unwrap(),
+                SocketAddrSpace::Unspecified,
             );
 
             loop {
@@ -1246,7 +1266,7 @@ fn test_fork_choice_refresh_old_votes() {
     // for lockouts built during partition to resolve and gives validators an opportunity
     // to try and switch forks)
     let on_partition_resolved = |cluster: &mut LocalCluster, _: &mut PartitionContext| {
-        cluster.check_for_new_roots(16, &"PARTITION_TEST");
+        cluster.check_for_new_roots(16, "PARTITION_TEST", SocketAddrSpace::Unspecified);
     };
 
     run_kill_partition_switch_threshold(
@@ -1273,16 +1293,19 @@ fn test_two_unbalanced_stakes() {
     let num_ticks_per_slot = 10;
     let num_slots_per_epoch = MINIMUM_SLOTS_PER_EPOCH as u64;
 
-    let mut cluster = LocalCluster::new(&mut ClusterConfig {
-        node_stakes: vec![999_990, 3],
-        cluster_lamports: 1_000_000,
-        validator_configs: make_identical_validator_configs(&validator_config, 2),
-        ticks_per_slot: num_ticks_per_slot,
-        slots_per_epoch: num_slots_per_epoch,
-        stakers_slot_offset: num_slots_per_epoch,
-        poh_config: PohConfig::new_sleep(Duration::from_millis(1000 / num_ticks_per_second)),
-        ..ClusterConfig::default()
-    });
+    let mut cluster = LocalCluster::new(
+        &mut ClusterConfig {
+            node_stakes: vec![999_990, 3],
+            cluster_lamports: 1_000_000,
+            validator_configs: make_identical_validator_configs(&validator_config, 2),
+            ticks_per_slot: num_ticks_per_slot,
+            slots_per_epoch: num_slots_per_epoch,
+            stakers_slot_offset: num_slots_per_epoch,
+            poh_config: PohConfig::new_sleep(Duration::from_millis(1000 / num_ticks_per_second)),
+            ..ClusterConfig::default()
+        },
+        SocketAddrSpace::Unspecified,
+    );
 
     cluster_tests::sleep_n_epochs(
         10.0,
@@ -1307,9 +1330,14 @@ fn test_forwarding() {
         validator_configs: make_identical_validator_configs(&ValidatorConfig::default(), 2),
         ..ClusterConfig::default()
     };
-    let cluster = LocalCluster::new(&mut config);
+    let cluster = LocalCluster::new(&mut config, SocketAddrSpace::Unspecified);
 
-    let cluster_nodes = discover_cluster(&cluster.entry_point_info.gossip, 2).unwrap();
+    let cluster_nodes = discover_cluster(
+        &cluster.entry_point_info.gossip,
+        2,
+        SocketAddrSpace::Unspecified,
+    )
+    .unwrap();
     assert!(cluster_nodes.len() >= 2);
 
     let leader_pubkey = cluster.entry_point_info.id;
@@ -1320,7 +1348,7 @@ fn test_forwarding() {
         .unwrap();
 
     // Confirm that transactions were forwarded to and processed by the leader.
-    cluster_tests::send_many_transactions(&validator_info, &cluster.funding_keypair, 10, 20);
+    cluster_tests::send_many_transactions(validator_info, &cluster.funding_keypair, 10, 20);
 }
 
 #[test]
@@ -1331,15 +1359,18 @@ fn test_restart_node() {
     let slots_per_epoch = MINIMUM_SLOTS_PER_EPOCH * 2;
     let ticks_per_slot = 16;
     let validator_config = ValidatorConfig::default();
-    let mut cluster = LocalCluster::new(&mut ClusterConfig {
-        node_stakes: vec![100; 1],
-        cluster_lamports: 100,
-        validator_configs: vec![safe_clone_config(&validator_config)],
-        ticks_per_slot,
-        slots_per_epoch,
-        stakers_slot_offset: slots_per_epoch,
-        ..ClusterConfig::default()
-    });
+    let mut cluster = LocalCluster::new(
+        &mut ClusterConfig {
+            node_stakes: vec![100; 1],
+            cluster_lamports: 100,
+            validator_configs: vec![safe_clone_config(&validator_config)],
+            ticks_per_slot,
+            slots_per_epoch,
+            stakers_slot_offset: slots_per_epoch,
+            ..ClusterConfig::default()
+        },
+        SocketAddrSpace::Unspecified,
+    );
     let nodes = cluster.get_node_pubkeys();
     cluster_tests::sleep_n_epochs(
         1.0,
@@ -1347,7 +1378,7 @@ fn test_restart_node() {
         clock::DEFAULT_TICKS_PER_SLOT,
         slots_per_epoch,
     );
-    cluster.exit_restart_node(&nodes[0], validator_config);
+    cluster.exit_restart_node(&nodes[0], validator_config, SocketAddrSpace::Unspecified);
     cluster_tests::sleep_n_epochs(
         0.5,
         &cluster.genesis_config.poh_config,
@@ -1372,8 +1403,13 @@ fn test_listener_startup() {
         validator_configs: make_identical_validator_configs(&ValidatorConfig::default(), 1),
         ..ClusterConfig::default()
     };
-    let cluster = LocalCluster::new(&mut config);
-    let cluster_nodes = discover_cluster(&cluster.entry_point_info.gossip, 4).unwrap();
+    let cluster = LocalCluster::new(&mut config, SocketAddrSpace::Unspecified);
+    let cluster_nodes = discover_cluster(
+        &cluster.entry_point_info.gossip,
+        4,
+        SocketAddrSpace::Unspecified,
+    )
+    .unwrap();
     assert_eq!(cluster_nodes.len(), 4);
 }
 
@@ -1389,8 +1425,13 @@ fn test_mainnet_beta_cluster_type() {
         validator_configs: make_identical_validator_configs(&ValidatorConfig::default(), 1),
         ..ClusterConfig::default()
     };
-    let cluster = LocalCluster::new(&mut config);
-    let cluster_nodes = discover_cluster(&cluster.entry_point_info.gossip, 1).unwrap();
+    let cluster = LocalCluster::new(&mut config, SocketAddrSpace::Unspecified);
+    let cluster_nodes = discover_cluster(
+        &cluster.entry_point_info.gossip,
+        1,
+        SocketAddrSpace::Unspecified,
+    )
+    .unwrap();
     assert_eq!(cluster_nodes.len(), 1);
 
     let client = create_client(
@@ -1402,7 +1443,7 @@ fn test_mainnet_beta_cluster_type() {
     for program_id in [
         &solana_config_program::id(),
         &solana_sdk::system_program::id(),
-        &solana_stake_program::id(),
+        &solana_sdk::stake::program::id(),
         &solana_vote_program::id(),
         &solana_sdk::bpf_loader_deprecated::id(),
         &solana_sdk::bpf_loader::id(),
@@ -1497,7 +1538,10 @@ fn test_frozen_account_from_genesis() {
         }],
         ..ClusterConfig::default()
     };
-    generate_frozen_account_panic(LocalCluster::new(&mut config), validator_identity);
+    generate_frozen_account_panic(
+        LocalCluster::new(&mut config, SocketAddrSpace::Unspecified),
+        validator_identity,
+    );
 }
 
 #[test]
@@ -1521,7 +1565,7 @@ fn test_frozen_account_from_snapshot() {
         ),
         ..ClusterConfig::default()
     };
-    let mut cluster = LocalCluster::new(&mut config);
+    let mut cluster = LocalCluster::new(&mut config, SocketAddrSpace::Unspecified);
 
     let snapshot_package_output_path = &snapshot_test_config
         .validator_config
@@ -1532,13 +1576,17 @@ fn test_frozen_account_from_snapshot() {
 
     trace!("Waiting for snapshot at {:?}", snapshot_package_output_path);
     let (archive_filename, _archive_snapshot_hash) =
-        wait_for_next_snapshot(&cluster, &snapshot_package_output_path);
+        wait_for_next_snapshot(&cluster, snapshot_package_output_path);
 
     trace!("Found snapshot: {:?}", archive_filename);
 
     // Restart the validator from a snapshot
     let validator_info = cluster.exit_node(&validator_identity.pubkey());
-    cluster.restart_node(&validator_identity.pubkey(), validator_info);
+    cluster.restart_node(
+        &validator_identity.pubkey(),
+        validator_info,
+        SocketAddrSpace::Unspecified,
+    );
 
     generate_frozen_account_panic(cluster, validator_identity);
 }
@@ -1565,10 +1613,15 @@ fn test_consistency_halt() {
         ..ClusterConfig::default()
     };
 
-    let mut cluster = LocalCluster::new(&mut config);
+    let mut cluster = LocalCluster::new(&mut config, SocketAddrSpace::Unspecified);
 
     sleep(Duration::from_millis(5000));
-    let cluster_nodes = discover_cluster(&cluster.entry_point_info.gossip, 1).unwrap();
+    let cluster_nodes = discover_cluster(
+        &cluster.entry_point_info.gossip,
+        1,
+        SocketAddrSpace::Unspecified,
+    )
+    .unwrap();
     info!("num_nodes: {}", cluster_nodes.len());
 
     // Add a validator with the leader as trusted, it should halt when it detects
@@ -1592,19 +1645,28 @@ fn test_consistency_halt() {
         validator_stake as u64,
         Arc::new(Keypair::new()),
         None,
+        SocketAddrSpace::Unspecified,
     );
     let num_nodes = 2;
     assert_eq!(
-        discover_cluster(&cluster.entry_point_info.gossip, num_nodes)
-            .unwrap()
-            .len(),
+        discover_cluster(
+            &cluster.entry_point_info.gossip,
+            num_nodes,
+            SocketAddrSpace::Unspecified
+        )
+        .unwrap()
+        .len(),
         num_nodes
     );
 
     // Check for only 1 node on the network.
     let mut encountered_error = false;
     loop {
-        let discover = discover_cluster(&cluster.entry_point_info.gossip, 2);
+        let discover = discover_cluster(
+            &cluster.entry_point_info.gossip,
+            2,
+            SocketAddrSpace::Unspecified,
+        );
         match discover {
             Err(_) => {
                 encountered_error = true;
@@ -1656,7 +1718,7 @@ fn test_snapshot_download() {
         ..ClusterConfig::default()
     };
 
-    let mut cluster = LocalCluster::new(&mut config);
+    let mut cluster = LocalCluster::new(&mut config, SocketAddrSpace::Unspecified);
 
     // Get slot after which this was generated
     let snapshot_package_output_path = &leader_snapshot_test_config
@@ -1668,7 +1730,7 @@ fn test_snapshot_download() {
 
     trace!("Waiting for snapshot");
     let (archive_filename, archive_snapshot_hash) =
-        wait_for_next_snapshot(&cluster, &snapshot_package_output_path);
+        wait_for_next_snapshot(&cluster, snapshot_package_output_path);
 
     trace!("found: {:?}", archive_filename);
     let validator_archive_path = snapshot_utils::get_snapshot_archive_path(
@@ -1696,6 +1758,7 @@ fn test_snapshot_download() {
         stake,
         Arc::new(Keypair::new()),
         None,
+        SocketAddrSpace::Unspecified,
     );
 }
 
@@ -1723,7 +1786,7 @@ fn test_snapshot_restart_tower() {
         ..ClusterConfig::default()
     };
 
-    let mut cluster = LocalCluster::new(&mut config);
+    let mut cluster = LocalCluster::new(&mut config, SocketAddrSpace::Unspecified);
 
     // Let the nodes run for a while, then stop one of the validators
     sleep(Duration::from_millis(5000));
@@ -1743,7 +1806,7 @@ fn test_snapshot_restart_tower() {
         .snapshot_package_output_path;
 
     let (archive_filename, archive_snapshot_hash) =
-        wait_for_next_snapshot(&cluster, &snapshot_package_output_path);
+        wait_for_next_snapshot(&cluster, snapshot_package_output_path);
 
     // Copy archive to validator's snapshot output directory
     let validator_archive_path = snapshot_utils::get_snapshot_archive_path(
@@ -1758,17 +1821,18 @@ fn test_snapshot_restart_tower() {
 
     // Restart validator from snapshot, the validator's tower state in this snapshot
     // will contain slots < the root bank of the snapshot. Validator should not panic.
-    cluster.restart_node(&validator_id, validator_info);
+    cluster.restart_node(&validator_id, validator_info, SocketAddrSpace::Unspecified);
 
     // Test cluster can still make progress and get confirmations in tower
     // Use the restarted node as the discovery point so that we get updated
     // validator's ContactInfo
     let restarted_node_info = cluster.get_contact_info(&validator_id).unwrap();
     cluster_tests::spend_and_verify_all_nodes(
-        &restarted_node_info,
+        restarted_node_info,
         &cluster.funding_keypair,
         1,
         HashSet::new(),
+        SocketAddrSpace::Unspecified,
     );
 }
 
@@ -1802,7 +1866,7 @@ fn test_snapshots_blockstore_floor() {
         ..ClusterConfig::default()
     };
 
-    let mut cluster = LocalCluster::new(&mut config);
+    let mut cluster = LocalCluster::new(&mut config, SocketAddrSpace::Unspecified);
 
     trace!("Waiting for snapshot tar to be generated with slot",);
 
@@ -1831,7 +1895,12 @@ fn test_snapshots_blockstore_floor() {
     // Start up a new node from a snapshot
     let validator_stake = 5;
 
-    let cluster_nodes = discover_cluster(&cluster.entry_point_info.gossip, 1).unwrap();
+    let cluster_nodes = discover_cluster(
+        &cluster.entry_point_info.gossip,
+        1,
+        SocketAddrSpace::Unspecified,
+    )
+    .unwrap();
     let mut trusted_validators = HashSet::new();
     trusted_validators.insert(cluster_nodes[0].id);
     validator_snapshot_test_config
@@ -1843,6 +1912,7 @@ fn test_snapshots_blockstore_floor() {
         validator_stake,
         Arc::new(Keypair::new()),
         None,
+        SocketAddrSpace::Unspecified,
     );
     let all_pubkeys = cluster.get_node_pubkeys();
     let validator_id = all_pubkeys
@@ -1911,7 +1981,7 @@ fn test_snapshots_restart_validity() {
     // Create and reboot the node from snapshot `num_runs` times
     let num_runs = 3;
     let mut expected_balances = HashMap::new();
-    let mut cluster = LocalCluster::new(&mut config);
+    let mut cluster = LocalCluster::new(&mut config, SocketAddrSpace::Unspecified);
     for i in 1..num_runs {
         info!("run {}", i);
         // Push transactions to one of the nodes and confirm that transactions were
@@ -1926,7 +1996,7 @@ fn test_snapshots_restart_validity() {
 
         expected_balances.extend(new_balances);
 
-        wait_for_next_snapshot(&cluster, &snapshot_package_output_path);
+        wait_for_next_snapshot(&cluster, snapshot_package_output_path);
 
         // Create new account paths since validator exit is not guaranteed to cleanup RPC threads,
         // which may delete the old accounts on exit at any point
@@ -1941,6 +2011,7 @@ fn test_snapshots_restart_validity() {
         cluster.exit_restart_node(
             &nodes[0],
             safe_clone_config(&snapshot_test_config.validator_config),
+            SocketAddrSpace::Unspecified,
         );
 
         // Verify account balances on validator
@@ -1954,6 +2025,7 @@ fn test_snapshots_restart_validity() {
             &cluster.funding_keypair,
             1,
             HashSet::new(),
+            SocketAddrSpace::Unspecified,
         );
     }
 }
@@ -1967,39 +2039,59 @@ fn test_fail_entry_verification_leader() {
 }
 
 #[test]
-#[allow(unused_attributes)]
+#[serial]
 #[ignore]
+#[allow(unused_attributes)]
 fn test_fake_shreds_broadcast_leader() {
     test_faulty_node(BroadcastStageType::BroadcastFakeShreds);
 }
 
+#[test]
+#[serial]
+#[ignore]
+#[allow(unused_attributes)]
+fn test_duplicate_shreds_broadcast_leader() {
+    test_faulty_node(BroadcastStageType::BroadcastDuplicates(
+        BroadcastDuplicatesConfig {
+            stake_partition: 50,
+            duplicate_send_delay: 1,
+        },
+    ));
+}
+
 fn test_faulty_node(faulty_node_type: BroadcastStageType) {
-    solana_logger::setup_with_default(RUST_LOG_FILTER);
-    let num_nodes = 2;
+    solana_logger::setup_with_default("solana_local_cluster=info");
+    let num_nodes = 3;
+
     let error_validator_config = ValidatorConfig {
         broadcast_stage_type: faulty_node_type,
         ..ValidatorConfig::default()
     };
-    let mut validator_configs = Vec::with_capacity(num_nodes - 1);
+    let mut validator_configs = Vec::with_capacity(num_nodes);
     validator_configs.resize_with(num_nodes - 1, ValidatorConfig::default);
+    validator_configs.push(error_validator_config);
+
+    let mut validator_keys = Vec::with_capacity(num_nodes);
+    validator_keys.resize_with(num_nodes, || (Arc::new(Keypair::new()), true));
 
-    // Push a faulty_bootstrap = vec![error_validator_config];
-    validator_configs.insert(0, error_validator_config);
-    let node_stakes = vec![300, 100];
+    let node_stakes = vec![60, 50, 60];
     assert_eq!(node_stakes.len(), num_nodes);
+    assert_eq!(validator_keys.len(), num_nodes);
+
     let mut cluster_config = ClusterConfig {
         cluster_lamports: 10_000,
         node_stakes,
         validator_configs,
-        slots_per_epoch: MINIMUM_SLOTS_PER_EPOCH * 2,
-        stakers_slot_offset: MINIMUM_SLOTS_PER_EPOCH * 2,
+        validator_keys: Some(validator_keys),
+        slots_per_epoch: MINIMUM_SLOTS_PER_EPOCH * 2u64,
+        stakers_slot_offset: MINIMUM_SLOTS_PER_EPOCH * 2u64,
         ..ClusterConfig::default()
     };
 
-    let cluster = LocalCluster::new(&mut cluster_config);
+    let cluster = LocalCluster::new(&mut cluster_config, SocketAddrSpace::Unspecified);
 
     // Check for new roots
-    cluster.check_for_new_roots(16, &"test_faulty_node");
+    cluster.check_for_new_roots(16, "test_faulty_node", SocketAddrSpace::Unspecified);
 }
 
 #[test]
@@ -2012,7 +2104,7 @@ fn test_wait_for_max_stake() {
         validator_configs: make_identical_validator_configs(&validator_config, 4),
         ..ClusterConfig::default()
     };
-    let cluster = LocalCluster::new(&mut config);
+    let cluster = LocalCluster::new(&mut config, SocketAddrSpace::Unspecified);
     let client = RpcClient::new_socket(cluster.entry_point_info.rpc);
 
     assert!(client
@@ -2036,7 +2128,7 @@ fn test_no_voting() {
         validator_configs: vec![validator_config],
         ..ClusterConfig::default()
     };
-    let mut cluster = LocalCluster::new(&mut config);
+    let mut cluster = LocalCluster::new(&mut config, SocketAddrSpace::Unspecified);
     let client = cluster
         .get_validator_client(&cluster.entry_point_info.id)
         .unwrap();
@@ -2090,7 +2182,7 @@ fn test_optimistic_confirmation_violation_detection() {
         skip_warmup_slots: true,
         ..ClusterConfig::default()
     };
-    let mut cluster = LocalCluster::new(&mut config);
+    let mut cluster = LocalCluster::new(&mut config, SocketAddrSpace::Unspecified);
     let entry_point_id = cluster.entry_point_info.id;
     // Let the nodes run for a while. Wait for validators to vote on slot `S`
     // so that the vote on `S-1` is definitely in gossip and optimistic confirmation is
@@ -2141,7 +2233,11 @@ fn test_optimistic_confirmation_violation_detection() {
         let buf = std::env::var("OPTIMISTIC_CONF_TEST_DUMP_LOG")
             .err()
             .map(|_| BufferRedirect::stderr().unwrap());
-        cluster.restart_node(&entry_point_id, exited_validator_info);
+        cluster.restart_node(
+            &entry_point_id,
+            exited_validator_info,
+            SocketAddrSpace::Unspecified,
+        );
 
         // Wait for a root > prev_voted_slot to be set. Because the root is on a
         // different fork than `prev_voted_slot`, then optimistic confirmation is
@@ -2163,11 +2259,21 @@ fn test_optimistic_confirmation_violation_detection() {
             OptimisticConfirmationVerifier::format_optimistic_confirmed_slot_violation_log(
                 prev_voted_slot,
             );
+        // Violation detection thread can be behind so poll logs up to 10 seconds
         if let Some(mut buf) = buf {
+            let start = Instant::now();
+            let mut success = false;
             let mut output = String::new();
-            buf.read_to_string(&mut output).unwrap();
-            assert!(output.contains(&expected_log));
+            while start.elapsed().as_secs() < 10 {
+                buf.read_to_string(&mut output).unwrap();
+                if output.contains(&expected_log) {
+                    success = true;
+                    break;
+                }
+                sleep(Duration::from_millis(10));
+            }
             print!("{}", output);
+            assert!(success);
         } else {
             panic!("dumped log and disabled testing");
         }
@@ -2199,7 +2305,7 @@ fn test_validator_saves_tower() {
         validator_keys: Some(vec![(validator_identity_keypair.clone(), true)]),
         ..ClusterConfig::default()
     };
-    let mut cluster = LocalCluster::new(&mut config);
+    let mut cluster = LocalCluster::new(&mut config, SocketAddrSpace::Unspecified);
 
     let validator_client = cluster.get_validator_client(&validator_id).unwrap();
 
@@ -2232,7 +2338,7 @@ fn test_validator_saves_tower() {
     assert_eq!(tower1.root(), 0);
 
     // Restart the validator and wait for a new root
-    cluster.restart_node(&validator_id, validator_info);
+    cluster.restart_node(&validator_id, validator_info, SocketAddrSpace::Unspecified);
     let validator_client = cluster.get_validator_client(&validator_id).unwrap();
 
     // Wait for the first root
@@ -2264,7 +2370,7 @@ fn test_validator_saves_tower() {
     // without having to wait for that snapshot to be generated in this test
     tower1.save(&validator_identity_keypair).unwrap();
 
-    cluster.restart_node(&validator_id, validator_info);
+    cluster.restart_node(&validator_id, validator_info, SocketAddrSpace::Unspecified);
     let validator_client = cluster.get_validator_client(&validator_id).unwrap();
 
     // Wait for a new root, demonstrating the validator was able to make progress from the older `tower1`
@@ -2296,7 +2402,7 @@ fn test_validator_saves_tower() {
     remove_tower(&ledger_path, &validator_id);
     validator_info.config.require_tower = false;
 
-    cluster.restart_node(&validator_id, validator_info);
+    cluster.restart_node(&validator_id, validator_info, SocketAddrSpace::Unspecified);
     let validator_client = cluster.get_validator_client(&validator_id).unwrap();
 
     // Wait for a couple more slots to pass so another vote occurs
@@ -2334,7 +2440,7 @@ fn purge_slots(blockstore: &Blockstore, start_slot: Slot, slot_count: Slot) {
 }
 
 fn restore_tower(ledger_path: &Path, node_pubkey: &Pubkey) -> Option<Tower> {
-    let tower = Tower::restore(&ledger_path, &node_pubkey);
+    let tower = Tower::restore(ledger_path, node_pubkey);
     if let Err(tower_err) = tower {
         if tower_err.is_file_missing() {
             return None;
@@ -2343,7 +2449,7 @@ fn restore_tower(ledger_path: &Path, node_pubkey: &Pubkey) -> Option<Tower> {
         }
     }
     // actually saved tower must have at least one vote.
-    Tower::restore(&ledger_path, &node_pubkey).ok()
+    Tower::restore(ledger_path, node_pubkey).ok()
 }
 
 fn last_vote_in_tower(ledger_path: &Path, node_pubkey: &Pubkey) -> Option<(Slot, Hash)> {
@@ -2355,7 +2461,7 @@ fn root_in_tower(ledger_path: &Path, node_pubkey: &Pubkey) -> Option<Slot> {
 }
 
 fn remove_tower(ledger_path: &Path, node_pubkey: &Pubkey) {
-    fs::remove_file(Tower::get_filename(&ledger_path, &node_pubkey)).unwrap();
+    fs::remove_file(Tower::get_filename(ledger_path, node_pubkey)).unwrap();
 }
 
 // A bit convoluted test case; but this roughly follows this test theoretical scenario:
@@ -2439,7 +2545,7 @@ fn do_test_optimistic_confirmation_violation_with_or_without_tower(with_tower: b
         skip_warmup_slots: true,
         ..ClusterConfig::default()
     };
-    let mut cluster = LocalCluster::new(&mut config);
+    let mut cluster = LocalCluster::new(&mut config, SocketAddrSpace::Unspecified);
 
     let base_slot = 26; // S2
     let next_slot_on_a = 27; // S3
@@ -2520,7 +2626,11 @@ fn do_test_optimistic_confirmation_violation_with_or_without_tower(with_tower: b
     // Run validator C only to make it produce and vote on its own fork.
     info!("Restart validator C again!!!");
     let val_c_ledger_path = validator_c_info.info.ledger_path.clone();
-    cluster.restart_node(&validator_c_pubkey, validator_c_info);
+    cluster.restart_node(
+        &validator_c_pubkey,
+        validator_c_info,
+        SocketAddrSpace::Unspecified,
+    );
 
     let mut votes_on_c_fork = std::collections::BTreeSet::new(); // S4 and S5
     for _ in 0..100 {
@@ -2542,7 +2652,11 @@ fn do_test_optimistic_confirmation_violation_with_or_without_tower(with_tower: b
     // Step 4:
     // verify whether there was violation or not
     info!("Restart validator A again!!!");
-    cluster.restart_node(&validator_a_pubkey, validator_a_info);
+    cluster.restart_node(
+        &validator_a_pubkey,
+        validator_a_info,
+        SocketAddrSpace::Unspecified,
+    );
 
     // monitor for actual votes from validator A
     let mut bad_vote_detected = false;
@@ -2629,7 +2743,7 @@ fn do_test_future_tower(cluster_mode: ClusterMode) {
         skip_warmup_slots: true,
         ..ClusterConfig::default()
     };
-    let mut cluster = LocalCluster::new(&mut config);
+    let mut cluster = LocalCluster::new(&mut config, SocketAddrSpace::Unspecified);
 
     let val_a_ledger_path = cluster.ledger_path(&validator_a_pubkey);
 
@@ -2654,7 +2768,11 @@ fn do_test_future_tower(cluster_mode: ClusterMode) {
         purge_slots(&blockstore, purged_slot_before_restart, 100);
     }
 
-    cluster.restart_node(&validator_a_pubkey, validator_a_info);
+    cluster.restart_node(
+        &validator_a_pubkey,
+        validator_a_info,
+        SocketAddrSpace::Unspecified,
+    );
 
     let mut newly_rooted = false;
     let some_root_after_restart = purged_slot_before_restart + 25; // 25 is arbitrary; just wait a bit
@@ -2736,7 +2854,10 @@ fn test_hard_fork_invalidates_tower() {
         skip_warmup_slots: true,
         ..ClusterConfig::default()
     };
-    let cluster = std::sync::Arc::new(std::sync::Mutex::new(LocalCluster::new(&mut config)));
+    let cluster = std::sync::Arc::new(std::sync::Mutex::new(LocalCluster::new(
+        &mut config,
+        SocketAddrSpace::Unspecified,
+    )));
 
     let val_a_ledger_path = cluster.lock().unwrap().ledger_path(&validator_a_pubkey);
 
@@ -2781,8 +2902,11 @@ fn test_hard_fork_invalidates_tower() {
             .lock()
             .unwrap()
             .create_restart_context(&validator_a_pubkey, &mut validator_a_info);
-        let restarted_validator_info =
-            LocalCluster::restart_node_with_context(validator_a_info, restart_context);
+        let restarted_validator_info = LocalCluster::restart_node_with_context(
+            validator_a_info,
+            restart_context,
+            SocketAddrSpace::Unspecified,
+        );
         cluster_for_a
             .lock()
             .unwrap()
@@ -2804,10 +2928,11 @@ fn test_hard_fork_invalidates_tower() {
     }
 
     // restart validator B normally
-    cluster
-        .lock()
-        .unwrap()
-        .restart_node(&validator_b_pubkey, validator_b_info);
+    cluster.lock().unwrap().restart_node(
+        &validator_b_pubkey,
+        validator_b_info,
+        SocketAddrSpace::Unspecified,
+    );
 
     // validator A should now start so join its thread here
     thread.join().unwrap();
@@ -2816,7 +2941,7 @@ fn test_hard_fork_invalidates_tower() {
     cluster
         .lock()
         .unwrap()
-        .check_for_new_roots(16, &"hard fork");
+        .check_for_new_roots(16, "hard fork", SocketAddrSpace::Unspecified);
 }
 
 #[test]
@@ -2875,7 +3000,11 @@ fn run_test_load_program_accounts_partition(scan_commitment: CommitmentConfig) {
     let on_partition_before_resolved = |_: &mut LocalCluster, _: &mut ()| {};
 
     let on_partition_resolved = |cluster: &mut LocalCluster, _: &mut ()| {
-        cluster.check_for_new_roots(20, &"run_test_load_program_accounts_partition");
+        cluster.check_for_new_roots(
+            20,
+            "run_test_load_program_accounts_partition",
+            SocketAddrSpace::Unspecified,
+        );
         exit.store(true, Ordering::Relaxed);
         t_update.join().unwrap();
         t_scan.join().unwrap();
@@ -3050,7 +3179,7 @@ fn run_test_load_program_accounts(scan_commitment: CommitmentConfig) {
         additional_accounts: starting_accounts,
         ..ClusterConfig::default()
     };
-    let cluster = LocalCluster::new(&mut config);
+    let cluster = LocalCluster::new(&mut config, SocketAddrSpace::Unspecified);
 
     // Give the threads a client to use for querying the cluster
     let all_pubkeys = cluster.get_node_pubkeys();
@@ -3066,7 +3195,11 @@ fn run_test_load_program_accounts(scan_commitment: CommitmentConfig) {
     scan_client_sender.send(scan_client).unwrap();
 
     // Wait for some roots to pass
-    cluster.check_for_new_roots(40, &"run_test_load_program_accounts");
+    cluster.check_for_new_roots(
+        40,
+        "run_test_load_program_accounts",
+        SocketAddrSpace::Unspecified,
+    );
 
     // Exit and ensure no violations of consistency were found
     exit.store(true, Ordering::Relaxed);
diff --git a/log-analyzer/Cargo.toml b/log-analyzer/Cargo.toml
index 8ce0a60982564f..3201aac181a50f 100644
--- a/log-analyzer/Cargo.toml
+++ b/log-analyzer/Cargo.toml
@@ -3,7 +3,7 @@ authors = ["Solana Maintainers <maintainers@solana.com>"]
 edition = "2018"
 name = "solana-log-analyzer"
 description = "The solana cluster network analysis tool"
-version = "1.7.0"
+version = "1.7.11"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
@@ -14,9 +14,9 @@ byte-unit = "4.0.9"
 clap = "2.33.1"
 serde = "1.0.122"
 serde_json = "1.0.56"
-solana-clap-utils = { path = "../clap-utils", version = "=1.7.0" }
-solana-logger = { path = "../logger", version = "=1.7.0" }
-solana-version = { path = "../version", version = "=1.7.0" }
+solana-clap-utils = { path = "../clap-utils", version = "=1.7.11" }
+solana-logger = { path = "../logger", version = "=1.7.11" }
+solana-version = { path = "../version", version = "=1.7.11" }
 
 [[bin]]
 name = "solana-log-analyzer"
diff --git a/logger/Cargo.toml b/logger/Cargo.toml
index d5567d8c7de4cb..e7625987e3f56c 100644
--- a/logger/Cargo.toml
+++ b/logger/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "solana-logger"
-version = "1.7.0"
+version = "1.7.11"
 description = "Solana Logger"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
diff --git a/measure/Cargo.toml b/measure/Cargo.toml
index ac26883fb140c0..88076cf1b77628 100644
--- a/measure/Cargo.toml
+++ b/measure/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "solana-measure"
 description = "Blockchain, Rebuilt for Scale"
-version = "1.7.0"
+version = "1.7.11"
 homepage = "https://solana.com/"
 documentation = "https://docs.rs/solana-measure"
 readme = "../README.md"
@@ -12,8 +12,8 @@ edition = "2018"
 
 [dependencies]
 log = "0.4.11"
-solana-sdk = { path = "../sdk", version = "=1.7.0" }
-solana-metrics = { path = "../metrics", version = "=1.7.0" }
+solana-sdk = { path = "../sdk", version = "=1.7.11" }
+solana-metrics = { path = "../metrics", version = "=1.7.11" }
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
diff --git a/measure/src/measure.rs b/measure/src/measure.rs
index 3b342605235093..26f32b097cd5e4 100644
--- a/measure/src/measure.rs
+++ b/measure/src/measure.rs
@@ -216,7 +216,7 @@ mod tests {
         {
             let some_struct = SomeStruct { x: 42 };
             let (result, _measure) = Measure::this(
-                |(obj, x)| SomeStruct::add_to(&obj, x),
+                |(obj, x)| SomeStruct::add_to(obj, x),
                 (&some_struct, 4),
                 "test",
             );
diff --git a/merkle-root-bench/Cargo.toml b/merkle-root-bench/Cargo.toml
index 5c471ba40155c7..c55f4a114ac3cb 100644
--- a/merkle-root-bench/Cargo.toml
+++ b/merkle-root-bench/Cargo.toml
@@ -2,7 +2,7 @@
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 edition = "2018"
 name = "solana-merkle-root-bench"
-version = "1.7.0"
+version = "1.7.11"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
@@ -10,11 +10,11 @@ publish = false
 
 [dependencies]
 log = "0.4.11"
-solana-logger = { path = "../logger", version = "=1.7.0" }
-solana-runtime = { path = "../runtime", version = "=1.7.0" }
-solana-measure = { path = "../measure", version = "=1.7.0" }
-solana-sdk = { path = "../sdk", version = "=1.7.0" }
-solana-version = { path = "../version", version = "=1.7.0" }
+solana-logger = { path = "../logger", version = "=1.7.11" }
+solana-runtime = { path = "../runtime", version = "=1.7.11" }
+solana-measure = { path = "../measure", version = "=1.7.11" }
+solana-sdk = { path = "../sdk", version = "=1.7.11" }
+solana-version = { path = "../version", version = "=1.7.11" }
 clap = "2.33.1"
 
 [package.metadata.docs.rs]
diff --git a/merkle-tree/Cargo.toml b/merkle-tree/Cargo.toml
index afae0fded082bd..3dcecab123c587 100644
--- a/merkle-tree/Cargo.toml
+++ b/merkle-tree/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "solana-merkle-tree"
-version = "1.7.0"
+version = "1.7.11"
 description = "Solana Merkle Tree"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -10,7 +10,7 @@ documentation = "https://docs.rs/solana-merkle-tree"
 edition = "2018"
 
 [dependencies]
-solana-program = { path = "../sdk/program", version = "=1.7.0" }
+solana-program = { path = "../sdk/program", version = "=1.7.11" }
 fast-math = "0.1"
 
 # This can go once the BPF toolchain target Rust 1.42.0+
diff --git a/metrics/Cargo.toml b/metrics/Cargo.toml
index 2904ffaf627f07..d65b89687fb631 100644
--- a/metrics/Cargo.toml
+++ b/metrics/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "solana-metrics"
-version = "1.7.0"
+version = "1.7.11"
 description = "Solana Metrics"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -15,7 +15,7 @@ gethostname = "0.2.1"
 lazy_static = "1.4.0"
 log = "0.4.11"
 reqwest = { version = "0.11.2", default-features = false, features = ["blocking", "rustls-tls", "json"] }
-solana-sdk = { path = "../sdk", version = "=1.7.0" }
+solana-sdk = { path = "../sdk", version = "=1.7.11" }
 
 [dev-dependencies]
 rand = "0.7.0"
diff --git a/metrics/src/counter.rs b/metrics/src/counter.rs
index 1bbc0dd778516e..29b7ecc526d2e9 100644
--- a/metrics/src/counter.rs
+++ b/metrics/src/counter.rs
@@ -222,7 +222,7 @@ mod tests {
             INIT_HOOK.call_once(|| {
                 ENV_LOCK = Some(RwLock::new(()));
             });
-            &ENV_LOCK.as_ref().unwrap()
+            ENV_LOCK.as_ref().unwrap()
         }
     }
 
diff --git a/metrics/src/metrics.rs b/metrics/src/metrics.rs
index 4484e8220bfa24..6d55b89e7e7a66 100644
--- a/metrics/src/metrics.rs
+++ b/metrics/src/metrics.rs
@@ -103,16 +103,23 @@ impl MetricsWriter for InfluxDbMetricsWriter {
 
             let client = reqwest::blocking::Client::builder()
                 .timeout(Duration::from_secs(5))
-                .build()
-                .unwrap();
+                .build();
+            let client = match client {
+                Ok(client) => client,
+                Err(err) => {
+                    warn!("client instantiation failed: {}", err);
+                    return;
+                }
+            };
+
             let response = client.post(write_url.as_str()).body(line).send();
             if let Ok(resp) = response {
-                if !resp.status().is_success() {
-                    warn!(
-                        "submit response unsuccessful: {} {}",
-                        resp.status(),
-                        resp.text().unwrap()
-                    );
+                let status = resp.status();
+                if !status.is_success() {
+                    let text = resp
+                        .text()
+                        .unwrap_or_else(|_| "[text body empty]".to_string());
+                    warn!("submit response unsuccessful: {} {}", status, text,);
                 }
             } else {
                 warn!("submit error: {}", response.unwrap_err());
diff --git a/multinode-demo/bootstrap-validator.sh b/multinode-demo/bootstrap-validator.sh
index d0046af995bd36..93c70af06977b2 100755
--- a/multinode-demo/bootstrap-validator.sh
+++ b/multinode-demo/bootstrap-validator.sh
@@ -20,6 +20,7 @@ else
 fi
 
 no_restart=0
+maybeRequireTower=true
 
 args=()
 while [[ -n $1 ]]; do
@@ -75,6 +76,12 @@ while [[ -n $1 ]]; do
     elif [[ $1 == --maximum-snapshots-to-retain ]]; then
       args+=("$1" "$2")
       shift 2
+    elif [[ $1 == --accounts-db-skip-shrink ]]; then
+      args+=("$1")
+      shift
+    elif [[ $1 == --skip-require-tower ]]; then
+      maybeRequireTower=false
+      shift
     else
       echo "Unknown argument: $1"
       $program --help
@@ -99,8 +106,11 @@ ledger_dir="$SOLANA_CONFIG_DIR"/bootstrap-validator
   exit 1
 }
 
+if [[ $maybeRequireTower = true ]]; then
+  args+=(--require-tower)
+fi
+
 args+=(
-  --require-tower
   --ledger "$ledger_dir"
   --rpc-port 8899
   --snapshot-interval-slots 200
diff --git a/multinode-demo/validator.sh b/multinode-demo/validator.sh
index 224300954cbb40..bb596ee67cf430 100755
--- a/multinode-demo/validator.sh
+++ b/multinode-demo/validator.sh
@@ -45,6 +45,8 @@ EOF
   exit 1
 }
 
+maybeRequireTower=true
+
 positional_args=()
 while [[ -n $1 ]]; do
   if [[ ${1:0:1} = - ]]; then
@@ -140,10 +142,10 @@ while [[ -n $1 ]]; do
     elif [[ $1 = --log ]]; then
       args+=("$1" "$2")
       shift 2
-    elif [[ $1 = --trusted-validator ]]; then
+    elif [[ $1 = --known-validator ]]; then
       args+=("$1" "$2")
       shift 2
-    elif [[ $1 = --halt-on-trusted-validators-accounts-hash-mismatch ]]; then
+    elif [[ $1 = --halt-on-known-validators-accounts-hash-mismatch ]]; then
       args+=("$1")
       shift
     elif [[ $1 = --max-genesis-archive-unpacked-size ]]; then
@@ -155,6 +157,12 @@ while [[ -n $1 ]]; do
     elif [[ $1 == --expected-bank-hash ]]; then
       args+=("$1" "$2")
       shift 2
+    elif [[ $1 == --accounts-db-skip-shrink ]]; then
+      args+=("$1")
+      shift
+    elif [[ $1 == --skip-require-tower ]]; then
+      maybeRequireTower=false
+      shift
     elif [[ $1 = -h ]]; then
       usage "$@"
     else
@@ -227,7 +235,10 @@ default_arg --identity "$identity"
 default_arg --vote-account "$vote_account"
 default_arg --ledger "$ledger_dir"
 default_arg --log -
-default_arg --require-tower
+
+if [[ $maybeRequireTower = true ]]; then
+  default_arg --require-tower
+fi
 
 if [[ -n $SOLANA_CUDA ]]; then
   program=$solana_validator_cuda
diff --git a/net-shaper/Cargo.toml b/net-shaper/Cargo.toml
index 9e0dea8a6163f5..15259e416e4e2f 100644
--- a/net-shaper/Cargo.toml
+++ b/net-shaper/Cargo.toml
@@ -3,7 +3,7 @@ authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 edition = "2018"
 name = "solana-net-shaper"
 description = "The solana cluster network shaping tool"
-version = "1.7.0"
+version = "1.7.11"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
@@ -13,8 +13,8 @@ publish = false
 clap = "2.33.1"
 serde = "1.0.122"
 serde_json = "1.0.56"
-solana-clap-utils = { path = "../clap-utils", version = "=1.7.0" }
-solana-logger = { path = "../logger", version = "=1.7.0" }
+solana-clap-utils = { path = "../clap-utils", version = "=1.7.11" }
+solana-logger = { path = "../logger", version = "=1.7.11" }
 rand = "0.7.0"
 
 [[bin]]
diff --git a/net-utils/Cargo.toml b/net-utils/Cargo.toml
index 5a13571098e6f7..0970c333598a3f 100644
--- a/net-utils/Cargo.toml
+++ b/net-utils/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "solana-net-utils"
-version = "1.7.0"
+version = "1.7.11"
 description = "Solana Network Utilities"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -18,9 +18,10 @@ rand = "0.7.0"
 serde = "1.0.122"
 serde_derive = "1.0.103"
 socket2 = "0.3.17"
-solana-clap-utils = { path = "../clap-utils", version = "=1.7.0" }
-solana-logger = { path = "../logger", version = "=1.7.0" }
-solana-version = { path = "../version", version = "=1.7.0" }
+solana-clap-utils = { path = "../clap-utils", version = "=1.7.11" }
+solana-logger = { path = "../logger", version = "=1.7.11" }
+solana-sdk = { path = "../sdk", version = "=1.7.11" }
+solana-version = { path = "../version", version = "=1.7.11" }
 tokio = { version = "1", features = ["full"] }
 url = "2.1.1"
 
diff --git a/net-utils/src/bin/ip_address_server.rs b/net-utils/src/bin/ip_address_server.rs
index d1b2e60d322ae2..dbf55f8edb63a2 100644
--- a/net-utils/src/bin/ip_address_server.rs
+++ b/net-utils/src/bin/ip_address_server.rs
@@ -19,7 +19,7 @@ fn main() {
         .unwrap_or_else(|_| panic!("Unable to parse {}", port));
     let bind_addr = SocketAddr::from(([0, 0, 0, 0], port));
     let tcp_listener = TcpListener::bind(bind_addr).expect("unable to start tcp listener");
-    let _runtime = solana_net_utils::ip_echo_server(tcp_listener);
+    let _runtime = solana_net_utils::ip_echo_server(tcp_listener, /*shred_version=*/ None);
     loop {
         std::thread::park();
     }
diff --git a/net-utils/src/ip_echo_server.rs b/net-utils/src/ip_echo_server.rs
index df46be35599263..31f0b704ddc718 100644
--- a/net-utils/src/ip_echo_server.rs
+++ b/net-utils/src/ip_echo_server.rs
@@ -1,8 +1,13 @@
 use {
-    crate::{ip_echo_server_reply_length, HEADER_LENGTH},
+    crate::{HEADER_LENGTH, IP_ECHO_SERVER_RESPONSE_LENGTH},
     log::*,
     serde_derive::{Deserialize, Serialize},
-    std::{io, net::SocketAddr, time::Duration},
+    solana_sdk::deserialize_utils::default_on_eof,
+    std::{
+        io,
+        net::{IpAddr, SocketAddr},
+        time::Duration,
+    },
     tokio::{
         io::{AsyncReadExt, AsyncWriteExt},
         net::{TcpListener, TcpStream},
@@ -23,6 +28,15 @@ pub(crate) struct IpEchoServerMessage {
     udp_ports: [u16; MAX_PORT_COUNT_PER_MESSAGE], // Fixed size list of ports to avoid vec serde
 }
 
+#[derive(Debug, PartialEq, Serialize, Deserialize)]
+pub struct IpEchoServerResponse {
+    // Public IP address of request echoed back to the node.
+    pub(crate) address: IpAddr,
+    // Cluster shred-version of the node running the server.
+    #[serde(deserialize_with = "default_on_eof")]
+    pub(crate) shred_version: Option<u16>,
+}
+
 impl IpEchoServerMessage {
     pub fn new(tcp_ports: &[u16], udp_ports: &[u16]) -> Self {
         let mut msg = Self::default();
@@ -42,7 +56,11 @@ pub(crate) fn ip_echo_server_request_length() -> usize {
         + REQUEST_TERMINUS_LENGTH
 }
 
-async fn process_connection(mut socket: TcpStream, peer_addr: SocketAddr) -> io::Result<()> {
+async fn process_connection(
+    mut socket: TcpStream,
+    peer_addr: SocketAddr,
+    shred_version: Option<u16>,
+) -> io::Result<()> {
     info!("connection from {:?}", peer_addr);
 
     let mut data = vec![0u8; ip_echo_server_request_length()];
@@ -113,16 +131,19 @@ async fn process_connection(mut socket: TcpStream, peer_addr: SocketAddr) -> io:
             let _ = tcp_stream.shutdown();
         }
     }
-
+    let response = IpEchoServerResponse {
+        address: peer_addr.ip(),
+        shred_version,
+    };
     // "\0\0\0\0" header is added to ensure a valid response will never
     // conflict with the first four bytes of a valid HTTP response.
-    let mut bytes = vec![0u8; ip_echo_server_reply_length()];
-    bincode::serialize_into(&mut bytes[HEADER_LENGTH..], &peer_addr.ip()).unwrap();
+    let mut bytes = vec![0u8; IP_ECHO_SERVER_RESPONSE_LENGTH];
+    bincode::serialize_into(&mut bytes[HEADER_LENGTH..], &response).unwrap();
     trace!("response: {:?}", bytes);
     writer.write_all(&bytes).await
 }
 
-async fn run_echo_server(tcp_listener: std::net::TcpListener) {
+async fn run_echo_server(tcp_listener: std::net::TcpListener, shred_version: Option<u16>) {
     info!("bound to {:?}", tcp_listener.local_addr().unwrap());
     let tcp_listener =
         TcpListener::from_std(tcp_listener).expect("Failed to convert std::TcpListener");
@@ -131,7 +152,7 @@ async fn run_echo_server(tcp_listener: std::net::TcpListener) {
         match tcp_listener.accept().await {
             Ok((socket, peer_addr)) => {
                 runtime::Handle::current().spawn(async move {
-                    if let Err(err) = process_connection(socket, peer_addr).await {
+                    if let Err(err) = process_connection(socket, peer_addr, shred_version).await {
                         info!("session failed: {:?}", err);
                     }
                 });
@@ -143,10 +164,14 @@ async fn run_echo_server(tcp_listener: std::net::TcpListener) {
 
 /// Starts a simple TCP server on the given port that echos the IP address of any peer that
 /// connects.  Used by |get_public_ip_addr|
-pub fn ip_echo_server(tcp_listener: std::net::TcpListener) -> IpEchoServer {
+pub fn ip_echo_server(
+    tcp_listener: std::net::TcpListener,
+    // Cluster shred-version of the node running the server.
+    shred_version: Option<u16>,
+) -> IpEchoServer {
     tcp_listener.set_nonblocking(true).unwrap();
 
     let runtime = Runtime::new().expect("Failed to create Runtime");
-    runtime.spawn(run_echo_server(tcp_listener));
+    runtime.spawn(run_echo_server(tcp_listener, shred_version));
     runtime
 }
diff --git a/net-utils/src/lib.rs b/net-utils/src/lib.rs
index 6c66f3d7fd2488..55d702baeb33b9 100644
--- a/net-utils/src/lib.rs
+++ b/net-utils/src/lib.rs
@@ -15,8 +15,8 @@ use {
 };
 
 mod ip_echo_server;
-use ip_echo_server::IpEchoServerMessage;
 pub use ip_echo_server::{ip_echo_server, IpEchoServer, MAX_PORT_COUNT_PER_MESSAGE};
+use ip_echo_server::{IpEchoServerMessage, IpEchoServerResponse};
 
 /// A data type representing a public Udp socket
 pub struct UdpSocketPair {
@@ -28,17 +28,12 @@ pub struct UdpSocketPair {
 pub type PortRange = (u16, u16);
 
 pub(crate) const HEADER_LENGTH: usize = 4;
-pub(crate) fn ip_echo_server_reply_length() -> usize {
-    let largest_ip_addr = IpAddr::from([0u16; 8]); // IPv6 variant
-    HEADER_LENGTH + bincode::serialized_size(&largest_ip_addr).unwrap() as usize
-}
+pub(crate) const IP_ECHO_SERVER_RESPONSE_LENGTH: usize = HEADER_LENGTH + 23;
 
 fn ip_echo_server_request(
     ip_echo_server_addr: &SocketAddr,
     msg: IpEchoServerMessage,
-) -> Result<IpAddr, String> {
-    let mut data = vec![0u8; ip_echo_server_reply_length()];
-
+) -> Result<IpEchoServerResponse, String> {
     let timeout = Duration::new(5, 0);
     TcpStream::connect_timeout(ip_echo_server_addr, timeout)
         .and_then(|mut stream| {
@@ -54,9 +49,11 @@ fn ip_echo_server_request(
             stream.set_read_timeout(Some(Duration::new(10, 0)))?;
             stream.write_all(&bytes)?;
             stream.shutdown(std::net::Shutdown::Write)?;
-            stream.read(data.as_mut_slice())
+            let mut data = vec![0u8; IP_ECHO_SERVER_RESPONSE_LENGTH];
+            let _ = stream.read(&mut data[..])?;
+            Ok(data)
         })
-        .and_then(|_| {
+        .and_then(|data| {
             // It's common for users to accidentally confuse the validator's gossip port and JSON
             // RPC port.  Attempt to detect when this occurs by looking for the standard HTTP
             // response header and provide the user with a helpful error message
@@ -102,7 +99,14 @@ fn ip_echo_server_request(
 /// Determine the public IP address of this machine by asking an ip_echo_server at the given
 /// address
 pub fn get_public_ip_addr(ip_echo_server_addr: &SocketAddr) -> Result<IpAddr, String> {
-    ip_echo_server_request(ip_echo_server_addr, IpEchoServerMessage::default())
+    let resp = ip_echo_server_request(ip_echo_server_addr, IpEchoServerMessage::default())?;
+    Ok(resp.address)
+}
+
+pub fn get_cluster_shred_version(ip_echo_server_addr: &SocketAddr) -> Result<u16, String> {
+    let resp = ip_echo_server_request(ip_echo_server_addr, IpEchoServerMessage::default())?;
+    resp.shred_version
+        .ok_or_else(|| String::from("IP echo server does not return a shred-version"))
 }
 
 // Checks if any of the provided TCP/UDP ports are not reachable by the machine at
@@ -524,6 +528,57 @@ mod tests {
     use super::*;
     use std::net::Ipv4Addr;
 
+    #[test]
+    fn test_response_length() {
+        let resp = IpEchoServerResponse {
+            address: IpAddr::from([u16::MAX; 8]), // IPv6 variant
+            shred_version: Some(u16::MAX),
+        };
+        let resp_size = bincode::serialized_size(&resp).unwrap();
+        assert_eq!(
+            IP_ECHO_SERVER_RESPONSE_LENGTH,
+            HEADER_LENGTH + resp_size as usize
+        );
+    }
+
+    // Asserts that an old client can parse the response from a new server.
+    #[test]
+    fn test_backward_compat() {
+        let address = IpAddr::from([
+            525u16, 524u16, 523u16, 522u16, 521u16, 520u16, 519u16, 518u16,
+        ]);
+        let response = IpEchoServerResponse {
+            address,
+            shred_version: Some(42),
+        };
+        let mut data = vec![0u8; IP_ECHO_SERVER_RESPONSE_LENGTH];
+        bincode::serialize_into(&mut data[HEADER_LENGTH..], &response).unwrap();
+        data.truncate(HEADER_LENGTH + 20);
+        assert_eq!(
+            bincode::deserialize::<IpAddr>(&data[HEADER_LENGTH..]).unwrap(),
+            address
+        );
+    }
+
+    // Asserts that a new client can parse the response from an old server.
+    #[test]
+    fn test_forward_compat() {
+        let address = IpAddr::from([
+            525u16, 524u16, 523u16, 522u16, 521u16, 520u16, 519u16, 518u16,
+        ]);
+        let mut data = vec![0u8; IP_ECHO_SERVER_RESPONSE_LENGTH];
+        bincode::serialize_into(&mut data[HEADER_LENGTH..], &address).unwrap();
+        let response: Result<IpEchoServerResponse, _> =
+            bincode::deserialize(&data[HEADER_LENGTH..]);
+        assert_eq!(
+            response.unwrap(),
+            IpEchoServerResponse {
+                address,
+                shred_version: None,
+            }
+        );
+    }
+
     #[test]
     fn test_parse_port_or_addr() {
         let p1 = parse_port_or_addr(Some("9000"), SocketAddr::from(([1, 2, 3, 4], 1)));
@@ -624,14 +679,14 @@ mod tests {
         let (_server_port, (server_udp_socket, server_tcp_listener)) =
             bind_common_in_range(ip_addr, (3200, 3250)).unwrap();
 
-        let _runtime = ip_echo_server(server_tcp_listener);
+        let _runtime = ip_echo_server(server_tcp_listener, /*shred_version=*/ Some(42));
 
         let server_ip_echo_addr = server_udp_socket.local_addr().unwrap();
         assert_eq!(
             get_public_ip_addr(&server_ip_echo_addr),
             parse_host("127.0.0.1"),
         );
-
+        assert_eq!(get_cluster_shred_version(&server_ip_echo_addr), Ok(42));
         assert!(verify_reachable_ports(&server_ip_echo_addr, vec![], &[],));
     }
 
@@ -644,14 +699,14 @@ mod tests {
         let (client_port, (client_udp_socket, client_tcp_listener)) =
             bind_common_in_range(ip_addr, (3200, 3250)).unwrap();
 
-        let _runtime = ip_echo_server(server_tcp_listener);
+        let _runtime = ip_echo_server(server_tcp_listener, /*shred_version=*/ Some(65535));
 
         let ip_echo_server_addr = server_udp_socket.local_addr().unwrap();
         assert_eq!(
             get_public_ip_addr(&ip_echo_server_addr),
             parse_host("127.0.0.1"),
         );
-
+        assert_eq!(get_cluster_shred_version(&ip_echo_server_addr), Ok(65535));
         assert!(verify_reachable_ports(
             &ip_echo_server_addr,
             vec![(client_port, client_tcp_listener)],
diff --git a/net/net.sh b/net/net.sh
index 3a25c81f261551..873c81b023da37 100755
--- a/net/net.sh
+++ b/net/net.sh
@@ -102,7 +102,10 @@ Operate a configured testnet
    --cluster-type development|devnet|testnet|mainnet-beta
                                       - Specify whether or not to launch the cluster in "development" mode with all features enabled at epoch 0,
                                         or various other live clusters' feature set (default: development)
-   --warp-slot WARP_SLOT              - Boot from a snapshot that has warped ahead to WARP_SLOT rather than a slot 0 genesis.
+   --slots-per-epoch SLOTS
+                                      - Override the number of slots in an epoch
+   --warp-slot WARP_SLOT
+                                      - Boot from a snapshot that has warped ahead to WARP_SLOT rather than a slot 0 genesis.
  sanity/start-specific options:
    -F                   - Discard validator nodes that didn't bootup successfully
    -o noInstallCheck    - Skip solana-install sanity
@@ -306,7 +309,7 @@ startBootstrapLeader() {
          ${#clientIpList[@]} \"$benchTpsExtraArgs\" \
          ${#clientIpList[@]} \"$benchExchangeExtraArgs\" \
          \"$genesisOptions\" \
-         \"$maybeNoSnapshot $maybeSkipLedgerVerify $maybeLimitLedgerSize $maybeWaitForSupermajority\" \
+         \"$maybeNoSnapshot $maybeSkipLedgerVerify $maybeLimitLedgerSize $maybeWaitForSupermajority $maybeAccountsDbSkipShrink $maybeSkipRequireTower\" \
          \"$gpuMode\" \
          \"$maybeWarpSlot\" \
          \"$waitForNodeInit\" \
@@ -378,7 +381,7 @@ startNode() {
          ${#clientIpList[@]} \"$benchTpsExtraArgs\" \
          ${#clientIpList[@]} \"$benchExchangeExtraArgs\" \
          \"$genesisOptions\" \
-         \"$maybeNoSnapshot $maybeSkipLedgerVerify $maybeLimitLedgerSize $maybeWaitForSupermajority\" \
+         \"$maybeNoSnapshot $maybeSkipLedgerVerify $maybeLimitLedgerSize $maybeWaitForSupermajority $maybeAccountsDbSkipShrink $maybeSkipRequireTower\" \
          \"$gpuMode\" \
          \"$maybeWarpSlot\" \
          \"$waitForNodeInit\" \
@@ -779,6 +782,8 @@ maybeLimitLedgerSize=""
 maybeSkipLedgerVerify=""
 maybeDisableAirdrops=""
 maybeWaitForSupermajority=""
+maybeAccountsDbSkipShrink=""
+maybeSkipRequireTower=""
 debugBuild=false
 doBuild=true
 gpuMode=auto
@@ -822,6 +827,9 @@ while [[ -n $1 ]]; do
       esac
       genesisOptions="$genesisOptions $1 $2"
       shift 2
+    elif [[ $1 = --slots-per-epoch ]]; then
+      genesisOptions="$genesisOptions $1 $2"
+      shift 2
     elif [[ $1 = --no-snapshot-fetch ]]; then
       maybeNoSnapshot="$1"
       shift 1
@@ -900,6 +908,12 @@ while [[ -n $1 ]]; do
     elif [[ $1 == --extra-primordial-stakes ]]; then
       extraPrimordialStakes=$2
       shift 2
+    elif [[ $1 = --accounts-db-skip-shrink ]]; then
+      maybeAccountsDbSkipShrink="$1"
+      shift 1
+    elif [[ $1 = --skip-require-tower ]]; then
+      maybeSkipRequireTower="$1"
+      shift 1
     else
       usage "Unknown long option: $1"
     fi
diff --git a/notifier/Cargo.toml b/notifier/Cargo.toml
index ca81c7de720303..247202af76823e 100644
--- a/notifier/Cargo.toml
+++ b/notifier/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "solana-notifier"
-version = "1.7.0"
+version = "1.7.11"
 description = "Solana Notifier"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
diff --git a/perf/Cargo.toml b/perf/Cargo.toml
index 8ab4a157fd224f..9d57b5e2b7b3be 100644
--- a/perf/Cargo.toml
+++ b/perf/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "solana-perf"
-version = "1.7.0"
+version = "1.7.11"
 description = "Solana Performance APIs"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -10,20 +10,19 @@ documentation = "https://docs.rs/solana-perf"
 edition = "2018"
 
 [dependencies]
-rand = "0.7.0"
-dlopen = "0.1.8"
 bincode = "1.3.1"
-rayon = "1.5.0"
-serde = "1.0.122"
+curve25519-dalek = { version = "2" }
+dlopen = "0.1.8"
 dlopen_derive = "0.1.4"
 lazy_static = "1.4.0"
 log = "0.4.11"
-solana-sdk = { path = "../sdk", version = "=1.7.0" }
-solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "=1.7.0" }
-solana-budget-program = { path = "../programs/budget", version = "=1.7.0" }
-solana-logger = { path = "../logger", version = "=1.7.0" }
-solana-metrics = { path = "../metrics", version = "=1.7.0" }
-curve25519-dalek = { version = "2" }
+rand = "0.7.0"
+rayon = "1.5.0"
+serde = "1.0.126"
+solana-logger = { path = "../logger", version = "=1.7.11" }
+solana-metrics = { path = "../metrics", version = "=1.7.11" }
+solana-sdk = { path = "../sdk", version = "=1.7.11" }
+solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "=1.7.11" }
 
 [lib]
 name = "solana_perf"
diff --git a/perf/src/cuda_runtime.rs b/perf/src/cuda_runtime.rs
index 3b5b054c1aadec..eb0bf6a79f9f09 100644
--- a/perf/src/cuda_runtime.rs
+++ b/perf/src/cuda_runtime.rs
@@ -146,6 +146,10 @@ impl<'a, T: Clone + Send + Sync + Default + Sized> IntoParallelIterator for &'a
 }
 
 impl<T: Clone + Default + Sized> PinnedVec<T> {
+    pub fn reserve(&mut self, size: usize) {
+        self.x.reserve(size);
+    }
+
     pub fn reserve_and_pin(&mut self, size: usize) {
         if self.x.capacity() < size {
             if self.pinned {
diff --git a/perf/src/packet.rs b/perf/src/packet.rs
index 946124e7fe0efb..e73a5ad6b7af25 100644
--- a/perf/src/packet.rs
+++ b/perf/src/packet.rs
@@ -28,11 +28,22 @@ impl Packets {
         Packets { packets }
     }
 
+    pub fn new_unpinned_with_recycler(
+        recycler: PacketsRecycler,
+        size: usize,
+        name: &'static str,
+    ) -> Self {
+        let mut packets = recycler.allocate(name);
+        packets.reserve(size);
+        Packets { packets }
+    }
+
     pub fn new_with_recycler(recycler: PacketsRecycler, size: usize, name: &'static str) -> Self {
         let mut packets = recycler.allocate(name);
         packets.reserve_and_pin(size);
         Packets { packets }
     }
+
     pub fn new_with_recycler_data(
         recycler: &PacketsRecycler,
         name: &'static str,
@@ -43,9 +54,19 @@ impl Packets {
         vec
     }
 
+    pub fn new_unpinned_with_recycler_data(
+        recycler: &PacketsRecycler,
+        name: &'static str,
+        mut packets: Vec<Packet>,
+    ) -> Self {
+        let mut vec = Self::new_unpinned_with_recycler(recycler.clone(), packets.len(), name);
+        vec.packets.append(&mut packets);
+        vec
+    }
+
     pub fn set_addr(&mut self, addr: &SocketAddr) {
         for m in self.packets.iter_mut() {
-            m.meta.set_addr(&addr);
+            m.meta.set_addr(addr);
         }
     }
 
@@ -76,7 +97,7 @@ pub fn to_packets_with_destination<T: Serialize>(
     recycler: PacketsRecycler,
     dests_and_data: &[(SocketAddr, T)],
 ) -> Packets {
-    let mut out = Packets::new_with_recycler(
+    let mut out = Packets::new_unpinned_with_recycler(
         recycler,
         dests_and_data.len(),
         "to_packets_with_destination",
diff --git a/perf/src/sigverify.rs b/perf/src/sigverify.rs
index a9651071920424..5b6c591482a9cc 100644
--- a/perf/src/sigverify.rs
+++ b/perf/src/sigverify.rs
@@ -118,10 +118,8 @@ fn verify_packet(packet: &mut Packet) {
         let pubkey_end = pubkey_start.saturating_add(size_of::<Pubkey>());
         let sig_end = sig_start.saturating_add(size_of::<Signature>());
 
-        if pubkey_end >= packet.meta.size || sig_end >= packet.meta.size {
-            packet.meta.discard = true;
-            return;
-        }
+        // get_packet_offsets should ensure pubkey_end and sig_end do
+        // not overflow packet.meta.size
 
         let signature = Signature::new(&packet.data[sig_start..sig_end]);
 
@@ -217,6 +215,10 @@ fn do_get_packet_offsets(
         .filter(|v| *v <= packet.meta.size)
         .ok_or(PacketError::InvalidPubkeyLen)?;
 
+    if pubkey_len < sig_len_untrusted {
+        return Err(PacketError::InvalidPubkeyLen);
+    }
+
     let sig_start = current_offset
         .checked_add(sig_size)
         .ok_or(PacketError::InvalidLen)?;
@@ -519,11 +521,11 @@ mod tests {
         let packet_offsets = sigverify::get_packet_offsets(&packet, 0);
 
         assert_eq!(
-            memfind(&tx_bytes, &tx.signatures[0].as_ref()),
+            memfind(&tx_bytes, tx.signatures[0].as_ref()),
             Some(SIG_OFFSET)
         );
         assert_eq!(
-            memfind(&tx_bytes, &tx.message().account_keys[0].as_ref()),
+            memfind(&tx_bytes, tx.message().account_keys[0].as_ref()),
             Some(packet_offsets.pubkey_start as usize)
         );
         assert_eq!(
@@ -531,7 +533,7 @@ mod tests {
             Some(packet_offsets.msg_start as usize)
         );
         assert_eq!(
-            memfind(&tx_bytes, &tx.signatures[0].as_ref()),
+            memfind(&tx_bytes, tx.signatures[0].as_ref()),
             Some(packet_offsets.sig_start as usize)
         );
         assert_eq!(packet_offsets.sig_len, 1);
@@ -597,6 +599,65 @@ mod tests {
         assert_eq!(res, Err(PacketError::InvalidLen));
     }
 
+    #[test]
+    fn test_pubkey_too_small() {
+        solana_logger::setup();
+        let mut tx = test_tx();
+        let sig = tx.signatures[0];
+        const NUM_SIG: usize = 18;
+        tx.signatures = vec![sig; NUM_SIG];
+        tx.message.account_keys = vec![];
+        tx.message.header.num_required_signatures = NUM_SIG as u8;
+        let mut packet = sigverify::make_packet_from_transaction(tx);
+
+        let res = sigverify::do_get_packet_offsets(&packet, 0);
+        assert_eq!(res, Err(PacketError::InvalidPubkeyLen));
+
+        verify_packet(&mut packet);
+        assert!(packet.meta.discard);
+
+        packet.meta.discard = false;
+        let mut batches = generate_packet_vec(&packet, 1, 1);
+        ed25519_verify(&mut batches);
+        assert!(batches[0].packets[0].meta.discard);
+    }
+
+    #[test]
+    fn test_pubkey_len() {
+        // See that the verify cannot walk off the end of the packet
+        // trying to index into the account_keys to access pubkey.
+        use solana_sdk::signer::{keypair::Keypair, Signer};
+        solana_logger::setup();
+
+        const NUM_SIG: usize = 17;
+        let keypair1 = Keypair::new();
+        let pubkey1 = keypair1.pubkey();
+        let mut message = Message::new(&[], Some(&pubkey1));
+        message.account_keys.push(pubkey1);
+        message.account_keys.push(pubkey1);
+        message.header.num_required_signatures = NUM_SIG as u8;
+        message.recent_blockhash = Hash(pubkey1.to_bytes());
+        let mut tx = Transaction::new_unsigned(message);
+
+        info!("message: {:?}", tx.message_data());
+        info!("tx: {:?}", tx);
+        let sig = keypair1.try_sign_message(&tx.message_data()).unwrap();
+        tx.signatures = vec![sig; NUM_SIG];
+
+        let mut packet = sigverify::make_packet_from_transaction(tx);
+
+        let res = sigverify::do_get_packet_offsets(&packet, 0);
+        assert_eq!(res, Err(PacketError::InvalidPubkeyLen));
+
+        verify_packet(&mut packet);
+        assert!(packet.meta.discard);
+
+        packet.meta.discard = false;
+        let mut batches = generate_packet_vec(&packet, 1, 1);
+        ed25519_verify(&mut batches);
+        assert!(batches[0].packets[0].meta.discard);
+    }
+
     #[test]
     fn test_large_sig_len() {
         let tx = test_tx();
@@ -667,7 +728,7 @@ mod tests {
         let tx_bytes = serialize(&tx0).unwrap();
         assert!(tx_bytes.len() <= PACKET_DATA_SIZE);
         assert_eq!(
-            memfind(&tx_bytes, &tx0.signatures[0].as_ref()),
+            memfind(&tx_bytes, tx0.signatures[0].as_ref()),
             Some(SIG_OFFSET)
         );
         let tx1 = deserialize(&tx_bytes).unwrap();
@@ -748,10 +809,8 @@ mod tests {
 
         let mut batches = generate_packet_vec(&packet, n, 2);
 
-        let recycler = Recycler::default();
-        let recycler_out = Recycler::default();
         // verify packets
-        sigverify::ed25519_verify(&mut batches, &recycler, &recycler_out);
+        ed25519_verify(&mut batches);
 
         // check result
         let should_discard = modify_data;
@@ -761,6 +820,12 @@ mod tests {
             .all(|p| p.meta.discard == should_discard));
     }
 
+    fn ed25519_verify(batches: &mut [Packets]) {
+        let recycler = Recycler::default();
+        let recycler_out = Recycler::default();
+        sigverify::ed25519_verify(batches, &recycler, &recycler_out);
+    }
+
     #[test]
     fn test_verify_tampered_sig_len() {
         let mut tx = test_tx();
@@ -770,10 +835,8 @@ mod tests {
 
         let mut batches = generate_packet_vec(&packet, 1, 1);
 
-        let recycler = Recycler::default();
-        let recycler_out = Recycler::default();
         // verify packets
-        sigverify::ed25519_verify(&mut batches, &recycler, &recycler_out);
+        ed25519_verify(&mut batches);
         assert!(batches
             .iter()
             .flat_map(|p| &p.packets)
@@ -810,10 +873,8 @@ mod tests {
 
         batches[0].packets.push(packet);
 
-        let recycler = Recycler::default();
-        let recycler_out = Recycler::default();
         // verify packets
-        sigverify::ed25519_verify(&mut batches, &recycler, &recycler_out);
+        ed25519_verify(&mut batches);
 
         // check result
         let ref_ans = 1u8;
diff --git a/perf/src/test_tx.rs b/perf/src/test_tx.rs
index 6664f684f9b335..a6845317183e1d 100644
--- a/perf/src/test_tx.rs
+++ b/perf/src/test_tx.rs
@@ -1,10 +1,12 @@
-use solana_sdk::hash::Hash;
-use solana_sdk::instruction::CompiledInstruction;
-use solana_sdk::signature::{Keypair, Signer};
-use solana_sdk::system_instruction::SystemInstruction;
-use solana_sdk::system_program;
-use solana_sdk::system_transaction;
-use solana_sdk::transaction::Transaction;
+use solana_sdk::{
+    hash::Hash,
+    instruction::CompiledInstruction,
+    signature::{Keypair, Signer},
+    stake,
+    system_instruction::SystemInstruction,
+    system_program, system_transaction,
+    transaction::Transaction,
+};
 
 pub fn test_tx() -> Transaction {
     let keypair1 = Keypair::new();
@@ -22,7 +24,7 @@ pub fn test_multisig_tx() -> Transaction {
 
     let transfer_instruction = SystemInstruction::Transfer { lamports };
 
-    let program_ids = vec![system_program::id(), solana_budget_program::id()];
+    let program_ids = vec![system_program::id(), stake::program::id()];
 
     let instructions = vec![CompiledInstruction::new(
         0,
diff --git a/poh-bench/Cargo.toml b/poh-bench/Cargo.toml
index 02db69035d6de1..2807a6359fbae7 100644
--- a/poh-bench/Cargo.toml
+++ b/poh-bench/Cargo.toml
@@ -2,7 +2,7 @@
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 edition = "2018"
 name = "solana-poh-bench"
-version = "1.7.0"
+version = "1.7.11"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
@@ -13,13 +13,13 @@ clap = "2.33.1"
 log = "0.4.11"
 rand = "0.7.0"
 rayon = "1.5.0"
-solana-logger = { path = "../logger", version = "=1.7.0" }
-solana-ledger = { path = "../ledger", version = "=1.7.0" }
-solana-sdk = { path = "../sdk", version = "=1.7.0" }
-solana-clap-utils = { path = "../clap-utils", version = "=1.7.0" }
-solana-measure = { path = "../measure", version = "=1.7.0" }
-solana-version = { path = "../version", version = "=1.7.0" }
-solana-perf = { path = "../perf", version = "=1.7.0" }
+solana-logger = { path = "../logger", version = "=1.7.11" }
+solana-ledger = { path = "../ledger", version = "=1.7.11" }
+solana-sdk = { path = "../sdk", version = "=1.7.11" }
+solana-clap-utils = { path = "../clap-utils", version = "=1.7.11" }
+solana-measure = { path = "../measure", version = "=1.7.11" }
+solana-version = { path = "../version", version = "=1.7.11" }
+solana-perf = { path = "../perf", version = "=1.7.11" }
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
diff --git a/poh-bench/src/main.rs b/poh-bench/src/main.rs
index 98e83f4f0fd165..d742d816e2d915 100644
--- a/poh-bench/src/main.rs
+++ b/poh-bench/src/main.rs
@@ -1,6 +1,9 @@
 #![allow(clippy::integer_arithmetic)]
 use clap::{crate_description, crate_name, value_t, App, Arg};
+#[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
 use solana_ledger::entry::{self, create_ticks, init_poh, EntrySlice, VerifyRecyclers};
+#[cfg(not(any(target_arch = "x86", target_arch = "x86_64")))]
+use solana_ledger::entry::{create_ticks, init_poh, EntrySlice, VerifyRecyclers};
 use solana_measure::measure::Measure;
 use solana_perf::perf_libs;
 use solana_sdk::hash::hash;
@@ -84,34 +87,40 @@ fn main() {
             time.as_us() / iterations as u64
         );
 
-        if is_x86_feature_detected!("avx2") && entry::api().is_some() {
-            let mut time = Measure::start("time");
-            for _ in 0..iterations {
-                assert!(ticks[..num_entries]
-                    .verify_cpu_x86_simd(&start_hash, 8)
-                    .finish_verify());
+        // A target_arch check is required here since calling
+        // is_x86_feature_detected from a non-x86_64 arch results in a build
+        // error.
+        #[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
+        {
+            if is_x86_feature_detected!("avx2") && entry::api().is_some() {
+                let mut time = Measure::start("time");
+                for _ in 0..iterations {
+                    assert!(ticks[..num_entries]
+                        .verify_cpu_x86_simd(&start_hash, 8)
+                        .finish_verify());
+                }
+                time.stop();
+                println!(
+                    "{},cpu_simd_avx2,{}",
+                    num_entries,
+                    time.as_us() / iterations as u64
+                );
             }
-            time.stop();
-            println!(
-                "{},cpu_simd_avx2,{}",
-                num_entries,
-                time.as_us() / iterations as u64
-            );
-        }
 
-        if is_x86_feature_detected!("avx512f") && entry::api().is_some() {
-            let mut time = Measure::start("time");
-            for _ in 0..iterations {
-                assert!(ticks[..num_entries]
-                    .verify_cpu_x86_simd(&start_hash, 16)
-                    .finish_verify());
+            if is_x86_feature_detected!("avx512f") && entry::api().is_some() {
+                let mut time = Measure::start("time");
+                for _ in 0..iterations {
+                    assert!(ticks[..num_entries]
+                        .verify_cpu_x86_simd(&start_hash, 16)
+                        .finish_verify());
+                }
+                time.stop();
+                println!(
+                    "{},cpu_simd_avx512,{}",
+                    num_entries,
+                    time.as_us() / iterations as u64
+                );
             }
-            time.stop();
-            println!(
-                "{},cpu_simd_avx512,{}",
-                num_entries,
-                time.as_us() / iterations as u64
-            );
         }
 
         if perf_libs::api().is_some() {
diff --git a/stake-monitor/.gitignore b/poh/.gitignore
similarity index 100%
rename from stake-monitor/.gitignore
rename to poh/.gitignore
diff --git a/poh/Cargo.toml b/poh/Cargo.toml
new file mode 100644
index 00000000000000..c4865464bd5c90
--- /dev/null
+++ b/poh/Cargo.toml
@@ -0,0 +1,39 @@
+[package]
+name = "solana-poh"
+version = "1.7.11"
+description = "Solana PoH"
+authors = ["Solana Maintainers <maintainers@solana.foundation>"]
+repository = "https://github.com/solana-labs/solana"
+license = "Apache-2.0"
+homepage = "https://solana.com/"
+documentation = "https://docs.rs/solana-poh"
+edition = "2018"
+
+[dependencies]
+core_affinity = "0.5.10"
+crossbeam-channel = "0.4"
+log = "0.4.11"
+solana-ledger = { path = "../ledger", version = "=1.7.11" }
+solana-measure = { path = "../measure", version = "=1.7.11" }
+solana-metrics = { path = "../metrics", version = "=1.7.11" }
+solana-runtime = { path = "../runtime", version = "=1.7.11" }
+solana-sdk = { path = "../sdk", version = "=1.7.11" }
+solana-sys-tuner = { path = "../sys-tuner", version = "=1.7.11" }
+thiserror = "1.0"
+
+[dev-dependencies]
+bincode = "1.3.1"
+matches = "0.1.6"
+rand = "0.7.0"
+solana-logger = { path = "../logger", version = "=1.7.11" }
+solana-perf = { path = "../perf", version = "=1.7.11" }
+
+[lib]
+crate-type = ["lib"]
+name = "solana_poh"
+
+[[bench]]
+name = "poh"
+
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
diff --git a/core/benches/poh.rs b/poh/benches/poh.rs
similarity index 88%
rename from core/benches/poh.rs
rename to poh/benches/poh.rs
index f7a7244a97b67e..9996544022c9d3 100644
--- a/core/benches/poh.rs
+++ b/poh/benches/poh.rs
@@ -3,12 +3,16 @@
 #![feature(test)]
 extern crate test;
 
-use solana_core::poh_service::DEFAULT_HASHES_PER_BATCH;
-use solana_ledger::poh::Poh;
-use solana_sdk::hash::Hash;
-use std::sync::atomic::{AtomicBool, Ordering};
-use std::sync::{Arc, Mutex};
-use test::Bencher;
+use {
+    solana_ledger::poh::Poh,
+    solana_poh::poh_service::DEFAULT_HASHES_PER_BATCH,
+    solana_sdk::hash::Hash,
+    std::sync::{
+        atomic::{AtomicBool, Ordering},
+        Arc, Mutex,
+    },
+    test::Bencher,
+};
 
 const NUM_HASHES: u64 = 30_000; // Should require ~10ms on a 2017 MacBook Pro
 
diff --git a/core/benches/poh_verify.rs b/poh/benches/poh_verify.rs
similarity index 78%
rename from core/benches/poh_verify.rs
rename to poh/benches/poh_verify.rs
index 9cbf551f496e78..b0ae0b7aaecfc6 100644
--- a/core/benches/poh_verify.rs
+++ b/poh/benches/poh_verify.rs
@@ -1,11 +1,15 @@
 #![feature(test)]
 extern crate test;
 
-use solana_ledger::entry::{next_entry_mut, Entry, EntrySlice};
-use solana_sdk::hash::{hash, Hash};
-use solana_sdk::signature::{Keypair, Signer};
-use solana_sdk::system_transaction;
-use test::Bencher;
+use {
+    solana_ledger::entry::{next_entry_mut, Entry, EntrySlice},
+    solana_sdk::{
+        hash::{hash, Hash},
+        signature::{Keypair, Signer},
+        system_transaction,
+    },
+    test::Bencher,
+};
 
 const NUM_HASHES: u64 = 400;
 const NUM_ENTRIES: usize = 800;
@@ -14,7 +18,7 @@ const NUM_ENTRIES: usize = 800;
 fn bench_poh_verify_ticks(bencher: &mut Bencher) {
     solana_logger::setup();
     let zero = Hash::default();
-    let start_hash = hash(&zero.as_ref());
+    let start_hash = hash(zero.as_ref());
     let mut cur_hash = start_hash;
 
     let mut ticks: Vec<Entry> = Vec::with_capacity(NUM_ENTRIES);
@@ -30,7 +34,7 @@ fn bench_poh_verify_ticks(bencher: &mut Bencher) {
 #[bench]
 fn bench_poh_verify_transaction_entries(bencher: &mut Bencher) {
     let zero = Hash::default();
-    let start_hash = hash(&zero.as_ref());
+    let start_hash = hash(zero.as_ref());
     let mut cur_hash = start_hash;
 
     let keypair1 = Keypair::new();
diff --git a/poh/src/lib.rs b/poh/src/lib.rs
new file mode 100644
index 00000000000000..b3980690cbe8df
--- /dev/null
+++ b/poh/src/lib.rs
@@ -0,0 +1,10 @@
+#![allow(clippy::integer_arithmetic)]
+pub mod poh_recorder;
+pub mod poh_service;
+
+#[macro_use]
+extern crate solana_metrics;
+
+#[cfg(test)]
+#[macro_use]
+extern crate matches;
diff --git a/core/src/poh_recorder.rs b/poh/src/poh_recorder.rs
similarity index 96%
rename from core/src/poh_recorder.rs
rename to poh/src/poh_recorder.rs
index 6753049a1ad922..2a17c68d418d27 100644
--- a/core/src/poh_recorder.rs
+++ b/poh/src/poh_recorder.rs
@@ -10,30 +10,32 @@
 //! For Entries:
 //! * recorded entry must be >= WorkingBank::min_tick_height && entry must be < WorkingBank::max_tick_height
 //!
-use crate::poh_service::PohService;
-use crossbeam_channel::{
-    unbounded, Receiver as CrossbeamReceiver, RecvTimeoutError, Sender as CrossbeamSender,
-};
-use solana_ledger::blockstore::Blockstore;
-use solana_ledger::entry::Entry;
-use solana_ledger::leader_schedule_cache::LeaderScheduleCache;
-use solana_ledger::poh::Poh;
-use solana_runtime::bank::Bank;
 pub use solana_sdk::clock::Slot;
-use solana_sdk::clock::NUM_CONSECUTIVE_LEADER_SLOTS;
-use solana_sdk::hash::Hash;
-use solana_sdk::poh_config::PohConfig;
-use solana_sdk::pubkey::Pubkey;
-use solana_sdk::timing;
-use solana_sdk::transaction::Transaction;
-use std::cmp;
-use std::sync::{
-    atomic::{AtomicBool, Ordering},
-    mpsc::{channel, Receiver, SendError, Sender, SyncSender},
-    {Arc, Mutex},
+use {
+    crate::poh_service::PohService,
+    crossbeam_channel::{
+        unbounded, Receiver as CrossbeamReceiver, RecvTimeoutError, Sender as CrossbeamSender,
+    },
+    log::*,
+    solana_ledger::{
+        blockstore::Blockstore, entry::Entry, leader_schedule_cache::LeaderScheduleCache, poh::Poh,
+    },
+    solana_runtime::bank::Bank,
+    solana_sdk::{
+        clock::NUM_CONSECUTIVE_LEADER_SLOTS, hash::Hash, poh_config::PohConfig, pubkey::Pubkey,
+        timing, transaction::Transaction,
+    },
+    std::{
+        cmp,
+        sync::{
+            atomic::{AtomicBool, Ordering},
+            mpsc::{channel, Receiver, SendError, Sender, SyncSender},
+            {Arc, Mutex},
+        },
+        time::{Duration, Instant},
+    },
+    thiserror::Error,
 };
-use std::time::{Duration, Instant};
-use thiserror::Error;
 
 pub const GRACE_TICKS_FACTOR: u64 = 2;
 pub const MAX_GRACE_SLOTS: u64 = 2;
@@ -726,22 +728,67 @@ impl PohRecorder {
         })
     }
 
-    #[cfg(test)]
+    // Used in tests
     pub fn schedule_dummy_max_height_reached_failure(&mut self) {
         self.reset(Hash::default(), 1, None);
     }
 }
 
+pub fn create_test_recorder(
+    bank: &Arc<Bank>,
+    blockstore: &Arc<Blockstore>,
+    poh_config: Option<PohConfig>,
+) -> (
+    Arc<AtomicBool>,
+    Arc<Mutex<PohRecorder>>,
+    PohService,
+    Receiver<WorkingBankEntry>,
+) {
+    let exit = Arc::new(AtomicBool::new(false));
+    let poh_config = Arc::new(poh_config.unwrap_or_default());
+    let (mut poh_recorder, entry_receiver, record_receiver) = PohRecorder::new(
+        bank.tick_height(),
+        bank.last_blockhash(),
+        bank.slot(),
+        Some((4, 4)),
+        bank.ticks_per_slot(),
+        &Pubkey::default(),
+        blockstore,
+        &Arc::new(LeaderScheduleCache::new_from_bank(bank)),
+        &poh_config,
+        exit.clone(),
+    );
+    poh_recorder.set_bank(bank);
+
+    let poh_recorder = Arc::new(Mutex::new(poh_recorder));
+    let poh_service = PohService::new(
+        poh_recorder.clone(),
+        &poh_config,
+        &exit,
+        bank.ticks_per_slot(),
+        crate::poh_service::DEFAULT_PINNED_CPU_CORE,
+        crate::poh_service::DEFAULT_HASHES_PER_BATCH,
+        record_receiver,
+    );
+
+    (exit, poh_recorder, poh_service, entry_receiver)
+}
+
 #[cfg(test)]
 mod tests {
-    use super::*;
-    use bincode::serialize;
-    use solana_ledger::genesis_utils::{create_genesis_config, GenesisConfigInfo};
-    use solana_ledger::{blockstore::Blockstore, blockstore_meta::SlotMeta, get_tmp_ledger_path};
-    use solana_perf::test_tx::test_tx;
-    use solana_sdk::clock::DEFAULT_TICKS_PER_SLOT;
-    use solana_sdk::hash::hash;
-    use std::sync::mpsc::sync_channel;
+    use {
+        super::*,
+        bincode::serialize,
+        solana_ledger::{
+            blockstore::Blockstore,
+            blockstore_meta::SlotMeta,
+            genesis_utils::{create_genesis_config, GenesisConfigInfo},
+            get_tmp_ledger_path,
+        },
+        solana_perf::test_tx::test_tx,
+        solana_sdk::{clock::DEFAULT_TICKS_PER_SLOT, hash::hash},
+        std::sync::mpsc::sync_channel,
+    };
 
     #[test]
     fn test_poh_recorder_no_zero_tick() {
diff --git a/core/src/poh_service.rs b/poh/src/poh_service.rs
similarity index 95%
rename from core/src/poh_service.rs
rename to poh/src/poh_service.rs
index c72bc6b6696a56..4833f16fb158c4 100644
--- a/core/src/poh_service.rs
+++ b/poh/src/poh_service.rs
@@ -1,14 +1,21 @@
 //! The `poh_service` module implements a service that records the passing of
 //! "ticks", a measure of time in the PoH stream
-use crate::poh_recorder::{PohRecorder, Record};
-use crossbeam_channel::Receiver;
-use solana_ledger::poh::Poh;
-use solana_measure::measure::Measure;
-use solana_sdk::poh_config::PohConfig;
-use std::sync::atomic::{AtomicBool, Ordering};
-use std::sync::{Arc, Mutex};
-use std::thread::{self, sleep, Builder, JoinHandle};
-use std::time::{Duration, Instant};
+use {
+    crate::poh_recorder::{PohRecorder, Record},
+    crossbeam_channel::Receiver,
+    log::*,
+    solana_ledger::poh::Poh,
+    solana_measure::measure::Measure,
+    solana_sdk::poh_config::PohConfig,
+    std::{
+        sync::{
+            atomic::{AtomicBool, Ordering},
+            Arc, Mutex,
+        },
+        thread::{self, sleep, Builder, JoinHandle},
+        time::{Duration, Instant},
+    },
+};
 
 pub struct PohService {
     tick_producer: JoinHandle<()>,
@@ -348,20 +355,22 @@ impl PohService {
 
 #[cfg(test)]
 mod tests {
-    use super::*;
-    use crate::poh_recorder::WorkingBank;
-    use rand::{thread_rng, Rng};
-    use solana_ledger::genesis_utils::{create_genesis_config, GenesisConfigInfo};
-    use solana_ledger::leader_schedule_cache::LeaderScheduleCache;
-    use solana_ledger::{blockstore::Blockstore, get_tmp_ledger_path};
-    use solana_measure::measure::Measure;
-    use solana_perf::test_tx::test_tx;
-    use solana_runtime::bank::Bank;
-    use solana_sdk::clock;
-    use solana_sdk::hash::hash;
-    use solana_sdk::pubkey::Pubkey;
-    use solana_sdk::timing;
-    use std::time::Duration;
+    use {
+        super::*,
+        crate::poh_recorder::WorkingBank,
+        rand::{thread_rng, Rng},
+        solana_ledger::{
+            blockstore::Blockstore,
+            genesis_utils::{create_genesis_config, GenesisConfigInfo},
+            get_tmp_ledger_path,
+            leader_schedule_cache::LeaderScheduleCache,
+        },
+        solana_measure::measure::Measure,
+        solana_perf::test_tx::test_tx,
+        solana_runtime::bank::Bank,
+        solana_sdk::{clock, hash::hash, pubkey::Pubkey, timing},
+        std::time::Duration,
+    };
 
     #[test]
     #[ignore]
diff --git a/program-test/Cargo.toml b/program-test/Cargo.toml
index 5734842a00adbc..255074a54d303a 100644
--- a/program-test/Cargo.toml
+++ b/program-test/Cargo.toml
@@ -5,28 +5,27 @@ edition = "2018"
 license = "Apache-2.0"
 name = "solana-program-test"
 repository = "https://github.com/solana-labs/solana"
-version = "1.7.0"
+version = "1.7.11"
 
 [dependencies]
 async-trait = "0.1.42"
 base64 = "0.12.3"
 bincode = "1.3.1"
 chrono = "0.4.19"
-chrono-humanize = "0.1.1"
+chrono-humanize = "0.2.1"
 log = "0.4.11"
 mio = "0.7.6"
 serde = "1.0.112"
 serde_derive = "1.0.103"
-solana-banks-client = { path = "../banks-client", version = "=1.7.0" }
-solana-banks-server = { path = "../banks-server", version = "=1.7.0" }
-solana-bpf-loader-program = { path = "../programs/bpf_loader", version = "=1.7.0" }
-solana-logger = { path = "../logger", version = "=1.7.0" }
-solana-runtime = { path = "../runtime", version = "=1.7.0" }
-solana-sdk = { path = "../sdk", version = "=1.7.0" }
-solana-vote-program = { path = "../programs/vote", version = "=1.7.0" }
+solana-banks-client = { path = "../banks-client", version = "=1.7.11" }
+solana-banks-server = { path = "../banks-server", version = "=1.7.11" }
+solana-bpf-loader-program = { path = "../programs/bpf_loader", version = "=1.7.11" }
+solana-logger = { path = "../logger", version = "=1.7.11" }
+solana-runtime = { path = "../runtime", version = "=1.7.11" }
+solana-sdk = { path = "../sdk", version = "=1.7.11" }
+solana-vote-program = { path = "../programs/vote", version = "=1.7.11" }
 thiserror = "1.0"
 tokio = { version = "1", features = ["full"] }
 
 [dev-dependencies]
 assert_matches = "1.3.0"
-solana-stake-program = { path = "../programs/stake", version = "=1.7.0" }
diff --git a/program-test/src/lib.rs b/program-test/src/lib.rs
index b531fb44e4c5f1..636fa68d6040cc 100644
--- a/program-test/src/lib.rs
+++ b/program-test/src/lib.rs
@@ -19,7 +19,6 @@ use {
         clock::{Clock, Slot},
         entrypoint::{ProgramResult, SUCCESS},
         epoch_schedule::EpochSchedule,
-        feature_set::demote_sysvar_write_locks,
         fee_calculator::{FeeCalculator, FeeRateGovernor},
         genesis_config::{ClusterType, GenesisConfig},
         hash::Hash,
@@ -259,14 +258,12 @@ impl solana_sdk::program_stubs::SyscallStubs for SyscallStubs {
             }
             panic!("Program id {} wasn't found in account_infos", program_id);
         };
-        let demote_sysvar_write_locks =
-            invoke_context.is_feature_active(&demote_sysvar_write_locks::id());
         // TODO don't have the caller's keyed_accounts so can't validate writer or signer escalation or deescalation yet
         let caller_privileges = message
             .account_keys
             .iter()
             .enumerate()
-            .map(|(i, _)| message.is_writable(i, demote_sysvar_write_locks))
+            .map(|(i, _)| message.is_writable(i))
             .collect::<Vec<bool>>();
 
         stable_log::program_invoke(&logger, &program_id, invoke_context.invoke_depth());
@@ -290,7 +287,7 @@ impl solana_sdk::program_stubs::SyscallStubs for SyscallStubs {
         'outer: for key in &message.account_keys {
             for account_info in account_infos {
                 if account_info.unsigned_key() == key {
-                    accounts.push(Rc::new(RefCell::new(ai_to_a(account_info))));
+                    accounts.push((*key, Rc::new(RefCell::new(ai_to_a(account_info)))));
                     continue 'outer;
                 }
             }
@@ -311,7 +308,7 @@ impl solana_sdk::program_stubs::SyscallStubs for SyscallStubs {
                 {
                     let mut program_signer = false;
                     for seeds in signers_seeds.iter() {
-                        let signer = Pubkey::create_program_address(&seeds, &caller).unwrap();
+                        let signer = Pubkey::create_program_address(seeds, &caller).unwrap();
                         if instruction_account.pubkey == signer {
                             program_signer = true;
                             break;
@@ -324,7 +321,7 @@ impl solana_sdk::program_stubs::SyscallStubs for SyscallStubs {
             }
         }
 
-        invoke_context.record_instruction(&instruction);
+        invoke_context.record_instruction(instruction);
 
         solana_runtime::message_processor::MessageProcessor::process_cross_program_instruction(
             &message,
@@ -336,14 +333,12 @@ impl solana_sdk::program_stubs::SyscallStubs for SyscallStubs {
         .map_err(|err| ProgramError::try_from(err).unwrap_or_else(|err| panic!("{}", err)))?;
 
         // Copy writeable account modifications back into the caller's AccountInfos
-        for (i, account_pubkey) in message.account_keys.iter().enumerate() {
-            if !message.is_writable(i, true) {
+        for (i, (pubkey, account)) in accounts.iter().enumerate().take(message.account_keys.len()) {
+            if !message.is_writable(i) {
                 continue;
             }
-
             for account_info in account_infos {
-                if account_info.unsigned_key() == account_pubkey {
-                    let account = &accounts[i];
+                if account_info.unsigned_key() == pubkey {
                     **account_info.try_borrow_mut_lamports().unwrap() = account.borrow().lamports();
 
                     let mut data = account_info.try_borrow_mut_data()?;
@@ -393,6 +388,16 @@ impl solana_sdk::program_stubs::SyscallStubs for SyscallStubs {
 }
 
 pub fn find_file(filename: &str) -> Option<PathBuf> {
+    for dir in default_shared_object_dirs() {
+        let candidate = dir.join(&filename);
+        if candidate.exists() {
+            return Some(candidate);
+        }
+    }
+    None
+}
+
+fn default_shared_object_dirs() -> Vec<PathBuf> {
     let mut search_path = vec![];
     if let Ok(bpf_out_dir) = std::env::var("BPF_OUT_DIR") {
         search_path.push(PathBuf::from(bpf_out_dir));
@@ -401,15 +406,8 @@ pub fn find_file(filename: &str) -> Option<PathBuf> {
     if let Ok(dir) = std::env::current_dir() {
         search_path.push(dir);
     }
-    trace!("search path: {:?}", search_path);
-
-    for path in search_path {
-        let candidate = path.join(&filename);
-        if candidate.exists() {
-            return Some(candidate);
-        }
-    }
-    None
+    trace!("BPF .so search path: {:?}", search_path);
+    search_path
 }
 
 pub fn read_file<P: AsRef<Path>>(path: P) -> Vec<u8> {
@@ -502,6 +500,13 @@ impl Default for ProgramTest {
 }
 
 impl ProgramTest {
+    /// Create a `ProgramTest`.
+    ///
+    /// This is a wrapper around [`default`] and [`add_program`]. See their documentation for more
+    /// details.
+    ///
+    /// [`default`]: #method.default
+    /// [`add_program`]: #method.add_program
     pub fn new(
         program_name: &str,
         program_id: Pubkey,
@@ -579,7 +584,7 @@ impl ProgramTest {
 
     /// Add a BPF program to the test environment.
     ///
-    /// `program_name` will also used to locate the BPF shared object in the current or fixtures
+    /// `program_name` will also be used to locate the BPF shared object in the current or fixtures
     /// directory.
     ///
     /// If `process_instruction` is provided, the natively built-program may be used instead of the
@@ -590,20 +595,7 @@ impl ProgramTest {
         program_id: Pubkey,
         process_instruction: Option<ProcessInstructionWithContext>,
     ) {
-        let loader = solana_sdk::bpf_loader::id();
-        let program_file = find_file(&format!("{}.so", program_name));
-
-        if process_instruction.is_none() && program_file.is_none() {
-            panic!("Unable to add program {} ({})", program_name, program_id);
-        }
-
-        if (program_file.is_some() && self.prefer_bpf) || process_instruction.is_none() {
-            let program_file = program_file.unwrap_or_else(|| {
-                panic!(
-                    "Program file data not available for {} ({})",
-                    program_name, program_id
-                );
-            });
+        let add_bpf = |this: &mut ProgramTest, program_file: PathBuf| {
             let data = read_file(&program_file);
             info!(
                 "\"{}\" BPF program from {}{}",
@@ -627,28 +619,87 @@ impl ProgramTest {
                     .unwrap_or_else(|| "".to_string())
             );
 
-            self.add_account(
+            this.add_account(
                 program_id,
                 Account {
                     lamports: Rent::default().minimum_balance(data.len()).min(1),
                     data,
-                    owner: loader,
+                    owner: solana_sdk::bpf_loader::id(),
                     executable: true,
                     rent_epoch: 0,
                 },
             );
-        } else {
+        };
+
+        let add_native = |this: &mut ProgramTest, process_fn: ProcessInstructionWithContext| {
             info!("\"{}\" program loaded as native code", program_name);
-            self.builtins.push(Builtin::new(
+            this.builtins
+                .push(Builtin::new(program_name, program_id, process_fn));
+        };
+
+        let warn_invalid_program_name = || {
+            let valid_program_names = default_shared_object_dirs()
+                .iter()
+                .filter_map(|dir| dir.read_dir().ok())
+                .flat_map(|read_dir| {
+                    read_dir.filter_map(|entry| {
+                        let path = entry.ok()?.path();
+                        if !path.is_file() {
+                            return None;
+                        }
+                        match path.extension()?.to_str()? {
+                            "so" => Some(path.file_stem()?.to_os_string()),
+                            _ => None,
+                        }
+                    })
+                })
+                .collect::<Vec<_>>();
+
+            if valid_program_names.is_empty() {
+                // This should be unreachable as `test-bpf` should guarantee at least one shared
+                // object exists somewhere.
+                warn!("No BPF shared objects found.");
+                return;
+            }
+
+            warn!(
+                "Possible bogus program name. Ensure the program name ({}) \
+                matches one of the following recognizable program names:",
                 program_name,
-                program_id,
-                process_instruction.unwrap_or_else(|| {
-                    panic!(
-                        "Program processor not available for {} ({})",
-                        program_name, program_id
-                    );
-                }),
-            ));
+            );
+            for name in valid_program_names {
+                warn!(" - {}", name.to_str().unwrap());
+            }
+        };
+
+        let program_file = find_file(&format!("{}.so", program_name));
+        match (self.prefer_bpf, program_file, process_instruction) {
+            // If BPF is preferred (i.e., `test-bpf` is invoked) and a BPF shared object exists,
+            // use that as the program data.
+            (true, Some(file), _) => add_bpf(self, file),
+
+            // If BPF is not required (i.e., we were invoked with `test`), use the provided
+            // processor function as is.
+            //
+            // TODO: figure out why tests hang if a processor panics when running native code.
+            (false, _, Some(process)) => add_native(self, process),
+
+            // Invalid: `test-bpf` invocation with no matching BPF shared object.
+            (true, None, _) => {
+                warn_invalid_program_name();
+                panic!(
+                    "Program file data not available for {} ({})",
+                    program_name, program_id
+                );
+            }
+
+            // Invalid: regular `test` invocation without a processor.
+            (false, _, None) => {
+                panic!(
+                    "Program processor not available for {} ({})",
+                    program_name, program_id
+                );
+            }
         }
     }
 
@@ -713,7 +764,7 @@ impl ProgramTest {
 
         // Add commonly-used SPL programs as a convenience to the user
         for (program_id, account) in programs::spl_programs(&Rent::default()).iter() {
-            bank.store_account(program_id, &account);
+            bank.store_account(program_id, account);
         }
 
         // User-supplied additional builtins
@@ -726,10 +777,10 @@ impl ProgramTest {
         }
 
         for (address, account) in self.accounts.iter() {
-            if bank.get_account(&address).is_some() {
+            if bank.get_account(address).is_some() {
                 info!("Overriding account at {}", address);
             }
-            bank.store_account(&address, &account);
+            bank.store_account(address, account);
         }
         bank.set_capitalization();
         if let Some(max_units) = self.bpf_compute_max_units {
diff --git a/program-test/src/programs.rs b/program-test/src/programs.rs
index 9854834476908f..bb5912328c3c1b 100644
--- a/program-test/src/programs.rs
+++ b/program-test/src/programs.rs
@@ -18,7 +18,7 @@ mod spl_associated_token_account {
 }
 
 static SPL_PROGRAMS: &[(Pubkey, &[u8])] = &[
-    (spl_token::ID, include_bytes!("programs/spl_token-3.1.0.so")),
+    (spl_token::ID, include_bytes!("programs/spl_token-3.2.0.so")),
     (
         spl_memo_1_0::ID,
         include_bytes!("programs/spl_memo-1.0.0.so"),
@@ -29,7 +29,7 @@ static SPL_PROGRAMS: &[(Pubkey, &[u8])] = &[
     ),
     (
         spl_associated_token_account::ID,
-        include_bytes!("programs/spl_associated-token-account-1.0.1.so"),
+        include_bytes!("programs/spl_associated-token-account-1.0.3.so"),
     ),
 ];
 
diff --git a/program-test/src/programs/spl_associated-token-account-1.0.1.so b/program-test/src/programs/spl_associated-token-account-1.0.1.so
deleted file mode 100644
index c50d9191acee8a..00000000000000
Binary files a/program-test/src/programs/spl_associated-token-account-1.0.1.so and /dev/null differ
diff --git a/program-test/src/programs/spl_associated-token-account-1.0.3.so b/program-test/src/programs/spl_associated-token-account-1.0.3.so
new file mode 100644
index 00000000000000..9b297786912d98
Binary files /dev/null and b/program-test/src/programs/spl_associated-token-account-1.0.3.so differ
diff --git a/program-test/src/programs/spl_token-3.1.0.so b/program-test/src/programs/spl_token-3.1.0.so
deleted file mode 100644
index 53079d03b5ba6a..00000000000000
Binary files a/program-test/src/programs/spl_token-3.1.0.so and /dev/null differ
diff --git a/program-test/src/programs/spl_token-3.2.0.so b/program-test/src/programs/spl_token-3.2.0.so
new file mode 100644
index 00000000000000..9b8c9549fceb5f
Binary files /dev/null and b/program-test/src/programs/spl_token-3.2.0.so differ
diff --git a/program-test/tests/warp.rs b/program-test/tests/warp.rs
index 9ed46aac1038b9..13758afd5e4bad 100644
--- a/program-test/tests/warp.rs
+++ b/program-test/tests/warp.rs
@@ -12,6 +12,10 @@ use {
         pubkey::Pubkey,
         rent::Rent,
         signature::{Keypair, Signer},
+        stake::{
+            instruction as stake_instruction,
+            state::{Authorized, Lockup, StakeState},
+        },
         system_instruction, system_program,
         sysvar::{
             clock,
@@ -20,10 +24,6 @@ use {
         },
         transaction::{Transaction, TransactionError},
     },
-    solana_stake_program::{
-        stake_instruction,
-        stake_state::{Authorized, Lockup, StakeState},
-    },
     solana_vote_program::{
         vote_instruction,
         vote_state::{VoteInit, VoteState},
@@ -277,7 +277,7 @@ async fn stake_rewards_from_warp() {
     assert_matches!(
         stake
             .delegation
-            .stake_activating_and_deactivating(clock.epoch, Some(&stake_history), true,),
+            .stake_activating_and_deactivating(clock.epoch, Some(&stake_history)),
         (_, 0, 0)
     );
 }
diff --git a/programs/bpf/Cargo.lock b/programs/bpf/Cargo.lock
index 03fc819703a93e..1f625a662eca20 100644
--- a/programs/bpf/Cargo.lock
+++ b/programs/bpf/Cargo.lock
@@ -42,13 +42,19 @@ dependencies = [
  "memchr",
 ]
 
+[[package]]
+name = "aliasable"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "250f629c0161ad8107cf89319e990051fae62832fd343083bea452d93e2205fd"
+
 [[package]]
 name = "ansi_term"
 version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b"
 dependencies = [
- "winapi 0.3.8",
+ "winapi 0.3.9",
 ]
 
 [[package]]
@@ -100,7 +106,7 @@ checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
 dependencies = [
  "hermit-abi",
  "libc",
- "winapi 0.3.8",
+ "winapi 0.3.9",
 ]
 
 [[package]]
@@ -217,9 +223,9 @@ checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae"
 
 [[package]]
 name = "borsh"
-version = "0.8.1"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5a26c53ddf60281f18e7a29b20db7ba3db82a9d81b9650bfaa02d646f50d364"
+checksum = "4fcabb02816fdadf90866dc9a7824491ccb63d69f55375a266dc03509ac68d36"
 dependencies = [
  "borsh-derive",
  "hashbrown",
@@ -227,9 +233,9 @@ dependencies = [
 
 [[package]]
 name = "borsh-derive"
-version = "0.8.1"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b637a47728b78a78cd7f4b85bf06d71ef4221840e059a38f048be2422bf673b2"
+checksum = "4bd16f0729b89f0a212b0e2e1d19cc6593df63f771161a11863967780e2d033d"
 dependencies = [
  "borsh-derive-internal",
  "borsh-schema-derive-internal",
@@ -240,9 +246,9 @@ dependencies = [
 
 [[package]]
 name = "borsh-derive-internal"
-version = "0.8.1"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d813fa25eb0bed78c36492cff4415f38c760d6de833d255ba9095bd8ebb7d725"
+checksum = "1e321a130a3ac4b88eb59a6d670bde11eec9721a397b77e0f2079060e2a1b785"
 dependencies = [
  "proc-macro2 1.0.24",
  "quote 1.0.6",
@@ -251,9 +257,9 @@ dependencies = [
 
 [[package]]
 name = "borsh-schema-derive-internal"
-version = "0.8.1"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcf78ee4a98c8cb9eba1bac3d3e2a1ea3d7673c719ce691e67b5cbafc472d3b7"
+checksum = "15151a485164b319cc7a5160fe4316dc469a27993f71b73d7617dc9032ff0fd7"
 dependencies = [
  "proc-macro2 1.0.24",
  "quote 1.0.6",
@@ -376,14 +382,14 @@ dependencies = [
  "num-traits",
  "serde",
  "time",
- "winapi 0.3.8",
+ "winapi 0.3.9",
 ]
 
 [[package]]
 name = "chrono-humanize"
-version = "0.1.2"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8164ae3089baf04ff71f32aeb70213283dcd236dce8bc976d00b17a458f5f71c"
+checksum = "2eddc119501d583fd930cb92144e605f44e0252c38dd89d9247fffa1993375cb"
 dependencies = [
  "chrono",
 ]
@@ -438,15 +444,15 @@ dependencies = [
  "terminal_size",
  "termios",
  "unicode-width",
- "winapi 0.3.8",
+ "winapi 0.3.9",
  "winapi-util",
 ]
 
 [[package]]
 name = "console"
-version = "0.13.0"
+version = "0.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a50aab2529019abfabfa93f1e6c41ef392f91fbf179b347a7e96abb524884a08"
+checksum = "3993e6445baa160675931ec041a5e03ca84b9c6e32a056150d3aa2bdda0a1f45"
 dependencies = [
  "encode_unicode",
  "lazy_static",
@@ -454,8 +460,7 @@ dependencies = [
  "regex",
  "terminal_size",
  "unicode-width",
- "winapi 0.3.8",
- "winapi-util",
+ "winapi 0.3.9",
 ]
 
 [[package]]
@@ -523,9 +528,9 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-deque"
-version = "0.7.3"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f02af974daeee82218205558e51ec8768b48cf524bd01d550abe5573a608285"
+checksum = "c20ff29ded3204c5106278a81a38f4b482636ed4fa1e6cfbeef193291beb29ed"
 dependencies = [
  "crossbeam-epoch 0.8.2",
  "crossbeam-utils 0.7.2",
@@ -534,9 +539,9 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-deque"
-version = "0.8.0"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94af6efb46fef72616855b036a624cf27ba656ffc9be1b9a3c931cfc7749a9a9"
+checksum = "6455c0ca19f0d2fbf751b908d5c55c1f5cbc65e03c4225427254b46890bdde1e"
 dependencies = [
  "cfg-if 1.0.0",
  "crossbeam-epoch 0.9.1",
@@ -611,16 +616,6 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
 
-[[package]]
-name = "crypto-mac"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4434400df11d95d556bac068ddfedd482915eb18fe8bea89bc80b6e4b1c179e5"
-dependencies = [
- "generic-array 0.12.3",
- "subtle 1.0.0",
-]
-
 [[package]]
 name = "crypto-mac"
 version = "0.8.0"
@@ -628,7 +623,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b584a330336237c1eecd3e94266efb216c56ed91225d634cb2991c5f3fd1aeab"
 dependencies = [
  "generic-array 0.14.3",
- "subtle 2.2.2",
+ "subtle",
 ]
 
 [[package]]
@@ -638,7 +633,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "58bcd97a54c7ca5ce2f6eb16f6bede5b0ab5f0055fedc17d2f0b4466e21671ca"
 dependencies = [
  "generic-array 0.14.3",
- "subtle 2.2.2",
+ "subtle",
 ]
 
 [[package]]
@@ -648,7 +643,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4857fd85a0c34b3c3297875b747c1e02e06b6a0ea32dd892d8192b9ce0813ea6"
 dependencies = [
  "generic-array 0.14.3",
- "subtle 2.2.2",
+ "subtle",
 ]
 
 [[package]]
@@ -660,7 +655,7 @@ dependencies = [
  "byteorder 1.3.4",
  "digest 0.8.1",
  "rand_core 0.5.1",
- "subtle 2.2.2",
+ "subtle",
  "zeroize",
 ]
 
@@ -673,7 +668,7 @@ dependencies = [
  "byteorder 1.3.4",
  "digest 0.9.0",
  "rand_core 0.5.1",
- "subtle 2.2.2",
+ "subtle",
  "zeroize",
 ]
 
@@ -764,7 +759,7 @@ checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d"
 dependencies = [
  "libc",
  "redox_users",
- "winapi 0.3.8",
+ "winapi 0.3.9",
 ]
 
 [[package]]
@@ -794,7 +789,7 @@ dependencies = [
  "rand 0.7.3",
  "serde",
  "serde_bytes",
- "sha2 0.9.2",
+ "sha2",
  "zeroize",
 ]
 
@@ -808,7 +803,7 @@ dependencies = [
  "ed25519-dalek",
  "failure",
  "hmac 0.9.0",
- "sha2 0.9.2",
+ "sha2",
 ]
 
 [[package]]
@@ -922,7 +917,7 @@ dependencies = [
  "cfg-if 0.1.10",
  "libc",
  "redox_syscall 0.1.56",
- "winapi 0.3.8",
+ "winapi 0.3.9",
 ]
 
 [[package]]
@@ -1078,7 +1073,7 @@ dependencies = [
  "futures-sink",
  "futures-task",
  "memchr",
- "pin-project-lite 0.2.4",
+ "pin-project-lite 0.2.7",
  "pin-utils",
  "proc-macro-hack",
  "proc-macro-nested",
@@ -1112,7 +1107,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e692e296bfac1d2533ef168d0b60ff5897b8b70a4009276834014dd8924cc028"
 dependencies = [
  "libc",
- "winapi 0.3.8",
+ "winapi 0.3.9",
 ]
 
 [[package]]
@@ -1162,9 +1157,9 @@ dependencies = [
 
 [[package]]
 name = "h2"
-version = "0.3.1"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d832b01df74254fe364568d6ddc294443f61cbec82816b60904303af87efae78"
+checksum = "825343c4eef0b63f541f8903f395dc5beb362a979b5799a84062527ef1e37726"
 dependencies = [
  "bytes 1.0.1",
  "fnv",
@@ -1174,7 +1169,7 @@ dependencies = [
  "http",
  "indexmap",
  "slab",
- "tokio 1.4.0",
+ "tokio 1.8.1",
  "tokio-util",
  "tracing",
 ]
@@ -1223,16 +1218,6 @@ dependencies = [
  "pkg-config",
 ]
 
-[[package]]
-name = "hmac"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5dcb5e64cda4c23119ab41ba960d1e170a774c8e4b9d9e6a9bc18aabf5e59695"
-dependencies = [
- "crypto-mac 0.7.0",
- "digest 0.8.1",
-]
-
 [[package]]
 name = "hmac"
 version = "0.8.1"
@@ -1265,13 +1250,13 @@ dependencies = [
 
 [[package]]
 name = "hmac-drbg"
-version = "0.2.0"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6e570451493f10f6581b48cdd530413b63ea9e780f544bfd3bdcaa0d89d1a7b"
+checksum = "17ea0a1394df5b6574da6e0c1ade9e78868c9fb0a4e5ef4428e32da4676b85b1"
 dependencies = [
- "digest 0.8.1",
- "generic-array 0.12.3",
- "hmac 0.7.1",
+ "digest 0.9.0",
+ "generic-array 0.14.3",
+ "hmac 0.8.1",
 ]
 
 [[package]]
@@ -1297,15 +1282,15 @@ dependencies = [
 
 [[package]]
 name = "httparse"
-version = "1.3.4"
+version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd179ae861f0c2e53da70d892f5f3029f9594be0c41dc5269cd371691b1dc2f9"
+checksum = "f3a87b616e37e93c22fb19bcd386f02f3af5ea98a25670ad0fce773de23c5e68"
 
 [[package]]
 name = "httpdate"
-version = "0.3.2"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "494b4d60369511e7dea41cf646832512a94e542f68bb9c49e54518e0f468eb47"
+checksum = "6456b8a6c8f33fee7d958fcd1b60d55b11940a79e63ae87013e6d22e26034440"
 
 [[package]]
 name = "humantime"
@@ -1315,9 +1300,9 @@ checksum = "3c1ad908cc71012b7bea4d0c53ba96a8cba9962f048fa68d143376143d863b7a"
 
 [[package]]
 name = "hyper"
-version = "0.14.4"
+version = "0.14.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8e946c2b1349055e0b72ae281b238baf1a3ea7307c7e9f9d64673bdd9c26ac7"
+checksum = "0b61cf2d1aebcf6e6352c97b81dc2244ca29194be1b276f5d8ad5c6330fffb11"
 dependencies = [
  "bytes 1.0.1",
  "futures-channel",
@@ -1329,9 +1314,9 @@ dependencies = [
  "httparse",
  "httpdate",
  "itoa",
- "pin-project",
- "socket2",
- "tokio 1.4.0",
+ "pin-project-lite 0.2.7",
+ "socket2 0.4.1",
+ "tokio 1.8.1",
  "tower-service",
  "tracing",
  "want",
@@ -1347,7 +1332,7 @@ dependencies = [
  "hyper",
  "log",
  "rustls",
- "tokio 1.4.0",
+ "tokio 1.8.1",
  "tokio-rustls",
  "webpki",
 ]
@@ -1379,7 +1364,7 @@ version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7baab56125e25686df467fe470785512329883aab42696d661247aca2a2896e4"
 dependencies = [
- "console 0.13.0",
+ "console 0.14.1",
  "lazy_static",
  "number_prefix",
  "regex",
@@ -1500,9 +1485,9 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.81"
+version = "0.2.98"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1482821306169ec4d07f6aca392a4681f66c75c9918aa49641a2595db64053cb"
+checksum = "320cfe77175da3a483efed4bc0adc1968ca050b098ce4f2f1c13a56626128790"
 
 [[package]]
 name = "libloading"
@@ -1510,25 +1495,57 @@ version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2cadb8e769f070c45df05c78c7520eb4cd17061d4ab262e43cfc68b4d00ac71c"
 dependencies = [
- "winapi 0.3.8",
+ "winapi 0.3.9",
 ]
 
 [[package]]
 name = "libsecp256k1"
-version = "0.3.5"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fc1e2c808481a63dc6da2074752fdd4336a3c8fcc68b83db6f1fd5224ae7962"
+checksum = "bd1137239ab33b41aa9637a88a28249e5e70c40a42ccc92db7f12cc356c1fcd7"
 dependencies = [
  "arrayref",
- "crunchy",
- "digest 0.8.1",
+ "base64 0.12.3",
+ "digest 0.9.0",
  "hmac-drbg",
+ "libsecp256k1-core",
+ "libsecp256k1-gen-ecmult",
+ "libsecp256k1-gen-genmult",
  "rand 0.7.3",
- "sha2 0.8.2",
- "subtle 2.2.2",
+ "serde",
+ "sha2",
  "typenum",
 ]
 
+[[package]]
+name = "libsecp256k1-core"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ee11012b293ea30093c129173cac4335513064094619f4639a25b310fd33c11"
+dependencies = [
+ "crunchy",
+ "digest 0.9.0",
+ "subtle",
+]
+
+[[package]]
+name = "libsecp256k1-gen-ecmult"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32239626ffbb6a095b83b37a02ceb3672b2443a87a000a884fc3c4d16925c9c0"
+dependencies = [
+ "libsecp256k1-core",
+]
+
+[[package]]
+name = "libsecp256k1-gen-genmult"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "76acb433e21d10f5f9892b1962c2856c58c7f39a9e4bd68ac82b9436a0ffd5b9"
+dependencies = [
+ "libsecp256k1-core",
+]
+
 [[package]]
 name = "linked-hash-map"
 version = "0.5.4"
@@ -1651,7 +1668,7 @@ dependencies = [
  "log",
  "miow 0.3.6",
  "ntapi",
- "winapi 0.3.8",
+ "winapi 0.3.9",
 ]
 
 [[package]]
@@ -1683,8 +1700,8 @@ version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5a33c1b55807fbed163481b5ba66db4b2fa6cde694a5027be10fb724206c5897"
 dependencies = [
- "socket2",
- "winapi 0.3.8",
+ "socket2 0.3.17",
+ "winapi 0.3.9",
 ]
 
 [[package]]
@@ -1713,7 +1730,7 @@ checksum = "391630d12b68002ae1e25e8f974306474966550ad82dac6886fb8910c19568ae"
 dependencies = [
  "cfg-if 0.1.10",
  "libc",
- "winapi 0.3.8",
+ "winapi 0.3.9",
 ]
 
 [[package]]
@@ -1734,7 +1751,7 @@ version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7a31937dea023539c72ddae0e3571deadc1414b300483fa7aaec176168cfa9d2"
 dependencies = [
- "winapi 0.3.8",
+ "winapi 0.3.9",
 ]
 
 [[package]]
@@ -1889,21 +1906,23 @@ dependencies = [
 
 [[package]]
 name = "ouroboros"
-version = "0.5.1"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc04551635026d3ac7bc646698ea1836a85ed2a26b7094fe1d15d8b14854c4a2"
+checksum = "f0e3827c8742f21283e9374adf7905984e7b85731ad94a203137b56955d818b3"
 dependencies = [
+ "aliasable",
  "ouroboros_macro",
  "stable_deref_trait",
 ]
 
 [[package]]
 name = "ouroboros_macro"
-version = "0.5.1"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cec33dfceabec83cd0e95a5ce9d20e76ab3a5cbfef59659b8c927f69b93ed8ae"
+checksum = "1ef06077e08eac7e2aeaacfbd113a25fcb1b9b903437bd89d2bd513da6e04112"
 dependencies = [
  "Inflector",
+ "proc-macro-error",
  "proc-macro2 1.0.24",
  "quote 1.0.6",
  "syn 1.0.67",
@@ -1953,7 +1972,7 @@ dependencies = [
  "redox_syscall 0.1.56",
  "rustc_version",
  "smallvec 0.6.14",
- "winapi 0.3.8",
+ "winapi 0.3.9",
 ]
 
 [[package]]
@@ -1967,7 +1986,7 @@ dependencies = [
  "libc",
  "redox_syscall 0.1.56",
  "smallvec 1.6.1",
- "winapi 0.3.8",
+ "winapi 0.3.9",
 ]
 
 [[package]]
@@ -1981,7 +2000,7 @@ dependencies = [
  "libc",
  "redox_syscall 0.1.56",
  "smallvec 1.6.1",
- "winapi 0.3.8",
+ "winapi 0.3.9",
 ]
 
 [[package]]
@@ -2045,9 +2064,9 @@ checksum = "f7505eeebd78492e0f6108f7171c4948dbb120ee8119d9d77d0afa5469bef67f"
 
 [[package]]
 name = "pin-project-lite"
-version = "0.2.4"
+version = "0.2.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "439697af366c49a6d0a010c56a0d97685bc140ce0d377b13a2ea2aa42d64a827"
+checksum = "8d31d11c69a6b52a174b42bdc0c30e5e11670f90788b2c471c31c1d17d449443"
 
 [[package]]
 name = "pin-utils"
@@ -2082,6 +2101,30 @@ dependencies = [
  "toml",
 ]
 
+[[package]]
+name = "proc-macro-error"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
+dependencies = [
+ "proc-macro-error-attr",
+ "proc-macro2 1.0.24",
+ "quote 1.0.6",
+ "syn 1.0.67",
+ "version_check",
+]
+
+[[package]]
+name = "proc-macro-error-attr"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
+dependencies = [
+ "proc-macro2 1.0.24",
+ "quote 1.0.6",
+ "version_check",
+]
+
 [[package]]
 name = "proc-macro-hack"
 version = "0.5.19"
@@ -2237,7 +2280,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8b0d8e0819fadc20c74ea8373106ead0600e3a67ef1fe8da56e39b9ae7275674"
 dependencies = [
  "autocfg",
- "crossbeam-deque 0.8.0",
+ "crossbeam-deque 0.8.1",
  "either",
  "rayon-core",
 ]
@@ -2249,7 +2292,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9ab346ac5921dc62ffa9f89b7a773907511cdfa5490c572ae9be1be33e8afa4a"
 dependencies = [
  "crossbeam-channel 0.5.0",
- "crossbeam-deque 0.8.0",
+ "crossbeam-deque 0.8.1",
  "crossbeam-utils 0.8.1",
  "lazy_static",
  "num_cpus",
@@ -2282,21 +2325,20 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.3.9"
+version = "1.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c3780fcf44b193bc4d09f36d2a3c87b251da4a046c87795a0d35f4f927ad8e6"
+checksum = "2a26af418b574bd56588335b3a3659a65725d4e636eb1016c2f9e3b38c7cc759"
 dependencies = [
  "aho-corasick",
  "memchr",
  "regex-syntax",
- "thread_local",
 ]
 
 [[package]]
 name = "regex-syntax"
-version = "0.6.18"
+version = "0.6.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26412eb97c6b088a6997e05f69403a802a92d520de2f8e63c2b65f9e0f47c4e8"
+checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b"
 
 [[package]]
 name = "remove_dir_all"
@@ -2304,7 +2346,7 @@ version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4a83fa3702a688b9359eccba92d153ac33fd2e8462f9e0e3fdf155239ea7792e"
 dependencies = [
- "winapi 0.3.8",
+ "winapi 0.3.9",
 ]
 
 [[package]]
@@ -2328,12 +2370,12 @@ dependencies = [
  "log",
  "mime",
  "percent-encoding",
- "pin-project-lite 0.2.4",
+ "pin-project-lite 0.2.7",
  "rustls",
  "serde",
  "serde_json",
  "serde_urlencoded",
- "tokio 1.4.0",
+ "tokio 1.8.1",
  "tokio-rustls",
  "url",
  "wasm-bindgen",
@@ -2355,7 +2397,7 @@ dependencies = [
  "spin",
  "untrusted",
  "web-sys",
- "winapi 0.3.8",
+ "winapi 0.3.9",
 ]
 
 [[package]]
@@ -2365,7 +2407,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "99371657d3c8e4d816fb6221db98fa408242b0b53bac08f8676a41f8554fe99f"
 dependencies = [
  "libc",
- "winapi 0.3.8",
+ "winapi 0.3.9",
 ]
 
 [[package]]
@@ -2430,7 +2472,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8f05ba609c234e60bee0d547fe94a4c7e9da733d1c962cf6e59efa4cd9c8bc75"
 dependencies = [
  "lazy_static",
- "winapi 0.3.8",
+ "winapi 0.3.9",
 ]
 
 [[package]]
@@ -2536,9 +2578,9 @@ dependencies = [
 
 [[package]]
 name = "serde_bytes"
-version = "0.11.4"
+version = "0.11.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3bf487fbf5c6239d7ea2ff8b10cb6b811cd4b5080d1c2aeed1dec18753c06e10"
+checksum = "16ae07dd2f88a366f15bd0632ba725227018c69a1c8550a927324f8eb8368bb9"
 dependencies = [
  "serde",
 ]
@@ -2601,18 +2643,6 @@ dependencies = [
  "opaque-debug 0.2.3",
 ]
 
-[[package]]
-name = "sha2"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a256f46ea78a0c0d9ff00077504903ac881a1dafdc20da66545699e7776b3e69"
-dependencies = [
- "block-buffer 0.7.3",
- "digest 0.8.1",
- "fake-simd",
- "opaque-debug 0.2.3",
-]
-
 [[package]]
 name = "sha2"
 version = "0.9.2"
@@ -2683,12 +2713,22 @@ dependencies = [
  "cfg-if 1.0.0",
  "libc",
  "redox_syscall 0.1.56",
- "winapi 0.3.8",
+ "winapi 0.3.9",
+]
+
+[[package]]
+name = "socket2"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "765f090f0e423d2b55843402a07915add955e7d60657db13707a159727326cad"
+dependencies = [
+ "libc",
+ "winapi 0.3.9",
 ]
 
 [[package]]
 name = "solana-account-decoder"
-version = "1.7.0"
+version = "1.7.11"
 dependencies = [
  "Inflector",
  "base64 0.12.3",
@@ -2701,7 +2741,6 @@ dependencies = [
  "serde_json",
  "solana-config-program",
  "solana-sdk",
- "solana-stake-program",
  "solana-vote-program",
  "spl-token",
  "thiserror",
@@ -2710,7 +2749,7 @@ dependencies = [
 
 [[package]]
 name = "solana-banks-client"
-version = "1.7.0"
+version = "1.7.11"
 dependencies = [
  "bincode",
  "borsh",
@@ -2718,16 +2757,16 @@ dependencies = [
  "futures 0.3.12",
  "mio 0.7.7",
  "solana-banks-interface",
- "solana-program 1.7.0",
+ "solana-program 1.7.11",
  "solana-sdk",
  "tarpc",
- "tokio 1.4.0",
+ "tokio 1.8.1",
  "tokio-serde",
 ]
 
 [[package]]
 name = "solana-banks-interface"
-version = "1.7.0"
+version = "1.7.11"
 dependencies = [
  "mio 0.7.7",
  "serde",
@@ -2737,7 +2776,7 @@ dependencies = [
 
 [[package]]
 name = "solana-banks-server"
-version = "1.7.0"
+version = "1.7.11"
 dependencies = [
  "bincode",
  "futures 0.3.12",
@@ -2748,17 +2787,18 @@ dependencies = [
  "solana-runtime",
  "solana-sdk",
  "tarpc",
- "tokio 1.4.0",
+ "tokio 1.8.1",
  "tokio-serde",
  "tokio-stream",
 ]
 
 [[package]]
 name = "solana-bpf-loader-program"
-version = "1.7.0"
+version = "1.7.11"
 dependencies = [
  "bincode",
  "byteorder 1.3.4",
+ "libsecp256k1",
  "log",
  "num-derive 0.3.0",
  "num-traits",
@@ -2773,7 +2813,7 @@ dependencies = [
 
 [[package]]
 name = "solana-bpf-programs"
-version = "1.7.0"
+version = "1.7.11"
 dependencies = [
  "bincode",
  "byteorder 1.3.4",
@@ -2785,7 +2825,7 @@ dependencies = [
  "solana-account-decoder",
  "solana-bpf-loader-program",
  "solana-cli-output",
- "solana-logger 1.7.0",
+ "solana-logger 1.7.11",
  "solana-measure",
  "solana-runtime",
  "solana-sdk",
@@ -2796,264 +2836,288 @@ dependencies = [
 
 [[package]]
 name = "solana-bpf-rust-128bit"
-version = "1.7.0"
+version = "1.7.11"
 dependencies = [
  "solana-bpf-rust-128bit-dep",
- "solana-program 1.7.0",
+ "solana-program 1.7.11",
 ]
 
 [[package]]
 name = "solana-bpf-rust-128bit-dep"
-version = "1.7.0"
+version = "1.7.11"
 dependencies = [
- "solana-program 1.7.0",
+ "solana-program 1.7.11",
 ]
 
 [[package]]
 name = "solana-bpf-rust-alloc"
-version = "1.7.0"
+version = "1.7.11"
 dependencies = [
- "solana-program 1.7.0",
+ "solana-program 1.7.11",
 ]
 
 [[package]]
 name = "solana-bpf-rust-call-depth"
-version = "1.7.0"
+version = "1.7.11"
 dependencies = [
- "solana-program 1.7.0",
+ "solana-program 1.7.11",
 ]
 
 [[package]]
 name = "solana-bpf-rust-caller-access"
-version = "1.7.0"
+version = "1.7.11"
 dependencies = [
- "solana-program 1.7.0",
+ "solana-program 1.7.11",
 ]
 
 [[package]]
 name = "solana-bpf-rust-custom-heap"
-version = "1.7.0"
+version = "1.7.11"
 dependencies = [
- "solana-program 1.7.0",
+ "solana-program 1.7.11",
 ]
 
 [[package]]
 name = "solana-bpf-rust-dep-crate"
-version = "1.7.0"
+version = "1.7.11"
 dependencies = [
  "byteorder 1.3.4",
- "solana-program 1.7.0",
+ "solana-program 1.7.11",
 ]
 
 [[package]]
 name = "solana-bpf-rust-deprecated-loader"
-version = "1.7.0"
+version = "1.7.11"
 dependencies = [
- "solana-program 1.7.0",
+ "solana-program 1.7.11",
 ]
 
 [[package]]
 name = "solana-bpf-rust-dup-accounts"
-version = "1.7.0"
+version = "1.7.11"
 dependencies = [
- "solana-program 1.7.0",
+ "solana-program 1.7.11",
 ]
 
 [[package]]
 name = "solana-bpf-rust-error-handling"
-version = "1.7.0"
+version = "1.7.11"
 dependencies = [
  "num-derive 0.2.5",
  "num-traits",
- "solana-program 1.7.0",
+ "solana-program 1.7.11",
  "thiserror",
 ]
 
 [[package]]
 name = "solana-bpf-rust-external-spend"
-version = "1.7.0"
+version = "1.7.11"
 dependencies = [
- "solana-program 1.7.0",
+ "solana-program 1.7.11",
 ]
 
 [[package]]
 name = "solana-bpf-rust-finalize"
-version = "1.7.0"
+version = "1.7.11"
 dependencies = [
- "solana-program 1.7.0",
+ "solana-program 1.7.11",
 ]
 
 [[package]]
 name = "solana-bpf-rust-instruction-introspection"
-version = "1.7.0"
+version = "1.7.11"
 dependencies = [
- "solana-program 1.7.0",
+ "solana-program 1.7.11",
 ]
 
 [[package]]
 name = "solana-bpf-rust-invoke"
-version = "1.7.0"
+version = "1.7.11"
 dependencies = [
  "solana-bpf-rust-invoked",
- "solana-program 1.7.0",
+ "solana-program 1.7.11",
 ]
 
 [[package]]
 name = "solana-bpf-rust-invoke-and-error"
-version = "1.7.0"
+version = "1.7.11"
 dependencies = [
- "solana-program 1.7.0",
+ "solana-program 1.7.11",
 ]
 
 [[package]]
 name = "solana-bpf-rust-invoke-and-ok"
-version = "1.7.0"
+version = "1.7.11"
 dependencies = [
- "solana-program 1.7.0",
+ "solana-program 1.7.11",
 ]
 
 [[package]]
 name = "solana-bpf-rust-invoke-and-return"
-version = "1.7.0"
+version = "1.7.11"
 dependencies = [
- "solana-program 1.7.0",
+ "solana-program 1.7.11",
 ]
 
 [[package]]
 name = "solana-bpf-rust-invoked"
-version = "1.7.0"
+version = "1.7.11"
 dependencies = [
- "solana-program 1.7.0",
+ "solana-program 1.7.11",
 ]
 
 [[package]]
 name = "solana-bpf-rust-iter"
-version = "1.7.0"
+version = "1.7.11"
 dependencies = [
- "solana-program 1.7.0",
+ "solana-program 1.7.11",
 ]
 
 [[package]]
 name = "solana-bpf-rust-many-args"
-version = "1.7.0"
+version = "1.7.11"
 dependencies = [
  "solana-bpf-rust-many-args-dep",
- "solana-program 1.7.0",
+ "solana-program 1.7.11",
 ]
 
 [[package]]
 name = "solana-bpf-rust-many-args-dep"
-version = "1.7.0"
+version = "1.7.11"
 dependencies = [
- "solana-program 1.7.0",
+ "solana-program 1.7.11",
 ]
 
 [[package]]
 name = "solana-bpf-rust-mem"
-version = "1.7.0"
+version = "1.7.11"
 dependencies = [
- "solana-program 1.7.0",
+ "solana-program 1.7.11",
+ "solana-program-test",
+ "solana-sdk",
+]
+
+[[package]]
+name = "solana-bpf-rust-membuiltins"
+version = "1.7.11"
+dependencies = [
+ "solana-bpf-rust-mem",
+ "solana-program 1.7.11",
 ]
 
 [[package]]
 name = "solana-bpf-rust-noop"
-version = "1.7.0"
+version = "1.7.11"
 dependencies = [
- "solana-program 1.7.0",
+ "solana-program 1.7.11",
 ]
 
 [[package]]
 name = "solana-bpf-rust-panic"
-version = "1.7.0"
+version = "1.7.11"
 dependencies = [
- "solana-program 1.7.0",
+ "solana-program 1.7.11",
 ]
 
 [[package]]
 name = "solana-bpf-rust-param-passing"
-version = "1.7.0"
+version = "1.7.11"
 dependencies = [
  "solana-bpf-rust-param-passing-dep",
- "solana-program 1.7.0",
+ "solana-program 1.7.11",
 ]
 
 [[package]]
 name = "solana-bpf-rust-param-passing-dep"
-version = "1.7.0"
+version = "1.7.11"
 dependencies = [
- "solana-program 1.7.0",
+ "solana-program 1.7.11",
 ]
 
 [[package]]
 name = "solana-bpf-rust-rand"
-version = "1.7.0"
+version = "1.7.11"
 dependencies = [
  "getrandom 0.1.14",
  "rand 0.7.3",
- "solana-program 1.7.0",
+ "solana-program 1.7.11",
+]
+
+[[package]]
+name = "solana-bpf-rust-ro-account_modify"
+version = "1.7.11"
+dependencies = [
+ "solana-program 1.7.11",
 ]
 
 [[package]]
 name = "solana-bpf-rust-ro-modify"
-version = "1.7.0"
+version = "1.7.11"
 dependencies = [
- "solana-program 1.7.0",
+ "solana-program 1.7.11",
 ]
 
 [[package]]
 name = "solana-bpf-rust-sanity"
-version = "1.7.0"
+version = "1.7.11"
 dependencies = [
- "solana-program 1.7.0",
+ "solana-program 1.7.11",
+]
+
+[[package]]
+name = "solana-bpf-rust-secp256k1-recover"
+version = "1.7.11"
+dependencies = [
+ "solana-program 1.7.11",
 ]
 
 [[package]]
 name = "solana-bpf-rust-sha"
-version = "1.7.0"
+version = "1.7.11"
 dependencies = [
- "solana-program 1.7.0",
+ "solana-program 1.7.11",
 ]
 
 [[package]]
 name = "solana-bpf-rust-spoof1"
-version = "1.7.0"
+version = "1.7.11"
 dependencies = [
- "solana-program 1.7.0",
+ "solana-program 1.7.11",
 ]
 
 [[package]]
 name = "solana-bpf-rust-spoof1-system"
-version = "1.7.0"
+version = "1.7.11"
 dependencies = [
- "solana-program 1.7.0",
+ "solana-program 1.7.11",
 ]
 
 [[package]]
 name = "solana-bpf-rust-sysvar"
-version = "1.7.0"
+version = "1.7.11"
 dependencies = [
- "solana-program 1.7.0",
+ "solana-program 1.7.11",
  "solana-program-test",
  "solana-sdk",
 ]
 
 [[package]]
 name = "solana-bpf-rust-upgradeable"
-version = "1.7.0"
+version = "1.7.11"
 dependencies = [
- "solana-program 1.7.0",
+ "solana-program 1.7.11",
 ]
 
 [[package]]
 name = "solana-bpf-rust-upgraded"
-version = "1.7.0"
+version = "1.7.11"
 dependencies = [
- "solana-program 1.7.0",
+ "solana-program 1.7.11",
 ]
 
 [[package]]
 name = "solana-clap-utils"
-version = "1.7.0"
+version = "1.7.11"
 dependencies = [
  "chrono",
  "clap",
@@ -3068,7 +3132,7 @@ dependencies = [
 
 [[package]]
 name = "solana-cli-config"
-version = "1.7.0"
+version = "1.7.11"
 dependencies = [
  "dirs-next",
  "lazy_static",
@@ -3080,12 +3144,13 @@ dependencies = [
 
 [[package]]
 name = "solana-cli-output"
-version = "1.7.0"
+version = "1.7.11"
 dependencies = [
  "Inflector",
  "base64 0.13.0",
  "chrono",
- "console 0.11.3",
+ "clap",
+ "console 0.14.1",
  "humantime",
  "indicatif",
  "serde",
@@ -3095,7 +3160,6 @@ dependencies = [
  "solana-clap-utils",
  "solana-client",
  "solana-sdk",
- "solana-stake-program",
  "solana-transaction-status",
  "solana-vote-program",
  "spl-memo",
@@ -3103,7 +3167,7 @@ dependencies = [
 
 [[package]]
 name = "solana-client"
-version = "1.7.0"
+version = "1.7.11"
 dependencies = [
  "base64 0.13.0",
  "bincode",
@@ -3128,14 +3192,14 @@ dependencies = [
  "solana-version",
  "solana-vote-program",
  "thiserror",
- "tokio 1.4.0",
+ "tokio 1.8.1",
  "tungstenite",
  "url",
 ]
 
 [[package]]
 name = "solana-config-program"
-version = "1.7.0"
+version = "1.7.11"
 dependencies = [
  "bincode",
  "chrono",
@@ -3148,7 +3212,7 @@ dependencies = [
 
 [[package]]
 name = "solana-crate-features"
-version = "1.7.0"
+version = "1.7.11"
 dependencies = [
  "backtrace",
  "bytes 0.4.12",
@@ -3166,12 +3230,12 @@ dependencies = [
  "syn 0.15.44",
  "syn 1.0.67",
  "tokio 0.1.22",
- "winapi 0.3.8",
+ "winapi 0.3.9",
 ]
 
 [[package]]
 name = "solana-faucet"
-version = "1.7.0"
+version = "1.7.11"
 dependencies = [
  "bincode",
  "byteorder 1.3.4",
@@ -3181,20 +3245,20 @@ dependencies = [
  "serde_derive",
  "solana-clap-utils",
  "solana-cli-config",
- "solana-logger 1.7.0",
+ "solana-logger 1.7.11",
  "solana-metrics",
  "solana-sdk",
  "solana-version",
  "spl-memo",
  "thiserror",
- "tokio 1.4.0",
+ "tokio 1.8.1",
 ]
 
 [[package]]
 name = "solana-frozen-abi"
-version = "1.6.4"
+version = "1.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f81ac3925c8995d935d3af27390cf7b748a81837a29feb75a00e115f40dae6dc"
+checksum = "b0b98d31e0662fedf3a1ee30919c655713874d578e19e65affe46109b1b927f9"
 dependencies = [
  "bs58",
  "bv",
@@ -3204,15 +3268,15 @@ dependencies = [
  "rustc_version",
  "serde",
  "serde_derive",
- "sha2 0.9.2",
- "solana-frozen-abi-macro 1.6.4",
- "solana-logger 1.6.4",
+ "sha2",
+ "solana-frozen-abi-macro 1.7.6",
+ "solana-logger 1.7.6",
  "thiserror",
 ]
 
 [[package]]
 name = "solana-frozen-abi"
-version = "1.7.0"
+version = "1.7.11"
 dependencies = [
  "bs58",
  "bv",
@@ -3222,19 +3286,18 @@ dependencies = [
  "rustc_version",
  "serde",
  "serde_derive",
- "sha2 0.9.2",
- "solana-frozen-abi-macro 1.7.0",
- "solana-logger 1.7.0",
+ "sha2",
+ "solana-frozen-abi-macro 1.7.11",
+ "solana-logger 1.7.11",
  "thiserror",
 ]
 
 [[package]]
 name = "solana-frozen-abi-macro"
-version = "1.6.4"
+version = "1.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae448159038e470f3b2dd1ab0d219246211f940a10bf1e656a02cb5c2d897437"
+checksum = "ceac6e8ad1a784c92ff5f3d6ad68a8d664d389b08055b674c38b2b9abb69e6d4"
 dependencies = [
- "lazy_static",
  "proc-macro2 1.0.24",
  "quote 1.0.6",
  "rustc_version",
@@ -3243,7 +3306,7 @@ dependencies = [
 
 [[package]]
 name = "solana-frozen-abi-macro"
-version = "1.7.0"
+version = "1.7.11"
 dependencies = [
  "proc-macro2 1.0.24",
  "quote 1.0.6",
@@ -3253,9 +3316,9 @@ dependencies = [
 
 [[package]]
 name = "solana-logger"
-version = "1.6.4"
+version = "1.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fa7bddd7b89c26c6e3ef4af9b47d6bc8d60888559affb5160f5ade18c0cd058"
+checksum = "ec7c514fe57f8c5042fa88c19f5711c67f264db723d9d79379fcb78dd1f09bbf"
 dependencies = [
  "env_logger",
  "lazy_static",
@@ -3264,7 +3327,7 @@ dependencies = [
 
 [[package]]
 name = "solana-logger"
-version = "1.7.0"
+version = "1.7.11"
 dependencies = [
  "env_logger",
  "lazy_static",
@@ -3273,7 +3336,7 @@ dependencies = [
 
 [[package]]
 name = "solana-measure"
-version = "1.7.0"
+version = "1.7.11"
 dependencies = [
  "log",
  "solana-metrics",
@@ -3282,7 +3345,7 @@ dependencies = [
 
 [[package]]
 name = "solana-metrics"
-version = "1.7.0"
+version = "1.7.11"
 dependencies = [
  "env_logger",
  "gethostname",
@@ -3294,7 +3357,7 @@ dependencies = [
 
 [[package]]
 name = "solana-net-utils"
-version = "1.7.0"
+version = "1.7.11"
 dependencies = [
  "bincode",
  "clap",
@@ -3303,21 +3366,23 @@ dependencies = [
  "rand 0.7.3",
  "serde",
  "serde_derive",
- "socket2",
+ "socket2 0.3.17",
  "solana-clap-utils",
- "solana-logger 1.7.0",
+ "solana-logger 1.7.11",
+ "solana-sdk",
  "solana-version",
- "tokio 1.4.0",
+ "tokio 1.8.1",
  "url",
 ]
 
 [[package]]
 name = "solana-program"
-version = "1.6.4"
+version = "1.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "231bf4cd42997b6f34e7c74a1449e8a1e8816fd83662fc3a5a0922da48fc667b"
+checksum = "3bfe6a5dfc5372c0a946018ecdd8115e38af78cea8275bac48cf3d105c6b1fb3"
 dependencies = [
  "bincode",
+ "blake3",
  "borsh",
  "borsh-derive",
  "bs58",
@@ -3326,6 +3391,7 @@ dependencies = [
  "hex",
  "itertools 0.9.0",
  "lazy_static",
+ "libsecp256k1",
  "log",
  "num-derive 0.3.0",
  "num-traits",
@@ -3335,17 +3401,18 @@ dependencies = [
  "serde",
  "serde_bytes",
  "serde_derive",
- "sha2 0.9.2",
- "solana-frozen-abi 1.6.4",
- "solana-frozen-abi-macro 1.6.4",
- "solana-logger 1.6.4",
- "solana-sdk-macro 1.6.4",
+ "sha2",
+ "sha3",
+ "solana-frozen-abi 1.7.6",
+ "solana-frozen-abi-macro 1.7.6",
+ "solana-logger 1.7.6",
+ "solana-sdk-macro 1.7.6",
  "thiserror",
 ]
 
 [[package]]
 name = "solana-program"
-version = "1.7.0"
+version = "1.7.11"
 dependencies = [
  "bincode",
  "blake3",
@@ -3357,6 +3424,7 @@ dependencies = [
  "hex",
  "itertools 0.9.0",
  "lazy_static",
+ "libsecp256k1",
  "log",
  "num-derive 0.3.0",
  "num-traits",
@@ -3366,18 +3434,18 @@ dependencies = [
  "serde",
  "serde_bytes",
  "serde_derive",
- "sha2 0.9.2",
+ "sha2",
  "sha3",
- "solana-frozen-abi 1.7.0",
- "solana-frozen-abi-macro 1.7.0",
- "solana-logger 1.7.0",
- "solana-sdk-macro 1.7.0",
+ "solana-frozen-abi 1.7.11",
+ "solana-frozen-abi-macro 1.7.11",
+ "solana-logger 1.7.11",
+ "solana-sdk-macro 1.7.11",
  "thiserror",
 ]
 
 [[package]]
 name = "solana-program-test"
-version = "1.7.0"
+version = "1.7.11"
 dependencies = [
  "async-trait",
  "base64 0.12.3",
@@ -3391,17 +3459,17 @@ dependencies = [
  "solana-banks-client",
  "solana-banks-server",
  "solana-bpf-loader-program",
- "solana-logger 1.7.0",
+ "solana-logger 1.7.11",
  "solana-runtime",
  "solana-sdk",
  "solana-vote-program",
  "thiserror",
- "tokio 1.4.0",
+ "tokio 1.8.1",
 ]
 
 [[package]]
 name = "solana-rayon-threadlimit"
-version = "1.7.0"
+version = "1.7.11"
 dependencies = [
  "lazy_static",
  "num_cpus",
@@ -3409,10 +3477,10 @@ dependencies = [
 
 [[package]]
 name = "solana-remote-wallet"
-version = "1.7.0"
+version = "1.7.11"
 dependencies = [
  "base32",
- "console 0.11.3",
+ "console 0.14.1",
  "dialoguer",
  "hidapi",
  "log",
@@ -3428,7 +3496,7 @@ dependencies = [
 
 [[package]]
 name = "solana-runtime"
-version = "1.7.0"
+version = "1.7.11"
 dependencies = [
  "arrayref",
  "bincode",
@@ -3458,9 +3526,9 @@ dependencies = [
  "serde",
  "serde_derive",
  "solana-config-program",
- "solana-frozen-abi 1.7.0",
- "solana-frozen-abi-macro 1.7.0",
- "solana-logger 1.7.0",
+ "solana-frozen-abi 1.7.11",
+ "solana-frozen-abi-macro 1.7.11",
+ "solana-logger 1.7.11",
  "solana-measure",
  "solana-metrics",
  "solana-rayon-threadlimit",
@@ -3477,7 +3545,7 @@ dependencies = [
 
 [[package]]
 name = "solana-sdk"
-version = "1.7.0"
+version = "1.7.11"
 dependencies = [
  "assert_matches",
  "bincode",
@@ -3510,23 +3578,23 @@ dependencies = [
  "serde_bytes",
  "serde_derive",
  "serde_json",
- "sha2 0.9.2",
+ "sha2",
  "sha3",
  "solana-crate-features",
- "solana-frozen-abi 1.7.0",
- "solana-frozen-abi-macro 1.7.0",
- "solana-logger 1.7.0",
- "solana-program 1.7.0",
- "solana-sdk-macro 1.7.0",
+ "solana-frozen-abi 1.7.11",
+ "solana-frozen-abi-macro 1.7.11",
+ "solana-logger 1.7.11",
+ "solana-program 1.7.11",
+ "solana-sdk-macro 1.7.11",
  "thiserror",
  "uriparse",
 ]
 
 [[package]]
 name = "solana-sdk-macro"
-version = "1.6.4"
+version = "1.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c805f1e32677f8ec0cc0b2f470833a0d5ab0922f068e52be3a4a93b468c9c70"
+checksum = "84710ce45a21cccd9f2b09d8e9aad529080bb2540f27b1253874b6e732b465b9"
 dependencies = [
  "bs58",
  "proc-macro2 1.0.24",
@@ -3537,7 +3605,7 @@ dependencies = [
 
 [[package]]
 name = "solana-sdk-macro"
-version = "1.7.0"
+version = "1.7.11"
 dependencies = [
  "bs58",
  "proc-macro2 1.0.24",
@@ -3548,20 +3616,14 @@ dependencies = [
 
 [[package]]
 name = "solana-secp256k1-program"
-version = "1.7.0"
+version = "1.7.11"
 dependencies = [
- "bincode",
- "digest 0.9.0",
- "libsecp256k1",
- "rand 0.7.3",
- "sha3",
- "solana-logger 1.7.0",
  "solana-sdk",
 ]
 
 [[package]]
 name = "solana-stake-program"
-version = "1.7.0"
+version = "1.7.11"
 dependencies = [
  "bincode",
  "log",
@@ -3571,8 +3633,8 @@ dependencies = [
  "serde",
  "serde_derive",
  "solana-config-program",
- "solana-frozen-abi 1.7.0",
- "solana-frozen-abi-macro 1.7.0",
+ "solana-frozen-abi 1.7.11",
+ "solana-frozen-abi-macro 1.7.11",
  "solana-metrics",
  "solana-sdk",
  "solana-vote-program",
@@ -3581,7 +3643,7 @@ dependencies = [
 
 [[package]]
 name = "solana-transaction-status"
-version = "1.7.0"
+version = "1.7.11"
 dependencies = [
  "Inflector",
  "base64 0.12.3",
@@ -3594,7 +3656,6 @@ dependencies = [
  "solana-account-decoder",
  "solana-runtime",
  "solana-sdk",
- "solana-stake-program",
  "solana-vote-program",
  "spl-associated-token-account",
  "spl-memo",
@@ -3604,21 +3665,21 @@ dependencies = [
 
 [[package]]
 name = "solana-version"
-version = "1.7.0"
+version = "1.7.11"
 dependencies = [
  "log",
  "rustc_version",
  "serde",
  "serde_derive",
- "solana-frozen-abi 1.7.0",
- "solana-frozen-abi-macro 1.7.0",
- "solana-logger 1.7.0",
+ "solana-frozen-abi 1.7.11",
+ "solana-frozen-abi-macro 1.7.11",
+ "solana-logger 1.7.11",
  "solana-sdk",
 ]
 
 [[package]]
 name = "solana-vote-program"
-version = "1.7.0"
+version = "1.7.11"
 dependencies = [
  "bincode",
  "log",
@@ -3627,9 +3688,9 @@ dependencies = [
  "rustc_version",
  "serde",
  "serde_derive",
- "solana-frozen-abi 1.7.0",
- "solana-frozen-abi-macro 1.7.0",
- "solana-logger 1.7.0",
+ "solana-frozen-abi 1.7.11",
+ "solana-frozen-abi-macro 1.7.11",
+ "solana-logger 1.7.11",
  "solana-metrics",
  "solana-sdk",
  "thiserror",
@@ -3662,11 +3723,11 @@ checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
 
 [[package]]
 name = "spl-associated-token-account"
-version = "1.0.2"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4adc47eebe5d2b662cbaaba1843719c28a67e5ec5d0460bc3ca60900a51f74e2"
+checksum = "393e2240d521c3dd770806bff25c2c00d761ac962be106e14e22dd912007f428"
 dependencies = [
- "solana-program 1.6.4",
+ "solana-program 1.7.6",
  "spl-token",
 ]
 
@@ -3676,20 +3737,20 @@ version = "3.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bd0dc6f70db6bacea7ff25870b016a65ba1d1b6013536f08e4fd79a8f9005325"
 dependencies = [
- "solana-program 1.6.4",
+ "solana-program 1.7.6",
 ]
 
 [[package]]
 name = "spl-token"
-version = "3.1.0"
+version = "3.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b795e50d15dfd35aa5460b80a16414503a322be115a417a43db987c5824c6798"
+checksum = "93bfdd5bd7c869cb565c7d7635c4fafe189b988a0bdef81063cd9585c6b8dc01"
 dependencies = [
  "arrayref",
  "num-derive 0.3.0",
  "num-traits",
  "num_enum",
- "solana-program 1.6.4",
+ "solana-program 1.7.6",
  "thiserror",
 ]
 
@@ -3711,12 +3772,6 @@ version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
 
-[[package]]
-name = "subtle"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d67a5a62ba6e01cb2192ff309324cb4875d0c451d55fe2319433abe7a05a8ee"
-
 [[package]]
 name = "subtle"
 version = "2.2.2"
@@ -3765,13 +3820,12 @@ dependencies = [
 
 [[package]]
 name = "tar"
-version = "0.4.29"
+version = "0.4.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8a4c1d0bee3230179544336c15eefb563cf0302955d962e456542323e8c2e8a"
+checksum = "d6f5515d3add52e0bbdcad7b83c388bb36ba7b754dda3b5f5bc2d38640cdba5c"
 dependencies = [
  "filetime",
  "libc",
- "redox_syscall 0.1.56",
  "xattr",
 ]
 
@@ -3791,7 +3845,7 @@ dependencies = [
  "serde",
  "static_assertions",
  "tarpc-plugins",
- "tokio 1.4.0",
+ "tokio 1.8.1",
  "tokio-serde",
  "tokio-util",
 ]
@@ -3818,7 +3872,7 @@ dependencies = [
  "rand 0.8.2",
  "redox_syscall 0.2.4",
  "remove_dir_all",
- "winapi 0.3.8",
+ "winapi 0.3.9",
 ]
 
 [[package]]
@@ -3837,7 +3891,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4bd2d183bd3fac5f5fe38ddbeb4dc9aec4a39a9d7d59e7491d900302da01cbe1"
 dependencies = [
  "libc",
- "winapi 0.3.8",
+ "winapi 0.3.9",
 ]
 
 [[package]]
@@ -3878,15 +3932,6 @@ dependencies = [
  "syn 1.0.67",
 ]
 
-[[package]]
-name = "thread_local"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14"
-dependencies = [
- "lazy_static",
-]
-
 [[package]]
 name = "time"
 version = "0.1.43"
@@ -3894,7 +3939,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438"
 dependencies = [
  "libc",
- "winapi 0.3.8",
+ "winapi 0.3.9",
 ]
 
 [[package]]
@@ -3909,7 +3954,7 @@ dependencies = [
  "pbkdf2 0.4.0",
  "rand 0.7.3",
  "rustc-hash",
- "sha2 0.9.2",
+ "sha2",
  "thiserror",
  "unicode-normalization",
  "zeroize",
@@ -3956,9 +4001,9 @@ dependencies = [
 
 [[package]]
 name = "tokio"
-version = "1.4.0"
+version = "1.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "134af885d758d645f0f0505c9a8b3f9bf8a348fd822e112ab5248138348f1722"
+checksum = "98c8b05dc14c75ea83d63dd391100353789f5f24b8b3866542a5e85c8be8e985"
 dependencies = [
  "autocfg",
  "bytes 1.0.1",
@@ -3968,10 +4013,10 @@ dependencies = [
  "num_cpus",
  "once_cell",
  "parking_lot 0.11.1",
- "pin-project-lite 0.2.4",
+ "pin-project-lite 0.2.7",
  "signal-hook-registry",
  "tokio-macros",
- "winapi 0.3.8",
+ "winapi 0.3.9",
 ]
 
 [[package]]
@@ -4064,7 +4109,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bc6844de72e57df1980054b38be3a9f4702aba4858be64dd700181a8a6d0e1b6"
 dependencies = [
  "rustls",
- "tokio 1.4.0",
+ "tokio 1.8.1",
  "webpki",
 ]
 
@@ -4091,8 +4136,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e177a5d8c3bf36de9ebe6d58537d8879e964332f93fb3339e43f618c81361af0"
 dependencies = [
  "futures-core",
- "pin-project-lite 0.2.4",
- "tokio 1.4.0",
+ "pin-project-lite 0.2.7",
+ "tokio 1.8.1",
 ]
 
 [[package]]
@@ -4125,7 +4170,7 @@ version = "0.1.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "df720b6581784c118f0eb4310796b12b1d242a7eb95f716a8367855325c25f89"
 dependencies = [
- "crossbeam-deque 0.7.3",
+ "crossbeam-deque 0.7.4",
  "crossbeam-queue",
  "crossbeam-utils 0.7.2",
  "futures 0.1.29",
@@ -4191,8 +4236,8 @@ dependencies = [
  "futures-core",
  "futures-sink",
  "log",
- "pin-project-lite 0.2.4",
- "tokio 1.4.0",
+ "pin-project-lite 0.2.7",
+ "tokio 1.8.1",
 ]
 
 [[package]]
@@ -4378,7 +4423,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "777182bc735b6424e1a57516d35ed72cb8019d85c8c9bf536dccb3445c1a2f7d"
 dependencies = [
  "same-file",
- "winapi 0.3.8",
+ "winapi 0.3.9",
  "winapi-util",
 ]
 
@@ -4509,9 +4554,9 @@ checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a"
 
 [[package]]
 name = "winapi"
-version = "0.3.8"
+version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6"
+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
 dependencies = [
  "winapi-i686-pc-windows-gnu",
  "winapi-x86_64-pc-windows-gnu",
@@ -4535,7 +4580,7 @@ version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
 dependencies = [
- "winapi 0.3.8",
+ "winapi 0.3.9",
 ]
 
 [[package]]
@@ -4550,7 +4595,7 @@ version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0120db82e8a1e0b9fb3345a539c478767c0048d842860994d96113d5b667bd69"
 dependencies = [
- "winapi 0.3.8",
+ "winapi 0.3.9",
 ]
 
 [[package]]
diff --git a/programs/bpf/Cargo.toml b/programs/bpf/Cargo.toml
index 8bb3d8097f413c..5291fdb0fd19b5 100644
--- 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.7.0"
+version = "1.7.11"
 documentation = "https://docs.rs/solana"
 homepage = "https://solana.com/"
 readme = "README.md"
@@ -26,15 +26,15 @@ itertools = "0.10.0"
 log = "0.4.11"
 miow = "0.2.2"
 net2 = "0.2.37"
-solana-bpf-loader-program = { path = "../bpf_loader", version = "=1.7.0" }
-solana-cli-output = { path = "../../cli-output", version = "=1.7.0" }
-solana-logger = { path = "../../logger", version = "=1.7.0" }
-solana-measure = { path = "../../measure", version = "=1.7.0" }
+solana-bpf-loader-program = { path = "../bpf_loader", version = "=1.7.11" }
+solana-cli-output = { path = "../../cli-output", version = "=1.7.11" }
+solana-logger = { path = "../../logger", version = "=1.7.11" }
+solana-measure = { path = "../../measure", version = "=1.7.11" }
 solana_rbpf = "=0.2.11"
-solana-runtime = { path = "../../runtime", version = "=1.7.0" }
-solana-sdk = { path = "../../sdk", version = "=1.7.0" }
-solana-transaction-status = { path = "../../transaction-status", version = "=1.7.0" }
-solana-account-decoder = { path = "../../account-decoder", version = "=1.7.0" }
+solana-runtime = { path = "../../runtime", version = "=1.7.11" }
+solana-sdk = { path = "../../sdk", version = "=1.7.11" }
+solana-transaction-status = { path = "../../transaction-status", version = "=1.7.11" }
+solana-account-decoder = { path = "../../account-decoder", version = "=1.7.11" }
 
 
 [[bench]]
@@ -64,13 +64,16 @@ members = [
     "rust/many_args",
     "rust/many_args_dep",
     "rust/mem",
+    "rust/membuiltins",
     "rust/noop",
     "rust/panic",
     "rust/param_passing",
     "rust/param_passing_dep",
     "rust/rand",
     "rust/ro_modify",
+    "rust/ro_account_modify",
     "rust/sanity",
+    "rust/secp256k1_recover",
     "rust/sha",
     "rust/spoof1",
     "rust/spoof1_system",
diff --git a/programs/bpf/build.rs b/programs/bpf/build.rs
index a044671a04175a..63f77b4b2b5853 100644
--- a/programs/bpf/build.rs
+++ b/programs/bpf/build.rs
@@ -78,12 +78,15 @@ fn main() {
             "iter",
             "many_args",
             "mem",
+            "membuiltins",
             "noop",
             "panic",
             "param_passing",
             "rand",
             "ro_modify",
+            "ro_account_modify",
             "sanity",
+            "secp256k1_recover",
             "sha",
             "spoof1",
             "spoof1_system",
diff --git a/programs/bpf/c/src/invoke/invoke.c b/programs/bpf/c/src/invoke/invoke.c
index 0ae306220e6ef6..c330576ef2aa02 100644
--- a/programs/bpf/c/src/invoke/invoke.c
+++ b/programs/bpf/c/src/invoke/invoke.c
@@ -17,6 +17,10 @@ static const uint8_t TEST_INSTRUCTION_META_TOO_LARGE = 10;
 static const uint8_t TEST_RETURN_ERROR = 11;
 static const uint8_t TEST_PRIVILEGE_DEESCALATION_ESCALATION_SIGNER = 12;
 static const uint8_t TEST_PRIVILEGE_DEESCALATION_ESCALATION_WRITABLE = 13;
+static const uint8_t TEST_WRITABLE_DEESCALATION_WRITABLE = 14;
+static const uint8_t TEST_NESTED_INVOKE_TOO_DEEP = 15;
+static const uint8_t TEST_EXECUTABLE_LAMPORTS = 16;
+static const uint8_t ADD_LAMPORTS = 17;
 
 static const int MINT_INDEX = 0;
 static const int ARGUMENT_INDEX = 1;
@@ -30,10 +34,39 @@ static const int DERIVED_KEY3_INDEX = 8;
 static const int SYSTEM_PROGRAM_INDEX = 9;
 static const int FROM_INDEX = 10;
 
+uint64_t do_nested_invokes(uint64_t num_nested_invokes,
+                           SolAccountInfo *accounts, uint64_t num_accounts) {
+  sol_assert(accounts[ARGUMENT_INDEX].is_signer);
+
+  *accounts[ARGUMENT_INDEX].lamports -= 5;
+  *accounts[INVOKED_ARGUMENT_INDEX].lamports += 5;
+
+  SolAccountMeta arguments[] = {
+      {accounts[INVOKED_ARGUMENT_INDEX].key, true, true},
+      {accounts[ARGUMENT_INDEX].key, true, true},
+      {accounts[INVOKED_PROGRAM_INDEX].key, false, false}};
+  uint8_t data[] = {NESTED_INVOKE, num_nested_invokes};
+  const SolInstruction instruction = {accounts[INVOKED_PROGRAM_INDEX].key,
+                                      arguments, SOL_ARRAY_SIZE(arguments),
+                                      data, SOL_ARRAY_SIZE(data)};
+
+  sol_log("First invoke");
+  sol_assert(SUCCESS == sol_invoke(&instruction, accounts, num_accounts));
+  sol_log("2nd invoke from first program");
+  sol_assert(SUCCESS == sol_invoke(&instruction, accounts, num_accounts));
+
+  sol_assert(*accounts[ARGUMENT_INDEX].lamports ==
+             42 - 5 + (2 * num_nested_invokes));
+  sol_assert(*accounts[INVOKED_ARGUMENT_INDEX].lamports ==
+             10 + 5 - (2 * num_nested_invokes));
+
+  return SUCCESS;
+}
+
 extern uint64_t entrypoint(const uint8_t *input) {
   sol_log("Invoke C program");
 
-  SolAccountInfo accounts[11];
+  SolAccountInfo accounts[12];
   SolParameters params = (SolParameters){.ka = accounts};
 
   if (!sol_deserialize(input, &params, SOL_ARRAY_SIZE(accounts))) {
@@ -202,32 +235,9 @@ extern uint64_t entrypoint(const uint8_t *input) {
                  sol_invoke(&instruction, accounts, SOL_ARRAY_SIZE(accounts)));
     }
 
-    sol_log("Test invoke");
+    sol_log("Test nested invoke");
     {
-      sol_assert(accounts[ARGUMENT_INDEX].is_signer);
-
-      *accounts[ARGUMENT_INDEX].lamports -= 5;
-      *accounts[INVOKED_ARGUMENT_INDEX].lamports += 5;
-
-      SolAccountMeta arguments[] = {
-          {accounts[INVOKED_ARGUMENT_INDEX].key, true, true},
-          {accounts[ARGUMENT_INDEX].key, true, true},
-          {accounts[INVOKED_PROGRAM_DUP_INDEX].key, false, false}};
-      uint8_t data[] = {NESTED_INVOKE};
-      const SolInstruction instruction = {accounts[INVOKED_PROGRAM_INDEX].key,
-                                          arguments, SOL_ARRAY_SIZE(arguments),
-                                          data, SOL_ARRAY_SIZE(data)};
-
-      sol_log("First invoke");
-      sol_assert(SUCCESS ==
-                 sol_invoke(&instruction, accounts, SOL_ARRAY_SIZE(accounts)));
-      sol_log("2nd invoke from first program");
-      sol_assert(SUCCESS ==
-                 sol_invoke(&instruction, accounts, SOL_ARRAY_SIZE(accounts)));
-
-      sol_assert(*accounts[ARGUMENT_INDEX].lamports == 42 - 5 + 1 + 1 + 1 + 1);
-      sol_assert(*accounts[INVOKED_ARGUMENT_INDEX].lamports ==
-                 10 + 5 - 1 - 1 - 1 - 1);
+      sol_assert(SUCCESS == do_nested_invokes(4, accounts, params.ka_num));
     }
 
     sol_log("Test privilege deescalation");
@@ -271,24 +281,6 @@ extern uint64_t entrypoint(const uint8_t *input) {
         sol_assert(accounts[ARGUMENT_INDEX].data[i] == 0);
       }
     }
-    sol_log("Test writable deescalation");
-    {
-      uint8_t buffer[10];
-      for (int i = 0; i < 10; i++) {
-        buffer[i] = accounts[INVOKED_ARGUMENT_INDEX].data[i];
-      }
-      SolAccountMeta arguments[] = {
-          {accounts[INVOKED_ARGUMENT_INDEX].key, false, false}};
-      uint8_t data[] = {WRITE_ACCOUNT, 10};
-      const SolInstruction instruction = {accounts[INVOKED_PROGRAM_INDEX].key,
-                                          arguments, SOL_ARRAY_SIZE(arguments),
-                                          data, SOL_ARRAY_SIZE(data)};
-      sol_invoke(&instruction, accounts, SOL_ARRAY_SIZE(accounts));
-
-      for (int i = 0; i < 10; i++) {
-        sol_assert(buffer[i] == accounts[INVOKED_ARGUMENT_INDEX].data[i]);
-      }
-    }
     break;
   }
   case TEST_PRIVILEGE_ESCALATION_SIGNER: {
@@ -521,6 +513,53 @@ extern uint64_t entrypoint(const uint8_t *input) {
                sol_invoke(&instruction, accounts, SOL_ARRAY_SIZE(accounts)));
     break;
   }
+  case TEST_WRITABLE_DEESCALATION_WRITABLE: {
+    sol_log("Test writable deescalation");
+    uint8_t buffer[10];
+    for (int i = 0; i < 10; i++) {
+      buffer[i] = accounts[INVOKED_ARGUMENT_INDEX].data[i];
+    }
+    SolAccountMeta arguments[] = {
+        {accounts[INVOKED_ARGUMENT_INDEX].key, false, false}};
+    uint8_t data[] = {WRITE_ACCOUNT, 10};
+    const SolInstruction instruction = {accounts[INVOKED_PROGRAM_INDEX].key,
+                                        arguments, SOL_ARRAY_SIZE(arguments),
+                                        data, SOL_ARRAY_SIZE(data)};
+    sol_invoke(&instruction, accounts, SOL_ARRAY_SIZE(accounts));
+
+    for (int i = 0; i < 10; i++) {
+      sol_assert(buffer[i] == accounts[INVOKED_ARGUMENT_INDEX].data[i]);
+    }
+    break;
+  }
+  case TEST_NESTED_INVOKE_TOO_DEEP: {
+    do_nested_invokes(5, accounts, params.ka_num);
+    break;
+  }
+  case TEST_EXECUTABLE_LAMPORTS: {
+      sol_log("Test executable lamports");
+      accounts[ARGUMENT_INDEX].executable = true;
+      *accounts[ARGUMENT_INDEX].lamports -= 1;
+      *accounts[DERIVED_KEY1_INDEX].lamports +=1;
+      SolAccountMeta arguments[] = {
+          {accounts[ARGUMENT_INDEX].key, true, false},
+          {accounts[DERIVED_KEY1_INDEX].key, true, false},
+      };
+      uint8_t data[] = {ADD_LAMPORTS, 0, 0, 0};
+      SolPubkey program_id;
+      sol_memcpy(&program_id, params.program_id, sizeof(SolPubkey));
+      const SolInstruction instruction = {&program_id,
+                                          arguments, SOL_ARRAY_SIZE(arguments),
+                                          data, SOL_ARRAY_SIZE(data)};
+      sol_invoke(&instruction, accounts, SOL_ARRAY_SIZE(accounts));
+      *accounts[ARGUMENT_INDEX].lamports += 1;
+      break;
+  }
+  case ADD_LAMPORTS: {
+      *accounts[0].lamports += 1;
+      break;
+  }
+
   default:
     sol_panic();
   }
diff --git a/programs/bpf/c/src/invoked/invoked.c b/programs/bpf/c/src/invoked/invoked.c
index e0b6f7f5515115..273deb9d0607db 100644
--- a/programs/bpf/c/src/invoked/invoked.c
+++ b/programs/bpf/c/src/invoked/invoked.c
@@ -228,16 +228,17 @@ extern uint64_t entrypoint(const uint8_t *input) {
     *accounts[INVOKED_ARGUMENT_INDEX].lamports -= 1;
     *accounts[ARGUMENT_INDEX].lamports += 1;
 
-    if (params.ka_num == 3) {
+    uint8_t remaining_invokes = params.data[1];
+    if (remaining_invokes > 1) {
+      sol_log("Invoke again");
       SolAccountMeta arguments[] = {
           {accounts[INVOKED_ARGUMENT_INDEX].key, true, true},
-          {accounts[ARGUMENT_INDEX].key, true, true}};
-      uint8_t data[] = {NESTED_INVOKE};
+          {accounts[ARGUMENT_INDEX].key, true, true},
+          {accounts[INVOKED_PROGRAM_INDEX].key, false, false}};
+      uint8_t data[] = {NESTED_INVOKE, remaining_invokes - 1};
       const SolInstruction instruction = {accounts[INVOKED_PROGRAM_INDEX].key,
                                           arguments, SOL_ARRAY_SIZE(arguments),
                                           data, SOL_ARRAY_SIZE(data)};
-
-      sol_log("Invoke again");
       sol_assert(SUCCESS == sol_invoke(&instruction, accounts, params.ka_num));
     } else {
       sol_log("Last invoked");
diff --git a/programs/bpf/c/src/secp256k1_recover/secp256k1_recover.c b/programs/bpf/c/src/secp256k1_recover/secp256k1_recover.c
new file mode 100644
index 00000000000000..f4cd076f7afb44
--- /dev/null
+++ b/programs/bpf/c/src/secp256k1_recover/secp256k1_recover.c
@@ -0,0 +1,38 @@
+/**
+ * @brief Secp256k1Recover Syscall test
+ */
+#include <solana_sdk.h>
+
+extern uint64_t entrypoint(const uint8_t *input) {
+
+  uint8_t result[SECP256K1_RECOVER_RESULT_LENGTH];
+  uint8_t expected[] = { 0x42, 0xcd, 0x27, 0xe4, 0x0f, 0xdf, 0x7c, 0x97,
+                         0x0a, 0xa2, 0xca, 0x0b, 0x88, 0x5b, 0x96, 0x0f,
+                         0x8b, 0x62, 0x8a, 0x41, 0xa1, 0x81, 0xe7, 0xe6,
+                         0x8e, 0x03, 0xea, 0x0b, 0x84, 0x20, 0x58, 0x9b,
+                         0x32, 0x06, 0xbd, 0x66, 0x2f, 0x75, 0x65, 0xd6,
+                         0x9d, 0xbd, 0x1d, 0x34, 0x29, 0x6a, 0xd9, 0x35,
+                         0x38, 0xed, 0x86, 0x9e, 0x99, 0x20, 0x43, 0xc3,
+                         0xeb, 0xad, 0x65, 0x50, 0xa0, 0x11, 0x6e, 0x5d};
+
+  uint8_t hash[] = { 0xde, 0xa5, 0x66, 0xb6, 0x94, 0x3b, 0xe0, 0xe9,
+                          0x62, 0x53, 0xc2, 0x21, 0x5b, 0x1b, 0xac, 0x69,
+                          0xe7, 0xa8, 0x1e, 0xdb, 0x41, 0xc5, 0x02, 0x8b,
+                          0x4f, 0x5c, 0x45, 0xc5, 0x3b, 0x49, 0x54, 0xd0};
+  uint8_t signature[] = { 0x97, 0xa4, 0xee, 0x31, 0xfe, 0x82, 0x65, 0x72,
+                          0x9f, 0x4a, 0xa6, 0x7d, 0x24, 0xd4, 0xa7, 0x27,
+                          0xf8, 0xc3, 0x15, 0xa4, 0xc8, 0xf9, 0x80, 0xeb,
+                          0x4c, 0x4d, 0x4a, 0xfa, 0x6e, 0xc9, 0x42, 0x41,
+                          0x5d, 0x10, 0xd9, 0xc2, 0x8a, 0x90, 0xe9, 0x92,
+                          0x9c, 0x52, 0x4b, 0x2c, 0xfb, 0x65, 0xdf, 0xbc,
+                          0xf6, 0x8c, 0xfd, 0x68, 0xdb, 0x17, 0xf9, 0x5d,
+                          0x23, 0x5f, 0x96, 0xd8, 0xf0, 0x72, 0x01, 0x2d};
+  uint64_t recovery_id = 1;
+
+  uint64_t result_code = sol_secp256k1_recover(hash, recovery_id, signature, result);
+
+  sol_assert(0 == result_code);
+  sol_assert(0 == sol_memcmp(result, expected, SHA256_RESULT_LENGTH));
+
+  return SUCCESS;
+}
diff --git a/programs/bpf/rust/128bit/Cargo.toml b/programs/bpf/rust/128bit/Cargo.toml
index bae158418d308f..eed97bf89d2c90 100644
--- 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.7.0"
+version = "1.7.11"
 description = "Solana BPF test program written in Rust"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -10,8 +10,8 @@ documentation = "https://docs.rs/solana-bpf-rust-128bit"
 edition = "2018"
 
 [dependencies]
-solana-program = { path = "../../../../sdk/program", version = "=1.7.0" }
-solana-bpf-rust-128bit-dep = { path = "../128bit_dep", version = "=1.7.0" }
+solana-program = { path = "../../../../sdk/program", version = "=1.7.11" }
+solana-bpf-rust-128bit-dep = { path = "../128bit_dep", version = "=1.7.11" }
 
 [lib]
 crate-type = ["cdylib"]
diff --git a/programs/bpf/rust/128bit_dep/Cargo.toml b/programs/bpf/rust/128bit_dep/Cargo.toml
index ba33bc4f652d05..5a0a0aa36c4480 100644
--- 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.7.0"
+version = "1.7.11"
 description = "Solana BPF test program written in Rust"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -10,7 +10,7 @@ documentation = "https://docs.rs/solana-bpf-rust-128bit-dep"
 edition = "2018"
 
 [dependencies]
-solana-program = { path = "../../../../sdk/program", version = "=1.7.0" }
+solana-program = { path = "../../../../sdk/program", version = "=1.7.11" }
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
diff --git a/programs/bpf/rust/alloc/Cargo.toml b/programs/bpf/rust/alloc/Cargo.toml
index b0f250134f35b5..c6801acc69c5dd 100644
--- 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.7.0"
+version = "1.7.11"
 description = "Solana BPF test program written in Rust"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -10,7 +10,7 @@ documentation = "https://docs.rs/solana-bpf-rust-alloc"
 edition = "2018"
 
 [dependencies]
-solana-program = { path = "../../../../sdk/program", version = "=1.7.0" }
+solana-program = { path = "../../../../sdk/program", version = "=1.7.11" }
 
 [lib]
 crate-type = ["cdylib"]
diff --git a/programs/bpf/rust/call_depth/Cargo.toml b/programs/bpf/rust/call_depth/Cargo.toml
index 5dea404fabe6dc..fded0b3c78edb6 100644
--- 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.7.0"
+version = "1.7.11"
 description = "Solana BPF test program written in Rust"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -10,7 +10,7 @@ documentation = "https://docs.rs/solana-bpf-rust-call-depth"
 edition = "2018"
 
 [dependencies]
-solana-program = { path = "../../../../sdk/program", version = "=1.7.0" }
+solana-program = { path = "../../../../sdk/program", version = "=1.7.11" }
 
 [lib]
 crate-type = ["cdylib"]
diff --git a/programs/bpf/rust/caller_access/Cargo.toml b/programs/bpf/rust/caller_access/Cargo.toml
index 47473a24c88787..1291eb7897911c 100644
--- 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.7.0"
+version = "1.7.11"
 description = "Solana BPF test program written in Rust"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -10,7 +10,7 @@ documentation = "https://docs.rs/solana-bpf-rust-caller-access"
 edition = "2018"
 
 [dependencies]
-solana-program = { path = "../../../../sdk/program", version = "=1.7.0" }
+solana-program = { path = "../../../../sdk/program", version = "=1.7.11" }
 
 [lib]
 crate-type = ["cdylib"]
diff --git a/programs/bpf/rust/caller_access/src/lib.rs b/programs/bpf/rust/caller_access/src/lib.rs
index 6db20e433aeb54..abceb6dda24bbd 100644
--- a/programs/bpf/rust/caller_access/src/lib.rs
+++ b/programs/bpf/rust/caller_access/src/lib.rs
@@ -21,16 +21,8 @@ fn process_instruction(
         let mut lamports = accounts[0].lamports();
         let owner = &accounts[0].owner;
         let mut data = accounts[0].try_borrow_mut_data()?;
-        let account = AccountInfo::new(
-            &key,
-            false,
-            false,
-            &mut lamports,
-            &mut data,
-            &owner,
-            true,
-            0,
-        );
+        let account =
+            AccountInfo::new(&key, false, false, &mut lamports, &mut data, owner, true, 0);
         msg!("{:?} calling {:?}", program_id, key);
         invoke(&ix, &[account])?;
     } else {
diff --git a/programs/bpf/rust/custom_heap/Cargo.toml b/programs/bpf/rust/custom_heap/Cargo.toml
index 6c925232b32190..3a7d9198ce30f7 100644
--- 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.7.0"
+version = "1.7.11"
 description = "Solana BPF test program written in Rust"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -10,7 +10,7 @@ documentation = "https://docs.rs/solana-bpf-rust-custom-heap"
 edition = "2018"
 
 [dependencies]
-solana-program = { path = "../../../../sdk/program", version = "=1.7.0" }
+solana-program = { path = "../../../../sdk/program", version = "=1.7.11" }
 
 [features]
 default = ["custom-heap"]
diff --git a/programs/bpf/rust/dep_crate/Cargo.toml b/programs/bpf/rust/dep_crate/Cargo.toml
index be2fd397f9b785..c9d219d930df40 100644
--- 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.7.0"
+version = "1.7.11"
 description = "Solana BPF test program written in Rust"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -11,7 +11,7 @@ edition = "2018"
 
 [dependencies]
 byteorder = { version = "1", default-features = false }
-solana-program = { path = "../../../../sdk/program", version = "=1.7.0" }
+solana-program = { path = "../../../../sdk/program", version = "=1.7.11" }
 
 [lib]
 crate-type = ["cdylib"]
diff --git a/programs/bpf/rust/deprecated_loader/Cargo.toml b/programs/bpf/rust/deprecated_loader/Cargo.toml
index 7fb1583673f472..60b828d3a8e060 100644
--- 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.7.0"
+version = "1.7.11"
 description = "Solana BPF test program written in Rust"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -10,7 +10,7 @@ documentation = "https://docs.rs/solana-bpf-rust-deprecated-loader"
 edition = "2018"
 
 [dependencies]
-solana-program = { path = "../../../../sdk/program", version = "=1.7.0" }
+solana-program = { path = "../../../../sdk/program", version = "=1.7.11" }
 
 [lib]
 crate-type = ["cdylib"]
diff --git a/programs/bpf/rust/dup_accounts/Cargo.toml b/programs/bpf/rust/dup_accounts/Cargo.toml
index 83956e52246dfd..3c1328aff487d0 100644
--- 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.7.0"
+version = "1.7.11"
 description = "Solana BPF test program written in Rust"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -10,7 +10,7 @@ documentation = "https://docs.rs/solana-bpf-rust-dup-accounts"
 edition = "2018"
 
 [dependencies]
-solana-program = { path = "../../../../sdk/program", version = "=1.7.0" }
+solana-program = { path = "../../../../sdk/program", version = "=1.7.11" }
 
 [lib]
 crate-type = ["cdylib"]
diff --git a/programs/bpf/rust/dup_accounts/src/lib.rs b/programs/bpf/rust/dup_accounts/src/lib.rs
index 25c1f8bd26aba5..33b55b5ee2ed6c 100644
--- a/programs/bpf/rust/dup_accounts/src/lib.rs
+++ b/programs/bpf/rust/dup_accounts/src/lib.rs
@@ -71,7 +71,7 @@ fn process_instruction(
                         AccountMeta::new_readonly(*accounts[3].key, true),
                     ],
                 );
-                invoke(&instruction, &accounts)?;
+                invoke(&instruction, accounts)?;
 
                 let instruction = Instruction::new_with_bytes(
                     *program_id,
@@ -83,7 +83,7 @@ fn process_instruction(
                         AccountMeta::new(*accounts[3].key, false),
                     ],
                 );
-                invoke(&instruction, &accounts)?;
+                invoke(&instruction, accounts)?;
                 assert_eq!(accounts[2].try_borrow_mut_data()?[0], 3);
                 assert_eq!(accounts[3].try_borrow_mut_data()?[0], 3);
             }
diff --git a/programs/bpf/rust/error_handling/Cargo.toml b/programs/bpf/rust/error_handling/Cargo.toml
index 45ae609cf606a5..a9ba80f62c12a3 100644
--- 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.7.0"
+version = "1.7.11"
 description = "Solana BPF test program written in Rust"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -12,7 +12,7 @@ edition = "2018"
 [dependencies]
 num-derive = "0.2"
 num-traits = "0.2"
-solana-program = { path = "../../../../sdk/program", version = "=1.7.0" }
+solana-program = { path = "../../../../sdk/program", version = "=1.7.11" }
 thiserror = "1.0"
 
 [lib]
diff --git a/programs/bpf/rust/external_spend/Cargo.toml b/programs/bpf/rust/external_spend/Cargo.toml
index 3edb267e0b8a0a..5598fb4da38cac 100644
--- 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.7.0"
+version = "1.7.11"
 description = "Solana BPF test program written in Rust"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -10,7 +10,7 @@ documentation = "https://docs.rs/solana-bpf-rust-external-spend"
 edition = "2018"
 
 [dependencies]
-solana-program = { path = "../../../../sdk/program", version = "=1.7.0" }
+solana-program = { path = "../../../../sdk/program", version = "=1.7.11" }
 
 [lib]
 crate-type = ["cdylib"]
diff --git a/programs/bpf/rust/finalize/Cargo.toml b/programs/bpf/rust/finalize/Cargo.toml
index 246dbac84f7770..1056f93ec3d9ac 100644
--- 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.7.0"
+version = "1.7.11"
 description = "Solana BPF test program written in Rust"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -10,7 +10,7 @@ documentation = "https://docs.rs/solana-bpf-rust-finalize"
 edition = "2018"
 
 [dependencies]
-solana-program = { path = "../../../../sdk/program", version = "=1.7.0" }
+solana-program = { path = "../../../../sdk/program", version = "=1.7.11" }
 
 [lib]
 crate-type = ["cdylib"]
diff --git a/programs/bpf/rust/instruction_introspection/Cargo.toml b/programs/bpf/rust/instruction_introspection/Cargo.toml
index c4ef4dec61efea..4905b38df1bffb 100644
--- 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.7.0"
+version = "1.7.11"
 description = "Solana BPF test program written in Rust"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -10,7 +10,7 @@ documentation = "https://docs.rs/solana-bpf-rust-instruction-introspection"
 edition = "2018"
 
 [dependencies]
-solana-program = { path = "../../../../sdk/program", version = "=1.7.0" }
+solana-program = { path = "../../../../sdk/program", version = "=1.7.11" }
 
 [lib]
 crate-type = ["cdylib"]
diff --git a/programs/bpf/rust/invoke/Cargo.toml b/programs/bpf/rust/invoke/Cargo.toml
index d9637269ae122e..283537311a158d 100644
--- 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.7.0"
+version = "1.7.11"
 description = "Solana BPF test program written in Rust"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -11,7 +11,7 @@ edition = "2018"
 
 [dependencies]
 solana-bpf-rust-invoked = { path = "../invoked", default-features = false }
-solana-program = { path = "../../../../sdk/program", version = "=1.7.0" }
+solana-program = { path = "../../../../sdk/program", version = "=1.7.11" }
 
 [lib]
 crate-type = ["cdylib"]
diff --git a/programs/bpf/rust/invoke/src/lib.rs b/programs/bpf/rust/invoke/src/lib.rs
index e0889766eeb699..dec99fd88eed57 100644
--- a/programs/bpf/rust/invoke/src/lib.rs
+++ b/programs/bpf/rust/invoke/src/lib.rs
@@ -29,19 +29,56 @@ const TEST_INSTRUCTION_META_TOO_LARGE: u8 = 10;
 const TEST_RETURN_ERROR: u8 = 11;
 const TEST_PRIVILEGE_DEESCALATION_ESCALATION_SIGNER: u8 = 12;
 const TEST_PRIVILEGE_DEESCALATION_ESCALATION_WRITABLE: u8 = 13;
+const TEST_WRITABLE_DEESCALATION_WRITABLE: u8 = 14;
+const TEST_NESTED_INVOKE_TOO_DEEP: u8 = 15;
+const TEST_EXECUTABLE_LAMPORTS: u8 = 16;
+const ADD_LAMPORTS: u8 = 17;
 
-// const MINT_INDEX: usize = 0;
+// const MINT_INDEX: usize = 0; // unused placeholder
 const ARGUMENT_INDEX: usize = 1;
 const INVOKED_PROGRAM_INDEX: usize = 2;
 const INVOKED_ARGUMENT_INDEX: usize = 3;
 const INVOKED_PROGRAM_DUP_INDEX: usize = 4;
-// const ARGUMENT_DUP_INDEX: usize = 5;
+// const ARGUMENT_DUP_INDEX: usize = 5; unused placeholder
 const DERIVED_KEY1_INDEX: usize = 6;
 const DERIVED_KEY2_INDEX: usize = 7;
 const DERIVED_KEY3_INDEX: usize = 8;
 const SYSTEM_PROGRAM_INDEX: usize = 9;
 const FROM_INDEX: usize = 10;
 
+fn do_nested_invokes(num_nested_invokes: u64, accounts: &[AccountInfo]) -> ProgramResult {
+    assert!(accounts[ARGUMENT_INDEX].is_signer);
+
+    let pre_argument_lamports = accounts[ARGUMENT_INDEX].lamports();
+    let pre_invoke_argument_lamports = accounts[INVOKED_ARGUMENT_INDEX].lamports();
+    **accounts[ARGUMENT_INDEX].lamports.borrow_mut() -= 5;
+    **accounts[INVOKED_ARGUMENT_INDEX].lamports.borrow_mut() += 5;
+
+    msg!("First invoke");
+    let instruction = create_instruction(
+        *accounts[INVOKED_PROGRAM_INDEX].key,
+        &[
+            (accounts[ARGUMENT_INDEX].key, true, true),
+            (accounts[INVOKED_ARGUMENT_INDEX].key, true, true),
+            (accounts[INVOKED_PROGRAM_INDEX].key, false, false),
+        ],
+        vec![NESTED_INVOKE, num_nested_invokes as u8],
+    );
+    invoke(&instruction, accounts)?;
+    msg!("2nd invoke from first program");
+    invoke(&instruction, accounts)?;
+
+    assert_eq!(
+        accounts[ARGUMENT_INDEX].lamports(),
+        pre_argument_lamports - 5 + (2 * num_nested_invokes)
+    );
+    assert_eq!(
+        accounts[INVOKED_ARGUMENT_INDEX].lamports(),
+        pre_invoke_argument_lamports + 5 - (2 * num_nested_invokes)
+    );
+    Ok(())
+}
+
 entrypoint!(process_instruction);
 fn process_instruction(
     program_id: &Pubkey,
@@ -226,8 +263,10 @@ fn process_instruction(
                     )?,
                     accounts[DERIVED_KEY1_INDEX].key
                 );
+                let not_native_program_id = Pubkey::new_from_array([6u8; 32]);
+                assert!(!not_native_program_id.is_native_program_id());
                 assert_eq!(
-                    Pubkey::create_program_address(&[b"You pass butter"], &Pubkey::default())
+                    Pubkey::create_program_address(&[b"You pass butter"], &not_native_program_id)
                         .unwrap_err(),
                     PubkeyError::InvalidSeeds
                 );
@@ -239,8 +278,10 @@ fn process_instruction(
                     Pubkey::try_find_program_address(&[b"You pass butter"], program_id).unwrap();
                 assert_eq!(&address, accounts[DERIVED_KEY1_INDEX].key);
                 assert_eq!(bump_seed, bump_seed1);
+                let not_native_program_id = Pubkey::new_from_array([6u8; 32]);
+                assert!(!not_native_program_id.is_native_program_id());
                 assert_eq!(
-                    Pubkey::create_program_address(&[b"You pass butter"], &Pubkey::default())
+                    Pubkey::create_program_address(&[b"You pass butter"], &not_native_program_id)
                         .unwrap_err(),
                     PubkeyError::InvalidSeeds
                 );
@@ -281,31 +322,7 @@ fn process_instruction(
 
             msg!("Test nested invoke");
             {
-                assert!(accounts[ARGUMENT_INDEX].is_signer);
-
-                **accounts[ARGUMENT_INDEX].lamports.borrow_mut() -= 5;
-                **accounts[INVOKED_ARGUMENT_INDEX].lamports.borrow_mut() += 5;
-
-                msg!("First invoke");
-                let instruction = create_instruction(
-                    *accounts[INVOKED_PROGRAM_INDEX].key,
-                    &[
-                        (accounts[ARGUMENT_INDEX].key, true, true),
-                        (accounts[INVOKED_ARGUMENT_INDEX].key, true, true),
-                        (accounts[INVOKED_PROGRAM_DUP_INDEX].key, false, false),
-                        (accounts[INVOKED_PROGRAM_DUP_INDEX].key, false, false),
-                    ],
-                    vec![NESTED_INVOKE],
-                );
-                invoke(&instruction, accounts)?;
-                msg!("2nd invoke from first program");
-                invoke(&instruction, accounts)?;
-
-                assert_eq!(accounts[ARGUMENT_INDEX].lamports(), 42 - 5 + 1 + 1 + 1 + 1);
-                assert_eq!(
-                    accounts[INVOKED_ARGUMENT_INDEX].lamports(),
-                    10 + 5 - 1 - 1 - 1 - 1
-                );
+                do_nested_invokes(4, accounts)?;
             }
 
             msg!("Test privilege deescalation");
@@ -354,27 +371,6 @@ fn process_instruction(
                 }
             }
 
-            msg!("Test writable deescalation");
-            {
-                const NUM_BYTES: usize = 10;
-                let mut buffer = [0; NUM_BYTES];
-                buffer.copy_from_slice(
-                    &accounts[INVOKED_ARGUMENT_INDEX].data.borrow_mut()[..NUM_BYTES],
-                );
-
-                let instruction = create_instruction(
-                    *accounts[INVOKED_PROGRAM_INDEX].key,
-                    &[(accounts[INVOKED_ARGUMENT_INDEX].key, false, false)],
-                    vec![WRITE_ACCOUNT, NUM_BYTES as u8],
-                );
-                let _ = invoke(&instruction, accounts);
-
-                assert_eq!(
-                    buffer,
-                    accounts[INVOKED_ARGUMENT_INDEX].data.borrow_mut()[..NUM_BYTES]
-                );
-            }
-
             msg!("Create account and init data");
             {
                 let from_lamports = accounts[FROM_INDEX].lamports();
@@ -603,6 +599,55 @@ fn process_instruction(
             );
             invoke(&invoked_instruction, accounts)?;
         }
+        TEST_WRITABLE_DEESCALATION_WRITABLE => {
+            msg!("Test writable deescalation writable");
+            const NUM_BYTES: usize = 10;
+            let mut buffer = [0; NUM_BYTES];
+            buffer
+                .copy_from_slice(&accounts[INVOKED_ARGUMENT_INDEX].data.borrow_mut()[..NUM_BYTES]);
+
+            let instruction = create_instruction(
+                *accounts[INVOKED_PROGRAM_INDEX].key,
+                &[(accounts[INVOKED_ARGUMENT_INDEX].key, false, false)],
+                vec![WRITE_ACCOUNT, NUM_BYTES as u8],
+            );
+            let _ = invoke(&instruction, accounts);
+
+            assert_eq!(
+                buffer,
+                accounts[INVOKED_ARGUMENT_INDEX].data.borrow_mut()[..NUM_BYTES]
+            );
+        }
+        TEST_NESTED_INVOKE_TOO_DEEP => {
+            let _ = do_nested_invokes(5, accounts);
+        }
+        TEST_EXECUTABLE_LAMPORTS => {
+            msg!("Test executable lamports");
+            let mut accounts = accounts.to_vec();
+
+            // set account to executable and subtract lamports
+            accounts[ARGUMENT_INDEX].executable = true;
+            **(*accounts[ARGUMENT_INDEX].lamports).borrow_mut() -= 1;
+            // add lamports to dest account
+            **(*accounts[DERIVED_KEY1_INDEX].lamports).borrow_mut() += 1;
+
+            let instruction = create_instruction(
+                *program_id,
+                &[
+                    (accounts[ARGUMENT_INDEX].key, true, false),
+                    (accounts[DERIVED_KEY1_INDEX].key, true, false),
+                ],
+                vec![ADD_LAMPORTS, 0, 0, 0],
+            );
+            let _ = invoke(&instruction, &accounts);
+
+            // reset executable account
+            **(*accounts[ARGUMENT_INDEX].lamports).borrow_mut() += 1;
+        }
+        ADD_LAMPORTS => {
+            // make sure the total balance is fine
+            **accounts[0].lamports.borrow_mut() += 1;
+        }
         _ => panic!(),
     }
 
diff --git a/programs/bpf/rust/invoke_and_error/Cargo.toml b/programs/bpf/rust/invoke_and_error/Cargo.toml
index 8bdf4e1142b985..1220d7b75ad4f2 100644
--- 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.7.0"
+version = "1.7.11"
 description = "Solana BPF test program written in Rust"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -10,7 +10,7 @@ documentation = "https://docs.rs/solana-bpf-rust-invoke-and-error"
 edition = "2018"
 
 [dependencies]
-solana-program = { path = "../../../../sdk/program", version = "=1.7.0" }
+solana-program = { path = "../../../../sdk/program", version = "=1.7.11" }
 
 [lib]
 crate-type = ["cdylib"]
diff --git a/programs/bpf/rust/invoke_and_error/src/lib.rs b/programs/bpf/rust/invoke_and_error/src/lib.rs
index 25012107514ab9..6b94e82ca0981e 100644
--- a/programs/bpf/rust/invoke_and_error/src/lib.rs
+++ b/programs/bpf/rust/invoke_and_error/src/lib.rs
@@ -26,7 +26,7 @@ fn process_instruction(
         data: instruction_data.to_owned(),
         program_id: *to_call,
     };
-    let _ = invoke(&instruction, &infos);
+    let _ = invoke(&instruction, infos);
 
     Err(42.into())
 }
diff --git a/programs/bpf/rust/invoke_and_ok/Cargo.toml b/programs/bpf/rust/invoke_and_ok/Cargo.toml
index 54bf58054735a4..374e6a3d8bf691 100644
--- 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.7.0"
+version = "1.7.11"
 description = "Solana BPF test program written in Rust"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -10,7 +10,7 @@ documentation = "https://docs.rs/solana-bpf-rust-invoke-and-ok"
 edition = "2018"
 
 [dependencies]
-solana-program = { path = "../../../../sdk/program", version = "=1.7.0" }
+solana-program = { path = "../../../../sdk/program", version = "=1.7.11" }
 
 [lib]
 crate-type = ["cdylib"]
diff --git a/programs/bpf/rust/invoke_and_ok/src/lib.rs b/programs/bpf/rust/invoke_and_ok/src/lib.rs
index 99e58f7d9ad66d..06a47ae5ec5371 100644
--- a/programs/bpf/rust/invoke_and_ok/src/lib.rs
+++ b/programs/bpf/rust/invoke_and_ok/src/lib.rs
@@ -27,7 +27,7 @@ fn process_instruction(
         data: instruction_data.to_owned(),
         program_id: *to_call,
     };
-    let _ = invoke(&instruction, &infos);
+    let _ = invoke(&instruction, infos);
 
     Ok(())
 }
diff --git a/programs/bpf/rust/invoke_and_return/Cargo.toml b/programs/bpf/rust/invoke_and_return/Cargo.toml
index 1cb4046ca4566e..b1c4ae4198b7cd 100644
--- 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.7.0"
+version = "1.7.11"
 description = "Solana BPF test program written in Rust"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -10,7 +10,7 @@ documentation = "https://docs.rs/solana-bpf-rust-invoke-and-return"
 edition = "2018"
 
 [dependencies]
-solana-program = { path = "../../../../sdk/program", version = "=1.7.0" }
+solana-program = { path = "../../../../sdk/program", version = "=1.7.11" }
 
 [lib]
 crate-type = ["cdylib"]
diff --git a/programs/bpf/rust/invoke_and_return/src/lib.rs b/programs/bpf/rust/invoke_and_return/src/lib.rs
index 5698103f11c1e5..924fd40a84fe40 100644
--- a/programs/bpf/rust/invoke_and_return/src/lib.rs
+++ b/programs/bpf/rust/invoke_and_return/src/lib.rs
@@ -27,5 +27,5 @@ fn process_instruction(
         data: instruction_data.to_owned(),
         program_id: *to_call,
     };
-    invoke(&instruction, &infos)
+    invoke(&instruction, infos)
 }
diff --git a/programs/bpf/rust/invoked/Cargo.toml b/programs/bpf/rust/invoked/Cargo.toml
index c311efcbf50b2b..0b8cd37e9ab6e1 100644
--- 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.7.0"
+version = "1.7.11"
 description = "Solana BPF test program written in Rust"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -10,7 +10,7 @@ documentation = "https://docs.rs/solana-bpf-rust-invoked"
 edition = "2018"
 
 [dependencies]
-solana-program = { path = "../../../../sdk/program", version = "=1.7.0" }
+solana-program = { path = "../../../../sdk/program", version = "=1.7.11" }
 
 [features]
 default = ["program"]
diff --git a/programs/bpf/rust/invoked/src/processor.rs b/programs/bpf/rust/invoked/src/processor.rs
index 062ca26c56e3a8..892ba90e631235 100644
--- a/programs/bpf/rust/invoked/src/processor.rs
+++ b/programs/bpf/rust/invoked/src/processor.rs
@@ -202,21 +202,24 @@ fn process_instruction(
             msg!("nested invoke");
             const ARGUMENT_INDEX: usize = 0;
             const INVOKED_ARGUMENT_INDEX: usize = 1;
-            const INVOKED_PROGRAM_INDEX: usize = 3;
+            const INVOKED_PROGRAM_INDEX: usize = 2;
 
             assert!(accounts[INVOKED_ARGUMENT_INDEX].is_signer);
+            assert!(instruction_data.len() > 1);
 
             **accounts[INVOKED_ARGUMENT_INDEX].lamports.borrow_mut() -= 1;
             **accounts[ARGUMENT_INDEX].lamports.borrow_mut() += 1;
-            if accounts.len() > 2 {
+            let remaining_invokes = instruction_data[1];
+            if remaining_invokes > 1 {
                 msg!("Invoke again");
                 let invoked_instruction = create_instruction(
                     *accounts[INVOKED_PROGRAM_INDEX].key,
                     &[
                         (accounts[ARGUMENT_INDEX].key, true, true),
                         (accounts[INVOKED_ARGUMENT_INDEX].key, true, true),
+                        (accounts[INVOKED_PROGRAM_INDEX].key, false, false),
                     ],
-                    vec![NESTED_INVOKE],
+                    vec![NESTED_INVOKE, remaining_invokes - 1],
                 );
                 invoke(&invoked_instruction, accounts)?;
             } else {
diff --git a/programs/bpf/rust/iter/Cargo.toml b/programs/bpf/rust/iter/Cargo.toml
index bfe39cd9b52a9c..1d52eebd055464 100644
--- 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.7.0"
+version = "1.7.11"
 description = "Solana BPF test program written in Rust"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -10,7 +10,7 @@ documentation = "https://docs.rs/solana-bpf-rust-iter"
 edition = "2018"
 
 [dependencies]
-solana-program = { path = "../../../../sdk/program", version = "=1.7.0" }
+solana-program = { path = "../../../../sdk/program", version = "=1.7.11" }
 
 [lib]
 crate-type = ["cdylib"]
diff --git a/programs/bpf/rust/many_args/Cargo.toml b/programs/bpf/rust/many_args/Cargo.toml
index 52eb398e3bdfb9..82c02404456356 100644
--- 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.7.0"
+version = "1.7.11"
 description = "Solana BPF test program written in Rust"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -10,8 +10,8 @@ documentation = "https://docs.rs/solana-bpf-rust-many-args"
 edition = "2018"
 
 [dependencies]
-solana-program = { path = "../../../../sdk/program", version = "=1.7.0" }
-solana-bpf-rust-many-args-dep = { path = "../many_args_dep", version = "=1.7.0" }
+solana-program = { path = "../../../../sdk/program", version = "=1.7.11" }
+solana-bpf-rust-many-args-dep = { path = "../many_args_dep", version = "=1.7.11" }
 
 [lib]
 crate-type = ["cdylib"]
diff --git a/programs/bpf/rust/many_args_dep/Cargo.toml b/programs/bpf/rust/many_args_dep/Cargo.toml
index 9992955485d5c2..1424ad9a7375c9 100644
--- 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.7.0"
+version = "1.7.11"
 description = "Solana BPF test program written in Rust"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -10,7 +10,7 @@ documentation = "https://docs.rs/solana-bpf-rust-many-args-dep"
 edition = "2018"
 
 [dependencies]
-solana-program = { path = "../../../../sdk/program", version = "=1.7.0" }
+solana-program = { path = "../../../../sdk/program", version = "=1.7.11" }
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
diff --git a/programs/bpf/rust/mem/Cargo.toml b/programs/bpf/rust/mem/Cargo.toml
index f3d15b6e741952..0810a4981cbd54 100644
--- 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.7.0"
+version = "1.7.11"
 description = "Solana BPF test program written in Rust"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -9,11 +9,18 @@ homepage = "https://solana.com/"
 documentation = "https://docs.rs/solana-bpf-rust-mem"
 edition = "2018"
 
+[features]
+no-entrypoint = []
+
 [dependencies]
-solana-program = { path = "../../../../sdk/program", version = "=1.7.0" }
+solana-program = { path = "../../../../sdk/program", version = "=1.7.11" }
+
+[dev-dependencies]
+solana-program-test = { path = "../../../../program-test", version = "=1.7.11" }
+solana-sdk = { path = "../../../../sdk", version = "=1.7.11" }
 
 [lib]
-crate-type = ["cdylib"]
+crate-type = ["cdylib", "lib"]
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
diff --git a/programs/bpf/rust/mem/src/entrypoint.rs b/programs/bpf/rust/mem/src/entrypoint.rs
new file mode 100644
index 00000000000000..65d25ef8f2fd7a
--- /dev/null
+++ b/programs/bpf/rust/mem/src/entrypoint.rs
@@ -0,0 +1,39 @@
+//! @brief Test mem functions
+
+use crate::{run_mem_tests, MemOps};
+use solana_program::{
+    account_info::AccountInfo,
+    entrypoint,
+    entrypoint::ProgramResult,
+    program_memory::{sol_memcmp, sol_memcpy, sol_memmove, sol_memset},
+    pubkey::Pubkey,
+};
+
+entrypoint!(process_instruction);
+#[allow(clippy::unnecessary_wraps)]
+pub fn process_instruction(
+    _program_id: &Pubkey,
+    _accounts: &[AccountInfo],
+    _instruction_data: &[u8],
+) -> ProgramResult {
+    // Via syscalls
+    #[derive(Default)]
+    struct MemOpSyscalls();
+    impl MemOps for MemOpSyscalls {
+        fn memcpy(&self, dst: &mut [u8], src: &[u8], n: usize) {
+            sol_memcpy(dst, src, n)
+        }
+        unsafe fn memmove(&self, dst: *mut u8, src: *mut u8, n: usize) {
+            sol_memmove(dst, src, n)
+        }
+        fn memset(&self, s: &mut [u8], c: u8, n: usize) {
+            sol_memset(s, c, n)
+        }
+        fn memcmp(&self, s1: &[u8], s2: &[u8], n: usize) -> i32 {
+            sol_memcmp(s1, s2, n)
+        }
+    }
+    run_mem_tests(MemOpSyscalls::default());
+
+    Ok(())
+}
diff --git a/programs/bpf/rust/mem/src/lib.rs b/programs/bpf/rust/mem/src/lib.rs
index 3817010ad2c64c..91a98a208c86bc 100644
--- a/programs/bpf/rust/mem/src/lib.rs
+++ b/programs/bpf/rust/mem/src/lib.rs
@@ -1,190 +1,165 @@
-//! @brief Test builtin mem functions
+//! @brief Test mem functions
 
-#![cfg(target_arch = "bpf")]
-#![feature(rustc_private)]
+#[cfg(not(feature = "no-entrypoint"))]
+pub mod entrypoint;
 
-extern crate compiler_builtins;
-use solana_program::{custom_panic_default, entrypoint::SUCCESS};
+pub trait MemOps {
+    fn memcpy(&self, dst: &mut [u8], src: &[u8], n: usize);
+    /// # Safety
+    unsafe fn memmove(&self, dst: *mut u8, src: *mut u8, n: usize);
+    fn memset(&self, s: &mut [u8], c: u8, n: usize);
+    fn memcmp(&self, s1: &[u8], s2: &[u8], n: usize) -> i32;
+}
 
-#[no_mangle]
-pub extern "C" fn entrypoint(_input: *mut u8) -> u64 {
-    unsafe {
-        // memcpy
-        let src = &mut [1_u8; 18];
-        let dst = &mut [0_u8; 1];
-        compiler_builtins::mem::memcpy(&mut src[0] as *mut u8, &mut dst[0] as *mut u8, 1);
-        assert_eq!(&src[..1], dst);
-        let dst = &mut [0_u8; 3];
-        compiler_builtins::mem::memcpy(&mut src[0] as *mut u8, &mut dst[0] as *mut u8, 3);
-        assert_eq!(&src[..3], dst);
-        let dst = &mut [0_u8; 8];
-        compiler_builtins::mem::memcpy(&mut src[0] as *mut u8, &mut dst[0] as *mut u8, 8);
-        assert_eq!(&src[..8], dst);
-        let dst = &mut [0_u8; 9];
-        compiler_builtins::mem::memcpy(&mut src[0] as *mut u8, &mut dst[0] as *mut u8, 9);
-        assert_eq!(&src[..9], dst);
-        let dst = &mut [0_u8; 16];
-        compiler_builtins::mem::memcpy(&mut src[0] as *mut u8, &mut dst[0] as *mut u8, 16);
-        assert_eq!(&src[..16], dst);
-        let dst = &mut [0_u8; 18];
-        compiler_builtins::mem::memcpy(&mut src[0] as *mut u8, &mut dst[0] as *mut u8, 18);
-        assert_eq!(&src[..18], dst);
-        let dst = &mut [0_u8; 18];
-        compiler_builtins::mem::memcpy(&mut src[1] as *mut u8, &mut dst[0] as *mut u8, 17);
-        assert_eq!(&src[1..], &dst[1..]);
-        let dst = &mut [0_u8; 18];
-        compiler_builtins::mem::memcpy(&mut src[1] as *mut u8, &mut dst[1] as *mut u8, 17);
-        assert_eq!(&src[1..], &dst[..17]);
+pub fn run_mem_tests<T: MemOps>(mem_ops: T) {
+    // memcpy
+    let src = &[1_u8; 18];
+    let dst = &mut [0_u8; 1];
+    mem_ops.memcpy(dst, src, 1);
+    assert_eq!(&src[..1], dst);
+    let dst = &mut [0_u8; 3];
+    mem_ops.memcpy(dst, src, 3);
+    assert_eq!(&src[..3], dst);
+    let dst = &mut [0_u8; 8];
+    mem_ops.memcpy(dst, src, 8);
+    assert_eq!(&src[..8], dst);
+    let dst = &mut [0_u8; 9];
+    mem_ops.memcpy(dst, src, 9);
+    assert_eq!(&src[..9], dst);
+    let dst = &mut [0_u8; 16];
+    mem_ops.memcpy(dst, src, 16);
+    assert_eq!(&src[..16], dst);
+    let dst = &mut [0_u8; 18];
+    mem_ops.memcpy(dst, src, 18);
+    assert_eq!(&src[..18], dst);
+    let dst = &mut [0_u8; 18];
+    mem_ops.memcpy(dst, &src[1..], 17);
+    assert_eq!(&src[1..], &dst[..17]);
+    let dst = &mut [0_u8; 18];
+    mem_ops.memcpy(&mut dst[1..], &src[1..], 17);
+    assert_eq!(&src[1..], &dst[1..]);
 
-        // memmove
+    // memmove
+    unsafe {
         let buf = &mut [1_u8, 0];
-        compiler_builtins::mem::memmove(&mut buf[0] as *mut u8, &mut buf[1] as *mut u8, 1);
+        mem_ops.memmove(&mut buf[0] as *mut u8, &mut buf[1] as *mut u8, 1);
         assert_eq!(buf[0], buf[1]);
         let buf = &mut [1_u8, 0];
-        compiler_builtins::mem::memmove(&mut buf[1] as *mut u8, &mut buf[0] as *mut u8, 1);
+        mem_ops.memmove(&mut buf[1] as *mut u8, &mut buf[0] as *mut u8, 1);
         assert_eq!(buf[0], buf[1]);
         let buf = &mut [1_u8, 1, 1, 0, 0, 0];
-        compiler_builtins::mem::memmove(&mut buf[0] as *mut u8, &mut buf[3] as *mut u8, 3);
+        mem_ops.memmove(&mut buf[0] as *mut u8, &mut buf[3] as *mut u8, 3);
         assert_eq!(buf[..3], buf[3..]);
         let buf = &mut [1_u8, 1, 1, 0, 0, 0];
-        compiler_builtins::mem::memmove(&mut buf[3] as *mut u8, &mut buf[0] as *mut u8, 3);
+        mem_ops.memmove(&mut buf[3] as *mut u8, &mut buf[0] as *mut u8, 3);
         assert_eq!(buf[..3], buf[3..]);
         let buf = &mut [1_u8, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0];
-        compiler_builtins::mem::memmove(&mut buf[0] as *mut u8, &mut buf[8] as *mut u8, 8);
+        mem_ops.memmove(&mut buf[0] as *mut u8, &mut buf[8] as *mut u8, 8);
         assert_eq!(buf[..8], buf[8..]);
         let buf = &mut [1_u8, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0];
-        compiler_builtins::mem::memmove(&mut buf[8] as *mut u8, &mut buf[0] as *mut u8, 8);
+        mem_ops.memmove(&mut buf[8] as *mut u8, &mut buf[0] as *mut u8, 8);
         assert_eq!(buf[..8], buf[8..]);
         let buf = &mut [1_u8, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0];
-        compiler_builtins::mem::memmove(&mut buf[0] as *mut u8, &mut buf[9] as *mut u8, 9);
+        mem_ops.memmove(&mut buf[0] as *mut u8, &mut buf[9] as *mut u8, 9);
         assert_eq!(buf[..9], buf[9..]);
         let buf = &mut [0_u8, 1, 2, 3, 4, 5, 6, 7, 8, 9];
-        compiler_builtins::mem::memmove(&mut buf[1] as *mut u8, &mut buf[0] as *mut u8, 9);
+        mem_ops.memmove(&mut buf[1] as *mut u8, &mut buf[0] as *mut u8, 9);
         assert_eq!(&mut [0_u8, 0, 1, 2, 3, 4, 5, 6, 7, 8], buf);
         let buf = &mut [1_u8, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0];
-        compiler_builtins::mem::memmove(&mut buf[9] as *mut u8, &mut buf[0] as *mut u8, 9);
+        mem_ops.memmove(&mut buf[9] as *mut u8, &mut buf[0] as *mut u8, 9);
         assert_eq!(buf[..9], buf[9..]);
         let buf = &mut [
             1_u8, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
             0, 0, 0, 0,
         ];
-        compiler_builtins::mem::memmove(&mut buf[0] as *mut u8, &mut buf[16] as *mut u8, 16);
+        mem_ops.memmove(&mut buf[0] as *mut u8, &mut buf[16] as *mut u8, 16);
         assert_eq!(buf[..16], buf[16..]);
         let buf = &mut [
             1_u8, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
             0, 0, 0, 0,
         ];
-        compiler_builtins::mem::memmove(&mut buf[16] as *mut u8, &mut buf[0] as *mut u8, 16);
+        mem_ops.memmove(&mut buf[16] as *mut u8, &mut buf[0] as *mut u8, 16);
         assert_eq!(buf[..16], buf[16..]);
         let buf = &mut [
             1_u8, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
             0, 0, 0, 0, 0, 0, 0, 0,
         ];
-        compiler_builtins::mem::memmove(&mut buf[0] as *mut u8, &mut buf[18] as *mut u8, 18);
+        mem_ops.memmove(&mut buf[0] as *mut u8, &mut buf[18] as *mut u8, 18);
         assert_eq!(buf[..18], buf[18..]);
         let buf = &mut [
             1_u8, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
             0, 0, 0, 0, 0, 0, 0, 0,
         ];
-        compiler_builtins::mem::memmove(&mut buf[18] as *mut u8, &mut buf[0] as *mut u8, 18);
+        mem_ops.memmove(&mut buf[18] as *mut u8, &mut buf[0] as *mut u8, 18);
         assert_eq!(buf[..18], buf[18..]);
         let buf = &mut [
             1_u8, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
             0, 0, 0, 0, 0, 0, 0, 0,
         ];
-        compiler_builtins::mem::memmove(&mut buf[1] as *mut u8, &mut buf[18] as *mut u8, 17);
+        mem_ops.memmove(&mut buf[1] as *mut u8, &mut buf[18] as *mut u8, 17);
         assert_eq!(buf[1..17], buf[18..34]);
         let buf = &mut [
             1_u8, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
             0, 0, 0, 0, 0, 0, 0, 0,
         ];
-        compiler_builtins::mem::memmove(&mut buf[19] as *mut u8, &mut buf[1] as *mut u8, 17);
+        mem_ops.memmove(&mut buf[19] as *mut u8, &mut buf[1] as *mut u8, 17);
         assert_eq!(buf[..17], buf[19..]);
-
-        // memset
-        let exp = &[1_u8; 18];
-        let buf = &mut [0_u8; 18];
-        compiler_builtins::mem::memset(&mut buf[0] as *mut u8, 1, 1);
-        assert_eq!(exp[..1], buf[..1]);
-        compiler_builtins::mem::memset(&mut buf[0] as *mut u8, 1, 3);
-        assert_eq!(exp[..3], buf[..3]);
-        compiler_builtins::mem::memset(&mut buf[0] as *mut u8, 1, 8);
-        assert_eq!(exp[..8], buf[..8]);
-        compiler_builtins::mem::memset(&mut buf[0] as *mut u8, 1, 9);
-        assert_eq!(exp[..9], buf[..9]);
-        compiler_builtins::mem::memset(&mut buf[0] as *mut u8, 1, 16);
-        assert_eq!(exp[..16], buf[..16]);
-        compiler_builtins::mem::memset(&mut buf[0] as *mut u8, 1, 18);
-        assert_eq!(exp[..18], buf[..18]);
-        compiler_builtins::mem::memset(&mut buf[1] as *mut u8, 1, 17);
-        assert_eq!(exp[1..18], buf[1..18]);
-
-        // memcmp
-        assert_eq!(
-            -1,
-            compiler_builtins::mem::memcmp(&[0_u8] as *const u8, &[1_u8] as *const u8, 1)
-        );
-        assert_eq!(
-            -1,
-            compiler_builtins::mem::memcmp(
-                &[0_u8, 0, 0] as *const u8,
-                &[0_u8, 0, 1] as *const u8,
-                3
-            )
-        );
-        assert_eq!(
-            0,
-            compiler_builtins::mem::memcmp(
-                &[0_u8, 0, 0, 0, 0, 0, 0, 0, 0] as *const u8,
-                &[0_u8, 0, 0, 0, 0, 0, 0, 0, 0] as *const u8,
-                9
-            )
-        );
-        assert_eq!(
-            -1,
-            compiler_builtins::mem::memcmp(
-                &[0_u8, 0, 0, 0, 0, 0, 0, 0, 0] as *const u8,
-                &[0_u8, 0, 0, 0, 0, 0, 0, 0, 1] as *const u8,
-                9
-            )
-        );
-        assert_eq!(
-            -1,
-            compiler_builtins::mem::memcmp(
-                &[0_u8, 0, 0, 0, 0, 0, 0, 0, 0, 0] as *const u8,
-                &[0_u8, 0, 0, 0, 0, 0, 0, 0, 0, 1] as *const u8,
-                10
-            )
-        );
-        assert_eq!(
-            0,
-            compiler_builtins::mem::memcmp(&[0_u8; 8] as *const u8, &[0_u8; 8] as *const u8, 8)
-        );
-        assert_eq!(
-            -1,
-            compiler_builtins::mem::memcmp(&[0_u8; 8] as *const u8, &[1_u8; 8] as *const u8, 8)
-        );
-        assert_eq!(
-            -1,
-            compiler_builtins::mem::memcmp(&[0_u8; 16] as *const u8, &[1_u8; 16] as *const u8, 16)
-        );
-        assert_eq!(
-            -1,
-            compiler_builtins::mem::memcmp(&[0_u8; 18] as *const u8, &[1_u8; 18] as *const u8, 18)
-        );
-        let one = &[0_u8; 18];
-        let two = &[1_u8; 18];
-        assert_eq!(
-            -1,
-            compiler_builtins::mem::memcmp(&one[1] as *const u8, &two[0] as *const u8, 17)
-        );
-        assert_eq!(
-            -1,
-            compiler_builtins::mem::memcmp(&one[1] as *const u8, &two[1] as *const u8, 17)
-        );
+        let buf = &mut [0_u8, 0, 0, 1, 1, 1, 1, 1, 0];
+        mem_ops.memmove(&mut buf[0] as *mut u8, &mut buf[3] as *mut u8, 5);
+        assert_eq!(buf, &mut [1, 1, 1, 1, 1, 1, 1, 1, 0]);
     }
 
-    SUCCESS
-}
+    // memset
+    let exp = &[1_u8; 18];
+    let buf = &mut [0_u8; 18];
+    mem_ops.memset(&mut buf[0..], 1, 1);
+    assert_eq!(exp[..1], buf[..1]);
+    mem_ops.memset(&mut buf[0..], 1, 3);
+    assert_eq!(exp[..3], buf[..3]);
+    mem_ops.memset(&mut buf[0..], 1, 8);
+    assert_eq!(exp[..8], buf[..8]);
+    mem_ops.memset(&mut buf[0..], 1, 9);
+    assert_eq!(exp[..9], buf[..9]);
+    mem_ops.memset(&mut buf[0..], 1, 16);
+    assert_eq!(exp[..16], buf[..16]);
+    mem_ops.memset(&mut buf[0..], 1, 18);
+    assert_eq!(exp[..18], buf[..18]);
+    mem_ops.memset(&mut buf[1..], 1, 17);
+    assert_eq!(exp[1..18], buf[1..18]);
 
-custom_panic_default!();
+    // memcmp
+    assert_eq!(-1, mem_ops.memcmp(&[0_u8], &[1_u8], 1));
+    assert_eq!(-1, mem_ops.memcmp(&[0_u8, 0, 0], &[0_u8, 0, 1], 3));
+    assert_eq!(
+        0,
+        mem_ops.memcmp(
+            &[0_u8, 0, 0, 0, 0, 0, 0, 0, 0],
+            &[0_u8, 0, 0, 0, 0, 0, 0, 0, 0],
+            9
+        )
+    );
+    assert_eq!(
+        -1,
+        mem_ops.memcmp(
+            &[0_u8, 0, 0, 0, 0, 0, 0, 0, 0],
+            &[0_u8, 0, 0, 0, 0, 0, 0, 0, 1],
+            9
+        )
+    );
+    assert_eq!(
+        -1,
+        mem_ops.memcmp(
+            &[0_u8, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+            &[0_u8, 0, 0, 0, 0, 0, 0, 0, 0, 1],
+            10
+        )
+    );
+    assert_eq!(0, mem_ops.memcmp(&[0_u8; 8], &[0_u8; 8], 8));
+    assert_eq!(-1, mem_ops.memcmp(&[0_u8; 8], &[1_u8; 8], 8));
+    assert_eq!(-1, mem_ops.memcmp(&[0_u8; 16], &[1_u8; 16], 16));
+    assert_eq!(-1, mem_ops.memcmp(&[0_u8; 18], &[1_u8; 18], 18));
+    let one = &[0_u8; 18];
+    let two = &[1_u8; 18];
+    assert_eq!(-1, mem_ops.memcmp(&one[1..], &two[0..], 17));
+    assert_eq!(-1, mem_ops.memcmp(&one[1..], &two[1..], 17));
+}
diff --git a/programs/bpf/rust/mem/tests/lib.rs b/programs/bpf/rust/mem/tests/lib.rs
new file mode 100644
index 00000000000000..5bc591d728644d
--- /dev/null
+++ b/programs/bpf/rust/mem/tests/lib.rs
@@ -0,0 +1,23 @@
+use solana_bpf_rust_mem::entrypoint::process_instruction;
+use solana_program_test::*;
+use solana_sdk::{
+    instruction::Instruction, pubkey::Pubkey, signature::Signer, transaction::Transaction,
+};
+
+#[tokio::test]
+async fn test_mem() {
+    let program_id = Pubkey::new_unique();
+    let program_test = ProgramTest::new(
+        "solana_bpf_rust_mem",
+        program_id,
+        processor!(process_instruction),
+    );
+    let (mut banks_client, payer, recent_blockhash) = program_test.start().await;
+
+    let mut transaction = Transaction::new_with_payer(
+        &[Instruction::new_with_bincode(program_id, &(), vec![])],
+        Some(&payer.pubkey()),
+    );
+    transaction.sign(&[&payer], recent_blockhash);
+    banks_client.process_transaction(transaction).await.unwrap();
+}
diff --git a/programs/bpf/rust/membuiltins/Cargo.toml b/programs/bpf/rust/membuiltins/Cargo.toml
new file mode 100644
index 00000000000000..e44acf6b325b30
--- /dev/null
+++ b/programs/bpf/rust/membuiltins/Cargo.toml
@@ -0,0 +1,20 @@
+[package]
+name = "solana-bpf-rust-membuiltins"
+version = "1.7.11"
+description = "Solana BPF test program written in Rust"
+authors = ["Solana Maintainers <maintainers@solana.foundation>"]
+repository = "https://github.com/solana-labs/solana"
+license = "Apache-2.0"
+homepage = "https://solana.com/"
+documentation = "https://docs.rs/solana-bpf-rust-mem"
+edition = "2018"
+
+[dependencies]
+solana-bpf-rust-mem = { path = "../mem", version = "=1.7.11", features = [ "no-entrypoint" ] }
+solana-program = { path = "../../../../sdk/program", version = "=1.7.11" }
+
+[lib]
+crate-type = ["cdylib"]
+
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
diff --git a/programs/bpf/rust/membuiltins/src/lib.rs b/programs/bpf/rust/membuiltins/src/lib.rs
new file mode 100644
index 00000000000000..1ce2ed339cc683
--- /dev/null
+++ b/programs/bpf/rust/membuiltins/src/lib.rs
@@ -0,0 +1,39 @@
+//! @brief Test builtin mem functions
+
+#![cfg(target_arch = "bpf")]
+#![feature(rustc_private)]
+
+extern crate compiler_builtins;
+use solana_bpf_rust_mem::{run_mem_tests, MemOps};
+use solana_program::{custom_panic_default, entrypoint::SUCCESS};
+
+#[no_mangle]
+pub extern "C" fn entrypoint(_input: *mut u8) -> u64 {
+    #[derive(Default)]
+    struct MemOpSyscalls();
+    impl MemOps for MemOpSyscalls {
+        fn memcpy(&self, dst: &mut [u8], src: &[u8], n: usize) {
+            unsafe {
+                compiler_builtins::mem::memcpy(dst.as_mut_ptr(), src.as_ptr(), n);
+            }
+        }
+        unsafe fn memmove(&self, dst: *mut u8, src: *mut u8, n: usize) {
+            compiler_builtins::mem::memmove(dst, src, n);
+        }
+        fn memset(&self, s: &mut [u8], c: u8, n: usize) {
+            unsafe {
+                compiler_builtins::mem::memset(s.as_mut_ptr(), c as i32, n);
+            }
+        }
+        fn memcmp(&self, s1: &[u8], s2: &[u8], n: usize) -> i32 {
+            unsafe { compiler_builtins::mem::memcmp(s1.as_ptr(), s2.as_ptr(), n) }
+        }
+    }
+    let mem_ops = MemOpSyscalls::default();
+
+    run_mem_tests(mem_ops);
+
+    SUCCESS
+}
+
+custom_panic_default!();
diff --git a/programs/bpf/rust/noop/Cargo.toml b/programs/bpf/rust/noop/Cargo.toml
index 46773504ae5842..091f34704c3019 100644
--- 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.7.0"
+version = "1.7.11"
 description = "Solana BPF test program written in Rust"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -10,7 +10,7 @@ documentation = "https://docs.rs/solana-bpf-rust-noop"
 edition = "2018"
 
 [dependencies]
-solana-program = { path = "../../../../sdk/program", version = "=1.7.0" }
+solana-program = { path = "../../../../sdk/program", version = "=1.7.11" }
 
 [lib]
 crate-type = ["cdylib"]
diff --git a/programs/bpf/rust/panic/Cargo.toml b/programs/bpf/rust/panic/Cargo.toml
index 40908be5b58c0c..ac5d469c9c5463 100644
--- 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.7.0"
+version = "1.7.11"
 description = "Solana BPF test program written in Rust"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -10,7 +10,7 @@ documentation = "https://docs.rs/solana-bpf-rust-panic"
 edition = "2018"
 
 [dependencies]
-solana-program = { path = "../../../../sdk/program", version = "=1.7.0" }
+solana-program = { path = "../../../../sdk/program", version = "=1.7.11" }
 
 [features]
 default = ["custom-panic"]
diff --git a/programs/bpf/rust/param_passing/Cargo.toml b/programs/bpf/rust/param_passing/Cargo.toml
index d8ffac57ed5c5f..f9c51db57df18f 100644
--- 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.7.0"
+version = "1.7.11"
 description = "Solana BPF test program written in Rust"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -10,8 +10,8 @@ documentation = "https://docs.rs/solana-bpf-rust-param-passing"
 edition = "2018"
 
 [dependencies]
-solana-program = { path = "../../../../sdk/program", version = "=1.7.0" }
-solana-bpf-rust-param-passing-dep = { path = "../param_passing_dep", version = "=1.7.0" }
+solana-program = { path = "../../../../sdk/program", version = "=1.7.11" }
+solana-bpf-rust-param-passing-dep = { path = "../param_passing_dep", version = "=1.7.11" }
 
 [lib]
 crate-type = ["cdylib"]
diff --git a/programs/bpf/rust/param_passing_dep/Cargo.toml b/programs/bpf/rust/param_passing_dep/Cargo.toml
index 085ff287f9b07b..47bc0b105aabb7 100644
--- 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.7.0"
+version = "1.7.11"
 description = "Solana BPF program written in Rust"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -10,7 +10,7 @@ documentation = "https://docs.rs/solana-bpf-rust-param-passing-dep"
 edition = "2018"
 
 [dependencies]
-solana-program = { path = "../../../../sdk/program", version = "=1.7.0" }
+solana-program = { path = "../../../../sdk/program", version = "=1.7.11" }
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
diff --git a/programs/bpf/rust/rand/Cargo.toml b/programs/bpf/rust/rand/Cargo.toml
index bc6ffc9fa1fcf6..650d90fe2dba17 100644
--- 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.7.0"
+version = "1.7.11"
 description = "Solana BPF test program written in Rust"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -12,7 +12,7 @@ edition = "2018"
 [dependencies]
 getrandom = { version = "0.1.14", features = ["dummy"] }
 rand = "0.7"
-solana-program = { path = "../../../../sdk/program", version = "=1.7.0" }
+solana-program = { path = "../../../../sdk/program", version = "=1.7.11" }
 
 [lib]
 crate-type = ["cdylib"]
diff --git a/programs/bpf/rust/ro_account_modify/Cargo.toml b/programs/bpf/rust/ro_account_modify/Cargo.toml
new file mode 100644
index 00000000000000..0967a80015c8a6
--- /dev/null
+++ b/programs/bpf/rust/ro_account_modify/Cargo.toml
@@ -0,0 +1,19 @@
+[package]
+name = "solana-bpf-rust-ro-account_modify"
+version = "1.7.11"
+description = "Solana BPF test program written in Rust"
+authors = ["Solana Maintainers <maintainers@solana.foundation>"]
+repository = "https://github.com/solana-labs/solana"
+license = "Apache-2.0"
+homepage = "https://solana.com/"
+documentation = "https://docs.rs/solana-bpf-rust-ro-modify"
+edition = "2018"
+
+[dependencies]
+solana-program = { path = "../../../../sdk/program", version = "=1.7.11" }
+
+[lib]
+crate-type = ["cdylib"]
+
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
diff --git a/programs/bpf/rust/ro_account_modify/src/lib.rs b/programs/bpf/rust/ro_account_modify/src/lib.rs
new file mode 100644
index 00000000000000..8a69f09a89740a
--- /dev/null
+++ b/programs/bpf/rust/ro_account_modify/src/lib.rs
@@ -0,0 +1,70 @@
+use solana_program::{
+    account_info::AccountInfo,
+    entrypoint,
+    entrypoint::ProgramResult,
+    instruction::{AccountMeta, Instruction},
+    msg,
+    program::invoke,
+    pubkey::Pubkey,
+};
+
+const ARGUMENT_INDEX: usize = 0;
+
+const INSTRUCTION_MODIFY: u8 = 0;
+const INSTRUCTION_INVOKE_MODIFY: u8 = 1;
+const INSTRUCTION_MODIFY_INVOKE: u8 = 2;
+const INSTRUCTION_VERIFY_MODIFIED: u8 = 3;
+
+entrypoint!(process_instruction);
+fn process_instruction(
+    program_id: &Pubkey,
+    accounts: &[AccountInfo],
+    instruction_data: &[u8],
+) -> ProgramResult {
+    assert!(!accounts[ARGUMENT_INDEX].is_writable);
+
+    match instruction_data[0] {
+        INSTRUCTION_MODIFY => {
+            msg!("modify ro account");
+            assert_eq!(0, accounts[ARGUMENT_INDEX].try_borrow_data()?[0]);
+            accounts[ARGUMENT_INDEX].try_borrow_mut_data()?[0] = 1;
+        }
+        INSTRUCTION_INVOKE_MODIFY => {
+            msg!("invoke and modify ro account");
+
+            assert_eq!(0, accounts[ARGUMENT_INDEX].try_borrow_data()?[0]);
+
+            let instruction = Instruction {
+                program_id: *program_id,
+                accounts: vec![AccountMeta::new_readonly(
+                    *accounts[ARGUMENT_INDEX].key,
+                    false,
+                )],
+                data: vec![INSTRUCTION_MODIFY],
+            };
+            invoke(&instruction, accounts)?;
+        }
+        INSTRUCTION_MODIFY_INVOKE => {
+            msg!("modify and invoke ro account");
+
+            assert_eq!(0, accounts[ARGUMENT_INDEX].try_borrow_data()?[0]);
+            accounts[ARGUMENT_INDEX].try_borrow_mut_data()?[0] = 1;
+
+            let instruction = Instruction {
+                program_id: *program_id,
+                accounts: vec![AccountMeta::new_readonly(
+                    *accounts[ARGUMENT_INDEX].key,
+                    false,
+                )],
+                data: vec![INSTRUCTION_VERIFY_MODIFIED],
+            };
+            invoke(&instruction, accounts)?;
+        }
+        INSTRUCTION_VERIFY_MODIFIED => {
+            msg!("verify modified");
+            assert_eq!(1, accounts[ARGUMENT_INDEX].try_borrow_data()?[0])
+        }
+        _ => panic!("Unknown instruction"),
+    }
+    Ok(())
+}
diff --git a/programs/bpf/rust/ro_modify/Cargo.toml b/programs/bpf/rust/ro_modify/Cargo.toml
index 1e3db09e3135e7..bac21ef9813b5b 100644
--- 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.7.0"
+version = "1.7.11"
 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 = "2018"
 
 [dependencies]
-solana-program = { path = "../../../../sdk/program", version = "=1.7.0" }
+solana-program = { path = "../../../../sdk/program", version = "=1.7.11" }
 
 [lib]
 crate-type = ["cdylib"]
diff --git a/programs/bpf/rust/sanity/Cargo.toml b/programs/bpf/rust/sanity/Cargo.toml
index 574fe56ab93a4b..d09474490a9dc6 100644
--- 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.7.0"
+version = "1.7.11"
 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-sanity"
 edition = "2018"
 
 [dependencies]
-solana-program = { path = "../../../../sdk/program", version = "=1.7.0" }
+solana-program = { path = "../../../../sdk/program", version = "=1.7.11" }
 
 [lib]
 crate-type = ["cdylib"]
diff --git a/programs/bpf/rust/secp256k1_recover/Cargo.toml b/programs/bpf/rust/secp256k1_recover/Cargo.toml
new file mode 100644
index 00000000000000..840d1006da9318
--- /dev/null
+++ b/programs/bpf/rust/secp256k1_recover/Cargo.toml
@@ -0,0 +1,19 @@
+[package]
+name = "solana-bpf-rust-secp256k1-recover"
+version = "1.7.11"
+description = "Solana BPF test program written in Rust"
+authors = ["Solana Maintainers <maintainers@solana.foundation>"]
+repository = "https://github.com/solana-labs/solana"
+license = "Apache-2.0"
+homepage = "https://solana.com/"
+documentation = "https://docs.rs/solana-bpf-rust-secp256k1-recover"
+edition = "2018"
+
+[dependencies]
+solana-program = { path = "../../../../sdk/program", version = "=1.7.11" }
+
+[lib]
+crate-type = ["cdylib"]
+
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
diff --git a/programs/bpf/rust/secp256k1_recover/src/lib.rs b/programs/bpf/rust/secp256k1_recover/src/lib.rs
new file mode 100644
index 00000000000000..f452bbbf759939
--- /dev/null
+++ b/programs/bpf/rust/secp256k1_recover/src/lib.rs
@@ -0,0 +1,44 @@
+//! @brief Secp256k1Recover Syscall test
+
+extern crate solana_program;
+use solana_program::{custom_panic_default, msg};
+
+fn test_secp256k1_recover() {
+    use solana_program::secp256k1_recover::secp256k1_recover;
+
+    let expected: [u8; 64] = [
+        0x42, 0xcd, 0x27, 0xe4, 0x0f, 0xdf, 0x7c, 0x97, 0x0a, 0xa2, 0xca, 0x0b, 0x88, 0x5b, 0x96,
+        0x0f, 0x8b, 0x62, 0x8a, 0x41, 0xa1, 0x81, 0xe7, 0xe6, 0x8e, 0x03, 0xea, 0x0b, 0x84, 0x20,
+        0x58, 0x9b, 0x32, 0x06, 0xbd, 0x66, 0x2f, 0x75, 0x65, 0xd6, 0x9d, 0xbd, 0x1d, 0x34, 0x29,
+        0x6a, 0xd9, 0x35, 0x38, 0xed, 0x86, 0x9e, 0x99, 0x20, 0x43, 0xc3, 0xeb, 0xad, 0x65, 0x50,
+        0xa0, 0x11, 0x6e, 0x5d,
+    ];
+
+    let hash: [u8; 32] = [
+        0xde, 0xa5, 0x66, 0xb6, 0x94, 0x3b, 0xe0, 0xe9, 0x62, 0x53, 0xc2, 0x21, 0x5b, 0x1b, 0xac,
+        0x69, 0xe7, 0xa8, 0x1e, 0xdb, 0x41, 0xc5, 0x02, 0x8b, 0x4f, 0x5c, 0x45, 0xc5, 0x3b, 0x49,
+        0x54, 0xd0,
+    ];
+    let recovery_id: u8 = 1;
+    let signature: [u8; 64] = [
+        0x97, 0xa4, 0xee, 0x31, 0xfe, 0x82, 0x65, 0x72, 0x9f, 0x4a, 0xa6, 0x7d, 0x24, 0xd4, 0xa7,
+        0x27, 0xf8, 0xc3, 0x15, 0xa4, 0xc8, 0xf9, 0x80, 0xeb, 0x4c, 0x4d, 0x4a, 0xfa, 0x6e, 0xc9,
+        0x42, 0x41, 0x5d, 0x10, 0xd9, 0xc2, 0x8a, 0x90, 0xe9, 0x92, 0x9c, 0x52, 0x4b, 0x2c, 0xfb,
+        0x65, 0xdf, 0xbc, 0xf6, 0x8c, 0xfd, 0x68, 0xdb, 0x17, 0xf9, 0x5d, 0x23, 0x5f, 0x96, 0xd8,
+        0xf0, 0x72, 0x01, 0x2d,
+    ];
+
+    let public_key = secp256k1_recover(&hash[..], recovery_id, &signature[..]).unwrap();
+    assert_eq!(public_key.to_bytes(), expected);
+}
+
+#[no_mangle]
+pub extern "C" fn entrypoint(_input: *mut u8) -> u64 {
+    msg!("secp256k1_recover");
+
+    test_secp256k1_recover();
+
+    0
+}
+
+custom_panic_default!();
diff --git a/programs/bpf/rust/sha/Cargo.toml b/programs/bpf/rust/sha/Cargo.toml
index 06e8eddfb39da7..21c69ee5a1d708 100644
--- 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.7.0"
+version = "1.7.11"
 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-sha"
 edition = "2018"
 
 [dependencies]
-solana-program = { path = "../../../../sdk/program", version = "=1.7.0" }
+solana-program = { path = "../../../../sdk/program", version = "=1.7.11" }
 
 [lib]
 crate-type = ["cdylib"]
diff --git a/programs/bpf/rust/spoof1/Cargo.toml b/programs/bpf/rust/spoof1/Cargo.toml
index 47c18bb99619ff..1a84e08f8cb865 100644
--- 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.7.0"
+version = "1.7.11"
 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 = "2018"
 
 [dependencies]
-solana-program = { path = "../../../../sdk/program", version = "=1.7.0" }
+solana-program = { path = "../../../../sdk/program", version = "=1.7.11" }
 
 [lib]
 crate-type = ["cdylib"]
diff --git a/programs/bpf/rust/spoof1_system/Cargo.toml b/programs/bpf/rust/spoof1_system/Cargo.toml
index c4221a0d0674b8..0e2abea6ebdce2 100644
--- 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.7.0"
+version = "1.7.11"
 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 = "2018"
 
 [dependencies]
-solana-program = { path = "../../../../sdk/program", version = "=1.7.0" }
+solana-program = { path = "../../../../sdk/program", version = "=1.7.11" }
 
 [lib]
 crate-type = ["cdylib"]
diff --git a/programs/bpf/rust/sysvar/Cargo.toml b/programs/bpf/rust/sysvar/Cargo.toml
index 90d4b77c8df0b3..81940fb331766e 100644
--- a/programs/bpf/rust/sysvar/Cargo.toml
+++ b/programs/bpf/rust/sysvar/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "solana-bpf-rust-sysvar"
-version = "1.7.0"
+version = "1.7.11"
 description = "Solana BPF test program written in Rust"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -10,11 +10,11 @@ documentation = "https://docs.rs/solana-bpf-rust-sysvar"
 edition = "2018"
 
 [dependencies]
-solana-program = { path = "../../../../sdk/program", version = "=1.7.0" }
+solana-program = { path = "../../../../sdk/program", version = "=1.7.11" }
 
 [dev-dependencies]
-solana-program-test = { path = "../../../../program-test", version = "=1.7.0" }
-solana-sdk = { path = "../../../../sdk", version = "=1.7.0" }
+solana-program-test = { path = "../../../../program-test", version = "=1.7.11" }
+solana-sdk = { path = "../../../../sdk", version = "=1.7.11" }
 
 [lib]
 crate-type = ["cdylib", "lib"]
diff --git a/programs/bpf/rust/sysvar/tests/lib.rs b/programs/bpf/rust/sysvar/tests/lib.rs
index 370cd9e3018418..bb0fbd59ae768b 100644
--- a/programs/bpf/rust/sysvar/tests/lib.rs
+++ b/programs/bpf/rust/sysvar/tests/lib.rs
@@ -12,7 +12,7 @@ use solana_sdk::{
 };
 
 #[tokio::test]
-async fn test_noop() {
+async fn test_sysvars() {
     let program_id = Pubkey::new_unique();
     let program_test = ProgramTest::new(
         "solana_bpf_rust_sysvar",
diff --git a/programs/bpf/rust/upgradeable/Cargo.toml b/programs/bpf/rust/upgradeable/Cargo.toml
index 0d326957a30cc0..f5e7c7ab1c22af 100644
--- a/programs/bpf/rust/upgradeable/Cargo.toml
+++ b/programs/bpf/rust/upgradeable/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "solana-bpf-rust-upgradeable"
-version = "1.7.0"
+version = "1.7.11"
 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-upgradeable"
 edition = "2018"
 
 [dependencies]
-solana-program = { path = "../../../../sdk/program", version = "=1.7.0" }
+solana-program = { path = "../../../../sdk/program", version = "=1.7.11" }
 
 [lib]
 name = "solana_bpf_rust_upgradeable"
diff --git a/programs/bpf/rust/upgraded/Cargo.toml b/programs/bpf/rust/upgraded/Cargo.toml
index 872ca3e5f53140..852e53a4f333f8 100644
--- a/programs/bpf/rust/upgraded/Cargo.toml
+++ b/programs/bpf/rust/upgraded/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "solana-bpf-rust-upgraded"
-version = "1.7.0"
+version = "1.7.11"
 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-upgraded"
 edition = "2018"
 
 [dependencies]
-solana-program = { path = "../../../../sdk/program", version = "=1.7.0" }
+solana-program = { path = "../../../../sdk/program", version = "=1.7.11" }
 
 [lib]
 name = "solana_bpf_rust_upgraded"
diff --git a/programs/bpf/tests/programs.rs b/programs/bpf/tests/programs.rs
index b95e4d7fca2484..c394f72b98e5ca 100644
--- a/programs/bpf/tests/programs.rs
+++ b/programs/bpf/tests/programs.rs
@@ -17,7 +17,7 @@ use solana_bpf_loader_program::{
 use solana_cli_output::display::println_transaction;
 use solana_rbpf::{
     static_analysis::Analysis,
-    vm::{Config, Executable, Tracer}
+    vm::{Config, Executable, Tracer},
 };
 use solana_runtime::{
     bank::{Bank, ExecuteTimings, NonceRollbackInfo, TransactionBalancesSet, TransactionResults},
@@ -278,7 +278,6 @@ fn run_program(
             &bpf_loader::id(),
             parameter_accounts,
             parameter_bytes.as_slice(),
-            true,
         )
         .unwrap();
     }
@@ -293,26 +292,24 @@ fn process_transaction_and_record_inner(
     let signature = tx.signatures.get(0).unwrap().clone();
     let txs = vec![tx];
     let tx_batch = bank.prepare_batch(txs.iter());
-    let (mut results, _, mut inner, _transaction_logs) = bank.load_execute_and_commit_transactions(
-        &tx_batch,
-        MAX_PROCESSING_AGE,
-        false,
-        true,
-        false,
-        &mut ExecuteTimings::default(),
-    );
-    let inner_instructions = if inner.is_empty() {
-        Some(vec![vec![]])
-    } else {
-        inner.swap_remove(0)
-    };
+    let (mut results, _, mut inner_instructions, _transaction_logs) = bank
+        .load_execute_and_commit_transactions(
+            &tx_batch,
+            MAX_PROCESSING_AGE,
+            false,
+            true,
+            false,
+            &mut ExecuteTimings::default(),
+        );
     let result = results
         .fee_collection_results
         .swap_remove(0)
         .and_then(|_| bank.get_signature_status(&signature).unwrap());
     (
         result,
-        inner_instructions.expect("cpi recording should be enabled"),
+        inner_instructions
+            .swap_remove(0)
+            .expect("cpi recording should be enabled"),
     )
 }
 
@@ -330,8 +327,8 @@ fn execute_transactions(bank: &Bank, txs: &[Transaction]) -> Vec<ConfirmedTransa
             post_balances,
             ..
         },
-        mut inner_instructions,
-        mut transaction_logs,
+        inner_instructions,
+        transaction_logs,
     ) = bank.load_execute_and_commit_transactions(
         &batch,
         std::usize::MAX,
@@ -342,13 +339,6 @@ fn execute_transactions(bank: &Bank, txs: &[Transaction]) -> Vec<ConfirmedTransa
     );
     let tx_post_token_balances = collect_token_balances(&bank, &batch, &mut mint_decimals);
 
-    for _ in 0..(txs.len() - transaction_logs.len()) {
-        transaction_logs.push(vec![]);
-    }
-    for _ in 0..(txs.len() - inner_instructions.len()) {
-        inner_instructions.push(None);
-    }
-
     izip!(
         txs.iter(),
         execution_results.into_iter(),
@@ -396,7 +386,7 @@ fn execute_transactions(bank: &Bank, txs: &[Transaction]) -> Vec<ConfirmedTransa
                 pre_token_balances: Some(pre_token_balances),
                 post_token_balances: Some(post_token_balances),
                 inner_instructions,
-                log_messages: Some(log_messages),
+                log_messages,
                 rewards: None,
             };
 
@@ -440,6 +430,7 @@ fn test_program_bpf_sanity() {
             ("relative_call", true),
             ("sanity", true),
             ("sanity++", true),
+            ("secp256k1_recover", true),
             ("sha", true),
             ("struct_pass", true),
             ("struct_ret", true),
@@ -455,12 +446,13 @@ fn test_program_bpf_sanity() {
             ("solana_bpf_rust_external_spend", false),
             ("solana_bpf_rust_iter", true),
             ("solana_bpf_rust_many_args", true),
-            ("solana_bpf_rust_mem", true),
+            ("solana_bpf_rust_membuiltins", true),
             ("solana_bpf_rust_noop", true),
             ("solana_bpf_rust_panic", false),
             ("solana_bpf_rust_param_passing", true),
             ("solana_bpf_rust_rand", true),
             ("solana_bpf_rust_sanity", true),
+            ("solana_bpf_rust_secp256k1_recover", true),
             ("solana_bpf_rust_sha", true),
         ]);
     }
@@ -757,6 +749,9 @@ fn test_program_bpf_invoke_sanity() {
     const TEST_RETURN_ERROR: u8 = 11;
     const TEST_PRIVILEGE_DEESCALATION_ESCALATION_SIGNER: u8 = 12;
     const TEST_PRIVILEGE_DEESCALATION_ESCALATION_WRITABLE: u8 = 13;
+    const TEST_WRITABLE_DEESCALATION_WRITABLE: u8 = 14;
+    const TEST_NESTED_INVOKE_TOO_DEEP: u8 = 15;
+    const TEST_EXECUTABLE_LAMPORTS: u8 = 16;
 
     #[allow(dead_code)]
     #[derive(Debug)]
@@ -831,6 +826,7 @@ fn test_program_bpf_invoke_sanity() {
             AccountMeta::new_readonly(derived_key3, false),
             AccountMeta::new_readonly(solana_sdk::system_program::id(), false),
             AccountMeta::new(from_keypair.pubkey(), true),
+            AccountMeta::new_readonly(invoke_program_id, false),
         ];
 
         // success cases
@@ -853,7 +849,7 @@ fn test_program_bpf_invoke_sanity() {
             bank.last_blockhash(),
         );
         let (result, inner_instructions) = process_transaction_and_record_inner(&bank, tx);
-        assert!(result.is_ok());
+        assert_eq!(result, Ok(()));
 
         let invoked_programs: Vec<Pubkey> = inner_instructions[0]
             .iter()
@@ -875,6 +871,9 @@ fn test_program_bpf_invoke_sanity() {
                 invoked_program_id.clone(),
                 invoked_program_id.clone(),
                 invoked_program_id.clone(),
+                invoked_program_id.clone(),
+                invoked_program_id.clone(),
+                invoked_program_id.clone(),
             ],
             Languages::Rust => vec![
                 solana_sdk::system_program::id(),
@@ -895,6 +894,9 @@ fn test_program_bpf_invoke_sanity() {
                 invoked_program_id.clone(),
                 invoked_program_id.clone(),
                 invoked_program_id.clone(),
+                invoked_program_id.clone(),
+                invoked_program_id.clone(),
+                invoked_program_id.clone(),
                 solana_sdk::system_program::id(),
             ],
         };
@@ -930,7 +932,7 @@ fn test_program_bpf_invoke_sanity() {
                     .iter()
                     .map(|ix| message.account_keys[ix.program_id_index as usize].clone())
                     .collect();
-                assert_eq!(result.unwrap_err(), expected_error);
+                assert_eq!(result, Err(expected_error));
                 assert_eq!(invoked_programs, expected_invoked_programs);
             };
 
@@ -1000,6 +1002,30 @@ fn test_program_bpf_invoke_sanity() {
             &[invoked_program_id.clone()],
         );
 
+        do_invoke_failure_test_local(
+            TEST_WRITABLE_DEESCALATION_WRITABLE,
+            TransactionError::InstructionError(0, InstructionError::ReadonlyDataModified),
+            &[invoked_program_id.clone()],
+        );
+
+        do_invoke_failure_test_local(
+            TEST_NESTED_INVOKE_TOO_DEEP,
+            TransactionError::InstructionError(0, InstructionError::CallDepth),
+            &[
+                invoked_program_id.clone(),
+                invoked_program_id.clone(),
+                invoked_program_id.clone(),
+                invoked_program_id.clone(),
+                invoked_program_id.clone(),
+            ],
+        );
+
+        do_invoke_failure_test_local(
+            TEST_EXECUTABLE_LAMPORTS,
+            TransactionError::InstructionError(0, InstructionError::ExecutableLamportChange),
+            &[invoke_program_id.clone()],
+        );
+
         // Check resulting state
 
         assert_eq!(43, bank.get_balance(&derived_key1));
@@ -1252,11 +1278,12 @@ fn assert_instruction_count() {
             ("alloc", 1137),
             ("bpf_to_bpf", 13),
             ("multiple_static", 8),
-            ("noop", 5),
-            ("noop++", 5),
+            ("noop", 42),
+            ("noop++", 42),
             ("relative_call", 10),
-            ("sanity", 169),
-            ("sanity++", 168),
+            ("sanity", 174),
+            ("sanity++", 174),
+            ("secp256k1_recover", 357),
             ("sha", 694),
             ("struct_pass", 8),
             ("struct_ret", 22),
@@ -1266,18 +1293,20 @@ fn assert_instruction_count() {
     {
         programs.extend_from_slice(&[
             ("solana_bpf_rust_128bit", 584),
-            ("solana_bpf_rust_alloc", 4967),
-            ("solana_bpf_rust_custom_heap", 365),
+            ("solana_bpf_rust_alloc", 8906),
+            ("solana_bpf_rust_custom_heap", 539),
             ("solana_bpf_rust_dep_crate", 2),
-            ("solana_bpf_rust_external_spend", 334),
-            ("solana_bpf_rust_iter", 8),
-            ("solana_bpf_rust_many_args", 189),
-            ("solana_bpf_rust_mem", 1665),
-            ("solana_bpf_rust_noop", 322),
+            ("solana_bpf_rust_external_spend", 521),
+            ("solana_bpf_rust_iter", 724),
+            ("solana_bpf_rust_many_args", 237),
+            ("solana_bpf_rust_mem", 3166),
+            ("solana_bpf_rust_membuiltins", 4069),
+            ("solana_bpf_rust_noop", 495),
             ("solana_bpf_rust_param_passing", 46),
-            ("solana_bpf_rust_rand", 325),
-            ("solana_bpf_rust_sanity", 587),
-            ("solana_bpf_rust_sha", 22417),
+            ("solana_bpf_rust_rand", 498),
+            ("solana_bpf_rust_sanity", 917),
+            ("solana_bpf_rust_secp256k1_recover", 306),
+            ("solana_bpf_rust_sha", 29131),
         ]);
     }
 
@@ -2454,3 +2483,68 @@ fn test_program_bpf_finalize() {
         TransactionError::InstructionError(0, InstructionError::ProgramFailedToComplete)
     );
 }
+
+#[cfg(feature = "bpf_rust")]
+#[test]
+fn test_program_bpf_ro_account_modify() {
+    solana_logger::setup();
+
+    let GenesisConfigInfo {
+        genesis_config,
+        mint_keypair,
+        ..
+    } = create_genesis_config(50);
+    let mut bank = Bank::new(&genesis_config);
+    let (name, id, entrypoint) = solana_bpf_loader_program!();
+    bank.add_builtin(&name, id, entrypoint);
+    let bank = Arc::new(bank);
+    let bank_client = BankClient::new_shared(&bank);
+
+    let program_id = load_bpf_program(
+        &bank_client,
+        &bpf_loader::id(),
+        &mint_keypair,
+        "solana_bpf_rust_ro_account_modify",
+    );
+
+    let argument_keypair = Keypair::new();
+    let account = AccountSharedData::new(42, 100, &program_id);
+    bank.store_account(&argument_keypair.pubkey(), &account);
+
+    let from_keypair = Keypair::new();
+    let account = AccountSharedData::new(84, 0, &solana_sdk::system_program::id());
+    bank.store_account(&from_keypair.pubkey(), &account);
+
+    let mint_pubkey = mint_keypair.pubkey();
+    let account_metas = vec![
+        AccountMeta::new_readonly(argument_keypair.pubkey(), false),
+        AccountMeta::new_readonly(program_id, false),
+    ];
+
+    let instruction = Instruction::new_with_bytes(program_id, &[0], account_metas.clone());
+    let message = Message::new(&[instruction], Some(&mint_pubkey));
+    let result = bank_client.send_and_confirm_message(&[&mint_keypair], message);
+    println!("result: {:?}", result);
+    assert_eq!(
+        result.unwrap_err().unwrap(),
+        TransactionError::InstructionError(0, InstructionError::ReadonlyDataModified)
+    );
+
+    let instruction = Instruction::new_with_bytes(program_id, &[1], account_metas.clone());
+    let message = Message::new(&[instruction], Some(&mint_pubkey));
+    let result = bank_client.send_and_confirm_message(&[&mint_keypair], message);
+    println!("result: {:?}", result);
+    assert_eq!(
+        result.unwrap_err().unwrap(),
+        TransactionError::InstructionError(0, InstructionError::ReadonlyDataModified)
+    );
+
+    let instruction = Instruction::new_with_bytes(program_id, &[2], account_metas.clone());
+    let message = Message::new(&[instruction], Some(&mint_pubkey));
+    let result = bank_client.send_and_confirm_message(&[&mint_keypair], message);
+    println!("result: {:?}", result);
+    assert_eq!(
+        result.unwrap_err().unwrap(),
+        TransactionError::InstructionError(0, InstructionError::ReadonlyDataModified)
+    );
+}
diff --git a/programs/bpf_loader/Cargo.toml b/programs/bpf_loader/Cargo.toml
index ba7c4970bc2c03..929a7a0f1c8d07 100644
--- a/programs/bpf_loader/Cargo.toml
+++ b/programs/bpf_loader/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "solana-bpf-loader-program"
-version = "1.7.0"
+version = "1.7.11"
 description = "Solana BPF loader"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -16,10 +16,11 @@ log = "0.4.11"
 num-derive = "0.3"
 num-traits = "0.2"
 rand_core = "0.6.2"
+libsecp256k1 = "0.5.0"
 sha3 = "0.9.1"
-solana-measure = { path = "../../measure", version = "=1.7.0" }
-solana-runtime = { path = "../../runtime", version = "=1.7.0" }
-solana-sdk = { path = "../../sdk", version = "=1.7.0" }
+solana-measure = { path = "../../measure", version = "=1.7.11" }
+solana-runtime = { path = "../../runtime", version = "=1.7.11" }
+solana-sdk = { path = "../../sdk", version = "=1.7.11" }
 solana_rbpf = "=0.2.11"
 thiserror = "1.0"
 
diff --git a/programs/bpf_loader/benches/serialization.rs b/programs/bpf_loader/benches/serialization.rs
index e99c953b496d4d..472c7953053aa2 100644
--- a/programs/bpf_loader/benches/serialization.rs
+++ b/programs/bpf_loader/benches/serialization.rs
@@ -107,9 +107,9 @@ fn bench_serialize_unaligned(bencher: &mut Bencher) {
         .enumerate()
         .map(|(i, (key, account))| {
             if i <= accounts.len() / 2 {
-                KeyedAccount::new_readonly(&key, false, &account)
+                KeyedAccount::new_readonly(key, false, account)
             } else {
-                KeyedAccount::new(&key, false, &account)
+                KeyedAccount::new(key, false, account)
             }
         })
         .collect();
@@ -128,9 +128,9 @@ fn bench_serialize_aligned(bencher: &mut Bencher) {
         .enumerate()
         .map(|(i, (key, account))| {
             if i <= accounts.len() / 2 {
-                KeyedAccount::new_readonly(&key, false, &account)
+                KeyedAccount::new_readonly(key, false, account)
             } else {
-                KeyedAccount::new(&key, false, &account)
+                KeyedAccount::new(key, false, account)
             }
         })
         .collect();
diff --git a/programs/bpf_loader/src/lib.rs b/programs/bpf_loader/src/lib.rs
index 2cad10a0b5e263..7bb85a7e89d2c2 100644
--- a/programs/bpf_loader/src/lib.rs
+++ b/programs/bpf_loader/src/lib.rs
@@ -31,14 +31,15 @@ use solana_sdk::{
     bpf_loader, bpf_loader_deprecated,
     bpf_loader_upgradeable::{self, UpgradeableLoaderState},
     clock::Clock,
-    entrypoint::SUCCESS,
-    feature_set::{skip_ro_deserialization, upgradeable_close_instruction},
+    entrypoint::{HEAP_LENGTH, SUCCESS},
+    feature_set::{add_missing_program_error_mappings, upgradeable_close_instruction},
     ic_logger_msg, ic_msg,
     instruction::InstructionError,
     keyed_account::{from_keyed_account, keyed_account_at_index},
     loader_instruction::LoaderInstruction,
     loader_upgradeable_instruction::UpgradeableLoaderInstruction,
     process_instruction::{stable_log, ComputeMeter, Executor, InvokeContext},
+    program_error::{ACCOUNT_NOT_RENT_EXEMPT, BORSH_IO_ERROR},
     program_utils::limited_deserialize,
     pubkey::Pubkey,
     rent::Rent,
@@ -128,7 +129,7 @@ fn write_program_data(
         );
         return Err(InstructionError::AccountDataTooSmall);
     }
-    data[program_data_offset..program_data_offset + len].copy_from_slice(&bytes);
+    data[program_data_offset..program_data_offset + len].copy_from_slice(bytes);
     Ok(())
 }
 
@@ -138,10 +139,6 @@ fn check_loader_id(id: &Pubkey) -> bool {
         || bpf_loader_upgradeable::check_id(id)
 }
 
-/// Default program heap size, allocators
-/// are expected to enforce this
-const DEFAULT_HEAP_SIZE: usize = 32 * 1024;
-
 /// Create the BPF virtual machine
 pub fn create_vm<'a>(
     loader_id: &'a Pubkey,
@@ -149,7 +146,11 @@ pub fn create_vm<'a>(
     parameter_bytes: &mut [u8],
     invoke_context: &'a mut dyn InvokeContext,
 ) -> Result<EbpfVm<'a, BpfError, ThisInstructionMeter>, EbpfError<BpfError>> {
-    let heap = AlignedMemory::new_with_size(DEFAULT_HEAP_SIZE, HOST_ALIGN);
+    let bpf_compute_budget = invoke_context.get_bpf_compute_budget();
+    let heap = AlignedMemory::new_with_size(
+        bpf_compute_budget.heap_size.unwrap_or(HEAP_LENGTH),
+        HOST_ALIGN,
+    );
     let heap_region = MemoryRegion::new_from_slice(heap.as_slice(), MM_HEAP_START, 0, true);
     let mut vm = EbpfVm::new(program, parameter_bytes, &[heap_region])?;
     syscalls::bind_syscall_context_objects(loader_id, &mut vm, invoke_context, heap)?;
@@ -369,7 +370,7 @@ fn process_loader_upgradeable_instruction(
             // Create ProgramData account
 
             let (derived_address, bump_seed) =
-                Pubkey::find_program_address(&[program.unsigned_key().as_ref()], &program_id);
+                Pubkey::find_program_address(&[program.unsigned_key().as_ref()], program_id);
             if derived_address != *programdata.unsigned_key() {
                 ic_logger_msg!(logger, "ProgramData address is not derived");
                 return Err(InstructionError::InvalidArgument);
@@ -751,13 +752,15 @@ impl Executor for BpfExecutor {
     ) -> Result<(), InstructionError> {
         let logger = invoke_context.get_logger();
         let invoke_depth = invoke_context.invoke_depth();
+        let add_missing_program_error_mappings =
+            invoke_context.is_feature_active(&add_missing_program_error_mappings::id());
 
         invoke_context.remove_first_keyed_account()?;
 
         let mut serialize_time = Measure::start("serialize");
         let keyed_accounts = invoke_context.get_keyed_accounts()?;
         let mut parameter_bytes =
-            serialize_parameters(loader_id, program_id, keyed_accounts, &instruction_data)?;
+            serialize_parameters(loader_id, program_id, keyed_accounts, instruction_data)?;
         serialize_time.stop();
         let mut create_vm_time = Measure::start("create_vm");
         let mut execute_time;
@@ -804,7 +807,14 @@ impl Executor for BpfExecutor {
             match result {
                 Ok(status) => {
                     if status != SUCCESS {
-                        let error: InstructionError = status.into();
+                        let error: InstructionError = if !add_missing_program_error_mappings
+                            && (status == ACCOUNT_NOT_RENT_EXEMPT || status == BORSH_IO_ERROR)
+                        {
+                            // map originally missing error mappings to InvalidError
+                            InstructionError::InvalidError
+                        } else {
+                            status.into()
+                        };
                         stable_log::program_failure(&logger, program_id, &error);
                         return Err(error);
                     }
@@ -827,12 +837,7 @@ impl Executor for BpfExecutor {
         }
         let mut deserialize_time = Measure::start("deserialize");
         let keyed_accounts = invoke_context.get_keyed_accounts()?;
-        deserialize_parameters(
-            loader_id,
-            keyed_accounts,
-            parameter_bytes.as_slice(),
-            invoke_context.is_feature_active(&skip_ro_deserialization::id()),
-        )?;
+        deserialize_parameters(loader_id, keyed_accounts, parameter_bytes.as_slice())?;
         deserialize_time.stop();
         invoke_context.update_timing(
             serialize_time.as_us(),
@@ -1128,6 +1133,7 @@ mod tests {
             programs: vec![],
             accounts: vec![],
             sysvars: vec![],
+            disabled_features: vec![].into_iter().collect(),
         };
         assert_eq!(
             Err(InstructionError::ProgramFailedToComplete),
@@ -2188,8 +2194,10 @@ mod tests {
         let upgrade_authority_address = Pubkey::new_unique();
         let buffer_address = Pubkey::new_unique();
         let program_address = Pubkey::new_unique();
-        let (programdata_address, _) =
-            Pubkey::find_program_address(&[program_address.as_ref()], &id());
+        let (programdata_address, _) = Pubkey::find_program_address(
+            &[program_address.as_ref()],
+            &bpf_loader_upgradeable::id(),
+        );
         let spill_address = Pubkey::new_unique();
         let upgrade_authority_account = AccountSharedData::new_ref(1, 0, &Pubkey::new_unique());
         let rent_id = sysvar::rent::id();
@@ -2224,7 +2232,7 @@ mod tests {
                 .unwrap();
             buffer_account.borrow_mut().data_as_mut_slice()
                 [UpgradeableLoaderState::buffer_data_offset().unwrap()..]
-                .copy_from_slice(&elf_new);
+                .copy_from_slice(elf_new);
             let programdata_account = AccountSharedData::new_ref(
                 min_programdata_balance,
                 UpgradeableLoaderState::programdata_len(elf_orig.len().max(elf_new.len())).unwrap(),
@@ -2842,8 +2850,10 @@ mod tests {
         let new_upgrade_authority_address = Pubkey::new_unique();
         let new_upgrade_authority_account = AccountSharedData::new_ref(1, 0, &Pubkey::new_unique());
         let program_address = Pubkey::new_unique();
-        let (programdata_address, _) =
-            Pubkey::find_program_address(&[program_address.as_ref()], &id());
+        let (programdata_address, _) = Pubkey::find_program_address(
+            &[program_address.as_ref()],
+            &bpf_loader_upgradeable::id(),
+        );
         let programdata_account = AccountSharedData::new_ref(
             1,
             UpgradeableLoaderState::programdata_len(0).unwrap(),
diff --git a/programs/bpf_loader/src/serialization.rs b/programs/bpf_loader/src/serialization.rs
index 31683274e5950b..4f842abebb36d7 100644
--- a/programs/bpf_loader/src/serialization.rs
+++ b/programs/bpf_loader/src/serialization.rs
@@ -40,12 +40,11 @@ pub fn deserialize_parameters(
     loader_id: &Pubkey,
     keyed_accounts: &[KeyedAccount],
     buffer: &[u8],
-    skip_ro_deserialization: bool,
 ) -> Result<(), InstructionError> {
     if *loader_id == bpf_loader_deprecated::id() {
-        deserialize_parameters_unaligned(keyed_accounts, buffer, skip_ro_deserialization)
+        deserialize_parameters_unaligned(keyed_accounts, buffer)
     } else {
-        deserialize_parameters_aligned(keyed_accounts, buffer, skip_ro_deserialization)
+        deserialize_parameters_aligned(keyed_accounts, buffer)
     }
 }
 
@@ -105,7 +104,7 @@ pub fn serialize_parameters_unaligned(
                 .map_err(|_| InstructionError::InvalidArgument)?;
             v.write_u64::<LittleEndian>(keyed_account.data_len()? as u64)
                 .map_err(|_| InstructionError::InvalidArgument)?;
-            v.write_all(&keyed_account.try_account_ref()?.data())
+            v.write_all(keyed_account.try_account_ref()?.data())
                 .map_err(|_| InstructionError::InvalidArgument)?;
             v.write_all(keyed_account.owner()?.as_ref())
                 .map_err(|_| InstructionError::InvalidArgument)?;
@@ -127,33 +126,28 @@ pub fn serialize_parameters_unaligned(
 pub fn deserialize_parameters_unaligned(
     keyed_accounts: &[KeyedAccount],
     buffer: &[u8],
-    skip_ro_deserialization: bool,
 ) -> Result<(), InstructionError> {
     let mut start = size_of::<u64>(); // number of accounts
     for (i, keyed_account) in keyed_accounts.iter().enumerate() {
         let (is_dup, _) = is_dup(&keyed_accounts[..i], keyed_account);
         start += 1; // is_dup
         if !is_dup {
-            if keyed_account.is_writable() || !skip_ro_deserialization {
-                start += size_of::<u8>(); // is_signer
-                start += size_of::<u8>(); // is_writable
-                start += size_of::<Pubkey>(); // key
-                keyed_account
-                    .try_account_ref_mut()?
-                    .set_lamports(LittleEndian::read_u64(&buffer[start..]));
-                start += size_of::<u64>() // lamports
+            start += size_of::<u8>(); // is_signer
+            start += size_of::<u8>(); // is_writable
+            start += size_of::<Pubkey>(); // key
+            keyed_account
+                .try_account_ref_mut()?
+                .set_lamports(LittleEndian::read_u64(&buffer[start..]));
+            start += size_of::<u64>() // lamports
                 + size_of::<u64>(); // data length
-                let end = start + keyed_account.data_len()?;
-                keyed_account
-                    .try_account_ref_mut()?
-                    .set_data_from_slice(&buffer[start..end]);
-                start += keyed_account.data_len()? // data
+            let end = start + keyed_account.data_len()?;
+            keyed_account
+                .try_account_ref_mut()?
+                .set_data_from_slice(&buffer[start..end]);
+            start += keyed_account.data_len()? // data
                 + size_of::<Pubkey>() // owner
                 + size_of::<u8>() // executable
                 + size_of::<u64>(); // rent_epoch
-            } else {
-                start += get_serialized_account_size_unaligned(keyed_account)?;
-            }
         }
     }
     Ok(())
@@ -229,7 +223,7 @@ pub fn serialize_parameters_aligned(
                 .map_err(|_| InstructionError::InvalidArgument)?;
             v.write_u64::<LittleEndian>(keyed_account.data_len()? as u64)
                 .map_err(|_| InstructionError::InvalidArgument)?;
-            v.write_all(&keyed_account.try_account_ref()?.data())
+            v.write_all(keyed_account.try_account_ref()?.data())
                 .map_err(|_| InstructionError::InvalidArgument)?;
             v.resize(
                 MAX_PERMITTED_DATA_INCREASE
@@ -253,7 +247,6 @@ pub fn serialize_parameters_aligned(
 pub fn deserialize_parameters_aligned(
     keyed_accounts: &[KeyedAccount],
     buffer: &[u8],
-    skip_ro_deserialization: bool,
 ) -> Result<(), InstructionError> {
     let mut start = size_of::<u64>(); // number of accounts
     for (i, keyed_account) in keyed_accounts.iter().enumerate() {
@@ -261,7 +254,7 @@ pub fn deserialize_parameters_aligned(
         start += size_of::<u8>(); // position
         if is_dup {
             start += 7; // padding to 64-bit aligned
-        } else if keyed_account.is_writable() || !skip_ro_deserialization {
+        } else {
             let mut account = keyed_account.try_account_ref_mut()?;
             start += size_of::<u8>() // is_signer
                 + size_of::<u8>() // is_writable
@@ -286,8 +279,6 @@ pub fn deserialize_parameters_aligned(
             start += pre_len + MAX_PERMITTED_DATA_INCREASE; // data
             start += (start as *const u8).align_offset(align_of::<u128>());
             start += size_of::<u64>(); // rent_epoch
-        } else {
-            start += get_serialized_account_size_aligned(keyed_account)?;
         }
     }
     Ok(())
@@ -391,9 +382,9 @@ mod tests {
             .enumerate()
             .map(|(i, (key, account))| {
                 if i <= accounts.len() / 2 {
-                    KeyedAccount::new_readonly(&key, false, &account)
+                    KeyedAccount::new_readonly(key, false, account)
                 } else {
-                    KeyedAccount::new(&key, false, &account)
+                    KeyedAccount::new(key, false, account)
                 }
             })
             .collect();
@@ -448,30 +439,19 @@ mod tests {
             .enumerate()
             .map(|(i, (key, account))| {
                 if i <= accounts.len() / 2 {
-                    KeyedAccount::new_readonly(&key, false, &account)
+                    KeyedAccount::new_readonly(key, false, account)
                 } else {
-                    KeyedAccount::new(&key, false, &account)
+                    KeyedAccount::new(key, false, account)
                 }
             })
             .collect();
-        deserialize_parameters(
-            &bpf_loader::id(),
-            &de_keyed_accounts,
-            serialized.as_slice(),
-            true,
-        )
-        .unwrap();
+        deserialize_parameters(&bpf_loader::id(), &de_keyed_accounts, serialized.as_slice())
+            .unwrap();
         for ((account, de_keyed_account), key) in
             accounts.iter().zip(de_keyed_accounts).zip(keys.clone())
         {
             assert_eq!(key, *de_keyed_account.unsigned_key());
             let account = account.borrow();
-            assert_eq!(account.lamports(), de_keyed_account.lamports().unwrap());
-            assert_eq!(
-                account.data(),
-                de_keyed_account.try_account_ref().unwrap().data()
-            );
-            assert_eq!(*account.owner(), de_keyed_account.owner().unwrap());
             assert_eq!(account.executable(), de_keyed_account.executable().unwrap());
             assert_eq!(account.rent_epoch(), de_keyed_account.rent_epoch().unwrap());
         }
@@ -507,9 +487,9 @@ mod tests {
             .enumerate()
             .map(|(i, (key, account))| {
                 if i < accounts.len() / 2 {
-                    KeyedAccount::new_readonly(&key, false, &account)
+                    KeyedAccount::new_readonly(key, false, account)
                 } else {
-                    KeyedAccount::new(&key, false, &account)
+                    KeyedAccount::new(key, false, account)
                 }
             })
             .collect();
@@ -517,7 +497,6 @@ mod tests {
             &bpf_loader_deprecated::id(),
             &de_keyed_accounts,
             serialized.as_slice(),
-            true,
         )
         .unwrap();
         for ((account, de_keyed_account), key) in
diff --git a/programs/bpf_loader/src/syscalls.rs b/programs/bpf_loader/src/syscalls.rs
index 15406fe1ed3e48..bbc507ec683cf9 100644
--- a/programs/bpf_loader/src/syscalls.rs
+++ b/programs/bpf_loader/src/syscalls.rs
@@ -19,9 +19,10 @@ use solana_sdk::{
     entrypoint::{MAX_PERMITTED_DATA_INCREASE, SUCCESS},
     epoch_schedule::EpochSchedule,
     feature_set::{
-        cpi_data_cost, cpi_share_ro_and_exec_accounts, demote_sysvar_write_locks,
-        enforce_aligned_host_addrs, keccak256_syscall_enabled,
-        set_upgrade_authority_via_cpi_enabled, sysvar_via_syscall, update_data_on_realloc,
+        cpi_data_cost, enforce_aligned_host_addrs, keccak256_syscall_enabled,
+        libsecp256k1_0_5_upgrade_enabled, mem_overlap_fix, memory_ops_syscalls,
+        secp256k1_recover_syscall_enabled, set_upgrade_authority_via_cpi_enabled,
+        sysvar_via_syscall, update_data_on_realloc,
     },
     hash::{Hasher, HASH_BYTES},
     ic_msg,
@@ -32,6 +33,9 @@ use solana_sdk::{
     process_instruction::{self, stable_log, ComputeMeter, InvokeContext, Logger},
     pubkey::{Pubkey, PubkeyError, MAX_SEEDS},
     rent::Rent,
+    secp256k1_recover::{
+        Secp256k1RecoverError, SECP256K1_PUBLIC_KEY_LENGTH, SECP256K1_SIGNATURE_LENGTH,
+    },
     sysvar::{self, fees::Fees, Sysvar, SysvarId},
 };
 use std::{
@@ -74,6 +78,8 @@ pub enum SyscallError {
     InstructionTooLarge(usize, usize),
     #[error("Too many accounts passed to inner instruction")]
     TooManyAccounts,
+    #[error("Overlapping copy")]
+    CopyOverlapping,
 }
 impl From<SyscallError> for EbpfError<BpfError> {
     fn from(error: SyscallError) -> Self {
@@ -132,6 +138,11 @@ pub fn register_syscalls(
         syscall_registry.register_syscall_by_name(b"sol_keccak256", SyscallKeccak256::call)?;
     }
 
+    if invoke_context.is_feature_active(&secp256k1_recover_syscall_enabled::id()) {
+        syscall_registry
+            .register_syscall_by_name(b"sol_secp256k1_recover", SyscallSecp256k1Recover::call)?;
+    }
+
     if invoke_context.is_feature_active(&sysvar_via_syscall::id()) {
         syscall_registry
             .register_syscall_by_name(b"sol_get_clock_sysvar", SyscallGetClockSysvar::call)?;
@@ -145,10 +156,20 @@ pub fn register_syscalls(
             .register_syscall_by_name(b"sol_get_rent_sysvar", SyscallGetRentSysvar::call)?;
     }
 
+    if invoke_context.is_feature_active(&memory_ops_syscalls::id()) {
+        syscall_registry.register_syscall_by_name(b"sol_memcpy_", SyscallMemcpy::call)?;
+        syscall_registry.register_syscall_by_name(b"sol_memmove_", SyscallMemmove::call)?;
+        syscall_registry.register_syscall_by_name(b"sol_memcmp_", SyscallMemcmp::call)?;
+        syscall_registry.register_syscall_by_name(b"sol_memset_", SyscallMemset::call)?;
+    }
+
+    // Cross-program invocation syscalls
     syscall_registry
         .register_syscall_by_name(b"sol_invoke_signed_c", SyscallInvokeSignedC::call)?;
     syscall_registry
         .register_syscall_by_name(b"sol_invoke_signed_rust", SyscallInvokeSignedRust::call)?;
+
+    // Memory allocator
     syscall_registry.register_syscall_by_name(b"sol_alloc_free_", SyscallAllocFree::call)?;
 
     Ok(syscall_registry)
@@ -268,6 +289,56 @@ pub fn bind_syscall_context_objects<'a>(
         }),
     );
 
+    bind_feature_gated_syscall_context_object!(
+        vm,
+        invoke_context.is_feature_active(&memory_ops_syscalls::id()),
+        Box::new(SyscallMemcpy {
+            cost: invoke_context.get_bpf_compute_budget().cpi_bytes_per_unit,
+            compute_meter: invoke_context.get_compute_meter(),
+            loader_id,
+            mem_overlap_fix: invoke_context.is_feature_active(&mem_overlap_fix::id()),
+        }),
+    );
+    bind_feature_gated_syscall_context_object!(
+        vm,
+        invoke_context.is_feature_active(&memory_ops_syscalls::id()),
+        Box::new(SyscallMemmove {
+            cost: invoke_context.get_bpf_compute_budget().cpi_bytes_per_unit,
+            compute_meter: invoke_context.get_compute_meter(),
+            loader_id,
+        }),
+    );
+    bind_feature_gated_syscall_context_object!(
+        vm,
+        invoke_context.is_feature_active(&memory_ops_syscalls::id()),
+        Box::new(SyscallMemcmp {
+            cost: invoke_context.get_bpf_compute_budget().cpi_bytes_per_unit,
+            compute_meter: invoke_context.get_compute_meter(),
+            loader_id,
+        }),
+    );
+    bind_feature_gated_syscall_context_object!(
+        vm,
+        invoke_context.is_feature_active(&memory_ops_syscalls::id()),
+        Box::new(SyscallMemset {
+            cost: invoke_context.get_bpf_compute_budget().cpi_bytes_per_unit,
+            compute_meter: invoke_context.get_compute_meter(),
+            loader_id,
+        }),
+    );
+
+    bind_feature_gated_syscall_context_object!(
+        vm,
+        invoke_context.is_feature_active(&secp256k1_recover_syscall_enabled::id()),
+        Box::new(SyscallSecp256k1Recover {
+            cost: bpf_compute_budget.secp256k1_recover_cost,
+            compute_meter: invoke_context.get_compute_meter(),
+            loader_id,
+            libsecp256k1_0_5_upgrade_enabled: invoke_context
+                .is_feature_active(&libsecp256k1_0_5_upgrade_enabled::id()),
+        }),
+    );
+
     let is_sysvar_via_syscall_active = invoke_context.is_feature_active(&sysvar_via_syscall::id());
 
     let invoke_context = Rc::new(RefCell::new(invoke_context));
@@ -322,7 +393,6 @@ pub fn bind_syscall_context_objects<'a>(
     )?;
 
     // Memory allocator
-
     vm.bind_syscall_context_object(
         Box::new(SyscallAllocFree {
             aligned: *loader_id != bpf_loader_deprecated::id(),
@@ -535,7 +605,7 @@ impl<'a> SyscallObject<BpfError> for SyscallPanic<'a> {
             memory_mapping,
             file,
             len,
-            &self.loader_id,
+            self.loader_id,
             self.enforce_aligned_host_addrs,
             &mut |string: &str| Err(SyscallError::Panic(string.to_string(), line, column).into()),
         );
@@ -566,7 +636,7 @@ impl<'a> SyscallObject<BpfError> for SyscallLog<'a> {
                 memory_mapping,
                 addr,
                 len,
-                &self.loader_id,
+                self.loader_id,
                 self.enforce_aligned_host_addrs,
                 &mut |string: &str| {
                     stable_log::program_log(&self.logger, string);
@@ -1137,6 +1207,252 @@ impl<'a> SyscallObject<BpfError> for SyscallKeccak256<'a> {
     }
 }
 
+fn check_overlapping(src_addr: u64, dst_addr: u64, n: u64) -> bool {
+    (src_addr <= dst_addr && src_addr + n > dst_addr)
+        || (dst_addr <= src_addr && dst_addr + n > src_addr)
+}
+
+/// memcpy
+pub struct SyscallMemcpy<'a> {
+    cost: u64,
+    compute_meter: Rc<RefCell<dyn ComputeMeter>>,
+    loader_id: &'a Pubkey,
+    mem_overlap_fix: bool,
+}
+impl<'a> SyscallObject<BpfError> for SyscallMemcpy<'a> {
+    fn call(
+        &mut self,
+        dst_addr: u64,
+        src_addr: u64,
+        n: u64,
+        _arg4: u64,
+        _arg5: u64,
+        memory_mapping: &MemoryMapping,
+        result: &mut Result<u64, EbpfError<BpfError>>,
+    ) {
+        if if self.mem_overlap_fix {
+            check_overlapping(src_addr, dst_addr, n)
+        } else {
+            dst_addr + n > src_addr && src_addr > dst_addr
+        } {
+            *result = Err(SyscallError::CopyOverlapping.into());
+            return;
+        }
+
+        question_mark!(self.compute_meter.consume(n / self.cost), result);
+        let dst = question_mark!(
+            translate_slice_mut::<u8>(memory_mapping, dst_addr, n, self.loader_id, true),
+            result
+        );
+        let src = question_mark!(
+            translate_slice::<u8>(memory_mapping, src_addr, n, self.loader_id, true),
+            result
+        );
+        unsafe {
+            std::ptr::copy_nonoverlapping(src.as_ptr(), dst.as_mut_ptr(), n as usize);
+        }
+        *result = Ok(0);
+    }
+}
+/// memmove
+pub struct SyscallMemmove<'a> {
+    cost: u64,
+    compute_meter: Rc<RefCell<dyn ComputeMeter>>,
+    loader_id: &'a Pubkey,
+}
+impl<'a> SyscallObject<BpfError> for SyscallMemmove<'a> {
+    fn call(
+        &mut self,
+        dst_addr: u64,
+        src_addr: u64,
+        n: u64,
+        _arg4: u64,
+        _arg5: u64,
+        memory_mapping: &MemoryMapping,
+        result: &mut Result<u64, EbpfError<BpfError>>,
+    ) {
+        question_mark!(self.compute_meter.consume(n / self.cost), result);
+        let dst = question_mark!(
+            translate_slice_mut::<u8>(memory_mapping, dst_addr, n, self.loader_id, true),
+            result
+        );
+        let src = question_mark!(
+            translate_slice::<u8>(memory_mapping, src_addr, n, self.loader_id, true),
+            result
+        );
+        unsafe {
+            std::ptr::copy(src.as_ptr(), dst.as_mut_ptr(), n as usize);
+        }
+        *result = Ok(0);
+    }
+}
+/// memcmp
+pub struct SyscallMemcmp<'a> {
+    cost: u64,
+    compute_meter: Rc<RefCell<dyn ComputeMeter>>,
+    loader_id: &'a Pubkey,
+}
+impl<'a> SyscallObject<BpfError> for SyscallMemcmp<'a> {
+    fn call(
+        &mut self,
+        s1_addr: u64,
+        s2_addr: u64,
+        n: u64,
+        cmp_result_addr: u64,
+        _arg5: u64,
+        memory_mapping: &MemoryMapping,
+        result: &mut Result<u64, EbpfError<BpfError>>,
+    ) {
+        question_mark!(self.compute_meter.consume(n / self.cost), result);
+        let s1 = question_mark!(
+            translate_slice::<u8>(memory_mapping, s1_addr, n, self.loader_id, true),
+            result
+        );
+        let s2 = question_mark!(
+            translate_slice::<u8>(memory_mapping, s2_addr, n, self.loader_id, true),
+            result
+        );
+        let cmp_result = question_mark!(
+            translate_type_mut::<i32>(memory_mapping, cmp_result_addr, self.loader_id, true),
+            result
+        );
+        let mut i = 0;
+        while i < n as usize {
+            let a = s1[i];
+            let b = s2[i];
+            if a != b {
+                *cmp_result = a as i32 - b as i32;
+                *result = Ok(0);
+                return;
+            }
+            i += 1;
+        }
+        *cmp_result = 0;
+        *result = Ok(0);
+    }
+}
+/// memset
+pub struct SyscallMemset<'a> {
+    cost: u64,
+    compute_meter: Rc<RefCell<dyn ComputeMeter>>,
+    loader_id: &'a Pubkey,
+}
+impl<'a> SyscallObject<BpfError> for SyscallMemset<'a> {
+    fn call(
+        &mut self,
+        s_addr: u64,
+        c: u64,
+        n: u64,
+        _arg4: u64,
+        _arg5: u64,
+        memory_mapping: &MemoryMapping,
+        result: &mut Result<u64, EbpfError<BpfError>>,
+    ) {
+        question_mark!(self.compute_meter.consume(n / self.cost), result);
+        let s = question_mark!(
+            translate_slice_mut::<u8>(memory_mapping, s_addr, n, self.loader_id, true),
+            result
+        );
+        for val in s.iter_mut().take(n as usize) {
+            *val = c as u8;
+        }
+        *result = Ok(0);
+    }
+}
+
+/// secp256k1_recover
+pub struct SyscallSecp256k1Recover<'a> {
+    cost: u64,
+    compute_meter: Rc<RefCell<dyn ComputeMeter>>,
+    loader_id: &'a Pubkey,
+    libsecp256k1_0_5_upgrade_enabled: bool,
+}
+
+impl<'a> SyscallObject<BpfError> for SyscallSecp256k1Recover<'a> {
+    fn call(
+        &mut self,
+        hash_addr: u64,
+        recovery_id_val: u64,
+        signature_addr: u64,
+        result_addr: u64,
+        _arg5: u64,
+        memory_mapping: &MemoryMapping,
+        result: &mut Result<u64, EbpfError<BpfError>>,
+    ) {
+        question_mark!(self.compute_meter.consume(self.cost), result);
+
+        let hash = question_mark!(
+            translate_slice::<u8>(
+                memory_mapping,
+                hash_addr,
+                keccak::HASH_BYTES as u64,
+                self.loader_id,
+                true,
+            ),
+            result
+        );
+        let signature = question_mark!(
+            translate_slice::<u8>(
+                memory_mapping,
+                signature_addr,
+                SECP256K1_SIGNATURE_LENGTH as u64,
+                self.loader_id,
+                true,
+            ),
+            result
+        );
+        let secp256k1_recover_result = question_mark!(
+            translate_slice_mut::<u8>(
+                memory_mapping,
+                result_addr,
+                SECP256K1_PUBLIC_KEY_LENGTH as u64,
+                self.loader_id,
+                true,
+            ),
+            result
+        );
+
+        let message = match libsecp256k1::Message::parse_slice(hash) {
+            Ok(msg) => msg,
+            Err(_) => {
+                *result = Ok(Secp256k1RecoverError::InvalidHash.into());
+                return;
+            }
+        };
+        let recovery_id = match libsecp256k1::RecoveryId::parse(recovery_id_val as u8) {
+            Ok(id) => id,
+            Err(_) => {
+                *result = Ok(Secp256k1RecoverError::InvalidRecoveryId.into());
+                return;
+            }
+        };
+        let sig_parse_result = if self.libsecp256k1_0_5_upgrade_enabled {
+            libsecp256k1::Signature::parse_standard_slice(signature)
+        } else {
+            libsecp256k1::Signature::parse_overflowing_slice(signature)
+        };
+
+        let signature = match sig_parse_result {
+            Ok(sig) => sig,
+            Err(_) => {
+                *result = Ok(Secp256k1RecoverError::InvalidSignature.into());
+                return;
+            }
+        };
+
+        let public_key = match libsecp256k1::recover(&message, &signature, &recovery_id) {
+            Ok(key) => key.serialize(),
+            Err(_) => {
+                *result = Ok(Secp256k1RecoverError::InvalidSignature.into());
+                return;
+            }
+        };
+
+        secp256k1_recover_result.copy_from_slice(&public_key[1..65]);
+        *result = Ok(SUCCESS);
+    }
+}
+
 // Cross-program invocation syscalls
 
 struct AccountReferences<'a> {
@@ -1152,7 +1468,7 @@ type TranslatedAccount<'a> = (
     Option<AccountReferences<'a>>,
 );
 type TranslatedAccounts<'a> = (
-    Vec<Rc<RefCell<AccountSharedData>>>,
+    Vec<(Pubkey, Rc<RefCell<AccountSharedData>>)>,
     Vec<Option<AccountReferences<'a>>>,
 );
 
@@ -1169,7 +1485,6 @@ trait SyscallInvokeSigned<'a> {
     fn translate_accounts(
         &self,
         account_keys: &[Pubkey],
-        caller_write_privileges: &[bool],
         program_account_index: usize,
         account_infos_addr: u64,
         account_infos_len: u64,
@@ -1246,7 +1561,6 @@ impl<'a> SyscallInvokeSigned<'a> for SyscallInvokeSignedRust<'a> {
     fn translate_accounts(
         &self,
         account_keys: &[Pubkey],
-        caller_write_privileges: &[bool],
         program_account_index: usize,
         account_infos_addr: u64,
         account_infos_len: u64,
@@ -1368,7 +1682,6 @@ impl<'a> SyscallInvokeSigned<'a> for SyscallInvokeSignedRust<'a> {
 
         get_translated_accounts(
             account_keys,
-            caller_write_privileges,
             program_account_index,
             &account_info_keys,
             account_infos,
@@ -1585,7 +1898,6 @@ impl<'a> SyscallInvokeSigned<'a> for SyscallInvokeSignedC<'a> {
     fn translate_accounts(
         &self,
         account_keys: &[Pubkey],
-        caller_write_privileges: &[bool],
         program_account_index: usize,
         account_infos_addr: u64,
         account_infos_len: u64,
@@ -1689,7 +2001,6 @@ impl<'a> SyscallInvokeSigned<'a> for SyscallInvokeSignedC<'a> {
 
         get_translated_accounts(
             account_keys,
-            caller_write_privileges,
             program_account_index,
             &account_info_keys,
             account_infos,
@@ -1779,7 +2090,6 @@ impl<'a> SyscallObject<BpfError> for SyscallInvokeSignedC<'a> {
 
 fn get_translated_accounts<'a, T, F>(
     account_keys: &[Pubkey],
-    caller_write_privileges: &[bool],
     program_account_index: usize,
     account_info_keys: &[&Pubkey],
     account_infos: &[T],
@@ -1792,7 +2102,7 @@ where
     let mut accounts = Vec::with_capacity(account_keys.len());
     let mut refs = Vec::with_capacity(account_keys.len());
     for (i, ref account_key) in account_keys.iter().enumerate() {
-        let account = invoke_context.get_account(&account_key).ok_or_else(|| {
+        let account = invoke_context.get_account(account_key).ok_or_else(|| {
             ic_msg!(
                 invoke_context,
                 "Instruction references an unknown account {}",
@@ -1801,13 +2111,9 @@ where
             SyscallError::InstructionError(InstructionError::MissingAccount)
         })?;
 
-        if i == program_account_index
-            || account.borrow().executable()
-            || (invoke_context.is_feature_active(&cpi_share_ro_and_exec_accounts::id())
-                && !caller_write_privileges[i])
-        {
+        if i == program_account_index || account.borrow().executable() {
             // Use the known account
-            accounts.push(account);
+            accounts.push((**account_key, account));
             refs.push(None);
         } else if let Some(account_info) =
             account_info_keys
@@ -1822,7 +2128,7 @@ where
                 })
         {
             let (account, account_ref) = do_translate(account_info, invoke_context)?;
-            accounts.push(account);
+            accounts.push((**account_key, account));
             refs.push(account_ref);
         } else {
             ic_msg!(
@@ -1935,14 +2241,7 @@ fn call<'a>(
     signers_seeds_len: u64,
     memory_mapping: &MemoryMapping,
 ) -> Result<u64, EbpfError<BpfError>> {
-    let (
-        message,
-        executables,
-        accounts,
-        account_refs,
-        caller_write_privileges,
-        demote_sysvar_write_locks,
-    ) = {
+    let (message, executables, accounts, account_refs, caller_write_privileges) = {
         let invoke_context = syscall.get_context()?;
 
         invoke_context
@@ -1960,7 +2259,7 @@ fn call<'a>(
 
         let instruction = syscall.translate_instruction(
             instruction_addr,
-            &memory_mapping,
+            memory_mapping,
             enforce_aligned_host_addrs,
         )?;
         let signers = syscall.translate_signers(
@@ -2000,7 +2299,6 @@ fn call<'a>(
         check_authorized_program(&callee_program_id, &instruction.data, &invoke_context)?;
         let (accounts, account_refs) = syscall.translate_accounts(
             &message.account_keys,
-            &caller_write_privileges,
             callee_program_id_index,
             account_infos_addr,
             account_infos_len,
@@ -2015,6 +2313,7 @@ fn call<'a>(
                 ic_msg!(invoke_context, "Unknown program {}", callee_program_id,);
                 SyscallError::InstructionError(InstructionError::MissingAccount)
             })?
+            .1
             .clone();
         let programdata_executable =
             get_upgradeable_executable(&callee_program_id, &program_account, &invoke_context)?;
@@ -2033,7 +2332,6 @@ fn call<'a>(
             accounts,
             account_refs,
             caller_write_privileges,
-            invoke_context.is_feature_active(&demote_sysvar_write_locks::id()),
         )
     };
 
@@ -2056,10 +2354,10 @@ fn call<'a>(
     // Copy results back to caller
     {
         let invoke_context = syscall.get_context()?;
-        for (i, (account, account_ref)) in accounts.iter().zip(account_refs).enumerate() {
+        for (i, ((_key, account), account_ref)) in accounts.iter().zip(account_refs).enumerate() {
             let account = account.borrow();
             if let Some(mut account_ref) = account_ref {
-                if message.is_writable(i, demote_sysvar_write_locks) && !account.executable() {
+                if message.is_writable(i) && !account.executable() {
                     *account_ref.lamports = account.lamports();
                     *account_ref.owner = *account.owner();
                     if account_ref.data.len() != account.data().len() {
@@ -3090,4 +3388,15 @@ mod tests {
             assert_eq!(got_rent, src_rent);
         }
     }
+
+    #[test]
+    fn test_overlapping() {
+        assert!(!check_overlapping(10, 7, 3));
+        assert!(check_overlapping(10, 8, 3));
+        assert!(check_overlapping(10, 9, 3));
+        assert!(check_overlapping(10, 10, 3));
+        assert!(check_overlapping(10, 11, 3));
+        assert!(check_overlapping(10, 12, 3));
+        assert!(!check_overlapping(10, 13, 3));
+    }
 }
diff --git a/programs/budget/Cargo.toml b/programs/budget/Cargo.toml
index a6e3ff3ec981f1..0c0113ccb7d3a8 100644
--- a/programs/budget/Cargo.toml
+++ b/programs/budget/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "solana-budget-program"
-version = "1.7.0"
+version = "1.7.11"
 description = "Solana Budget program"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -17,11 +17,11 @@ num-derive = "0.3"
 num-traits = "0.2"
 serde = "1.0.122"
 serde_derive = "1.0.103"
-solana-sdk = { path = "../../sdk", version = "=1.7.0" }
+solana-sdk = { path = "../../sdk", version = "=1.7.11" }
 thiserror = "1.0"
 
 [dev-dependencies]
-solana-runtime = { path = "../../runtime", version = "=1.7.0" }
+solana-runtime = { path = "../../runtime", version = "=1.7.11" }
 
 [lib]
 crate-type = ["lib", "cdylib"]
diff --git a/programs/budget/src/budget_expr.rs b/programs/budget/src/budget_expr.rs
deleted file mode 100644
index c5584eee092715..00000000000000
--- a/programs/budget/src/budget_expr.rs
+++ /dev/null
@@ -1,390 +0,0 @@
-//! The `budget_expr` module provides a domain-specific language for payment plans. Users create BudgetExpr objects that
-//! are given to an interpreter. The interpreter listens for `Witness` transactions,
-//! which it uses to reduce the payment plan. When the budget is reduced to a
-//! `Payment`, the payment is executed.
-
-use chrono::prelude::*;
-use serde_derive::{Deserialize, Serialize};
-use solana_sdk::hash::Hash;
-use solana_sdk::pubkey::Pubkey;
-
-/// The types of events a payment plan can process.
-#[derive(Serialize, Deserialize, Debug, PartialEq, Eq, Clone)]
-pub enum Witness {
-    /// The current time.
-    Timestamp(DateTime<Utc>),
-
-    /// A signature from Pubkey.
-    Signature,
-
-    /// Account snapshot.
-    AccountData(Hash, Pubkey),
-}
-
-/// Some amount of lamports that should be sent to the `to` `Pubkey`.
-#[derive(Serialize, Deserialize, Debug, PartialEq, Eq, Clone)]
-pub struct Payment {
-    /// Amount to be paid.
-    pub lamports: u64,
-
-    /// The `Pubkey` that `lamports` should be paid to.
-    pub to: Pubkey,
-}
-
-/// The account constraints a Condition would wait on.
-/// Note: ideally this would be function that accepts an Account and returns
-/// a bool, but we don't have a way to pass functions over the wire. To simulate
-/// higher order programming, create your own program that includes an instruction
-/// that sets account data to a boolean. Pass that account key and program_id here.
-#[derive(Serialize, Deserialize, Debug, PartialEq, Eq, Clone)]
-pub struct AccountConstraints {
-    /// The account holder.
-    pub key: Pubkey,
-
-    /// The program id that must own the account at `key`.
-    pub program_id: Pubkey,
-
-    /// The hash of the data in the account at `key`.
-    pub data_hash: Hash,
-}
-
-/// A data type representing a `Witness` that the payment plan is waiting on.
-#[derive(Serialize, Deserialize, Debug, PartialEq, Eq, Clone)]
-pub enum Condition {
-    /// Wait for a `Timestamp` `Witness` at or after the given `DateTime`.
-    Timestamp(DateTime<Utc>, Pubkey),
-
-    /// Wait for a `Signature` `Witness` from `Pubkey`.
-    Signature(Pubkey),
-
-    /// Wait for the account with the given constraints.
-    AccountData(AccountConstraints),
-}
-
-impl Condition {
-    /// Return true if the given Witness satisfies this Condition.
-    pub fn is_satisfied(&self, witness: &Witness, from: &Pubkey) -> bool {
-        match (self, witness) {
-            (Condition::Signature(pubkey), Witness::Signature) => pubkey == from,
-            (Condition::Timestamp(dt, pubkey), Witness::Timestamp(last_time)) => {
-                pubkey == from && dt <= last_time
-            }
-            (
-                Condition::AccountData(constraints),
-                Witness::AccountData(actual_hash, program_id),
-            ) => {
-                constraints.program_id == *program_id
-                    && constraints.key == *from
-                    && constraints.data_hash == *actual_hash
-            }
-            _ => false,
-        }
-    }
-}
-
-/// A data type representing a payment plan.
-#[repr(C)]
-#[derive(Serialize, Deserialize, Debug, PartialEq, Eq, Clone)]
-pub enum BudgetExpr {
-    /// Make a payment.
-    Pay(Payment),
-
-    /// Make a payment after some condition.
-    After(Condition, Box<BudgetExpr>),
-
-    /// Either make a payment after one condition or a different payment after another
-    /// condition, which ever condition is satisfied first.
-    Or((Condition, Box<BudgetExpr>), (Condition, Box<BudgetExpr>)),
-
-    /// Make a payment after both of two conditions are satisfied
-    And(Condition, Condition, Box<BudgetExpr>),
-}
-
-impl BudgetExpr {
-    /// Create the simplest budget - one that pays `lamports` to Pubkey.
-    pub fn new_payment(lamports: u64, to: &Pubkey) -> Self {
-        BudgetExpr::Pay(Payment { lamports, to: *to })
-    }
-
-    /// Create a budget that pays `lamports` to `to` after being witnessed by `from`.
-    pub fn new_authorized_payment(from: &Pubkey, lamports: u64, to: &Pubkey) -> Self {
-        BudgetExpr::After(
-            Condition::Signature(*from),
-            Box::new(Self::new_payment(lamports, to)),
-        )
-    }
-
-    /// Create a budget that pays `lamports` to `to` after witnessing account data in `account_pubkey` with the given hash.
-    pub fn new_payment_when_account_data(
-        account_pubkey: &Pubkey,
-        account_program_id: &Pubkey,
-        account_hash: Hash,
-        lamports: u64,
-        to: &Pubkey,
-    ) -> Self {
-        BudgetExpr::After(
-            Condition::AccountData(AccountConstraints {
-                key: *account_pubkey,
-                program_id: *account_program_id,
-                data_hash: account_hash,
-            }),
-            Box::new(Self::new_payment(lamports, to)),
-        )
-    }
-
-    /// Create a budget that pays `lamports` to `to` after being witnessed by `witness` unless
-    /// canceled with a signature from `from`.
-    pub fn new_cancelable_authorized_payment(
-        witness: &Pubkey,
-        lamports: u64,
-        to: &Pubkey,
-        from: Option<Pubkey>,
-    ) -> Self {
-        if from.is_none() {
-            return Self::new_authorized_payment(witness, lamports, to);
-        }
-        let from = from.unwrap();
-        BudgetExpr::Or(
-            (
-                Condition::Signature(*witness),
-                Box::new(BudgetExpr::new_payment(lamports, to)),
-            ),
-            (
-                Condition::Signature(from),
-                Box::new(BudgetExpr::new_payment(lamports, &from)),
-            ),
-        )
-    }
-
-    /// Create a budget that pays lamports` to `to` after being witnessed by 2x `from`s
-    pub fn new_2_2_multisig_payment(
-        from0: &Pubkey,
-        from1: &Pubkey,
-        lamports: u64,
-        to: &Pubkey,
-    ) -> Self {
-        BudgetExpr::And(
-            Condition::Signature(*from0),
-            Condition::Signature(*from1),
-            Box::new(Self::new_payment(lamports, to)),
-        )
-    }
-
-    /// Create a budget that pays `lamports` to `to` after the given DateTime signed
-    /// by `dt_pubkey`.
-    pub fn new_future_payment(
-        dt: DateTime<Utc>,
-        dt_pubkey: &Pubkey,
-        lamports: u64,
-        to: &Pubkey,
-    ) -> Self {
-        BudgetExpr::After(
-            Condition::Timestamp(dt, *dt_pubkey),
-            Box::new(Self::new_payment(lamports, to)),
-        )
-    }
-
-    /// Create a budget that pays `lamports` to `to` after the given DateTime
-    /// signed by `dt_pubkey` unless canceled by `from`.
-    pub fn new_cancelable_future_payment(
-        dt: DateTime<Utc>,
-        dt_pubkey: &Pubkey,
-        lamports: u64,
-        to: &Pubkey,
-        from: Option<Pubkey>,
-    ) -> Self {
-        if from.is_none() {
-            return Self::new_future_payment(dt, dt_pubkey, lamports, to);
-        }
-        let from = from.unwrap();
-        BudgetExpr::Or(
-            (
-                Condition::Timestamp(dt, *dt_pubkey),
-                Box::new(Self::new_payment(lamports, to)),
-            ),
-            (
-                Condition::Signature(from),
-                Box::new(Self::new_payment(lamports, &from)),
-            ),
-        )
-    }
-
-    /// Return Payment if the budget requires no additional Witnesses.
-    pub fn final_payment(&self) -> Option<Payment> {
-        match self {
-            BudgetExpr::Pay(payment) => Some(payment.clone()),
-            _ => None,
-        }
-    }
-
-    /// Return true if the budget spends exactly `spendable_lamports`.
-    pub fn verify(&self, spendable_lamports: u64) -> bool {
-        match self {
-            BudgetExpr::Pay(payment) => payment.lamports == spendable_lamports,
-            BudgetExpr::After(_, sub_expr) | BudgetExpr::And(_, _, sub_expr) => {
-                sub_expr.verify(spendable_lamports)
-            }
-            BudgetExpr::Or(a, b) => {
-                a.1.verify(spendable_lamports) && b.1.verify(spendable_lamports)
-            }
-        }
-    }
-
-    /// Apply a witness to the budget to see if the budget can be reduced.
-    /// If so, modify the budget in-place.
-    pub fn apply_witness(&mut self, witness: &Witness, from: &Pubkey) {
-        let new_expr = match self {
-            BudgetExpr::After(cond, sub_expr) if cond.is_satisfied(witness, from) => {
-                Some(sub_expr.clone())
-            }
-            BudgetExpr::Or((cond, sub_expr), _) if cond.is_satisfied(witness, from) => {
-                Some(sub_expr.clone())
-            }
-            BudgetExpr::Or(_, (cond, sub_expr)) if cond.is_satisfied(witness, from) => {
-                Some(sub_expr.clone())
-            }
-            BudgetExpr::And(cond0, cond1, sub_expr) => {
-                if cond0.is_satisfied(witness, from) {
-                    Some(Box::new(BudgetExpr::After(cond1.clone(), sub_expr.clone())))
-                } else if cond1.is_satisfied(witness, from) {
-                    Some(Box::new(BudgetExpr::After(cond0.clone(), sub_expr.clone())))
-                } else {
-                    None
-                }
-            }
-            _ => None,
-        };
-        if let Some(expr) = new_expr {
-            *self = *expr;
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn test_signature_satisfied() {
-        let from = Pubkey::default();
-        assert!(Condition::Signature(from).is_satisfied(&Witness::Signature, &from));
-    }
-
-    #[test]
-    fn test_timestamp_satisfied() {
-        let dt1 = Utc.ymd(2014, 11, 14).and_hms(8, 9, 10);
-        let dt2 = Utc.ymd(2014, 11, 14).and_hms(10, 9, 8);
-        let from = Pubkey::default();
-        assert!(Condition::Timestamp(dt1, from).is_satisfied(&Witness::Timestamp(dt1), &from));
-        assert!(Condition::Timestamp(dt1, from).is_satisfied(&Witness::Timestamp(dt2), &from));
-        assert!(!Condition::Timestamp(dt2, from).is_satisfied(&Witness::Timestamp(dt1), &from));
-    }
-
-    #[test]
-    fn test_verify() {
-        let dt = Utc.ymd(2014, 11, 14).and_hms(8, 9, 10);
-        let from = Pubkey::default();
-        let to = Pubkey::default();
-        assert!(BudgetExpr::new_payment(42, &to).verify(42));
-        assert!(BudgetExpr::new_authorized_payment(&from, 42, &to).verify(42));
-        assert!(BudgetExpr::new_future_payment(dt, &from, 42, &to).verify(42));
-        assert!(
-            BudgetExpr::new_cancelable_future_payment(dt, &from, 42, &to, Some(from)).verify(42)
-        );
-    }
-
-    #[test]
-    fn test_authorized_payment() {
-        let from = Pubkey::default();
-        let to = Pubkey::default();
-
-        let mut expr = BudgetExpr::new_authorized_payment(&from, 42, &to);
-        expr.apply_witness(&Witness::Signature, &from);
-        assert_eq!(expr, BudgetExpr::new_payment(42, &to));
-    }
-
-    #[test]
-    fn test_future_payment() {
-        let dt = Utc.ymd(2014, 11, 14).and_hms(8, 9, 10);
-        let from = solana_sdk::pubkey::new_rand();
-        let to = solana_sdk::pubkey::new_rand();
-
-        let mut expr = BudgetExpr::new_future_payment(dt, &from, 42, &to);
-        expr.apply_witness(&Witness::Timestamp(dt), &from);
-        assert_eq!(expr, BudgetExpr::new_payment(42, &to));
-    }
-
-    #[test]
-    fn test_unauthorized_future_payment() {
-        // Ensure timestamp will only be acknowledged if it came from the
-        // whitelisted public key.
-        let dt = Utc.ymd(2014, 11, 14).and_hms(8, 9, 10);
-        let from = solana_sdk::pubkey::new_rand();
-        let to = solana_sdk::pubkey::new_rand();
-
-        let mut expr = BudgetExpr::new_future_payment(dt, &from, 42, &to);
-        let orig_expr = expr.clone();
-        expr.apply_witness(&Witness::Timestamp(dt), &to); // <-- Attack!
-        assert_eq!(expr, orig_expr);
-    }
-
-    #[test]
-    fn test_cancelable_future_payment() {
-        let dt = Utc.ymd(2014, 11, 14).and_hms(8, 9, 10);
-        let from = Pubkey::default();
-        let to = Pubkey::default();
-
-        let mut expr = BudgetExpr::new_cancelable_future_payment(dt, &from, 42, &to, Some(from));
-        expr.apply_witness(&Witness::Timestamp(dt), &from);
-        assert_eq!(expr, BudgetExpr::new_payment(42, &to));
-
-        let mut expr = BudgetExpr::new_cancelable_future_payment(dt, &from, 42, &to, Some(from));
-        expr.apply_witness(&Witness::Signature, &from);
-        assert_eq!(expr, BudgetExpr::new_payment(42, &from));
-    }
-    #[test]
-    fn test_2_2_multisig_payment() {
-        let from0 = solana_sdk::pubkey::new_rand();
-        let from1 = solana_sdk::pubkey::new_rand();
-        let to = Pubkey::default();
-
-        let mut expr = BudgetExpr::new_2_2_multisig_payment(&from0, &from1, 42, &to);
-        expr.apply_witness(&Witness::Signature, &from0);
-        assert_eq!(expr, BudgetExpr::new_authorized_payment(&from1, 42, &to));
-    }
-
-    #[test]
-    fn test_multisig_after_sig() {
-        let from0 = solana_sdk::pubkey::new_rand();
-        let from1 = solana_sdk::pubkey::new_rand();
-        let from2 = solana_sdk::pubkey::new_rand();
-        let to = Pubkey::default();
-
-        let expr = BudgetExpr::new_2_2_multisig_payment(&from0, &from1, 42, &to);
-        let mut expr = BudgetExpr::After(Condition::Signature(from2), Box::new(expr));
-
-        expr.apply_witness(&Witness::Signature, &from2);
-        expr.apply_witness(&Witness::Signature, &from0);
-        assert_eq!(expr, BudgetExpr::new_authorized_payment(&from1, 42, &to));
-    }
-
-    #[test]
-    fn test_multisig_after_ts() {
-        let from0 = solana_sdk::pubkey::new_rand();
-        let from1 = solana_sdk::pubkey::new_rand();
-        let dt = Utc.ymd(2014, 11, 11).and_hms(7, 7, 7);
-        let to = Pubkey::default();
-
-        let expr = BudgetExpr::new_2_2_multisig_payment(&from0, &from1, 42, &to);
-        let mut expr = BudgetExpr::After(Condition::Timestamp(dt, from0), Box::new(expr));
-
-        expr.apply_witness(&Witness::Timestamp(dt), &from0);
-        assert_eq!(
-            expr,
-            BudgetExpr::new_2_2_multisig_payment(&from0, &from1, 42, &to)
-        );
-
-        expr.apply_witness(&Witness::Signature, &from0);
-        assert_eq!(expr, BudgetExpr::new_authorized_payment(&from1, 42, &to));
-    }
-}
diff --git a/programs/budget/src/budget_instruction.rs b/programs/budget/src/budget_instruction.rs
deleted file mode 100644
index e61bdfcce0bd29..00000000000000
--- a/programs/budget/src/budget_instruction.rs
+++ /dev/null
@@ -1,195 +0,0 @@
-use crate::{budget_expr::BudgetExpr, budget_state::BudgetState, id};
-use bincode::serialized_size;
-use chrono::prelude::{DateTime, Utc};
-use num_derive::{FromPrimitive, ToPrimitive};
-use serde_derive::{Deserialize, Serialize};
-use solana_sdk::{
-    decode_error::DecodeError,
-    hash::Hash,
-    instruction::{AccountMeta, Instruction},
-    pubkey::Pubkey,
-    system_instruction,
-};
-use thiserror::Error;
-
-#[derive(Error, Debug, Clone, PartialEq, FromPrimitive, ToPrimitive)]
-pub enum BudgetError {
-    #[error("destination missing")]
-    DestinationMissing,
-}
-
-impl<T> DecodeError<T> for BudgetError {
-    fn type_of() -> &'static str {
-        "BudgetError"
-    }
-}
-
-/// An instruction to progress the smart contract.
-#[derive(Serialize, Deserialize, Debug, PartialEq, Eq, Clone)]
-pub enum BudgetInstruction {
-    /// Declare and instantiate `BudgetExpr`.
-    InitializeAccount(Box<BudgetExpr>),
-
-    /// Tell a payment plan acknowledge the given `DateTime` has past.
-    ApplyTimestamp(DateTime<Utc>),
-
-    /// Tell the budget that the `InitializeAccount` with `Signature` has been
-    /// signed by the containing transaction's `Pubkey`.
-    ApplySignature,
-
-    /// Load an account and pass its data to the budget for inspection.
-    ApplyAccountData,
-}
-
-fn initialize_account(contract: &Pubkey, expr: BudgetExpr) -> Instruction {
-    let mut keys = vec![];
-    if let BudgetExpr::Pay(payment) = &expr {
-        keys.push(AccountMeta::new(payment.to, false));
-    }
-    keys.push(AccountMeta::new(*contract, false));
-    Instruction::new_with_bincode(
-        id(),
-        &BudgetInstruction::InitializeAccount(Box::new(expr)),
-        keys,
-    )
-}
-
-pub fn create_account(
-    from: &Pubkey,
-    contract: &Pubkey,
-    lamports: u64,
-    expr: BudgetExpr,
-) -> Vec<Instruction> {
-    if !expr.verify(lamports) {
-        panic!("invalid budget expression");
-    }
-    let space = serialized_size(&BudgetState::new(expr.clone())).unwrap();
-    vec![
-        system_instruction::create_account(&from, contract, lamports, space, &id()),
-        initialize_account(contract, expr),
-    ]
-}
-
-/// Create a new payment script.
-pub fn payment(from: &Pubkey, to: &Pubkey, contract: &Pubkey, lamports: u64) -> Vec<Instruction> {
-    let expr = BudgetExpr::new_payment(lamports, to);
-    create_account(from, &contract, lamports, expr)
-}
-
-/// Create a future payment script.
-pub fn on_date(
-    from: &Pubkey,
-    to: &Pubkey,
-    contract: &Pubkey,
-    dt: DateTime<Utc>,
-    dt_pubkey: &Pubkey,
-    cancelable: Option<Pubkey>,
-    lamports: u64,
-) -> Vec<Instruction> {
-    let expr = BudgetExpr::new_cancelable_future_payment(dt, dt_pubkey, lamports, to, cancelable);
-    create_account(from, contract, lamports, expr)
-}
-
-/// Create a multisig payment script.
-pub fn when_signed(
-    from: &Pubkey,
-    to: &Pubkey,
-    contract: &Pubkey,
-    witness: &Pubkey,
-    cancelable: Option<Pubkey>,
-    lamports: u64,
-) -> Vec<Instruction> {
-    let expr = BudgetExpr::new_cancelable_authorized_payment(witness, lamports, to, cancelable);
-    create_account(from, contract, lamports, expr)
-}
-
-/// Make a payment when an account has the given data
-pub fn when_account_data(
-    from: &Pubkey,
-    to: &Pubkey,
-    contract: &Pubkey,
-    account_pubkey: &Pubkey,
-    account_program_id: &Pubkey,
-    account_hash: Hash,
-    lamports: u64,
-) -> Vec<Instruction> {
-    let expr = BudgetExpr::new_payment_when_account_data(
-        account_pubkey,
-        account_program_id,
-        account_hash,
-        lamports,
-        to,
-    );
-    create_account(from, contract, lamports, expr)
-}
-
-pub fn apply_timestamp(
-    from: &Pubkey,
-    contract: &Pubkey,
-    to: &Pubkey,
-    dt: DateTime<Utc>,
-) -> Instruction {
-    let mut account_metas = vec![
-        AccountMeta::new(*from, true),
-        AccountMeta::new(*contract, false),
-    ];
-    if from != to {
-        account_metas.push(AccountMeta::new(*to, false));
-    }
-    Instruction::new_with_bincode(id(), &BudgetInstruction::ApplyTimestamp(dt), account_metas)
-}
-
-pub fn apply_signature(from: &Pubkey, contract: &Pubkey, to: &Pubkey) -> Instruction {
-    let mut account_metas = vec![
-        AccountMeta::new(*from, true),
-        AccountMeta::new(*contract, false),
-    ];
-    if from != to {
-        account_metas.push(AccountMeta::new(*to, false));
-    }
-    Instruction::new_with_bincode(id(), &BudgetInstruction::ApplySignature, account_metas)
-}
-
-/// Apply account data to a contract waiting on an AccountData witness.
-pub fn apply_account_data(witness_pubkey: &Pubkey, contract: &Pubkey, to: &Pubkey) -> Instruction {
-    let account_metas = vec![
-        AccountMeta::new_readonly(*witness_pubkey, false),
-        AccountMeta::new(*contract, false),
-        AccountMeta::new(*to, false),
-    ];
-    Instruction::new_with_bincode(id(), &BudgetInstruction::ApplyAccountData, account_metas)
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::budget_expr::BudgetExpr;
-
-    #[test]
-    fn test_budget_instruction_verify() {
-        let alice_pubkey = solana_sdk::pubkey::new_rand();
-        let bob_pubkey = solana_sdk::pubkey::new_rand();
-        let budget_pubkey = solana_sdk::pubkey::new_rand();
-        payment(&alice_pubkey, &bob_pubkey, &budget_pubkey, 1); // No panic! indicates success.
-    }
-
-    #[test]
-    #[should_panic]
-    fn test_budget_instruction_overspend() {
-        let alice_pubkey = solana_sdk::pubkey::new_rand();
-        let bob_pubkey = solana_sdk::pubkey::new_rand();
-        let budget_pubkey = solana_sdk::pubkey::new_rand();
-        let expr = BudgetExpr::new_payment(2, &bob_pubkey);
-        create_account(&alice_pubkey, &budget_pubkey, 1, expr);
-    }
-
-    #[test]
-    #[should_panic]
-    fn test_budget_instruction_underspend() {
-        let alice_pubkey = solana_sdk::pubkey::new_rand();
-        let bob_pubkey = solana_sdk::pubkey::new_rand();
-        let budget_pubkey = solana_sdk::pubkey::new_rand();
-        let expr = BudgetExpr::new_payment(1, &bob_pubkey);
-        create_account(&alice_pubkey, &budget_pubkey, 2, expr);
-    }
-}
diff --git a/programs/budget/src/budget_processor.rs b/programs/budget/src/budget_processor.rs
deleted file mode 100644
index 1df0ea8592c750..00000000000000
--- a/programs/budget/src/budget_processor.rs
+++ /dev/null
@@ -1,627 +0,0 @@
-//! budget program
-use crate::{
-    budget_expr::Witness,
-    budget_instruction::{BudgetError, BudgetInstruction},
-    budget_state::BudgetState,
-};
-use chrono::prelude::{DateTime, Utc};
-use log::*;
-use solana_sdk::{
-    account::{ReadableAccount, WritableAccount},
-    hash::hash,
-    instruction::InstructionError,
-    keyed_account::{keyed_account_at_index, KeyedAccount},
-    process_instruction::InvokeContext,
-    program_utils::limited_deserialize,
-    pubkey::Pubkey,
-};
-
-/// Process a Witness Signature. Any payment plans waiting on this signature
-/// will progress one step.
-fn apply_signature(
-    budget_state: &mut BudgetState,
-    witness_keyed_account: &KeyedAccount,
-    contract_keyed_account: &KeyedAccount,
-    to_keyed_account: Result<&KeyedAccount, InstructionError>,
-) -> Result<(), InstructionError> {
-    let mut final_payment = None;
-    if let Some(ref mut expr) = budget_state.pending_budget {
-        let key = witness_keyed_account.signer_key().unwrap();
-        expr.apply_witness(&Witness::Signature, key);
-        final_payment = expr.final_payment();
-    }
-
-    if let Some(payment) = final_payment {
-        if let Some(key) = witness_keyed_account.signer_key() {
-            if &payment.to == key {
-                budget_state.pending_budget = None;
-                contract_keyed_account
-                    .try_account_ref_mut()?
-                    .checked_sub_lamports(payment.lamports)?;
-                witness_keyed_account
-                    .try_account_ref_mut()?
-                    .checked_add_lamports(payment.lamports)?;
-                return Ok(());
-            }
-        }
-        let to_keyed_account = to_keyed_account?;
-        if &payment.to != to_keyed_account.unsigned_key() {
-            trace!("destination missing");
-            return Err(BudgetError::DestinationMissing.into());
-        }
-        budget_state.pending_budget = None;
-        contract_keyed_account
-            .try_account_ref_mut()?
-            .checked_sub_lamports(payment.lamports)?;
-        to_keyed_account
-            .try_account_ref_mut()?
-            .checked_add_lamports(payment.lamports)?;
-    }
-    Ok(())
-}
-
-/// Process a Witness Timestamp. Any payment plans waiting on this timestamp
-/// will progress one step.
-fn apply_timestamp(
-    budget_state: &mut BudgetState,
-    witness_keyed_account: &KeyedAccount,
-    contract_keyed_account: &KeyedAccount,
-    to_keyed_account: Result<&KeyedAccount, InstructionError>,
-    dt: DateTime<Utc>,
-) -> Result<(), InstructionError> {
-    // Check to see if any timelocked transactions can be completed.
-    let mut final_payment = None;
-
-    if let Some(ref mut expr) = budget_state.pending_budget {
-        let key = witness_keyed_account.signer_key().unwrap();
-        expr.apply_witness(&Witness::Timestamp(dt), key);
-        final_payment = expr.final_payment();
-    }
-
-    if let Some(payment) = final_payment {
-        let to_keyed_account = to_keyed_account?;
-        if &payment.to != to_keyed_account.unsigned_key() {
-            trace!("destination missing");
-            return Err(BudgetError::DestinationMissing.into());
-        }
-        budget_state.pending_budget = None;
-        contract_keyed_account
-            .try_account_ref_mut()?
-            .checked_sub_lamports(payment.lamports)?;
-        to_keyed_account
-            .try_account_ref_mut()?
-            .checked_add_lamports(payment.lamports)?;
-    }
-    Ok(())
-}
-
-/// Process an AccountData Witness and any payment waiting on it.
-fn apply_account_data(
-    budget_state: &mut BudgetState,
-    witness_keyed_account: &KeyedAccount,
-    contract_keyed_account: &KeyedAccount,
-    to_keyed_account: Result<&KeyedAccount, InstructionError>,
-) -> Result<(), InstructionError> {
-    // Check to see if any timelocked transactions can be completed.
-    let mut final_payment = None;
-
-    if let Some(ref mut expr) = budget_state.pending_budget {
-        let key = witness_keyed_account.unsigned_key();
-        let program_id = witness_keyed_account.owner()?;
-        let actual_hash = hash(&witness_keyed_account.try_account_ref()?.data());
-        expr.apply_witness(&Witness::AccountData(actual_hash, program_id), key);
-        final_payment = expr.final_payment();
-    }
-
-    if let Some(payment) = final_payment {
-        let to_keyed_account = to_keyed_account?;
-        if &payment.to != to_keyed_account.unsigned_key() {
-            trace!("destination missing");
-            return Err(BudgetError::DestinationMissing.into());
-        }
-        budget_state.pending_budget = None;
-        contract_keyed_account
-            .try_account_ref_mut()?
-            .checked_sub_lamports(payment.lamports)?;
-        to_keyed_account
-            .try_account_ref_mut()?
-            .checked_add_lamports(payment.lamports)?;
-    }
-    Ok(())
-}
-
-pub fn process_instruction(
-    _program_id: &Pubkey,
-    data: &[u8],
-    invoke_context: &mut dyn InvokeContext,
-) -> Result<(), InstructionError> {
-    let keyed_accounts = invoke_context.get_keyed_accounts()?;
-
-    let instruction = limited_deserialize(data)?;
-
-    trace!("process_instruction: {:?}", instruction);
-
-    match instruction {
-        BudgetInstruction::InitializeAccount(expr) => {
-            let contract_keyed_account = keyed_account_at_index(keyed_accounts, 0)?;
-
-            if let Some(payment) = expr.final_payment() {
-                let to_keyed_account = contract_keyed_account;
-                let contract_keyed_account = keyed_account_at_index(keyed_accounts, 1)?;
-                contract_keyed_account
-                    .try_account_ref_mut()?
-                    .set_lamports(0);
-                to_keyed_account
-                    .try_account_ref_mut()?
-                    .checked_add_lamports(payment.lamports)?;
-                return Ok(());
-            }
-            let existing =
-                BudgetState::deserialize(&contract_keyed_account.try_account_ref_mut()?.data())
-                    .ok();
-            if Some(true) == existing.map(|x| x.initialized) {
-                trace!("contract already exists");
-                return Err(InstructionError::AccountAlreadyInitialized);
-            }
-            let budget_state = BudgetState {
-                pending_budget: Some(*expr),
-                initialized: true,
-            };
-            budget_state.serialize(
-                &mut contract_keyed_account
-                    .try_account_ref_mut()?
-                    .data_as_mut_slice(),
-            )
-        }
-        BudgetInstruction::ApplyTimestamp(dt) => {
-            let witness_keyed_account = keyed_account_at_index(keyed_accounts, 0)?;
-            let contract_keyed_account = keyed_account_at_index(keyed_accounts, 1)?;
-            let mut budget_state =
-                BudgetState::deserialize(&contract_keyed_account.try_account_ref()?.data())?;
-            if !budget_state.is_pending() {
-                return Ok(()); // Nothing to do here.
-            }
-            if !budget_state.initialized {
-                trace!("contract is uninitialized");
-                return Err(InstructionError::UninitializedAccount);
-            }
-            if witness_keyed_account.signer_key().is_none() {
-                return Err(InstructionError::MissingRequiredSignature);
-            }
-            trace!("apply timestamp");
-            apply_timestamp(
-                &mut budget_state,
-                witness_keyed_account,
-                contract_keyed_account,
-                keyed_account_at_index(keyed_accounts, 2),
-                dt,
-            )?;
-            trace!("apply timestamp committed");
-            budget_state.serialize(
-                &mut contract_keyed_account
-                    .try_account_ref_mut()?
-                    .data_as_mut_slice(),
-            )
-        }
-        BudgetInstruction::ApplySignature => {
-            let witness_keyed_account = keyed_account_at_index(keyed_accounts, 0)?;
-            let contract_keyed_account = keyed_account_at_index(keyed_accounts, 1)?;
-            let mut budget_state =
-                BudgetState::deserialize(&contract_keyed_account.try_account_ref()?.data())?;
-            if !budget_state.is_pending() {
-                return Ok(()); // Nothing to do here.
-            }
-            if !budget_state.initialized {
-                trace!("contract is uninitialized");
-                return Err(InstructionError::UninitializedAccount);
-            }
-            if witness_keyed_account.signer_key().is_none() {
-                return Err(InstructionError::MissingRequiredSignature);
-            }
-            trace!("apply signature");
-            apply_signature(
-                &mut budget_state,
-                witness_keyed_account,
-                contract_keyed_account,
-                keyed_account_at_index(keyed_accounts, 2),
-            )?;
-            trace!("apply signature committed");
-            budget_state.serialize(
-                &mut contract_keyed_account
-                    .try_account_ref_mut()?
-                    .data_as_mut_slice(),
-            )
-        }
-        BudgetInstruction::ApplyAccountData => {
-            let witness_keyed_account = keyed_account_at_index(keyed_accounts, 0)?;
-            let contract_keyed_account = keyed_account_at_index(keyed_accounts, 1)?;
-            let mut budget_state =
-                BudgetState::deserialize(&contract_keyed_account.try_account_ref()?.data())?;
-            if !budget_state.is_pending() {
-                return Ok(()); // Nothing to do here.
-            }
-            if !budget_state.initialized {
-                trace!("contract is uninitialized");
-                return Err(InstructionError::UninitializedAccount);
-            }
-            apply_account_data(
-                &mut budget_state,
-                witness_keyed_account,
-                contract_keyed_account,
-                keyed_account_at_index(keyed_accounts, 2),
-            )?;
-            trace!("apply account data committed");
-            budget_state.serialize(
-                &mut contract_keyed_account
-                    .try_account_ref_mut()?
-                    .data_as_mut_slice(),
-            )
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::budget_instruction;
-    use crate::id;
-    use solana_runtime::bank::Bank;
-    use solana_runtime::bank_client::BankClient;
-    use solana_sdk::account::{Account, AccountSharedData};
-    use solana_sdk::client::SyncClient;
-    use solana_sdk::genesis_config::create_genesis_config;
-    use solana_sdk::hash::hash;
-    use solana_sdk::instruction::InstructionError;
-    use solana_sdk::message::Message;
-    use solana_sdk::signature::{Keypair, Signer};
-    use solana_sdk::transaction::TransactionError;
-
-    fn create_bank(lamports: u64) -> (Bank, Keypair) {
-        let (genesis_config, mint_keypair) = create_genesis_config(lamports);
-        let mut bank = Bank::new(&genesis_config);
-        bank.add_builtin("budget_program", id(), process_instruction);
-        (bank, mint_keypair)
-    }
-
-    #[test]
-    fn test_initialize_no_panic() {
-        let (bank, alice_keypair) = create_bank(1);
-        let bank_client = BankClient::new(bank);
-
-        let alice_pubkey = alice_keypair.pubkey();
-        let budget_keypair = Keypair::new();
-        let budget_pubkey = budget_keypair.pubkey();
-        let bob_pubkey = solana_sdk::pubkey::new_rand();
-
-        let mut instructions =
-            budget_instruction::payment(&alice_pubkey, &bob_pubkey, &budget_pubkey, 1);
-        instructions[1].accounts = vec![]; // <!-- Attack! Prevent accounts from being passed into processor.
-
-        let message = Message::new(&instructions, Some(&alice_pubkey));
-        assert_eq!(
-            bank_client
-                .send_and_confirm_message(&[&alice_keypair, &budget_keypair], message)
-                .unwrap_err()
-                .unwrap(),
-            TransactionError::InstructionError(1, InstructionError::NotEnoughAccountKeys)
-        );
-    }
-
-    #[test]
-    fn test_budget_payment() {
-        let (bank, alice_keypair) = create_bank(10_000);
-        let bank_client = BankClient::new(bank);
-        let alice_pubkey = alice_keypair.pubkey();
-        let bob_pubkey = solana_sdk::pubkey::new_rand();
-        let budget_keypair = Keypair::new();
-        let budget_pubkey = budget_keypair.pubkey();
-        let instructions =
-            budget_instruction::payment(&alice_pubkey, &bob_pubkey, &budget_pubkey, 100);
-        let message = Message::new(&instructions, Some(&alice_pubkey));
-        bank_client
-            .send_and_confirm_message(&[&alice_keypair, &budget_keypair], message)
-            .unwrap();
-        assert_eq!(bank_client.get_balance(&bob_pubkey).unwrap(), 100);
-    }
-
-    #[test]
-    fn test_unsigned_witness_key() {
-        let (bank, alice_keypair) = create_bank(10_000);
-        let bank_client = BankClient::new(bank);
-        let alice_pubkey = alice_keypair.pubkey();
-
-        // Initialize BudgetState
-        let budget_keypair = Keypair::new();
-        let budget_pubkey = budget_keypair.pubkey();
-        let bob_pubkey = solana_sdk::pubkey::new_rand();
-        let witness = solana_sdk::pubkey::new_rand();
-        let instructions = budget_instruction::when_signed(
-            &alice_pubkey,
-            &bob_pubkey,
-            &budget_pubkey,
-            &witness,
-            None,
-            1,
-        );
-        let message = Message::new(&instructions, Some(&alice_pubkey));
-        bank_client
-            .send_and_confirm_message(&[&alice_keypair, &budget_keypair], message)
-            .unwrap();
-
-        // Attack! Part 1: Sign a witness transaction with a random key.
-        let mallory_keypair = Keypair::new();
-        let mallory_pubkey = mallory_keypair.pubkey();
-        bank_client
-            .transfer_and_confirm(1, &alice_keypair, &mallory_pubkey)
-            .unwrap();
-        let instruction =
-            budget_instruction::apply_signature(&mallory_pubkey, &budget_pubkey, &bob_pubkey);
-        let mut message = Message::new(&[instruction], Some(&mallory_pubkey));
-
-        // Attack! Part 2: Point the instruction to the expected, but unsigned, key.
-        message.account_keys.insert(3, alice_pubkey);
-        message.instructions[0].accounts[0] = 3;
-        message.instructions[0].program_id_index = 4;
-
-        // Ensure the transaction fails because of the unsigned key.
-        assert_eq!(
-            bank_client
-                .send_and_confirm_message(&[&mallory_keypair], message)
-                .unwrap_err()
-                .unwrap(),
-            TransactionError::InstructionError(0, InstructionError::MissingRequiredSignature)
-        );
-    }
-
-    #[test]
-    fn test_unsigned_timestamp() {
-        let (bank, alice_keypair) = create_bank(10_000);
-        let bank_client = BankClient::new(bank);
-        let alice_pubkey = alice_keypair.pubkey();
-
-        // Initialize BudgetState
-        let budget_keypair = Keypair::new();
-        let budget_pubkey = budget_keypair.pubkey();
-        let bob_pubkey = solana_sdk::pubkey::new_rand();
-        let dt = Utc::now();
-        let instructions = budget_instruction::on_date(
-            &alice_pubkey,
-            &bob_pubkey,
-            &budget_pubkey,
-            dt,
-            &alice_pubkey,
-            None,
-            1,
-        );
-        let message = Message::new(&instructions, Some(&alice_pubkey));
-        bank_client
-            .send_and_confirm_message(&[&alice_keypair, &budget_keypair], message)
-            .unwrap();
-
-        // Attack! Part 1: Sign a timestamp transaction with a random key.
-        let mallory_keypair = Keypair::new();
-        let mallory_pubkey = mallory_keypair.pubkey();
-        bank_client
-            .transfer_and_confirm(1, &alice_keypair, &mallory_pubkey)
-            .unwrap();
-        let instruction =
-            budget_instruction::apply_timestamp(&mallory_pubkey, &budget_pubkey, &bob_pubkey, dt);
-        let mut message = Message::new(&[instruction], Some(&mallory_pubkey));
-
-        // Attack! Part 2: Point the instruction to the expected, but unsigned, key.
-        message.account_keys.insert(3, alice_pubkey);
-        message.instructions[0].accounts[0] = 3;
-        message.instructions[0].program_id_index = 4;
-
-        // Ensure the transaction fails because of the unsigned key.
-        assert_eq!(
-            bank_client
-                .send_and_confirm_message(&[&mallory_keypair], message)
-                .unwrap_err()
-                .unwrap(),
-            TransactionError::InstructionError(0, InstructionError::MissingRequiredSignature)
-        );
-    }
-
-    #[test]
-    fn test_pay_on_date() {
-        let (bank, alice_keypair) = create_bank(2);
-        let bank_client = BankClient::new(bank);
-        let alice_pubkey = alice_keypair.pubkey();
-        let budget_keypair = Keypair::new();
-        let budget_pubkey = budget_keypair.pubkey();
-        let bob_pubkey = solana_sdk::pubkey::new_rand();
-        let mallory_pubkey = solana_sdk::pubkey::new_rand();
-        let dt = Utc::now();
-
-        let instructions = budget_instruction::on_date(
-            &alice_pubkey,
-            &bob_pubkey,
-            &budget_pubkey,
-            dt,
-            &alice_pubkey,
-            None,
-            1,
-        );
-        let message = Message::new(&instructions, Some(&alice_pubkey));
-        bank_client
-            .send_and_confirm_message(&[&alice_keypair, &budget_keypair], message)
-            .unwrap();
-        assert_eq!(bank_client.get_balance(&alice_pubkey).unwrap(), 1);
-        assert_eq!(bank_client.get_balance(&budget_pubkey).unwrap(), 1);
-
-        let contract_account = bank_client
-            .get_account_data(&budget_pubkey)
-            .unwrap()
-            .unwrap();
-        let budget_state = BudgetState::deserialize(&contract_account).unwrap();
-        assert!(budget_state.is_pending());
-
-        // Attack! Try to payout to mallory_pubkey
-        let instruction =
-            budget_instruction::apply_timestamp(&alice_pubkey, &budget_pubkey, &mallory_pubkey, dt);
-        assert_eq!(
-            bank_client
-                .send_and_confirm_instruction(&alice_keypair, instruction)
-                .unwrap_err()
-                .unwrap(),
-            TransactionError::InstructionError(
-                0,
-                InstructionError::Custom(BudgetError::DestinationMissing as u32)
-            )
-        );
-        assert_eq!(bank_client.get_balance(&alice_pubkey).unwrap(), 1);
-        assert_eq!(bank_client.get_balance(&budget_pubkey).unwrap(), 1);
-        assert_eq!(bank_client.get_balance(&bob_pubkey).unwrap(), 0);
-
-        let contract_account = bank_client
-            .get_account_data(&budget_pubkey)
-            .unwrap()
-            .unwrap();
-        let budget_state = BudgetState::deserialize(&contract_account).unwrap();
-        assert!(budget_state.is_pending());
-
-        // Now, acknowledge the time in the condition occurred and
-        // that pubkey's funds are now available.
-        let instruction =
-            budget_instruction::apply_timestamp(&alice_pubkey, &budget_pubkey, &bob_pubkey, dt);
-        bank_client
-            .send_and_confirm_instruction(&alice_keypair, instruction)
-            .unwrap();
-        assert_eq!(bank_client.get_balance(&alice_pubkey).unwrap(), 1);
-        assert_eq!(bank_client.get_balance(&budget_pubkey).unwrap(), 0);
-        assert_eq!(bank_client.get_balance(&bob_pubkey).unwrap(), 1);
-        assert_eq!(bank_client.get_account_data(&budget_pubkey).unwrap(), None);
-    }
-
-    #[test]
-    fn test_cancel_payment() {
-        let (bank, alice_keypair) = create_bank(3);
-        let bank_client = BankClient::new(bank);
-        let alice_pubkey = alice_keypair.pubkey();
-        let budget_keypair = Keypair::new();
-        let budget_pubkey = budget_keypair.pubkey();
-        let bob_pubkey = solana_sdk::pubkey::new_rand();
-        let dt = Utc::now();
-
-        let instructions = budget_instruction::on_date(
-            &alice_pubkey,
-            &bob_pubkey,
-            &budget_pubkey,
-            dt,
-            &alice_pubkey,
-            Some(alice_pubkey),
-            1,
-        );
-        let message = Message::new(&instructions, Some(&alice_pubkey));
-        bank_client
-            .send_and_confirm_message(&[&alice_keypair, &budget_keypair], message)
-            .unwrap();
-        assert_eq!(bank_client.get_balance(&alice_pubkey).unwrap(), 2);
-        assert_eq!(bank_client.get_balance(&budget_pubkey).unwrap(), 1);
-
-        let contract_account = bank_client
-            .get_account_data(&budget_pubkey)
-            .unwrap()
-            .unwrap();
-        let budget_state = BudgetState::deserialize(&contract_account).unwrap();
-        assert!(budget_state.is_pending());
-
-        // Attack! try to put the lamports into the wrong account with cancel
-        let mallory_keypair = Keypair::new();
-        let mallory_pubkey = mallory_keypair.pubkey();
-        bank_client
-            .transfer_and_confirm(1, &alice_keypair, &mallory_pubkey)
-            .unwrap();
-        assert_eq!(bank_client.get_balance(&alice_pubkey).unwrap(), 1);
-
-        let instruction =
-            budget_instruction::apply_signature(&mallory_pubkey, &budget_pubkey, &bob_pubkey);
-        bank_client
-            .send_and_confirm_instruction(&mallory_keypair, instruction)
-            .unwrap();
-        // nothing should be changed because apply witness didn't finalize a payment
-        assert_eq!(bank_client.get_balance(&alice_pubkey).unwrap(), 1);
-        assert_eq!(bank_client.get_balance(&budget_pubkey).unwrap(), 1);
-        assert_eq!(bank_client.get_account_data(&bob_pubkey).unwrap(), None);
-
-        // Now, cancel the transaction. mint gets her funds back
-        let instruction =
-            budget_instruction::apply_signature(&alice_pubkey, &budget_pubkey, &alice_pubkey);
-        bank_client
-            .send_and_confirm_instruction(&alice_keypair, instruction)
-            .unwrap();
-        assert_eq!(bank_client.get_balance(&alice_pubkey).unwrap(), 2);
-        assert_eq!(bank_client.get_account_data(&budget_pubkey).unwrap(), None);
-        assert_eq!(bank_client.get_account_data(&bob_pubkey).unwrap(), None);
-    }
-
-    #[test]
-    fn test_pay_when_account_data() {
-        let (bank, alice_keypair) = create_bank(42);
-        let game_pubkey = solana_sdk::pubkey::new_rand();
-        let game_account = AccountSharedData::from(Account {
-            lamports: 1,
-            data: vec![1, 2, 3],
-            ..Account::default()
-        });
-        bank.store_account(&game_pubkey, &game_account);
-        assert_eq!(
-            bank.get_account(&game_pubkey).unwrap().data(),
-            &vec![1, 2, 3]
-        );
-
-        let bank_client = BankClient::new(bank);
-
-        let alice_pubkey = alice_keypair.pubkey();
-        let game_hash = hash(&[1, 2, 3]);
-        let budget_keypair = Keypair::new();
-        let budget_pubkey = budget_keypair.pubkey();
-        let bob_keypair = Keypair::new();
-        let bob_pubkey = bob_keypair.pubkey();
-
-        // Give Bob some lamports so he can sign the witness transaction.
-        bank_client
-            .transfer_and_confirm(1, &alice_keypair, &bob_pubkey)
-            .unwrap();
-
-        let instructions = budget_instruction::when_account_data(
-            &alice_pubkey,
-            &bob_pubkey,
-            &budget_pubkey,
-            &game_pubkey,
-            game_account.owner(),
-            game_hash,
-            41,
-        );
-        let message = Message::new(&instructions, Some(&alice_pubkey));
-        bank_client
-            .send_and_confirm_message(&[&alice_keypair, &budget_keypair], message)
-            .unwrap();
-        assert_eq!(bank_client.get_balance(&alice_pubkey).unwrap(), 0);
-        assert_eq!(bank_client.get_balance(&budget_pubkey).unwrap(), 41);
-
-        let contract_account = bank_client
-            .get_account_data(&budget_pubkey)
-            .unwrap()
-            .unwrap();
-        let budget_state = BudgetState::deserialize(&contract_account).unwrap();
-        assert!(budget_state.is_pending());
-
-        // Acknowledge the condition occurred and that Bob's funds are now available.
-        let instruction =
-            budget_instruction::apply_account_data(&game_pubkey, &budget_pubkey, &bob_pubkey);
-
-        // Anyone can sign the message, but presumably it's Bob, since he's the
-        // one claiming the payout.
-        let message = Message::new(&[instruction], Some(&bob_pubkey));
-        bank_client
-            .send_and_confirm_message(&[&bob_keypair], message)
-            .unwrap();
-
-        assert_eq!(bank_client.get_balance(&alice_pubkey).unwrap(), 0);
-        assert_eq!(bank_client.get_balance(&budget_pubkey).unwrap(), 0);
-        assert_eq!(bank_client.get_balance(&bob_pubkey).unwrap(), 42);
-        assert_eq!(bank_client.get_account_data(&budget_pubkey).unwrap(), None);
-    }
-}
diff --git a/programs/budget/src/budget_state.rs b/programs/budget/src/budget_state.rs
deleted file mode 100644
index 0c5c4f2763f43c..00000000000000
--- a/programs/budget/src/budget_state.rs
+++ /dev/null
@@ -1,58 +0,0 @@
-//! budget state
-use crate::budget_expr::BudgetExpr;
-use bincode::{self, deserialize, serialize_into};
-use serde_derive::{Deserialize, Serialize};
-use solana_sdk::instruction::InstructionError;
-
-#[derive(Serialize, Deserialize, Debug, Clone, Default, PartialEq)]
-pub struct BudgetState {
-    pub initialized: bool,
-    pub pending_budget: Option<BudgetExpr>,
-}
-
-impl BudgetState {
-    pub fn new(budget_expr: BudgetExpr) -> Self {
-        Self {
-            initialized: true,
-            pending_budget: Some(budget_expr),
-        }
-    }
-
-    pub fn is_pending(&self) -> bool {
-        self.pending_budget.is_some()
-    }
-
-    pub fn serialize(&self, output: &mut [u8]) -> Result<(), InstructionError> {
-        serialize_into(output, self).map_err(|_| InstructionError::AccountDataTooSmall)
-    }
-
-    pub fn deserialize(input: &[u8]) -> Result<Self, InstructionError> {
-        deserialize(input).map_err(|_| InstructionError::InvalidAccountData)
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use super::*;
-    use crate::id;
-    use solana_sdk::account::Account;
-
-    #[test]
-    fn test_serializer() {
-        let mut a = Account::new(0, 512, &id());
-        let b = BudgetState::default();
-        b.serialize(&mut a.data).unwrap();
-        let c = BudgetState::deserialize(&a.data).unwrap();
-        assert_eq!(b, c);
-    }
-
-    #[test]
-    fn test_serializer_data_too_small() {
-        let mut a = Account::new(0, 1, &id());
-        let b = BudgetState::default();
-        assert_eq!(
-            b.serialize(&mut a.data),
-            Err(InstructionError::AccountDataTooSmall)
-        );
-    }
-}
diff --git a/programs/budget/src/lib.rs b/programs/budget/src/lib.rs
deleted file mode 100644
index ba182ef79d48f8..00000000000000
--- a/programs/budget/src/lib.rs
+++ /dev/null
@@ -1,13 +0,0 @@
-#![allow(clippy::integer_arithmetic)]
-pub mod budget_expr;
-pub mod budget_instruction;
-pub mod budget_processor;
-pub mod budget_state;
-
-use crate::budget_processor::process_instruction;
-
-solana_sdk::declare_program!(
-    "Budget1111111111111111111111111111111111111",
-    solana_budget_program,
-    process_instruction
-);
diff --git a/programs/config/Cargo.toml b/programs/config/Cargo.toml
index 94bf63135e8705..7aa9c9f17cf993 100644
--- a/programs/config/Cargo.toml
+++ b/programs/config/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "solana-config-program"
-version = "1.7.0"
+version = "1.7.11"
 description = "Solana Config program"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -16,10 +16,10 @@ log = "0.4.11"
 rand_core = "0.6.2"
 serde = "1.0.122"
 serde_derive = "1.0.103"
-solana-sdk = { path = "../../sdk", version = "=1.7.0" }
+solana-sdk = { path = "../../sdk", version = "=1.7.11" }
 
 [dev-dependencies]
-solana-logger = { path = "../../logger", version = "=1.7.0" }
+solana-logger = { path = "../../logger", version = "=1.7.11" }
 
 [lib]
 crate-type = ["lib"]
diff --git a/programs/config/src/config_processor.rs b/programs/config/src/config_processor.rs
index d93ed85ac57eaa..a7ac27313afd49 100644
--- a/programs/config/src/config_processor.rs
+++ b/programs/config/src/config_processor.rs
@@ -11,6 +11,7 @@ use solana_sdk::{
     program_utils::limited_deserialize,
     pubkey::Pubkey,
 };
+use std::collections::BTreeSet;
 
 pub fn process_instruction(
     _program_id: &Pubkey,
@@ -29,7 +30,7 @@ pub fn process_instruction(
             return Err(InstructionError::InvalidAccountOwner);
         }
 
-        deserialize(&config_account.data()).map_err(|err| {
+        deserialize(config_account.data()).map_err(|err| {
             ic_msg!(
                 invoke_context,
                 "Unable to deserialize config account: {}",
@@ -101,6 +102,15 @@ pub fn process_instruction(
         }
     }
 
+    if invoke_context.is_feature_active(&feature_set::dedupe_config_program_signers::id()) {
+        let total_new_keys = key_list.keys.len();
+        let unique_new_keys = key_list.keys.into_iter().collect::<BTreeSet<_>>();
+        if unique_new_keys.len() != total_new_keys {
+            ic_msg!(invoke_context, "new config contains duplicate keys");
+            return Err(InstructionError::InvalidArgument);
+        }
+    }
+
     // Check for Config data signers not present in incoming account update
     if current_signer_keys.len() > counter {
         ic_msg!(
@@ -120,7 +130,7 @@ pub fn process_instruction(
     config_keyed_account
         .try_account_ref_mut()?
         .data_as_mut_slice()[..data.len()]
-        .copy_from_slice(&data);
+        .copy_from_slice(data);
     Ok(())
 }
 
@@ -206,7 +216,7 @@ mod tests {
         let (_, config_account) = create_config_account(keys);
         assert_eq!(
             Some(MyConfig::default()),
-            deserialize(get_config_data(&config_account.borrow().data()).unwrap()).ok()
+            deserialize(get_config_data(config_account.borrow().data()).unwrap()).ok()
         );
     }
 
@@ -231,7 +241,7 @@ mod tests {
         );
         assert_eq!(
             Some(my_config),
-            deserialize(get_config_data(&config_account.borrow().data()).unwrap()).ok()
+            deserialize(get_config_data(config_account.borrow().data()).unwrap()).ok()
         );
     }
 
@@ -311,11 +321,11 @@ mod tests {
             ),
             Ok(())
         );
-        let meta_data: ConfigKeys = deserialize(&config_account.borrow().data()).unwrap();
+        let meta_data: ConfigKeys = deserialize(config_account.borrow().data()).unwrap();
         assert_eq!(meta_data.keys, keys);
         assert_eq!(
             Some(my_config),
-            deserialize(get_config_data(&config_account.borrow().data()).unwrap()).ok()
+            deserialize(get_config_data(config_account.borrow().data()).unwrap()).ok()
         );
     }
 
@@ -444,11 +454,11 @@ mod tests {
             ),
             Ok(())
         );
-        let meta_data: ConfigKeys = deserialize(&config_account.borrow().data()).unwrap();
+        let meta_data: ConfigKeys = deserialize(config_account.borrow().data()).unwrap();
         assert_eq!(meta_data.keys, keys);
         assert_eq!(
             new_config,
-            MyConfig::deserialize(get_config_data(&config_account.borrow().data()).unwrap())
+            MyConfig::deserialize(get_config_data(config_account.borrow().data()).unwrap())
                 .unwrap()
         );
 
@@ -493,6 +503,96 @@ mod tests {
         );
     }
 
+    #[test]
+    fn test_config_initialize_contains_duplicates_fails() {
+        solana_logger::setup();
+        let config_address = Pubkey::new_unique();
+        let signer0_pubkey = Pubkey::new_unique();
+        let signer0_account = RefCell::new(AccountSharedData::default());
+        let keys = vec![
+            (config_address, false),
+            (signer0_pubkey, true),
+            (signer0_pubkey, true),
+        ];
+        let (config_keypair, config_account) = create_config_account(keys.clone());
+        let config_pubkey = config_keypair.pubkey();
+        let my_config = MyConfig::new(42);
+
+        // Attempt initialization with duplicate signer inputs
+        let instruction = config_instruction::store(&config_pubkey, true, keys, &my_config);
+        let accounts = vec![
+            (true, false, &config_pubkey, &config_account),
+            (true, false, &signer0_pubkey, &signer0_account),
+            (true, false, &signer0_pubkey, &signer0_account),
+        ];
+        let keyed_accounts = create_keyed_accounts_unified(&accounts);
+        assert_eq!(
+            process_instruction(
+                &id(),
+                &instruction.data,
+                &mut MockInvokeContext::new(keyed_accounts)
+            ),
+            Err(InstructionError::InvalidArgument),
+        );
+    }
+
+    #[test]
+    fn test_config_update_contains_duplicates_fails() {
+        solana_logger::setup();
+        let config_address = Pubkey::new_unique();
+        let signer0_pubkey = Pubkey::new_unique();
+        let signer1_pubkey = Pubkey::new_unique();
+        let signer0_account = RefCell::new(AccountSharedData::default());
+        let signer1_account = RefCell::new(AccountSharedData::default());
+        let keys = vec![
+            (config_address, false),
+            (signer0_pubkey, true),
+            (signer1_pubkey, true),
+        ];
+        let (config_keypair, config_account) = create_config_account(keys.clone());
+        let config_pubkey = config_keypair.pubkey();
+        let my_config = MyConfig::new(42);
+
+        let instruction = config_instruction::store(&config_pubkey, true, keys, &my_config);
+        let accounts = vec![
+            (true, false, &config_pubkey, &config_account),
+            (true, false, &signer0_pubkey, &signer0_account),
+            (true, false, &signer1_pubkey, &signer1_account),
+        ];
+        let keyed_accounts = create_keyed_accounts_unified(&accounts);
+        assert_eq!(
+            process_instruction(
+                &id(),
+                &instruction.data,
+                &mut MockInvokeContext::new(keyed_accounts)
+            ),
+            Ok(()),
+        );
+
+        // Attempt update with duplicate signer inputs
+        let new_config = MyConfig::new(84);
+        let dupe_keys = vec![
+            (config_address, false),
+            (signer0_pubkey, true),
+            (signer0_pubkey, true),
+        ];
+        let instruction = config_instruction::store(&config_pubkey, false, dupe_keys, &new_config);
+        let accounts = vec![
+            (false, false, &config_pubkey, &config_account),
+            (true, false, &signer0_pubkey, &signer0_account),
+            (true, false, &signer0_pubkey, &signer0_account),
+        ];
+        let keyed_accounts = create_keyed_accounts_unified(&accounts);
+        assert_eq!(
+            process_instruction(
+                &id(),
+                &instruction.data,
+                &mut MockInvokeContext::new(keyed_accounts)
+            ),
+            Err(InstructionError::InvalidArgument),
+        );
+    }
+
     #[test]
     fn test_config_updates_requiring_config() {
         solana_logger::setup();
@@ -546,11 +646,11 @@ mod tests {
             ),
             Ok(())
         );
-        let meta_data: ConfigKeys = deserialize(&config_account.borrow().data()).unwrap();
+        let meta_data: ConfigKeys = deserialize(config_account.borrow().data()).unwrap();
         assert_eq!(meta_data.keys, keys);
         assert_eq!(
             new_config,
-            MyConfig::deserialize(get_config_data(&config_account.borrow().data()).unwrap())
+            MyConfig::deserialize(get_config_data(config_account.borrow().data()).unwrap())
                 .unwrap()
         );
 
diff --git a/programs/config/src/date_instruction.rs b/programs/config/src/date_instruction.rs
index c4f732644a8d41..7bc4ae41450658 100644
--- a/programs/config/src/date_instruction.rs
+++ b/programs/config/src/date_instruction.rs
@@ -54,5 +54,5 @@ pub fn create_account(
 /// transaction containing this instruction.
 pub fn store(date_pubkey: &Pubkey, date: Date<Utc>) -> Instruction {
     let date_config = DateConfig::new(date);
-    config_instruction::store(&date_pubkey, true, vec![], &date_config)
+    config_instruction::store(date_pubkey, true, vec![], &date_config)
 }
diff --git a/programs/config/src/lib.rs b/programs/config/src/lib.rs
index e170ef7659ad98..5658232c36720f 100644
--- a/programs/config/src/lib.rs
+++ b/programs/config/src/lib.rs
@@ -9,15 +9,23 @@ use solana_sdk::{
     account::{Account, AccountSharedData},
     pubkey::Pubkey,
     short_vec,
+    stake::config::Config as StakeConfig,
 };
 
-solana_sdk::declare_id!("Config1111111111111111111111111111111111111");
+pub use solana_sdk::config::program::id;
 
 pub trait ConfigState: serde::Serialize + Default {
     /// Maximum space that the serialized representation will require
     fn max_space() -> u64;
 }
 
+// TODO move ConfigState into `solana_program` to implement trait locally
+impl ConfigState for StakeConfig {
+    fn max_space() -> u64 {
+        serialized_size(&StakeConfig::default()).unwrap()
+    }
+}
+
 /// A collection of keys to be stored in Config account data.
 #[derive(Debug, Default, Deserialize, Serialize)]
 pub struct ConfigKeys {
diff --git a/programs/exchange/Cargo.toml b/programs/exchange/Cargo.toml
index 40a5ed371665aa..647c005d562be8 100644
--- a/programs/exchange/Cargo.toml
+++ b/programs/exchange/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "solana-exchange-program"
-version = "1.7.0"
+version = "1.7.11"
 description = "Solana Exchange program"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -16,13 +16,13 @@ num-derive = { version = "0.3" }
 num-traits = { version = "0.2" }
 serde = "1.0.122"
 serde_derive = "1.0.103"
-solana-logger = { path = "../../logger", version = "=1.7.0" }
-solana-metrics = { path = "../../metrics", version = "=1.7.0" }
-solana-sdk = { path = "../../sdk", version = "=1.7.0" }
+solana-logger = { path = "../../logger", version = "=1.7.11" }
+solana-metrics = { path = "../../metrics", version = "=1.7.11" }
+solana-sdk = { path = "../../sdk", version = "=1.7.11" }
 thiserror = "1.0"
 
 [dev-dependencies]
-solana-runtime = { path = "../../runtime", version = "=1.7.0" }
+solana-runtime = { path = "../../runtime", version = "=1.7.11" }
 
 [lib]
 crate-type = ["lib", "cdylib"]
diff --git a/programs/exchange/src/exchange_processor.rs b/programs/exchange/src/exchange_processor.rs
index f2a36630b57812..ab63cf7ec6fd6d 100644
--- a/programs/exchange/src/exchange_processor.rs
+++ b/programs/exchange/src/exchange_processor.rs
@@ -193,11 +193,11 @@ impl ExchangeProcessor {
             error!("Not enough accounts");
             return Err(InstructionError::InvalidArgument);
         }
-        Self::is_account_unallocated(&keyed_accounts[NEW_ACCOUNT_INDEX].try_account_ref()?.data())?;
+        Self::is_account_unallocated(keyed_accounts[NEW_ACCOUNT_INDEX].try_account_ref()?.data())?;
         Self::serialize(
             &ExchangeState::Account(
                 TokenAccountInfo::default()
-                    .owner(&keyed_accounts[OWNER_INDEX].unsigned_key())
+                    .owner(keyed_accounts[OWNER_INDEX].unsigned_key())
                     .tokens(100_000, 100_000, 100_000, 100_000),
             ),
             &mut keyed_accounts[NEW_ACCOUNT_INDEX]
@@ -221,13 +221,13 @@ impl ExchangeProcessor {
         }
 
         let mut to_account =
-            Self::deserialize_account(&keyed_accounts[TO_ACCOUNT_INDEX].try_account_ref()?.data())?;
+            Self::deserialize_account(keyed_accounts[TO_ACCOUNT_INDEX].try_account_ref()?.data())?;
 
         if &faucet::id() == keyed_accounts[FROM_ACCOUNT_INDEX].unsigned_key() {
             to_account.tokens[token] += tokens;
         } else {
             let state: ExchangeState =
-                bincode::deserialize(&keyed_accounts[FROM_ACCOUNT_INDEX].try_account_ref()?.data())
+                bincode::deserialize(keyed_accounts[FROM_ACCOUNT_INDEX].try_account_ref()?.data())
                     .map_err(Self::map_to_invalid_arg)?;
             match state {
                 ExchangeState::Account(mut from_account) => {
@@ -309,11 +309,10 @@ impl ExchangeProcessor {
             return Err(InstructionError::InvalidArgument);
         }
 
-        Self::is_account_unallocated(&keyed_accounts[ORDER_INDEX].try_account_ref()?.data())?;
+        Self::is_account_unallocated(keyed_accounts[ORDER_INDEX].try_account_ref()?.data())?;
 
-        let mut account = Self::deserialize_account(
-            &keyed_accounts[ACCOUNT_INDEX].try_account_ref_mut()?.data(),
-        )?;
+        let mut account =
+            Self::deserialize_account(keyed_accounts[ACCOUNT_INDEX].try_account_ref_mut()?.data())?;
 
         if &account.owner != keyed_accounts[OWNER_INDEX].unsigned_key() {
             error!("Signer does not own account");
@@ -367,8 +366,7 @@ impl ExchangeProcessor {
             return Err(InstructionError::InvalidArgument);
         }
 
-        let order =
-            Self::deserialize_order(&keyed_accounts[ORDER_INDEX].try_account_ref()?.data())?;
+        let order = Self::deserialize_order(keyed_accounts[ORDER_INDEX].try_account_ref()?.data())?;
 
         if &order.owner != keyed_accounts[OWNER_INDEX].unsigned_key() {
             error!("Signer does not own order");
@@ -404,11 +402,11 @@ impl ExchangeProcessor {
         }
 
         let mut to_order =
-            Self::deserialize_order(&keyed_accounts[TO_ORDER_INDEX].try_account_ref()?.data())?;
+            Self::deserialize_order(keyed_accounts[TO_ORDER_INDEX].try_account_ref()?.data())?;
         let mut from_order =
-            Self::deserialize_order(&keyed_accounts[FROM_ORDER_INDEX].try_account_ref()?.data())?;
+            Self::deserialize_order(keyed_accounts[FROM_ORDER_INDEX].try_account_ref()?.data())?;
         let mut profit_account = Self::deserialize_account(
-            &keyed_accounts[PROFIT_ACCOUNT_INDEX]
+            keyed_accounts[PROFIT_ACCOUNT_INDEX]
                 .try_account_ref()?
                 .data(),
         )?;
@@ -639,7 +637,7 @@ mod test {
     }
 
     fn create_token_account(client: &BankClient, owner: &Keypair) -> Pubkey {
-        let new = create_account(&client, &owner);
+        let new = create_account(client, owner);
         let instruction = exchange_instruction::account_request(&owner.pubkey(), &new);
         client
             .send_and_confirm_instruction(owner, instruction)
@@ -670,9 +668,9 @@ mod test {
         trade_tokens: u64,
         price: u64,
     ) -> (Pubkey, Pubkey) {
-        let trade = create_account(&client, &owner);
-        let src = create_token_account(&client, &owner);
-        transfer(&client, &owner, &src, from_token, src_tokens);
+        let trade = create_account(client, owner);
+        let src = create_token_account(client, owner);
+        transfer(client, owner, &src, from_token, src_tokens);
 
         let instruction = exchange_instruction::trade_request(
             &owner.pubkey(),
diff --git a/programs/failure/Cargo.toml b/programs/failure/Cargo.toml
index d301bdc8726e88..b786da380ad8e5 100644
--- a/programs/failure/Cargo.toml
+++ b/programs/failure/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "solana-failure-program"
-version = "1.7.0"
+version = "1.7.11"
 description = "Solana failure program"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -10,10 +10,10 @@ documentation = "https://docs.rs/solana-failure-program"
 edition = "2018"
 
 [dependencies]
-solana-sdk = { path = "../../sdk", version = "=1.7.0" }
+solana-sdk = { path = "../../sdk", version = "=1.7.11" }
 
 [dev-dependencies]
-solana-runtime = { path = "../../runtime", version = "=1.7.0" }
+solana-runtime = { path = "../../runtime", version = "=1.7.11" }
 
 [lib]
 crate-type = ["lib", "cdylib"]
diff --git a/programs/noop/Cargo.toml b/programs/noop/Cargo.toml
index 3dda2ca82aff78..0786729c33f46d 100644
--- a/programs/noop/Cargo.toml
+++ b/programs/noop/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "solana-noop-program"
-version = "1.7.0"
+version = "1.7.11"
 description = "Solana Noop program"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -11,8 +11,8 @@ edition = "2018"
 
 [dependencies]
 log = "0.4.11"
-solana-logger = { path = "../../logger", version = "=1.7.0" }
-solana-sdk = { path = "../../sdk", version = "=1.7.0" }
+solana-logger = { path = "../../logger", version = "=1.7.11" }
+solana-sdk = { path = "../../sdk", version = "=1.7.11" }
 
 [lib]
 crate-type = ["lib", "cdylib"]
diff --git a/programs/ownable/Cargo.toml b/programs/ownable/Cargo.toml
index 48abee2f517c3b..58d8211d0e60b9 100644
--- a/programs/ownable/Cargo.toml
+++ b/programs/ownable/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "solana-ownable"
-version = "1.7.0"
+version = "1.7.11"
 description = "ownable program"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -11,13 +11,13 @@ edition = "2018"
 
 [dependencies]
 bincode = "1.3.1"
-solana-sdk = { path = "../../sdk", version = "=1.7.0" }
+solana-sdk = { path = "../../sdk", version = "=1.7.11" }
 num-derive = "0.3"
 num-traits = "0.2"
 thiserror = "1.0"
 
 [dev-dependencies]
-solana-runtime = { path = "../../runtime", version = "=1.7.0" }
+solana-runtime = { path = "../../runtime", version = "=1.7.11" }
 
 [lib]
 crate-type = ["lib", "cdylib"]
diff --git a/programs/ownable/src/ownable_instruction.rs b/programs/ownable/src/ownable_instruction.rs
index 2e4cb1c5b0c188..d9c7dab4e20940 100644
--- a/programs/ownable/src/ownable_instruction.rs
+++ b/programs/ownable/src/ownable_instruction.rs
@@ -33,7 +33,7 @@ pub fn create_account(
     let space = std::mem::size_of::<Pubkey>() as u64;
     vec![
         system_instruction::create_account(
-            &payer_pubkey,
+            payer_pubkey,
             account_pubkey,
             lamports,
             space,
diff --git a/programs/ownable/src/ownable_processor.rs b/programs/ownable/src/ownable_processor.rs
index d9532922cada79..b6696614cf24ce 100644
--- a/programs/ownable/src/ownable_processor.rs
+++ b/programs/ownable/src/ownable_processor.rs
@@ -38,7 +38,7 @@ pub fn process_instruction(
     let new_owner_pubkey: Pubkey = limited_deserialize(data)?;
     let account_keyed_account = &mut keyed_account_at_index(keyed_accounts, 0)?;
     let mut account_owner_pubkey: Pubkey =
-        limited_deserialize(&account_keyed_account.try_account_ref()?.data())?;
+        limited_deserialize(account_keyed_account.try_account_ref()?.data())?;
 
     if account_owner_pubkey == Pubkey::default() {
         account_owner_pubkey = new_owner_pubkey;
@@ -47,7 +47,7 @@ pub fn process_instruction(
         set_owner(
             &mut account_owner_pubkey,
             new_owner_pubkey,
-            &owner_keyed_account,
+            owner_keyed_account,
         )?;
     }
 
diff --git a/programs/secp256k1/Cargo.toml b/programs/secp256k1/Cargo.toml
index d46e810ff41516..255028768588ee 100644
--- a/programs/secp256k1/Cargo.toml
+++ b/programs/secp256k1/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "solana-secp256k1-program"
 description = "Solana Secp256k1 program"
-version = "1.7.0"
+version = "1.7.11"
 homepage = "https://solana.com/"
 documentation = "https://docs.rs/solana-secp256k1-program"
 repository = "https://github.com/solana-labs/solana"
@@ -10,13 +10,13 @@ license = "Apache-2.0"
 edition = "2018"
 
 [dependencies]
-solana-sdk = { path = "../../sdk", version = "=1.7.0" }
-libsecp256k1 = "0.3.5"
-sha3 = "0.9.1"
-digest = "0.9.0"
+solana-sdk = { path = "../../sdk", version = "=1.7.11" }
+
+[dev-dependencies]
 bincode = "1.3.1"
+libsecp256k1 = "0.5.0"
 rand = "0.7.0"
-solana-logger = { path = "../../logger", version = "=1.7.0" }
+solana-logger = { path = "../../logger", version = "=1.7.11" }
 
 [lib]
 crate-type = ["lib"]
diff --git a/programs/secp256k1/src/lib.rs b/programs/secp256k1/src/lib.rs
index ebb29bd80153b4..2f1aee3e1e0a62 100644
--- a/programs/secp256k1/src/lib.rs
+++ b/programs/secp256k1/src/lib.rs
@@ -32,7 +32,7 @@ pub mod test {
             SIGNATURE_OFFSETS_SERIALIZED_SIZE
         );
 
-        let secp_privkey = secp256k1::SecretKey::random(&mut thread_rng());
+        let secp_privkey = libsecp256k1::SecretKey::random(&mut thread_rng());
         let message_arr = b"hello";
         let mut secp_instruction = new_secp256k1_instruction(&secp_privkey, message_arr);
         let mint_keypair = Keypair::new();
@@ -44,7 +44,7 @@ pub mod test {
             Hash::default(),
         );
 
-        assert!(tx.verify_precompiles().is_ok());
+        assert!(tx.verify_precompiles(false).is_ok());
 
         let index = thread_rng().gen_range(0, secp_instruction.data.len());
         secp_instruction.data[index] = secp_instruction.data[index].wrapping_add(12);
@@ -54,6 +54,6 @@ pub mod test {
             &[&mint_keypair],
             Hash::default(),
         );
-        assert!(tx.verify_precompiles().is_err());
+        assert!(tx.verify_precompiles(false).is_err());
     }
 }
diff --git a/programs/stake/Cargo.toml b/programs/stake/Cargo.toml
index f884977e5c3ba8..1f0707d42cfd20 100644
--- a/programs/stake/Cargo.toml
+++ b/programs/stake/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "solana-stake-program"
-version = "1.7.0"
+version = "1.7.11"
 description = "Solana Stake program"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -16,16 +16,17 @@ num-derive = "0.3"
 num-traits = "0.2"
 serde = "1.0.122"
 serde_derive = "1.0.103"
-solana-frozen-abi = { path = "../../frozen-abi", version = "=1.7.0" }
-solana-frozen-abi-macro = { path = "../../frozen-abi/macro", version = "=1.7.0" }
-solana-metrics = { path = "../../metrics", version = "=1.7.0" }
-solana-sdk = { path = "../../sdk", version = "=1.7.0" }
-solana-vote-program = { path = "../vote", version = "=1.7.0" }
-solana-config-program = { path = "../config", version = "=1.7.0" }
+solana-frozen-abi = { path = "../../frozen-abi", version = "=1.7.11" }
+solana-frozen-abi-macro = { path = "../../frozen-abi/macro", version = "=1.7.11" }
+solana-metrics = { path = "../../metrics", version = "=1.7.11" }
+solana-sdk = { path = "../../sdk", version = "=1.7.11" }
+solana-vote-program = { path = "../vote", version = "=1.7.11" }
+solana-config-program = { path = "../config", version = "=1.7.11" }
 thiserror = "1.0"
 
 [dev-dependencies]
-solana-logger = { path = "../../logger", version = "=1.7.0" }
+proptest = "1.0"
+solana-logger = { path = "../../logger", version = "=1.7.11" }
 
 [build-dependencies]
 rustc_version = "0.2"
diff --git a/programs/stake/src/config.rs b/programs/stake/src/config.rs
index ee968d40c4644a..98d5b9df44cd88 100644
--- a/programs/stake/src/config.rs
+++ b/programs/stake/src/config.rs
@@ -1,52 +1,36 @@
 //! config for staking
 //!  carries variables that the stake program cares about
-use bincode::{deserialize, serialized_size};
-use serde_derive::{Deserialize, Serialize};
-use solana_config_program::{create_config_account, get_config_data, ConfigState};
+use bincode::deserialize;
+use solana_config_program::{create_config_account, get_config_data};
 use solana_sdk::{
     account::{AccountSharedData, ReadableAccount, WritableAccount},
     genesis_config::GenesisConfig,
     instruction::InstructionError,
     keyed_account::KeyedAccount,
+    stake::config::{self, Config},
 };
 
-// stake config ID
-solana_sdk::declare_id!("StakeConfig11111111111111111111111111111111");
+#[deprecated(
+    since = "1.7.2",
+    note = "Please use `solana_sdk::stake::config` or `solana_program::stake::config` instead"
+)]
+pub use solana_sdk::stake::config::*;
 
-// means that no more than RATE of current effective stake may be added or subtracted per
-//  epoch
-pub const DEFAULT_WARMUP_COOLDOWN_RATE: f64 = 0.25;
-pub const DEFAULT_SLASH_PENALTY: u8 = ((5 * std::u8::MAX as usize) / 100) as u8;
-
-#[derive(Serialize, Deserialize, Debug, PartialEq, Clone, Copy)]
-pub struct Config {
-    /// how much stake we can activate/deactivate per-epoch as a fraction of currently effective stake
-    pub warmup_cooldown_rate: f64,
-    /// percentage of stake lost when slash, expressed as a portion of std::u8::MAX
-    pub slash_penalty: u8,
+pub fn from<T: ReadableAccount>(account: &T) -> Option<Config> {
+    get_config_data(account.data())
+        .ok()
+        .and_then(|data| deserialize(data).ok())
 }
 
-impl Config {
-    pub fn from<T: ReadableAccount>(account: &T) -> Option<Self> {
-        get_config_data(&account.data())
-            .ok()
-            .and_then(|data| deserialize(data).ok())
-    }
-}
-
-impl Default for Config {
-    fn default() -> Self {
-        Self {
-            warmup_cooldown_rate: DEFAULT_WARMUP_COOLDOWN_RATE,
-            slash_penalty: DEFAULT_SLASH_PENALTY,
-        }
+pub fn from_keyed_account(account: &KeyedAccount) -> Result<Config, InstructionError> {
+    if !config::check_id(account.unsigned_key()) {
+        return Err(InstructionError::InvalidArgument);
     }
+    from(&*account.try_account_ref()?).ok_or(InstructionError::InvalidArgument)
 }
 
-impl ConfigState for Config {
-    fn max_space() -> u64 {
-        serialized_size(&Config::default()).unwrap()
-    }
+pub fn create_account(lamports: u64, config: &Config) -> AccountSharedData {
+    create_config_account(vec![], config, lamports)
 }
 
 pub fn add_genesis_account(genesis_config: &mut GenesisConfig) -> u64 {
@@ -55,22 +39,11 @@ pub fn add_genesis_account(genesis_config: &mut GenesisConfig) -> u64 {
 
     account.set_lamports(lamports.max(1));
 
-    genesis_config.add_account(id(), account);
+    genesis_config.add_account(config::id(), account);
 
     lamports
 }
 
-pub fn create_account(lamports: u64, config: &Config) -> AccountSharedData {
-    create_config_account(vec![], config, lamports)
-}
-
-pub fn from_keyed_account(account: &KeyedAccount) -> Result<Config, InstructionError> {
-    if !check_id(account.unsigned_key()) {
-        return Err(InstructionError::InvalidArgument);
-    }
-    Config::from(&*account.try_account_ref()?).ok_or(InstructionError::InvalidArgument)
-}
-
 #[cfg(test)]
 mod tests {
     use super::*;
@@ -80,7 +53,7 @@ mod tests {
     #[test]
     fn test() {
         let account = RefCell::new(create_account(0, &Config::default()));
-        assert_eq!(Config::from(&account.borrow()), Some(Config::default()));
+        assert_eq!(from(&account.borrow()), Some(Config::default()));
         assert_eq!(
             from_keyed_account(&KeyedAccount::new(&Pubkey::default(), false, &account)),
             Err(InstructionError::InvalidArgument)
diff --git a/programs/stake/src/lib.rs b/programs/stake/src/lib.rs
index f93ed516563f36..26d9c31df5225c 100644
--- a/programs/stake/src/lib.rs
+++ b/programs/stake/src/lib.rs
@@ -2,15 +2,16 @@
 #![allow(clippy::integer_arithmetic)]
 use solana_sdk::genesis_config::GenesisConfig;
 
+#[deprecated(
+    since = "1.7.2",
+    note = "Please use `solana_sdk::stake::program::id` or `solana_program::stake::program::id` instead"
+)]
+pub use solana_sdk::stake::program::{check_id, id};
+
 pub mod config;
 pub mod stake_instruction;
 pub mod stake_state;
 
-solana_sdk::declare_id!("Stake11111111111111111111111111111111111111");
-
 pub fn add_genesis_accounts(genesis_config: &mut GenesisConfig) -> u64 {
     config::add_genesis_account(genesis_config)
 }
-
-#[macro_use]
-extern crate solana_frozen_abi_macro;
diff --git a/programs/stake/src/stake_instruction.rs b/programs/stake/src/stake_instruction.rs
index 410bb1000be727..f8258a82dfae9c 100644
--- a/programs/stake/src/stake_instruction.rs
+++ b/programs/stake/src/stake_instruction.rs
@@ -1,488 +1,27 @@
-use crate::{
-    config, id,
-    stake_state::{Authorized, Lockup, StakeAccount, StakeAuthorize, StakeState},
+use {
+    crate::{config, stake_state::StakeAccount},
+    log::*,
+    solana_sdk::{
+        feature_set,
+        instruction::InstructionError,
+        keyed_account::{from_keyed_account, get_signers, keyed_account_at_index},
+        process_instruction::{get_sysvar, InvokeContext},
+        program_utils::limited_deserialize,
+        pubkey::Pubkey,
+        stake::{
+            instruction::StakeInstruction,
+            program::id,
+            state::{Authorized, Lockup},
+        },
+        sysvar::{self, clock::Clock, rent::Rent, stake_history::StakeHistory},
+    },
 };
-use log::*;
-use num_derive::{FromPrimitive, ToPrimitive};
-use serde_derive::{Deserialize, Serialize};
-use solana_sdk::{
-    clock::{Epoch, UnixTimestamp},
-    decode_error::DecodeError,
-    feature_set,
-    instruction::{AccountMeta, Instruction, InstructionError},
-    keyed_account::{from_keyed_account, get_signers, keyed_account_at_index},
-    process_instruction::{get_sysvar, InvokeContext},
-    program_utils::limited_deserialize,
-    pubkey::Pubkey,
-    system_instruction,
-    sysvar::{self, clock::Clock, rent::Rent, stake_history::StakeHistory},
-};
-use thiserror::Error;
-
-/// Reasons the stake might have had an error
-#[derive(Error, Debug, Clone, PartialEq, FromPrimitive, ToPrimitive)]
-pub enum StakeError {
-    #[error("not enough credits to redeem")]
-    NoCreditsToRedeem,
-
-    #[error("lockup has not yet expired")]
-    LockupInForce,
-
-    #[error("stake already deactivated")]
-    AlreadyDeactivated,
-
-    #[error("one re-delegation permitted per epoch")]
-    TooSoonToRedelegate,
-
-    #[error("split amount is more than is staked")]
-    InsufficientStake,
-
-    #[error("stake account with transient stake cannot be merged")]
-    MergeTransientStake,
-
-    #[error("stake account merge failed due to different authority, lockups or state")]
-    MergeMismatch,
-
-    #[error("custodian address not present")]
-    CustodianMissing,
-
-    #[error("custodian signature not present")]
-    CustodianSignatureMissing,
-}
-
-impl<E> DecodeError<E> for StakeError {
-    fn type_of() -> &'static str {
-        "StakeError"
-    }
-}
-
-#[derive(Serialize, Deserialize, Debug, PartialEq, Clone)]
-pub enum StakeInstruction {
-    /// Initialize a stake with lockup and authorization information
-    ///
-    /// # Account references
-    ///   0. [WRITE] Uninitialized stake account
-    ///   1. [] Rent sysvar
-    ///
-    /// Authorized carries pubkeys that must sign staker transactions
-    ///   and withdrawer transactions.
-    /// Lockup carries information about withdrawal restrictions
-    Initialize(Authorized, Lockup),
-
-    /// Authorize a key to manage stake or withdrawal
-    ///
-    /// # Account references
-    ///   0. [WRITE] Stake account to be updated
-    ///   1. [] Clock sysvar
-    ///   2. [SIGNER] The stake or withdraw authority
-    ///   3. Optional: [SIGNER] Lockup authority, if updating StakeAuthorize::Withdrawer before
-    ///      lockup expiration
-    Authorize(Pubkey, StakeAuthorize),
-
-    /// Delegate a stake to a particular vote account
-    ///
-    /// # Account references
-    ///   0. [WRITE] Initialized stake account to be delegated
-    ///   1. [] Vote account to which this stake will be delegated
-    ///   2. [] Clock sysvar
-    ///   3. [] Stake history sysvar that carries stake warmup/cooldown history
-    ///   4. [] Address of config account that carries stake config
-    ///   5. [SIGNER] Stake authority
-    ///
-    /// The entire balance of the staking account is staked.  DelegateStake
-    ///   can be called multiple times, but re-delegation is delayed
-    ///   by one epoch
-    DelegateStake,
-
-    /// Split u64 tokens and stake off a stake account into another stake account.
-    ///
-    /// # Account references
-    ///   0. [WRITE] Stake account to be split; must be in the Initialized or Stake state
-    ///   1. [WRITE] Uninitialized stake account that will take the split-off amount
-    ///   2. [SIGNER] Stake authority
-    Split(u64),
-
-    /// Withdraw unstaked lamports from the stake account
-    ///
-    /// # Account references
-    ///   0. [WRITE] Stake account from which to withdraw
-    ///   1. [WRITE] Recipient account
-    ///   2. [] Clock sysvar
-    ///   3. [] Stake history sysvar that carries stake warmup/cooldown history
-    ///   4. [SIGNER] Withdraw authority
-    ///   5. Optional: [SIGNER] Lockup authority, if before lockup expiration
-    ///
-    /// The u64 is the portion of the stake account balance to be withdrawn,
-    ///    must be `<= StakeAccount.lamports - staked_lamports`.
-    Withdraw(u64),
-
-    /// Deactivates the stake in the account
-    ///
-    /// # Account references
-    ///   0. [WRITE] Delegated stake account
-    ///   1. [] Clock sysvar
-    ///   2. [SIGNER] Stake authority
-    Deactivate,
-
-    /// Set stake lockup
-    ///
-    /// If a lockup is not active, the withdraw authority may set a new lockup
-    /// If a lockup is active, the lockup custodian may update the lockup parameters
-    ///
-    /// # Account references
-    ///   0. [WRITE] Initialized stake account
-    ///   1. [SIGNER] Lockup authority or withdraw authority
-    SetLockup(LockupArgs),
-
-    /// Merge two stake accounts.
-    ///
-    /// Both accounts must have identical lockup and authority keys. A merge
-    /// is possible between two stakes in the following states with no additional
-    /// conditions:
-    ///
-    /// * two deactivated stakes
-    /// * an inactive stake into an activating stake during its activation epoch
-    ///
-    /// For the following cases, the voter pubkey and vote credits observed must match:
-    ///
-    /// * two activated stakes
-    /// * two activating accounts that share an activation epoch, during the activation epoch
-    ///
-    /// All other combinations of stake states will fail to merge, including all
-    /// "transient" states, where a stake is activating or deactivating with a
-    /// non-zero effective stake.
-    ///
-    /// # Account references
-    ///   0. [WRITE] Destination stake account for the merge
-    ///   1. [WRITE] Source stake account for to merge.  This account will be drained
-    ///   2. [] Clock sysvar
-    ///   3. [] Stake history sysvar that carries stake warmup/cooldown history
-    ///   4. [SIGNER] Stake authority
-    Merge,
-
-    /// Authorize a key to manage stake or withdrawal with a derived key
-    ///
-    /// # Account references
-    ///   0. [WRITE] Stake account to be updated
-    ///   1. [SIGNER] Base key of stake or withdraw authority
-    ///   2. [] Clock sysvar
-    ///   3. Optional: [SIGNER] Lockup authority, if updating StakeAuthorize::Withdrawer before
-    ///      lockup expiration
-    AuthorizeWithSeed(AuthorizeWithSeedArgs),
-}
-
-#[derive(Default, Debug, Serialize, Deserialize, PartialEq, Clone, Copy)]
-pub struct LockupArgs {
-    pub unix_timestamp: Option<UnixTimestamp>,
-    pub epoch: Option<Epoch>,
-    pub custodian: Option<Pubkey>,
-}
-
-#[derive(Debug, Serialize, Deserialize, PartialEq, Clone)]
-pub struct AuthorizeWithSeedArgs {
-    pub new_authorized_pubkey: Pubkey,
-    pub stake_authorize: StakeAuthorize,
-    pub authority_seed: String,
-    pub authority_owner: Pubkey,
-}
-
-fn initialize(stake_pubkey: &Pubkey, authorized: &Authorized, lockup: &Lockup) -> Instruction {
-    Instruction::new_with_bincode(
-        id(),
-        &StakeInstruction::Initialize(*authorized, *lockup),
-        vec![
-            AccountMeta::new(*stake_pubkey, false),
-            AccountMeta::new_readonly(sysvar::rent::id(), false),
-        ],
-    )
-}
-
-pub fn create_account_with_seed(
-    from_pubkey: &Pubkey,
-    stake_pubkey: &Pubkey,
-    base: &Pubkey,
-    seed: &str,
-    authorized: &Authorized,
-    lockup: &Lockup,
-    lamports: u64,
-) -> Vec<Instruction> {
-    vec![
-        system_instruction::create_account_with_seed(
-            from_pubkey,
-            stake_pubkey,
-            base,
-            seed,
-            lamports,
-            std::mem::size_of::<StakeState>() as u64,
-            &id(),
-        ),
-        initialize(stake_pubkey, authorized, lockup),
-    ]
-}
-
-pub fn create_account(
-    from_pubkey: &Pubkey,
-    stake_pubkey: &Pubkey,
-    authorized: &Authorized,
-    lockup: &Lockup,
-    lamports: u64,
-) -> Vec<Instruction> {
-    vec![
-        system_instruction::create_account(
-            from_pubkey,
-            stake_pubkey,
-            lamports,
-            std::mem::size_of::<StakeState>() as u64,
-            &id(),
-        ),
-        initialize(stake_pubkey, authorized, lockup),
-    ]
-}
-
-fn _split(
-    stake_pubkey: &Pubkey,
-    authorized_pubkey: &Pubkey,
-    lamports: u64,
-    split_stake_pubkey: &Pubkey,
-) -> Instruction {
-    let account_metas = vec![
-        AccountMeta::new(*stake_pubkey, false),
-        AccountMeta::new(*split_stake_pubkey, false),
-        AccountMeta::new_readonly(*authorized_pubkey, true),
-    ];
-
-    Instruction::new_with_bincode(id(), &StakeInstruction::Split(lamports), account_metas)
-}
-
-pub fn split(
-    stake_pubkey: &Pubkey,
-    authorized_pubkey: &Pubkey,
-    lamports: u64,
-    split_stake_pubkey: &Pubkey,
-) -> Vec<Instruction> {
-    vec![
-        system_instruction::create_account(
-            authorized_pubkey, // Sending 0, so any signer will suffice
-            split_stake_pubkey,
-            0,
-            std::mem::size_of::<StakeState>() as u64,
-            &id(),
-        ),
-        _split(
-            stake_pubkey,
-            authorized_pubkey,
-            lamports,
-            split_stake_pubkey,
-        ),
-    ]
-}
-
-pub fn split_with_seed(
-    stake_pubkey: &Pubkey,
-    authorized_pubkey: &Pubkey,
-    lamports: u64,
-    split_stake_pubkey: &Pubkey, // derived using create_with_seed()
-    base: &Pubkey,               // base
-    seed: &str,                  // seed
-) -> Vec<Instruction> {
-    vec![
-        system_instruction::create_account_with_seed(
-            authorized_pubkey, // Sending 0, so any signer will suffice
-            split_stake_pubkey,
-            base,
-            seed,
-            0,
-            std::mem::size_of::<StakeState>() as u64,
-            &id(),
-        ),
-        _split(
-            stake_pubkey,
-            authorized_pubkey,
-            lamports,
-            split_stake_pubkey,
-        ),
-    ]
-}
-
-pub fn merge(
-    destination_stake_pubkey: &Pubkey,
-    source_stake_pubkey: &Pubkey,
-    authorized_pubkey: &Pubkey,
-) -> Vec<Instruction> {
-    let account_metas = vec![
-        AccountMeta::new(*destination_stake_pubkey, false),
-        AccountMeta::new(*source_stake_pubkey, false),
-        AccountMeta::new_readonly(sysvar::clock::id(), false),
-        AccountMeta::new_readonly(sysvar::stake_history::id(), false),
-        AccountMeta::new_readonly(*authorized_pubkey, true),
-    ];
-
-    vec![Instruction::new_with_bincode(
-        id(),
-        &StakeInstruction::Merge,
-        account_metas,
-    )]
-}
-
-pub fn create_account_and_delegate_stake(
-    from_pubkey: &Pubkey,
-    stake_pubkey: &Pubkey,
-    vote_pubkey: &Pubkey,
-    authorized: &Authorized,
-    lockup: &Lockup,
-    lamports: u64,
-) -> Vec<Instruction> {
-    let mut instructions = create_account(from_pubkey, stake_pubkey, authorized, lockup, lamports);
-    instructions.push(delegate_stake(
-        stake_pubkey,
-        &authorized.staker,
-        vote_pubkey,
-    ));
-    instructions
-}
-
-pub fn create_account_with_seed_and_delegate_stake(
-    from_pubkey: &Pubkey,
-    stake_pubkey: &Pubkey,
-    base: &Pubkey,
-    seed: &str,
-    vote_pubkey: &Pubkey,
-    authorized: &Authorized,
-    lockup: &Lockup,
-    lamports: u64,
-) -> Vec<Instruction> {
-    let mut instructions = create_account_with_seed(
-        from_pubkey,
-        stake_pubkey,
-        base,
-        seed,
-        authorized,
-        lockup,
-        lamports,
-    );
-    instructions.push(delegate_stake(
-        stake_pubkey,
-        &authorized.staker,
-        vote_pubkey,
-    ));
-    instructions
-}
-
-pub fn authorize(
-    stake_pubkey: &Pubkey,
-    authorized_pubkey: &Pubkey,
-    new_authorized_pubkey: &Pubkey,
-    stake_authorize: StakeAuthorize,
-    custodian_pubkey: Option<&Pubkey>,
-) -> Instruction {
-    let mut account_metas = vec![
-        AccountMeta::new(*stake_pubkey, false),
-        AccountMeta::new_readonly(sysvar::clock::id(), false),
-        AccountMeta::new_readonly(*authorized_pubkey, true),
-    ];
-
-    if let Some(custodian_pubkey) = custodian_pubkey {
-        account_metas.push(AccountMeta::new_readonly(*custodian_pubkey, true));
-    }
-
-    Instruction::new_with_bincode(
-        id(),
-        &StakeInstruction::Authorize(*new_authorized_pubkey, stake_authorize),
-        account_metas,
-    )
-}
-
-pub fn authorize_with_seed(
-    stake_pubkey: &Pubkey,
-    authority_base: &Pubkey,
-    authority_seed: String,
-    authority_owner: &Pubkey,
-    new_authorized_pubkey: &Pubkey,
-    stake_authorize: StakeAuthorize,
-    custodian_pubkey: Option<&Pubkey>,
-) -> Instruction {
-    let mut account_metas = vec![
-        AccountMeta::new(*stake_pubkey, false),
-        AccountMeta::new_readonly(*authority_base, true),
-        AccountMeta::new_readonly(sysvar::clock::id(), false),
-    ];
-
-    if let Some(custodian_pubkey) = custodian_pubkey {
-        account_metas.push(AccountMeta::new_readonly(*custodian_pubkey, true));
-    }
-
-    let args = AuthorizeWithSeedArgs {
-        new_authorized_pubkey: *new_authorized_pubkey,
-        stake_authorize,
-        authority_seed,
-        authority_owner: *authority_owner,
-    };
-
-    Instruction::new_with_bincode(
-        id(),
-        &StakeInstruction::AuthorizeWithSeed(args),
-        account_metas,
-    )
-}
-
-pub fn delegate_stake(
-    stake_pubkey: &Pubkey,
-    authorized_pubkey: &Pubkey,
-    vote_pubkey: &Pubkey,
-) -> Instruction {
-    let account_metas = vec![
-        AccountMeta::new(*stake_pubkey, false),
-        AccountMeta::new_readonly(*vote_pubkey, false),
-        AccountMeta::new_readonly(sysvar::clock::id(), false),
-        AccountMeta::new_readonly(sysvar::stake_history::id(), false),
-        AccountMeta::new_readonly(crate::config::id(), false),
-        AccountMeta::new_readonly(*authorized_pubkey, true),
-    ];
-    Instruction::new_with_bincode(id(), &StakeInstruction::DelegateStake, account_metas)
-}
-
-pub fn withdraw(
-    stake_pubkey: &Pubkey,
-    withdrawer_pubkey: &Pubkey,
-    to_pubkey: &Pubkey,
-    lamports: u64,
-    custodian_pubkey: Option<&Pubkey>,
-) -> Instruction {
-    let mut account_metas = vec![
-        AccountMeta::new(*stake_pubkey, false),
-        AccountMeta::new(*to_pubkey, false),
-        AccountMeta::new_readonly(sysvar::clock::id(), false),
-        AccountMeta::new_readonly(sysvar::stake_history::id(), false),
-        AccountMeta::new_readonly(*withdrawer_pubkey, true),
-    ];
-
-    if let Some(custodian_pubkey) = custodian_pubkey {
-        account_metas.push(AccountMeta::new_readonly(*custodian_pubkey, true));
-    }
 
-    Instruction::new_with_bincode(id(), &StakeInstruction::Withdraw(lamports), account_metas)
-}
-
-pub fn deactivate_stake(stake_pubkey: &Pubkey, authorized_pubkey: &Pubkey) -> Instruction {
-    let account_metas = vec![
-        AccountMeta::new(*stake_pubkey, false),
-        AccountMeta::new_readonly(sysvar::clock::id(), false),
-        AccountMeta::new_readonly(*authorized_pubkey, true),
-    ];
-    Instruction::new_with_bincode(id(), &StakeInstruction::Deactivate, account_metas)
-}
-
-pub fn set_lockup(
-    stake_pubkey: &Pubkey,
-    lockup: &LockupArgs,
-    custodian_pubkey: &Pubkey,
-) -> Instruction {
-    let account_metas = vec![
-        AccountMeta::new(*stake_pubkey, false),
-        AccountMeta::new_readonly(*custodian_pubkey, true),
-    ];
-    Instruction::new_with_bincode(id(), &StakeInstruction::SetLockup(*lockup), account_metas)
-}
+#[deprecated(
+    since = "1.7.2",
+    note = "Please use `solana_sdk::stake::instruction` or `solana_program::stake::instruction` instead"
+)]
+pub use solana_sdk::stake::instruction::*;
 
 pub fn process_instruction(
     _program_id: &Pubkey,
@@ -521,8 +60,9 @@ pub fn process_instruction(
                 let clock =
                     from_keyed_account::<Clock>(keyed_account_at_index(keyed_accounts, 1)?)?;
                 let _current_authority = keyed_account_at_index(keyed_accounts, 2)?;
-                let custodian =
-                    keyed_account_at_index(keyed_accounts, 3).map(|ka| ka.unsigned_key());
+                let custodian = keyed_account_at_index(keyed_accounts, 3)
+                    .ok()
+                    .map(|ka| ka.unsigned_key());
 
                 me.authorize(
                     &signers,
@@ -530,7 +70,7 @@ pub fn process_instruction(
                     stake_authorize,
                     require_custodian_for_locked_stake_authorize,
                     &clock,
-                    custodian.ok(),
+                    custodian,
                 )
             } else {
                 me.authorize(
@@ -552,22 +92,23 @@ pub fn process_instruction(
             if require_custodian_for_locked_stake_authorize {
                 let clock =
                     from_keyed_account::<Clock>(keyed_account_at_index(keyed_accounts, 2)?)?;
-                let custodian =
-                    keyed_account_at_index(keyed_accounts, 3).map(|ka| ka.unsigned_key());
+                let custodian = keyed_account_at_index(keyed_accounts, 3)
+                    .ok()
+                    .map(|ka| ka.unsigned_key());
 
                 me.authorize_with_seed(
-                    &authority_base,
+                    authority_base,
                     &args.authority_seed,
                     &args.authority_owner,
                     &args.new_authorized_pubkey,
                     args.stake_authorize,
                     require_custodian_for_locked_stake_authorize,
                     &clock,
-                    custodian.ok(),
+                    custodian,
                 )
             } else {
                 me.authorize_with_seed(
-                    &authority_base,
+                    authority_base,
                     &args.authority_seed,
                     &args.authority_owner,
                     &args.new_authorized_pubkey,
@@ -584,7 +125,7 @@ pub fn process_instruction(
             let vote = keyed_account_at_index(keyed_accounts, 1)?;
 
             me.delegate(
-                &vote,
+                vote,
                 &from_keyed_account::<Clock>(keyed_account_at_index(keyed_accounts, 2)?)?,
                 &from_keyed_account::<StakeHistory>(keyed_account_at_index(keyed_accounts, 3)?)?,
                 &config::from_keyed_account(keyed_account_at_index(keyed_accounts, 4)?)?,
@@ -609,7 +150,6 @@ pub fn process_instruction(
                 can_merge_expired_lockups,
             )
         }
-
         StakeInstruction::Withdraw(lamports) => {
             let to = &keyed_account_at_index(keyed_accounts, 1)?;
             me.withdraw(
@@ -626,7 +166,6 @@ pub fn process_instruction(
             &from_keyed_account::<Clock>(keyed_account_at_index(keyed_accounts, 1)?)?,
             &signers,
         ),
-
         StakeInstruction::SetLockup(lockup) => {
             let clock = if invoke_context.is_feature_active(&feature_set::stake_program_v4::id()) {
                 Some(get_sysvar::<Clock>(invoke_context, &sysvar::clock::id())?)
@@ -635,22 +174,123 @@ pub fn process_instruction(
             };
             me.set_lockup(&lockup, &signers, clock.as_ref())
         }
+        StakeInstruction::InitializeChecked => {
+            if invoke_context.is_feature_active(&feature_set::vote_stake_checked_instructions::id())
+            {
+                let authorized = Authorized {
+                    staker: *keyed_account_at_index(keyed_accounts, 2)?.unsigned_key(),
+                    withdrawer: *keyed_account_at_index(keyed_accounts, 3)?
+                        .signer_key()
+                        .ok_or(InstructionError::MissingRequiredSignature)?,
+                };
+
+                me.initialize(
+                    &authorized,
+                    &Lockup::default(),
+                    &from_keyed_account::<Rent>(keyed_account_at_index(keyed_accounts, 1)?)?,
+                )
+            } else {
+                Err(InstructionError::InvalidInstructionData)
+            }
+        }
+        StakeInstruction::AuthorizeChecked(stake_authorize) => {
+            if invoke_context.is_feature_active(&feature_set::vote_stake_checked_instructions::id())
+            {
+                let clock =
+                    from_keyed_account::<Clock>(keyed_account_at_index(keyed_accounts, 1)?)?;
+                let _current_authority = keyed_account_at_index(keyed_accounts, 2)?;
+                let authorized_pubkey = &keyed_account_at_index(keyed_accounts, 3)?
+                    .signer_key()
+                    .ok_or(InstructionError::MissingRequiredSignature)?;
+                let custodian = keyed_account_at_index(keyed_accounts, 4)
+                    .ok()
+                    .map(|ka| ka.unsigned_key());
+
+                me.authorize(
+                    &signers,
+                    authorized_pubkey,
+                    stake_authorize,
+                    true,
+                    &clock,
+                    custodian,
+                )
+            } else {
+                Err(InstructionError::InvalidInstructionData)
+            }
+        }
+        StakeInstruction::AuthorizeCheckedWithSeed(args) => {
+            if invoke_context.is_feature_active(&feature_set::vote_stake_checked_instructions::id())
+            {
+                let authority_base = keyed_account_at_index(keyed_accounts, 1)?;
+                let clock =
+                    from_keyed_account::<Clock>(keyed_account_at_index(keyed_accounts, 2)?)?;
+                let authorized_pubkey = &keyed_account_at_index(keyed_accounts, 3)?
+                    .signer_key()
+                    .ok_or(InstructionError::MissingRequiredSignature)?;
+                let custodian = keyed_account_at_index(keyed_accounts, 4)
+                    .ok()
+                    .map(|ka| ka.unsigned_key());
+
+                me.authorize_with_seed(
+                    authority_base,
+                    &args.authority_seed,
+                    &args.authority_owner,
+                    authorized_pubkey,
+                    args.stake_authorize,
+                    true,
+                    &clock,
+                    custodian,
+                )
+            } else {
+                Err(InstructionError::InvalidInstructionData)
+            }
+        }
+        StakeInstruction::SetLockupChecked(lockup_checked) => {
+            if invoke_context.is_feature_active(&feature_set::vote_stake_checked_instructions::id())
+            {
+                let custodian = if let Ok(custodian) = keyed_account_at_index(keyed_accounts, 2) {
+                    Some(
+                        *custodian
+                            .signer_key()
+                            .ok_or(InstructionError::MissingRequiredSignature)?,
+                    )
+                } else {
+                    None
+                };
+
+                let lockup = LockupArgs {
+                    unix_timestamp: lockup_checked.unix_timestamp,
+                    epoch: lockup_checked.epoch,
+                    custodian,
+                };
+                let clock = Some(get_sysvar::<Clock>(invoke_context, &sysvar::clock::id())?);
+                me.set_lockup(&lockup, &signers, clock.as_ref())
+            } else {
+                Err(InstructionError::InvalidInstructionData)
+            }
+        }
     }
 }
 
 #[cfg(test)]
 mod tests {
     use super::*;
+    use crate::stake_state::{Meta, StakeState};
     use bincode::serialize;
     use solana_sdk::{
         account::{self, Account, AccountSharedData, WritableAccount},
+        instruction::{AccountMeta, Instruction},
         keyed_account::KeyedAccount,
         process_instruction::{mock_set_sysvar, MockInvokeContext},
         rent::Rent,
+        stake::{
+            config as stake_config,
+            instruction::{self, LockupArgs},
+            state::{Authorized, Lockup, StakeAuthorize},
+        },
         sysvar::stake_history::StakeHistory,
     };
-    use std::cell::RefCell;
-    use std::str::FromStr;
+    use std::{cell::RefCell, rc::Rc, str::FromStr};
 
     fn create_default_account() -> RefCell<AccountSharedData> {
         RefCell::new(AccountSharedData::default())
@@ -692,8 +332,8 @@ mod tests {
                     ))
                 } else if sysvar::stake_history::check_id(&meta.pubkey) {
                     account::create_account_shared_data_for_test(&StakeHistory::default())
-                } else if config::check_id(&meta.pubkey) {
-                    config::create_account(0, &config::Config::default())
+                } else if stake_config::check_id(&meta.pubkey) {
+                    config::create_account(0, &stake_config::Config::default())
                 } else if sysvar::rent::check_id(&meta.pubkey) {
                     account::create_account_shared_data_for_test(&Rent::default())
                 } else if meta.pubkey == invalid_stake_state_pubkey() {
@@ -742,7 +382,7 @@ mod tests {
     #[test]
     fn test_stake_process_instruction() {
         assert_eq!(
-            process_instruction(&initialize(
+            process_instruction(&instruction::initialize(
                 &Pubkey::default(),
                 &Authorized::default(),
                 &Lockup::default()
@@ -750,7 +390,7 @@ mod tests {
             Err(InstructionError::InvalidAccountData),
         );
         assert_eq!(
-            process_instruction(&authorize(
+            process_instruction(&instruction::authorize(
                 &Pubkey::default(),
                 &Pubkey::default(),
                 &Pubkey::default(),
@@ -761,18 +401,18 @@ mod tests {
         );
         assert_eq!(
             process_instruction(
-                &split(
+                &instruction::split(
                     &Pubkey::default(),
                     &Pubkey::default(),
                     100,
                     &invalid_stake_state_pubkey(),
-                )[1]
+                )[2]
             ),
             Err(InstructionError::InvalidAccountData),
         );
         assert_eq!(
             process_instruction(
-                &merge(
+                &instruction::merge(
                     &Pubkey::default(),
                     &invalid_stake_state_pubkey(),
                     &Pubkey::default(),
@@ -782,7 +422,7 @@ mod tests {
         );
         assert_eq!(
             process_instruction(
-                &split_with_seed(
+                &instruction::split_with_seed(
                     &Pubkey::default(),
                     &Pubkey::default(),
                     100,
@@ -794,7 +434,7 @@ mod tests {
             Err(InstructionError::InvalidAccountData),
         );
         assert_eq!(
-            process_instruction(&delegate_stake(
+            process_instruction(&instruction::delegate_stake(
                 &Pubkey::default(),
                 &Pubkey::default(),
                 &invalid_vote_state_pubkey(),
@@ -802,7 +442,7 @@ mod tests {
             Err(InstructionError::InvalidAccountData),
         );
         assert_eq!(
-            process_instruction(&withdraw(
+            process_instruction(&instruction::withdraw(
                 &Pubkey::default(),
                 &Pubkey::default(),
                 &solana_sdk::pubkey::new_rand(),
@@ -812,11 +452,14 @@ mod tests {
             Err(InstructionError::InvalidAccountData),
         );
         assert_eq!(
-            process_instruction(&deactivate_stake(&Pubkey::default(), &Pubkey::default())),
+            process_instruction(&instruction::deactivate_stake(
+                &Pubkey::default(),
+                &Pubkey::default()
+            )),
             Err(InstructionError::InvalidAccountData),
         );
         assert_eq!(
-            process_instruction(&set_lockup(
+            process_instruction(&instruction::set_lockup(
                 &Pubkey::default(),
                 &LockupArgs::default(),
                 &Pubkey::default()
@@ -828,7 +471,7 @@ mod tests {
     #[test]
     fn test_spoofed_stake_accounts() {
         assert_eq!(
-            process_instruction(&initialize(
+            process_instruction(&instruction::initialize(
                 &spoofed_stake_state_pubkey(),
                 &Authorized::default(),
                 &Lockup::default()
@@ -836,7 +479,7 @@ mod tests {
             Err(InstructionError::InvalidAccountOwner),
         );
         assert_eq!(
-            process_instruction(&authorize(
+            process_instruction(&instruction::authorize(
                 &spoofed_stake_state_pubkey(),
                 &Pubkey::default(),
                 &Pubkey::default(),
@@ -847,29 +490,29 @@ mod tests {
         );
         assert_eq!(
             process_instruction(
-                &split(
+                &instruction::split(
                     &spoofed_stake_state_pubkey(),
                     &Pubkey::default(),
                     100,
                     &Pubkey::default(),
-                )[1]
+                )[2]
             ),
             Err(InstructionError::InvalidAccountOwner),
         );
         assert_eq!(
             process_instruction(
-                &split(
+                &instruction::split(
                     &Pubkey::default(),
                     &Pubkey::default(),
                     100,
                     &spoofed_stake_state_pubkey(),
-                )[1]
+                )[2]
             ),
             Err(InstructionError::IncorrectProgramId),
         );
         assert_eq!(
             process_instruction(
-                &merge(
+                &instruction::merge(
                     &spoofed_stake_state_pubkey(),
                     &Pubkey::default(),
                     &Pubkey::default(),
@@ -879,7 +522,7 @@ mod tests {
         );
         assert_eq!(
             process_instruction(
-                &merge(
+                &instruction::merge(
                     &Pubkey::default(),
                     &spoofed_stake_state_pubkey(),
                     &Pubkey::default(),
@@ -889,7 +532,7 @@ mod tests {
         );
         assert_eq!(
             process_instruction(
-                &split_with_seed(
+                &instruction::split_with_seed(
                     &spoofed_stake_state_pubkey(),
                     &Pubkey::default(),
                     100,
@@ -901,7 +544,7 @@ mod tests {
             Err(InstructionError::InvalidAccountOwner),
         );
         assert_eq!(
-            process_instruction(&delegate_stake(
+            process_instruction(&instruction::delegate_stake(
                 &spoofed_stake_state_pubkey(),
                 &Pubkey::default(),
                 &Pubkey::default(),
@@ -909,7 +552,7 @@ mod tests {
             Err(InstructionError::InvalidAccountOwner),
         );
         assert_eq!(
-            process_instruction(&withdraw(
+            process_instruction(&instruction::withdraw(
                 &spoofed_stake_state_pubkey(),
                 &Pubkey::default(),
                 &solana_sdk::pubkey::new_rand(),
@@ -919,14 +562,14 @@ mod tests {
             Err(InstructionError::InvalidAccountOwner),
         );
         assert_eq!(
-            process_instruction(&deactivate_stake(
+            process_instruction(&instruction::deactivate_stake(
                 &spoofed_stake_state_pubkey(),
                 &Pubkey::default()
             )),
             Err(InstructionError::InvalidAccountOwner),
         );
         assert_eq!(
-            process_instruction(&set_lockup(
+            process_instruction(&instruction::set_lockup(
                 &spoofed_stake_state_pubkey(),
                 &LockupArgs::default(),
                 &Pubkey::default()
@@ -1058,8 +701,9 @@ mod tests {
         let stake_history_account = RefCell::new(account::create_account_shared_data_for_test(
             &sysvar::stake_history::StakeHistory::default(),
         ));
-        let config_address = config::id();
-        let config_account = RefCell::new(config::create_account(0, &config::Config::default()));
+        let config_address = stake_config::id();
+        let config_account =
+            RefCell::new(config::create_account(0, &stake_config::Config::default()));
         let keyed_accounts = vec![
             KeyedAccount::new(&stake_address, true, &stake_account),
             KeyedAccount::new(&vote_address, false, &bad_vote_account),
@@ -1149,28 +793,268 @@ mod tests {
     }
 
     #[test]
-    fn test_custom_error_decode() {
-        use num_traits::FromPrimitive;
-        fn pretty_err<T>(err: InstructionError) -> String
-        where
-            T: 'static + std::error::Error + DecodeError<T> + FromPrimitive,
-        {
-            if let InstructionError::Custom(code) = err {
-                let specific_error: T = T::decode_custom_error_to_enum(code).unwrap();
-                format!(
-                    "{:?}: {}::{:?} - {}",
-                    err,
-                    T::type_of(),
-                    specific_error,
-                    specific_error,
-                )
-            } else {
-                "".to_string()
-            }
-        }
+    fn test_stake_checked_instructions() {
+        let stake_address = Pubkey::new_unique();
+        let staker = Pubkey::new_unique();
+        let withdrawer = Pubkey::new_unique();
+
+        // Test InitializeChecked with non-signing withdrawer
+        let mut instruction =
+            initialize_checked(&stake_address, &Authorized { staker, withdrawer });
+        instruction.accounts[3] = AccountMeta::new_readonly(withdrawer, false);
+        assert_eq!(
+            process_instruction(&instruction),
+            Err(InstructionError::MissingRequiredSignature),
+        );
+
+        // Test InitializeChecked with withdrawer signer
+        let stake_account = AccountSharedData::new_ref(
+            1_000_000_000,
+            std::mem::size_of::<crate::stake_state::StakeState>(),
+            &id(),
+        );
+        let rent_address = sysvar::rent::id();
+        let rent_account = RefCell::new(account::create_account_shared_data_for_test(
+            &Rent::default(),
+        ));
+        let staker_account = create_default_account();
+        let withdrawer_account = create_default_account();
+
+        let keyed_accounts = vec![
+            KeyedAccount::new(&stake_address, false, &stake_account),
+            KeyedAccount::new(&rent_address, false, &rent_account),
+            KeyedAccount::new(&staker, false, &staker_account),
+            KeyedAccount::new(&withdrawer, true, &withdrawer_account),
+        ];
+
+        assert_eq!(
+            super::process_instruction(
+                &Pubkey::default(),
+                &serialize(&StakeInstruction::InitializeChecked).unwrap(),
+                &mut MockInvokeContext::new(keyed_accounts)
+            ),
+            Ok(()),
+        );
+
+        // Test AuthorizeChecked with non-signing authority
+        let authorized_address = Pubkey::new_unique();
+        let mut instruction = authorize_checked(
+            &stake_address,
+            &authorized_address,
+            &staker,
+            StakeAuthorize::Staker,
+            None,
+        );
+        instruction.accounts[3] = AccountMeta::new_readonly(staker, false);
+        assert_eq!(
+            process_instruction(&instruction),
+            Err(InstructionError::MissingRequiredSignature),
+        );
+
+        let mut instruction = authorize_checked(
+            &stake_address,
+            &authorized_address,
+            &withdrawer,
+            StakeAuthorize::Withdrawer,
+            None,
+        );
+        instruction.accounts[3] = AccountMeta::new_readonly(withdrawer, false);
         assert_eq!(
-            "Custom(0): StakeError::NoCreditsToRedeem - not enough credits to redeem",
-            pretty_err::<StakeError>(StakeError::NoCreditsToRedeem.into())
+            process_instruction(&instruction),
+            Err(InstructionError::MissingRequiredSignature),
+        );
+
+        // Test AuthorizeChecked with authority signer
+        let stake_account = AccountSharedData::new_ref_data_with_space(
+            42,
+            &StakeState::Initialized(Meta::auto(&authorized_address)),
+            std::mem::size_of::<StakeState>(),
+            &id(),
         )
+        .unwrap();
+        let clock_address = sysvar::clock::id();
+        let clock_account = RefCell::new(account::create_account_shared_data_for_test(
+            &Clock::default(),
+        ));
+        let authorized_account = create_default_account();
+        let new_authorized_account = create_default_account();
+
+        let keyed_accounts = vec![
+            KeyedAccount::new(&stake_address, false, &stake_account),
+            KeyedAccount::new(&clock_address, false, &clock_account),
+            KeyedAccount::new(&authorized_address, true, &authorized_account),
+            KeyedAccount::new(&staker, true, &new_authorized_account),
+        ];
+
+        assert_eq!(
+            super::process_instruction(
+                &Pubkey::default(),
+                &serialize(&StakeInstruction::AuthorizeChecked(StakeAuthorize::Staker)).unwrap(),
+                &mut MockInvokeContext::new(keyed_accounts)
+            ),
+            Ok(()),
+        );
+
+        let keyed_accounts = vec![
+            KeyedAccount::new(&stake_address, false, &stake_account),
+            KeyedAccount::new(&clock_address, false, &clock_account),
+            KeyedAccount::new(&authorized_address, true, &authorized_account),
+            KeyedAccount::new(&withdrawer, true, &new_authorized_account),
+        ];
+
+        assert_eq!(
+            super::process_instruction(
+                &Pubkey::default(),
+                &serialize(&StakeInstruction::AuthorizeChecked(
+                    StakeAuthorize::Withdrawer
+                ))
+                .unwrap(),
+                &mut MockInvokeContext::new(keyed_accounts)
+            ),
+            Ok(()),
+        );
+
+        // Test AuthorizeCheckedWithSeed with non-signing authority
+        let authorized_owner = Pubkey::new_unique();
+        let seed = "test seed";
+        let address_with_seed =
+            Pubkey::create_with_seed(&authorized_owner, seed, &authorized_owner).unwrap();
+        let mut instruction = authorize_checked_with_seed(
+            &stake_address,
+            &authorized_owner,
+            seed.to_string(),
+            &authorized_owner,
+            &staker,
+            StakeAuthorize::Staker,
+            None,
+        );
+        instruction.accounts[3] = AccountMeta::new_readonly(staker, false);
+        assert_eq!(
+            process_instruction(&instruction),
+            Err(InstructionError::MissingRequiredSignature),
+        );
+
+        let mut instruction = authorize_checked_with_seed(
+            &stake_address,
+            &authorized_owner,
+            seed.to_string(),
+            &authorized_owner,
+            &staker,
+            StakeAuthorize::Withdrawer,
+            None,
+        );
+        instruction.accounts[3] = AccountMeta::new_readonly(staker, false);
+        assert_eq!(
+            process_instruction(&instruction),
+            Err(InstructionError::MissingRequiredSignature),
+        );
+
+        // Test AuthorizeCheckedWithSeed with authority signer
+        let stake_account = AccountSharedData::new_ref_data_with_space(
+            42,
+            &StakeState::Initialized(Meta::auto(&address_with_seed)),
+            std::mem::size_of::<StakeState>(),
+            &id(),
+        )
+        .unwrap();
+        let keyed_accounts = vec![
+            KeyedAccount::new(&address_with_seed, false, &stake_account),
+            KeyedAccount::new(&authorized_owner, true, &authorized_account),
+            KeyedAccount::new(&clock_address, false, &clock_account),
+            KeyedAccount::new(&staker, true, &new_authorized_account),
+        ];
+
+        assert_eq!(
+            super::process_instruction(
+                &Pubkey::default(),
+                &serialize(&StakeInstruction::AuthorizeCheckedWithSeed(
+                    AuthorizeCheckedWithSeedArgs {
+                        stake_authorize: StakeAuthorize::Staker,
+                        authority_seed: seed.to_string(),
+                        authority_owner: authorized_owner,
+                    }
+                ))
+                .unwrap(),
+                &mut MockInvokeContext::new(keyed_accounts)
+            ),
+            Ok(()),
+        );
+
+        let keyed_accounts = vec![
+            KeyedAccount::new(&address_with_seed, false, &stake_account),
+            KeyedAccount::new(&authorized_owner, true, &authorized_account),
+            KeyedAccount::new(&clock_address, false, &clock_account),
+            KeyedAccount::new(&withdrawer, true, &new_authorized_account),
+        ];
+
+        assert_eq!(
+            super::process_instruction(
+                &Pubkey::default(),
+                &serialize(&StakeInstruction::AuthorizeCheckedWithSeed(
+                    AuthorizeCheckedWithSeedArgs {
+                        stake_authorize: StakeAuthorize::Withdrawer,
+                        authority_seed: seed.to_string(),
+                        authority_owner: authorized_owner,
+                    }
+                ))
+                .unwrap(),
+                &mut MockInvokeContext::new(keyed_accounts)
+            ),
+            Ok(()),
+        );
+
+        // Test SetLockupChecked with non-signing lockup custodian
+        let custodian = Pubkey::new_unique();
+        let mut instruction = set_lockup_checked(
+            &stake_address,
+            &LockupArgs {
+                unix_timestamp: None,
+                epoch: Some(1),
+                custodian: Some(custodian),
+            },
+            &withdrawer,
+        );
+        instruction.accounts[2] = AccountMeta::new_readonly(custodian, false);
+        assert_eq!(
+            process_instruction(&instruction),
+            Err(InstructionError::MissingRequiredSignature),
+        );
+
+        // Test SetLockupChecked with lockup custodian signer
+        let stake_account = AccountSharedData::new_ref_data_with_space(
+            42,
+            &StakeState::Initialized(Meta::auto(&withdrawer)),
+            std::mem::size_of::<StakeState>(),
+            &id(),
+        )
+        .unwrap();
+        let custodian_account = create_default_account();
+
+        let keyed_accounts = vec![
+            KeyedAccount::new(&stake_address, false, &stake_account),
+            KeyedAccount::new(&withdrawer, true, &withdrawer_account),
+            KeyedAccount::new(&custodian, true, &custodian_account),
+        ];
+
+        let mut invoke_context = MockInvokeContext::new(keyed_accounts);
+        let clock = Clock::default();
+        let mut data = vec![];
+        bincode::serialize_into(&mut data, &clock).unwrap();
+        invoke_context
+            .sysvars
+            .push((sysvar::clock::id(), Some(Rc::new(data))));
+
+        assert_eq!(
+            super::process_instruction(
+                &Pubkey::default(),
+                &serialize(&StakeInstruction::SetLockupChecked(LockupCheckedArgs {
+                    unix_timestamp: None,
+                    epoch: Some(1),
+                }))
+                .unwrap(),
+                &mut invoke_context
+            ),
+            Ok(()),
+        );
     }
 }
diff --git a/programs/stake/src/stake_state.rs b/programs/stake/src/stake_state.rs
index 5e9e41a27e1cf5..cb9775021dec74 100644
--- a/programs/stake/src/stake_state.rs
+++ b/programs/stake/src/stake_state.rs
@@ -3,35 +3,34 @@
 //! * keep track of rewards
 //! * own mining pools
 
-use crate::{
-    config::Config,
-    id,
-    stake_instruction::{LockupArgs, StakeError},
-};
-use serde_derive::{Deserialize, Serialize};
-use solana_sdk::{
-    account::{AccountSharedData, ReadableAccount, WritableAccount},
-    account_utils::{State, StateMut},
-    clock::{Clock, Epoch, UnixTimestamp},
-    ic_msg,
-    instruction::{checked_add, InstructionError},
-    keyed_account::KeyedAccount,
-    process_instruction::InvokeContext,
-    pubkey::Pubkey,
-    rent::{Rent, ACCOUNT_STORAGE_OVERHEAD},
-    stake_history::{StakeHistory, StakeHistoryEntry},
+use {
+    solana_sdk::{
+        account::{AccountSharedData, ReadableAccount, WritableAccount},
+        account_utils::{State, StateMut},
+        clock::{Clock, Epoch},
+        feature_set::stake_merge_with_unmatched_credits_observed,
+        ic_msg,
+        instruction::{checked_add, InstructionError},
+        keyed_account::KeyedAccount,
+        process_instruction::InvokeContext,
+        pubkey::Pubkey,
+        rent::{Rent, ACCOUNT_STORAGE_OVERHEAD},
+        stake::{
+            config::Config,
+            instruction::{LockupArgs, StakeError},
+            program::id,
+        },
+        stake_history::{StakeHistory, StakeHistoryEntry},
+    },
+    solana_vote_program::vote_state::{VoteState, VoteStateVersions},
+    std::{collections::HashSet, convert::TryFrom},
 };
-use solana_vote_program::vote_state::{VoteState, VoteStateVersions};
-use std::{collections::HashSet, convert::TryFrom};
-
-#[derive(Debug, Serialize, Deserialize, PartialEq, Clone, Copy, AbiExample)]
-#[allow(clippy::large_enum_variant)]
-pub enum StakeState {
-    Uninitialized,
-    Initialized(Meta),
-    Stake(Meta, Stake),
-    RewardsPool,
-}
+
+#[deprecated(
+    since = "1.7.2",
+    note = "Please use `solana_sdk::stake::state` or `solana_program::stake::state` instead"
+)]
+pub use solana_sdk::stake::state::*;
 
 #[derive(Debug)]
 pub enum SkippedReason {
@@ -64,489 +63,85 @@ pub(crate) fn null_tracer() -> Option<impl FnMut(&InflationPointCalculationEvent
     None::<fn(&_)>
 }
 
-impl Default for StakeState {
-    fn default() -> Self {
-        StakeState::Uninitialized
-    }
-}
-
-impl StakeState {
-    pub fn get_rent_exempt_reserve(rent: &Rent) -> u64 {
-        rent.minimum_balance(std::mem::size_of::<StakeState>())
-    }
-
-    // utility function, used by Stakes, tests
-    pub fn from<T: ReadableAccount + StateMut<StakeState>>(account: &T) -> Option<StakeState> {
-        account.state().ok()
-    }
-
-    pub fn stake_from<T: ReadableAccount + StateMut<StakeState>>(account: &T) -> Option<Stake> {
-        Self::from(account).and_then(|state: Self| state.stake())
-    }
-    pub fn stake(&self) -> Option<Stake> {
-        match self {
-            StakeState::Stake(_meta, stake) => Some(*stake),
-            _ => None,
-        }
-    }
-
-    pub fn delegation_from(account: &AccountSharedData) -> Option<Delegation> {
-        Self::from(account).and_then(|state: Self| state.delegation())
-    }
-    pub fn delegation(&self) -> Option<Delegation> {
-        match self {
-            StakeState::Stake(_meta, stake) => Some(stake.delegation),
-            _ => None,
-        }
-    }
-
-    pub fn authorized_from(account: &AccountSharedData) -> Option<Authorized> {
-        Self::from(account).and_then(|state: Self| state.authorized())
-    }
-
-    pub fn authorized(&self) -> Option<Authorized> {
-        match self {
-            StakeState::Stake(meta, _stake) => Some(meta.authorized),
-            StakeState::Initialized(meta) => Some(meta.authorized),
-            _ => None,
-        }
-    }
-
-    pub fn lockup_from<T: ReadableAccount + StateMut<StakeState>>(account: &T) -> Option<Lockup> {
-        Self::from(account).and_then(|state: Self| state.lockup())
-    }
-
-    pub fn lockup(&self) -> Option<Lockup> {
-        self.meta().map(|meta| meta.lockup)
-    }
-
-    pub fn meta_from(account: &AccountSharedData) -> Option<Meta> {
-        Self::from(account).and_then(|state: Self| state.meta())
-    }
-
-    pub fn meta(&self) -> Option<Meta> {
-        match self {
-            StakeState::Stake(meta, _stake) => Some(*meta),
-            StakeState::Initialized(meta) => Some(*meta),
-            _ => None,
-        }
-    }
+// utility function, used by Stakes, tests
+pub fn from<T: ReadableAccount + StateMut<StakeState>>(account: &T) -> Option<StakeState> {
+    account.state().ok()
 }
 
-#[derive(Debug, Serialize, Deserialize, PartialEq, Clone, Copy, AbiExample)]
-pub enum StakeAuthorize {
-    Staker,
-    Withdrawer,
+pub fn stake_from<T: ReadableAccount + StateMut<StakeState>>(account: &T) -> Option<Stake> {
+    from(account).and_then(|state: StakeState| state.stake())
 }
 
-#[derive(Default, Debug, Serialize, Deserialize, PartialEq, Clone, Copy, AbiExample)]
-pub struct Lockup {
-    /// UnixTimestamp at which this stake will allow withdrawal, unless the
-    ///   transaction is signed by the custodian
-    pub unix_timestamp: UnixTimestamp,
-    /// epoch height at which this stake will allow withdrawal, unless the
-    ///   transaction is signed by the custodian
-    pub epoch: Epoch,
-    /// custodian signature on a transaction exempts the operation from
-    ///  lockup constraints
-    pub custodian: Pubkey,
+pub fn delegation_from(account: &AccountSharedData) -> Option<Delegation> {
+    from(account).and_then(|state: StakeState| state.delegation())
 }
 
-impl Lockup {
-    pub fn is_in_force(&self, clock: &Clock, custodian: Option<&Pubkey>) -> bool {
-        if custodian == Some(&self.custodian) {
-            return false;
-        }
-        self.unix_timestamp > clock.unix_timestamp || self.epoch > clock.epoch
-    }
+pub fn authorized_from(account: &AccountSharedData) -> Option<Authorized> {
+    from(account).and_then(|state: StakeState| state.authorized())
 }
 
-#[derive(Default, Debug, Serialize, Deserialize, PartialEq, Clone, Copy, AbiExample)]
-pub struct Authorized {
-    pub staker: Pubkey,
-    pub withdrawer: Pubkey,
+pub fn lockup_from<T: ReadableAccount + StateMut<StakeState>>(account: &T) -> Option<Lockup> {
+    from(account).and_then(|state: StakeState| state.lockup())
 }
 
-#[derive(Default, Debug, Serialize, Deserialize, PartialEq, Clone, Copy, AbiExample)]
-pub struct Meta {
-    pub rent_exempt_reserve: u64,
-    pub authorized: Authorized,
-    pub lockup: Lockup,
+pub fn meta_from(account: &AccountSharedData) -> Option<Meta> {
+    from(account).and_then(|state: StakeState| state.meta())
 }
 
-impl Meta {
-    pub fn set_lockup(
-        &mut self,
-        lockup: &LockupArgs,
-        signers: &HashSet<Pubkey>,
-        clock: Option<&Clock>,
-    ) -> Result<(), InstructionError> {
-        match clock {
-            None => {
-                // pre-stake_program_v4 behavior: custodian can set lockups at any time
-                if !signers.contains(&self.lockup.custodian) {
-                    return Err(InstructionError::MissingRequiredSignature);
-                }
-            }
-            Some(clock) => {
-                // post-stake_program_v4 behavior:
-                // * custodian can update the lockup while in force
-                // * withdraw authority can set a new lockup
-                //
-                if self.lockup.is_in_force(clock, None) {
-                    if !signers.contains(&self.lockup.custodian) {
-                        return Err(InstructionError::MissingRequiredSignature);
-                    }
-                } else if !signers.contains(&self.authorized.withdrawer) {
-                    return Err(InstructionError::MissingRequiredSignature);
-                }
-            }
-        }
-        if let Some(unix_timestamp) = lockup.unix_timestamp {
-            self.lockup.unix_timestamp = unix_timestamp;
-        }
-        if let Some(epoch) = lockup.epoch {
-            self.lockup.epoch = epoch;
-        }
-        if let Some(custodian) = lockup.custodian {
-            self.lockup.custodian = custodian;
-        }
-        Ok(())
-    }
-
-    pub fn rewrite_rent_exempt_reserve(
-        &mut self,
-        rent: &Rent,
-        data_len: usize,
-    ) -> Option<(u64, u64)> {
-        let corrected_rent_exempt_reserve = rent.minimum_balance(data_len);
-        if corrected_rent_exempt_reserve != self.rent_exempt_reserve {
-            // We forcibly update rent_excempt_reserve even
-            // if rent_exempt_reserve > account_balance, hoping user might restore
-            // rent_exempt status by depositing.
-            let (old, new) = (self.rent_exempt_reserve, corrected_rent_exempt_reserve);
-            self.rent_exempt_reserve = corrected_rent_exempt_reserve;
-            Some((old, new))
+fn redelegate(
+    stake: &mut Stake,
+    stake_lamports: u64,
+    voter_pubkey: &Pubkey,
+    vote_state: &VoteState,
+    clock: &Clock,
+    stake_history: &StakeHistory,
+    config: &Config,
+    can_reverse_deactivation: bool,
+) -> Result<(), StakeError> {
+    // If stake is currently active:
+    if stake.stake(clock.epoch, Some(stake_history)) != 0 {
+        // If pubkey of new voter is the same as current,
+        // and we are scheduled to start deactivating this epoch,
+        // we rescind deactivation
+        if stake.delegation.voter_pubkey == *voter_pubkey
+            && clock.epoch == stake.delegation.deactivation_epoch
+            && can_reverse_deactivation
+        {
+            stake.delegation.deactivation_epoch = std::u64::MAX;
+            return Ok(());
         } else {
-            None
+            // can't redelegate to another pubkey if stake is active.
+            return Err(StakeError::TooSoonToRedelegate);
         }
     }
+    // Either the stake is freshly activated, is active but has been
+    // deactivated this epoch, or has fully de-activated.
+    // Redelegation implies either re-activation or un-deactivation
+
+    stake.delegation.stake = stake_lamports;
+    stake.delegation.activation_epoch = clock.epoch;
+    stake.delegation.deactivation_epoch = std::u64::MAX;
+    stake.delegation.voter_pubkey = *voter_pubkey;
+    stake.delegation.warmup_cooldown_rate = config.warmup_cooldown_rate;
+    stake.credits_observed = vote_state.credits();
+    Ok(())
 }
 
-#[derive(Debug, Serialize, Deserialize, PartialEq, Clone, Copy, AbiExample)]
-pub struct Delegation {
-    /// to whom the stake is delegated
-    pub voter_pubkey: Pubkey,
-    /// activated stake amount, set at delegate() time
-    pub stake: u64,
-    /// epoch at which this stake was activated, std::Epoch::MAX if is a bootstrap stake
-    pub activation_epoch: Epoch,
-    /// epoch the stake was deactivated, std::Epoch::MAX if not deactivated
-    pub deactivation_epoch: Epoch,
-    /// how much stake we can activate per-epoch as a fraction of currently effective stake
-    pub warmup_cooldown_rate: f64,
-}
-
-impl Default for Delegation {
-    fn default() -> Self {
-        Self {
-            voter_pubkey: Pubkey::default(),
-            stake: 0,
-            activation_epoch: 0,
-            deactivation_epoch: std::u64::MAX,
-            warmup_cooldown_rate: Config::default().warmup_cooldown_rate,
-        }
-    }
-}
-
-impl Delegation {
-    pub fn new(
-        voter_pubkey: &Pubkey,
-        stake: u64,
-        activation_epoch: Epoch,
-        warmup_cooldown_rate: f64,
-    ) -> Self {
-        Self {
-            voter_pubkey: *voter_pubkey,
+fn new_stake(
+    stake: u64,
+    voter_pubkey: &Pubkey,
+    vote_state: &VoteState,
+    activation_epoch: Epoch,
+    config: &Config,
+) -> Stake {
+    Stake {
+        delegation: Delegation::new(
+            voter_pubkey,
             stake,
             activation_epoch,
-            warmup_cooldown_rate,
-            ..Delegation::default()
-        }
-    }
-    pub fn is_bootstrap(&self) -> bool {
-        self.activation_epoch == std::u64::MAX
-    }
-
-    pub fn stake(
-        &self,
-        epoch: Epoch,
-        history: Option<&StakeHistory>,
-        fix_stake_deactivate: bool,
-    ) -> u64 {
-        self.stake_activating_and_deactivating(epoch, history, fix_stake_deactivate)
-            .0
-    }
-
-    // returned tuple is (effective, activating, deactivating) stake
-    #[allow(clippy::comparison_chain)]
-    pub fn stake_activating_and_deactivating(
-        &self,
-        target_epoch: Epoch,
-        history: Option<&StakeHistory>,
-        fix_stake_deactivate: bool,
-    ) -> (u64, u64, u64) {
-        let delegated_stake = self.stake;
-
-        // first, calculate an effective and activating stake
-        let (effective_stake, activating_stake) =
-            self.stake_and_activating(target_epoch, history, fix_stake_deactivate);
-
-        // then de-activate some portion if necessary
-        if target_epoch < self.deactivation_epoch {
-            // not deactivated
-            (effective_stake, activating_stake, 0)
-        } else if target_epoch == self.deactivation_epoch {
-            // can only deactivate what's activated
-            (effective_stake, 0, effective_stake.min(delegated_stake))
-        } else if let Some((history, mut prev_epoch, mut prev_cluster_stake)) =
-            history.and_then(|history| {
-                history
-                    .get(&self.deactivation_epoch)
-                    .map(|cluster_stake_at_deactivation_epoch| {
-                        (
-                            history,
-                            self.deactivation_epoch,
-                            cluster_stake_at_deactivation_epoch,
-                        )
-                    })
-            })
-        {
-            // target_epoch > self.deactivation_epoch
-
-            // loop from my deactivation epoch until the target epoch
-            // current effective stake is updated using its previous epoch's cluster stake
-            let mut current_epoch;
-            let mut current_effective_stake = effective_stake;
-            loop {
-                current_epoch = prev_epoch + 1;
-                // if there is no deactivating stake at prev epoch, we should have been
-                // fully undelegated at this moment
-                if prev_cluster_stake.deactivating == 0 {
-                    break;
-                }
-
-                // I'm trying to get to zero, how much of the deactivation in stake
-                //   this account is entitled to take
-                let weight =
-                    current_effective_stake as f64 / prev_cluster_stake.deactivating as f64;
-
-                // portion of newly not-effective cluster stake I'm entitled to at current epoch
-                let newly_not_effective_cluster_stake =
-                    prev_cluster_stake.effective as f64 * self.warmup_cooldown_rate;
-                let newly_not_effective_stake =
-                    ((weight * newly_not_effective_cluster_stake) as u64).max(1);
-
-                current_effective_stake =
-                    current_effective_stake.saturating_sub(newly_not_effective_stake);
-                if current_effective_stake == 0 {
-                    break;
-                }
-
-                if current_epoch >= target_epoch {
-                    break;
-                }
-                if let Some(current_cluster_stake) = history.get(&current_epoch) {
-                    prev_epoch = current_epoch;
-                    prev_cluster_stake = current_cluster_stake;
-                } else {
-                    break;
-                }
-            }
-
-            // deactivating stake should equal to all of currently remaining effective stake
-            (current_effective_stake, 0, current_effective_stake)
-        } else {
-            // no history or I've dropped out of history, so assume fully deactivated
-            (0, 0, 0)
-        }
-    }
-
-    // returned tuple is (effective, activating) stake
-    fn stake_and_activating(
-        &self,
-        target_epoch: Epoch,
-        history: Option<&StakeHistory>,
-        fix_stake_deactivate: bool,
-    ) -> (u64, u64) {
-        let delegated_stake = self.stake;
-
-        if self.is_bootstrap() {
-            // fully effective immediately
-            (delegated_stake, 0)
-        } else if fix_stake_deactivate && self.activation_epoch == self.deactivation_epoch {
-            // activated but instantly deactivated; no stake at all regardless of target_epoch
-            // this must be after the bootstrap check and before all-is-activating check
-            (0, 0)
-        } else if target_epoch == self.activation_epoch {
-            // all is activating
-            (0, delegated_stake)
-        } else if target_epoch < self.activation_epoch {
-            // not yet enabled
-            (0, 0)
-        } else if let Some((history, mut prev_epoch, mut prev_cluster_stake)) =
-            history.and_then(|history| {
-                history
-                    .get(&self.activation_epoch)
-                    .map(|cluster_stake_at_activation_epoch| {
-                        (
-                            history,
-                            self.activation_epoch,
-                            cluster_stake_at_activation_epoch,
-                        )
-                    })
-            })
-        {
-            // target_epoch > self.activation_epoch
-
-            // loop from my activation epoch until the target epoch summing up my entitlement
-            // current effective stake is updated using its previous epoch's cluster stake
-            let mut current_epoch;
-            let mut current_effective_stake = 0;
-            loop {
-                current_epoch = prev_epoch + 1;
-                // if there is no activating stake at prev epoch, we should have been
-                // fully effective at this moment
-                if prev_cluster_stake.activating == 0 {
-                    break;
-                }
-
-                // how much of the growth in stake this account is
-                //  entitled to take
-                let remaining_activating_stake = delegated_stake - current_effective_stake;
-                let weight =
-                    remaining_activating_stake as f64 / prev_cluster_stake.activating as f64;
-
-                // portion of newly effective cluster stake I'm entitled to at current epoch
-                let newly_effective_cluster_stake =
-                    prev_cluster_stake.effective as f64 * self.warmup_cooldown_rate;
-                let newly_effective_stake =
-                    ((weight * newly_effective_cluster_stake) as u64).max(1);
-
-                current_effective_stake += newly_effective_stake;
-                if current_effective_stake >= delegated_stake {
-                    current_effective_stake = delegated_stake;
-                    break;
-                }
-
-                if current_epoch >= target_epoch || current_epoch >= self.deactivation_epoch {
-                    break;
-                }
-                if let Some(current_cluster_stake) = history.get(&current_epoch) {
-                    prev_epoch = current_epoch;
-                    prev_cluster_stake = current_cluster_stake;
-                } else {
-                    break;
-                }
-            }
-
-            (
-                current_effective_stake,
-                delegated_stake - current_effective_stake,
-            )
-        } else {
-            // no history or I've dropped out of history, so assume fully effective
-            (delegated_stake, 0)
-        }
-    }
-
-    pub(crate) fn rewrite_stake(
-        &mut self,
-        account_balance: u64,
-        rent_exempt_balance: u64,
-    ) -> Option<(u64, u64)> {
-        // note that this will intentionally overwrite innocent
-        // deactivated-then-immeditealy-withdrawn stake accounts as well
-        // this is chosen to minimize the risks from complicated logic,
-        // over some unneeded rewrites
-        let corrected_stake = account_balance.saturating_sub(rent_exempt_balance);
-        if self.stake != corrected_stake {
-            // this could result in creating a 0-staked account;
-            // rewards and staking calc can handle it.
-            let (old, new) = (self.stake, corrected_stake);
-            self.stake = corrected_stake;
-            Some((old, new))
-        } else {
-            None
-        }
-    }
-}
-
-#[derive(Debug, Default, Serialize, Deserialize, PartialEq, Clone, Copy, AbiExample)]
-pub struct Stake {
-    pub delegation: Delegation,
-    /// credits observed is credits from vote account state when delegated or redeemed
-    pub credits_observed: u64,
-}
-
-impl Authorized {
-    pub fn auto(authorized: &Pubkey) -> Self {
-        Self {
-            staker: *authorized,
-            withdrawer: *authorized,
-        }
-    }
-    pub fn check(
-        &self,
-        signers: &HashSet<Pubkey>,
-        stake_authorize: StakeAuthorize,
-    ) -> Result<(), InstructionError> {
-        match stake_authorize {
-            StakeAuthorize::Staker if signers.contains(&self.staker) => Ok(()),
-            StakeAuthorize::Withdrawer if signers.contains(&self.withdrawer) => Ok(()),
-            _ => Err(InstructionError::MissingRequiredSignature),
-        }
-    }
-
-    pub fn authorize(
-        &mut self,
-        signers: &HashSet<Pubkey>,
-        new_authorized: &Pubkey,
-        stake_authorize: StakeAuthorize,
-        lockup_custodian_args: Option<(&Lockup, &Clock, Option<&Pubkey>)>,
-    ) -> Result<(), InstructionError> {
-        match stake_authorize {
-            StakeAuthorize::Staker => {
-                // Allow either the staker or the withdrawer to change the staker key
-                if !signers.contains(&self.staker) && !signers.contains(&self.withdrawer) {
-                    return Err(InstructionError::MissingRequiredSignature);
-                }
-                self.staker = *new_authorized
-            }
-            StakeAuthorize::Withdrawer => {
-                if let Some((lockup, clock, custodian)) = lockup_custodian_args {
-                    if lockup.is_in_force(&clock, None) {
-                        match custodian {
-                            None => {
-                                return Err(StakeError::CustodianMissing.into());
-                            }
-                            Some(custodian) => {
-                                if !signers.contains(custodian) {
-                                    return Err(StakeError::CustodianSignatureMissing.into());
-                                }
-
-                                if lockup.is_in_force(&clock, Some(custodian)) {
-                                    return Err(StakeError::LockupInForce.into());
-                                }
-                            }
-                        }
-                    }
-                }
-                self.check(signers, stake_authorize)?;
-                self.withdrawer = *new_authorized
-            }
-        }
-        Ok(())
+            config.warmup_cooldown_rate,
+        ),
+        credits_observed: vote_state.credits(),
     }
 }
 
@@ -560,296 +155,185 @@ pub struct PointValue {
     pub points: u128, // over these points
 }
 
-impl Stake {
-    pub fn stake(
-        &self,
-        epoch: Epoch,
-        history: Option<&StakeHistory>,
-        fix_stake_deactivate: bool,
-    ) -> u64 {
-        self.delegation.stake(epoch, history, fix_stake_deactivate)
+fn redeem_stake_rewards(
+    stake: &mut Stake,
+    point_value: &PointValue,
+    vote_state: &VoteState,
+    stake_history: Option<&StakeHistory>,
+    inflation_point_calc_tracer: &mut Option<impl FnMut(&InflationPointCalculationEvent)>,
+) -> Option<(u64, u64)> {
+    if let Some(inflation_point_calc_tracer) = inflation_point_calc_tracer {
+        inflation_point_calc_tracer(&InflationPointCalculationEvent::CreditsObserved(
+            stake.credits_observed,
+            None,
+        ));
     }
-
-    pub fn redeem_rewards(
-        &mut self,
-        point_value: &PointValue,
-        vote_state: &VoteState,
-        stake_history: Option<&StakeHistory>,
-        inflation_point_calc_tracer: &mut Option<impl FnMut(&InflationPointCalculationEvent)>,
-        fix_stake_deactivate: bool,
-    ) -> Option<(u64, u64)> {
+    calculate_stake_rewards(
+        stake,
+        point_value,
+        vote_state,
+        stake_history,
+        inflation_point_calc_tracer,
+    )
+    .map(|(stakers_reward, voters_reward, credits_observed)| {
         if let Some(inflation_point_calc_tracer) = inflation_point_calc_tracer {
             inflation_point_calc_tracer(&InflationPointCalculationEvent::CreditsObserved(
-                self.credits_observed,
-                None,
+                stake.credits_observed,
+                Some(credits_observed),
             ));
         }
-        self.calculate_rewards(
-            point_value,
-            vote_state,
-            stake_history,
-            inflation_point_calc_tracer,
-            fix_stake_deactivate,
-        )
-        .map(|(stakers_reward, voters_reward, credits_observed)| {
-            if let Some(inflation_point_calc_tracer) = inflation_point_calc_tracer {
-                inflation_point_calc_tracer(&InflationPointCalculationEvent::CreditsObserved(
-                    self.credits_observed,
-                    Some(credits_observed),
-                ));
-            }
-            self.credits_observed = credits_observed;
-            self.delegation.stake += stakers_reward;
-            (stakers_reward, voters_reward)
-        })
-    }
+        stake.credits_observed = credits_observed;
+        stake.delegation.stake += stakers_reward;
+        (stakers_reward, voters_reward)
+    })
+}
 
-    pub fn calculate_points(
-        &self,
-        vote_state: &VoteState,
-        stake_history: Option<&StakeHistory>,
-        inflation_point_calc_tracer: &mut Option<impl FnMut(&InflationPointCalculationEvent)>,
-        fix_stake_deactivate: bool,
-    ) -> u128 {
-        self.calculate_points_and_credits(
-            vote_state,
-            stake_history,
-            inflation_point_calc_tracer,
-            fix_stake_deactivate,
-        )
-        .0
-    }
+fn calculate_stake_points(
+    stake: &Stake,
+    vote_state: &VoteState,
+    stake_history: Option<&StakeHistory>,
+    inflation_point_calc_tracer: &mut Option<impl FnMut(&InflationPointCalculationEvent)>,
+) -> u128 {
+    calculate_stake_points_and_credits(
+        stake,
+        vote_state,
+        stake_history,
+        inflation_point_calc_tracer,
+    )
+    .0
+}
 
-    /// for a given stake and vote_state, calculate how many
-    ///   points were earned (credits * stake) and new value
-    ///   for credits_observed were the points paid
-    fn calculate_points_and_credits(
-        &self,
-        new_vote_state: &VoteState,
-        stake_history: Option<&StakeHistory>,
-        inflation_point_calc_tracer: &mut Option<impl FnMut(&InflationPointCalculationEvent)>,
-        fix_stake_deactivate: bool,
-    ) -> (u128, u64) {
-        // if there is no newer credits since observed, return no point
-        if new_vote_state.credits() <= self.credits_observed {
-            if fix_stake_deactivate {
-                if let Some(inflation_point_calc_tracer) = inflation_point_calc_tracer {
-                    inflation_point_calc_tracer(&SkippedReason::ZeroCreditsAndReturnCurrent.into());
-                }
-                return (0, self.credits_observed);
-            } else {
-                if let Some(inflation_point_calc_tracer) = inflation_point_calc_tracer {
-                    inflation_point_calc_tracer(&SkippedReason::ZeroCreditsAndReturnZero.into());
-                }
-                return (0, 0);
-            }
+/// for a given stake and vote_state, calculate how many
+///   points were earned (credits * stake) and new value
+///   for credits_observed were the points paid
+fn calculate_stake_points_and_credits(
+    stake: &Stake,
+    new_vote_state: &VoteState,
+    stake_history: Option<&StakeHistory>,
+    inflation_point_calc_tracer: &mut Option<impl FnMut(&InflationPointCalculationEvent)>,
+) -> (u128, u64) {
+    // if there is no newer credits since observed, return no point
+    if new_vote_state.credits() <= stake.credits_observed {
+        if let Some(inflation_point_calc_tracer) = inflation_point_calc_tracer {
+            inflation_point_calc_tracer(&SkippedReason::ZeroCreditsAndReturnCurrent.into());
         }
+        return (0, stake.credits_observed);
+    }
+
+    let mut points = 0;
+    let mut new_credits_observed = stake.credits_observed;
+
+    for (epoch, final_epoch_credits, initial_epoch_credits) in
+        new_vote_state.epoch_credits().iter().copied()
+    {
+        let stake_amount = u128::from(stake.delegation.stake(epoch, stake_history));
+
+        // figure out how much this stake has seen that
+        //   for which the vote account has a record
+        let earned_credits = if stake.credits_observed < initial_epoch_credits {
+            // the staker observed the entire epoch
+            final_epoch_credits - initial_epoch_credits
+        } else if stake.credits_observed < final_epoch_credits {
+            // the staker registered sometime during the epoch, partial credit
+            final_epoch_credits - new_credits_observed
+        } else {
+            // the staker has already observed or been redeemed this epoch
+            //  or was activated after this epoch
+            0
+        };
+        let earned_credits = u128::from(earned_credits);
 
-        let mut points = 0;
-        let mut new_credits_observed = self.credits_observed;
+        // don't want to assume anything about order of the iterator...
+        new_credits_observed = new_credits_observed.max(final_epoch_credits);
 
-        for (epoch, final_epoch_credits, initial_epoch_credits) in
-            new_vote_state.epoch_credits().iter().copied()
-        {
-            let stake = u128::from(self.delegation.stake(
+        // finally calculate points for this epoch
+        let earned_points = stake_amount * earned_credits;
+        points += earned_points;
+
+        if let Some(inflation_point_calc_tracer) = inflation_point_calc_tracer {
+            inflation_point_calc_tracer(&InflationPointCalculationEvent::CalculatedPoints(
                 epoch,
-                stake_history,
-                fix_stake_deactivate,
+                stake_amount,
+                earned_credits,
+                earned_points,
             ));
-
-            // figure out how much this stake has seen that
-            //   for which the vote account has a record
-            let earned_credits = if self.credits_observed < initial_epoch_credits {
-                // the staker observed the entire epoch
-                final_epoch_credits - initial_epoch_credits
-            } else if self.credits_observed < final_epoch_credits {
-                // the staker registered sometime during the epoch, partial credit
-                final_epoch_credits - new_credits_observed
-            } else {
-                // the staker has already observed or been redeemed this epoch
-                //  or was activated after this epoch
-                0
-            };
-            let earned_credits = u128::from(earned_credits);
-
-            // don't want to assume anything about order of the iterator...
-            new_credits_observed = new_credits_observed.max(final_epoch_credits);
-
-            // finally calculate points for this epoch
-            let earned_points = stake * earned_credits;
-            points += earned_points;
-
-            if let Some(inflation_point_calc_tracer) = inflation_point_calc_tracer {
-                inflation_point_calc_tracer(&InflationPointCalculationEvent::CalculatedPoints(
-                    epoch,
-                    stake,
-                    earned_credits,
-                    earned_points,
-                ));
-            }
         }
-
-        (points, new_credits_observed)
     }
 
-    /// for a given stake and vote_state, calculate what distributions and what updates should be made
-    /// returns a tuple in the case of a payout of:
-    ///   * staker_rewards to be distributed
-    ///   * voter_rewards to be distributed
-    ///   * new value for credits_observed in the stake
-    /// returns None if there's no payout or if any deserved payout is < 1 lamport
-    pub fn calculate_rewards(
-        &self,
-        point_value: &PointValue,
-        vote_state: &VoteState,
-        stake_history: Option<&StakeHistory>,
-        inflation_point_calc_tracer: &mut Option<impl FnMut(&InflationPointCalculationEvent)>,
-        fix_stake_deactivate: bool,
-    ) -> Option<(u64, u64, u64)> {
-        let (points, credits_observed) = self.calculate_points_and_credits(
-            vote_state,
-            stake_history,
-            inflation_point_calc_tracer,
-            fix_stake_deactivate,
-        );
-
-        // Drive credits_observed forward unconditionally when rewards are disabled
-        if point_value.rewards == 0 && fix_stake_deactivate {
-            return Some((0, 0, credits_observed));
-        }
-
-        if points == 0 {
-            if let Some(inflation_point_calc_tracer) = inflation_point_calc_tracer {
-                inflation_point_calc_tracer(&SkippedReason::ZeroPoints.into());
-            }
-            return None;
-        }
-        if point_value.points == 0 {
-            if let Some(inflation_point_calc_tracer) = inflation_point_calc_tracer {
-                inflation_point_calc_tracer(&SkippedReason::ZeroPointValue.into());
-            }
-            return None;
-        }
+    (points, new_credits_observed)
+}
 
-        let rewards = points
-            .checked_mul(u128::from(point_value.rewards))
-            .unwrap()
-            .checked_div(point_value.points)
-            .unwrap();
+/// for a given stake and vote_state, calculate what distributions and what updates should be made
+/// returns a tuple in the case of a payout of:
+///   * staker_rewards to be distributed
+///   * voter_rewards to be distributed
+///   * new value for credits_observed in the stake
+/// returns None if there's no payout or if any deserved payout is < 1 lamport
+fn calculate_stake_rewards(
+    stake: &Stake,
+    point_value: &PointValue,
+    vote_state: &VoteState,
+    stake_history: Option<&StakeHistory>,
+    inflation_point_calc_tracer: &mut Option<impl FnMut(&InflationPointCalculationEvent)>,
+) -> Option<(u64, u64, u64)> {
+    let (points, credits_observed) = calculate_stake_points_and_credits(
+        stake,
+        vote_state,
+        stake_history,
+        inflation_point_calc_tracer,
+    );
 
-        let rewards = u64::try_from(rewards).unwrap();
+    // Drive credits_observed forward unconditionally when rewards are disabled
+    if point_value.rewards == 0 {
+        return Some((0, 0, credits_observed));
+    }
 
-        // don't bother trying to split if fractional lamports got truncated
-        if rewards == 0 {
-            if let Some(inflation_point_calc_tracer) = inflation_point_calc_tracer {
-                inflation_point_calc_tracer(&SkippedReason::ZeroReward.into());
-            }
-            return None;
+    if points == 0 {
+        if let Some(inflation_point_calc_tracer) = inflation_point_calc_tracer {
+            inflation_point_calc_tracer(&SkippedReason::ZeroPoints.into());
         }
-        let (voter_rewards, staker_rewards, is_split) = vote_state.commission_split(rewards);
+        return None;
+    }
+    if point_value.points == 0 {
         if let Some(inflation_point_calc_tracer) = inflation_point_calc_tracer {
-            inflation_point_calc_tracer(&InflationPointCalculationEvent::SplitRewards(
-                rewards,
-                voter_rewards,
-                staker_rewards,
-                (*point_value).clone(),
-            ));
+            inflation_point_calc_tracer(&SkippedReason::ZeroPointValue.into());
         }
+        return None;
+    }
 
-        if (voter_rewards == 0 || staker_rewards == 0) && is_split {
-            // don't collect if we lose a whole lamport somewhere
-            //  is_split means there should be tokens on both sides,
-            //  uncool to move credits_observed if one side didn't get paid
-            return None;
-        }
+    let rewards = points
+        .checked_mul(u128::from(point_value.rewards))
+        .unwrap()
+        .checked_div(point_value.points)
+        .unwrap();
 
-        Some((staker_rewards, voter_rewards, credits_observed))
-    }
+    let rewards = u64::try_from(rewards).unwrap();
 
-    fn redelegate(
-        &mut self,
-        stake_lamports: u64,
-        voter_pubkey: &Pubkey,
-        vote_state: &VoteState,
-        clock: &Clock,
-        stake_history: &StakeHistory,
-        config: &Config,
-        can_reverse_deactivation: bool,
-    ) -> Result<(), StakeError> {
-        // If stake is currently active:
-        if self.stake(clock.epoch, Some(stake_history), true) != 0 {
-            // If pubkey of new voter is the same as current,
-            // and we are scheduled to start deactivating this epoch,
-            // we rescind deactivation
-            if self.delegation.voter_pubkey == *voter_pubkey
-                && clock.epoch == self.delegation.deactivation_epoch
-                && can_reverse_deactivation
-            {
-                self.delegation.deactivation_epoch = std::u64::MAX;
-                return Ok(());
-            } else {
-                // can't redelegate to another pubkey if stake is active.
-                return Err(StakeError::TooSoonToRedelegate);
-            }
+    // don't bother trying to split if fractional lamports got truncated
+    if rewards == 0 {
+        if let Some(inflation_point_calc_tracer) = inflation_point_calc_tracer {
+            inflation_point_calc_tracer(&SkippedReason::ZeroReward.into());
         }
-        // Either the stake is freshly activated, is active but has been
-        // deactivated this epoch, or has fully de-activated.
-        // Redelegation implies either re-activation or un-deactivation
-
-        self.delegation.stake = stake_lamports;
-        self.delegation.activation_epoch = clock.epoch;
-        self.delegation.deactivation_epoch = std::u64::MAX;
-        self.delegation.voter_pubkey = *voter_pubkey;
-        self.delegation.warmup_cooldown_rate = config.warmup_cooldown_rate;
-        self.credits_observed = vote_state.credits();
-        Ok(())
+        return None;
     }
-
-    fn split(
-        &mut self,
-        remaining_stake_delta: u64,
-        split_stake_amount: u64,
-    ) -> Result<Self, StakeError> {
-        if remaining_stake_delta > self.delegation.stake {
-            return Err(StakeError::InsufficientStake);
-        }
-        self.delegation.stake -= remaining_stake_delta;
-        let new = Self {
-            delegation: Delegation {
-                stake: split_stake_amount,
-                ..self.delegation
-            },
-            ..*self
-        };
-        Ok(new)
+    let (voter_rewards, staker_rewards, is_split) = vote_state.commission_split(rewards);
+    if let Some(inflation_point_calc_tracer) = inflation_point_calc_tracer {
+        inflation_point_calc_tracer(&InflationPointCalculationEvent::SplitRewards(
+            rewards,
+            voter_rewards,
+            staker_rewards,
+            (*point_value).clone(),
+        ));
     }
 
-    fn new(
-        stake: u64,
-        voter_pubkey: &Pubkey,
-        vote_state: &VoteState,
-        activation_epoch: Epoch,
-        config: &Config,
-    ) -> Self {
-        Self {
-            delegation: Delegation::new(
-                voter_pubkey,
-                stake,
-                activation_epoch,
-                config.warmup_cooldown_rate,
-            ),
-            credits_observed: vote_state.credits(),
-        }
+    if (voter_rewards == 0 || staker_rewards == 0) && is_split {
+        // don't collect if we lose a whole lamport somewhere
+        //  is_split means there should be tokens on both sides,
+        //  uncool to move credits_observed if one side didn't get paid
+        return None;
     }
 
-    fn deactivate(&mut self, epoch: Epoch) -> Result<(), StakeError> {
-        if self.delegation.deactivation_epoch != std::u64::MAX {
-            Err(StakeError::AlreadyDeactivated)
-        } else {
-            self.delegation.deactivation_epoch = epoch;
-            Ok(())
-        }
-    }
+    Some((staker_rewards, voter_rewards, credits_observed))
 }
 
 pub trait StakeAccount {
@@ -1012,7 +496,7 @@ impl<'a> StakeAccount for KeyedAccount<'a> {
         }
         self.authorize(
             &signers,
-            &new_authority,
+            new_authority,
             stake_authorize,
             require_custodian_for_locked_stake_authorize,
             clock,
@@ -1035,7 +519,7 @@ impl<'a> StakeAccount for KeyedAccount<'a> {
         match self.state()? {
             StakeState::Initialized(meta) => {
                 meta.authorized.check(signers, StakeAuthorize::Staker)?;
-                let stake = Stake::new(
+                let stake = new_stake(
                     self.lamports()?.saturating_sub(meta.rent_exempt_reserve), // can't stake the rent ;)
                     vote_account.unsigned_key(),
                     &State::<VoteStateVersions>::state(vote_account)?.convert_to_current(),
@@ -1046,7 +530,8 @@ impl<'a> StakeAccount for KeyedAccount<'a> {
             }
             StakeState::Stake(meta, mut stake) => {
                 meta.authorized.check(signers, StakeAuthorize::Staker)?;
-                stake.redelegate(
+                redelegate(
+                    &mut stake,
                     self.lamports()?.saturating_sub(meta.rent_exempt_reserve), // can't stake the rent ;)
                     vote_account.unsigned_key(),
                     &State::<VoteStateVersions>::state(vote_account)?.convert_to_current(),
@@ -1184,7 +669,7 @@ impl<'a> StakeAccount for KeyedAccount<'a> {
                     split.set_state(&StakeState::Initialized(split_meta))?;
                 }
                 StakeState::Uninitialized => {
-                    if !signers.contains(&self.unsigned_key()) {
+                    if !signers.contains(self.unsigned_key()) {
                         return Err(InstructionError::MissingRequiredSignature);
                     }
                 }
@@ -1283,9 +768,7 @@ impl<'a> StakeAccount for KeyedAccount<'a> {
                     .check(&signers, StakeAuthorize::Withdrawer)?;
                 // if we have a deactivation epoch and we're in cooldown
                 let staked = if clock.epoch >= stake.delegation.deactivation_epoch {
-                    stake
-                        .delegation
-                        .stake(clock.epoch, Some(stake_history), true)
+                    stake.delegation.stake(clock.epoch, Some(stake_history))
                 } else {
                     // Assume full stake if the stake account hasn't been
                     //  de-activated, because in the future the exposed stake
@@ -1308,7 +791,7 @@ impl<'a> StakeAccount for KeyedAccount<'a> {
                 (meta.lockup, reserve, false)
             }
             StakeState::Uninitialized => {
-                if !signers.contains(&self.unsigned_key()) {
+                if !signers.contains(self.unsigned_key()) {
                     return Err(InstructionError::MissingRequiredSignature);
                 }
                 (Lockup::default(), 0, false) // no lockup, no restrictions
@@ -1319,7 +802,7 @@ impl<'a> StakeAccount for KeyedAccount<'a> {
         // verify that lockup has expired or that the withdrawal is signed by
         //   the custodian, both epoch and unix_timestamp must have passed
         let custodian_pubkey = custodian.and_then(|keyed_account| keyed_account.signer_key());
-        if lockup.is_in_force(&clock, custodian_pubkey) {
+        if lockup.is_in_force(clock, custodian_pubkey) {
             return Err(StakeError::LockupInForce.into());
         }
 
@@ -1383,11 +866,10 @@ impl MergeKind {
             StakeState::Stake(meta, stake) => {
                 // stake must not be in a transient state. Transient here meaning
                 // activating or deactivating with non-zero effective stake.
-                match stake.delegation.stake_activating_and_deactivating(
-                    clock.epoch,
-                    Some(stake_history),
-                    true,
-                ) {
+                match stake
+                    .delegation
+                    .stake_activating_and_deactivating(clock.epoch, Some(stake_history))
+                {
                     /*
                     (e, a, d): e - effective, a - activating, d - deactivating */
                     (0, 0, 0) => Ok(Self::Inactive(meta, stake_keyed_account.lamports()?)),
@@ -1455,6 +937,7 @@ impl MergeKind {
         }
     }
 
+    // Remove this when the `stake_merge_with_unmatched_credits_observed` feature is removed
     fn active_stakes_can_merge(
         invoke_context: &dyn InvokeContext,
         stake: &Stake,
@@ -1486,7 +969,19 @@ impl MergeKind {
         Self::metas_can_merge(invoke_context, self.meta(), source.meta(), clock)?;
         self.active_stake()
             .zip(source.active_stake())
-            .map(|(stake, source)| Self::active_stakes_can_merge(invoke_context, stake, source))
+            .map(|(stake, source)| {
+                if invoke_context
+                    .is_feature_active(&stake_merge_with_unmatched_credits_observed::id())
+                {
+                    Self::active_delegations_can_merge(
+                        invoke_context,
+                        &stake.delegation,
+                        &source.delegation,
+                    )
+                } else {
+                    Self::active_stakes_can_merge(invoke_context, stake, source)
+                }
+            })
             .unwrap_or(Ok(()))?;
         let merged_state = match (self, source) {
             (Self::Inactive(_, _), Self::Inactive(_, _)) => None,
@@ -1503,7 +998,12 @@ impl MergeKind {
                     source_meta.rent_exempt_reserve,
                     source_stake.delegation.stake,
                 )?;
-                stake.delegation.stake = checked_add(stake.delegation.stake, source_lamports)?;
+                merge_delegation_stake_and_credits_observed(
+                    invoke_context,
+                    &mut stake,
+                    source_lamports,
+                    source_stake.credits_observed,
+                )?;
                 Some(StakeState::Stake(meta, stake))
             }
             (Self::FullyActive(meta, mut stake), Self::FullyActive(_, source_stake)) => {
@@ -1511,8 +1011,12 @@ impl MergeKind {
                 // protect against the magic activation loophole. It will
                 // instead be moved into the destination account as extra,
                 // withdrawable `lamports`
-                stake.delegation.stake =
-                    checked_add(stake.delegation.stake, source_stake.delegation.stake)?;
+                merge_delegation_stake_and_credits_observed(
+                    invoke_context,
+                    &mut stake,
+                    source_stake.delegation.stake,
+                    source_stake.credits_observed,
+                )?;
                 Some(StakeState::Stake(meta, stake))
             }
             _ => return Err(StakeError::MergeMismatch.into()),
@@ -1521,27 +1025,86 @@ impl MergeKind {
     }
 }
 
+fn merge_delegation_stake_and_credits_observed(
+    invoke_context: &dyn InvokeContext,
+    stake: &mut Stake,
+    absorbed_lamports: u64,
+    absorbed_credits_observed: u64,
+) -> Result<(), InstructionError> {
+    if invoke_context.is_feature_active(&stake_merge_with_unmatched_credits_observed::id()) {
+        stake.credits_observed =
+            stake_weighted_credits_observed(stake, absorbed_lamports, absorbed_credits_observed)
+                .ok_or(InstructionError::ArithmeticOverflow)?;
+    }
+    stake.delegation.stake = checked_add(stake.delegation.stake, absorbed_lamports)?;
+    Ok(())
+}
+
+/// Calculate the effective credits observed for two stakes when merging
+///
+/// When merging two `ActivationEpoch` or `FullyActive` stakes, the credits
+/// observed of the merged stake is the weighted average of the two stakes'
+/// credits observed.
+///
+/// This is because we can derive the effective credits_observed by reversing the staking
+/// rewards equation, _while keeping the rewards unchanged after merge (i.e. strong
+/// requirement)_, like below:
+///
+/// a(N) => account, r => rewards, s => stake, c => credits:
+/// assume:
+///   a3 = merge(a1, a2)
+/// then:
+///   a3.s = a1.s + a2.s
+///
+/// Next, given:
+///   aN.r = aN.c * aN.s (for every N)
+/// finally:
+///        a3.r = a1.r + a2.r
+/// a3.c * a3.s = a1.c * a1.s + a2.c * a2.s
+///        a3.c = (a1.c * a1.s + a2.c * a2.s) / (a1.s + a2.s)     // QED
+///
+/// (For this discussion, we omitted irrelevant variables, including distance
+///  calculation against vote_account and point indirection.)
+fn stake_weighted_credits_observed(
+    stake: &Stake,
+    absorbed_lamports: u64,
+    absorbed_credits_observed: u64,
+) -> Option<u64> {
+    if stake.credits_observed == absorbed_credits_observed {
+        Some(stake.credits_observed)
+    } else {
+        let total_stake = u128::from(stake.delegation.stake.checked_add(absorbed_lamports)?);
+        let stake_weighted_credits =
+            u128::from(stake.credits_observed).checked_mul(u128::from(stake.delegation.stake))?;
+        let absorbed_weighted_credits =
+            u128::from(absorbed_credits_observed).checked_mul(u128::from(absorbed_lamports))?;
+        // Discard fractional credits as a merge side-effect friction by taking
+        // the ceiling, done by adding `denominator - 1` to the numerator.
+        let total_weighted_credits = stake_weighted_credits
+            .checked_add(absorbed_weighted_credits)?
+            .checked_add(total_stake)?
+            .checked_sub(1)?;
+        u64::try_from(total_weighted_credits.checked_div(total_stake)?).ok()
+    }
+}
+
 // utility function, used by runtime
 // returns a tuple of (stakers_reward,voters_reward)
 pub fn redeem_rewards(
     rewarded_epoch: Epoch,
     stake_account: &mut AccountSharedData,
     vote_account: &mut AccountSharedData,
+    vote_state: &VoteState,
     point_value: &PointValue,
     stake_history: Option<&StakeHistory>,
     inflation_point_calc_tracer: &mut Option<impl FnMut(&InflationPointCalculationEvent)>,
-    fix_stake_deactivate: bool,
 ) -> Result<(u64, u64), InstructionError> {
     if let StakeState::Stake(meta, mut stake) = stake_account.state()? {
-        let vote_state: VoteState =
-            StateMut::<VoteStateVersions>::state(vote_account)?.convert_to_current();
         if let Some(inflation_point_calc_tracer) = inflation_point_calc_tracer {
             inflation_point_calc_tracer(
-                &InflationPointCalculationEvent::EffectiveStakeAtRewardedEpoch(stake.stake(
-                    rewarded_epoch,
-                    stake_history,
-                    fix_stake_deactivate,
-                )),
+                &InflationPointCalculationEvent::EffectiveStakeAtRewardedEpoch(
+                    stake.stake(rewarded_epoch, stake_history),
+                ),
             );
             inflation_point_calc_tracer(&InflationPointCalculationEvent::RentExemptReserve(
                 meta.rent_exempt_reserve,
@@ -1551,12 +1114,12 @@ pub fn redeem_rewards(
             ));
         }
 
-        if let Some((stakers_reward, voters_reward)) = stake.redeem_rewards(
+        if let Some((stakers_reward, voters_reward)) = redeem_stake_rewards(
+            &mut stake,
             point_value,
-            &vote_state,
+            vote_state,
             stake_history,
             inflation_point_calc_tracer,
-            fix_stake_deactivate,
         ) {
             stake_account.checked_add_lamports(stakers_reward)?;
             vote_account.checked_add_lamports(voters_reward)?;
@@ -1577,17 +1140,16 @@ pub fn calculate_points(
     stake_account: &AccountSharedData,
     vote_account: &AccountSharedData,
     stake_history: Option<&StakeHistory>,
-    fix_stake_deactivate: bool,
 ) -> Result<u128, InstructionError> {
     if let StakeState::Stake(_meta, stake) = stake_account.state()? {
         let vote_state: VoteState =
             StateMut::<VoteStateVersions>::state(vote_account)?.convert_to_current();
 
-        Ok(stake.calculate_points(
+        Ok(calculate_stake_points(
+            &stake,
             &vote_state,
             stake_history,
             &mut null_tracer(),
-            fix_stake_deactivate,
         ))
     } else {
         Err(InstructionError::InvalidAccountData)
@@ -1609,48 +1171,11 @@ fn calculate_split_rent_exempt_reserve(
 
 pub type RewriteStakeStatus = (&'static str, (u64, u64), (u64, u64));
 
-pub fn rewrite_stakes(
-    stake_account: &mut AccountSharedData,
-    rent: &Rent,
-) -> Result<RewriteStakeStatus, InstructionError> {
-    match stake_account.state()? {
-        StakeState::Initialized(mut meta) => {
-            let meta_status = meta.rewrite_rent_exempt_reserve(rent, stake_account.data().len());
-
-            if meta_status.is_none() {
-                return Err(InstructionError::InvalidAccountData);
-            }
-
-            stake_account.set_state(&StakeState::Initialized(meta))?;
-            Ok(("initialized", meta_status.unwrap_or_default(), (0, 0)))
-        }
-        StakeState::Stake(mut meta, mut stake) => {
-            let meta_status = meta.rewrite_rent_exempt_reserve(rent, stake_account.data().len());
-            let stake_status = stake
-                .delegation
-                .rewrite_stake(stake_account.lamports(), meta.rent_exempt_reserve);
-
-            if meta_status.is_none() && stake_status.is_none() {
-                return Err(InstructionError::InvalidAccountData);
-            }
-
-            stake_account.set_state(&StakeState::Stake(meta, stake))?;
-            Ok((
-                "stake",
-                meta_status.unwrap_or_default(),
-                stake_status.unwrap_or_default(),
-            ))
-        }
-        _ => Err(InstructionError::InvalidAccountData),
-    }
-}
-
 // utility function, used by runtime::Stakes, tests
 pub fn new_stake_history_entry<'a, I>(
     epoch: Epoch,
     stakes: I,
     history: Option<&StakeHistory>,
-    fix_stake_deactivate: bool,
 ) -> StakeHistoryEntry
 where
     I: Iterator<Item = &'a Delegation>,
@@ -1661,10 +1186,7 @@ where
         (a.0 + b.0, a.1 + b.1, a.2 + b.2)
     }
     let (effective, activating, deactivating) = stakes.fold((0, 0, 0), |sum, stake| {
-        add(
-            sum,
-            stake.stake_activating_and_deactivating(epoch, history, fix_stake_deactivate),
-        )
+        add(sum, stake.stake_activating_and_deactivating(epoch, history))
     });
 
     StakeHistoryEntry {
@@ -1762,7 +1284,7 @@ fn do_create_account(
                 rent_exempt_reserve,
                 ..Meta::default()
             },
-            Stake::new(
+            new_stake(
                 lamports - rent_exempt_reserve, // underflow is an error, is basically: assert!(lamports > rent_exempt_reserve);
                 voter_pubkey,
                 &vote_state,
@@ -1778,9 +1300,10 @@ fn do_create_account(
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::id;
+    use proptest::prelude::*;
     use solana_sdk::{
         account::{AccountSharedData, WritableAccount},
+        clock::UnixTimestamp,
         native_token,
         process_instruction::MockInvokeContext,
         pubkey::Pubkey,
@@ -1789,15 +1312,6 @@ mod tests {
     use solana_vote_program::vote_state;
     use std::{cell::RefCell, iter::FromIterator};
 
-    impl Meta {
-        pub fn auto(authorized: &Pubkey) -> Self {
-            Self {
-                authorized: Authorized::auto(authorized),
-                ..Meta::default()
-            }
-        }
-    }
-
     #[test]
     fn test_authorized_authorize() {
         let staker = solana_sdk::pubkey::new_rand();
@@ -1944,7 +1458,7 @@ mod tests {
             .set_state(&StakeState::default())
             .expect("set_state");
 
-        assert_eq!(StakeState::stake_from(&stake_account), None);
+        assert_eq!(stake_from(&stake_account), None);
     }
 
     #[test]
@@ -2051,7 +1565,7 @@ mod tests {
             .is_ok());
 
         // verify that delegate() looks right, compare against hand-rolled
-        let stake = StakeState::stake_from(&stake_keyed_account.account.borrow()).unwrap();
+        let stake = stake_from(&stake_keyed_account.account.borrow()).unwrap();
         assert_eq!(
             stake,
             Stake {
@@ -2112,7 +1626,7 @@ mod tests {
             .unwrap();
 
         // verify that deactivation has been cleared
-        let stake = StakeState::stake_from(&stake_keyed_account.account.borrow()).unwrap();
+        let stake = stake_from(&stake_keyed_account.account.borrow()).unwrap();
         assert_eq!(stake.delegation.deactivation_epoch, std::u64::MAX);
 
         // verify that delegate to a different vote account fails
@@ -2167,7 +1681,7 @@ mod tests {
         );
 
         // verify that delegate() looks right, compare against hand-rolled
-        let stake = StakeState::stake_from(&stake_keyed_account.account.borrow()).unwrap();
+        let stake = stake_from(&stake_keyed_account.account.borrow()).unwrap();
         assert_eq!(
             stake,
             Stake {
@@ -2220,7 +1734,6 @@ mod tests {
                 epoch,
                 delegations.iter().chain(bootstrap_delegation.iter()),
                 Some(&stake_history),
-                true,
             );
             stake_history.add(epoch, entry);
         }
@@ -2243,26 +1756,19 @@ mod tests {
         let mut stake_history = StakeHistory::default();
         // assert that this stake follows step function if there's no history
         assert_eq!(
-            stake.stake_activating_and_deactivating(
-                stake.activation_epoch,
-                Some(&stake_history),
-                true
-            ),
+            stake.stake_activating_and_deactivating(stake.activation_epoch, Some(&stake_history),),
             (0, stake.stake, 0)
         );
         for epoch in stake.activation_epoch + 1..stake.deactivation_epoch {
             assert_eq!(
-                stake.stake_activating_and_deactivating(epoch, Some(&stake_history), true),
+                stake.stake_activating_and_deactivating(epoch, Some(&stake_history)),
                 (stake.stake, 0, 0)
             );
         }
         // assert that this stake is full deactivating
         assert_eq!(
-            stake.stake_activating_and_deactivating(
-                stake.deactivation_epoch,
-                Some(&stake_history),
-                true
-            ),
+            stake
+                .stake_activating_and_deactivating(stake.deactivation_epoch, Some(&stake_history),),
             (stake.stake, 0, stake.stake)
         );
         // assert that this stake is fully deactivated if there's no history
@@ -2270,7 +1776,6 @@ mod tests {
             stake.stake_activating_and_deactivating(
                 stake.deactivation_epoch + 1,
                 Some(&stake_history),
-                true,
             ),
             (0, 0, 0)
         );
@@ -2285,7 +1790,7 @@ mod tests {
         );
         // assert that this stake is broken, because above setup is broken
         assert_eq!(
-            stake.stake_activating_and_deactivating(1, Some(&stake_history), true),
+            stake.stake_activating_and_deactivating(1, Some(&stake_history)),
             (0, stake.stake, 0)
         );
 
@@ -2300,7 +1805,7 @@ mod tests {
         );
         // assert that this stake is broken, because above setup is broken
         assert_eq!(
-            stake.stake_activating_and_deactivating(2, Some(&stake_history), true),
+            stake.stake_activating_and_deactivating(2, Some(&stake_history)),
             (increment, stake.stake - increment, 0)
         );
 
@@ -2320,7 +1825,6 @@ mod tests {
             stake.stake_activating_and_deactivating(
                 stake.deactivation_epoch + 1,
                 Some(&stake_history),
-                true,
             ),
             (stake.stake, 0, stake.stake) // says "I'm still waiting for deactivation"
         );
@@ -2339,7 +1843,6 @@ mod tests {
             stake.stake_activating_and_deactivating(
                 stake.deactivation_epoch + 2,
                 Some(&stake_history),
-                true,
             ),
             (stake.stake - increment, 0, stake.stake - increment) // hung, should be lower
         );
@@ -2353,11 +1856,7 @@ mod tests {
             Slow,
         }
 
-        fn do_test(
-            old_behavior: OldDeactivationBehavior,
-            fix_stake_deactivate: bool,
-            expected_stakes: &[(u64, u64, u64)],
-        ) {
+        fn do_test(old_behavior: OldDeactivationBehavior, expected_stakes: &[(u64, u64, u64)]) {
             let cluster_stake = 1_000;
             let activating_stake = 10_000;
             let some_stake = 700;
@@ -2406,49 +1905,12 @@ mod tests {
             assert_eq!(
                 expected_stakes,
                 (0..expected_stakes.len())
-                    .map(|epoch| stake.stake_activating_and_deactivating(
-                        epoch as u64,
-                        Some(&stake_history),
-                        fix_stake_deactivate
-                    ))
+                    .map(|epoch| stake
+                        .stake_activating_and_deactivating(epoch as u64, Some(&stake_history),))
                     .collect::<Vec<_>>()
             );
         }
 
-        #[test]
-        fn test_old_behavior_slow() {
-            do_test(
-                OldDeactivationBehavior::Slow,
-                false,
-                &[
-                    (0, 0, 0),
-                    (13, 0, 13),
-                    (10, 0, 10),
-                    (8, 0, 8),
-                    (0, 0, 0),
-                    (0, 0, 0),
-                    (0, 0, 0),
-                ],
-            );
-        }
-
-        #[test]
-        fn test_old_behavior_stuck() {
-            do_test(
-                OldDeactivationBehavior::Stuck,
-                false,
-                &[
-                    (0, 0, 0),
-                    (17, 0, 17),
-                    (17, 0, 17),
-                    (17, 0, 17),
-                    (17, 0, 17),
-                    (17, 0, 17),
-                    (17, 0, 17),
-                ],
-            );
-        }
-
         #[test]
         fn test_new_behavior_previously_slow() {
             // any stake accounts activated and deactivated at the same epoch
@@ -2456,7 +1918,6 @@ mod tests {
 
             do_test(
                 OldDeactivationBehavior::Slow,
-                true,
                 &[
                     (0, 0, 0),
                     (0, 0, 0),
@@ -2476,7 +1937,6 @@ mod tests {
 
             do_test(
                 OldDeactivationBehavior::Stuck,
-                true,
                 &[
                     (0, 0, 0),
                     (0, 0, 0),
@@ -2573,11 +2033,7 @@ mod tests {
         let calculate_each_staking_status = |stake: &Delegation, epoch_count: usize| -> Vec<_> {
             (0..epoch_count)
                 .map(|epoch| {
-                    stake.stake_activating_and_deactivating(
-                        epoch as u64,
-                        Some(&stake_history),
-                        true,
-                    )
+                    stake.stake_activating_and_deactivating(epoch as u64, Some(&stake_history))
                 })
                 .collect::<Vec<_>>()
         };
@@ -2701,7 +2157,7 @@ mod tests {
                 (0, history.deactivating)
             };
             assert_eq!(
-                stake.stake_activating_and_deactivating(epoch, Some(&stake_history), true),
+                stake.stake_activating_and_deactivating(epoch, Some(&stake_history)),
                 (expected_stake, expected_activating, expected_deactivating)
             );
         }
@@ -2728,7 +2184,7 @@ mod tests {
         for epoch in 0..epochs {
             let stake = delegations
                 .iter()
-                .map(|delegation| delegation.stake(epoch, Some(&stake_history), true))
+                .map(|delegation| delegation.stake(epoch, Some(&stake_history)))
                 .sum::<u64>();
             max_stake = max_stake.max(stake);
             min_stake = min_stake.min(stake);
@@ -2787,7 +2243,7 @@ mod tests {
 
         let mut prev_total_effective_stake = delegations
             .iter()
-            .map(|delegation| delegation.stake(0, Some(&stake_history), true))
+            .map(|delegation| delegation.stake(0, Some(&stake_history)))
             .sum::<u64>();
 
         // uncomment and add ! for fun with graphing
@@ -2795,7 +2251,7 @@ mod tests {
         for epoch in 1..epochs {
             let total_effective_stake = delegations
                 .iter()
-                .map(|delegation| delegation.stake(epoch, Some(&stake_history), true))
+                .map(|delegation| delegation.stake(epoch, Some(&stake_history)))
                 .sum::<u64>();
 
             let delta = if total_effective_stake > prev_total_effective_stake {
@@ -2858,7 +2314,7 @@ mod tests {
         );
         // check that we see what we expect
         assert_eq!(
-            StakeState::from(&stake_keyed_account.account.borrow()).unwrap(),
+            from(&stake_keyed_account.account.borrow()).unwrap(),
             StakeState::Initialized(Meta {
                 lockup: Lockup {
                     unix_timestamp: 0,
@@ -3147,7 +2603,7 @@ mod tests {
         );
 
         if let StakeState::Initialized(Meta { lockup, .. }) =
-            StakeState::from(&stake_keyed_account.account.borrow()).unwrap()
+            from(&stake_keyed_account.account.borrow()).unwrap()
         {
             assert_eq!(lockup.unix_timestamp, 2);
             assert_eq!(lockup.epoch, 1);
@@ -3170,7 +2626,7 @@ mod tests {
         );
 
         if let StakeState::Initialized(Meta { lockup, .. }) =
-            StakeState::from(&stake_keyed_account.account.borrow()).unwrap()
+            from(&stake_keyed_account.account.borrow()).unwrap()
         {
             assert_eq!(lockup.unix_timestamp, 2);
             assert_eq!(lockup.epoch, 3);
@@ -3194,7 +2650,7 @@ mod tests {
         );
 
         if let StakeState::Initialized(Meta { lockup, .. }) =
-            StakeState::from(&stake_keyed_account.account.borrow()).unwrap()
+            from(&stake_keyed_account.account.borrow()).unwrap()
         {
             assert_eq!(lockup.unix_timestamp, 2);
             assert_eq!(lockup.epoch, 3);
@@ -3594,11 +3050,9 @@ mod tests {
         let stake_history = create_stake_history_from_delegations(
             None,
             0..future.epoch,
-            &[
-                StakeState::stake_from(&stake_keyed_account.account.borrow())
-                    .unwrap()
-                    .delegation,
-            ],
+            &[stake_from(&stake_keyed_account.account.borrow())
+                .unwrap()
+                .delegation],
         );
 
         // Try to withdraw stake
@@ -3893,7 +3347,7 @@ mod tests {
         // assume stake.stake() is right
         // bootstrap means fully-vested stake at epoch 0
         let stake_lamports = 1;
-        let mut stake = Stake::new(
+        let mut stake = new_stake(
             stake_lamports,
             &Pubkey::default(),
             &vote_state,
@@ -3904,7 +3358,8 @@ mod tests {
         // this one can't collect now, credits_observed == vote_state.credits()
         assert_eq!(
             None,
-            stake.redeem_rewards(
+            redeem_stake_rewards(
+                &mut stake,
                 &PointValue {
                     rewards: 1_000_000_000,
                     points: 1
@@ -3912,7 +3367,6 @@ mod tests {
                 &vote_state,
                 None,
                 &mut null_tracer(),
-                true,
             )
         );
 
@@ -3923,7 +3377,8 @@ mod tests {
         // this one should be able to collect exactly 2
         assert_eq!(
             Some((stake_lamports * 2, 0)),
-            stake.redeem_rewards(
+            redeem_stake_rewards(
+                &mut stake,
                 &PointValue {
                     rewards: 1,
                     points: 1
@@ -3931,7 +3386,6 @@ mod tests {
                 &vote_state,
                 None,
                 &mut null_tracer(),
-                true,
             )
         );
 
@@ -3948,7 +3402,7 @@ mod tests {
 
         // bootstrap means fully-vested stake at epoch 0 with
         //  10_000_000 SOL is a big but not unreasaonable stake
-        let stake = Stake::new(
+        let stake = new_stake(
             native_token::sol_to_lamports(10_000_000f64),
             &Pubkey::default(),
             &vote_state,
@@ -3959,7 +3413,8 @@ mod tests {
         // this one can't collect now, credits_observed == vote_state.credits()
         assert_eq!(
             None,
-            stake.calculate_rewards(
+            calculate_stake_rewards(
+                &stake,
                 &PointValue {
                     rewards: 1_000_000_000,
                     points: 1
@@ -3967,7 +3422,6 @@ mod tests {
                 &vote_state,
                 None,
                 &mut null_tracer(),
-                true,
             )
         );
 
@@ -3981,7 +3435,7 @@ mod tests {
         // no overflow on points
         assert_eq!(
             u128::from(stake.delegation.stake) * epoch_slots,
-            stake.calculate_points(&vote_state, None, &mut null_tracer(), true)
+            calculate_stake_points(&stake, &vote_state, None, &mut null_tracer())
         );
     }
 
@@ -3990,7 +3444,7 @@ mod tests {
         let mut vote_state = VoteState::default();
         // assume stake.stake() is right
         // bootstrap means fully-vested stake at epoch 0
-        let mut stake = Stake::new(
+        let mut stake = new_stake(
             1,
             &Pubkey::default(),
             &vote_state,
@@ -4001,7 +3455,8 @@ mod tests {
         // this one can't collect now, credits_observed == vote_state.credits()
         assert_eq!(
             None,
-            stake.calculate_rewards(
+            calculate_stake_rewards(
+                &stake,
                 &PointValue {
                     rewards: 1_000_000_000,
                     points: 1
@@ -4009,7 +3464,6 @@ mod tests {
                 &vote_state,
                 None,
                 &mut null_tracer(),
-                true,
             )
         );
 
@@ -4020,7 +3474,8 @@ mod tests {
         // this one should be able to collect exactly 2
         assert_eq!(
             Some((stake.delegation.stake * 2, 0, 2)),
-            stake.calculate_rewards(
+            calculate_stake_rewards(
+                &stake,
                 &PointValue {
                     rewards: 2,
                     points: 2 // all his
@@ -4028,7 +3483,6 @@ mod tests {
                 &vote_state,
                 None,
                 &mut null_tracer(),
-                true,
             )
         );
 
@@ -4036,7 +3490,8 @@ mod tests {
         // this one should be able to collect exactly 1 (already observed one)
         assert_eq!(
             Some((stake.delegation.stake, 0, 2)),
-            stake.calculate_rewards(
+            calculate_stake_rewards(
+                &stake,
                 &PointValue {
                     rewards: 1,
                     points: 1
@@ -4044,7 +3499,6 @@ mod tests {
                 &vote_state,
                 None,
                 &mut null_tracer(),
-                true,
             )
         );
 
@@ -4055,7 +3509,8 @@ mod tests {
         // this one should be able to collect the one just added
         assert_eq!(
             Some((stake.delegation.stake, 0, 3)),
-            stake.calculate_rewards(
+            calculate_stake_rewards(
+                &stake,
                 &PointValue {
                     rewards: 2,
                     points: 2
@@ -4063,7 +3518,6 @@ mod tests {
                 &vote_state,
                 None,
                 &mut null_tracer(),
-                true,
             )
         );
 
@@ -4072,7 +3526,8 @@ mod tests {
         // this one should be able to collect 2 now
         assert_eq!(
             Some((stake.delegation.stake * 2, 0, 4)),
-            stake.calculate_rewards(
+            calculate_stake_rewards(
+                &stake,
                 &PointValue {
                     rewards: 2,
                     points: 2
@@ -4080,7 +3535,6 @@ mod tests {
                 &vote_state,
                 None,
                 &mut null_tracer(),
-                true,
             )
         );
 
@@ -4095,7 +3549,8 @@ mod tests {
                 0,
                 4
             )),
-            stake.calculate_rewards(
+            calculate_stake_rewards(
+                &stake,
                 &PointValue {
                     rewards: 4,
                     points: 4
@@ -4103,7 +3558,6 @@ mod tests {
                 &vote_state,
                 None,
                 &mut null_tracer(),
-                true,
             )
         );
 
@@ -4112,7 +3566,8 @@ mod tests {
         vote_state.commission = 1;
         assert_eq!(
             None, // would be Some((0, 2 * 1 + 1 * 2, 4)),
-            stake.calculate_rewards(
+            calculate_stake_rewards(
+                &stake,
                 &PointValue {
                     rewards: 4,
                     points: 4
@@ -4120,13 +3575,13 @@ mod tests {
                 &vote_state,
                 None,
                 &mut null_tracer(),
-                true,
             )
         );
         vote_state.commission = 99;
         assert_eq!(
             None, // would be Some((0, 2 * 1 + 1 * 2, 4)),
-            stake.calculate_rewards(
+            calculate_stake_rewards(
+                &stake,
                 &PointValue {
                     rewards: 4,
                     points: 4
@@ -4134,7 +3589,6 @@ mod tests {
                 &vote_state,
                 None,
                 &mut null_tracer(),
-                true,
             )
         );
 
@@ -4143,7 +3597,8 @@ mod tests {
         // paying rewards when inflation is turned on.
         assert_eq!(
             Some((0, 0, 4)),
-            stake.calculate_rewards(
+            calculate_stake_rewards(
+                &stake,
                 &PointValue {
                     rewards: 0,
                     points: 4
@@ -4151,7 +3606,6 @@ mod tests {
                 &vote_state,
                 None,
                 &mut null_tracer(),
-                true,
             )
         );
 
@@ -4160,7 +3614,8 @@ mod tests {
         stake.credits_observed = 4;
         assert_eq!(
             Some((0, 0, 4)),
-            stake.calculate_rewards(
+            calculate_stake_rewards(
+                &stake,
                 &PointValue {
                     rewards: 0,
                     points: 4
@@ -4168,18 +3623,13 @@ mod tests {
                 &vote_state,
                 None,
                 &mut null_tracer(),
-                true,
             )
         );
 
         // assert the previous behavior is preserved where fix_stake_deactivate=false
-        assert_eq!(
-            (0, 0),
-            stake.calculate_points_and_credits(&vote_state, None, &mut null_tracer(), false)
-        );
         assert_eq!(
             (0, 4),
-            stake.calculate_points_and_credits(&vote_state, None, &mut null_tracer(), true)
+            calculate_stake_points_and_credits(&stake, &vote_state, None, &mut null_tracer())
         );
     }
 
@@ -4254,7 +3704,7 @@ mod tests {
             Ok(())
         );
         if let StakeState::Initialized(Meta { authorized, .. }) =
-            StakeState::from(&stake_keyed_account.account.borrow()).unwrap()
+            from(&stake_keyed_account.account.borrow()).unwrap()
         {
             assert_eq!(authorized.staker, stake_pubkey0);
             assert_eq!(authorized.withdrawer, stake_pubkey0);
@@ -4292,7 +3742,7 @@ mod tests {
             Ok(())
         );
         if let StakeState::Initialized(Meta { authorized, .. }) =
-            StakeState::from(&stake_keyed_account.account.borrow()).unwrap()
+            from(&stake_keyed_account.account.borrow()).unwrap()
         {
             assert_eq!(authorized.staker, stake_pubkey2);
         }
@@ -4309,7 +3759,7 @@ mod tests {
             Ok(())
         );
         if let StakeState::Initialized(Meta { authorized, .. }) =
-            StakeState::from(&stake_keyed_account.account.borrow()).unwrap()
+            from(&stake_keyed_account.account.borrow()).unwrap()
         {
             assert_eq!(authorized.staker, stake_pubkey2);
         }
@@ -4351,7 +3801,7 @@ mod tests {
     fn test_authorize_with_seed() {
         let base_pubkey = solana_sdk::pubkey::new_rand();
         let seed = "42";
-        let withdrawer_pubkey = Pubkey::create_with_seed(&base_pubkey, &seed, &id()).unwrap();
+        let withdrawer_pubkey = Pubkey::create_with_seed(&base_pubkey, seed, &id()).unwrap();
         let stake_lamports = 42;
         let stake_account = AccountSharedData::new_ref_data_with_space(
             stake_lamports,
@@ -4372,7 +3822,7 @@ mod tests {
         assert_eq!(
             stake_keyed_account.authorize_with_seed(
                 &base_keyed_account,
-                &"",
+                "",
                 &id(),
                 &new_authority,
                 StakeAuthorize::Staker,
@@ -4387,7 +3837,7 @@ mod tests {
         assert_eq!(
             stake_keyed_account.authorize_with_seed(
                 &stake_keyed_account,
-                &seed,
+                seed,
                 &id(),
                 &new_authority,
                 StakeAuthorize::Staker,
@@ -4402,7 +3852,7 @@ mod tests {
         assert_eq!(
             stake_keyed_account.authorize_with_seed(
                 &base_keyed_account,
-                &seed,
+                seed,
                 &id(),
                 &new_authority,
                 StakeAuthorize::Staker,
@@ -4417,7 +3867,7 @@ mod tests {
         assert_eq!(
             stake_keyed_account.authorize_with_seed(
                 &base_keyed_account,
-                &seed,
+                seed,
                 &id(),
                 &new_authority,
                 StakeAuthorize::Withdrawer,
@@ -4432,7 +3882,7 @@ mod tests {
         assert_eq!(
             stake_keyed_account.authorize_with_seed(
                 &stake_keyed_account,
-                &seed,
+                seed,
                 &id(),
                 &new_authority,
                 StakeAuthorize::Withdrawer,
@@ -4584,7 +4034,7 @@ mod tests {
         let stake_lamports = 42;
         let stake_account = AccountSharedData::new_ref_data_with_space(
             stake_lamports,
-            &StakeState::Stake(Meta::auto(&stake_pubkey), Stake::just_stake(stake_lamports)),
+            &StakeState::Stake(Meta::auto(&stake_pubkey), just_stake(stake_lamports)),
             std::mem::size_of::<StakeState>(),
             &id(),
         )
@@ -4608,15 +4058,13 @@ mod tests {
             Err(InstructionError::InvalidAccountData)
         );
     }
-    impl Stake {
-        fn just_stake(stake: u64) -> Self {
-            Self {
-                delegation: Delegation {
-                    stake,
-                    ..Delegation::default()
-                },
-                ..Stake::default()
-            }
+    fn just_stake(stake: u64) -> Stake {
+        Stake {
+            delegation: Delegation {
+                stake,
+                ..Delegation::default()
+            },
+            ..Stake::default()
         }
     }
 
@@ -4628,7 +4076,7 @@ mod tests {
             stake_lamports,
             &StakeState::Stake(
                 Meta::auto(&stake_pubkey),
-                Stake::just_stake(stake_lamports / 2 - 1),
+                just_stake(stake_lamports / 2 - 1),
             ),
             std::mem::size_of::<StakeState>(),
             &id(),
@@ -4671,10 +4119,7 @@ mod tests {
         // test splitting both an Initialized stake and a Staked stake
         for state in &[
             StakeState::Initialized(meta),
-            StakeState::Stake(
-                meta,
-                Stake::just_stake(stake_lamports - rent_exempt_reserve),
-            ),
+            StakeState::Stake(meta, just_stake(stake_lamports - rent_exempt_reserve)),
         ] {
             let stake_account = AccountSharedData::new_ref_data_with_space(
                 stake_lamports,
@@ -4769,7 +4214,7 @@ mod tests {
         // test splitting both an Initialized stake and a Staked stake
         for state in &[
             StakeState::Initialized(Meta::auto(&stake_pubkey)),
-            StakeState::Stake(Meta::auto(&stake_pubkey), Stake::just_stake(stake_lamports)),
+            StakeState::Stake(Meta::auto(&stake_pubkey), just_stake(stake_lamports)),
         ] {
             let split_stake_account = AccountSharedData::new_ref_data_with_space(
                 0,
@@ -4874,7 +4319,7 @@ mod tests {
 
         let stake_account = AccountSharedData::new_ref_data_with_space(
             stake_lamports,
-            &StakeState::Stake(Meta::auto(&stake_pubkey), Stake::just_stake(stake_lamports)),
+            &StakeState::Stake(Meta::auto(&stake_pubkey), just_stake(stake_lamports)),
             std::mem::size_of::<StakeState>(),
             &id(),
         )
@@ -4903,10 +4348,7 @@ mod tests {
             ..Meta::default()
         };
 
-        let state = StakeState::Stake(
-            meta,
-            Stake::just_stake(stake_lamports - rent_exempt_reserve),
-        );
+        let state = StakeState::Stake(meta, just_stake(stake_lamports - rent_exempt_reserve));
         // Test various account prefunding, including empty, less than rent_exempt_reserve, exactly
         // rent_exempt_reserve, and more than rent_exempt_reserve. The empty case is not covered in
         // test_split, since that test uses a Meta with rent_exempt_reserve = 0
@@ -5006,10 +4448,7 @@ mod tests {
             ..Meta::default()
         };
 
-        let state = StakeState::Stake(
-            meta,
-            Stake::just_stake(stake_lamports - rent_exempt_reserve),
-        );
+        let state = StakeState::Stake(meta, just_stake(stake_lamports - rent_exempt_reserve));
 
         let expected_rent_exempt_reserve = calculate_split_rent_exempt_reserve(
             meta.rent_exempt_reserve,
@@ -5133,10 +4572,7 @@ mod tests {
         let stake_lamports = expected_rent_exempt_reserve + 1;
         let split_amount = stake_lamports - (rent_exempt_reserve + 1); // Enough so that split stake is > 0
 
-        let state = StakeState::Stake(
-            meta,
-            Stake::just_stake(stake_lamports - rent_exempt_reserve),
-        );
+        let state = StakeState::Stake(meta, just_stake(stake_lamports - rent_exempt_reserve));
 
         let split_lamport_balances = vec![
             0,
@@ -5196,10 +4632,7 @@ mod tests {
         // test splitting both an Initialized stake and a Staked stake
         for state in &[
             StakeState::Initialized(meta),
-            StakeState::Stake(
-                meta,
-                Stake::just_stake(stake_lamports - rent_exempt_reserve),
-            ),
+            StakeState::Stake(meta, just_stake(stake_lamports - rent_exempt_reserve)),
         ] {
             let split_stake_account = AccountSharedData::new_ref_data_with_space(
                 0,
@@ -5282,10 +4715,7 @@ mod tests {
             ..Meta::default()
         };
 
-        let state = StakeState::Stake(
-            meta,
-            Stake::just_stake(stake_lamports - rent_exempt_reserve),
-        );
+        let state = StakeState::Stake(meta, just_stake(stake_lamports - rent_exempt_reserve));
         // Test various account prefunding, including empty, less than rent_exempt_reserve, exactly
         // rent_exempt_reserve, and more than rent_exempt_reserve. Technically, the empty case is
         // covered in test_split_100_percent_of_source, but included here as well for readability
@@ -5361,10 +4791,7 @@ mod tests {
 
         for state in &[
             StakeState::Initialized(meta),
-            StakeState::Stake(
-                meta,
-                Stake::just_stake(stake_lamports - rent_exempt_reserve),
-            ),
+            StakeState::Stake(meta, just_stake(stake_lamports - rent_exempt_reserve)),
         ] {
             // Test that splitting to a larger account fails
             let split_stake_account = AccountSharedData::new_ref_data_with_space(
@@ -5484,17 +4911,11 @@ mod tests {
 
         for state in &[
             StakeState::Initialized(Meta::auto(&authorized_pubkey)),
-            StakeState::Stake(
-                Meta::auto(&authorized_pubkey),
-                Stake::just_stake(stake_lamports),
-            ),
+            StakeState::Stake(Meta::auto(&authorized_pubkey), just_stake(stake_lamports)),
         ] {
             for source_state in &[
                 StakeState::Initialized(Meta::auto(&authorized_pubkey)),
-                StakeState::Stake(
-                    Meta::auto(&authorized_pubkey),
-                    Stake::just_stake(stake_lamports),
-                ),
+                StakeState::Stake(Meta::auto(&authorized_pubkey), just_stake(stake_lamports)),
             ] {
                 let stake_account = AccountSharedData::new_ref_data_with_space(
                     stake_lamports,
@@ -5647,16 +5068,13 @@ mod tests {
 
         for state in &[
             StakeState::Initialized(Meta::auto(&authorized_pubkey)),
-            StakeState::Stake(
-                Meta::auto(&authorized_pubkey),
-                Stake::just_stake(stake_lamports),
-            ),
+            StakeState::Stake(Meta::auto(&authorized_pubkey), just_stake(stake_lamports)),
         ] {
             for source_state in &[
                 StakeState::Initialized(Meta::auto(&wrong_authorized_pubkey)),
                 StakeState::Stake(
                     Meta::auto(&wrong_authorized_pubkey),
-                    Stake::just_stake(stake_lamports),
+                    just_stake(stake_lamports),
                 ),
             ] {
                 let stake_account = AccountSharedData::new_ref_data_with_space(
@@ -5718,10 +5136,7 @@ mod tests {
             StakeState::Uninitialized,
             StakeState::RewardsPool,
             StakeState::Initialized(Meta::auto(&authorized_pubkey)),
-            StakeState::Stake(
-                Meta::auto(&authorized_pubkey),
-                Stake::just_stake(stake_lamports),
-            ),
+            StakeState::Stake(Meta::auto(&authorized_pubkey), just_stake(stake_lamports)),
         ] {
             for source_state in &[StakeState::Uninitialized, StakeState::RewardsPool] {
                 let stake_account = AccountSharedData::new_ref_data_with_space(
@@ -5769,10 +5184,7 @@ mod tests {
 
         let stake_account = AccountSharedData::new_ref_data_with_space(
             stake_lamports,
-            &StakeState::Stake(
-                Meta::auto(&authorized_pubkey),
-                Stake::just_stake(stake_lamports),
-            ),
+            &StakeState::Stake(Meta::auto(&authorized_pubkey), just_stake(stake_lamports)),
             std::mem::size_of::<StakeState>(),
             &id(),
         )
@@ -5781,10 +5193,7 @@ mod tests {
 
         let source_stake_account = AccountSharedData::new_ref_data_with_space(
             stake_lamports,
-            &StakeState::Stake(
-                Meta::auto(&authorized_pubkey),
-                Stake::just_stake(stake_lamports),
-            ),
+            &StakeState::Stake(Meta::auto(&authorized_pubkey), just_stake(stake_lamports)),
             std::mem::size_of::<StakeState>(),
             &solana_sdk::pubkey::new_rand(),
         )
@@ -5943,8 +5352,8 @@ mod tests {
                     deactivating,
                 },
             );
-            if stake_amount == stake.stake(clock.epoch, Some(&stake_history), true)
-                && source_amount == source_stake.stake(clock.epoch, Some(&stake_history), true)
+            if stake_amount == stake.stake(clock.epoch, Some(&stake_history))
+                && source_amount == source_stake.stake(clock.epoch, Some(&stake_history))
             {
                 break;
             }
@@ -6029,8 +5438,8 @@ mod tests {
                     deactivating,
                 },
             );
-            if 0 == stake.stake(clock.epoch, Some(&stake_history), true)
-                && 0 == source_stake.stake(clock.epoch, Some(&stake_history), true)
+            if 0 == stake.stake(clock.epoch, Some(&stake_history))
+                && 0 == source_stake.stake(clock.epoch, Some(&stake_history))
             {
                 break;
             }
@@ -6190,8 +5599,7 @@ mod tests {
             ),
             Ok(())
         );
-        let authorized =
-            StakeState::authorized_from(&stake_keyed_account.try_account_ref().unwrap()).unwrap();
+        let authorized = authorized_from(&stake_keyed_account.try_account_ref().unwrap()).unwrap();
         assert_eq!(authorized.staker, new_staker_pubkey);
 
         let other_pubkey = solana_sdk::pubkey::new_rand();
@@ -6237,8 +5645,7 @@ mod tests {
             ),
             Ok(())
         );
-        let stake =
-            StakeState::stake_from(&stake_keyed_account.try_account_ref().unwrap()).unwrap();
+        let stake = stake_from(&stake_keyed_account.try_account_ref().unwrap()).unwrap();
         assert_eq!(stake.delegation.voter_pubkey, new_voter_pubkey);
 
         // Test another staking action
@@ -6324,7 +5731,7 @@ mod tests {
                 true,
             )
             .unwrap();
-        let stake = StakeState::stake_from(&stake_account.borrow()).unwrap();
+        let stake = stake_from(&stake_account.borrow()).unwrap();
         assert_eq!(
             stake.delegation.stake,
             stake_keyed_account.lamports().unwrap() - rent_exempt_reserve,
@@ -6351,7 +5758,7 @@ mod tests {
                 true,
             )
             .unwrap();
-        let stake = StakeState::stake_from(&stake_account.borrow()).unwrap();
+        let stake = stake_from(&stake_account.borrow()).unwrap();
         assert_eq!(
             stake.delegation.stake,
             stake_keyed_account.lamports().unwrap() - rent_exempt_reserve,
@@ -6393,98 +5800,6 @@ mod tests {
         }
     }
 
-    #[test]
-    fn test_stake_rewrite_stake() {
-        let right_data_len = std::mem::size_of::<StakeState>() as u64;
-        let rent = Rent::default();
-        let rent_exempt_reserve = rent.minimum_balance(right_data_len as usize);
-        let expected_stake = 1000;
-        let account_balance = rent_exempt_reserve + expected_stake;
-
-        let test_cases = [
-            (9999, Some((9999, expected_stake))), // large stake
-            (1000, None),                         // correct
-            (42, Some((42, expected_stake))),     // small stake
-        ];
-        for (staked_amount, expected_rewrite) in &test_cases {
-            let mut delegation = Delegation {
-                stake: *staked_amount,
-                ..Delegation::default()
-            };
-            let actual_rewrite = delegation.rewrite_stake(account_balance, rent_exempt_reserve);
-            assert_eq!(actual_rewrite, *expected_rewrite);
-            assert_eq!(delegation.stake, expected_stake);
-        }
-    }
-
-    enum ExpectedRewriteResult {
-        NotRewritten,
-        Rewritten,
-    }
-
-    #[test]
-    fn test_rewrite_stakes_initialized() {
-        let right_data_len = std::mem::size_of::<StakeState>();
-        let rent = Rent::default();
-        let rent_exempt_reserve = rent.minimum_balance(right_data_len as usize);
-        let expected_stake = 1000;
-        let account_balance = rent_exempt_reserve + expected_stake;
-
-        let test_cases = [
-            (1, ExpectedRewriteResult::Rewritten),
-            (0, ExpectedRewriteResult::NotRewritten),
-        ];
-        for (offset, expected_rewrite) in &test_cases {
-            let meta = Meta {
-                rent_exempt_reserve: rent_exempt_reserve + offset,
-                ..Meta::default()
-            };
-            let mut account = AccountSharedData::new(account_balance, right_data_len, &id());
-            account.set_state(&StakeState::Initialized(meta)).unwrap();
-            let result = rewrite_stakes(&mut account, &rent);
-            match expected_rewrite {
-                ExpectedRewriteResult::NotRewritten => assert!(result.is_err()),
-                ExpectedRewriteResult::Rewritten => assert!(result.is_ok()),
-            }
-        }
-    }
-
-    #[test]
-    fn test_rewrite_stakes_stake() {
-        let right_data_len = std::mem::size_of::<StakeState>();
-        let rent = Rent::default();
-        let rent_exempt_reserve = rent.minimum_balance(right_data_len as usize);
-        let expected_stake = 1000;
-        let account_balance = rent_exempt_reserve + expected_stake;
-
-        let test_cases = [
-            (1, 9999, ExpectedRewriteResult::Rewritten), // bad meta, bad stake
-            (1, 1000, ExpectedRewriteResult::Rewritten), // bad meta, good stake
-            (0, 9999, ExpectedRewriteResult::Rewritten), // good meta, bad stake
-            (0, 1000, ExpectedRewriteResult::NotRewritten), // good meta, good stake
-        ];
-        for (offset, staked_amount, expected_rewrite) in &test_cases {
-            let meta = Meta {
-                rent_exempt_reserve: rent_exempt_reserve + offset,
-                ..Meta::default()
-            };
-            let stake = Stake {
-                delegation: (Delegation {
-                    stake: *staked_amount,
-                    ..Delegation::default()
-                }),
-                ..Stake::default()
-            };
-            let mut account = AccountSharedData::new(account_balance, right_data_len, &id());
-            account.set_state(&StakeState::Stake(meta, stake)).unwrap();
-            let result = rewrite_stakes(&mut account, &rent);
-            match expected_rewrite {
-                ExpectedRewriteResult::NotRewritten => assert!(result.is_err()),
-                ExpectedRewriteResult::Rewritten => assert!(result.is_ok()),
-            }
-        }
-    }
-
     #[test]
     fn test_calculate_lamports_per_byte_year() {
         let rent = Rent::default();
@@ -7161,4 +6476,187 @@ mod tests {
         let delegation = new_state.delegation().unwrap();
         assert_eq!(delegation.stake, 2 * stake.delegation.stake);
     }
+
+    #[test]
+    fn test_active_stake_merge() {
+        let delegation_a = 4_242_424_242u64;
+        let delegation_b = 6_200_000_000u64;
+        let credits_a = 124_521_000u64;
+        let rent_exempt_reserve = 227_000_000u64;
+        let meta = Meta {
+            rent_exempt_reserve,
+            ..Meta::default()
+        };
+        let stake_a = Stake {
+            delegation: Delegation {
+                stake: delegation_a,
+                ..Delegation::default()
+            },
+            credits_observed: credits_a,
+        };
+        let stake_b = Stake {
+            delegation: Delegation {
+                stake: delegation_b,
+                ..Delegation::default()
+            },
+            credits_observed: credits_a,
+        };
+
+        let invoke_context = MockInvokeContext::new(vec![]);
+
+        // activating stake merge, match credits observed
+        let activation_epoch_a = MergeKind::ActivationEpoch(meta, stake_a);
+        let activation_epoch_b = MergeKind::ActivationEpoch(meta, stake_b);
+        let new_stake = activation_epoch_a
+            .merge(&invoke_context, activation_epoch_b, None)
+            .unwrap()
+            .unwrap()
+            .stake()
+            .unwrap();
+        assert_eq!(new_stake.credits_observed, credits_a);
+        assert_eq!(
+            new_stake.delegation.stake,
+            delegation_a + delegation_b + rent_exempt_reserve
+        );
+
+        // active stake merge, match credits observed
+        let fully_active_a = MergeKind::FullyActive(meta, stake_a);
+        let fully_active_b = MergeKind::FullyActive(meta, stake_b);
+        let new_stake = fully_active_a
+            .merge(&invoke_context, fully_active_b, None)
+            .unwrap()
+            .unwrap()
+            .stake()
+            .unwrap();
+        assert_eq!(new_stake.credits_observed, credits_a);
+        assert_eq!(new_stake.delegation.stake, delegation_a + delegation_b);
+
+        // activating stake merge, unmatched credits observed
+        let credits_b = 125_124_521u64;
+        let stake_b = Stake {
+            delegation: Delegation {
+                stake: delegation_b,
+                ..Delegation::default()
+            },
+            credits_observed: credits_b,
+        };
+        let activation_epoch_a = MergeKind::ActivationEpoch(meta, stake_a);
+        let activation_epoch_b = MergeKind::ActivationEpoch(meta, stake_b);
+        let new_stake = activation_epoch_a
+            .merge(&invoke_context, activation_epoch_b, None)
+            .unwrap()
+            .unwrap()
+            .stake()
+            .unwrap();
+        assert_eq!(
+            new_stake.credits_observed,
+            (credits_a * delegation_a + credits_b * (delegation_b + rent_exempt_reserve))
+                / (delegation_a + delegation_b + rent_exempt_reserve)
+                + 1
+        );
+        assert_eq!(
+            new_stake.delegation.stake,
+            delegation_a + delegation_b + rent_exempt_reserve
+        );
+
+        // active stake merge, unmatched credits observed
+        let fully_active_a = MergeKind::FullyActive(meta, stake_a);
+        let fully_active_b = MergeKind::FullyActive(meta, stake_b);
+        let new_stake = fully_active_a
+            .merge(&invoke_context, fully_active_b, None)
+            .unwrap()
+            .unwrap()
+            .stake()
+            .unwrap();
+        assert_eq!(
+            new_stake.credits_observed,
+            (credits_a * delegation_a + credits_b * delegation_b) / (delegation_a + delegation_b)
+                + 1
+        );
+        assert_eq!(new_stake.delegation.stake, delegation_a + delegation_b);
+
+        // active stake merge, unmatched credits observed, no need to ceiling the calculation
+        let delegation = 1_000_000u64;
+        let credits_a = 200_000_000u64;
+        let credits_b = 100_000_000u64;
+        let rent_exempt_reserve = 227_000_000u64;
+        let meta = Meta {
+            rent_exempt_reserve,
+            ..Meta::default()
+        };
+        let stake_a = Stake {
+            delegation: Delegation {
+                stake: delegation,
+                ..Delegation::default()
+            },
+            credits_observed: credits_a,
+        };
+        let stake_b = Stake {
+            delegation: Delegation {
+                stake: delegation,
+                ..Delegation::default()
+            },
+            credits_observed: credits_b,
+        };
+        let fully_active_a = MergeKind::FullyActive(meta, stake_a);
+        let fully_active_b = MergeKind::FullyActive(meta, stake_b);
+        let new_stake = fully_active_a
+            .merge(&invoke_context, fully_active_b, None)
+            .unwrap()
+            .unwrap()
+            .stake()
+            .unwrap();
+        assert_eq!(
+            new_stake.credits_observed,
+            (credits_a * delegation + credits_b * delegation) / (delegation * 2)
+        );
+        assert_eq!(new_stake.delegation.stake, delegation * 2);
+    }
+
+    prop_compose! {
+        pub fn sum_within(max: u64)(total in 1..max)
+            (intermediate in 1..total, total in Just(total))
+            -> (u64, u64) {
+                (intermediate, total - intermediate)
+        }
+    }
+
+    proptest! {
+        #[test]
+        fn test_stake_weighted_credits_observed(
+            (credits_a, credits_b) in sum_within(u64::MAX),
+            (delegation_a, delegation_b) in sum_within(u64::MAX),
+        ) {
+            let stake = Stake {
+                delegation: Delegation {
+                    stake: delegation_a,
+                    ..Delegation::default()
+                },
+                credits_observed: credits_a
+            };
+            let credits_observed = stake_weighted_credits_observed(
+                &stake,
+                delegation_b,
+                credits_b,
+            ).unwrap();
+
+            // calculated credits observed should always be between the credits of a and b
+            if credits_a < credits_b {
+                assert!(credits_a < credits_observed);
+                assert!(credits_observed <= credits_b);
+            } else {
+                assert!(credits_b <= credits_observed);
+                assert!(credits_observed <= credits_a);
+            }
+
+            // the difference of the combined weighted credits and the separate weighted credits
+            // should be 1 or 0
+            let weighted_credits_total = credits_observed as u128 * (delegation_a + delegation_b) as u128;
+            let weighted_credits_a = credits_a as u128 * delegation_a as u128;
+            let weighted_credits_b = credits_b as u128 * delegation_b as u128;
+            let raw_diff = weighted_credits_total - (weighted_credits_a + weighted_credits_b);
+            let credits_observed_diff = raw_diff / (delegation_a + delegation_b) as u128;
+            assert!(credits_observed_diff <= 1);
+        }
+    }
 }
diff --git a/programs/vote/Cargo.toml b/programs/vote/Cargo.toml
index 59bb9618021283..5de9d1383649b4 100644
--- a/programs/vote/Cargo.toml
+++ b/programs/vote/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "solana-vote-program"
-version = "1.7.0"
+version = "1.7.11"
 description = "Solana Vote program"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -16,11 +16,11 @@ num-derive = "0.3"
 num-traits = "0.2"
 serde = "1.0.122"
 serde_derive = "1.0.103"
-solana-frozen-abi = { path = "../../frozen-abi", version = "=1.7.0" }
-solana-frozen-abi-macro = { path = "../../frozen-abi/macro", version = "=1.7.0" }
-solana-logger = { path = "../../logger", version = "=1.7.0" }
-solana-metrics = { path = "../../metrics", version = "=1.7.0" }
-solana-sdk = { path = "../../sdk", version = "=1.7.0" }
+solana-frozen-abi = { path = "../../frozen-abi", version = "=1.7.11" }
+solana-frozen-abi-macro = { path = "../../frozen-abi/macro", version = "=1.7.11" }
+solana-logger = { path = "../../logger", version = "=1.7.11" }
+solana-metrics = { path = "../../metrics", version = "=1.7.11" }
+solana-sdk = { path = "../../sdk", version = "=1.7.11" }
 thiserror = "1.0"
 
 [build-dependencies]
diff --git a/programs/vote/src/lib.rs b/programs/vote/src/lib.rs
index ad9cf9f89cdc75..3995bbab844b5b 100644
--- a/programs/vote/src/lib.rs
+++ b/programs/vote/src/lib.rs
@@ -12,4 +12,4 @@ extern crate solana_metrics;
 #[macro_use]
 extern crate solana_frozen_abi_macro;
 
-solana_sdk::declare_id!("Vote111111111111111111111111111111111111111");
+pub use solana_sdk::vote::program::{check_id, id};
diff --git a/programs/vote/src/vote_instruction.rs b/programs/vote/src/vote_instruction.rs
index 92ce7d98121083..ac9c863d05401b 100644
--- a/programs/vote/src/vote_instruction.rs
+++ b/programs/vote/src/vote_instruction.rs
@@ -111,6 +111,18 @@ pub enum VoteInstruction {
     ///   2. [] Clock sysvar
     ///   3. [SIGNER] Vote authority
     VoteSwitch(Vote, Hash),
+
+    /// Authorize a key to send votes or issue a withdrawal
+    ///
+    /// This instruction behaves like `Authorize` with the additional requirement that the new vote
+    /// or withdraw authority must also be a signer.
+    ///
+    /// # Account references
+    ///   0. [WRITE] Vote account to be updated with the Pubkey for authorization
+    ///   1. [] Clock sysvar
+    ///   2. [SIGNER] Vote or withdraw authority
+    ///   3. [SIGNER] New vote or withdraw authority
+    AuthorizeChecked(VoteAuthorize),
 }
 
 fn initialize_account(vote_pubkey: &Pubkey, vote_init: &VoteInit) -> Instruction {
@@ -182,6 +194,26 @@ pub fn authorize(
     )
 }
 
+pub fn authorize_checked(
+    vote_pubkey: &Pubkey,
+    authorized_pubkey: &Pubkey, // currently authorized
+    new_authorized_pubkey: &Pubkey,
+    vote_authorize: VoteAuthorize,
+) -> Instruction {
+    let account_metas = vec![
+        AccountMeta::new(*vote_pubkey, false),
+        AccountMeta::new_readonly(sysvar::clock::id(), false),
+        AccountMeta::new_readonly(*authorized_pubkey, true),
+        AccountMeta::new_readonly(*new_authorized_pubkey, true),
+    ];
+
+    Instruction::new_with_bincode(
+        id(),
+        &VoteInstruction::AuthorizeChecked(vote_authorize),
+        account_metas,
+    )
+}
+
 pub fn update_validator_identity(
     vote_pubkey: &Pubkey,
     authorized_withdrawer_pubkey: &Pubkey,
@@ -335,12 +367,30 @@ pub fn process_instruction(
             let to = keyed_account_at_index(keyed_accounts, 1)?;
             vote_state::withdraw(me, lamports, to, &signers)
         }
+        VoteInstruction::AuthorizeChecked(vote_authorize) => {
+            if invoke_context.is_feature_active(&feature_set::vote_stake_checked_instructions::id())
+            {
+                let voter_pubkey = &keyed_account_at_index(keyed_accounts, 3)?
+                    .signer_key()
+                    .ok_or(InstructionError::MissingRequiredSignature)?;
+                vote_state::authorize(
+                    me,
+                    voter_pubkey,
+                    vote_authorize,
+                    &signers,
+                    &from_keyed_account::<Clock>(keyed_account_at_index(keyed_accounts, 1)?)?,
+                )
+            } else {
+                Err(InstructionError::InvalidInstructionData)
+            }
+        }
     }
 }
 
 #[cfg(test)]
 mod tests {
     use super::*;
+    use bincode::serialize;
     use solana_sdk::{
         account::{self, Account, AccountSharedData},
         process_instruction::MockInvokeContext,
@@ -349,6 +399,10 @@ mod tests {
     use std::cell::RefCell;
     use std::str::FromStr;
 
+    fn create_default_account() -> RefCell<AccountSharedData> {
+        RefCell::new(AccountSharedData::default())
+    }
+
     // these are for 100% coverage in this file
     #[test]
     fn test_vote_process_instruction_decode_bail() {
@@ -489,6 +543,105 @@ mod tests {
         );
     }
 
+    #[test]
+    fn test_vote_authorize_checked() {
+        let vote_pubkey = Pubkey::new_unique();
+        let authorized_pubkey = Pubkey::new_unique();
+        let new_authorized_pubkey = Pubkey::new_unique();
+
+        // Test with vanilla authorize accounts
+        let mut instruction = authorize_checked(
+            &vote_pubkey,
+            &authorized_pubkey,
+            &new_authorized_pubkey,
+            VoteAuthorize::Voter,
+        );
+        instruction.accounts = instruction.accounts[0..2].to_vec();
+        assert_eq!(
+            process_instruction(&instruction),
+            Err(InstructionError::NotEnoughAccountKeys),
+        );
+
+        let mut instruction = authorize_checked(
+            &vote_pubkey,
+            &authorized_pubkey,
+            &new_authorized_pubkey,
+            VoteAuthorize::Withdrawer,
+        );
+        instruction.accounts = instruction.accounts[0..2].to_vec();
+        assert_eq!(
+            process_instruction(&instruction),
+            Err(InstructionError::NotEnoughAccountKeys),
+        );
+
+        // Test with non-signing new_authorized_pubkey
+        let mut instruction = authorize_checked(
+            &vote_pubkey,
+            &authorized_pubkey,
+            &new_authorized_pubkey,
+            VoteAuthorize::Voter,
+        );
+        instruction.accounts[3] = AccountMeta::new_readonly(new_authorized_pubkey, false);
+        assert_eq!(
+            process_instruction(&instruction),
+            Err(InstructionError::MissingRequiredSignature),
+        );
+
+        let mut instruction = authorize_checked(
+            &vote_pubkey,
+            &authorized_pubkey,
+            &new_authorized_pubkey,
+            VoteAuthorize::Withdrawer,
+        );
+        instruction.accounts[3] = AccountMeta::new_readonly(new_authorized_pubkey, false);
+        assert_eq!(
+            process_instruction(&instruction),
+            Err(InstructionError::MissingRequiredSignature),
+        );
+
+        // Test with new_authorized_pubkey signer
+        let vote_account = AccountSharedData::new_ref(100, VoteState::size_of(), &id());
+        let clock_address = sysvar::clock::id();
+        let clock_account = RefCell::new(account::create_account_shared_data_for_test(
+            &Clock::default(),
+        ));
+        let default_authorized_pubkey = Pubkey::default();
+        let authorized_account = create_default_account();
+        let new_authorized_account = create_default_account();
+        let keyed_accounts = vec![
+            KeyedAccount::new(&vote_pubkey, false, &vote_account),
+            KeyedAccount::new(&clock_address, false, &clock_account),
+            KeyedAccount::new(&default_authorized_pubkey, true, &authorized_account),
+            KeyedAccount::new(&new_authorized_pubkey, true, &new_authorized_account),
+        ];
+        assert_eq!(
+            super::process_instruction(
+                &Pubkey::default(),
+                &serialize(&VoteInstruction::AuthorizeChecked(VoteAuthorize::Voter)).unwrap(),
+                &mut MockInvokeContext::new(keyed_accounts)
+            ),
+            Ok(())
+        );
+
+        let keyed_accounts = vec![
+            KeyedAccount::new(&vote_pubkey, false, &vote_account),
+            KeyedAccount::new(&clock_address, false, &clock_account),
+            KeyedAccount::new(&default_authorized_pubkey, true, &authorized_account),
+            KeyedAccount::new(&new_authorized_pubkey, true, &new_authorized_account),
+        ];
+        assert_eq!(
+            super::process_instruction(
+                &Pubkey::default(),
+                &serialize(&VoteInstruction::AuthorizeChecked(
+                    VoteAuthorize::Withdrawer
+                ))
+                .unwrap(),
+                &mut MockInvokeContext::new(keyed_accounts)
+            ),
+            Ok(())
+        );
+    }
+
     #[test]
     fn test_minimum_balance() {
         let rent = solana_sdk::rent::Rent::default();
diff --git a/programs/vote/src/vote_state/mod.rs b/programs/vote/src/vote_state/mod.rs
index bd21e855072d0a..70e59c3d28de7d 100644
--- a/programs/vote/src/vote_state/mod.rs
+++ b/programs/vote/src/vote_state/mod.rs
@@ -230,7 +230,7 @@ impl VoteState {
 
     // utility function, used by Stakes, tests
     pub fn from<T: ReadableAccount>(account: &T) -> Option<VoteState> {
-        Self::deserialize(&account.data()).ok()
+        Self::deserialize(account.data()).ok()
     }
 
     // utility function, used by Stakes, tests
@@ -239,7 +239,7 @@ impl VoteState {
     }
 
     pub fn deserialize(input: &[u8]) -> Result<Self, InstructionError> {
-        deserialize::<VoteStateVersions>(&input)
+        deserialize::<VoteStateVersions>(input)
             .map(|versioned| versioned.convert_to_current())
             .map_err(|_| InstructionError::InvalidAccountData)
     }
@@ -638,7 +638,7 @@ pub fn update_validator_identity<S: std::hash::BuildHasher>(
     verify_authorized_signer(&vote_state.authorized_withdrawer, signers)?;
 
     // new node must say "yay"
-    verify_authorized_signer(&node_pubkey, signers)?;
+    verify_authorized_signer(node_pubkey, signers)?;
 
     vote_state.node_pubkey = *node_pubkey;
 
@@ -938,7 +938,7 @@ mod tests {
         slot_hashes: &[SlotHash],
         epoch: Epoch,
     ) -> Result<VoteState, InstructionError> {
-        let keyed_accounts = &[KeyedAccount::new(&vote_pubkey, true, vote_account)];
+        let keyed_accounts = &[KeyedAccount::new(vote_pubkey, true, vote_account)];
         let signers: HashSet<Pubkey> = get_signers(keyed_accounts);
         process_vote(
             &keyed_accounts[0],
diff --git a/programs/vote/src/vote_transaction.rs b/programs/vote/src/vote_transaction.rs
index fdbce1798217ef..f5446564c5126f 100644
--- a/programs/vote/src/vote_transaction.rs
+++ b/programs/vote/src/vote_transaction.rs
@@ -19,7 +19,7 @@ pub fn parse_vote_transaction(tx: &Transaction) -> Option<(Pubkey, Vote, Option<
         let prog_id_idx = first_instruction.program_id_index as usize;
         match message.account_keys.get(prog_id_idx) {
             Some(program_id) => {
-                if !crate::check_id(&program_id) {
+                if !crate::check_id(program_id) {
                     return None;
                 }
             }
diff --git a/rayon-threadlimit/Cargo.toml b/rayon-threadlimit/Cargo.toml
index 9493c64e48e473..836c08102c71dd 100644
--- a/rayon-threadlimit/Cargo.toml
+++ b/rayon-threadlimit/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "solana-rayon-threadlimit"
-version = "1.7.0"
+version = "1.7.11"
 description = "solana-rayon-threadlimit"
 homepage = "https://solana.com/"
 documentation = "https://docs.rs/solana-rayon-threadlimit"
diff --git a/rbpf-cli/src/main.rs b/rbpf-cli/src/main.rs
new file mode 100644
index 00000000000000..0a98d596638285
--- /dev/null
+++ b/rbpf-cli/src/main.rs
@@ -0,0 +1,253 @@
+use clap::{crate_version, App, Arg};
+use serde::{Deserialize, Serialize};
+use serde_json::Result;
+use solana_bpf_loader_program::{
+    create_vm, serialization::serialize_parameters, syscalls::register_syscalls, BpfError,
+    ThisInstructionMeter,
+};
+use solana_rbpf::{
+    assembler::assemble,
+    static_analysis::Analysis,
+    verifier::check,
+    vm::{Config, DynamicAnalysis, Executable},
+};
+use solana_sdk::{
+    account::AccountSharedData,
+    bpf_loader,
+    keyed_account::KeyedAccount,
+    process_instruction::{InvokeContext, MockInvokeContext},
+    pubkey::Pubkey,
+};
+use std::{cell::RefCell, fs::File, io::Read, io::Seek, io::SeekFrom, path::Path};
+
+#[derive(Serialize, Deserialize, Debug)]
+struct Account {
+    lamports: u64,
+    data: Vec<u8>,
+    owner: Pubkey,
+}
+#[derive(Serialize, Deserialize)]
+struct Input {
+    accounts: Vec<Account>,
+    insndata: Vec<u8>,
+}
+fn load_accounts(path: &Path) -> Result<Input> {
+    let file = File::open(path).unwrap();
+    let input: Input = serde_json::from_reader(file)?;
+    println!("Program input:");
+    println!("accounts {:?}", &input.accounts);
+    println!("insndata {:?}", &input.insndata);
+    println!("----------------------------------------");
+    Ok(input)
+}
+
+fn main() {
+    solana_logger::setup();
+    let matches = App::new("Solana BPF CLI")
+        .version(crate_version!())
+        .author("Solana Maintainers <maintainers@solana.foundation>")
+        .about(
+            r##"CLI to test and analyze eBPF programs.
+
+The tool executes eBPF programs in a mocked environment.
+Some features, such as sysvars syscall and CPI, are not
+available for the programs executed by the CLI tool.
+
+The input data for a program execution have to be in JSON format
+and the following fields are required
+{
+    "accounts": [
+        {
+            "lamports": 1000,
+            "data": [0, 0, 0, 3],
+            "owner": [
+                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+            ]
+        }
+    ],
+    "insndata": []
+}
+"##,
+        )
+        .arg(
+            Arg::new("PROGRAM")
+                .about(
+                    "Program file to use. This is either an ELF shared-object file to be executed, \
+                     or an assembly file to be assembled and executed.",
+                )
+                .required(true)
+                .index(1)
+        )
+        .arg(
+            Arg::new("input")
+                .about(
+                    "Input for the program to run on, where FILE is a name of a JSON file \
+with input data, or BYTES is the number of 0-valued bytes to allocate for program parameters",
+                )
+                .short('i')
+                .long("input")
+                .value_name("FILE / BYTES")
+                .takes_value(true)
+                .default_value("0"),
+        )
+        .arg(
+            Arg::new("memory")
+                .about("Heap memory for the program to run on")
+                .short('m')
+                .long("memory")
+                .value_name("BYTES")
+                .takes_value(true)
+                .default_value("0"),
+        )
+        .arg(
+            Arg::new("use")
+                .about(
+                    "Method of execution to use, where 'cfg' generates Control Flow Graph \
+of the program, 'disassembler' dumps disassembled code of the program, 'interpreter' runs \
+the program in the virtual machine's interpreter, and 'jit' precompiles the program to \
+native machine code before execting it in the virtual machine.",
+                )
+                .short('u')
+                .long("use")
+                .takes_value(true)
+                .value_name("VALUE")
+                .possible_values(&["cfg", "disassembler", "interpreter", "jit"])
+                .default_value("interpreter"),
+        )
+        .arg(
+            Arg::new("instruction limit")
+                .about("Limit the number of instructions to execute")
+                .short('l')
+                .long("limit")
+                .takes_value(true)
+                .value_name("COUNT")
+                .default_value(&std::i64::MAX.to_string()),
+        )
+        .arg(
+            Arg::new("trace")
+                .about("Output trace to 'trace.out' file using tracing instrumentation")
+                .short('t')
+                .long("trace"),
+        )
+        .arg(
+            Arg::new("profile")
+                .about("Output profile to 'profile.dot' file using tracing instrumentation")
+                .short('p')
+                .long("profile"),
+        )
+        .arg(
+            Arg::new("verify")
+                .about("Run the verifier before execution or disassembly")
+                .short('v')
+                .long("verify"),
+        )
+        .get_matches();
+
+    let config = Config {
+        enable_instruction_tracing: matches.is_present("trace") || matches.is_present("profile"),
+        ..Config::default()
+    };
+    let mut accounts = Vec::new();
+    let mut account_refcells = Vec::new();
+    let default_account = RefCell::new(AccountSharedData::default());
+    let key = solana_sdk::pubkey::new_rand();
+    let mut mem = match matches.value_of("input").unwrap().parse::<usize>() {
+        Ok(allocate) => {
+            accounts.push(KeyedAccount::new(&key, false, &default_account));
+            vec![0u8; allocate]
+        }
+        Err(_) => {
+            let input = load_accounts(Path::new(matches.value_of("input").unwrap())).unwrap();
+            for acc in input.accounts {
+                let asd = AccountSharedData::new_ref(acc.lamports, acc.data.len(), &acc.owner);
+                asd.borrow_mut().set_data(acc.data);
+                account_refcells.push(asd);
+            }
+            for acc in &account_refcells {
+                accounts.push(KeyedAccount::new(&key, false, acc));
+            }
+            let lid = bpf_loader::id();
+            let pid = Pubkey::new(&[0u8; 32]);
+            let mut bytes = serialize_parameters(&lid, &pid, &accounts, &input.insndata).unwrap();
+            Vec::from(bytes.as_slice_mut())
+        }
+    };
+    let mut invoke_context = MockInvokeContext::new(accounts);
+    let logger = invoke_context.logger.clone();
+    let compute_meter = invoke_context.get_compute_meter();
+    let mut instruction_meter = ThisInstructionMeter { compute_meter };
+
+    let program = matches.value_of("PROGRAM").unwrap();
+    let mut file = File::open(&Path::new(program)).unwrap();
+    let mut magic = [0u8; 4];
+    file.read_exact(&mut magic).unwrap();
+    file.seek(SeekFrom::Start(0)).unwrap();
+    let mut contents = Vec::new();
+    file.read_to_end(&mut contents).unwrap();
+    let mut executable = if magic == [0x7f, 0x45, 0x4c, 0x46] {
+        <dyn Executable<BpfError, ThisInstructionMeter>>::from_elf(&contents, None, config)
+            .map_err(|err| format!("Executable constructor failed: {:?}", err))
+    } else {
+        assemble::<BpfError, ThisInstructionMeter>(
+            std::str::from_utf8(contents.as_slice()).unwrap(),
+            None,
+            config,
+        )
+    }
+    .unwrap();
+
+    if matches.is_present("verify") {
+        let (_, elf_bytes) = executable.get_text_bytes().unwrap();
+        check(elf_bytes).unwrap();
+    }
+    executable.set_syscall_registry(register_syscalls(&mut invoke_context).unwrap());
+    executable.jit_compile().unwrap();
+    let analysis = Analysis::from_executable(executable.as_ref());
+
+    match matches.value_of("use") {
+        Some("cfg") => {
+            let mut file = File::create("cfg.dot").unwrap();
+            analysis.visualize_graphically(&mut file, None).unwrap();
+            return;
+        }
+        Some("disassembler") => {
+            let stdout = std::io::stdout();
+            analysis.disassemble(&mut stdout.lock()).unwrap();
+            return;
+        }
+        _ => {}
+    }
+
+    let id = bpf_loader::id();
+    let mut vm = create_vm(&id, executable.as_ref(), &mut mem, &mut invoke_context).unwrap();
+    let result = if matches.value_of("use").unwrap() == "interpreter" {
+        vm.execute_program_interpreted(&mut instruction_meter)
+    } else {
+        vm.execute_program_jit(&mut instruction_meter)
+    };
+    if logger.log.borrow().len() > 0 {
+        println!("Program output:");
+        for s in logger.log.borrow_mut().iter() {
+            println!("{}", s);
+        }
+        println!("----------------------------------------");
+    }
+    println!("Result: {:?}", result);
+    println!("Instruction Count: {}", vm.get_total_instruction_count());
+    if matches.is_present("trace") {
+        println!("Trace is saved in trace.out");
+        let mut file = File::create("trace.out").unwrap();
+        let analysis = Analysis::from_executable(executable.as_ref());
+        vm.get_tracer().write(&mut file, &analysis).unwrap();
+    }
+    if matches.is_present("profile") {
+        println!("Profile is saved in profile.dot");
+        let tracer = &vm.get_tracer();
+        let dynamic_analysis = DynamicAnalysis::new(tracer, &analysis);
+        let mut file = File::create("profile.dot").unwrap();
+        analysis
+            .visualize_graphically(&mut file, Some(&dynamic_analysis))
+            .unwrap();
+    }
+}
diff --git a/remote-wallet/Cargo.toml b/remote-wallet/Cargo.toml
index 81c0c34e51d299..d17c36ae7cd495 100644
--- a/remote-wallet/Cargo.toml
+++ b/remote-wallet/Cargo.toml
@@ -3,7 +3,7 @@ authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 edition = "2018"
 name = "solana-remote-wallet"
 description = "Blockchain, Rebuilt for Scale"
-version = "1.7.0"
+version = "1.7.11"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
@@ -11,7 +11,7 @@ documentation = "https://docs.rs/solana-remote-wallet"
 
 [dependencies]
 base32 = "0.4.0"
-console = "0.11.3"
+console = "0.14.1"
 dialoguer = "0.6.2"
 hidapi = { version = "1.2.5", default-features = false }
 log = "0.4.11"
@@ -20,7 +20,7 @@ num-traits = { version = "0.2" }
 parking_lot = "0.10"
 qstring = "0.7.2"
 semver = "0.9"
-solana-sdk = { path = "../sdk", version = "=1.7.0" }
+solana-sdk = { path = "../sdk", version = "=1.7.11" }
 thiserror = "1.0"
 uriparse = "0.6.3"
 
diff --git a/remote-wallet/src/remote_keypair.rs b/remote-wallet/src/remote_keypair.rs
index 28ccbe83c4097f..d37eefe2427175 100644
--- a/remote-wallet/src/remote_keypair.rs
+++ b/remote-wallet/src/remote_keypair.rs
@@ -53,6 +53,10 @@ impl Signer for RemoteKeypair {
                 .map_err(|e| e.into()),
         }
     }
+
+    fn is_interactive(&self) -> bool {
+        true
+    }
 }
 
 pub fn generate_remote_keypair(
diff --git a/remote-wallet/src/remote_wallet.rs b/remote-wallet/src/remote_wallet.rs
index afa5abc2f53631..af061650180ff5 100644
--- a/remote-wallet/src/remote_wallet.rs
+++ b/remote-wallet/src/remote_wallet.rs
@@ -114,10 +114,10 @@ impl RemoteWalletManager {
             is_valid_hid_device(device_info.usage_page(), device_info.interface_number())
                 && is_valid_ledger(device_info.vendor_id(), device_info.product_id())
         }) {
-            match usb.open_path(&device_info.path()) {
+            match usb.open_path(device_info.path()) {
                 Ok(device) => {
                     let mut ledger = LedgerWallet::new(device);
-                    let result = ledger.read_device(&device_info);
+                    let result = ledger.read_device(device_info);
                     match result {
                         Ok(info) => {
                             ledger.pretty_path = info.get_pretty_path();
diff --git a/rpc/.gitignore b/rpc/.gitignore
new file mode 100644
index 00000000000000..5404b132dba6e1
--- /dev/null
+++ b/rpc/.gitignore
@@ -0,0 +1,2 @@
+/target/
+/farf/
diff --git a/rpc/Cargo.toml b/rpc/Cargo.toml
index 76f4f4eda23996..cf4c84e0ca3a9a 100644
--- a/rpc/Cargo.toml
+++ b/rpc/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "solana-rpc"
-version = "1.7.0"
+version = "1.7.11"
 description = "Solana RPC"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -10,31 +10,50 @@ documentation = "https://docs.rs/solana-rpc"
 edition = "2018"
 
 [dependencies]
+base64 = "0.12.3"
+bincode = "1.3.1"
 bs58 = "0.3.1"
 crossbeam-channel = "0.4"
-jsonrpc-core = "17.0.0"
-jsonrpc-core-client = { version = "17.0.0", features = ["ipc", "ws"] }
-jsonrpc-derive = "17.0.0"
-jsonrpc-pubsub = "17.0.0"
-jsonrpc-ws-server = "17.0.0"
+itertools = "0.9.0"
+jsonrpc-core = "17.1.0"
+jsonrpc-core-client = { version = "17.1.0", features = ["ipc", "ws"] }
+jsonrpc-derive = "17.1.0"
+jsonrpc-http-server = "17.1.0"
+jsonrpc-pubsub = "17.1.0"
+jsonrpc-ws-server = "17.1.0"
+libc = "0.2.81"
 log = "0.4.11"
+regex = "1.3.9"
 serde = "1.0.122"
 serde_derive = "1.0.103"
 serde_json = "1.0.56"
-solana-account-decoder = { path = "../account-decoder", version = "=1.7.0" }
-solana-client = { path = "../client", version = "=1.7.0" }
-solana-ledger = { path = "../ledger", version = "=1.7.0" }
-solana-measure = { path = "../measure", version = "=1.7.0" }
-solana-metrics = { path = "../metrics", version = "=1.7.0" }
-solana-runtime = { path = "../runtime", version = "=1.7.0" }
-solana-sdk = { path = "../sdk", version = "=1.7.0" }
-solana-vote-program = { path = "../programs/vote", version = "=1.7.0" }
-spl-token-v2-0 = { package = "spl-token", version = "=3.1.0", features = ["no-entrypoint"] }
+solana-account-decoder = { path = "../account-decoder", version = "=1.7.11" }
+solana-client = { path = "../client", version = "=1.7.11" }
+solana-faucet = { path = "../faucet", version = "=1.7.11" }
+solana-gossip = { path = "../gossip", version = "=1.7.11" }
+solana-ledger = { path = "../ledger", version = "=1.7.11" }
+solana-measure = { path = "../measure", version = "=1.7.11" }
+solana-metrics = { path = "../metrics", version = "=1.7.11" }
+solana-perf = { path = "../perf", version = "=1.7.11" }
+solana-poh = { path = "../poh", version = "=1.7.11" }
+solana-runtime = { path = "../runtime", version = "=1.7.11" }
+solana-sdk = { path = "../sdk", version = "=1.7.11" }
+solana-streamer = { path = "../streamer", version = "=1.7.11" }
+solana-storage-bigtable = { path = "../storage-bigtable", version = "=1.7.11" }
+solana-transaction-status = { path = "../transaction-status", version = "=1.7.11" }
+solana-version = { path = "../version", version = "=1.7.11" }
+solana-vote-program = { path = "../programs/vote", version = "=1.7.11" }
+spl-token-v2-0 = { package = "spl-token", version = "=3.2.0", features = ["no-entrypoint"] }
+tokio = { version = "1", features = ["full"] }
+tokio_02 = { version = "0.2", package = "tokio", features = ["full"] }
+tokio-util = { version = "0.3", features = ["codec"] } # This crate needs to stay in sync with tokio_02, until that dependency can be removed
 
 [dev-dependencies]
 serial_test = "0.4.0"
-solana-stake-program = { path = "../programs/stake", version = "=1.7.0" }
-tokio = { version = "1", features = ["full"] }
+solana-logger = { path = "../logger", version = "=1.7.11" }
+solana-net-utils = { path = "../net-utils", version = "=1.7.11" }
+solana-stake-program = { path = "../programs/stake", version = "=1.7.11" }
+symlink = "0.1.0"
 
 [lib]
 crate-type = ["lib"]
diff --git a/rpc/src/lib.rs b/rpc/src/lib.rs
index bb280e3e3e917f..f3a9b4b6e91306 100644
--- a/rpc/src/lib.rs
+++ b/rpc/src/lib.rs
@@ -2,10 +2,15 @@
 pub mod max_slots;
 pub mod optimistically_confirmed_bank_tracker;
 pub mod parsed_token_accounts;
+pub mod rpc;
 pub mod rpc_completed_slots_service;
+pub mod rpc_health;
 pub mod rpc_pubsub;
 pub mod rpc_pubsub_service;
+pub mod rpc_service;
 pub mod rpc_subscriptions;
+pub mod send_transaction_service;
+pub mod transaction_status_service;
 
 #[macro_use]
 extern crate log;
diff --git a/rpc/src/optimistically_confirmed_bank_tracker.rs b/rpc/src/optimistically_confirmed_bank_tracker.rs
index 62ab533105561d..e046aa3214a19b 100644
--- a/rpc/src/optimistically_confirmed_bank_tracker.rs
+++ b/rpc/src/optimistically_confirmed_bank_tracker.rs
@@ -66,6 +66,8 @@ impl OptimisticallyConfirmedBankTracker {
     ) -> Self {
         let exit_ = exit.clone();
         let mut pending_optimistically_confirmed_banks = HashSet::new();
+        let mut last_notified_confirmed_slot: Slot = 0;
+        let mut highest_confirmed_slot: Slot = 0;
         let thread_hdl = Builder::new()
             .name("solana-optimistic-bank-tracker".to_string())
             .spawn(move || loop {
@@ -79,6 +81,8 @@ impl OptimisticallyConfirmedBankTracker {
                     &optimistically_confirmed_bank,
                     &subscriptions,
                     &mut pending_optimistically_confirmed_banks,
+                    &mut last_notified_confirmed_slot,
+                    &mut highest_confirmed_slot,
                 ) {
                     break;
                 }
@@ -93,6 +97,8 @@ impl OptimisticallyConfirmedBankTracker {
         optimistically_confirmed_bank: &Arc<RwLock<OptimisticallyConfirmedBank>>,
         subscriptions: &Arc<RpcSubscriptions>,
         mut pending_optimistically_confirmed_banks: &mut HashSet<Slot>,
+        mut last_notified_confirmed_slot: &mut Slot,
+        mut highest_confirmed_slot: &mut Slot,
     ) -> Result<(), RecvTimeoutError> {
         let notification = receiver.recv_timeout(Duration::from_secs(1))?;
         Self::process_notification(
@@ -101,31 +107,91 @@ impl OptimisticallyConfirmedBankTracker {
             optimistically_confirmed_bank,
             subscriptions,
             &mut pending_optimistically_confirmed_banks,
+            &mut last_notified_confirmed_slot,
+            &mut highest_confirmed_slot,
         );
         Ok(())
     }
 
+    fn notify_or_defer(
+        subscriptions: &Arc<RpcSubscriptions>,
+        bank_forks: &Arc<RwLock<BankForks>>,
+        bank: &Arc<Bank>,
+        last_notified_confirmed_slot: &mut Slot,
+        pending_optimistically_confirmed_banks: &mut HashSet<Slot>,
+    ) {
+        if bank.is_frozen() {
+            if bank.slot() > *last_notified_confirmed_slot {
+                debug!(
+                    "notify_or_defer notifying via notify_gossip_subscribers for slot {:?}",
+                    bank.slot()
+                );
+                subscriptions.notify_gossip_subscribers(bank.slot());
+                *last_notified_confirmed_slot = bank.slot();
+            }
+        } else if bank.slot() > bank_forks.read().unwrap().root_bank().slot() {
+            pending_optimistically_confirmed_banks.insert(bank.slot());
+            debug!("notify_or_defer defer notifying for slot {:?}", bank.slot());
+        }
+    }
+
+    fn notify_or_defer_confirmed_banks(
+        subscriptions: &Arc<RpcSubscriptions>,
+        bank_forks: &Arc<RwLock<BankForks>>,
+        bank: &Arc<Bank>,
+        slot_threshold: Slot,
+        mut last_notified_confirmed_slot: &mut Slot,
+        mut pending_optimistically_confirmed_banks: &mut HashSet<Slot>,
+    ) {
+        for confirmed_bank in bank.clone().parents_inclusive().iter().rev() {
+            if confirmed_bank.slot() > slot_threshold {
+                debug!(
+                    "Calling notify_or_defer for confirmed_bank {:?}",
+                    confirmed_bank.slot()
+                );
+                Self::notify_or_defer(
+                    subscriptions,
+                    bank_forks,
+                    confirmed_bank,
+                    &mut last_notified_confirmed_slot,
+                    &mut pending_optimistically_confirmed_banks,
+                );
+            }
+        }
+    }
+
     pub fn process_notification(
         notification: BankNotification,
         bank_forks: &Arc<RwLock<BankForks>>,
         optimistically_confirmed_bank: &Arc<RwLock<OptimisticallyConfirmedBank>>,
         subscriptions: &Arc<RpcSubscriptions>,
-        pending_optimistically_confirmed_banks: &mut HashSet<Slot>,
+        mut pending_optimistically_confirmed_banks: &mut HashSet<Slot>,
+        mut last_notified_confirmed_slot: &mut Slot,
+        highest_confirmed_slot: &mut Slot,
     ) {
         debug!("received bank notification: {:?}", notification);
         match notification {
             BankNotification::OptimisticallyConfirmed(slot) => {
-                if let Some(bank) = bank_forks
-                    .read()
-                    .unwrap()
-                    .get(slot)
-                    .filter(|b| b.is_frozen())
-                {
+                if let Some(bank) = bank_forks.read().unwrap().get(slot) {
                     let mut w_optimistically_confirmed_bank =
                         optimistically_confirmed_bank.write().unwrap();
-                    if bank.slot() > w_optimistically_confirmed_bank.bank.slot() {
+
+                    if bank.slot() > w_optimistically_confirmed_bank.bank.slot() && bank.is_frozen()
+                    {
                         w_optimistically_confirmed_bank.bank = bank.clone();
-                        subscriptions.notify_gossip_subscribers(slot);
+                    }
+
+                    if slot > *highest_confirmed_slot {
+                        Self::notify_or_defer_confirmed_banks(
+                            subscriptions,
+                            bank_forks,
+                            bank,
+                            *highest_confirmed_slot,
+                            &mut last_notified_confirmed_slot,
+                            &mut pending_optimistically_confirmed_banks,
+                        );
+
+                        *highest_confirmed_slot = slot;
                     }
                     drop(w_optimistically_confirmed_bank);
                 } else if slot > bank_forks.read().unwrap().root_bank().slot() {
@@ -159,11 +225,24 @@ impl OptimisticallyConfirmedBankTracker {
                 }
 
                 if pending_optimistically_confirmed_banks.remove(&bank.slot()) {
+                    debug!(
+                        "Calling notify_gossip_subscribers to send deferred notification {:?}",
+                        frozen_slot
+                    );
+
+                    Self::notify_or_defer_confirmed_banks(
+                        subscriptions,
+                        bank_forks,
+                        &bank,
+                        *last_notified_confirmed_slot,
+                        &mut last_notified_confirmed_slot,
+                        &mut pending_optimistically_confirmed_banks,
+                    );
+
                     let mut w_optimistically_confirmed_bank =
                         optimistically_confirmed_bank.write().unwrap();
                     if frozen_slot > w_optimistically_confirmed_bank.bank.slot() {
                         w_optimistically_confirmed_bank.bank = bank;
-                        subscriptions.notify_gossip_subscribers(frozen_slot);
                     }
                     drop(w_optimistically_confirmed_bank);
                 }
@@ -231,14 +310,19 @@ mod tests {
 
         assert_eq!(optimistically_confirmed_bank.read().unwrap().bank.slot(), 0);
 
+        let mut highest_confirmed_slot: Slot = 0;
+        let mut last_notified_confirmed_slot: Slot = 0;
         OptimisticallyConfirmedBankTracker::process_notification(
             BankNotification::OptimisticallyConfirmed(2),
             &bank_forks,
             &optimistically_confirmed_bank,
             &subscriptions,
             &mut pending_optimistically_confirmed_banks,
+            &mut last_notified_confirmed_slot,
+            &mut highest_confirmed_slot,
         );
         assert_eq!(optimistically_confirmed_bank.read().unwrap().bank.slot(), 2);
+        assert_eq!(highest_confirmed_slot, 2);
 
         // Test max optimistically confirmed bank remains in the cache
         OptimisticallyConfirmedBankTracker::process_notification(
@@ -247,8 +331,11 @@ mod tests {
             &optimistically_confirmed_bank,
             &subscriptions,
             &mut pending_optimistically_confirmed_banks,
+            &mut last_notified_confirmed_slot,
+            &mut highest_confirmed_slot,
         );
         assert_eq!(optimistically_confirmed_bank.read().unwrap().bank.slot(), 2);
+        assert_eq!(highest_confirmed_slot, 2);
 
         // Test bank will only be cached when frozen
         OptimisticallyConfirmedBankTracker::process_notification(
@@ -257,21 +344,30 @@ mod tests {
             &optimistically_confirmed_bank,
             &subscriptions,
             &mut pending_optimistically_confirmed_banks,
+            &mut last_notified_confirmed_slot,
+            &mut highest_confirmed_slot,
         );
         assert_eq!(optimistically_confirmed_bank.read().unwrap().bank.slot(), 2);
         assert_eq!(pending_optimistically_confirmed_banks.len(), 1);
         assert!(pending_optimistically_confirmed_banks.contains(&3));
+        assert_eq!(highest_confirmed_slot, 3);
 
         // Test bank will only be cached when frozen
         let bank3 = bank_forks.read().unwrap().get(3).unwrap().clone();
+        bank3.freeze();
+
         OptimisticallyConfirmedBankTracker::process_notification(
             BankNotification::Frozen(bank3),
             &bank_forks,
             &optimistically_confirmed_bank,
             &subscriptions,
             &mut pending_optimistically_confirmed_banks,
+            &mut last_notified_confirmed_slot,
+            &mut highest_confirmed_slot,
         );
         assert_eq!(optimistically_confirmed_bank.read().unwrap().bank.slot(), 3);
+        assert_eq!(highest_confirmed_slot, 3);
+        assert_eq!(pending_optimistically_confirmed_banks.len(), 0);
 
         // Test higher root will be cached and clear pending_optimistically_confirmed_banks
         let bank3 = bank_forks.read().unwrap().get(3).unwrap().clone();
@@ -283,10 +379,13 @@ mod tests {
             &optimistically_confirmed_bank,
             &subscriptions,
             &mut pending_optimistically_confirmed_banks,
+            &mut last_notified_confirmed_slot,
+            &mut highest_confirmed_slot,
         );
         assert_eq!(optimistically_confirmed_bank.read().unwrap().bank.slot(), 3);
         assert_eq!(pending_optimistically_confirmed_banks.len(), 1);
         assert!(pending_optimistically_confirmed_banks.contains(&4));
+        assert_eq!(highest_confirmed_slot, 4);
 
         let bank4 = bank_forks.read().unwrap().get(4).unwrap().clone();
         let bank5 = Bank::new_from_parent(&bank4, &Pubkey::default(), 5);
@@ -298,10 +397,13 @@ mod tests {
             &optimistically_confirmed_bank,
             &subscriptions,
             &mut pending_optimistically_confirmed_banks,
+            &mut last_notified_confirmed_slot,
+            &mut highest_confirmed_slot,
         );
         assert_eq!(optimistically_confirmed_bank.read().unwrap().bank.slot(), 5);
         assert_eq!(pending_optimistically_confirmed_banks.len(), 0);
         assert!(!pending_optimistically_confirmed_banks.contains(&4));
+        assert_eq!(highest_confirmed_slot, 4);
 
         // Banks <= root do not get added to pending list, even if not frozen
         let bank5 = bank_forks.read().unwrap().get(5).unwrap().clone();
@@ -320,9 +422,12 @@ mod tests {
             &optimistically_confirmed_bank,
             &subscriptions,
             &mut pending_optimistically_confirmed_banks,
+            &mut last_notified_confirmed_slot,
+            &mut highest_confirmed_slot,
         );
         assert_eq!(optimistically_confirmed_bank.read().unwrap().bank.slot(), 5);
         assert_eq!(pending_optimistically_confirmed_banks.len(), 0);
         assert!(!pending_optimistically_confirmed_banks.contains(&6));
+        assert_eq!(highest_confirmed_slot, 4);
     }
 }
diff --git a/rpc/src/parsed_token_accounts.rs b/rpc/src/parsed_token_accounts.rs
index bfcc9a1fa7c61d..1e2c22007bbe04 100644
--- a/rpc/src/parsed_token_accounts.rs
+++ b/rpc/src/parsed_token_accounts.rs
@@ -20,7 +20,7 @@ pub fn get_parsed_token_account(
     pubkey: &Pubkey,
     account: AccountSharedData,
 ) -> UiAccount {
-    let additional_data = get_token_account_mint(&account.data())
+    let additional_data = get_token_account_mint(account.data())
         .and_then(|mint_pubkey| get_mint_owner_and_decimals(&bank, &mint_pubkey).ok())
         .map(|(_, decimals)| AccountAdditionalData {
             spl_token_decimals: Some(decimals),
@@ -44,7 +44,7 @@ where
 {
     let mut mint_decimals: HashMap<Pubkey, u8> = HashMap::new();
     keyed_accounts.filter_map(move |(pubkey, account)| {
-        let additional_data = get_token_account_mint(&account.data()).map(|mint_pubkey| {
+        let additional_data = get_token_account_mint(account.data()).map(|mint_pubkey| {
             let spl_token_decimals = mint_decimals.get(&mint_pubkey).cloned().or_else(|| {
                 let (_, decimals) = get_mint_owner_and_decimals(&bank, &mint_pubkey).ok()?;
                 mint_decimals.insert(mint_pubkey, decimals);
@@ -80,7 +80,7 @@ pub fn get_mint_owner_and_decimals(bank: &Arc<Bank>, mint: &Pubkey) -> Result<(P
         let mint_account = bank.get_account(mint).ok_or_else(|| {
             Error::invalid_params("Invalid param: could not find mint".to_string())
         })?;
-        let decimals = get_mint_decimals(&mint_account.data())?;
+        let decimals = get_mint_decimals(mint_account.data())?;
         Ok((*mint_account.owner(), decimals))
     }
 }
diff --git a/core/src/rpc.rs b/rpc/src/rpc.rs
similarity index 91%
rename from core/src/rpc.rs
rename to rpc/src/rpc.rs
index 4d2b514859907c..f608b98315a3a6 100644
--- a/core/src/rpc.rs
+++ b/rpc/src/rpc.rs
@@ -1,95 +1,99 @@
 //! The `rpc` module implements the Solana RPC interface.
 
-use crate::{
-    rpc_health::*,
-    send_transaction_service::{SendTransactionService, TransactionInfo},
-    validator::ValidatorExit,
-};
-use bincode::{config::Options, serialize};
-use jsonrpc_core::{types::error, Error, Metadata, Result};
-use jsonrpc_derive::rpc;
-use serde::{Deserialize, Serialize};
-use solana_account_decoder::{
-    parse_token::{spl_token_id_v2_0, token_amount_to_ui_amount, UiTokenAmount},
-    UiAccount, UiAccountEncoding, UiDataSliceConfig,
-};
-use solana_client::{
-    rpc_cache::LargestAccountsCache,
-    rpc_config::*,
-    rpc_custom_error::RpcCustomError,
-    rpc_deprecated_config::*,
-    rpc_filter::{Memcmp, MemcmpEncodedBytes, RpcFilterType},
-    rpc_request::{
-        TokenAccountsFilter, DELINQUENT_VALIDATOR_SLOT_DISTANCE, MAX_GET_CONFIRMED_BLOCKS_RANGE,
-        MAX_GET_CONFIRMED_SIGNATURES_FOR_ADDRESS2_LIMIT,
-        MAX_GET_CONFIRMED_SIGNATURES_FOR_ADDRESS_SLOT_RANGE, MAX_GET_PROGRAM_ACCOUNT_FILTERS,
-        MAX_GET_SIGNATURE_STATUSES_QUERY_ITEMS, MAX_GET_SLOT_LEADERS, MAX_MULTIPLE_ACCOUNTS,
-        NUM_LARGEST_ACCOUNTS,
+use {
+    crate::{
+        max_slots::MaxSlots,
+        optimistically_confirmed_bank_tracker::OptimisticallyConfirmedBank,
+        parsed_token_accounts::*,
+        rpc_health::*,
+        send_transaction_service::{SendTransactionService, TransactionInfo},
     },
-    rpc_response::Response as RpcResponse,
-    rpc_response::*,
-};
-use solana_faucet::faucet::request_airdrop_transaction;
-use solana_gossip::{cluster_info::ClusterInfo, contact_info::ContactInfo};
-use solana_ledger::{
-    blockstore::Blockstore, blockstore_db::BlockstoreError, get_tmp_ledger_path,
-    leader_schedule_cache::LeaderScheduleCache,
-};
-use solana_metrics::inc_new_counter_info;
-use solana_perf::packet::PACKET_DATA_SIZE;
-use solana_rpc::{
-    max_slots::MaxSlots, optimistically_confirmed_bank_tracker::OptimisticallyConfirmedBank,
-    parsed_token_accounts::*,
-};
-use solana_runtime::{
-    accounts::AccountAddressFilter,
-    accounts_index::{AccountIndex, AccountSecondaryIndexes, IndexKey},
-    bank::Bank,
-    bank_forks::{BankForks, SnapshotConfig},
-    commitment::{BlockCommitmentArray, BlockCommitmentCache, CommitmentSlots},
-    inline_spl_token_v2_0::{SPL_TOKEN_ACCOUNT_MINT_OFFSET, SPL_TOKEN_ACCOUNT_OWNER_OFFSET},
-    non_circulating_supply::calculate_non_circulating_supply,
-    snapshot_utils::get_highest_snapshot_archive_path,
-};
-use solana_sdk::{
-    account::{AccountSharedData, ReadableAccount},
-    account_utils::StateMut,
-    clock::{Slot, UnixTimestamp, MAX_RECENT_BLOCKHASHES},
-    commitment_config::{CommitmentConfig, CommitmentLevel},
-    epoch_info::EpochInfo,
-    epoch_schedule::EpochSchedule,
-    hash::Hash,
-    pubkey::Pubkey,
-    sanitize::Sanitize,
-    signature::Signature,
-    stake_history::StakeHistory,
-    system_instruction,
-    sysvar::stake_history,
-    transaction::{self, Transaction},
-};
-use solana_stake_program::stake_state::StakeState;
-use solana_transaction_status::{
-    EncodedConfirmedTransaction, Reward, RewardType, TransactionConfirmationStatus,
-    TransactionStatus, UiConfirmedBlock, UiTransactionEncoding,
-};
-use solana_vote_program::vote_state::{VoteState, MAX_LOCKOUT_HISTORY};
-use spl_token_v2_0::{
-    solana_program::program_pack::Pack,
-    state::{Account as TokenAccount, Mint},
-};
-use std::{
-    cmp::{max, min},
-    collections::{HashMap, HashSet},
-    net::SocketAddr,
-    str::FromStr,
-    sync::{
-        atomic::{AtomicBool, AtomicU64, Ordering},
-        mpsc::{channel, Receiver, Sender},
-        Arc, Mutex, RwLock,
+    bincode::{config::Options, serialize},
+    jsonrpc_core::{types::error, Error, Metadata, Result},
+    jsonrpc_derive::rpc,
+    serde::{Deserialize, Serialize},
+    solana_account_decoder::{
+        parse_token::{spl_token_id_v2_0, token_amount_to_ui_amount, UiTokenAmount},
+        UiAccount, UiAccountEncoding, UiDataSliceConfig, MAX_BASE58_BYTES,
+    },
+    solana_client::{
+        rpc_cache::LargestAccountsCache,
+        rpc_config::*,
+        rpc_custom_error::RpcCustomError,
+        rpc_deprecated_config::*,
+        rpc_filter::{Memcmp, MemcmpEncodedBytes, RpcFilterType},
+        rpc_request::{
+            TokenAccountsFilter, DELINQUENT_VALIDATOR_SLOT_DISTANCE,
+            MAX_GET_CONFIRMED_BLOCKS_RANGE, MAX_GET_CONFIRMED_SIGNATURES_FOR_ADDRESS2_LIMIT,
+            MAX_GET_CONFIRMED_SIGNATURES_FOR_ADDRESS_SLOT_RANGE, MAX_GET_PROGRAM_ACCOUNT_FILTERS,
+            MAX_GET_SIGNATURE_STATUSES_QUERY_ITEMS, MAX_GET_SLOT_LEADERS, MAX_MULTIPLE_ACCOUNTS,
+            NUM_LARGEST_ACCOUNTS,
+        },
+        rpc_response::Response as RpcResponse,
+        rpc_response::*,
+    },
+    solana_faucet::faucet::request_airdrop_transaction,
+    solana_gossip::{cluster_info::ClusterInfo, contact_info::ContactInfo},
+    solana_ledger::{
+        blockstore::Blockstore, blockstore_db::BlockstoreError, get_tmp_ledger_path,
+        leader_schedule_cache::LeaderScheduleCache,
+    },
+    solana_metrics::inc_new_counter_info,
+    solana_perf::packet::PACKET_DATA_SIZE,
+    solana_runtime::{
+        accounts::AccountAddressFilter,
+        accounts_index::{AccountIndex, AccountSecondaryIndexes, IndexKey},
+        bank::Bank,
+        bank_forks::{BankForks, SnapshotConfig},
+        commitment::{BlockCommitmentArray, BlockCommitmentCache, CommitmentSlots},
+        inline_spl_token_v2_0::{SPL_TOKEN_ACCOUNT_MINT_OFFSET, SPL_TOKEN_ACCOUNT_OWNER_OFFSET},
+        non_circulating_supply::calculate_non_circulating_supply,
+        snapshot_utils::get_highest_snapshot_archive_path,
+    },
+    solana_sdk::{
+        account::{AccountSharedData, ReadableAccount},
+        account_utils::StateMut,
+        clock::{Slot, UnixTimestamp, MAX_RECENT_BLOCKHASHES},
+        commitment_config::{CommitmentConfig, CommitmentLevel},
+        epoch_info::EpochInfo,
+        epoch_schedule::EpochSchedule,
+        exit::Exit,
+        hash::Hash,
+        pubkey::Pubkey,
+        sanitize::Sanitize,
+        signature::{Keypair, Signature, Signer},
+        stake::state::StakeState,
+        stake_history::StakeHistory,
+        system_instruction,
+        sysvar::stake_history,
+        transaction::{self, Transaction, TransactionError},
+    },
+    solana_streamer::socket::SocketAddrSpace,
+    solana_transaction_status::{
+        ConfirmedBlock, EncodedConfirmedTransaction, Reward, RewardType,
+        TransactionConfirmationStatus, TransactionStatus, UiConfirmedBlock, UiTransactionEncoding,
     },
-    time::Duration,
+    solana_vote_program::vote_state::{VoteState, MAX_LOCKOUT_HISTORY},
+    spl_token_v2_0::{
+        solana_program::program_pack::Pack,
+        state::{Account as TokenAccount, Mint},
+    },
+    std::{
+        cmp::{max, min},
+        collections::{HashMap, HashSet},
+        net::SocketAddr,
+        str::FromStr,
+        sync::{
+            atomic::{AtomicBool, AtomicU64, Ordering},
+            mpsc::{channel, Receiver, Sender},
+            Arc, Mutex, RwLock,
+        },
+        time::Duration,
+    },
+    tokio::runtime::Runtime,
 };
-use tokio::runtime::Runtime;
+
+type RpcCustomResult<T> = std::result::Result<T, RpcCustomError>;
 
 pub const MAX_REQUEST_PAYLOAD_SIZE: usize = 50 * (1 << 10); // 50kB
 pub const PERFORMANCE_SAMPLES_LIMIT: usize = 720;
@@ -148,7 +152,7 @@ pub struct JsonRpcRequestProcessor {
     blockstore: Arc<Blockstore>,
     config: JsonRpcConfig,
     snapshot_config: Option<SnapshotConfig>,
-    validator_exit: Arc<RwLock<ValidatorExit>>,
+    validator_exit: Arc<RwLock<Exit>>,
     health: Arc<RpcHealth>,
     cluster_info: Arc<ClusterInfo>,
     genesis_hash: Hash,
@@ -228,6 +232,10 @@ impl JsonRpcRequestProcessor {
         })
     }
 
+    fn genesis_creation_time(&self) -> UnixTimestamp {
+        self.bank(None).genesis_creation_time()
+    }
+
     #[allow(clippy::too_many_arguments)]
     pub fn new(
         config: JsonRpcConfig,
@@ -235,7 +243,7 @@ impl JsonRpcRequestProcessor {
         bank_forks: Arc<RwLock<BankForks>>,
         block_commitment_cache: Arc<RwLock<BlockCommitmentCache>>,
         blockstore: Arc<Blockstore>,
-        validator_exit: Arc<RwLock<ValidatorExit>>,
+        validator_exit: Arc<RwLock<Exit>>,
         health: Arc<RpcHealth>,
         cluster_info: Arc<ClusterInfo>,
         genesis_hash: Hash,
@@ -273,7 +281,7 @@ impl JsonRpcRequestProcessor {
     }
 
     // Useful for unit testing
-    pub fn new_from_bank(bank: &Arc<Bank>) -> Self {
+    pub fn new_from_bank(bank: &Arc<Bank>, socket_addr_space: SocketAddrSpace) -> Self {
         let genesis_hash = bank.hash();
         let bank_forks = Arc::new(RwLock::new(BankForks::new_from_banks(
             &[bank.clone()],
@@ -281,7 +289,11 @@ impl JsonRpcRequestProcessor {
         )));
         let blockstore = Arc::new(Blockstore::open(&get_tmp_ledger_path!()).unwrap());
         let exit = Arc::new(AtomicBool::new(false));
-        let cluster_info = Arc::new(ClusterInfo::default());
+        let cluster_info = Arc::new(ClusterInfo::new(
+            ContactInfo::default(),
+            Arc::new(Keypair::new()),
+            socket_addr_space,
+        ));
         let tpu_address = cluster_info.my_contact_info().tpu;
         let (sender, receiver) = channel();
         SendTransactionService::new(tpu_address, &bank_forks, None, receiver, 1000, 1);
@@ -381,19 +393,14 @@ impl JsonRpcRequestProcessor {
             if program_id == &spl_token_id_v2_0() && encoding == UiAccountEncoding::JsonParsed {
                 get_parsed_token_accounts(bank.clone(), keyed_accounts.into_iter()).collect()
             } else {
-                keyed_accounts
-                    .into_iter()
-                    .map(|(pubkey, account)| RpcKeyedAccount {
+                let mut encoded_accounts = vec![];
+                for (pubkey, account) in keyed_accounts {
+                    encoded_accounts.push(RpcKeyedAccount {
                         pubkey: pubkey.to_string(),
-                        account: UiAccount::encode(
-                            &pubkey,
-                            &account,
-                            encoding,
-                            None,
-                            data_slice_config,
-                        ),
-                    })
-                    .collect()
+                        account: encode_account(&account, &pubkey, encoding, data_slice_config)?,
+                    });
+                }
+                encoded_accounts
             };
         Ok(result).map(|result| match with_context {
             true => OptionalContext::Context(new_response(&bank, result)),
@@ -477,6 +484,7 @@ impl JsonRpcRequestProcessor {
                         effective_slot: first_confirmed_block_in_epoch,
                         amount: reward.lamports.abs() as u64,
                         post_balance: reward.post_balance,
+                        commission: reward.commission,
                     });
                 }
                 None
@@ -541,6 +549,7 @@ impl JsonRpcRequestProcessor {
     fn get_fees(&self, commitment: Option<CommitmentConfig>) -> RpcResponse<RpcFees> {
         let bank = self.bank(commitment);
         let (blockhash, fee_calculator) = bank.confirmed_last_blockhash();
+        #[allow(deprecated)]
         let last_valid_slot = bank
             .get_blockhash_last_valid_slot(&blockhash)
             .expect("bank blockhash queue should contain blockhash");
@@ -704,18 +713,23 @@ impl JsonRpcRequestProcessor {
     fn get_largest_accounts(
         &self,
         config: Option<RpcLargestAccountsConfig>,
-    ) -> RpcResponse<Vec<RpcAccountBalance>> {
+    ) -> RpcCustomResult<RpcResponse<Vec<RpcAccountBalance>>> {
         let config = config.unwrap_or_default();
         let bank = self.bank(config.commitment);
 
         if let Some((slot, accounts)) = self.get_cached_largest_accounts(&config.filter) {
-            Response {
+            Ok(Response {
                 context: RpcResponseContext { slot },
                 value: accounts,
-            }
+            })
         } else {
             let (addresses, address_filter) = if let Some(filter) = config.clone().filter {
-                let non_circulating_supply = calculate_non_circulating_supply(&bank);
+                let non_circulating_supply =
+                    calculate_non_circulating_supply(&bank).map_err(|e| {
+                        RpcCustomError::ScanError {
+                            message: e.to_string(),
+                        }
+                    })?;
                 let addresses = non_circulating_supply.accounts.into_iter().collect();
                 let address_filter = match filter {
                     RpcLargestAccountsFilter::Circulating => AccountAddressFilter::Exclude,
@@ -727,6 +741,9 @@ impl JsonRpcRequestProcessor {
             };
             let accounts = bank
                 .get_largest_accounts(NUM_LARGEST_ACCOUNTS, &addresses, address_filter)
+                .map_err(|e| RpcCustomError::ScanError {
+                    message: e.to_string(),
+                })?
                 .into_iter()
                 .map(|(address, lamports)| RpcAccountBalance {
                     address: address.to_string(),
@@ -735,27 +752,40 @@ impl JsonRpcRequestProcessor {
                 .collect::<Vec<RpcAccountBalance>>();
 
             self.set_cached_largest_accounts(&config.filter, bank.slot(), &accounts);
-            new_response(&bank, accounts)
+            Ok(new_response(&bank, accounts))
         }
     }
 
-    fn get_supply(&self, commitment: Option<CommitmentConfig>) -> RpcResponse<RpcSupply> {
-        let bank = self.bank(commitment);
-        let non_circulating_supply = calculate_non_circulating_supply(&bank);
+    fn get_supply(
+        &self,
+        config: Option<RpcSupplyConfig>,
+    ) -> RpcCustomResult<RpcResponse<RpcSupply>> {
+        let config = config.unwrap_or_default();
+        let bank = self.bank(config.commitment);
+        let non_circulating_supply =
+            calculate_non_circulating_supply(&bank).map_err(|e| RpcCustomError::ScanError {
+                message: e.to_string(),
+            })?;
         let total_supply = bank.capitalization();
-        new_response(
+        let non_circulating_accounts = if config.exclude_non_circulating_accounts_list {
+            vec![]
+        } else {
+            non_circulating_supply
+                .accounts
+                .iter()
+                .map(|pubkey| pubkey.to_string())
+                .collect()
+        };
+
+        Ok(new_response(
             &bank,
             RpcSupply {
                 total: total_supply,
                 circulating: total_supply - non_circulating_supply.lamports,
                 non_circulating: non_circulating_supply.lamports,
-                non_circulating_accounts: non_circulating_supply
-                    .accounts
-                    .iter()
-                    .map(|pubkey| pubkey.to_string())
-                    .collect(),
+                non_circulating_accounts,
             },
-        )
+        ))
     }
 
     fn get_vote_accounts(
@@ -776,6 +806,9 @@ impl JsonRpcRequestProcessor {
             .epoch_vote_accounts(bank.get_epoch_and_slot_index(bank.slot()).0)
             .ok_or_else(Error::invalid_request)?;
         let default_vote_state = VoteState::default();
+        let delinquent_validator_slot_distance = config
+            .delinquent_slot_distance
+            .unwrap_or(DELINQUENT_VALIDATOR_SLOT_DISTANCE);
         let (current_vote_accounts, delinquent_vote_accounts): (
             Vec<RpcVoteAccountInfo>,
             Vec<RpcVoteAccountInfo>,
@@ -819,22 +852,27 @@ impl JsonRpcRequestProcessor {
                 })
             })
             .partition(|vote_account_info| {
-                if bank.slot() >= DELINQUENT_VALIDATOR_SLOT_DISTANCE as u64 {
+                if bank.slot() >= delinquent_validator_slot_distance as u64 {
                     vote_account_info.last_vote
-                        > bank.slot() - DELINQUENT_VALIDATOR_SLOT_DISTANCE as u64
+                        > bank.slot() - delinquent_validator_slot_distance as u64
                 } else {
                     vote_account_info.last_vote > 0
                 }
             });
 
-        let delinquent_staked_vote_accounts = delinquent_vote_accounts
-            .into_iter()
-            .filter(|vote_account_info| vote_account_info.activated_stake > 0)
-            .collect::<Vec<_>>();
+        let keep_unstaked_delinquents = config.keep_unstaked_delinquents.unwrap_or_default();
+        let delinquent_vote_accounts = if !keep_unstaked_delinquents {
+            delinquent_vote_accounts
+                .into_iter()
+                .filter(|vote_account_info| vote_account_info.activated_stake > 0)
+                .collect::<Vec<_>>()
+        } else {
+            delinquent_vote_accounts
+        };
 
         Ok(RpcVoteAccountStatus {
             current: current_vote_accounts,
-            delinquent: delinquent_staked_vote_accounts,
+            delinquent: delinquent_vote_accounts,
         })
     }
 
@@ -928,21 +966,26 @@ impl JsonRpcRequestProcessor {
             {
                 let result = self.blockstore.get_rooted_block(slot, true);
                 self.check_blockstore_root(&result, slot)?;
+                let configure_block = |confirmed_block: ConfirmedBlock| {
+                    let mut confirmed_block =
+                        confirmed_block.configure(encoding, transaction_details, show_rewards);
+                    if slot == 0 {
+                        confirmed_block.block_time = Some(self.genesis_creation_time());
+                        confirmed_block.block_height = Some(0);
+                    }
+                    confirmed_block
+                };
                 if result.is_err() {
                     if let Some(bigtable_ledger_storage) = &self.bigtable_ledger_storage {
                         let bigtable_result = self
                             .runtime
                             .block_on(bigtable_ledger_storage.get_confirmed_block(slot));
                         self.check_bigtable_result(&bigtable_result)?;
-                        return Ok(bigtable_result.ok().map(|confirmed_block| {
-                            confirmed_block.configure(encoding, transaction_details, show_rewards)
-                        }));
+                        return Ok(bigtable_result.ok().map(configure_block));
                     }
                 }
                 self.check_slot_cleaned_up(&result, slot)?;
-                return Ok(result.ok().map(|confirmed_block| {
-                    confirmed_block.configure(encoding, transaction_details, show_rewards)
-                }));
+                return Ok(result.ok().map(configure_block));
             } else if commitment.is_confirmed() {
                 // Check if block is confirmed
                 let confirmed_bank = self.bank(Some(CommitmentConfig::confirmed()));
@@ -1043,7 +1086,10 @@ impl JsonRpcRequestProcessor {
             .map_err(|_| Error::internal_error())?
             .filter(|&slot| slot <= end_slot && slot <= highest_confirmed_root)
             .collect();
-        let last_element = blocks.last().cloned().unwrap_or_default();
+        let last_element = blocks
+            .last()
+            .cloned()
+            .unwrap_or_else(|| start_slot.saturating_sub(1));
 
         // Maybe add confirmed blocks
         if commitment.is_confirmed() && last_element < end_slot {
@@ -1124,6 +1170,9 @@ impl JsonRpcRequestProcessor {
     }
 
     pub fn get_block_time(&self, slot: Slot) -> Result<Option<UnixTimestamp>> {
+        if slot == 0 {
+            return Ok(Some(self.genesis_creation_time()));
+        }
         if slot
             <= self
                 .block_commitment_cache
@@ -1515,11 +1564,8 @@ impl JsonRpcRequestProcessor {
             solana_sdk::account::from_account::<StakeHistory, _>(&stake_history_account)
                 .ok_or_else(Error::internal_error)?;
 
-        let (active, activating, deactivating) = delegation.stake_activating_and_deactivating(
-            epoch,
-            Some(&stake_history),
-            bank.stake_program_v2_enabled(),
-        );
+        let (active, activating, deactivating) =
+            delegation.stake_activating_and_deactivating(epoch, Some(&stake_history));
         let stake_activation_state = if deactivating > 0 {
             StakeActivationState::Deactivating
         } else if activating > 0 {
@@ -1557,12 +1603,12 @@ impl JsonRpcRequestProcessor {
                 "Invalid param: not a v2.0 Token account".to_string(),
             ));
         }
-        let token_account = TokenAccount::unpack(&account.data()).map_err(|_| {
+        let token_account = TokenAccount::unpack(account.data()).map_err(|_| {
             Error::invalid_params("Invalid param: not a v2.0 Token account".to_string())
         })?;
         let mint = &Pubkey::from_str(&token_account.mint.to_string())
             .expect("Token account mint should be convertible to Pubkey");
-        let (_, decimals) = get_mint_owner_and_decimals(&bank, &mint)?;
+        let (_, decimals) = get_mint_owner_and_decimals(&bank, mint)?;
         let balance = token_amount_to_ui_amount(token_account.amount, decimals);
         Ok(new_response(&bank, balance))
     }
@@ -1581,7 +1627,7 @@ impl JsonRpcRequestProcessor {
                 "Invalid param: not a v2.0 Token mint".to_string(),
             ));
         }
-        let mint = Mint::unpack(&mint_account.data()).map_err(|_| {
+        let mint = Mint::unpack(mint_account.data()).map_err(|_| {
             Error::invalid_params("Invalid param: mint could not be unpacked".to_string())
         })?;
 
@@ -1602,10 +1648,10 @@ impl JsonRpcRequestProcessor {
             ));
         }
         let mut token_balances: Vec<RpcTokenAccountBalance> = self
-            .get_filtered_spl_token_accounts_by_mint(&bank, &mint, vec![])?
+            .get_filtered_spl_token_accounts_by_mint(&bank, mint, vec![])?
             .into_iter()
             .map(|(address, account)| {
-                let amount = TokenAccount::unpack(&account.data())
+                let amount = TokenAccount::unpack(account.data())
                     .map(|account| account.amount)
                     .unwrap_or(0);
                 let amount = token_amount_to_ui_amount(amount, decimals);
@@ -1737,11 +1783,11 @@ impl JsonRpcRequestProcessor {
         bank: &Arc<Bank>,
         program_id: &Pubkey,
         filters: Vec<RpcFilterType>,
-    ) -> Result<Vec<(Pubkey, AccountSharedData)>> {
+    ) -> RpcCustomResult<Vec<(Pubkey, AccountSharedData)>> {
         let filter_closure = |account: &AccountSharedData| {
             filters.iter().all(|filter_type| match filter_type {
                 RpcFilterType::DataSize(size) => account.data().len() as u64 == *size,
-                RpcFilterType::Memcmp(compare) => compare.bytes_match(&account.data()),
+                RpcFilterType::Memcmp(compare) => compare.bytes_match(account.data()),
             })
         };
         if self
@@ -1752,21 +1798,26 @@ impl JsonRpcRequestProcessor {
             if !self.config.account_indexes.include_key(program_id) {
                 return Err(RpcCustomError::KeyExcludedFromSecondaryIndex {
                     index_key: program_id.to_string(),
-                }
-                .into());
+                });
             }
-            Ok(
-                bank.get_filtered_indexed_accounts(&IndexKey::ProgramId(*program_id), |account| {
+            Ok(bank
+                .get_filtered_indexed_accounts(&IndexKey::ProgramId(*program_id), |account| {
                     // The program-id account index checks for Account owner on inclusion. However, due
                     // to the current AccountsDb implementation, an account may remain in storage as a
                     // zero-lamport AccountSharedData::Default() after being wiped and reinitialized in later
                     // updates. We include the redundant filters here to avoid returning these
                     // accounts.
                     account.owner() == program_id && filter_closure(account)
-                }),
-            )
+                })
+                .map_err(|e| RpcCustomError::ScanError {
+                    message: e.to_string(),
+                })?)
         } else {
-            Ok(bank.get_filtered_program_accounts(program_id, filter_closure))
+            Ok(bank
+                .get_filtered_program_accounts(program_id, filter_closure)
+                .map_err(|e| RpcCustomError::ScanError {
+                    message: e.to_string(),
+                })?)
         }
     }
 
@@ -1776,7 +1827,7 @@ impl JsonRpcRequestProcessor {
         bank: &Arc<Bank>,
         owner_key: &Pubkey,
         mut filters: Vec<RpcFilterType>,
-    ) -> Result<Vec<(Pubkey, AccountSharedData)>> {
+    ) -> RpcCustomResult<Vec<(Pubkey, AccountSharedData)>> {
         // The by-owner accounts index checks for Token Account state and Owner address on
         // inclusion. However, due to the current AccountsDb implementation, an account may remain
         // in storage as a zero-lamport AccountSharedData::Default() after being wiped and reinitialized in
@@ -1801,19 +1852,19 @@ impl JsonRpcRequestProcessor {
             if !self.config.account_indexes.include_key(owner_key) {
                 return Err(RpcCustomError::KeyExcludedFromSecondaryIndex {
                     index_key: owner_key.to_string(),
-                }
-                .into());
+                });
             }
-            Ok(bank.get_filtered_indexed_accounts(
-                &IndexKey::SplTokenOwner(*owner_key),
-                |account| {
+            Ok(bank
+                .get_filtered_indexed_accounts(&IndexKey::SplTokenOwner(*owner_key), |account| {
                     account.owner() == &spl_token_id_v2_0()
                         && filters.iter().all(|filter_type| match filter_type {
                             RpcFilterType::DataSize(size) => account.data().len() as u64 == *size,
-                            RpcFilterType::Memcmp(compare) => compare.bytes_match(&account.data()),
+                            RpcFilterType::Memcmp(compare) => compare.bytes_match(account.data()),
                         })
-                },
-            ))
+                })
+                .map_err(|e| RpcCustomError::ScanError {
+                    message: e.to_string(),
+                })?)
         } else {
             self.get_filtered_program_accounts(bank, &spl_token_id_v2_0(), filters)
         }
@@ -1825,7 +1876,7 @@ impl JsonRpcRequestProcessor {
         bank: &Arc<Bank>,
         mint_key: &Pubkey,
         mut filters: Vec<RpcFilterType>,
-    ) -> Result<Vec<(Pubkey, AccountSharedData)>> {
+    ) -> RpcCustomResult<Vec<(Pubkey, AccountSharedData)>> {
         // The by-mint accounts index checks for Token Account state and Mint address on inclusion.
         // However, due to the current AccountsDb implementation, an account may remain in storage
         // as be zero-lamport AccountSharedData::Default() after being wiped and reinitialized in later
@@ -1849,33 +1900,41 @@ impl JsonRpcRequestProcessor {
             if !self.config.account_indexes.include_key(mint_key) {
                 return Err(RpcCustomError::KeyExcludedFromSecondaryIndex {
                     index_key: mint_key.to_string(),
-                }
-                .into());
+                });
             }
-            Ok(
-                bank.get_filtered_indexed_accounts(&IndexKey::SplTokenMint(*mint_key), |account| {
+            Ok(bank
+                .get_filtered_indexed_accounts(&IndexKey::SplTokenMint(*mint_key), |account| {
                     account.owner() == &spl_token_id_v2_0()
                         && filters.iter().all(|filter_type| match filter_type {
                             RpcFilterType::DataSize(size) => account.data().len() as u64 == *size,
-                            RpcFilterType::Memcmp(compare) => compare.bytes_match(&account.data()),
+                            RpcFilterType::Memcmp(compare) => compare.bytes_match(account.data()),
                         })
-                }),
-            )
+                })
+                .map_err(|e| RpcCustomError::ScanError {
+                    message: e.to_string(),
+                })?)
         } else {
             self.get_filtered_program_accounts(bank, &spl_token_id_v2_0(), filters)
         }
     }
 }
 
-fn verify_transaction(transaction: &Transaction) -> Result<()> {
+fn verify_transaction(
+    transaction: &Transaction,
+    libsecp256k1_0_5_upgrade_enabled: bool,
+) -> Result<()> {
     if transaction.verify().is_err() {
         return Err(RpcCustomError::TransactionSignatureVerificationFailure.into());
     }
 
-    if let Err(e) = transaction.verify_precompiles() {
+    if let Err(e) = transaction.verify_precompiles(libsecp256k1_0_5_upgrade_enabled) {
         return Err(RpcCustomError::TransactionPrecompileVerificationFailure(e).into());
     }
 
+    if !transaction.verify_signatures_len() {
+        return Err(RpcCustomError::TransactionSignatureVerificationFailure.into());
+    }
+
     Ok(())
 }
 
@@ -1956,26 +2015,41 @@ fn get_encoded_account(
     encoding: UiAccountEncoding,
     data_slice: Option<UiDataSliceConfig>,
 ) -> Result<Option<UiAccount>> {
-    let mut response = None;
-    if let Some(account) = bank.get_account(pubkey) {
-        if account.owner() == &spl_token_id_v2_0() && encoding == UiAccountEncoding::JsonParsed {
-            response = Some(get_parsed_token_account(bank.clone(), pubkey, account));
-        } else if (encoding == UiAccountEncoding::Binary || encoding == UiAccountEncoding::Base58)
-            && account.data().len() > 128
-        {
-            let message = "Encoded binary (base 58) data should be less than 128 bytes, please use Base64 encoding.".to_string();
-            return Err(error::Error {
-                code: error::ErrorCode::InvalidRequest,
-                message,
-                data: None,
-            });
-        } else {
-            response = Some(UiAccount::encode(
-                pubkey, &account, encoding, None, data_slice,
-            ));
+    match bank.get_account(pubkey) {
+        Some(account) => {
+            let response = if account.owner() == &spl_token_id_v2_0()
+                && encoding == UiAccountEncoding::JsonParsed
+            {
+                get_parsed_token_account(bank.clone(), pubkey, account)
+            } else {
+                encode_account(&account, pubkey, encoding, data_slice)?
+            };
+            Ok(Some(response))
         }
+        None => Ok(None),
+    }
+}
+
+fn encode_account<T: ReadableAccount>(
+    account: &T,
+    pubkey: &Pubkey,
+    encoding: UiAccountEncoding,
+    data_slice: Option<UiDataSliceConfig>,
+) -> Result<UiAccount> {
+    if (encoding == UiAccountEncoding::Binary || encoding == UiAccountEncoding::Base58)
+        && account.data().len() > MAX_BASE58_BYTES
+    {
+        let message = format!("Encoded binary (base 58) data should be less than {} bytes, please use Base64 encoding.", MAX_BASE58_BYTES);
+        Err(error::Error {
+            code: error::ErrorCode::InvalidRequest,
+            message,
+            data: None,
+        })
+    } else {
+        Ok(UiAccount::encode(
+            pubkey, account, encoding, None, data_slice,
+        ))
     }
-    Ok(response)
 }
 
 fn get_spl_token_owner_filter(program_id: &Pubkey, filters: &[RpcFilterType]) -> Option<Pubkey> {
@@ -2042,7 +2116,7 @@ fn get_token_program_id_and_mint(
 ) -> Result<(Pubkey, Option<Pubkey>)> {
     match token_account_filter {
         TokenAccountsFilter::Mint(mint) => {
-            let (mint_owner, _) = get_mint_owner_and_decimals(&bank, &mint)?;
+            let (mint_owner, _) = get_mint_owner_and_decimals(bank, &mint)?;
             if mint_owner != spl_token_id_v2_0() {
                 return Err(Error::invalid_params(
                     "Invalid param: not a v2.0 Token mint".to_string(),
@@ -2066,7 +2140,7 @@ fn _send_transaction(
     meta: JsonRpcRequestProcessor,
     transaction: Transaction,
     wire_transaction: Vec<u8>,
-    last_valid_slot: Slot,
+    last_valid_block_height: u64,
     durable_nonce_info: Option<(Pubkey, Hash)>,
 ) -> Result<String> {
     if transaction.signatures.is_empty() {
@@ -2076,7 +2150,7 @@ fn _send_transaction(
     let transaction_info = TransactionInfo::new(
         signature,
         wire_transaction,
-        last_valid_slot,
+        last_valid_block_height,
         durable_nonce_info,
     );
     meta.transaction_sender
@@ -2439,7 +2513,7 @@ pub mod rpc_full {
         fn get_supply(
             &self,
             meta: Self::Metadata,
-            commitment: Option<CommitmentConfig>,
+            config: Option<RpcSupplyConfig>,
         ) -> Result<RpcResponse<RpcSupply>>;
 
         #[rpc(meta, name = "requestAirdrop")]
@@ -2742,20 +2816,21 @@ pub mod rpc_full {
         fn get_cluster_nodes(&self, meta: Self::Metadata) -> Result<Vec<RpcContactInfo>> {
             debug!("get_cluster_nodes rpc request received");
             let cluster_info = &meta.cluster_info;
-            fn valid_address_or_none(addr: &SocketAddr) -> Option<SocketAddr> {
-                if ContactInfo::is_valid_address(addr) {
+            let socket_addr_space = cluster_info.socket_addr_space();
+            let valid_address_or_none = |addr: &SocketAddr| -> Option<SocketAddr> {
+                if ContactInfo::is_valid_address(addr, socket_addr_space) {
                     Some(*addr)
                 } else {
                     None
                 }
-            }
+            };
             let my_shred_version = cluster_info.my_shred_version();
             Ok(cluster_info
                 .all_peers()
                 .iter()
                 .filter_map(|(contact_info, _)| {
                     if my_shred_version == contact_info.shred_version
-                        && ContactInfo::is_valid_address(&contact_info.gossip)
+                        && ContactInfo::is_valid_address(&contact_info.gossip, socket_addr_space)
                     {
                         let (version, feature_set) = if let Some(version) =
                             cluster_info.get_node_version(&contact_info.id)
@@ -2871,16 +2946,16 @@ pub mod rpc_full {
             config: Option<RpcLargestAccountsConfig>,
         ) -> Result<RpcResponse<Vec<RpcAccountBalance>>> {
             debug!("get_largest_accounts rpc request received");
-            Ok(meta.get_largest_accounts(config))
+            Ok(meta.get_largest_accounts(config)?)
         }
 
         fn get_supply(
             &self,
             meta: Self::Metadata,
-            commitment: Option<CommitmentConfig>,
+            config: Option<RpcSupplyConfig>,
         ) -> Result<RpcResponse<RpcSupply>> {
             debug!("get_supply rpc request received");
-            Ok(meta.get_supply(commitment))
+            Ok(meta.get_supply(config)?)
         }
 
         fn request_airdrop(
@@ -2909,7 +2984,9 @@ pub mod rpc_full {
             } else {
                 bank.confirmed_last_blockhash().0
             };
-            let last_valid_slot = bank.get_blockhash_last_valid_slot(&blockhash).unwrap_or(0);
+            let last_valid_block_height = bank
+                .get_blockhash_last_valid_block_height(&blockhash)
+                .unwrap_or(0);
 
             let transaction =
                 request_airdrop_transaction(&faucet_addr, &pubkey, lamports, blockhash).map_err(
@@ -2924,7 +3001,13 @@ pub mod rpc_full {
                 Error::internal_error()
             })?;
 
-            _send_transaction(meta, transaction, wire_transaction, last_valid_slot, None)
+            _send_transaction(
+                meta,
+                transaction,
+                wire_transaction,
+                last_valid_block_height,
+                None,
+            )
         }
 
         fn send_transaction(
@@ -2943,40 +3026,46 @@ pub mod rpc_full {
                 .map(|commitment| CommitmentConfig { commitment });
             let preflight_bank = &*meta.bank(preflight_commitment);
 
-            let mut last_valid_slot = preflight_bank
-                .get_blockhash_last_valid_slot(&transaction.message.recent_blockhash)
+            let mut last_valid_block_height = preflight_bank
+                .get_blockhash_last_valid_block_height(&transaction.message.recent_blockhash)
                 .unwrap_or(0);
 
             let durable_nonce_info = solana_sdk::transaction::uses_durable_nonce(&transaction)
                 .and_then(|nonce_ix| {
                     solana_sdk::transaction::get_nonce_pubkey_from_instruction(
-                        &nonce_ix,
+                        nonce_ix,
                         &transaction,
                     )
                 })
                 .map(|&pubkey| (pubkey, transaction.message.recent_blockhash));
             if durable_nonce_info.is_some() {
-                // While it uses a defined constant, this last_valid_slot value is chosen arbitrarily.
+                // While it uses a defined constant, this last_valid_block_height value is chosen arbitrarily.
                 // It provides a fallback timeout for durable-nonce transaction retries in case of
                 // malicious packing of the retry queue. Durable-nonce transactions are otherwise
                 // retried until the nonce is advanced.
-                last_valid_slot = preflight_bank.slot() + MAX_RECENT_BLOCKHASHES as u64;
+                last_valid_block_height =
+                    preflight_bank.block_height() + MAX_RECENT_BLOCKHASHES as u64;
             }
 
             if !config.skip_preflight {
-                if let Err(e) = verify_transaction(&transaction) {
+                if let Err(e) = verify_transaction(
+                    &transaction,
+                    preflight_bank.libsecp256k1_0_5_upgrade_enabled(),
+                ) {
                     return Err(e);
                 }
 
                 match meta.health.check() {
                     RpcHealthStatus::Ok => (),
                     RpcHealthStatus::Unknown => {
+                        inc_new_counter_info!("rpc-send-tx_health-unknown", 1);
                         return Err(RpcCustomError::NodeUnhealthy {
                             num_slots_behind: None,
                         }
                         .into());
                     }
                     RpcHealthStatus::Behind { num_slots } => {
+                        inc_new_counter_info!("rpc-send-tx_health-behind", 1);
                         return Err(RpcCustomError::NodeUnhealthy {
                             num_slots_behind: Some(num_slots),
                         }
@@ -2985,6 +3074,14 @@ pub mod rpc_full {
                 }
 
                 if let (Err(err), logs, _) = preflight_bank.simulate_transaction(&transaction) {
+                    match err {
+                        TransactionError::BlockhashNotFound => {
+                            inc_new_counter_info!("rpc-send-tx_err-blockhash-not-found", 1);
+                        }
+                        _ => {
+                            inc_new_counter_info!("rpc-send-tx_err-other", 1);
+                        }
+                    }
                     return Err(RpcCustomError::SendTransactionPreflightFailure {
                         message: format!("Transaction simulation failed: {}", err),
                         result: RpcSimulateTransactionResult {
@@ -3001,7 +3098,7 @@ pub mod rpc_full {
                 meta,
                 transaction,
                 wire_transaction,
-                last_valid_slot,
+                last_valid_block_height,
                 durable_nonce_info,
             )
         }
@@ -3017,6 +3114,7 @@ pub mod rpc_full {
             let encoding = config.encoding.unwrap_or(UiTransactionEncoding::Base58);
             let (_, mut transaction) = deserialize_transaction(data, encoding)?;
 
+            let bank = &*meta.bank(config.commitment);
             if config.sig_verify {
                 if config.replace_recent_blockhash {
                     return Err(Error::invalid_params(
@@ -3024,11 +3122,12 @@ pub mod rpc_full {
                     ));
                 }
 
-                if let Err(e) = verify_transaction(&transaction) {
+                if let Err(e) =
+                    verify_transaction(&transaction, bank.libsecp256k1_0_5_upgrade_enabled())
+                {
                     return Err(e);
                 }
             }
-            let bank = &*meta.bank(config.commitment);
             if config.replace_recent_blockhash {
                 transaction.message.recent_blockhash = bank.last_blockhash();
             }
@@ -3058,15 +3157,21 @@ pub mod rpc_full {
                     accounts.push(if result.is_err() {
                         None
                     } else {
-                        transaction
-                            .message
-                            .account_keys
-                            .iter()
-                            .position(|pubkey| *pubkey == address)
-                            .map(|i| post_simulation_accounts.get(i))
-                            .flatten()
-                            .map(|account| {
-                                UiAccount::encode(&address, account, accounts_encoding, None, None)
+                        (0..transaction.message.account_keys.len())
+                            .position(|i| {
+                                post_simulation_accounts
+                                    .get(i)
+                                    .map(|(key, _account)| *key == address)
+                                    .unwrap_or(false)
+                            })
+                            .map(|i| {
+                                UiAccount::encode(
+                                    &address,
+                                    &post_simulation_accounts[i].1,
+                                    accounts_encoding,
+                                    None,
+                                    None,
+                                )
                             })
                     });
                 }
@@ -3076,7 +3181,7 @@ pub mod rpc_full {
             };
 
             Ok(new_response(
-                &bank,
+                bank,
                 RpcSimulateTransactionResult {
                     err: result.err(),
                     logs: Some(logs),
@@ -3772,64 +3877,141 @@ fn deserialize_transaction(
         .map(|transaction| (wire_transaction, transaction))
 }
 
-pub(crate) fn create_validator_exit(exit: &Arc<AtomicBool>) -> Arc<RwLock<ValidatorExit>> {
-    let mut validator_exit = ValidatorExit::default();
+pub(crate) fn create_validator_exit(exit: &Arc<AtomicBool>) -> Arc<RwLock<Exit>> {
+    let mut validator_exit = Exit::default();
     let exit_ = exit.clone();
     validator_exit.register_exit(Box::new(move || exit_.store(true, Ordering::Relaxed)));
     Arc::new(RwLock::new(validator_exit))
 }
 
+// Used for tests
+pub fn create_test_transactions_and_populate_blockstore(
+    keypairs: Vec<&Keypair>,
+    previous_slot: Slot,
+    bank: Arc<Bank>,
+    blockstore: Arc<Blockstore>,
+    max_complete_transaction_status_slot: Arc<AtomicU64>,
+) -> Vec<Signature> {
+    let mint_keypair = keypairs[0];
+    let keypair1 = keypairs[1];
+    let keypair2 = keypairs[2];
+    let keypair3 = keypairs[3];
+    let slot = bank.slot();
+    let blockhash = bank.confirmed_last_blockhash().0;
+
+    // Generate transactions for processing
+    // Successful transaction
+    let success_tx =
+        solana_sdk::system_transaction::transfer(mint_keypair, &keypair1.pubkey(), 2, blockhash);
+    let success_signature = success_tx.signatures[0];
+    let entry_1 = solana_ledger::entry::next_entry(&blockhash, 1, vec![success_tx]);
+    // Failed transaction, InstructionError
+    let ix_error_tx =
+        solana_sdk::system_transaction::transfer(keypair2, &keypair3.pubkey(), 10, blockhash);
+    let ix_error_signature = ix_error_tx.signatures[0];
+    let entry_2 = solana_ledger::entry::next_entry(&entry_1.hash, 1, vec![ix_error_tx]);
+    // Failed transaction
+    let fail_tx = solana_sdk::system_transaction::transfer(
+        mint_keypair,
+        &keypair2.pubkey(),
+        2,
+        Hash::default(),
+    );
+    let entry_3 = solana_ledger::entry::next_entry(&entry_2.hash, 1, vec![fail_tx]);
+    let mut entries = vec![entry_1, entry_2, entry_3];
+
+    let shreds = solana_ledger::blockstore::entries_to_test_shreds(
+        entries.clone(),
+        slot,
+        previous_slot,
+        true,
+        0,
+    );
+    blockstore.insert_shreds(shreds, None, false).unwrap();
+    blockstore.set_roots(std::iter::once(&slot)).unwrap();
+
+    let (transaction_status_sender, transaction_status_receiver) = crossbeam_channel::unbounded();
+    let (replay_vote_sender, _replay_vote_receiver) = crossbeam_channel::unbounded();
+    let transaction_status_service =
+        crate::transaction_status_service::TransactionStatusService::new(
+            transaction_status_receiver,
+            max_complete_transaction_status_slot,
+            blockstore,
+            &Arc::new(AtomicBool::new(false)),
+        );
+
+    // Check that process_entries successfully writes can_commit transactions statuses, and
+    // that they are matched properly by get_rooted_block
+    let _result = solana_ledger::blockstore_processor::process_entries(
+        &bank,
+        &mut entries,
+        true,
+        Some(
+            &solana_ledger::blockstore_processor::TransactionStatusSender {
+                sender: transaction_status_sender,
+                enable_cpi_and_log_storage: false,
+            },
+        ),
+        Some(&replay_vote_sender),
+    );
+
+    transaction_status_service.join().unwrap();
+
+    vec![success_signature, ix_error_signature]
+}
+
 #[cfg(test)]
 pub mod tests {
-    use super::{rpc_full::*, rpc_minimal::*, *};
-    use crate::replay_stage::tests::create_test_transactions_and_populate_blockstore;
-    use bincode::deserialize;
-    use jsonrpc_core::{futures, ErrorCode, MetaIoHandler, Output, Response, Value};
-    use jsonrpc_core_client::transports::local;
-    use solana_client::rpc_filter::{Memcmp, MemcmpEncodedBytes};
-    use solana_gossip::{contact_info::ContactInfo, socketaddr};
-    use solana_ledger::{
-        blockstore_meta::PerfSample,
-        blockstore_processor::fill_blockstore_slot_with_ticks,
-        genesis_utils::{create_genesis_config, GenesisConfigInfo},
-    };
-    use solana_rpc::{
-        optimistically_confirmed_bank_tracker::{
-            BankNotification, OptimisticallyConfirmedBankTracker,
+    use {
+        super::{rpc_full::*, rpc_minimal::*, *},
+        crate::{
+            optimistically_confirmed_bank_tracker::{
+                BankNotification, OptimisticallyConfirmedBankTracker,
+            },
+            rpc_subscriptions::RpcSubscriptions,
         },
-        rpc_subscriptions::RpcSubscriptions,
-    };
-    use solana_runtime::{
-        accounts_background_service::AbsRequestSender, commitment::BlockCommitment,
-        non_circulating_supply::non_circulating_accounts,
-    };
-    use solana_sdk::{
-        account::Account,
-        clock::MAX_RECENT_BLOCKHASHES,
-        fee_calculator::DEFAULT_BURN_PERCENT,
-        hash::{hash, Hash},
-        instruction::InstructionError,
-        message::Message,
-        nonce, rpc_port,
-        signature::{Keypair, Signer},
-        system_program, system_transaction,
-        timing::slot_duration_from_slots_per_year,
-        transaction::{self, TransactionError},
-    };
-    use solana_transaction_status::{
-        EncodedConfirmedBlock, EncodedTransaction, EncodedTransactionWithStatusMeta,
-        TransactionDetails, UiMessage,
-    };
-    use solana_vote_program::{
-        vote_instruction,
-        vote_state::{BlockTimestamp, Vote, VoteInit, VoteStateVersions, MAX_LOCKOUT_HISTORY},
-    };
-    use spl_token_v2_0::{
-        solana_program::{program_option::COption, pubkey::Pubkey as SplTokenPubkey},
-        state::AccountState as TokenAccountState,
-        state::Mint,
+        bincode::deserialize,
+        jsonrpc_core::{futures, ErrorCode, MetaIoHandler, Output, Response, Value},
+        jsonrpc_core_client::transports::local,
+        solana_client::rpc_filter::{Memcmp, MemcmpEncodedBytes},
+        solana_gossip::{contact_info::ContactInfo, socketaddr},
+        solana_ledger::{
+            blockstore_meta::PerfSample,
+            blockstore_processor::fill_blockstore_slot_with_ticks,
+            genesis_utils::{create_genesis_config, GenesisConfigInfo},
+        },
+        solana_runtime::{
+            accounts_background_service::AbsRequestSender, commitment::BlockCommitment,
+            non_circulating_supply::non_circulating_accounts,
+        },
+        solana_sdk::{
+            account::Account,
+            clock::MAX_RECENT_BLOCKHASHES,
+            fee_calculator::DEFAULT_BURN_PERCENT,
+            hash::{hash, Hash},
+            instruction::InstructionError,
+            message::Message,
+            nonce, rpc_port,
+            signature::{Keypair, Signer},
+            system_program, system_transaction,
+            timing::slot_duration_from_slots_per_year,
+            transaction::{self, TransactionError},
+        },
+        solana_transaction_status::{
+            EncodedConfirmedBlock, EncodedTransaction, EncodedTransactionWithStatusMeta,
+            TransactionDetails, UiMessage,
+        },
+        solana_vote_program::{
+            vote_instruction,
+            vote_state::{BlockTimestamp, Vote, VoteInit, VoteStateVersions, MAX_LOCKOUT_HISTORY},
+        },
+        spl_token_v2_0::{
+            solana_program::{program_option::COption, pubkey::Pubkey as SplTokenPubkey},
+            state::AccountState as TokenAccountState,
+            state::Mint,
+        },
+        std::collections::HashMap,
     };
-    use std::collections::HashMap;
 
     const TEST_MINT_LAMPORTS: u64 = 1_000_000;
     const TEST_SLOTS_PER_EPOCH: u64 = DELINQUENT_VALIDATOR_SLOT_DISTANCE + 1;
@@ -3910,7 +4092,7 @@ pub mod tests {
                 let parent = if i > 0 { roots[i - 1] } else { 0 };
                 fill_blockstore_slot_with_ticks(&blockstore, 5, *root, parent, Hash::default());
             }
-            blockstore.set_roots(&roots).unwrap();
+            blockstore.set_roots(roots.iter()).unwrap();
             let new_bank = Bank::new_from_parent(
                 &parent_bank,
                 parent_bank.collector_id(),
@@ -3955,7 +4137,11 @@ pub mod tests {
         let tx = system_transaction::transfer(&alice, pubkey, std::u64::MAX, blockhash);
         let _ = bank.process_transaction(&tx);
 
-        let cluster_info = Arc::new(ClusterInfo::default());
+        let cluster_info = Arc::new(ClusterInfo::new(
+            ContactInfo::default(),
+            Arc::new(Keypair::new()),
+            SocketAddrSpace::Unspecified,
+        ));
         let tpu_address = cluster_info.my_contact_info().tpu;
 
         cluster_info.insert_info(ContactInfo::new_with_pubkey_socketaddr(
@@ -4030,7 +4216,8 @@ pub mod tests {
         let bank = Arc::new(Bank::new(&genesis.genesis_config));
         bank.transfer(20, &genesis.mint_keypair, &bob_pubkey)
             .unwrap();
-        let request_processor = JsonRpcRequestProcessor::new_from_bank(&bank);
+        let request_processor =
+            JsonRpcRequestProcessor::new_from_bank(&bank, SocketAddrSpace::Unspecified);
         assert_eq!(request_processor.get_transaction_count(None), 1);
     }
 
@@ -4039,7 +4226,7 @@ pub mod tests {
         let genesis = create_genesis_config(20);
         let mint_pubkey = genesis.mint_keypair.pubkey();
         let bank = Arc::new(Bank::new(&genesis.genesis_config));
-        let meta = JsonRpcRequestProcessor::new_from_bank(&bank);
+        let meta = JsonRpcRequestProcessor::new_from_bank(&bank, SocketAddrSpace::Unspecified);
 
         let mut io = MetaIoHandler::default();
         io.extend_with(rpc_minimal::MinimalImpl.to_delegate());
@@ -4067,7 +4254,7 @@ pub mod tests {
         let genesis = create_genesis_config(20);
         let mint_pubkey = genesis.mint_keypair.pubkey();
         let bank = Arc::new(Bank::new(&genesis.genesis_config));
-        let meta = JsonRpcRequestProcessor::new_from_bank(&bank);
+        let meta = JsonRpcRequestProcessor::new_from_bank(&bank, SocketAddrSpace::Unspecified);
 
         let mut io = MetaIoHandler::default();
         io.extend_with(rpc_minimal::MinimalImpl.to_delegate());
@@ -4103,7 +4290,7 @@ pub mod tests {
 
         let req = r#"{"jsonrpc":"2.0","id":1,"method":"getClusterNodes"}"#;
 
-        let res = io.handle_request_sync(&req, meta);
+        let res = io.handle_request_sync(req, meta);
         let result: Response = serde_json::from_str(&res.expect("actual response"))
             .expect("actual response deserialization");
 
@@ -4125,7 +4312,7 @@ pub mod tests {
 
         let req = r#"{"jsonrpc":"2.0","id":1,"method":"getRecentPerformanceSamples"}"#;
 
-        let res = io.handle_request_sync(&req, meta);
+        let res = io.handle_request_sync(req, meta);
         let result: Response = serde_json::from_str(&res.expect("actual response"))
             .expect("actual response deserialization");
 
@@ -4155,7 +4342,7 @@ pub mod tests {
         let req =
             r#"{"jsonrpc":"2.0","id":1,"method":"getRecentPerformanceSamples","params":[10000]}"#;
 
-        let res = io.handle_request_sync(&req, meta);
+        let res = io.handle_request_sync(req, meta);
         let result: Response = serde_json::from_str(&res.expect("actual response"))
             .expect("actual response deserialization");
 
@@ -4184,7 +4371,7 @@ pub mod tests {
         } = start_rpc_handler_with_tx(&bob_pubkey);
 
         let req = r#"{"jsonrpc":"2.0","id":1,"method":"getSlotLeader"}"#;
-        let res = io.handle_request_sync(&req, meta);
+        let res = io.handle_request_sync(req, meta);
         let expected = format!(r#"{{"jsonrpc":"2.0","result":"{}","id":1}}"#, leader_pubkey);
         let expected: Response =
             serde_json::from_str(&expected).expect("expected response deserialization");
@@ -4208,16 +4395,16 @@ pub mod tests {
         bank.transfer(4, &genesis.mint_keypair, &bob_pubkey)
             .unwrap();
 
-        let meta = JsonRpcRequestProcessor::new_from_bank(&bank);
+        let meta = JsonRpcRequestProcessor::new_from_bank(&bank, SocketAddrSpace::Unspecified);
 
         let mut io = MetaIoHandler::default();
         io.extend_with(rpc_minimal::MinimalImpl.to_delegate());
 
         let req = r#"{"jsonrpc":"2.0","id":1,"method":"getTransactionCount"}"#;
-        let res = io.handle_request_sync(&req, meta);
+        let res = io.handle_request_sync(req, meta);
         let expected = r#"{"jsonrpc":"2.0","result":4,"id":1}"#;
         let expected: Response =
-            serde_json::from_str(&expected).expect("expected response deserialization");
+            serde_json::from_str(expected).expect("expected response deserialization");
         let result: Response = serde_json::from_str(&res.expect("actual response"))
             .expect("actual response deserialization");
         assert_eq!(expected, result);
@@ -4229,10 +4416,10 @@ pub mod tests {
         let RpcHandler { io, meta, .. } = start_rpc_handler_with_tx(&bob_pubkey);
 
         let req = r#"{"jsonrpc":"2.0","id":1,"method":"minimumLedgerSlot"}"#;
-        let res = io.handle_request_sync(&req, meta);
+        let res = io.handle_request_sync(req, meta);
         let expected = r#"{"jsonrpc":"2.0","result":0,"id":1}"#;
         let expected: Response =
-            serde_json::from_str(&expected).expect("expected response deserialization");
+            serde_json::from_str(expected).expect("expected response deserialization");
         let result: Response = serde_json::from_str(&res.expect("actual response"))
             .expect("actual response deserialization");
         assert_eq!(expected, result);
@@ -4243,7 +4430,7 @@ pub mod tests {
         let bob_pubkey = solana_sdk::pubkey::new_rand();
         let RpcHandler { io, meta, .. } = start_rpc_handler_with_tx(&bob_pubkey);
         let req = r#"{"jsonrpc":"2.0","id":1,"method":"getSupply"}"#;
-        let res = io.handle_request_sync(&req, meta);
+        let res = io.handle_request_sync(req, meta);
         let json: Value = serde_json::from_str(&res.unwrap()).unwrap();
         let supply: RpcSupply = serde_json::from_value(json["result"]["value"].clone())
             .expect("actual response deserialization");
@@ -4263,6 +4450,21 @@ pub mod tests {
         }
     }
 
+    #[test]
+    fn test_get_supply_exclude_account_list() {
+        let bob_pubkey = solana_sdk::pubkey::new_rand();
+        let RpcHandler { io, meta, .. } = start_rpc_handler_with_tx(&bob_pubkey);
+        let req = r#"{"jsonrpc":"2.0","id":1,"method":"getSupply","params":[{"excludeNonCirculatingAccountsList":true}]}"#;
+        let res = io.handle_request_sync(req, meta);
+        let json: Value = serde_json::from_str(&res.unwrap()).unwrap();
+        let supply: RpcSupply = serde_json::from_value(json["result"]["value"].clone())
+            .expect("actual response deserialization");
+        assert_eq!(supply.non_circulating, 20);
+        assert!(supply.circulating >= TEST_MINT_LAMPORTS);
+        assert!(supply.total >= TEST_MINT_LAMPORTS + 20);
+        assert!(supply.non_circulating_accounts.is_empty());
+    }
+
     #[test]
     fn test_get_largest_accounts() {
         let bob_pubkey = solana_sdk::pubkey::new_rand();
@@ -4270,7 +4472,7 @@ pub mod tests {
             io, meta, alice, ..
         } = start_rpc_handler_with_tx(&bob_pubkey);
         let req = r#"{"jsonrpc":"2.0","id":1,"method":"getLargestAccounts"}"#;
-        let res = io.handle_request_sync(&req, meta.clone());
+        let res = io.handle_request_sync(req, meta.clone());
         let json: Value = serde_json::from_str(&res.unwrap()).unwrap();
         let largest_accounts: Vec<RpcAccountBalance> =
             serde_json::from_value(json["result"]["value"].clone())
@@ -4307,14 +4509,14 @@ pub mod tests {
 
         // Test Circulating/NonCirculating Filter
         let req = r#"{"jsonrpc":"2.0","id":1,"method":"getLargestAccounts","params":[{"filter":"circulating"}]}"#;
-        let res = io.handle_request_sync(&req, meta.clone());
+        let res = io.handle_request_sync(req, meta.clone());
         let json: Value = serde_json::from_str(&res.unwrap()).unwrap();
         let largest_accounts: Vec<RpcAccountBalance> =
             serde_json::from_value(json["result"]["value"].clone())
                 .expect("actual response deserialization");
         assert_eq!(largest_accounts.len(), 20);
         let req = r#"{"jsonrpc":"2.0","id":1,"method":"getLargestAccounts","params":[{"filter":"nonCirculating"}]}"#;
-        let res = io.handle_request_sync(&req, meta);
+        let res = io.handle_request_sync(req, meta);
         let json: Value = serde_json::from_str(&res.unwrap()).unwrap();
         let largest_accounts: Vec<RpcAccountBalance> =
             serde_json::from_value(json["result"]["value"].clone())
@@ -4360,7 +4562,7 @@ pub mod tests {
         let RpcHandler { io, meta, bank, .. } = start_rpc_handler_with_tx(&bob_pubkey);
 
         let req = r#"{"jsonrpc":"2.0","id":1,"method":"getInflationGovernor"}"#;
-        let rep = io.handle_request_sync(&req, meta.clone());
+        let rep = io.handle_request_sync(req, meta.clone());
         let res: Response = serde_json::from_str(&rep.expect("actual response"))
             .expect("actual response deserialization");
         let inflation_governor: RpcInflationGovernor = if let Response::Single(res) = res {
@@ -4376,7 +4578,7 @@ pub mod tests {
         assert_eq!(inflation_governor, expected_inflation_governor);
 
         let req = r#"{"jsonrpc":"2.0","id":1,"method":"getInflationRate"}"#; // Queries current epoch
-        let rep = io.handle_request_sync(&req, meta);
+        let rep = io.handle_request_sync(req, meta);
         let res: Response = serde_json::from_str(&rep.expect("actual response"))
             .expect("actual response deserialization");
         let inflation_rate: RpcInflationRate = if let Response::Single(res) = res {
@@ -4406,7 +4608,7 @@ pub mod tests {
         let RpcHandler { io, meta, bank, .. } = start_rpc_handler_with_tx(&bob_pubkey);
 
         let req = r#"{"jsonrpc":"2.0","id":1,"method":"getEpochSchedule"}"#;
-        let rep = io.handle_request_sync(&req, meta);
+        let rep = io.handle_request_sync(req, meta);
         let res: Response = serde_json::from_str(&rep.expect("actual response"))
             .expect("actual response deserialization");
 
@@ -4441,7 +4643,7 @@ pub mod tests {
         ]
         .iter()
         {
-            let rep = io.handle_request_sync(&req, meta.clone());
+            let rep = io.handle_request_sync(req, meta.clone());
             let res: Response = serde_json::from_str(&rep.expect("actual response"))
                 .expect("actual response deserialization");
 
@@ -4470,7 +4672,7 @@ pub mod tests {
         }
 
         let req = r#"{"jsonrpc":"2.0","id":1,"method":"getLeaderSchedule", "params": [42424242]}"#;
-        let rep = io.handle_request_sync(&req, meta.clone());
+        let rep = io.handle_request_sync(req, meta.clone());
         let res: Response = serde_json::from_str(&rep.expect("actual response"))
             .expect("actual response deserialization");
 
@@ -5337,7 +5539,7 @@ pub mod tests {
         } = start_rpc_handler_with_tx(&bob_pubkey);
 
         let req = r#"{"jsonrpc":"2.0","id":1,"method":"getRecentBlockhash"}"#;
-        let res = io.handle_request_sync(&req, meta);
+        let res = io.handle_request_sync(req, meta);
         let expected = json!({
             "jsonrpc": "2.0",
             "result": {
@@ -5368,7 +5570,7 @@ pub mod tests {
         } = start_rpc_handler_with_tx(&bob_pubkey);
 
         let req = r#"{"jsonrpc":"2.0","id":1,"method":"getFees"}"#;
-        let res = io.handle_request_sync(&req, meta);
+        let res = io.handle_request_sync(req, meta);
         let expected = json!({
             "jsonrpc": "2.0",
             "result": {
@@ -5444,7 +5646,7 @@ pub mod tests {
         let RpcHandler { io, meta, .. } = start_rpc_handler_with_tx(&bob_pubkey);
 
         let req = r#"{"jsonrpc":"2.0","id":1,"method":"getFeeRateGovernor"}"#;
-        let res = io.handle_request_sync(&req, meta);
+        let res = io.handle_request_sync(req, meta);
         let expected = json!({
             "jsonrpc": "2.0",
             "result": {
@@ -5491,7 +5693,7 @@ pub mod tests {
     fn test_rpc_send_bad_tx() {
         let genesis = create_genesis_config(100);
         let bank = Arc::new(Bank::new(&genesis.genesis_config));
-        let meta = JsonRpcRequestProcessor::new_from_bank(&bank);
+        let meta = JsonRpcRequestProcessor::new_from_bank(&bank, SocketAddrSpace::Unspecified);
 
         let mut io = MetaIoHandler::default();
         io.extend_with(rpc_full::FullImpl.to_delegate());
@@ -5518,8 +5720,10 @@ pub mod tests {
 
         let mut io = MetaIoHandler::default();
         io.extend_with(rpc_full::FullImpl.to_delegate());
-        let cluster_info = Arc::new(ClusterInfo::new_with_invalid_keypair(
+        let cluster_info = Arc::new(ClusterInfo::new(
             ContactInfo::new_with_socketaddr(&socketaddr!("127.0.0.1:1234")),
+            Arc::new(Keypair::new()),
+            SocketAddrSpace::Unspecified,
         ));
         let tpu_address = cluster_info.my_contact_info().tpu;
         let (meta, receiver) = JsonRpcRequestProcessor::new(
@@ -5718,7 +5922,7 @@ pub mod tests {
         let RpcHandler { io, meta, .. } = start_rpc_handler_with_tx(&bob_pubkey);
 
         let req = r#"{"jsonrpc":"2.0","id":1,"method":"getIdentity"}"#;
-        let res = io.handle_request_sync(&req, meta);
+        let res = io.handle_request_sync(req, meta);
         let expected = json!({
             "jsonrpc": "2.0",
             "result": {
@@ -5757,7 +5961,7 @@ pub mod tests {
         let RpcHandler { io, meta, .. } = start_rpc_handler_with_tx(&bob_pubkey);
 
         let req = r#"{"jsonrpc":"2.0","id":1,"method":"getVersion"}"#;
-        let res = io.handle_request_sync(&req, meta);
+        let res = io.handle_request_sync(req, meta);
         let version = solana_version::Version::default();
         let expected = json!({
             "jsonrpc": "2.0",
@@ -5797,7 +6001,11 @@ pub mod tests {
             CommitmentSlots::new_from_slot(bank_forks.read().unwrap().highest_slot()),
         )));
 
-        let cluster_info = Arc::new(ClusterInfo::default());
+        let cluster_info = Arc::new(ClusterInfo::new(
+            ContactInfo::default(),
+            Arc::new(Keypair::new()),
+            SocketAddrSpace::Unspecified,
+        ));
         let tpu_address = cluster_info.my_contact_info().tpu;
         let (request_processor, receiver) = JsonRpcRequestProcessor::new(
             JsonRpcConfig::default(),
@@ -5852,7 +6060,7 @@ pub mod tests {
         } = start_rpc_handler_with_tx(&bob_pubkey);
 
         let req = r#"{"jsonrpc":"2.0","id":1,"method":"getBlockCommitment","params":[0]}"#;
-        let res = io.handle_request_sync(&req, meta.clone());
+        let res = io.handle_request_sync(req, meta.clone());
         let result: Response = serde_json::from_str(&res.expect("actual response"))
             .expect("actual response deserialization");
         let RpcBlockCommitment {
@@ -5878,7 +6086,7 @@ pub mod tests {
         assert_eq!(total_stake, 10);
 
         let req = r#"{"jsonrpc":"2.0","id":1,"method":"getBlockCommitment","params":[2]}"#;
-        let res = io.handle_request_sync(&req, meta);
+        let res = io.handle_request_sync(req, meta);
         let result: Response = serde_json::from_str(&res.expect("actual response"))
             .expect("actual response deserialization");
         let commitment_response: RpcBlockCommitment<BlockCommitmentArray> =
@@ -5907,7 +6115,7 @@ pub mod tests {
         } = start_rpc_handler_with_tx(&bob_pubkey);
 
         let req = r#"{"jsonrpc":"2.0","id":1,"method":"getBlock","params":[0]}"#;
-        let res = io.handle_request_sync(&req, meta.clone());
+        let res = io.handle_request_sync(req, meta.clone());
         let result: Value = serde_json::from_str(&res.expect("actual response"))
             .expect("actual response deserialization");
         let confirmed_block: Option<EncodedConfirmedBlock> =
@@ -5952,7 +6160,7 @@ pub mod tests {
         }
 
         let req = r#"{"jsonrpc":"2.0","id":1,"method":"getBlock","params":[0,"binary"]}"#;
-        let res = io.handle_request_sync(&req, meta.clone());
+        let res = io.handle_request_sync(req, meta.clone());
         let result: Value = serde_json::from_str(&res.expect("actual response"))
             .expect("actual response deserialization");
         let confirmed_block: Option<EncodedConfirmedBlock> =
@@ -5997,7 +6205,7 @@ pub mod tests {
         // disable rpc-tx-history
         meta.config.enable_rpc_transaction_history = false;
         let req = r#"{"jsonrpc":"2.0","id":1,"method":"getBlock","params":[0]}"#;
-        let res = io.handle_request_sync(&req, meta);
+        let res = io.handle_request_sync(req, meta);
         assert_eq!(
             res,
             Some(
@@ -6074,7 +6282,7 @@ pub mod tests {
             .set_highest_confirmed_root(8);
 
         let req = r#"{"jsonrpc":"2.0","id":1,"method":"getBlockProduction","params":[]}"#;
-        let res = io.handle_request_sync(&req, meta.clone());
+        let res = io.handle_request_sync(req, meta.clone());
         let result: Value = serde_json::from_str(&res.expect("actual response"))
             .expect("actual response deserialization");
         let block_production: RpcBlockProduction =
@@ -6150,35 +6358,35 @@ pub mod tests {
             .set_highest_confirmed_root(8);
 
         let req = r#"{"jsonrpc":"2.0","id":1,"method":"getBlocks","params":[0]}"#;
-        let res = io.handle_request_sync(&req, meta.clone());
+        let res = io.handle_request_sync(req, meta.clone());
         let result: Value = serde_json::from_str(&res.expect("actual response"))
             .expect("actual response deserialization");
         let confirmed_blocks: Vec<Slot> = serde_json::from_value(result["result"].clone()).unwrap();
         assert_eq!(confirmed_blocks, roots[1..].to_vec());
 
         let req = r#"{"jsonrpc":"2.0","id":1,"method":"getBlocks","params":[2]}"#;
-        let res = io.handle_request_sync(&req, meta.clone());
+        let res = io.handle_request_sync(req, meta.clone());
         let result: Value = serde_json::from_str(&res.expect("actual response"))
             .expect("actual response deserialization");
         let confirmed_blocks: Vec<Slot> = serde_json::from_value(result["result"].clone()).unwrap();
         assert_eq!(confirmed_blocks, vec![3, 4, 8]);
 
         let req = r#"{"jsonrpc":"2.0","id":1,"method":"getBlocks","params":[0,4]}"#;
-        let res = io.handle_request_sync(&req, meta.clone());
+        let res = io.handle_request_sync(req, meta.clone());
         let result: Value = serde_json::from_str(&res.expect("actual response"))
             .expect("actual response deserialization");
         let confirmed_blocks: Vec<Slot> = serde_json::from_value(result["result"].clone()).unwrap();
         assert_eq!(confirmed_blocks, vec![1, 3, 4]);
 
         let req = r#"{"jsonrpc":"2.0","id":1,"method":"getBlocks","params":[0,7]}"#;
-        let res = io.handle_request_sync(&req, meta.clone());
+        let res = io.handle_request_sync(req, meta.clone());
         let result: Value = serde_json::from_str(&res.expect("actual response"))
             .expect("actual response deserialization");
         let confirmed_blocks: Vec<Slot> = serde_json::from_value(result["result"].clone()).unwrap();
         assert_eq!(confirmed_blocks, vec![1, 3, 4]);
 
         let req = r#"{"jsonrpc":"2.0","id":1,"method":"getBlocks","params":[9,11]}"#;
-        let res = io.handle_request_sync(&req, meta.clone());
+        let res = io.handle_request_sync(req, meta.clone());
         let result: Value = serde_json::from_str(&res.expect("actual response"))
             .expect("actual response deserialization");
         let confirmed_blocks: Vec<Slot> = serde_json::from_value(result["result"].clone()).unwrap();
@@ -6227,7 +6435,7 @@ pub mod tests {
             .set_highest_confirmed_root(8);
 
         let req = r#"{"jsonrpc":"2.0","id":1,"method":"getBlocksWithLimit","params":[0,500001]}"#;
-        let res = io.handle_request_sync(&req, meta.clone());
+        let res = io.handle_request_sync(req, meta.clone());
         assert_eq!(
             res,
             Some(
@@ -6236,35 +6444,35 @@ pub mod tests {
         );
 
         let req = r#"{"jsonrpc":"2.0","id":1,"method":"getBlocksWithLimit","params":[0,0]}"#;
-        let res = io.handle_request_sync(&req, meta.clone());
+        let res = io.handle_request_sync(req, meta.clone());
         let result: Value = serde_json::from_str(&res.expect("actual response"))
             .expect("actual response deserialization");
         let confirmed_blocks: Vec<Slot> = serde_json::from_value(result["result"].clone()).unwrap();
         assert!(confirmed_blocks.is_empty());
 
         let req = r#"{"jsonrpc":"2.0","id":1,"method":"getBlocksWithLimit","params":[2,2]}"#;
-        let res = io.handle_request_sync(&req, meta.clone());
+        let res = io.handle_request_sync(req, meta.clone());
         let result: Value = serde_json::from_str(&res.expect("actual response"))
             .expect("actual response deserialization");
         let confirmed_blocks: Vec<Slot> = serde_json::from_value(result["result"].clone()).unwrap();
         assert_eq!(confirmed_blocks, vec![3, 4]);
 
         let req = r#"{"jsonrpc":"2.0","id":1,"method":"getBlocksWithLimit","params":[2,3]}"#;
-        let res = io.handle_request_sync(&req, meta.clone());
+        let res = io.handle_request_sync(req, meta.clone());
         let result: Value = serde_json::from_str(&res.expect("actual response"))
             .expect("actual response deserialization");
         let confirmed_blocks: Vec<Slot> = serde_json::from_value(result["result"].clone()).unwrap();
         assert_eq!(confirmed_blocks, vec![3, 4, 8]);
 
         let req = r#"{"jsonrpc":"2.0","id":1,"method":"getBlocksWithLimit","params":[2,500000]}"#;
-        let res = io.handle_request_sync(&req, meta.clone());
+        let res = io.handle_request_sync(req, meta.clone());
         let result: Value = serde_json::from_str(&res.expect("actual response"))
             .expect("actual response deserialization");
         let confirmed_blocks: Vec<Slot> = serde_json::from_value(result["result"].clone()).unwrap();
         assert_eq!(confirmed_blocks, vec![3, 4, 8]);
 
         let req = r#"{"jsonrpc":"2.0","id":1,"method":"getBlocksWithLimit","params":[9,500000]}"#;
-        let res = io.handle_request_sync(&req, meta);
+        let res = io.handle_request_sync(req, meta);
         let result: Value = serde_json::from_str(&res.expect("actual response"))
             .expect("actual response deserialization");
         let confirmed_blocks: Vec<Slot> = serde_json::from_value(result["result"].clone()).unwrap();
@@ -6332,7 +6540,7 @@ pub mod tests {
         let res = io.handle_request_sync(&req, meta);
         let expected = r#"{"jsonrpc":"2.0","error":{"code":-32004,"message":"Block not available for slot 12345"},"id":1}"#;
         let expected: Response =
-            serde_json::from_str(&expected).expect("expected response deserialization");
+            serde_json::from_str(expected).expect("expected response deserialization");
         let result: Response = serde_json::from_str(&res.expect("actual response"))
             .expect("actual response deserialization");
         assert_eq!(expected, result);
@@ -6394,7 +6602,7 @@ pub mod tests {
         // stake but has never voted, and the vote account with no stake should not be present.
         {
             let req = r#"{"jsonrpc":"2.0","id":1,"method":"getVoteAccounts"}"#;
-            let res = io.handle_request_sync(&req, meta.clone());
+            let res = io.handle_request_sync(req, meta.clone());
             let result: Value = serde_json::from_str(&res.expect("actual response"))
                 .expect("actual response deserialization");
 
@@ -6495,7 +6703,8 @@ pub mod tests {
                 r#"{{"jsonrpc":"2.0","id":1,"method":"getVoteAccounts","params":{}}}"#,
                 json!([RpcGetVoteAccountsConfig {
                     vote_pubkey: Some(leader_vote_keypair.pubkey().to_string()),
-                    commitment: Some(CommitmentConfig::processed())
+                    commitment: Some(CommitmentConfig::processed()),
+                    ..RpcGetVoteAccountsConfig::default()
                 }])
             );
 
@@ -6580,7 +6789,7 @@ pub mod tests {
         let bank = Arc::new(Bank::default());
         let ledger_path = get_tmp_ledger_path!();
         let blockstore = Arc::new(Blockstore::open(&ledger_path).unwrap());
-        blockstore.set_roots(&[0, 1]).unwrap();
+        blockstore.set_roots(vec![0, 1].iter()).unwrap();
         // Build BlockCommitmentCache with rooted slots
         let mut cache0 = BlockCommitment::default();
         cache0.increase_rooted_stake(50);
@@ -7194,8 +7403,11 @@ pub mod tests {
         let ledger_path = get_tmp_ledger_path!();
         let blockstore = Arc::new(Blockstore::open(&ledger_path).unwrap());
         let block_commitment_cache = Arc::new(RwLock::new(BlockCommitmentCache::default()));
-        let cluster_info = Arc::new(ClusterInfo::default());
-
+        let cluster_info = Arc::new(ClusterInfo::new(
+            ContactInfo::default(),
+            Arc::new(Keypair::new()),
+            SocketAddrSpace::Unspecified,
+        ));
         let GenesisConfigInfo { genesis_config, .. } = create_genesis_config(100);
         let bank = Bank::new(&genesis_config);
 
@@ -7250,6 +7462,8 @@ pub mod tests {
         let json: Value = serde_json::from_str(&res.unwrap()).unwrap();
         let slot: Slot = serde_json::from_value(json["result"].clone()).unwrap();
         assert_eq!(slot, 0);
+        let mut highest_confirmed_slot: Slot = 0;
+        let mut last_notified_confirmed_slot: Slot = 0;
 
         OptimisticallyConfirmedBankTracker::process_notification(
             BankNotification::OptimisticallyConfirmed(2),
@@ -7257,10 +7471,12 @@ pub mod tests {
             &optimistically_confirmed_bank,
             &subscriptions,
             &mut pending_optimistically_confirmed_banks,
+            &mut last_notified_confirmed_slot,
+            &mut highest_confirmed_slot,
         );
         let req =
             r#"{"jsonrpc":"2.0","id":1,"method":"getSlot","params":[{"commitment": "confirmed"}]}"#;
-        let res = io.handle_request_sync(&req, meta.clone());
+        let res = io.handle_request_sync(req, meta.clone());
         let json: Value = serde_json::from_str(&res.unwrap()).unwrap();
         let slot: Slot = serde_json::from_value(json["result"].clone()).unwrap();
         assert_eq!(slot, 2);
@@ -7272,10 +7488,12 @@ pub mod tests {
             &optimistically_confirmed_bank,
             &subscriptions,
             &mut pending_optimistically_confirmed_banks,
+            &mut last_notified_confirmed_slot,
+            &mut highest_confirmed_slot,
         );
         let req =
             r#"{"jsonrpc":"2.0","id":1,"method":"getSlot","params":[{"commitment": "confirmed"}]}"#;
-        let res = io.handle_request_sync(&req, meta.clone());
+        let res = io.handle_request_sync(req, meta.clone());
         let json: Value = serde_json::from_str(&res.unwrap()).unwrap();
         let slot: Slot = serde_json::from_value(json["result"].clone()).unwrap();
         assert_eq!(slot, 2);
@@ -7287,10 +7505,12 @@ pub mod tests {
             &optimistically_confirmed_bank,
             &subscriptions,
             &mut pending_optimistically_confirmed_banks,
+            &mut last_notified_confirmed_slot,
+            &mut highest_confirmed_slot,
         );
         let req =
             r#"{"jsonrpc":"2.0","id":1,"method":"getSlot","params":[{"commitment": "confirmed"}]}"#;
-        let res = io.handle_request_sync(&req, meta.clone());
+        let res = io.handle_request_sync(req, meta.clone());
         let json: Value = serde_json::from_str(&res.unwrap()).unwrap();
         let slot: Slot = serde_json::from_value(json["result"].clone()).unwrap();
         assert_eq!(slot, 2);
@@ -7303,10 +7523,12 @@ pub mod tests {
             &optimistically_confirmed_bank,
             &subscriptions,
             &mut pending_optimistically_confirmed_banks,
+            &mut last_notified_confirmed_slot,
+            &mut highest_confirmed_slot,
         );
         let req =
             r#"{"jsonrpc":"2.0","id":1,"method":"getSlot","params":[{"commitment": "confirmed"}]}"#;
-        let res = io.handle_request_sync(&req, meta);
+        let res = io.handle_request_sync(req, meta);
         let json: Value = serde_json::from_str(&res.unwrap()).unwrap();
         let slot: Slot = serde_json::from_value(json["result"].clone()).unwrap();
         assert_eq!(slot, 3);
diff --git a/core/src/rpc_health.rs b/rpc/src/rpc_health.rs
similarity index 81%
rename from core/src/rpc_health.rs
rename to rpc/src/rpc_health.rs
index 32e6c3b336c4ec..33b2ca4dcb20f0 100644
--- a/core/src/rpc_health.rs
+++ b/rpc/src/rpc_health.rs
@@ -65,7 +65,7 @@ impl RpcHealth {
                     .iter()
                     .filter_map(|trusted_validator| {
                         self.cluster_info
-                            .get_accounts_hash_for_node(&trusted_validator, |hashes| {
+                            .get_accounts_hash_for_node(trusted_validator, |hashes| {
                                 hashes
                                     .iter()
                                     .max_by(|a, b| a.0.cmp(&b.0))
@@ -98,7 +98,15 @@ impl RpcHealth {
                         RpcHealthStatus::Behind { num_slots }
                     }
                 }
-                _ => RpcHealthStatus::Unknown,
+                (latest_account_hash_slot, latest_trusted_validator_account_hash_slot) => {
+                    if latest_account_hash_slot.is_none() {
+                        warn!("health check: latest_account_hash_slot not available");
+                    }
+                    if latest_trusted_validator_account_hash_slot.is_none() {
+                        warn!("health check: latest_trusted_validator_account_hash_slot not available");
+                    }
+                    RpcHealthStatus::Unknown
+                }
             }
         } else {
             // No trusted validator point of reference available, so this validator is healthy
@@ -109,8 +117,16 @@ impl RpcHealth {
 
     #[cfg(test)]
     pub(crate) fn stub() -> Arc<Self> {
+        use {
+            solana_gossip::contact_info::ContactInfo, solana_sdk::signer::keypair::Keypair,
+            solana_streamer::socket::SocketAddrSpace,
+        };
         Arc::new(Self::new(
-            Arc::new(ClusterInfo::default()),
+            Arc::new(ClusterInfo::new(
+                ContactInfo::default(),
+                Arc::new(Keypair::new()),
+                SocketAddrSpace::Unspecified,
+            )),
             None,
             42,
             Arc::new(AtomicBool::new(false)),
diff --git a/rpc/src/rpc_pubsub.rs b/rpc/src/rpc_pubsub.rs
index 68de7d9dae15c4..1dd78de907c3a2 100644
--- a/rpc/src/rpc_pubsub.rs
+++ b/rpc/src/rpc_pubsub.rs
@@ -27,7 +27,7 @@ use {
     },
 };
 
-const MAX_ACTIVE_SUBSCRIPTIONS: usize = 100_000;
+pub const MAX_ACTIVE_SUBSCRIPTIONS: usize = 100_000;
 
 // Suppress needless_return due to
 //   https://github.com/paritytech/jsonrpc/blob/2d38e6424d8461cdf72e78425ce67d51af9c6586/derive/src/lib.rs#L204
@@ -194,26 +194,38 @@ pub trait RpcSolPubSub {
 pub struct RpcSolPubSubImpl {
     uid: Arc<atomic::AtomicUsize>,
     subscriptions: Arc<RpcSubscriptions>,
+    max_active_subscriptions: usize,
 }
 
 impl RpcSolPubSubImpl {
-    pub fn new(subscriptions: Arc<RpcSubscriptions>) -> Self {
+    pub fn new(subscriptions: Arc<RpcSubscriptions>, max_active_subscriptions: usize) -> Self {
         let uid = Arc::new(atomic::AtomicUsize::default());
-        Self { uid, subscriptions }
+        Self {
+            uid,
+            subscriptions,
+            max_active_subscriptions,
+        }
     }
 
     #[cfg(test)]
     fn default_with_bank_forks(bank_forks: Arc<RwLock<BankForks>>) -> Self {
         let uid = Arc::new(atomic::AtomicUsize::default());
         let subscriptions = Arc::new(RpcSubscriptions::default_with_bank_forks(bank_forks));
-        Self { uid, subscriptions }
+        let max_active_subscriptions = MAX_ACTIVE_SUBSCRIPTIONS;
+        Self {
+            uid,
+            subscriptions,
+            max_active_subscriptions,
+        }
     }
 
     fn check_subscription_count(&self) -> Result<()> {
         let num_subscriptions = self.subscriptions.total();
         debug!("Total existing subscriptions: {}", num_subscriptions);
-        if num_subscriptions >= MAX_ACTIVE_SUBSCRIPTIONS {
+        if num_subscriptions >= self.max_active_subscriptions {
             info!("Node subscription limit reached");
+            datapoint_info!("rpc-subscription", ("total", num_subscriptions, i64));
+            inc_new_counter_info!("rpc-subscription-refused-limit-reached", 1);
             Err(Error {
                 code: ErrorCode::InternalError,
                 message: "Internal Error: Subscription refused. Node subscription limit reached"
@@ -221,6 +233,7 @@ impl RpcSolPubSubImpl {
                 data: None,
             })
         } else {
+            datapoint_info!("rpc-subscription", ("total", num_subscriptions + 1, i64));
             Ok(())
         }
     }
@@ -569,13 +582,14 @@ mod tests {
             message::Message,
             pubkey::Pubkey,
             signature::{Keypair, Signer},
+            stake::{
+                self, instruction as stake_instruction,
+                state::{Authorized, Lockup, StakeAuthorize},
+            },
             system_instruction, system_program, system_transaction,
             transaction::{self, Transaction},
         },
-        solana_stake_program::{
-            self, stake_instruction,
-            stake_state::{Authorized, Lockup, StakeAuthorize, StakeState},
-        },
+        solana_stake_program::stake_state,
         solana_vote_program::vote_state::Vote,
         std::{
             sync::{atomic::AtomicBool, RwLock},
@@ -629,6 +643,7 @@ mod tests {
                 OptimisticallyConfirmedBank::locked_from_bank_forks_root(&bank_forks),
             )),
             uid: Arc::new(atomic::AtomicUsize::default()),
+            max_active_subscriptions: MAX_ACTIVE_SUBSCRIPTIONS,
         };
 
         // Test signature subscriptions
@@ -760,19 +775,19 @@ mod tests {
         let _res = io.handle_request_sync(&req, session.clone());
 
         let req = r#"{"jsonrpc":"2.0","id":1,"method":"signatureUnsubscribe","params":[0]}"#;
-        let res = io.handle_request_sync(&req, session.clone());
+        let res = io.handle_request_sync(req, session.clone());
 
         let expected = r#"{"jsonrpc":"2.0","result":true,"id":1}"#;
-        let expected: Response = serde_json::from_str(&expected).unwrap();
+        let expected: Response = serde_json::from_str(expected).unwrap();
 
         let result: Response = serde_json::from_str(&res.unwrap()).unwrap();
         assert_eq!(expected, result);
 
         // Test bad parameter
         let req = r#"{"jsonrpc":"2.0","id":1,"method":"signatureUnsubscribe","params":[1]}"#;
-        let res = io.handle_request_sync(&req, session);
-        let expected = r#"{"jsonrpc":"2.0","error":{"code":-32602,"message":"Invalid Request: Subscription id does not exist"},"id":1}"#;
-        let expected: Response = serde_json::from_str(&expected).unwrap();
+        let res = io.handle_request_sync(req, session);
+        let expected = r#"{"jsonrpc":"2.0","error":{"code":-32602,"message":"Invalid subscription id."},"id":1}"#;
+        let expected: Response = serde_json::from_str(expected).unwrap();
 
         let result: Response = serde_json::from_str(&res.unwrap()).unwrap();
         assert_eq!(expected, result);
@@ -791,7 +806,7 @@ mod tests {
         let stake_authority = Keypair::new();
         let from = Keypair::new();
         let stake_account = Keypair::new();
-        let stake_program_id = solana_stake_program::id();
+        let stake_program_id = stake::program::id();
         let bank = Bank::new(&genesis_config);
         let blockhash = bank.last_blockhash();
         let bank_forks = Arc::new(RwLock::new(BankForks::new(bank)));
@@ -809,8 +824,10 @@ mod tests {
                 OptimisticallyConfirmedBank::locked_from_bank_forks_root(&bank_forks),
             )),
             uid: Arc::new(atomic::AtomicUsize::default()),
+            max_active_subscriptions: MAX_ACTIVE_SUBSCRIPTIONS,
         };
         let session = create_session();
+        let encoding = UiAccountEncoding::Base64;
         let (subscriber, _id_receiver, receiver) = Subscriber::new_test("accountNotification");
         rpc.account_subscribe(
             session,
@@ -818,7 +835,7 @@ mod tests {
             stake_account.pubkey().to_string(),
             Some(RpcAccountInfoConfig {
                 commitment: Some(CommitmentConfig::processed()),
-                encoding: None,
+                encoding: Some(encoding),
                 data_slice: None,
             }),
         );
@@ -857,7 +874,7 @@ mod tests {
                    "value": {
                        "owner": stake_program_id.to_string(),
                        "lamports": 51,
-                       "data": bs58::encode(expected_data).into_string(),
+                       "data": [base64::encode(expected_data), encoding],
                        "executable": false,
                        "rentEpoch": 0,
                    },
@@ -887,7 +904,7 @@ mod tests {
         let bank = bank_forks.read().unwrap()[1].clone();
         let account = bank.get_account(&stake_account.pubkey()).unwrap();
         assert_eq!(
-            StakeState::authorized_from(&account).unwrap().staker,
+            stake_state::authorized_from(&account).unwrap().staker,
             new_stake_authority
         );
     }
@@ -919,6 +936,7 @@ mod tests {
                 OptimisticallyConfirmedBank::locked_from_bank_forks_root(&bank_forks),
             )),
             uid: Arc::new(atomic::AtomicUsize::default()),
+            max_active_subscriptions: MAX_ACTIVE_SUBSCRIPTIONS,
         };
         let session = create_session();
         let (subscriber, _id_receiver, receiver) = Subscriber::new_test("accountNotification");
@@ -1002,19 +1020,19 @@ mod tests {
         let _res = io.handle_request_sync(&req, session.clone());
 
         let req = r#"{"jsonrpc":"2.0","id":1,"method":"accountUnsubscribe","params":[0]}"#;
-        let res = io.handle_request_sync(&req, session.clone());
+        let res = io.handle_request_sync(req, session.clone());
 
         let expected = r#"{"jsonrpc":"2.0","result":true,"id":1}"#;
-        let expected: Response = serde_json::from_str(&expected).unwrap();
+        let expected: Response = serde_json::from_str(expected).unwrap();
 
         let result: Response = serde_json::from_str(&res.unwrap()).unwrap();
         assert_eq!(expected, result);
 
         // Test bad parameter
         let req = r#"{"jsonrpc":"2.0","id":1,"method":"accountUnsubscribe","params":[1]}"#;
-        let res = io.handle_request_sync(&req, session);
-        let expected = r#"{"jsonrpc":"2.0","error":{"code":-32602,"message":"Invalid Request: Subscription id does not exist"},"id":1}"#;
-        let expected: Response = serde_json::from_str(&expected).unwrap();
+        let res = io.handle_request_sync(req, session);
+        let expected = r#"{"jsonrpc":"2.0","error":{"code":-32602,"message":"Invalid subscription id."},"id":1}"#;
+        let expected: Response = serde_json::from_str(expected).unwrap();
 
         let result: Response = serde_json::from_str(&res.unwrap()).unwrap();
         assert_eq!(expected, result);
diff --git a/rpc/src/rpc_pubsub_service.rs b/rpc/src/rpc_pubsub_service.rs
index ea328b9af9c142..c76873671763dc 100644
--- a/rpc/src/rpc_pubsub_service.rs
+++ b/rpc/src/rpc_pubsub_service.rs
@@ -2,7 +2,7 @@
 
 use {
     crate::{
-        rpc_pubsub::{RpcSolPubSub, RpcSolPubSubImpl},
+        rpc_pubsub::{RpcSolPubSub, RpcSolPubSubImpl, MAX_ACTIVE_SUBSCRIPTIONS},
         rpc_subscriptions::RpcSubscriptions,
     },
     jsonrpc_pubsub::{PubSubHandler, Session},
@@ -29,6 +29,7 @@ pub struct PubSubConfig {
     pub max_fragment_size: usize,
     pub max_in_buffer_capacity: usize,
     pub max_out_buffer_capacity: usize,
+    pub max_active_subscriptions: usize,
 }
 
 impl Default for PubSubConfig {
@@ -39,6 +40,7 @@ impl Default for PubSubConfig {
             max_fragment_size: 50 * 1024, // 50KB
             max_in_buffer_capacity: 50 * 1024, // 50KB
             max_out_buffer_capacity: 15 * 1024 * 1024, // max account size (10MB), then 5MB extra for base64 encoding overhead/etc
+            max_active_subscriptions: MAX_ACTIVE_SUBSCRIPTIONS,
         }
     }
 }
@@ -55,7 +57,10 @@ impl PubSubService {
         exit: &Arc<AtomicBool>,
     ) -> Self {
         info!("rpc_pubsub bound to {:?}", pubsub_addr);
-        let rpc = RpcSolPubSubImpl::new(subscriptions.clone());
+        let rpc = RpcSolPubSubImpl::new(
+            subscriptions.clone(),
+            pubsub_config.max_active_subscriptions,
+        );
         let exit_ = exit.clone();
 
         let thread_hdl = Builder::new()
diff --git a/core/src/rpc_service.rs b/rpc/src/rpc_service.rs
similarity index 89%
rename from core/src/rpc_service.rs
rename to rpc/src/rpc_service.rs
index f930a24d78de0c..645e73a93d594f 100644
--- a/core/src/rpc_service.rs
+++ b/rpc/src/rpc_service.rs
@@ -1,45 +1,47 @@
 //! The `rpc_service` module implements the Solana JSON RPC service.
 
-use crate::{
-    bigtable_upload_service::BigTableUploadService,
-    poh_recorder::PohRecorder,
-    rpc::{rpc_deprecated_v1_7::*, rpc_full::*, rpc_minimal::*, rpc_obsolete_v1_7::*, *},
-    rpc_health::*,
-    send_transaction_service::{LeaderInfo, SendTransactionService},
-    validator::ValidatorExit,
+use {
+    crate::{
+        max_slots::MaxSlots,
+        optimistically_confirmed_bank_tracker::OptimisticallyConfirmedBank,
+        rpc::{rpc_deprecated_v1_7::*, rpc_full::*, rpc_minimal::*, rpc_obsolete_v1_7::*, *},
+        rpc_health::*,
+        send_transaction_service::{LeaderInfo, SendTransactionService},
+    },
+    jsonrpc_core::{futures::prelude::*, MetaIoHandler},
+    jsonrpc_http_server::{
+        hyper, AccessControlAllowOrigin, CloseHandle, DomainsValidation, RequestMiddleware,
+        RequestMiddlewareAction, ServerBuilder,
+    },
+    regex::Regex,
+    solana_client::rpc_cache::LargestAccountsCache,
+    solana_gossip::cluster_info::ClusterInfo,
+    solana_ledger::{
+        bigtable_upload_service::BigTableUploadService, blockstore::Blockstore,
+        leader_schedule_cache::LeaderScheduleCache,
+    },
+    solana_metrics::inc_new_counter_info,
+    solana_poh::poh_recorder::PohRecorder,
+    solana_runtime::{
+        bank_forks::{BankForks, SnapshotConfig},
+        commitment::BlockCommitmentCache,
+        snapshot_utils,
+    },
+    solana_sdk::{
+        exit::Exit, genesis_config::DEFAULT_GENESIS_DOWNLOAD_PATH, hash::Hash,
+        native_token::lamports_to_sol, pubkey::Pubkey,
+    },
+    std::{
+        collections::HashSet,
+        net::SocketAddr,
+        path::{Path, PathBuf},
+        sync::atomic::{AtomicBool, AtomicU64, Ordering},
+        sync::{mpsc::channel, Arc, Mutex, RwLock},
+        thread::{self, Builder, JoinHandle},
+    },
+    tokio::runtime,
+    tokio_util::codec::{BytesCodec, FramedRead},
 };
-use jsonrpc_core::{futures::prelude::*, MetaIoHandler};
-use jsonrpc_http_server::{
-    hyper, AccessControlAllowOrigin, CloseHandle, DomainsValidation, RequestMiddleware,
-    RequestMiddlewareAction, ServerBuilder,
-};
-use regex::Regex;
-use solana_client::rpc_cache::LargestAccountsCache;
-use solana_gossip::cluster_info::ClusterInfo;
-use solana_ledger::{blockstore::Blockstore, leader_schedule_cache::LeaderScheduleCache};
-use solana_metrics::inc_new_counter_info;
-use solana_rpc::{
-    max_slots::MaxSlots, optimistically_confirmed_bank_tracker::OptimisticallyConfirmedBank,
-};
-use solana_runtime::{
-    bank_forks::{BankForks, SnapshotConfig},
-    commitment::BlockCommitmentCache,
-    snapshot_utils,
-};
-use solana_sdk::{
-    genesis_config::DEFAULT_GENESIS_DOWNLOAD_PATH, hash::Hash, native_token::lamports_to_sol,
-    pubkey::Pubkey,
-};
-use std::{
-    collections::HashSet,
-    net::SocketAddr,
-    path::{Path, PathBuf},
-    sync::atomic::{AtomicBool, AtomicU64, Ordering},
-    sync::{mpsc::channel, Arc, Mutex, RwLock},
-    thread::{self, Builder, JoinHandle},
-};
-use tokio::runtime;
-use tokio_util::codec::{BytesCodec, FramedRead};
 
 const LARGEST_ACCOUNTS_CACHE_DURATION: u64 = 60 * 60 * 2;
 
@@ -163,7 +165,11 @@ impl RpcRequestMiddleware {
             should_validate_hosts: true,
             response: Box::pin(async {
                 match Self::open_no_follow(filename).await {
-                    Err(_) => Ok(Self::internal_server_error()),
+                    Err(err) => Ok(if err.kind() == std::io::ErrorKind::NotFound {
+                        Self::not_found()
+                    } else {
+                        Self::internal_server_error()
+                    }),
                     Ok(file) => {
                         let stream =
                             FramedRead::new(file, BytesCodec::new()).map_ok(|b| b.freeze());
@@ -207,7 +213,7 @@ impl RequestMiddleware for RpcRequestMiddleware {
                             .file_name()
                             .unwrap_or_else(|| std::ffi::OsStr::new(""))
                             .to_str()
-                            .unwrap_or(&"")
+                            .unwrap_or("")
                     ))
                 } else {
                     RpcRequestMiddleware::not_found()
@@ -244,6 +250,7 @@ fn process_rest(bank_forks: &Arc<RwLock<BankForks>>, path: &str) -> Option<Strin
             let total_supply = bank.capitalization();
             let non_circulating_supply =
                 solana_runtime::non_circulating_supply::calculate_non_circulating_supply(&bank)
+                    .expect("Scan should not error on root banks")
                     .lamports;
             Some(format!(
                 "{}",
@@ -273,7 +280,7 @@ impl JsonRpcService {
         poh_recorder: Option<Arc<Mutex<PohRecorder>>>,
         genesis_hash: Hash,
         ledger_path: &Path,
-        validator_exit: Arc<RwLock<ValidatorExit>>,
+        validator_exit: Arc<RwLock<Exit>>,
         trusted_validators: Option<HashSet<Pubkey>>,
         override_health_check: Arc<AtomicBool>,
         optimistically_confirmed_bank: Arc<RwLock<OptimisticallyConfirmedBank>>,
@@ -478,23 +485,32 @@ impl JsonRpcService {
 
 #[cfg(test)]
 mod tests {
-    use super::*;
-    use crate::rpc::create_validator_exit;
-    use solana_gossip::crds_value::{CrdsData, CrdsValue, SnapshotHash};
-    use solana_ledger::{
-        genesis_utils::{create_genesis_config, GenesisConfigInfo},
-        get_tmp_ledger_path,
+    use {
+        super::*,
+        crate::rpc::create_validator_exit,
+        solana_gossip::{
+            contact_info::ContactInfo,
+            crds_value::{CrdsData, CrdsValue, SnapshotHash},
+        },
+        solana_ledger::{
+            genesis_utils::{create_genesis_config, GenesisConfigInfo},
+            get_tmp_ledger_path,
+        },
+        solana_runtime::{
+            bank::Bank, bank_forks::ArchiveFormat, snapshot_utils::SnapshotVersion,
+            snapshot_utils::DEFAULT_MAX_SNAPSHOTS_TO_RETAIN,
+        },
+        solana_sdk::{
+            genesis_config::{ClusterType, DEFAULT_GENESIS_ARCHIVE},
+            signature::Signer,
+            signer::keypair::Keypair,
+        },
+        solana_streamer::socket::SocketAddrSpace,
+        std::{
+            io::Write,
+            net::{IpAddr, Ipv4Addr},
+        },
     };
-    use solana_runtime::{
-        bank::Bank, bank_forks::ArchiveFormat, snapshot_utils::SnapshotVersion,
-        snapshot_utils::DEFAULT_MAX_SNAPSHOTS_TO_RETAIN,
-    };
-    use solana_sdk::{
-        genesis_config::{ClusterType, DEFAULT_GENESIS_ARCHIVE},
-        signature::Signer,
-    };
-    use std::io::Write;
-    use std::net::{IpAddr, Ipv4Addr};
 
     #[test]
     fn test_rpc_new() {
@@ -506,7 +522,11 @@ mod tests {
         let exit = Arc::new(AtomicBool::new(false));
         let validator_exit = create_validator_exit(&exit);
         let bank = Bank::new(&genesis_config);
-        let cluster_info = Arc::new(ClusterInfo::default());
+        let cluster_info = Arc::new(ClusterInfo::new(
+            ContactInfo::default(),
+            Arc::new(Keypair::new()),
+            SocketAddrSpace::Unspecified,
+        ));
         let ip_addr = IpAddr::V4(Ipv4Addr::new(0, 0, 0, 0));
         let rpc_addr = SocketAddr::new(
             ip_addr,
@@ -700,7 +720,11 @@ mod tests {
 
     #[test]
     fn test_health_check_with_trusted_validators() {
-        let cluster_info = Arc::new(ClusterInfo::default());
+        let cluster_info = Arc::new(ClusterInfo::new(
+            ContactInfo::default(),
+            Arc::new(Keypair::new()),
+            SocketAddrSpace::Unspecified,
+        ));
         let health_check_slot_distance = 123;
         let override_health_check = Arc::new(AtomicBool::new(false));
         let trusted_validators = vec![
diff --git a/rpc/src/rpc_subscriptions.rs b/rpc/src/rpc_subscriptions.rs
index d2aedd5eadf185..678b0f3bc89559 100644
--- a/rpc/src/rpc_subscriptions.rs
+++ b/rpc/src/rpc_subscriptions.rs
@@ -335,7 +335,7 @@ fn filter_program_results(
     let keyed_accounts = accounts.into_iter().filter(move |(_, account)| {
         filters.iter().all(|filter_type| match filter_type {
             RpcFilterType::DataSize(size) => account.data().len() as u64 == *size,
-            RpcFilterType::Memcmp(compare) => compare.bytes_match(&account.data()),
+            RpcFilterType::Memcmp(compare) => compare.bytes_match(account.data()),
         })
     });
     let accounts: Box<dyn Iterator<Item = RpcKeyedAccount>> = if program_id == &spl_token_id_v2_0()
@@ -614,7 +614,7 @@ impl RpcSubscriptions {
         if let Some(subscription_ids) = subscriptions.get_mut(signature) {
             subscription_ids.retain(|k, _| !notified_ids.contains(k));
             if subscription_ids.is_empty() {
-                subscriptions.remove(&signature);
+                subscriptions.remove(signature);
             }
         }
         notified_ids
@@ -1156,7 +1156,7 @@ impl RpcSubscriptions {
             &subscriptions.gossip_signature_subscriptions,
             bank_forks,
             &commitment_slots,
-            &notifier,
+            notifier,
             "gossip",
         );
     }
@@ -1182,8 +1182,8 @@ impl RpcSubscriptions {
                 pubkey,
                 bank_forks,
                 account_subscriptions.clone(),
-                &notifier,
-                &commitment_slots,
+                notifier,
+                commitment_slots,
             )
             .len();
         }
@@ -1200,8 +1200,8 @@ impl RpcSubscriptions {
                 address,
                 bank_forks,
                 logs_subscriptions.clone(),
-                &notifier,
-                &commitment_slots,
+                notifier,
+                commitment_slots,
             )
             .len();
         }
@@ -1218,8 +1218,8 @@ impl RpcSubscriptions {
                 program_id,
                 bank_forks,
                 program_subscriptions.clone(),
-                &notifier,
-                &commitment_slots,
+                notifier,
+                commitment_slots,
             )
             .len();
         }
@@ -1236,8 +1236,8 @@ impl RpcSubscriptions {
                 signature,
                 bank_forks,
                 signature_subscriptions.clone(),
-                &notifier,
-                &commitment_slots,
+                notifier,
+                commitment_slots,
             )
             .len();
         }
@@ -1304,7 +1304,7 @@ impl RpcSubscriptions {
                                     ReceivedSignatureResult::ReceivedSignature,
                                 ),
                             },
-                            &sink,
+                            sink,
                         );
                     }
                 }
@@ -1343,10 +1343,13 @@ pub(crate) mod tests {
         solana_sdk::{
             message::Message,
             signature::{Keypair, Signer},
-            system_instruction, system_program, system_transaction,
+            stake, system_instruction, system_program, system_transaction,
             transaction::Transaction,
         },
-        std::{fmt::Debug, sync::mpsc::channel},
+        std::{
+            fmt::Debug,
+            sync::{atomic::Ordering::Relaxed, mpsc::channel},
+        },
         tokio::{
             runtime::Runtime,
             time::{sleep, timeout},
@@ -1381,6 +1384,26 @@ pub(crate) mod tests {
         inner_receiver.recv().expect("recv error")
     }
 
+    fn make_account_result(lamports: u64, subscription: u64, data: &str) -> serde_json::Value {
+        json!({
+           "jsonrpc": "2.0",
+           "method": "accountNotification",
+           "params": {
+               "result": {
+                   "context": { "slot": 1 },
+                   "value": {
+                       "data": data,
+                       "executable": false,
+                       "lamports": lamports,
+                       "owner": "11111111111111111111111111111111",
+                       "rentEpoch": 0,
+                    },
+               },
+               "subscription": subscription,
+           }
+        })
+    }
+
     #[test]
     #[serial]
     fn test_check_account_subscribe() {
@@ -1397,12 +1420,6 @@ pub(crate) mod tests {
         bank_forks.write().unwrap().insert(bank1);
         let alice = Keypair::new();
 
-        let (create_sub, _id_receiver, create_recv) = Subscriber::new_test("accountNotification");
-        let (close_sub, _id_receiver, close_recv) = Subscriber::new_test("accountNotification");
-
-        let create_sub_id = SubscriptionId::Number(0);
-        let close_sub_id = SubscriptionId::Number(1);
-
         let exit = Arc::new(AtomicBool::new(false));
         let subscriptions = RpcSubscriptions::new(
             &exit,
@@ -1412,25 +1429,8 @@ pub(crate) mod tests {
             ))),
             OptimisticallyConfirmedBank::locked_from_bank_forks_root(&bank_forks),
         );
-        subscriptions.add_account_subscription(
-            alice.pubkey(),
-            Some(RpcAccountInfoConfig {
-                commitment: Some(CommitmentConfig::processed()),
-                encoding: None,
-                data_slice: None,
-            }),
-            create_sub_id.clone(),
-            create_sub,
-        );
-
-        assert!(subscriptions
-            .subscriptions
-            .account_subscriptions
-            .read()
-            .unwrap()
-            .contains_key(&alice.pubkey()));
 
-        let tx = system_transaction::create_account(
+        let tx0 = system_transaction::create_account(
             &mint_keypair,
             &alice,
             blockhash,
@@ -1438,92 +1438,77 @@ pub(crate) mod tests {
             0,
             &system_program::id(),
         );
-        bank_forks
-            .write()
-            .unwrap()
-            .get(1)
-            .unwrap()
-            .process_transaction(&tx)
-            .unwrap();
-        let commitment_slots = CommitmentSlots {
-            slot: 1,
-            ..CommitmentSlots::default()
-        };
-        subscriptions.notify_subscribers(commitment_slots);
-        let (response, _) = robust_poll_or_panic(create_recv);
-        let expected = json!({
-           "jsonrpc": "2.0",
-           "method": "accountNotification",
-           "params": {
-               "result": {
-                   "context": { "slot": 1 },
-                   "value": {
-                       "data": "",
-                       "executable": false,
-                       "lamports": 1,
-                       "owner": "11111111111111111111111111111111",
-                       "rentEpoch": 0,
-                    },
-               },
-               "subscription": 0,
-           }
-        });
-        assert_eq!(serde_json::to_string(&expected).unwrap(), response);
-        subscriptions.remove_account_subscription(&create_sub_id);
-
-        subscriptions.add_account_subscription(
-            alice.pubkey(),
-            Some(RpcAccountInfoConfig {
-                commitment: Some(CommitmentConfig::processed()),
-                encoding: None,
-                data_slice: None,
-            }),
-            close_sub_id.clone(),
-            close_sub,
-        );
+        let expected0 = make_account_result(1, 0, "");
 
-        let tx = {
+        let tx1 = {
             let instruction =
                 system_instruction::transfer(&alice.pubkey(), &mint_keypair.pubkey(), 1);
             let message = Message::new(&[instruction], Some(&mint_keypair.pubkey()));
             Transaction::new(&[&alice, &mint_keypair], message, blockhash)
         };
+        let expected1 = make_account_result(0, 1, "");
 
-        bank_forks
-            .write()
-            .unwrap()
-            .get(1)
-            .unwrap()
-            .process_transaction(&tx)
-            .unwrap();
-        subscriptions.notify_subscribers(commitment_slots);
-        let (response, _) = robust_poll_or_panic(close_recv);
-        let expected = json!({
-           "jsonrpc": "2.0",
-           "method": "accountNotification",
-           "params": {
-               "result": {
-                   "context": { "slot": 1 },
-                   "value": {
-                       "data": "",
-                       "executable": false,
-                       "lamports": 0,
-                       "owner": "11111111111111111111111111111111",
-                       "rentEpoch": 0,
-                    },
-               },
-               "subscription": 1,
-           }
-        });
-        assert_eq!(serde_json::to_string(&expected).unwrap(), response);
-        subscriptions.remove_account_subscription(&close_sub_id);
+        let tx2 = system_transaction::create_account(
+            &mint_keypair,
+            &alice,
+            blockhash,
+            1,
+            1024,
+            &system_program::id(),
+        );
+        let expected2 = make_account_result(1, 2, "error: data too large for bs58 encoding");
+
+        let subscribe_cases = vec![
+            (alice.pubkey(), tx0, expected0),
+            (alice.pubkey(), tx1, expected1),
+            (alice.pubkey(), tx2, expected2),
+        ];
+
+        for (i, (pubkey, tx, expected)) in subscribe_cases.iter().enumerate() {
+            let (sub, _id_receiver, recv) = Subscriber::new_test("accountNotification");
+            let sub_id = SubscriptionId::Number(i as u64);
+            subscriptions.add_account_subscription(
+                *pubkey,
+                Some(RpcAccountInfoConfig {
+                    commitment: Some(CommitmentConfig::processed()),
+                    encoding: None,
+                    data_slice: None,
+                }),
+                sub_id.clone(),
+                sub,
+            );
 
-        assert!(!subscriptions
-            .subscriptions
-            .account_subscriptions
-            .read()
-            .unwrap()
-            .contains_key(&alice.pubkey()));
+            assert!(subscriptions
+                .subscriptions
+                .account_subscriptions
+                .read()
+                .unwrap()
+                .contains_key(pubkey));
+
+            bank_forks
+                .read()
+                .unwrap()
+                .get(1)
+                .unwrap()
+                .process_transaction(tx)
+                .unwrap();
+            let commitment_slots = CommitmentSlots {
+                slot: 1,
+                ..CommitmentSlots::default()
+            };
+            subscriptions.notify_subscribers(commitment_slots);
+            let (response, _) = robust_poll_or_panic(recv);
+
+            assert_eq!(serde_json::to_string(&expected).unwrap(), response);
+            subscriptions.remove_account_subscription(&sub_id);
+
+            assert!(!subscriptions
+                .subscriptions
+                .account_subscriptions
+                .read()
+                .unwrap()
+                .contains_key(pubkey));
+        }
     }
 
     #[test]
@@ -1544,7 +1529,7 @@ pub(crate) mod tests {
             blockhash,
             1,
             16,
-            &solana_stake_program::id(),
+            &stake::program::id(),
         );
         bank_forks
             .write()
@@ -1567,7 +1552,7 @@ pub(crate) mod tests {
             optimistically_confirmed_bank,
         );
         subscriptions.add_program_subscription(
-            solana_stake_program::id(),
+            stake::program::id(),
             Some(RpcProgramAccountsConfig {
                 account_config: RpcAccountInfoConfig {
                     commitment: Some(CommitmentConfig::processed()),
@@ -1584,7 +1569,7 @@ pub(crate) mod tests {
             .program_subscriptions
             .read()
             .unwrap()
-            .contains_key(&solana_stake_program::id()));
+            .contains_key(&stake::program::id()));
 
         subscriptions.notify_subscribers(CommitmentSlots::default());
         let (response, _) = robust_poll_or_panic(transport_receiver);
@@ -1616,7 +1601,455 @@ pub(crate) mod tests {
             .program_subscriptions
             .read()
             .unwrap()
-            .contains_key(&solana_stake_program::id()));
+            .contains_key(&stake::program::id()));
+    }
+
+    #[test]
+    #[serial]
+    fn test_check_program_subscribe_for_missing_optimistically_confirmed_slot() {
+        // Testing if we can get the pubsub notification if a slot does not
+        // receive OptimisticallyConfirmed but its descendant slot get the confirmed
+        // notification.
+        let GenesisConfigInfo {
+            genesis_config,
+            mint_keypair,
+            ..
+        } = create_genesis_config(100);
+        let bank = Bank::new(&genesis_config);
+        bank.lazy_rent_collection.store(true, Relaxed);
+
+        let blockhash = bank.last_blockhash();
+        let bank_forks = Arc::new(RwLock::new(BankForks::new(bank)));
+
+        let bank0 = bank_forks.read().unwrap().get(0).unwrap().clone();
+        let bank1 = Bank::new_from_parent(&bank0, &Pubkey::default(), 1);
+        bank_forks.write().unwrap().insert(bank1);
+        let bank1 = bank_forks.read().unwrap().get(1).unwrap().clone();
+
+        // add account for alice and process the transaction at bank1
+        let alice = Keypair::new();
+        let tx = system_transaction::create_account(
+            &mint_keypair,
+            &alice,
+            blockhash,
+            1,
+            16,
+            &stake::program::id(),
+        );
+
+        bank1.process_transaction(&tx).unwrap();
+
+        let bank2 = Bank::new_from_parent(&bank1, &Pubkey::default(), 2);
+        bank_forks.write().unwrap().insert(bank2);
+
+        // add account for bob and process the transaction at bank2
+        let bob = Keypair::new();
+        let tx = system_transaction::create_account(
+            &mint_keypair,
+            &bob,
+            blockhash,
+            2,
+            16,
+            &stake::program::id(),
+        );
+        let bank2 = bank_forks.read().unwrap().get(2).unwrap().clone();
+
+        bank2.process_transaction(&tx).unwrap();
+
+        let bank3 = Bank::new_from_parent(&bank2, &Pubkey::default(), 3);
+        bank_forks.write().unwrap().insert(bank3);
+
+        // add account for joe and process the transaction at bank3
+        let joe = Keypair::new();
+        let tx = system_transaction::create_account(
+            &mint_keypair,
+            &joe,
+            blockhash,
+            3,
+            16,
+            &stake::program::id(),
+        );
+        let bank3 = bank_forks.read().unwrap().get(3).unwrap().clone();
+
+        bank3.process_transaction(&tx).unwrap();
+
+        // now add programSubscribe at the "confirmed" commitment level
+        let (subscriber, _id_receiver, transport_receiver) =
+            Subscriber::new_test("programNotification");
+        let sub_id = SubscriptionId::Number(0);
+        let exit = Arc::new(AtomicBool::new(false));
+        let optimistically_confirmed_bank =
+            OptimisticallyConfirmedBank::locked_from_bank_forks_root(&bank_forks);
+        let mut pending_optimistically_confirmed_banks = HashSet::new();
+
+        let subscriptions = Arc::new(RpcSubscriptions::new(
+            &exit,
+            bank_forks.clone(),
+            Arc::new(RwLock::new(BlockCommitmentCache::new_for_tests_with_slots(
+                1, 1,
+            ))),
+            optimistically_confirmed_bank.clone(),
+        ));
+        subscriptions.add_program_subscription(
+            stake::program::id(),
+            Some(RpcProgramAccountsConfig {
+                account_config: RpcAccountInfoConfig {
+                    commitment: Some(CommitmentConfig::confirmed()),
+                    ..RpcAccountInfoConfig::default()
+                },
+                ..RpcProgramAccountsConfig::default()
+            }),
+            sub_id.clone(),
+            subscriber,
+        );
+
+        assert!(subscriptions
+            .subscriptions
+            .gossip_program_subscriptions
+            .read()
+            .unwrap()
+            .contains_key(&stake::program::id()));
+
+        let mut highest_confirmed_slot: Slot = 0;
+        let mut last_notified_confirmed_slot: Slot = 0;
+        // Optimistically notifying slot 3 without notifying slot 1 and 2, bank3 is unfrozen, we expect
+        // to see transaction for alice and bob to be notified in order.
+        OptimisticallyConfirmedBankTracker::process_notification(
+            BankNotification::OptimisticallyConfirmed(3),
+            &bank_forks,
+            &optimistically_confirmed_bank,
+            &subscriptions,
+            &mut pending_optimistically_confirmed_banks,
+            &mut last_notified_confirmed_slot,
+            &mut highest_confirmed_slot,
+        );
+
+        // a closure to reduce code duplications in building expected responses:
+        let build_expected_resp = |slot: Slot, lamports: u64, pubkey: &str, subscription: i32| {
+            json!({
+               "jsonrpc": "2.0",
+               "method": "programNotification",
+               "params": {
+                   "result": {
+                       "context": { "slot": slot },
+                       "value": {
+                           "account": {
+                              "data": "1111111111111111",
+                              "executable": false,
+                              "lamports": lamports,
+                              "owner": "Stake11111111111111111111111111111111111111",
+                              "rentEpoch": 0,
+                           },
+                           "pubkey": pubkey,
+                        },
+                   },
+                   "subscription": subscription,
+               }
+            })
+        };
+
+        let (response, transport_receiver) = robust_poll_or_panic(transport_receiver);
+        let expected = build_expected_resp(1, 1, &alice.pubkey().to_string(), 0);
+        assert_eq!(serde_json::to_string(&expected).unwrap(), response);
+
+        let (response, transport_receiver) = robust_poll_or_panic(transport_receiver);
+        let expected = build_expected_resp(2, 2, &bob.pubkey().to_string(), 0);
+        assert_eq!(serde_json::to_string(&expected).unwrap(), response);
+
+        bank3.freeze();
+        OptimisticallyConfirmedBankTracker::process_notification(
+            BankNotification::Frozen(bank3),
+            &bank_forks,
+            &optimistically_confirmed_bank,
+            &subscriptions,
+            &mut pending_optimistically_confirmed_banks,
+            &mut last_notified_confirmed_slot,
+            &mut highest_confirmed_slot,
+        );
+
+        let (response, _) = robust_poll_or_panic(transport_receiver);
+        let expected = build_expected_resp(3, 3, &joe.pubkey().to_string(), 0);
+        assert_eq!(serde_json::to_string(&expected).unwrap(), response);
+        subscriptions.remove_program_subscription(&sub_id);
+    }
+
+    #[test]
+    #[serial]
+    #[should_panic]
+    fn test_check_program_subscribe_for_missing_optimistically_confirmed_slot_with_no_banks_no_notifications(
+    ) {
+        // Testing if we can get the pubsub notification if a slot does not
+        // receive OptimisticallyConfirmed but its descendant slot get the confirmed
+        // notification with a bank in the BankForks. We are not expecting to receive any notifications -- should panic.
+        let GenesisConfigInfo {
+            genesis_config,
+            mint_keypair,
+            ..
+        } = create_genesis_config(100);
+        let bank = Bank::new(&genesis_config);
+        bank.lazy_rent_collection.store(true, Relaxed);
+
+        let blockhash = bank.last_blockhash();
+        let bank_forks = Arc::new(RwLock::new(BankForks::new(bank)));
+
+        let bank0 = bank_forks.read().unwrap().get(0).unwrap().clone();
+        let bank1 = Bank::new_from_parent(&bank0, &Pubkey::default(), 1);
+        bank_forks.write().unwrap().insert(bank1);
+        let bank1 = bank_forks.read().unwrap().get(1).unwrap().clone();
+
+        // add account for alice and process the transaction at bank1
+        let alice = Keypair::new();
+        let tx = system_transaction::create_account(
+            &mint_keypair,
+            &alice,
+            blockhash,
+            1,
+            16,
+            &stake::program::id(),
+        );
+
+        bank1.process_transaction(&tx).unwrap();
+
+        let bank2 = Bank::new_from_parent(&bank1, &Pubkey::default(), 2);
+        bank_forks.write().unwrap().insert(bank2);
+
+        // add account for bob and process the transaction at bank2
+        let bob = Keypair::new();
+        let tx = system_transaction::create_account(
+            &mint_keypair,
+            &bob,
+            blockhash,
+            2,
+            16,
+            &stake::program::id(),
+        );
+        let bank2 = bank_forks.read().unwrap().get(2).unwrap().clone();
+
+        bank2.process_transaction(&tx).unwrap();
+
+        // now add programSubscribe at the "confirmed" commitment level
+        let (subscriber, _id_receiver, transport_receiver) =
+            Subscriber::new_test("programNotification");
+        let sub_id = SubscriptionId::Number(0);
+        let exit = Arc::new(AtomicBool::new(false));
+        let optimistically_confirmed_bank =
+            OptimisticallyConfirmedBank::locked_from_bank_forks_root(&bank_forks);
+        let mut pending_optimistically_confirmed_banks = HashSet::new();
+
+        let subscriptions = Arc::new(RpcSubscriptions::new(
+            &exit,
+            bank_forks.clone(),
+            Arc::new(RwLock::new(BlockCommitmentCache::new_for_tests_with_slots(
+                1, 1,
+            ))),
+            optimistically_confirmed_bank.clone(),
+        ));
+        subscriptions.add_program_subscription(
+            stake::program::id(),
+            Some(RpcProgramAccountsConfig {
+                account_config: RpcAccountInfoConfig {
+                    commitment: Some(CommitmentConfig::confirmed()),
+                    ..RpcAccountInfoConfig::default()
+                },
+                ..RpcProgramAccountsConfig::default()
+            }),
+            sub_id,
+            subscriber,
+        );
+
+        assert!(subscriptions
+            .subscriptions
+            .gossip_program_subscriptions
+            .read()
+            .unwrap()
+            .contains_key(&stake::program::id()));
+
+        let mut highest_confirmed_slot: Slot = 0;
+        let mut last_notified_confirmed_slot: Slot = 0;
+        // Optimistically notifying slot 3 without notifying slot 1 and 2, bank3 is not in the bankforks, we do not
+        // expect to see any RPC notifications.
+        OptimisticallyConfirmedBankTracker::process_notification(
+            BankNotification::OptimisticallyConfirmed(3),
+            &bank_forks,
+            &optimistically_confirmed_bank,
+            &subscriptions,
+            &mut pending_optimistically_confirmed_banks,
+            &mut last_notified_confirmed_slot,
+            &mut highest_confirmed_slot,
+        );
+
+        // The following should panic
+        let (_response, _transport_receiver) = robust_poll_or_panic(transport_receiver);
+    }
+
+    #[test]
+    #[serial]
+    fn test_check_program_subscribe_for_missing_optimistically_confirmed_slot_with_no_banks() {
+        // Testing if we can get the pubsub notification if a slot does not
+        // receive OptimisticallyConfirmed but its descendant slot get the confirmed
+        // notification. It differs from the test_check_program_subscribe_for_missing_optimistically_confirmed_slot
+        // test in that when the descendant get confirmed, the descendant does not have a bank yet.
+        let GenesisConfigInfo {
+            genesis_config,
+            mint_keypair,
+            ..
+        } = create_genesis_config(100);
+        let bank = Bank::new(&genesis_config);
+        bank.lazy_rent_collection.store(true, Relaxed);
+
+        let blockhash = bank.last_blockhash();
+        let bank_forks = Arc::new(RwLock::new(BankForks::new(bank)));
+
+        let bank0 = bank_forks.read().unwrap().get(0).unwrap().clone();
+        let bank1 = Bank::new_from_parent(&bank0, &Pubkey::default(), 1);
+        bank_forks.write().unwrap().insert(bank1);
+        let bank1 = bank_forks.read().unwrap().get(1).unwrap().clone();
+
+        // add account for alice and process the transaction at bank1
+        let alice = Keypair::new();
+        let tx = system_transaction::create_account(
+            &mint_keypair,
+            &alice,
+            blockhash,
+            1,
+            16,
+            &stake::program::id(),
+        );
+
+        bank1.process_transaction(&tx).unwrap();
+
+        let bank2 = Bank::new_from_parent(&bank1, &Pubkey::default(), 2);
+        bank_forks.write().unwrap().insert(bank2);
+
+        // add account for bob and process the transaction at bank2
+        let bob = Keypair::new();
+        let tx = system_transaction::create_account(
+            &mint_keypair,
+            &bob,
+            blockhash,
+            2,
+            16,
+            &stake::program::id(),
+        );
+        let bank2 = bank_forks.read().unwrap().get(2).unwrap().clone();
+
+        bank2.process_transaction(&tx).unwrap();
+
+        // now add programSubscribe at the "confirmed" commitment level
+        let (subscriber, _id_receiver, transport_receiver) =
+            Subscriber::new_test("programNotification");
+        let sub_id = SubscriptionId::Number(0);
+        let exit = Arc::new(AtomicBool::new(false));
+        let optimistically_confirmed_bank =
+            OptimisticallyConfirmedBank::locked_from_bank_forks_root(&bank_forks);
+        let mut pending_optimistically_confirmed_banks = HashSet::new();
+
+        let subscriptions = Arc::new(RpcSubscriptions::new(
+            &exit,
+            bank_forks.clone(),
+            Arc::new(RwLock::new(BlockCommitmentCache::new_for_tests_with_slots(
+                1, 1,
+            ))),
+            optimistically_confirmed_bank.clone(),
+        ));
+        subscriptions.add_program_subscription(
+            stake::program::id(),
+            Some(RpcProgramAccountsConfig {
+                account_config: RpcAccountInfoConfig {
+                    commitment: Some(CommitmentConfig::confirmed()),
+                    ..RpcAccountInfoConfig::default()
+                },
+                ..RpcProgramAccountsConfig::default()
+            }),
+            sub_id.clone(),
+            subscriber,
+        );
+
+        assert!(subscriptions
+            .subscriptions
+            .gossip_program_subscriptions
+            .read()
+            .unwrap()
+            .contains_key(&stake::program::id()));
+
+        let mut highest_confirmed_slot: Slot = 0;
+        let mut last_notified_confirmed_slot: Slot = 0;
+        // Optimistically notifying slot 3 without notifying slot 1 and 2, bank3 is not in the bankforks, we expect
+        // to see transaction for alice and bob to be notified only when bank3 is added to the fork and
+        // frozen. The notifications should be in the increasing order of the slot.
+        OptimisticallyConfirmedBankTracker::process_notification(
+            BankNotification::OptimisticallyConfirmed(3),
+            &bank_forks,
+            &optimistically_confirmed_bank,
+            &subscriptions,
+            &mut pending_optimistically_confirmed_banks,
+            &mut last_notified_confirmed_slot,
+            &mut highest_confirmed_slot,
+        );
+
+        // a closure to reduce code duplications in building expected responses:
+        let build_expected_resp = |slot: Slot, lamports: u64, pubkey: &str, subscription: i32| {
+            json!({
+               "jsonrpc": "2.0",
+               "method": "programNotification",
+               "params": {
+                   "result": {
+                       "context": { "slot": slot },
+                       "value": {
+                           "account": {
+                              "data": "1111111111111111",
+                              "executable": false,
+                              "lamports": lamports,
+                              "owner": "Stake11111111111111111111111111111111111111",
+                              "rentEpoch": 0,
+                           },
+                           "pubkey": pubkey,
+                        },
+                   },
+                   "subscription": subscription,
+               }
+            })
+        };
+
+        let bank3 = Bank::new_from_parent(&bank2, &Pubkey::default(), 3);
+        bank_forks.write().unwrap().insert(bank3);
+
+        // add account for joe and process the transaction at bank3
+        let joe = Keypair::new();
+        let tx = system_transaction::create_account(
+            &mint_keypair,
+            &joe,
+            blockhash,
+            3,
+            16,
+            &stake::program::id(),
+        );
+        let bank3 = bank_forks.read().unwrap().get(3).unwrap().clone();
+
+        bank3.process_transaction(&tx).unwrap();
+        bank3.freeze();
+        OptimisticallyConfirmedBankTracker::process_notification(
+            BankNotification::Frozen(bank3),
+            &bank_forks,
+            &optimistically_confirmed_bank,
+            &subscriptions,
+            &mut pending_optimistically_confirmed_banks,
+            &mut last_notified_confirmed_slot,
+            &mut highest_confirmed_slot,
+        );
+
+        let (response, transport_receiver) = robust_poll_or_panic(transport_receiver);
+        let expected = build_expected_resp(1, 1, &alice.pubkey().to_string(), 0);
+        assert_eq!(serde_json::to_string(&expected).unwrap(), response);
+
+        let (response, transport_receiver) = robust_poll_or_panic(transport_receiver);
+        let expected = build_expected_resp(2, 2, &bob.pubkey().to_string(), 0);
+        assert_eq!(serde_json::to_string(&expected).unwrap(), response);
+
+        let (response, _) = robust_poll_or_panic(transport_receiver);
+        let expected = build_expected_resp(3, 3, &joe.pubkey().to_string(), 0);
+        assert_eq!(serde_json::to_string(&expected).unwrap(), response);
+        subscriptions.remove_program_subscription(&sub_id);
     }
 
     #[test]
@@ -2044,7 +2477,7 @@ pub(crate) mod tests {
             blockhash,
             1,
             16,
-            &solana_stake_program::id(),
+            &stake::program::id(),
         );
 
         // Add the transaction to the 1st bank and then freeze the bank
@@ -2062,21 +2495,28 @@ pub(crate) mod tests {
             .unwrap();
 
         // First, notify the unfrozen bank first to queue pending notification
+        let mut highest_confirmed_slot: Slot = 0;
+        let mut last_notified_confirmed_slot: Slot = 0;
         OptimisticallyConfirmedBankTracker::process_notification(
             BankNotification::OptimisticallyConfirmed(2),
             &bank_forks,
             &optimistically_confirmed_bank,
             &subscriptions,
             &mut pending_optimistically_confirmed_banks,
+            &mut last_notified_confirmed_slot,
+            &mut highest_confirmed_slot,
         );
 
         // Now, notify the frozen bank and ensure its notifications are processed
+        highest_confirmed_slot = 0;
         OptimisticallyConfirmedBankTracker::process_notification(
             BankNotification::OptimisticallyConfirmed(1),
             &bank_forks,
             &optimistically_confirmed_bank,
             &subscriptions,
             &mut pending_optimistically_confirmed_banks,
+            &mut last_notified_confirmed_slot,
+            &mut highest_confirmed_slot,
         );
 
         let (response, _) = robust_poll_or_panic(transport_receiver0);
@@ -2113,12 +2553,16 @@ pub(crate) mod tests {
         );
 
         let bank2 = bank_forks.read().unwrap().get(2).unwrap().clone();
+        bank2.freeze();
+        highest_confirmed_slot = 0;
         OptimisticallyConfirmedBankTracker::process_notification(
             BankNotification::Frozen(bank2),
             &bank_forks,
             &optimistically_confirmed_bank,
             &subscriptions,
             &mut pending_optimistically_confirmed_banks,
+            &mut last_notified_confirmed_slot,
+            &mut highest_confirmed_slot,
         );
         let (response, _) = robust_poll_or_panic(transport_receiver1);
         let expected = json!({
diff --git a/core/src/send_transaction_service.rs b/rpc/src/send_transaction_service.rs
similarity index 90%
rename from core/src/send_transaction_service.rs
rename to rpc/src/send_transaction_service.rs
index 335f8e46a54aa3..cd3630ec3b9bf6 100644
--- a/core/src/send_transaction_service.rs
+++ b/rpc/src/send_transaction_service.rs
@@ -1,26 +1,24 @@
 // TODO: Merge this implementation with the one at `banks-server/src/send_transaction_service.rs`
-use crate::poh_recorder::PohRecorder;
-use log::*;
-use solana_gossip::cluster_info::ClusterInfo;
-use solana_metrics::{datapoint_warn, inc_new_counter_info};
-use solana_runtime::{bank::Bank, bank_forks::BankForks};
-use solana_sdk::{
-    clock::{Slot, NUM_CONSECUTIVE_LEADER_SLOTS},
-    hash::Hash,
-    nonce_account,
-    pubkey::Pubkey,
-    signature::Signature,
-};
-use std::sync::Mutex;
-use std::{
-    collections::HashMap,
-    net::{SocketAddr, UdpSocket},
-    sync::{
-        mpsc::{Receiver, RecvTimeoutError},
-        Arc, RwLock,
+use {
+    log::*,
+    solana_gossip::cluster_info::ClusterInfo,
+    solana_metrics::{datapoint_warn, inc_new_counter_info},
+    solana_poh::poh_recorder::PohRecorder,
+    solana_runtime::{bank::Bank, bank_forks::BankForks},
+    solana_sdk::{
+        clock::NUM_CONSECUTIVE_LEADER_SLOTS, hash::Hash, nonce_account, pubkey::Pubkey,
+        signature::Signature,
+    },
+    std::{
+        collections::HashMap,
+        net::{SocketAddr, UdpSocket},
+        sync::{
+            mpsc::{Receiver, RecvTimeoutError},
+            Arc, Mutex, RwLock,
+        },
+        thread::{self, Builder, JoinHandle},
+        time::{Duration, Instant},
     },
-    thread::{self, Builder, JoinHandle},
-    time::{Duration, Instant},
 };
 
 /// Maximum size of the transaction queue
@@ -33,7 +31,7 @@ pub struct SendTransactionService {
 pub struct TransactionInfo {
     pub signature: Signature,
     pub wire_transaction: Vec<u8>,
-    pub last_valid_slot: Slot,
+    pub last_valid_block_height: u64,
     pub durable_nonce_info: Option<(Pubkey, Hash)>,
 }
 
@@ -41,13 +39,13 @@ impl TransactionInfo {
     pub fn new(
         signature: Signature,
         wire_transaction: Vec<u8>,
-        last_valid_slot: Slot,
+        last_valid_block_height: u64,
         durable_nonce_info: Option<(Pubkey, Hash)>,
     ) -> Self {
         Self {
             signature,
             wire_transaction,
-            last_valid_slot,
+            last_valid_block_height,
             durable_nonce_info,
         }
     }
@@ -243,7 +241,7 @@ impl SendTransactionService {
                     return false;
                 }
             }
-            if transaction_info.last_valid_slot < root_bank.slot() {
+            if transaction_info.last_valid_block_height < root_bank.block_height() {
                 info!("Dropping expired transaction: {}", signature);
                 result.expired += 1;
                 inc_new_counter_info!("send_transaction_service-expired", 1);
@@ -268,10 +266,10 @@ impl SendTransactionService {
                                 address_list
                             }
                         })
-                        .unwrap_or_else(|| vec![&tpu_address]);
+                        .unwrap_or_else(|| vec![tpu_address]);
                     for address in addresses {
                         Self::send_transaction(
-                            &send_socket,
+                            send_socket,
                             address,
                             &transaction_info.wire_transaction,
                         );
@@ -312,26 +310,29 @@ impl SendTransactionService {
 
 #[cfg(test)]
 mod test {
-    use super::*;
-    use solana_gossip::contact_info::ContactInfo;
-    use solana_ledger::{
-        blockstore::Blockstore, get_tmp_ledger_path, leader_schedule_cache::LeaderScheduleCache,
-    };
-    use solana_runtime::genesis_utils::{
-        create_genesis_config_with_vote_accounts, GenesisConfigInfo, ValidatorVoteKeypairs,
-    };
-    use solana_sdk::{
-        account::AccountSharedData,
-        fee_calculator::FeeCalculator,
-        genesis_config::create_genesis_config,
-        nonce,
-        poh_config::PohConfig,
-        pubkey::Pubkey,
-        signature::{Keypair, Signer},
-        system_program, system_transaction,
-        timing::timestamp,
+    use {
+        super::*,
+        solana_gossip::contact_info::ContactInfo,
+        solana_ledger::{
+            blockstore::Blockstore, get_tmp_ledger_path, leader_schedule_cache::LeaderScheduleCache,
+        },
+        solana_runtime::genesis_utils::{
+            create_genesis_config_with_vote_accounts, GenesisConfigInfo, ValidatorVoteKeypairs,
+        },
+        solana_sdk::{
+            account::AccountSharedData,
+            fee_calculator::FeeCalculator,
+            genesis_config::create_genesis_config,
+            nonce,
+            poh_config::PohConfig,
+            pubkey::Pubkey,
+            signature::{Keypair, Signer},
+            system_program, system_transaction,
+            timing::timestamp,
+        },
+        solana_streamer::socket::SocketAddrSpace,
+        std::sync::{atomic::AtomicBool, mpsc::channel},
     };
-    use std::sync::{atomic::AtomicBool, mpsc::channel};
 
     #[test]
     fn service_exit() {
@@ -387,7 +388,12 @@ mod test {
         info!("Expired transactions are dropped...");
         transactions.insert(
             Signature::default(),
-            TransactionInfo::new(Signature::default(), vec![], root_bank.slot() - 1, None),
+            TransactionInfo::new(
+                Signature::default(),
+                vec![],
+                root_bank.block_height() - 1,
+                None,
+            ),
         );
         let result = SendTransactionService::process_transactions(
             &working_bank,
@@ -410,7 +416,7 @@ mod test {
         info!("Rooted transactions are dropped...");
         transactions.insert(
             rooted_signature,
-            TransactionInfo::new(rooted_signature, vec![], working_bank.slot(), None),
+            TransactionInfo::new(rooted_signature, vec![], working_bank.block_height(), None),
         );
         let result = SendTransactionService::process_transactions(
             &working_bank,
@@ -433,7 +439,7 @@ mod test {
         info!("Failed transactions are dropped...");
         transactions.insert(
             failed_signature,
-            TransactionInfo::new(failed_signature, vec![], working_bank.slot(), None),
+            TransactionInfo::new(failed_signature, vec![], working_bank.block_height(), None),
         );
         let result = SendTransactionService::process_transactions(
             &working_bank,
@@ -456,7 +462,12 @@ mod test {
         info!("Non-rooted transactions are kept...");
         transactions.insert(
             non_rooted_signature,
-            TransactionInfo::new(non_rooted_signature, vec![], working_bank.slot(), None),
+            TransactionInfo::new(
+                non_rooted_signature,
+                vec![],
+                working_bank.block_height(),
+                None,
+            ),
         );
         let result = SendTransactionService::process_transactions(
             &working_bank,
@@ -480,7 +491,12 @@ mod test {
         info!("Unknown transactions are retried...");
         transactions.insert(
             Signature::default(),
-            TransactionInfo::new(Signature::default(), vec![], working_bank.slot(), None),
+            TransactionInfo::new(
+                Signature::default(),
+                vec![],
+                working_bank.block_height(),
+                None,
+            ),
         );
         let result = SendTransactionService::process_transactions(
             &working_bank,
@@ -538,7 +554,7 @@ mod test {
             .transfer(2, &mint_keypair, &mint_keypair.pubkey())
             .unwrap();
 
-        let last_valid_slot = working_bank.slot() + 300;
+        let last_valid_block_height = working_bank.block_height() + 300;
 
         let failed_signature = {
             let blockhash = working_bank.last_blockhash();
@@ -557,7 +573,7 @@ mod test {
             TransactionInfo::new(
                 rooted_signature,
                 vec![],
-                last_valid_slot,
+                last_valid_block_height,
                 Some((nonce_address, durable_nonce)),
             ),
         );
@@ -584,7 +600,7 @@ mod test {
             TransactionInfo::new(
                 rooted_signature,
                 vec![],
-                last_valid_slot,
+                last_valid_block_height,
                 Some((nonce_address, Hash::new_unique())),
             ),
         );
@@ -613,7 +629,7 @@ mod test {
             TransactionInfo::new(
                 Signature::default(),
                 vec![],
-                last_valid_slot,
+                last_valid_block_height,
                 Some((nonce_address, Hash::new_unique())),
             ),
         );
@@ -634,13 +650,13 @@ mod test {
                 ..ProcessTransactionsResult::default()
             }
         );
-        // ... or last_valid_slot timeout has passed
+        // ... or last_valid_block_height timeout has passed
         transactions.insert(
             Signature::default(),
             TransactionInfo::new(
                 Signature::default(),
                 vec![],
-                root_bank.slot() - 1,
+                root_bank.block_height() - 1,
                 Some((nonce_address, durable_nonce)),
             ),
         );
@@ -668,7 +684,7 @@ mod test {
             TransactionInfo::new(
                 failed_signature,
                 vec![],
-                last_valid_slot,
+                last_valid_block_height,
                 Some((nonce_address, Hash::new_unique())), // runtime should advance nonce on failed transactions
             ),
         );
@@ -696,7 +712,7 @@ mod test {
             TransactionInfo::new(
                 non_rooted_signature,
                 vec![],
-                last_valid_slot,
+                last_valid_block_height,
                 Some((nonce_address, Hash::new_unique())), // runtime advances nonce when transaction lands
             ),
         );
@@ -725,7 +741,7 @@ mod test {
             TransactionInfo::new(
                 Signature::default(),
                 vec![],
-                last_valid_slot,
+                last_valid_block_height,
                 Some((nonce_address, durable_nonce)),
             ),
         );
@@ -818,6 +834,7 @@ mod test {
             let cluster_info = Arc::new(ClusterInfo::new(
                 ContactInfo::new_localhost(&node_keypair.pubkey(), timestamp()),
                 node_keypair,
+                SocketAddrSpace::Unspecified,
             ));
 
             let validator0_socket = SocketAddr::from(([127, 0, 0, 1], 1111));
diff --git a/core/src/transaction_status_service.rs b/rpc/src/transaction_status_service.rs
similarity index 84%
rename from core/src/transaction_status_service.rs
rename to rpc/src/transaction_status_service.rs
index 148648b39f13c0..ce246961b547c9 100644
--- a/core/src/transaction_status_service.rs
+++ b/rpc/src/transaction_status_service.rs
@@ -1,20 +1,22 @@
-use crossbeam_channel::{Receiver, RecvTimeoutError};
-use itertools::izip;
-use solana_ledger::{
-    blockstore::Blockstore,
-    blockstore_processor::{TransactionStatusBatch, TransactionStatusMessage},
-};
-use solana_runtime::bank::{
-    Bank, InnerInstructionsList, NonceRollbackInfo, TransactionLogMessages,
-};
-use solana_transaction_status::{InnerInstructions, Reward, TransactionStatusMeta};
-use std::{
-    sync::{
-        atomic::{AtomicBool, AtomicU64, Ordering},
-        Arc,
+use {
+    crossbeam_channel::{Receiver, RecvTimeoutError},
+    itertools::izip,
+    solana_ledger::{
+        blockstore::Blockstore,
+        blockstore_processor::{TransactionStatusBatch, TransactionStatusMessage},
+    },
+    solana_runtime::bank::{
+        Bank, InnerInstructionsList, NonceRollbackInfo, TransactionLogMessages,
+    },
+    solana_transaction_status::{InnerInstructions, Reward, TransactionStatusMeta},
+    std::{
+        sync::{
+            atomic::{AtomicBool, AtomicU64, Ordering},
+            Arc,
+        },
+        thread::{self, Builder, JoinHandle},
+        time::Duration,
     },
-    thread::{self, Builder, JoinHandle},
-    time::Duration,
 };
 
 pub struct TransactionStatusService {
@@ -72,12 +74,13 @@ impl TransactionStatusService {
                 } else {
                     Box::new(std::iter::repeat_with(|| None))
                 };
-                let transaction_logs_iter: Box<dyn Iterator<Item = TransactionLogMessages>> =
-                    if let Some(transaction_logs) = transaction_logs {
-                        Box::new(transaction_logs.into_iter())
-                    } else {
-                        Box::new(std::iter::repeat_with(Vec::new))
-                    };
+                let transaction_logs_iter: Box<
+                    dyn Iterator<Item = Option<TransactionLogMessages>>,
+                > = if let Some(transaction_logs) = transaction_logs {
+                    Box::new(transaction_logs.into_iter())
+                } else {
+                    Box::new(std::iter::repeat_with(|| None))
+                };
                 for (
                     transaction,
                     (status, nonce_rollback),
@@ -107,9 +110,8 @@ impl TransactionStatusService {
                             })
                             .expect("FeeCalculator must exist");
                         let fee = fee_calculator.calculate_fee(transaction.message());
-                        let (writable_keys, readonly_keys) = transaction
-                            .message
-                            .get_account_keys_by_lock_type(bank.demote_sysvar_write_locks());
+                        let (writable_keys, readonly_keys) =
+                            transaction.message.get_account_keys_by_lock_type();
 
                         let inner_instructions = inner_instructions.map(|inner_instructions| {
                             inner_instructions
@@ -123,7 +125,6 @@ impl TransactionStatusService {
                                 .collect()
                         });
 
-                        let log_messages = Some(log_messages);
                         let pre_token_balances = Some(pre_token_balances);
                         let post_token_balances = Some(post_token_balances);
                         let rewards = Some(
@@ -135,6 +136,7 @@ impl TransactionStatusService {
                                     lamports: reward_info.lamports,
                                     post_balance: reward_info.post_balance,
                                     reward_type: Some(reward_info.reward_type),
+                                    commission: reward_info.commission,
                                 })
                                 .collect(),
                         );
diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml
index 8c97c19b2f4d0e..355bcafa5587ad 100644
--- a/runtime/Cargo.toml
+++ b/runtime/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "solana-runtime"
-version = "1.7.0"
+version = "1.7.11"
 description = "Solana runtime"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -30,25 +30,25 @@ memmap2 = "0.1.0"
 num-derive = { version = "0.3" }
 num-traits = { version = "0.2" }
 num_cpus = "1.13.0"
-ouroboros = "0.5.1"
+ouroboros = "0.10.0"
 rand = "0.7.0"
 rayon = "1.5.0"
 regex = "1.3.9"
 serde = { version = "1.0.122", features = ["rc"] }
 serde_derive = "1.0.103"
-solana-config-program = { path = "../programs/config", version = "=1.7.0" }
-solana-frozen-abi = { path = "../frozen-abi", version = "=1.7.0" }
-solana-frozen-abi-macro = { path = "../frozen-abi/macro", version = "=1.7.0" }
-solana-logger = { path = "../logger", version = "=1.7.0" }
-solana-measure = { path = "../measure", version = "=1.7.0" }
-solana-metrics = { path = "../metrics", version = "=1.7.0" }
-solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "=1.7.0" }
-solana-sdk = { path = "../sdk", version = "=1.7.0" }
-solana-stake-program = { path = "../programs/stake", version = "=1.7.0" }
-solana-vote-program = { path = "../programs/vote", version = "=1.7.0" }
-solana-secp256k1-program = { path = "../programs/secp256k1", version = "=1.7.0" }
+solana-config-program = { path = "../programs/config", version = "=1.7.11" }
+solana-frozen-abi = { path = "../frozen-abi", version = "=1.7.11" }
+solana-frozen-abi-macro = { path = "../frozen-abi/macro", version = "=1.7.11" }
+solana-logger = { path = "../logger", version = "=1.7.11" }
+solana-measure = { path = "../measure", version = "=1.7.11" }
+solana-metrics = { path = "../metrics", version = "=1.7.11" }
+solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "=1.7.11" }
+solana-sdk = { path = "../sdk", version = "=1.7.11" }
+solana-secp256k1-program = { path = "../programs/secp256k1", version = "=1.7.11" }
+solana-stake-program = { path = "../programs/stake", version = "=1.7.11" }
+solana-vote-program = { path = "../programs/vote", version = "=1.7.11" }
 symlink = "0.1.0"
-tar = "0.4.28"
+tar = "0.4.37"
 tempfile = "3.1.0"
 thiserror = "1.0"
 zstd = "0.5.1"
@@ -59,7 +59,7 @@ name = "solana_runtime"
 
 [dev-dependencies]
 assert_matches = "1.3.0"
-solana-noop-program = { path = "../programs/noop", version = "=1.7.0" }
+solana-noop-program = { path = "../programs/noop", version = "=1.7.11" }
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
diff --git a/runtime/benches/accounts.rs b/runtime/benches/accounts.rs
index 373301dd715987..364707dddefa2c 100644
--- a/runtime/benches/accounts.rs
+++ b/runtime/benches/accounts.rs
@@ -8,6 +8,7 @@ use rand::Rng;
 use rayon::iter::{IntoParallelRefIterator, ParallelIterator};
 use solana_runtime::{
     accounts::{create_test_accounts, AccountAddressFilter, Accounts},
+    accounts_db::AccountShrinkThreshold,
     accounts_index::AccountSecondaryIndexes,
     ancestors::Ancestors,
     bank::*,
@@ -59,6 +60,8 @@ fn test_accounts_create(bencher: &mut Bencher) {
         None,
         AccountSecondaryIndexes::default(),
         false,
+        AccountShrinkThreshold::default(),
+        false,
     );
     bencher.iter(|| {
         let mut pubkeys: Vec<Pubkey> = vec![];
@@ -78,6 +81,8 @@ fn test_accounts_squash(bencher: &mut Bencher) {
         None,
         AccountSecondaryIndexes::default(),
         false,
+        AccountShrinkThreshold::default(),
+        false,
     ));
     let mut pubkeys: Vec<Pubkey> = vec![];
     deposit_many(&prev_bank, &mut pubkeys, 250_000).unwrap();
@@ -103,6 +108,7 @@ fn test_accounts_hash_bank_hash(bencher: &mut Bencher) {
         &ClusterType::Development,
         AccountSecondaryIndexes::default(),
         false,
+        AccountShrinkThreshold::default(),
     );
     let mut pubkeys: Vec<Pubkey> = vec![];
     let num_accounts = 60_000;
@@ -110,7 +116,15 @@ fn test_accounts_hash_bank_hash(bencher: &mut Bencher) {
     create_test_accounts(&accounts, &mut pubkeys, num_accounts, slot);
     let ancestors = Ancestors::from(vec![0]);
     let (_, total_lamports) = accounts.accounts_db.update_accounts_hash(0, &ancestors);
-    bencher.iter(|| assert!(accounts.verify_bank_hash_and_lamports(0, &ancestors, total_lamports)));
+    let test_hash_calculation = false;
+    bencher.iter(|| {
+        assert!(accounts.verify_bank_hash_and_lamports(
+            0,
+            &ancestors,
+            total_lamports,
+            test_hash_calculation
+        ))
+    });
 }
 
 #[bench]
@@ -121,6 +135,7 @@ fn test_update_accounts_hash(bencher: &mut Bencher) {
         &ClusterType::Development,
         AccountSecondaryIndexes::default(),
         false,
+        AccountShrinkThreshold::default(),
     );
     let mut pubkeys: Vec<Pubkey> = vec![];
     create_test_accounts(&accounts, &mut pubkeys, 50_000, 0);
@@ -138,6 +153,7 @@ fn test_accounts_delta_hash(bencher: &mut Bencher) {
         &ClusterType::Development,
         AccountSecondaryIndexes::default(),
         false,
+        AccountShrinkThreshold::default(),
     );
     let mut pubkeys: Vec<Pubkey> = vec![];
     create_test_accounts(&accounts, &mut pubkeys, 100_000, 0);
@@ -154,6 +170,7 @@ fn bench_delete_dependencies(bencher: &mut Bencher) {
         &ClusterType::Development,
         AccountSecondaryIndexes::default(),
         false,
+        AccountShrinkThreshold::default(),
     );
     let mut old_pubkey = Pubkey::default();
     let zero_account = AccountSharedData::new(0, 0, AccountSharedData::default().owner());
@@ -187,6 +204,7 @@ fn store_accounts_with_possible_contention<F: 'static>(
         &ClusterType::Development,
         AccountSecondaryIndexes::default(),
         false,
+        AccountShrinkThreshold::default(),
     ));
     let num_keys = 1000;
     let slot = 0;
@@ -222,7 +240,7 @@ fn store_accounts_with_possible_contention<F: 'static>(
             // Write to a different slot than the one being read from. Because
             // there's a new account pubkey being written to every time, will
             // compete for the accounts index lock on every store
-            accounts.store_slow_uncached(slot + 1, &solana_sdk::pubkey::new_rand(), &account);
+            accounts.store_slow_uncached(slot + 1, &solana_sdk::pubkey::new_rand(), account);
         }
     })
 }
@@ -252,7 +270,13 @@ fn bench_concurrent_read_write(bencher: &mut Bencher) {
 fn bench_concurrent_scan_write(bencher: &mut Bencher) {
     store_accounts_with_possible_contention("concurrent_scan_write", bencher, |accounts, _| loop {
         test::black_box(
-            accounts.load_by_program(&Ancestors::default(), AccountSharedData::default().owner()),
+            accounts
+                .load_by_program(
+                    &Ancestors::default(),
+                    0,
+                    AccountSharedData::default().owner(),
+                )
+                .unwrap(),
         );
     })
 }
@@ -316,6 +340,7 @@ fn setup_bench_dashmap_iter() -> (Arc<Accounts>, DashMap<Pubkey, (AccountSharedD
         &ClusterType::Development,
         AccountSecondaryIndexes::default(),
         false,
+        AccountShrinkThreshold::default(),
     ));
 
     let dashmap = DashMap::new();
@@ -370,6 +395,7 @@ fn bench_load_largest_accounts(b: &mut Bencher) {
         &ClusterType::Development,
         AccountSecondaryIndexes::default(),
         false,
+        AccountShrinkThreshold::default(),
     );
     let mut rng = rand::thread_rng();
     for _ in 0..10_000 {
@@ -379,9 +405,11 @@ fn bench_load_largest_accounts(b: &mut Bencher) {
         accounts.store_slow_uncached(0, &pubkey, &account);
     }
     let ancestors = Ancestors::from(vec![0]);
+    let bank_id = 0;
     b.iter(|| {
         accounts.load_largest_accounts(
             &ancestors,
+            bank_id,
             20,
             &HashSet::new(),
             AccountAddressFilter::Exclude,
diff --git a/runtime/benches/bank.rs b/runtime/benches/bank.rs
index e739050d0caeb9..22f7b48c067624 100644
--- a/runtime/benches/bank.rs
+++ b/runtime/benches/bank.rs
@@ -50,7 +50,7 @@ pub fn create_builtin_transactions(
             // Seed the signer account
             let rando0 = Keypair::new();
             bank_client
-                .transfer_and_confirm(10_000, &mint_keypair, &rando0.pubkey())
+                .transfer_and_confirm(10_000, mint_keypair, &rando0.pubkey())
                 .unwrap_or_else(|_| panic!("{}:{}", line!(), file!()));
 
             let instruction = create_invoke_instruction(rando0.pubkey(), program_id, &1u8);
@@ -72,7 +72,7 @@ pub fn create_native_loader_transactions(
             // Seed the signer account©41
             let rando0 = Keypair::new();
             bank_client
-                .transfer_and_confirm(10_000, &mint_keypair, &rando0.pubkey())
+                .transfer_and_confirm(10_000, mint_keypair, &rando0.pubkey())
                 .unwrap_or_else(|_| panic!("{}:{}", line!(), file!()));
 
             let instruction = create_invoke_instruction(rando0.pubkey(), program_id, &1u8);
@@ -94,7 +94,7 @@ fn async_bencher(bank: &Arc<Bank>, bank_client: &BankClient, transactions: &[Tra
     }
     for _ in 0..1_000_000_000_u64 {
         if bank
-            .get_signature_status(&transactions.last().unwrap().signatures.get(0).unwrap())
+            .get_signature_status(transactions.last().unwrap().signatures.get(0).unwrap())
             .is_some()
         {
             break;
@@ -102,13 +102,13 @@ fn async_bencher(bank: &Arc<Bank>, bank_client: &BankClient, transactions: &[Tra
         sleep(Duration::from_nanos(1));
     }
     if bank
-        .get_signature_status(&transactions.last().unwrap().signatures.get(0).unwrap())
+        .get_signature_status(transactions.last().unwrap().signatures.get(0).unwrap())
         .unwrap()
         .is_err()
     {
         error!(
             "transaction failed: {:?}",
-            bank.get_signature_status(&transactions.last().unwrap().signatures.get(0).unwrap())
+            bank.get_signature_status(transactions.last().unwrap().signatures.get(0).unwrap())
                 .unwrap()
         );
         panic!();
diff --git a/runtime/benches/message_processor.rs b/runtime/benches/message_processor.rs
index d36eb865a975f1..1a3665607fb954 100644
--- a/runtime/benches/message_processor.rs
+++ b/runtime/benches/message_processor.rs
@@ -26,6 +26,7 @@ fn bench_verify_account_changes_data(bencher: &mut Bencher) {
             &post,
             &mut ExecuteDetailsTimings::default(),
             false,
+            true,
         ),
         Ok(())
     );
@@ -39,6 +40,7 @@ fn bench_verify_account_changes_data(bencher: &mut Bencher) {
             &post,
             &mut ExecuteDetailsTimings::default(),
             false,
+            true,
         )
         .unwrap();
     });
@@ -63,6 +65,7 @@ fn bench_verify_account_changes_data(bencher: &mut Bencher) {
             &post,
             &mut ExecuteDetailsTimings::default(),
             false,
+            true,
         )
         .unwrap();
     });
diff --git a/runtime/src/accounts.rs b/runtime/src/accounts.rs
index b61633429db846..8ed206eaf19c10 100644
--- a/runtime/src/accounts.rs
+++ b/runtime/src/accounts.rs
@@ -1,8 +1,9 @@
 use crate::{
     accounts_db::{
-        AccountsDb, BankHashInfo, ErrorCounters, LoadHint, LoadedAccount, ScanStorageResult,
+        AccountShrinkThreshold, AccountsDb, BankHashInfo, ErrorCounters, LoadHint, LoadedAccount,
+        ScanStorageResult,
     },
-    accounts_index::{AccountSecondaryIndexes, IndexKey},
+    accounts_index::{AccountSecondaryIndexes, IndexKey, ScanResult},
     ancestors::Ancestors,
     bank::{
         NonceRollbackFull, NonceRollbackInfo, RentDebits, TransactionCheckResult,
@@ -22,13 +23,14 @@ use solana_sdk::{
     account::{Account, AccountSharedData, ReadableAccount, WritableAccount},
     account_utils::StateMut,
     bpf_loader_upgradeable::{self, UpgradeableLoaderState},
-    clock::{Slot, INITIAL_RENT_EPOCH},
+    clock::{BankId, Slot, INITIAL_RENT_EPOCH},
     feature_set::{self, FeatureSet},
-    fee_calculator::{FeeCalculator, FeeConfig},
+    fee_calculator::FeeCalculator,
     genesis_config::ClusterType,
     hash::Hash,
     message::{Message, MessageProgramIdsCache},
     native_loader, nonce,
+    nonce::NONCED_TX_MARKER_IX_INDEX,
     pubkey::Pubkey,
     transaction::Result,
     transaction::{Transaction, TransactionError},
@@ -96,14 +98,12 @@ pub struct Accounts {
 }
 
 // for the load instructions
-pub type TransactionAccounts = Vec<AccountSharedData>;
-pub type TransactionAccountDeps = Vec<(Pubkey, AccountSharedData)>;
+pub type TransactionAccounts = Vec<(Pubkey, AccountSharedData)>;
 pub type TransactionRent = u64;
 pub type TransactionLoaders = Vec<Vec<(Pubkey, AccountSharedData)>>;
 #[derive(PartialEq, Debug, Clone)]
 pub struct LoadedTransaction {
     pub accounts: TransactionAccounts,
-    pub account_deps: TransactionAccountDeps,
     pub loaders: TransactionLoaders,
     pub rent: TransactionRent,
     pub rent_debits: RentDebits,
@@ -117,12 +117,17 @@ pub enum AccountAddressFilter {
 }
 
 impl Accounts {
-    pub fn new(paths: Vec<PathBuf>, cluster_type: &ClusterType) -> Self {
+    pub fn new(
+        paths: Vec<PathBuf>,
+        cluster_type: &ClusterType,
+        shrink_ratio: AccountShrinkThreshold,
+    ) -> Self {
         Self::new_with_config(
             paths,
             cluster_type,
             AccountSecondaryIndexes::default(),
             false,
+            shrink_ratio,
         )
     }
 
@@ -131,6 +136,7 @@ impl Accounts {
         cluster_type: &ClusterType,
         account_indexes: AccountSecondaryIndexes,
         caching_enabled: bool,
+        shrink_ratio: AccountShrinkThreshold,
     ) -> Self {
         Self {
             accounts_db: Arc::new(AccountsDb::new_with_config(
@@ -138,6 +144,7 @@ impl Accounts {
                 cluster_type,
                 account_indexes,
                 caching_enabled,
+                shrink_ratio,
             )),
             account_locks: Mutex::new(AccountLocks::default()),
         }
@@ -172,11 +179,8 @@ impl Accounts {
         false
     }
 
-    fn construct_instructions_account(
-        message: &Message,
-        demote_sysvar_write_locks: bool,
-    ) -> AccountSharedData {
-        let mut data = message.serialize_instructions(demote_sysvar_write_locks);
+    fn construct_instructions_account(message: &Message) -> AccountSharedData {
+        let mut data = message.serialize_instructions();
         // add room for current instruction index.
         data.resize(data.len() + 2, 0);
         AccountSharedData::from(Account {
@@ -205,10 +209,10 @@ impl Accounts {
             let mut tx_rent: TransactionRent = 0;
             let mut accounts = Vec::with_capacity(message.account_keys.len());
             let mut account_deps = Vec::with_capacity(message.account_keys.len());
-            let demote_sysvar_write_locks =
-                feature_set.is_active(&feature_set::demote_sysvar_write_locks::id());
-            let mut key_check = MessageProgramIdsCache::new(&message);
+            let mut key_check = MessageProgramIdsCache::new(message);
             let mut rent_debits = RentDebits::default();
+            let rent_for_sysvars = feature_set.is_active(&feature_set::rent_for_sysvars::id());
+
             for (i, key) in message.account_keys.iter().enumerate() {
                 let account = if key_check.is_non_loader_key(key, i) {
                     if payer_index.is_none() {
@@ -218,18 +222,21 @@ impl Accounts {
                     if solana_sdk::sysvar::instructions::check_id(key)
                         && feature_set.is_active(&feature_set::instructions_sysvar_enabled::id())
                     {
-                        if message.is_writable(i, demote_sysvar_write_locks) {
+                        if message.is_writable(i) {
                             return Err(TransactionError::InvalidAccountIndex);
                         }
-                        Self::construct_instructions_account(message, demote_sysvar_write_locks)
+                        Self::construct_instructions_account(message)
                     } else {
                         let (account, rent) = self
                             .accounts_db
                             .load_with_fixed_root(ancestors, key)
                             .map(|(mut account, _)| {
-                                if message.is_writable(i, demote_sysvar_write_locks) {
-                                    let rent_due = rent_collector
-                                        .collect_from_existing_account(&key, &mut account);
+                                if message.is_writable(i) {
+                                    let rent_due = rent_collector.collect_from_existing_account(
+                                        key,
+                                        &mut account,
+                                        rent_for_sysvars,
+                                    );
                                     (account, rent_due)
                                 } else {
                                     (account, 0)
@@ -269,36 +276,43 @@ impl Accounts {
                     // Fill in an empty account for the program slots.
                     AccountSharedData::default()
                 };
-                accounts.push(account);
+                accounts.push((*key, account));
             }
             debug_assert_eq!(accounts.len(), message.account_keys.len());
+            // Appends the account_deps at the end of the accounts,
+            // this way they can be accessed in a uniform way.
+            // At places where only the accounts are needed,
+            // the account_deps are truncated using e.g:
+            // accounts.iter().take(message.account_keys.len())
+            accounts.append(&mut account_deps);
 
             if let Some(payer_index) = payer_index {
                 if payer_index != 0 {
                     warn!("Payer index should be 0! {:?}", tx);
                 }
-                if accounts[payer_index].lamports() == 0 {
+                let payer_account = &mut accounts[payer_index].1;
+                if payer_account.lamports() == 0 {
                     error_counters.account_not_found += 1;
                     Err(TransactionError::AccountNotFound)
                 } else {
-                    let min_balance = match get_system_account_kind(&accounts[payer_index])
-                        .ok_or_else(|| {
+                    let min_balance =
+                        match get_system_account_kind(payer_account).ok_or_else(|| {
                             error_counters.invalid_account_for_fee += 1;
                             TransactionError::InvalidAccountForFee
                         })? {
-                        SystemAccountKind::System => 0,
-                        SystemAccountKind::Nonce => {
-                            // Should we ever allow a fees charge to zero a nonce account's
-                            // balance. The state MUST be set to uninitialized in that case
-                            rent_collector.rent.minimum_balance(nonce::State::size())
-                        }
-                    };
+                            SystemAccountKind::System => 0,
+                            SystemAccountKind::Nonce => {
+                                // Should we ever allow a fees charge to zero a nonce account's
+                                // balance. The state MUST be set to uninitialized in that case
+                                rent_collector.rent.minimum_balance(nonce::State::size())
+                            }
+                        };
 
-                    if accounts[payer_index].lamports() < fee + min_balance {
+                    if payer_account.lamports() < fee + min_balance {
                         error_counters.insufficient_funds += 1;
                         Err(TransactionError::InsufficientFundsForFee)
                     } else {
-                        accounts[payer_index]
+                        payer_account
                             .checked_sub_lamports(fee)
                             .map_err(|_| TransactionError::InsufficientFundsForFee)?;
 
@@ -321,7 +335,6 @@ impl Accounts {
                             .collect::<Result<TransactionLoaders>>()?;
                         Ok(LoadedTransaction {
                             accounts,
-                            account_deps,
                             loaders,
                             rent: tx_rent,
                             rent_debits,
@@ -413,10 +426,6 @@ impl Accounts {
         rent_collector: &RentCollector,
         feature_set: &FeatureSet,
     ) -> Vec<TransactionLoadResult> {
-        let fee_config = FeeConfig {
-            secp256k1_program_enabled: feature_set
-                .is_active(&feature_set::secp256k1_program_enabled::id()),
-        };
         txs.zip(lock_results)
             .map(|etx| match etx {
                 (tx, (Ok(()), nonce_rollback)) => {
@@ -429,7 +438,7 @@ impl Accounts {
                                 .cloned()
                         });
                     let fee = if let Some(fee_calculator) = fee_calculator {
-                        fee_calculator.calculate_fee_with_config(tx.message(), &fee_config)
+                        fee_calculator.calculate_fee(tx.message())
                     } else {
                         return (Err(TransactionError::BlockhashNotFound), None);
                     };
@@ -577,15 +586,17 @@ impl Accounts {
     pub fn load_largest_accounts(
         &self,
         ancestors: &Ancestors,
+        bank_id: BankId,
         num: usize,
         filter_by_address: &HashSet<Pubkey>,
         filter: AccountAddressFilter,
-    ) -> Vec<(Pubkey, u64)> {
+    ) -> ScanResult<Vec<(Pubkey, u64)>> {
         if num == 0 {
-            return vec![];
+            return Ok(vec![]);
         }
         let account_balances = self.accounts_db.scan_accounts(
             ancestors,
+            bank_id,
             |collector: &mut BinaryHeap<Reverse<(u64, Pubkey)>>, option| {
                 if let Some((pubkey, account, _slot)) = option {
                     if account.lamports() == 0 {
@@ -611,28 +622,32 @@ impl Accounts {
                     collector.push(Reverse((account.lamports(), *pubkey)));
                 }
             },
-        );
-        account_balances
+        )?;
+        Ok(account_balances
             .into_sorted_vec()
             .into_iter()
             .map(|Reverse((balance, pubkey))| (pubkey, balance))
-            .collect()
+            .collect())
     }
 
-    pub fn calculate_capitalization(&self, ancestors: &Ancestors) -> u64 {
-        self.accounts_db.unchecked_scan_accounts(
-            "calculate_capitalization_scan_elapsed",
-            ancestors,
-            |total_capitalization: &mut u64, (_pubkey, loaded_account, _slot)| {
-                let lamports = loaded_account.lamports();
-                if Self::is_loadable(lamports) {
-                    *total_capitalization = AccountsDb::checked_iterative_sum_for_capitalization(
-                        *total_capitalization,
-                        lamports,
-                    );
-                }
-            },
-        )
+    pub fn calculate_capitalization(
+        &self,
+        ancestors: &Ancestors,
+        slot: Slot,
+        can_cached_slot_be_unflushed: bool,
+        debug_verify: bool,
+    ) -> u64 {
+        let use_index = false;
+        self.accounts_db
+            .update_accounts_hash_with_index_option(
+                use_index,
+                debug_verify,
+                slot,
+                ancestors,
+                None,
+                can_cached_slot_be_unflushed,
+            )
+            .1
     }
 
     #[must_use]
@@ -641,11 +656,14 @@ impl Accounts {
         slot: Slot,
         ancestors: &Ancestors,
         total_lamports: u64,
+        test_hash_calculation: bool,
     ) -> bool {
-        if let Err(err) =
-            self.accounts_db
-                .verify_bank_hash_and_lamports(slot, ancestors, total_lamports)
-        {
+        if let Err(err) = self.accounts_db.verify_bank_hash_and_lamports(
+            slot,
+            ancestors,
+            total_lamports,
+            test_hash_calculation,
+        ) {
             warn!("verify_bank_hash failed: {:?}", err);
             false
         } else {
@@ -675,10 +693,12 @@ impl Accounts {
     pub fn load_by_program(
         &self,
         ancestors: &Ancestors,
+        bank_id: BankId,
         program_id: &Pubkey,
-    ) -> Vec<(Pubkey, AccountSharedData)> {
+    ) -> ScanResult<Vec<(Pubkey, AccountSharedData)>> {
         self.accounts_db.scan_accounts(
             ancestors,
+            bank_id,
             |collector: &mut Vec<(Pubkey, AccountSharedData)>, some_account_tuple| {
                 Self::load_while_filtering(collector, some_account_tuple, |account| {
                     account.owner() == program_id
@@ -690,11 +710,13 @@ impl Accounts {
     pub fn load_by_program_with_filter<F: Fn(&AccountSharedData) -> bool>(
         &self,
         ancestors: &Ancestors,
+        bank_id: BankId,
         program_id: &Pubkey,
         filter: F,
-    ) -> Vec<(Pubkey, AccountSharedData)> {
+    ) -> ScanResult<Vec<(Pubkey, AccountSharedData)>> {
         self.accounts_db.scan_accounts(
             ancestors,
+            bank_id,
             |collector: &mut Vec<(Pubkey, AccountSharedData)>, some_account_tuple| {
                 Self::load_while_filtering(collector, some_account_tuple, |account| {
                     account.owner() == program_id && filter(account)
@@ -706,12 +728,14 @@ impl Accounts {
     pub fn load_by_index_key_with_filter<F: Fn(&AccountSharedData) -> bool>(
         &self,
         ancestors: &Ancestors,
+        bank_id: BankId,
         index_key: &IndexKey,
         filter: F,
-    ) -> Vec<(Pubkey, AccountSharedData)> {
+    ) -> ScanResult<Vec<(Pubkey, AccountSharedData)>> {
         self.accounts_db
             .index_scan_accounts(
                 ancestors,
+                bank_id,
                 *index_key,
                 |collector: &mut Vec<(Pubkey, AccountSharedData)>, some_account_tuple| {
                     Self::load_while_filtering(collector, some_account_tuple, |account| {
@@ -719,16 +743,21 @@ impl Accounts {
                     })
                 },
             )
-            .0
+            .map(|result| result.0)
     }
 
     pub fn account_indexes_include_key(&self, key: &Pubkey) -> bool {
         self.accounts_db.account_indexes.include_key(key)
     }
 
-    pub fn load_all(&self, ancestors: &Ancestors) -> Vec<(Pubkey, AccountSharedData, Slot)> {
+    pub fn load_all(
+        &self,
+        ancestors: &Ancestors,
+        bank_id: BankId,
+    ) -> ScanResult<Vec<(Pubkey, AccountSharedData, Slot)>> {
         self.accounts_db.scan_accounts(
             ancestors,
+            bank_id,
             |collector: &mut Vec<(Pubkey, AccountSharedData, Slot)>, some_account_tuple| {
                 if let Some((pubkey, account, slot)) = some_account_tuple
                     .filter(|(_, account, _)| Self::is_loadable(account.lamports()))
@@ -799,26 +828,15 @@ impl Accounts {
 
     fn unlock_account(
         &self,
-        tx: &Transaction,
-        result: &Result<()>,
-        locks: &mut AccountLocks,
-        demote_sysvar_write_locks: bool,
+        account_locks: &mut AccountLocks,
+        writable_keys: Vec<&Pubkey>,
+        readonly_keys: Vec<&Pubkey>,
     ) {
-        match result {
-            Err(TransactionError::AccountInUse) => (),
-            Err(TransactionError::SanitizeFailure) => (),
-            Err(TransactionError::AccountLoadedTwice) => (),
-            _ => {
-                let (writable_keys, readonly_keys) = &tx
-                    .message()
-                    .get_account_keys_by_lock_type(demote_sysvar_write_locks);
-                for k in writable_keys {
-                    locks.unlock_write(k);
-                }
-                for k in readonly_keys {
-                    locks.unlock_readonly(k);
-                }
-            }
+        for k in writable_keys {
+            account_locks.unlock_write(k);
+        }
+        for k in readonly_keys {
+            account_locks.unlock_readonly(k);
         }
     }
 
@@ -841,11 +859,7 @@ impl Accounts {
     /// same time
     #[must_use]
     #[allow(clippy::needless_collect)]
-    pub fn lock_accounts<'a>(
-        &self,
-        txs: impl Iterator<Item = &'a Transaction>,
-        demote_sysvar_write_locks: bool,
-    ) -> Vec<Result<()>> {
+    pub fn lock_accounts<'a>(&self, txs: impl Iterator<Item = &'a Transaction>) -> Vec<Result<()>> {
         use solana_sdk::sanitize::Sanitize;
         let keys: Vec<Result<_>> = txs
             .map(|tx| {
@@ -855,9 +869,7 @@ impl Accounts {
                     return Err(TransactionError::AccountLoadedTwice);
                 }
 
-                Ok(tx
-                    .message()
-                    .get_account_keys_by_lock_type(demote_sysvar_write_locks))
+                Ok(tx.message().get_account_keys_by_lock_type())
             })
             .collect();
         let mut account_locks = &mut self.account_locks.lock().unwrap();
@@ -872,22 +884,26 @@ impl Accounts {
     }
 
     /// Once accounts are unlocked, new transactions that modify that state can enter the pipeline
+    #[allow(clippy::needless_collect)]
     pub fn unlock_accounts<'a>(
         &self,
         txs: impl Iterator<Item = &'a Transaction>,
         results: &[Result<()>],
-        demote_sysvar_write_locks: bool,
     ) {
+        let keys: Vec<_> = txs
+            .zip(results)
+            .filter_map(|(tx, res)| match res {
+                Err(TransactionError::AccountInUse) => None,
+                Err(TransactionError::SanitizeFailure) => None,
+                Err(TransactionError::AccountLoadedTwice) => None,
+                _ => Some(tx.message.get_account_keys_by_lock_type()),
+            })
+            .collect();
         let mut account_locks = self.account_locks.lock().unwrap();
         debug!("bank unlock accounts");
-        for (tx, lock_result) in txs.zip(results) {
-            self.unlock_account(
-                tx,
-                lock_result,
-                &mut account_locks,
-                demote_sysvar_write_locks,
-            );
-        }
+        keys.into_iter().for_each(|(writable_keys, readonly_keys)| {
+            self.unlock_account(&mut account_locks, writable_keys, readonly_keys);
+        });
     }
 
     /// Store the accounts into the DB
@@ -902,7 +918,8 @@ impl Accounts {
         rent_collector: &RentCollector,
         last_blockhash_with_fee_calculator: &(Hash, FeeCalculator),
         fix_recent_blockhashes_sysvar_delay: bool,
-        demote_sysvar_write_locks: bool,
+        rent_for_sysvars: bool,
+        merge_nonce_error_into_system_error: bool,
     ) {
         let accounts_to_store = self.collect_accounts_to_store(
             txs,
@@ -911,7 +928,8 @@ impl Accounts {
             rent_collector,
             last_blockhash_with_fee_calculator,
             fix_recent_blockhashes_sysvar_delay,
-            demote_sysvar_write_locks,
+            rent_for_sysvars,
+            merge_nonce_error_into_system_error,
         );
         self.accounts_db.store_cached(slot, &accounts_to_store);
     }
@@ -919,8 +937,8 @@ impl Accounts {
     /// Purge a slot if it is not a root
     /// Root slots cannot be purged
     /// `is_from_abs` is true if the caller is the AccountsBackgroundService
-    pub fn purge_slot(&self, slot: Slot, is_from_abs: bool) {
-        self.accounts_db.purge_slot(slot, is_from_abs);
+    pub fn purge_slot(&self, slot: Slot, bank_id: BankId, is_from_abs: bool) {
+        self.accounts_db.purge_slot(slot, bank_id, is_from_abs);
     }
 
     /// Add a slot to root.  Root slots cannot be purged
@@ -936,7 +954,8 @@ impl Accounts {
         rent_collector: &RentCollector,
         last_blockhash_with_fee_calculator: &(Hash, FeeCalculator),
         fix_recent_blockhashes_sysvar_delay: bool,
-        demote_sysvar_write_locks: bool,
+        rent_for_sysvars: bool,
+        merge_nonce_error_into_system_error: bool,
     ) -> Vec<(&'a Pubkey, &'a AccountSharedData)> {
         let mut accounts = Vec::with_capacity(loaded.len());
         for (i, ((raccs, _nonce_rollback), tx)) in loaded.iter_mut().zip(txs).enumerate() {
@@ -949,13 +968,19 @@ impl Accounts {
                     let pubkey = nonce_rollback.nonce_address();
                     let acc = nonce_rollback.nonce_account();
                     let maybe_fee_account = nonce_rollback.fee_account();
-                    Some((pubkey, acc, maybe_fee_account))
+                    Some((pubkey, acc, maybe_fee_account, true))
                 }
-                (Err(TransactionError::InstructionError(_, _)), Some(nonce_rollback)) => {
+                (Err(TransactionError::InstructionError(index, _)), Some(nonce_rollback)) => {
+                    let nonce_marker_ix_failed = if merge_nonce_error_into_system_error {
+                        // Don't advance stored blockhash when the nonce marker ix fails
+                        *index == NONCED_TX_MARKER_IX_INDEX
+                    } else {
+                        false
+                    };
                     let pubkey = nonce_rollback.nonce_address();
                     let acc = nonce_rollback.nonce_account();
                     let maybe_fee_account = nonce_rollback.fee_account();
-                    Some((pubkey, acc, maybe_fee_account))
+                    Some((pubkey, acc, maybe_fee_account, !nonce_marker_ix_failed))
                 }
                 (Ok(_), _nonce_rollback) => None,
                 (Err(_), _nonce_rollback) => continue,
@@ -964,12 +989,9 @@ impl Accounts {
             let message = &tx.message();
             let loaded_transaction = raccs.as_mut().unwrap();
             let mut fee_payer_index = None;
-            for ((i, key), account) in message
-                .account_keys
-                .iter()
-                .enumerate()
+            for (i, (key, account)) in (0..message.account_keys.len())
                 .zip(loaded_transaction.accounts.iter_mut())
-                .filter(|((i, key), _account)| message.is_non_loader_key(key, *i))
+                .filter(|(i, (key, _account))| message.is_non_loader_key(key, *i))
             {
                 let is_nonce_account = prepare_if_nonce_account(
                     account,
@@ -983,31 +1005,35 @@ impl Accounts {
                     fee_payer_index = Some(i);
                 }
                 let is_fee_payer = Some(i) == fee_payer_index;
-                if message.is_writable(i, demote_sysvar_write_locks)
+                if message.is_writable(i)
                     && (res.is_ok()
                         || (maybe_nonce_rollback.is_some() && (is_nonce_account || is_fee_payer)))
                 {
                     if res.is_err() {
                         match (is_nonce_account, is_fee_payer, maybe_nonce_rollback) {
                             // nonce is fee-payer, state updated in `prepare_if_nonce_account()`
-                            (true, true, Some((_, _, None))) => (),
+                            (true, true, Some((_, _, None, _))) => (),
                             // nonce not fee-payer, state updated in `prepare_if_nonce_account()`
-                            (true, false, Some((_, _, Some(_)))) => (),
+                            (true, false, Some((_, _, Some(_), _))) => (),
                             // not nonce, but fee-payer. rollback to cached state
-                            (false, true, Some((_, _, Some(fee_payer_account)))) => {
+                            (false, true, Some((_, _, Some(fee_payer_account), _))) => {
                                 *account = fee_payer_account.clone();
                             }
                             _ => panic!("unexpected nonce_rollback condition"),
                         }
                     }
                     if account.rent_epoch() == INITIAL_RENT_EPOCH {
-                        let rent = rent_collector.collect_from_created_account(&key, account);
+                        let rent = rent_collector.collect_from_created_account(
+                            key,
+                            account,
+                            rent_for_sysvars,
+                        );
                         loaded_transaction.rent += rent;
                         loaded_transaction
                             .rent_debits
                             .push(key, rent, account.lamports());
                     }
-                    accounts.push((key, &*account));
+                    accounts.push((&*key, &*account));
                 }
             }
         }
@@ -1019,11 +1045,18 @@ pub fn prepare_if_nonce_account(
     account: &mut AccountSharedData,
     account_pubkey: &Pubkey,
     tx_result: &Result<()>,
-    maybe_nonce_rollback: Option<(&Pubkey, &AccountSharedData, Option<&AccountSharedData>)>,
+    maybe_nonce_rollback: Option<(
+        &Pubkey,
+        &AccountSharedData,
+        Option<&AccountSharedData>,
+        bool,
+    )>,
     last_blockhash_with_fee_calculator: &(Hash, FeeCalculator),
     fix_recent_blockhashes_sysvar_delay: bool,
 ) -> bool {
-    if let Some((nonce_key, nonce_acc, _maybe_fee_account)) = maybe_nonce_rollback {
+    if let Some((nonce_key, nonce_acc, _maybe_fee_account, advance_blockhash)) =
+        maybe_nonce_rollback
+    {
         if account_pubkey == nonce_key {
             let overwrite = if tx_result.is_err() {
                 // Nonce TX failed with an InstructionError. Roll back
@@ -1035,7 +1068,10 @@ pub fn prepare_if_nonce_account(
                 // recent_blockhashes_sysvar_delay fix is activated
                 !fix_recent_blockhashes_sysvar_delay
             };
-            if overwrite {
+            if overwrite && advance_blockhash {
+                // Advance the stored blockhash to prevent fee theft by replaying
+                // transactions that have failed with an `InstructionError`
+
                 // Since hash_age_kind is DurableNonce, unwrap is safe here
                 let state = StateMut::<nonce::state::Versions>::state(nonce_acc)
                     .unwrap()
@@ -1078,7 +1114,7 @@ pub fn update_accounts_bench(accounts: &Accounts, pubkeys: &[Pubkey], slot: u64)
     for pubkey in pubkeys {
         let amount = thread_rng().gen_range(0, 10);
         let account = AccountSharedData::new(amount, 0, AccountSharedData::default().owner());
-        accounts.store_slow_uncached(slot, &pubkey, &account);
+        accounts.store_slow_uncached(slot, pubkey, &account);
     }
 }
 
@@ -1112,12 +1148,13 @@ mod tests {
         error_counters: &mut ErrorCounters,
     ) -> Vec<TransactionLoadResult> {
         let mut hash_queue = BlockhashQueue::new(100);
-        hash_queue.register_hash(&tx.message().recent_blockhash, &fee_calculator);
+        hash_queue.register_hash(&tx.message().recent_blockhash, fee_calculator);
         let accounts = Accounts::new_with_config(
             Vec::new(),
             &ClusterType::Development,
             AccountSecondaryIndexes::default(),
             false,
+            AccountShrinkThreshold::default(),
         );
         for ka in ka.iter() {
             accounts.store_slow_uncached(0, &ka.0, &ka.1);
@@ -1348,7 +1385,7 @@ mod tests {
         assert_eq!(loaded_accounts.len(), 1);
         let (load_res, _nonce_rollback) = &loaded_accounts[0];
         let loaded_transaction = load_res.as_ref().unwrap();
-        assert_eq!(loaded_transaction.accounts[0].lamports(), min_balance);
+        assert_eq!(loaded_transaction.accounts[0].1.lamports(), min_balance);
 
         // Fee leaves zero balance fails
         accounts[0].1.set_lamports(min_balance);
@@ -1410,7 +1447,7 @@ mod tests {
         match &loaded_accounts[0] {
             (Ok(loaded_transaction), _nonce_rollback) => {
                 assert_eq!(loaded_transaction.accounts.len(), 3);
-                assert_eq!(loaded_transaction.accounts[0], accounts[0].1);
+                assert_eq!(loaded_transaction.accounts[0].1, accounts[0].1);
                 assert_eq!(loaded_transaction.loaders.len(), 1);
                 assert_eq!(loaded_transaction.loaders[0].len(), 0);
             }
@@ -1633,7 +1670,7 @@ mod tests {
         match &loaded_accounts[0] {
             (Ok(loaded_transaction), _nonce_rollback) => {
                 assert_eq!(loaded_transaction.accounts.len(), 3);
-                assert_eq!(loaded_transaction.accounts[0], accounts[0].1);
+                assert_eq!(loaded_transaction.accounts[0].1, accounts[0].1);
                 assert_eq!(loaded_transaction.loaders.len(), 2);
                 assert_eq!(loaded_transaction.loaders[0].len(), 1);
                 assert_eq!(loaded_transaction.loaders[1].len(), 2);
@@ -1655,6 +1692,7 @@ mod tests {
             &ClusterType::Development,
             AccountSecondaryIndexes::default(),
             false,
+            AccountShrinkThreshold::default(),
         );
 
         // Load accounts owned by various programs into AccountsDb
@@ -1683,6 +1721,7 @@ mod tests {
             &ClusterType::Development,
             AccountSecondaryIndexes::default(),
             false,
+            AccountShrinkThreshold::default(),
         );
         let mut error_counters = ErrorCounters::default();
         let ancestors = vec![(0, 0)].into_iter().collect();
@@ -1706,6 +1745,7 @@ mod tests {
             &ClusterType::Development,
             AccountSecondaryIndexes::default(),
             false,
+            AccountShrinkThreshold::default(),
         );
         accounts.bank_hash_at(1);
     }
@@ -1727,6 +1767,7 @@ mod tests {
             &ClusterType::Development,
             AccountSecondaryIndexes::default(),
             false,
+            AccountShrinkThreshold::default(),
         );
         accounts.store_slow_uncached(0, &keypair0.pubkey(), &account0);
         accounts.store_slow_uncached(0, &keypair1.pubkey(), &account1);
@@ -1743,10 +1784,7 @@ mod tests {
             instructions,
         );
         let tx = Transaction::new(&[&keypair0], message, Hash::default());
-        let results0 = accounts.lock_accounts(
-            [tx.clone()].iter(),
-            true, // demote_sysvar_write_locks
-        );
+        let results0 = accounts.lock_accounts([tx.clone()].iter());
 
         assert!(results0[0].is_ok());
         assert_eq!(
@@ -1781,10 +1819,7 @@ mod tests {
         );
         let tx1 = Transaction::new(&[&keypair1], message, Hash::default());
         let txs = vec![tx0, tx1];
-        let results1 = accounts.lock_accounts(
-            txs.iter(),
-            true, // demote_sysvar_write_locks
-        );
+        let results1 = accounts.lock_accounts(txs.iter());
 
         assert!(results1[0].is_ok()); // Read-only account (keypair1) can be referenced multiple times
         assert!(results1[1].is_err()); // Read-only account (keypair1) cannot also be locked as writable
@@ -1799,16 +1834,8 @@ mod tests {
             2
         );
 
-        accounts.unlock_accounts(
-            [tx].iter(),
-            &results0,
-            true, // demote_sysvar_write_locks
-        );
-        accounts.unlock_accounts(
-            txs.iter(),
-            &results1,
-            true, // demote_sysvar_write_locks
-        );
+        accounts.unlock_accounts([tx].iter(), &results0);
+        accounts.unlock_accounts(txs.iter(), &results1);
         let instructions = vec![CompiledInstruction::new(2, &(), vec![0, 1])];
         let message = Message::new_with_compiled_instructions(
             1,
@@ -1819,10 +1846,7 @@ mod tests {
             instructions,
         );
         let tx = Transaction::new(&[&keypair1], message, Hash::default());
-        let results2 = accounts.lock_accounts(
-            [tx].iter(),
-            true, // demote_sysvar_write_locks
-        );
+        let results2 = accounts.lock_accounts([tx].iter());
         assert!(results2[0].is_ok()); // Now keypair1 account can be locked as writable
 
         // Check that read-only lock with zero references is deleted
@@ -1853,6 +1877,7 @@ mod tests {
             &ClusterType::Development,
             AccountSecondaryIndexes::default(),
             false,
+            AccountShrinkThreshold::default(),
         );
         accounts.store_slow_uncached(0, &keypair0.pubkey(), &account0);
         accounts.store_slow_uncached(0, &keypair1.pubkey(), &account1);
@@ -1890,20 +1915,13 @@ mod tests {
             let exit_clone = exit_clone.clone();
             loop {
                 let txs = vec![writable_tx.clone()];
-                let results = accounts_clone.clone().lock_accounts(
-                    txs.iter(),
-                    true, // demote_sysvar_write_locks
-                );
+                let results = accounts_clone.clone().lock_accounts(txs.iter());
                 for result in results.iter() {
                     if result.is_ok() {
                         counter_clone.clone().fetch_add(1, Ordering::SeqCst);
                     }
                 }
-                accounts_clone.unlock_accounts(
-                    txs.iter(),
-                    &results,
-                    true, // demote_sysvar_write_locks
-                );
+                accounts_clone.unlock_accounts(txs.iter(), &results);
                 if exit_clone.clone().load(Ordering::Relaxed) {
                     break;
                 }
@@ -1912,20 +1930,13 @@ mod tests {
         let counter_clone = counter;
         for _ in 0..5 {
             let txs = vec![readonly_tx.clone()];
-            let results = accounts_arc.clone().lock_accounts(
-                txs.iter(),
-                true, // demote_sysvar_write_locks
-            );
+            let results = accounts_arc.clone().lock_accounts(txs.iter());
             if results[0].is_ok() {
                 let counter_value = counter_clone.clone().load(Ordering::SeqCst);
                 thread::sleep(time::Duration::from_millis(50));
                 assert_eq!(counter_value, counter_clone.clone().load(Ordering::SeqCst));
             }
-            accounts_arc.unlock_accounts(
-                txs.iter(),
-                &results,
-                true, // demote_sysvar_write_locks
-            );
+            accounts_arc.unlock_accounts(txs.iter(), &results);
             thread::sleep(time::Duration::from_millis(50));
         }
         exit.store(true, Ordering::Relaxed);
@@ -1936,6 +1947,9 @@ mod tests {
         let keypair0 = Keypair::new();
         let keypair1 = Keypair::new();
         let pubkey = solana_sdk::pubkey::new_rand();
+        let account0 = AccountSharedData::new(1, 0, &Pubkey::default());
+        let account1 = AccountSharedData::new(2, 0, &Pubkey::default());
+        let account2 = AccountSharedData::new(3, 0, &Pubkey::default());
 
         let rent_collector = RentCollector::default();
 
@@ -1948,6 +1962,10 @@ mod tests {
             Hash::default(),
             instructions,
         );
+        let transaction_accounts0 = vec![
+            (message.account_keys[0], account0),
+            (message.account_keys[1], account2.clone()),
+        ];
         let tx0 = Transaction::new(&[&keypair0], message, Hash::default());
 
         let instructions = vec![CompiledInstruction::new(2, &(), vec![0, 1])];
@@ -1959,22 +1977,19 @@ mod tests {
             Hash::default(),
             instructions,
         );
+        let transaction_accounts1 = vec![
+            (message.account_keys[0], account1),
+            (message.account_keys[1], account2),
+        ];
         let tx1 = Transaction::new(&[&keypair1], message, Hash::default());
-        let txs = vec![tx0, tx1];
 
         let loaders = vec![(Ok(()), None), (Ok(()), None)];
 
-        let account0 = AccountSharedData::new(1, 0, &Pubkey::default());
-        let account1 = AccountSharedData::new(2, 0, &Pubkey::default());
-        let account2 = AccountSharedData::new(3, 0, &Pubkey::default());
-
-        let transaction_accounts0 = vec![account0, account2.clone()];
         let transaction_loaders0 = vec![];
         let transaction_rent0 = 0;
         let loaded0 = (
             Ok(LoadedTransaction {
                 accounts: transaction_accounts0,
-                account_deps: vec![],
                 loaders: transaction_loaders0,
                 rent: transaction_rent0,
                 rent_debits: RentDebits::default(),
@@ -1982,13 +1997,11 @@ mod tests {
             None,
         );
 
-        let transaction_accounts1 = vec![account1, account2];
         let transaction_loaders1 = vec![];
         let transaction_rent1 = 0;
         let loaded1 = (
             Ok(LoadedTransaction {
                 accounts: transaction_accounts1,
-                account_deps: vec![],
                 loaders: transaction_loaders1,
                 rent: transaction_rent1,
                 rent_debits: RentDebits::default(),
@@ -2003,6 +2016,7 @@ mod tests {
             &ClusterType::Development,
             AccountSecondaryIndexes::default(),
             false,
+            AccountShrinkThreshold::default(),
         );
         {
             accounts
@@ -2011,6 +2025,7 @@ mod tests {
                 .unwrap()
                 .insert_new_readonly(&pubkey);
         }
+        let txs = &[tx0, tx1];
         let collected_accounts = accounts.collect_accounts_to_store(
             txs.iter(),
             &loaders,
@@ -2018,7 +2033,8 @@ mod tests {
             &rent_collector,
             &(Hash::default(), FeeCalculator::default()),
             true,
-            true, // demote_sysvar_write_locks
+            true,
+            true, // merge_nonce_error_into_system_error
         );
         assert_eq!(collected_accounts.len(), 2);
         assert!(collected_accounts
@@ -2055,6 +2071,7 @@ mod tests {
             &ClusterType::Development,
             AccountSecondaryIndexes::default(),
             false,
+            AccountShrinkThreshold::default(),
         );
         let mut old_pubkey = Pubkey::default();
         let zero_account = AccountSharedData::new(0, 0, AccountSharedData::default().owner());
@@ -2102,6 +2119,7 @@ mod tests {
             &ClusterType::Development,
             AccountSecondaryIndexes::default(),
             false,
+            AccountShrinkThreshold::default(),
         );
 
         let instructions_key = solana_sdk::sysvar::instructions::id();
@@ -2150,18 +2168,23 @@ mod tests {
         account: &mut AccountSharedData,
         account_pubkey: &Pubkey,
         tx_result: &Result<()>,
-        maybe_nonce_rollback: Option<(&Pubkey, &AccountSharedData, Option<&AccountSharedData>)>,
+        maybe_nonce_rollback: Option<(
+            &Pubkey,
+            &AccountSharedData,
+            Option<&AccountSharedData>,
+            bool,
+        )>,
         last_blockhash_with_fee_calculator: &(Hash, FeeCalculator),
         expect_account: &AccountSharedData,
     ) -> bool {
         // Verify expect_account's relationship
         match maybe_nonce_rollback {
-            Some((nonce_pubkey, _nonce_account, _maybe_fee_account))
+            Some((nonce_pubkey, _nonce_account, _maybe_fee_account, _))
                 if nonce_pubkey == account_pubkey && tx_result.is_ok() =>
             {
                 assert_eq!(expect_account, account) // Account update occurs in system_instruction_processor
             }
-            Some((nonce_pubkey, nonce_account, _maybe_fee_account))
+            Some((nonce_pubkey, nonce_account, _maybe_fee_account, _))
                 if nonce_pubkey == account_pubkey =>
             {
                 assert_ne!(expect_account, nonce_account)
@@ -2175,7 +2198,7 @@ mod tests {
             tx_result,
             maybe_nonce_rollback,
             last_blockhash_with_fee_calculator,
-            true,
+            false,
         );
         expect_account == account
     }
@@ -2205,7 +2228,8 @@ mod tests {
             Some((
                 &pre_account_pubkey,
                 &pre_account,
-                maybe_fee_account.as_ref()
+                maybe_fee_account.as_ref(),
+                false,
             )),
             &(last_blockhash, last_fee_calculator),
             &expect_account,
@@ -2256,7 +2280,8 @@ mod tests {
             Some((
                 &pre_account_pubkey,
                 &pre_account,
-                maybe_fee_account.as_ref()
+                maybe_fee_account.as_ref(),
+                true,
             )),
             &(last_blockhash, last_fee_calculator),
             &expect_account,
@@ -2296,7 +2321,8 @@ mod tests {
             Some((
                 &pre_account_pubkey,
                 &pre_account,
-                maybe_fee_account.as_ref()
+                maybe_fee_account.as_ref(),
+                true,
             )),
             &(last_blockhash, last_fee_calculator),
             &expect_account,
@@ -2312,16 +2338,34 @@ mod tests {
         let from = keypair_from_seed(&[1; 32]).unwrap();
         let from_address = from.pubkey();
         let to_address = Pubkey::new_unique();
+        let nonce_state =
+            nonce::state::Versions::new_current(nonce::State::Initialized(nonce::state::Data {
+                authority: nonce_authority.pubkey(),
+                blockhash: Hash::new_unique(),
+                fee_calculator: FeeCalculator::default(),
+            }));
+        let nonce_account_post =
+            AccountSharedData::new_data(43, &nonce_state, &system_program::id()).unwrap();
+        let from_account_post = AccountSharedData::new(4199, 0, &Pubkey::default());
+        let to_account = AccountSharedData::new(2, 0, &Pubkey::default());
+        let nonce_authority_account = AccountSharedData::new(3, 0, &Pubkey::default());
+        let recent_blockhashes_sysvar_account = AccountSharedData::new(4, 0, &Pubkey::default());
+
         let instructions = vec![
             system_instruction::advance_nonce_account(&nonce_address, &nonce_authority.pubkey()),
             system_instruction::transfer(&from_address, &to_address, 42),
         ];
         let message = Message::new(&instructions, Some(&from_address));
         let blockhash = Hash::new_unique();
+        let transaction_accounts = vec![
+            (message.account_keys[0], from_account_post),
+            (message.account_keys[1], nonce_authority_account),
+            (message.account_keys[2], nonce_account_post),
+            (message.account_keys[3], to_account),
+            (message.account_keys[4], recent_blockhashes_sysvar_account),
+        ];
         let tx = Transaction::new(&[&nonce_authority, &from], message, blockhash);
 
-        let txs = vec![tx];
-
         let nonce_state =
             nonce::state::Versions::new_current(nonce::State::Initialized(nonce::state::Data {
                 authority: nonce_authority.pubkey(),
@@ -2345,33 +2389,11 @@ mod tests {
             nonce_rollback.clone(),
         )];
 
-        let nonce_state =
-            nonce::state::Versions::new_current(nonce::State::Initialized(nonce::state::Data {
-                authority: nonce_authority.pubkey(),
-                blockhash: Hash::new_unique(),
-                fee_calculator: FeeCalculator::default(),
-            }));
-        let nonce_account_post =
-            AccountSharedData::new_data(43, &nonce_state, &system_program::id()).unwrap();
-
-        let from_account_post = AccountSharedData::new(4199, 0, &Pubkey::default());
-        let to_account = AccountSharedData::new(2, 0, &Pubkey::default());
-        let nonce_authority_account = AccountSharedData::new(3, 0, &Pubkey::default());
-        let recent_blockhashes_sysvar_account = AccountSharedData::new(4, 0, &Pubkey::default());
-
-        let transaction_accounts = vec![
-            from_account_post,
-            nonce_authority_account,
-            nonce_account_post,
-            to_account,
-            recent_blockhashes_sysvar_account,
-        ];
         let transaction_loaders = vec![];
         let transaction_rent = 0;
         let loaded = (
             Ok(LoadedTransaction {
                 accounts: transaction_accounts,
-                account_deps: vec![],
                 loaders: transaction_loaders,
                 rent: transaction_rent,
                 rent_debits: RentDebits::default(),
@@ -2387,7 +2409,9 @@ mod tests {
             &ClusterType::Development,
             AccountSecondaryIndexes::default(),
             false,
+            AccountShrinkThreshold::default(),
         );
+        let txs = &[tx];
         let collected_accounts = accounts.collect_accounts_to_store(
             txs.iter(),
             &loaders,
@@ -2395,7 +2419,8 @@ mod tests {
             &rent_collector,
             &(next_blockhash, FeeCalculator::default()),
             true,
-            true, // demote_sysvar_write_locks
+            true,
+            true, // merge_nonce_error_into_system_error
         );
         assert_eq!(collected_accounts.len(), 2);
         assert_eq!(
@@ -2432,16 +2457,34 @@ mod tests {
         let from = keypair_from_seed(&[1; 32]).unwrap();
         let from_address = from.pubkey();
         let to_address = Pubkey::new_unique();
+        let nonce_state =
+            nonce::state::Versions::new_current(nonce::State::Initialized(nonce::state::Data {
+                authority: nonce_authority.pubkey(),
+                blockhash: Hash::new_unique(),
+                fee_calculator: FeeCalculator::default(),
+            }));
+        let nonce_account_post =
+            AccountSharedData::new_data(43, &nonce_state, &system_program::id()).unwrap();
+        let from_account_post = AccountSharedData::new(4200, 0, &Pubkey::default());
+        let to_account = AccountSharedData::new(2, 0, &Pubkey::default());
+        let nonce_authority_account = AccountSharedData::new(3, 0, &Pubkey::default());
+        let recent_blockhashes_sysvar_account = AccountSharedData::new(4, 0, &Pubkey::default());
+
         let instructions = vec![
             system_instruction::advance_nonce_account(&nonce_address, &nonce_authority.pubkey()),
             system_instruction::transfer(&from_address, &to_address, 42),
         ];
         let message = Message::new(&instructions, Some(&nonce_address));
         let blockhash = Hash::new_unique();
+        let transaction_accounts = vec![
+            (message.account_keys[0], from_account_post),
+            (message.account_keys[1], nonce_authority_account),
+            (message.account_keys[2], nonce_account_post),
+            (message.account_keys[3], to_account),
+            (message.account_keys[4], recent_blockhashes_sysvar_account),
+        ];
         let tx = Transaction::new(&[&nonce_authority, &from], message, blockhash);
 
-        let txs = vec![tx];
-
         let nonce_state =
             nonce::state::Versions::new_current(nonce::State::Initialized(nonce::state::Data {
                 authority: nonce_authority.pubkey(),
@@ -2464,33 +2507,11 @@ mod tests {
             nonce_rollback.clone(),
         )];
 
-        let nonce_state =
-            nonce::state::Versions::new_current(nonce::State::Initialized(nonce::state::Data {
-                authority: nonce_authority.pubkey(),
-                blockhash: Hash::new_unique(),
-                fee_calculator: FeeCalculator::default(),
-            }));
-        let nonce_account_post =
-            AccountSharedData::new_data(43, &nonce_state, &system_program::id()).unwrap();
-
-        let from_account_post = AccountSharedData::new(4200, 0, &Pubkey::default());
-        let to_account = AccountSharedData::new(2, 0, &Pubkey::default());
-        let nonce_authority_account = AccountSharedData::new(3, 0, &Pubkey::default());
-        let recent_blockhashes_sysvar_account = AccountSharedData::new(4, 0, &Pubkey::default());
-
-        let transaction_accounts = vec![
-            from_account_post,
-            nonce_authority_account,
-            nonce_account_post,
-            to_account,
-            recent_blockhashes_sysvar_account,
-        ];
         let transaction_loaders = vec![];
         let transaction_rent = 0;
         let loaded = (
             Ok(LoadedTransaction {
                 accounts: transaction_accounts,
-                account_deps: vec![],
                 loaders: transaction_loaders,
                 rent: transaction_rent,
                 rent_debits: RentDebits::default(),
@@ -2506,7 +2527,9 @@ mod tests {
             &ClusterType::Development,
             AccountSecondaryIndexes::default(),
             false,
+            AccountShrinkThreshold::default(),
         );
+        let txs = &[tx];
         let collected_accounts = accounts.collect_accounts_to_store(
             txs.iter(),
             &loaders,
@@ -2514,7 +2537,8 @@ mod tests {
             &rent_collector,
             &(next_blockhash, FeeCalculator::default()),
             true,
-            true, // demote_sysvar_write_locks
+            true,
+            true, // merge_nonce_error_into_system_error
         );
         assert_eq!(collected_accounts.len(), 1);
         let collected_nonce_account = collected_accounts
@@ -2540,6 +2564,7 @@ mod tests {
             &ClusterType::Development,
             AccountSecondaryIndexes::default(),
             false,
+            AccountShrinkThreshold::default(),
         );
 
         let pubkey0 = Pubkey::new_unique();
@@ -2556,108 +2581,160 @@ mod tests {
         let all_pubkeys: HashSet<_> = vec![pubkey0, pubkey1, pubkey2].into_iter().collect();
 
         // num == 0 should always return empty set
+        let bank_id = 0;
         assert_eq!(
-            accounts.load_largest_accounts(
-                &ancestors,
-                0,
-                &HashSet::new(),
-                AccountAddressFilter::Exclude
-            ),
+            accounts
+                .load_largest_accounts(
+                    &ancestors,
+                    bank_id,
+                    0,
+                    &HashSet::new(),
+                    AccountAddressFilter::Exclude
+                )
+                .unwrap(),
             vec![]
         );
         assert_eq!(
-            accounts.load_largest_accounts(
-                &ancestors,
-                0,
-                &all_pubkeys,
-                AccountAddressFilter::Include
-            ),
+            accounts
+                .load_largest_accounts(
+                    &ancestors,
+                    bank_id,
+                    0,
+                    &all_pubkeys,
+                    AccountAddressFilter::Include
+                )
+                .unwrap(),
             vec![]
         );
 
         // list should be sorted by balance, then pubkey, descending
         assert!(pubkey1 > pubkey0);
         assert_eq!(
-            accounts.load_largest_accounts(
-                &ancestors,
-                1,
-                &HashSet::new(),
-                AccountAddressFilter::Exclude
-            ),
+            accounts
+                .load_largest_accounts(
+                    &ancestors,
+                    bank_id,
+                    1,
+                    &HashSet::new(),
+                    AccountAddressFilter::Exclude
+                )
+                .unwrap(),
             vec![(pubkey1, 42)]
         );
         assert_eq!(
-            accounts.load_largest_accounts(
-                &ancestors,
-                2,
-                &HashSet::new(),
-                AccountAddressFilter::Exclude
-            ),
+            accounts
+                .load_largest_accounts(
+                    &ancestors,
+                    bank_id,
+                    2,
+                    &HashSet::new(),
+                    AccountAddressFilter::Exclude
+                )
+                .unwrap(),
             vec![(pubkey1, 42), (pubkey0, 42)]
         );
         assert_eq!(
-            accounts.load_largest_accounts(
-                &ancestors,
-                3,
-                &HashSet::new(),
-                AccountAddressFilter::Exclude
-            ),
+            accounts
+                .load_largest_accounts(
+                    &ancestors,
+                    bank_id,
+                    3,
+                    &HashSet::new(),
+                    AccountAddressFilter::Exclude
+                )
+                .unwrap(),
             vec![(pubkey1, 42), (pubkey0, 42), (pubkey2, 41)]
         );
 
         // larger num should not affect results
         assert_eq!(
-            accounts.load_largest_accounts(
-                &ancestors,
-                6,
-                &HashSet::new(),
-                AccountAddressFilter::Exclude
-            ),
+            accounts
+                .load_largest_accounts(
+                    &ancestors,
+                    bank_id,
+                    6,
+                    &HashSet::new(),
+                    AccountAddressFilter::Exclude
+                )
+                .unwrap(),
             vec![(pubkey1, 42), (pubkey0, 42), (pubkey2, 41)]
         );
 
         // AccountAddressFilter::Exclude should exclude entry
         let exclude1: HashSet<_> = vec![pubkey1].into_iter().collect();
         assert_eq!(
-            accounts.load_largest_accounts(&ancestors, 1, &exclude1, AccountAddressFilter::Exclude),
+            accounts
+                .load_largest_accounts(
+                    &ancestors,
+                    bank_id,
+                    1,
+                    &exclude1,
+                    AccountAddressFilter::Exclude
+                )
+                .unwrap(),
             vec![(pubkey0, 42)]
         );
         assert_eq!(
-            accounts.load_largest_accounts(&ancestors, 2, &exclude1, AccountAddressFilter::Exclude),
+            accounts
+                .load_largest_accounts(
+                    &ancestors,
+                    bank_id,
+                    2,
+                    &exclude1,
+                    AccountAddressFilter::Exclude
+                )
+                .unwrap(),
             vec![(pubkey0, 42), (pubkey2, 41)]
         );
         assert_eq!(
-            accounts.load_largest_accounts(&ancestors, 3, &exclude1, AccountAddressFilter::Exclude),
+            accounts
+                .load_largest_accounts(
+                    &ancestors,
+                    bank_id,
+                    3,
+                    &exclude1,
+                    AccountAddressFilter::Exclude
+                )
+                .unwrap(),
             vec![(pubkey0, 42), (pubkey2, 41)]
         );
 
         // AccountAddressFilter::Include should limit entries
         let include1_2: HashSet<_> = vec![pubkey1, pubkey2].into_iter().collect();
         assert_eq!(
-            accounts.load_largest_accounts(
-                &ancestors,
-                1,
-                &include1_2,
-                AccountAddressFilter::Include
-            ),
+            accounts
+                .load_largest_accounts(
+                    &ancestors,
+                    bank_id,
+                    1,
+                    &include1_2,
+                    AccountAddressFilter::Include
+                )
+                .unwrap(),
             vec![(pubkey1, 42)]
         );
         assert_eq!(
-            accounts.load_largest_accounts(
-                &ancestors,
-                2,
-                &include1_2,
-                AccountAddressFilter::Include
-            ),
+            accounts
+                .load_largest_accounts(
+                    &ancestors,
+                    bank_id,
+                    2,
+                    &include1_2,
+                    AccountAddressFilter::Include
+                )
+                .unwrap(),
             vec![(pubkey1, 42), (pubkey2, 41)]
         );
         assert_eq!(
-            accounts.load_largest_accounts(
-                &ancestors,
-                3,
-                &include1_2,
-                AccountAddressFilter::Include
-            ),
+            accounts
+                .load_largest_accounts(
+                    &ancestors,
+                    bank_id,
+                    3,
+                    &include1_2,
+                    AccountAddressFilter::Include
+                )
+                .unwrap(),
             vec![(pubkey1, 42), (pubkey2, 41)]
         );
     }
diff --git a/runtime/src/accounts_background_service.rs b/runtime/src/accounts_background_service.rs
index 277e25f9180123..2a2992dd8fb856 100644
--- a/runtime/src/accounts_background_service.rs
+++ b/runtime/src/accounts_background_service.rs
@@ -12,7 +12,10 @@ use crossbeam_channel::{Receiver, SendError, Sender};
 use log::*;
 use rand::{thread_rng, Rng};
 use solana_measure::measure::Measure;
-use solana_sdk::{clock::Slot, hash::Hash};
+use solana_sdk::{
+    clock::{BankId, Slot},
+    hash::Hash,
+};
 use std::{
     boxed::Box,
     fmt::{Debug, Formatter},
@@ -39,8 +42,8 @@ const RECYCLE_STORE_EXPIRATION_INTERVAL_SECS: u64 = crate::accounts_db::EXPIRATI
 
 pub type SnapshotRequestSender = Sender<SnapshotRequest>;
 pub type SnapshotRequestReceiver = Receiver<SnapshotRequest>;
-pub type DroppedSlotsSender = Sender<Slot>;
-pub type DroppedSlotsReceiver = Receiver<Slot>;
+pub type DroppedSlotsSender = Sender<(Slot, BankId)>;
+pub type DroppedSlotsReceiver = Receiver<(Slot, BankId)>;
 
 #[derive(Clone)]
 pub struct SendDroppedBankCallback {
@@ -49,7 +52,7 @@ pub struct SendDroppedBankCallback {
 
 impl DropCallback for SendDroppedBankCallback {
     fn callback(&self, bank: &Bank) {
-        if let Err(e) = self.sender.send(bank.slot()) {
+        if let Err(e) = self.sender.send((bank.slot(), bank.bank_id())) {
             warn!("Error sending dropped banks: {:?}", e);
         }
     }
@@ -89,11 +92,13 @@ impl SnapshotRequestHandler {
         accounts_db_caching_enabled: bool,
         test_hash_calculation: bool,
         use_index_hash_calculation: bool,
+        non_snapshot_time_us: u128,
     ) -> Option<u64> {
         self.snapshot_request_receiver
             .try_iter()
             .last()
             .map(|snapshot_request| {
+                let mut total_time = Measure::start("snapshot_request_receiver_total_time");
                 let SnapshotRequest {
                     snapshot_root_bank,
                     status_cache_slot_deltas,
@@ -188,6 +193,7 @@ impl SnapshotRequestHandler {
                 let mut purge_old_snapshots_time = Measure::start("purge_old_snapshots_time");
                 snapshot_utils::purge_old_snapshots(&self.snapshot_config.snapshot_path);
                 purge_old_snapshots_time.stop();
+                total_time.stop();
 
                 datapoint_info!(
                     "handle_snapshot_requests-timing",
@@ -205,6 +211,8 @@ impl SnapshotRequestHandler {
                         purge_old_snapshots_time.as_us(),
                         i64
                     ),
+                    ("total_us", total_time.as_us(), i64),
+                    ("non_snapshot_time_us", non_snapshot_time_us, i64),
                 );
                 snapshot_root_bank.block_height()
             })
@@ -251,6 +259,7 @@ impl AbsRequestHandler {
         accounts_db_caching_enabled: bool,
         test_hash_calculation: bool,
         use_index_hash_calculation: bool,
+        non_snapshot_time_us: u128,
     ) -> Option<u64> {
         self.snapshot_request_handler
             .as_ref()
@@ -259,6 +268,7 @@ impl AbsRequestHandler {
                     accounts_db_caching_enabled,
                     test_hash_calculation,
                     use_index_hash_calculation,
+                    non_snapshot_time_us,
                 )
             })
     }
@@ -266,9 +276,11 @@ impl AbsRequestHandler {
     /// `is_from_abs` is true if the caller is the AccountsBackgroundService
     pub fn handle_pruned_banks(&self, bank: &Bank, is_from_abs: bool) -> usize {
         let mut count = 0;
-        for pruned_slot in self.pruned_banks_receiver.try_iter() {
+        for (pruned_slot, pruned_bank_id) in self.pruned_banks_receiver.try_iter() {
             count += 1;
-            bank.rc.accounts.purge_slot(pruned_slot, is_from_abs);
+            bank.rc
+                .accounts
+                .purge_slot(pruned_slot, pruned_bank_id, is_from_abs);
         }
 
         count
@@ -297,87 +309,101 @@ impl AccountsBackgroundService {
         let mut last_expiration_check_time = Instant::now();
         let t_background = Builder::new()
             .name("solana-bg-accounts".to_string())
-            .spawn(move || loop {
-                if exit.load(Ordering::Relaxed) {
-                    break;
-                }
+            .spawn(move || {
+                let mut last_snapshot_end_time = None;
+                loop {
+                    if exit.load(Ordering::Relaxed) {
+                        break;
+                    }
 
-                // Grab the current root bank
-                let bank = bank_forks.read().unwrap().root_bank().clone();
+                    // Grab the current root bank
+                    let bank = bank_forks.read().unwrap().root_bank().clone();
 
-                // Purge accounts of any dead slots
-                Self::remove_dead_slots(
-                    &bank,
-                    &request_handler,
-                    &mut removed_slots_count,
-                    &mut total_remove_slots_time,
-                );
+                    // Purge accounts of any dead slots
+                    Self::remove_dead_slots(
+                        &bank,
+                        &request_handler,
+                        &mut removed_slots_count,
+                        &mut total_remove_slots_time,
+                    );
 
-                Self::expire_old_recycle_stores(&bank, &mut last_expiration_check_time);
-
-                // Check to see if there were any requests for snapshotting banks
-                // < the current root bank `bank` above.
-
-                // Claim: Any snapshot request for slot `N` found here implies that the last cleanup
-                // slot `M` satisfies `M < N`
-                //
-                // Proof: Assume for contradiction that we find a snapshot request for slot `N` here,
-                // but cleanup has already happened on some slot `M >= N`. Because the call to
-                // `bank.clean_accounts(true)` (in the code below) implies we only clean slots `<= bank - 1`,
-                // then that means in some *previous* iteration of this loop, we must have gotten a root
-                // bank for slot some slot `R` where `R > N`, but did not see the snapshot for `N` in the
-                // snapshot request channel.
-                //
-                // However, this is impossible because BankForks.set_root() will always flush the snapshot
-                // request for `N` to the snapshot request channel before setting a root `R > N`, and
-                // snapshot_request_handler.handle_requests() will always look for the latest
-                // available snapshot in the channel.
-                let snapshot_block_height = request_handler.handle_snapshot_requests(
-                    accounts_db_caching_enabled,
-                    test_hash_calculation,
-                    use_index_hash_calculation,
-                );
-                if accounts_db_caching_enabled {
-                    // Note that the flush will do an internal clean of the
-                    // cache up to bank.slot(), so should be safe as long
-                    // as any later snapshots that are taken are of
-                    // slots >= bank.slot()
-                    bank.flush_accounts_cache_if_needed();
-                }
+                    Self::expire_old_recycle_stores(&bank, &mut last_expiration_check_time);
+
+                    let non_snapshot_time = last_snapshot_end_time
+                        .map(|last_snapshot_end_time: Instant| {
+                            last_snapshot_end_time.elapsed().as_micros()
+                        })
+                        .unwrap_or_default();
+
+                    // Check to see if there were any requests for snapshotting banks
+                    // < the current root bank `bank` above.
+
+                    // Claim: Any snapshot request for slot `N` found here implies that the last cleanup
+                    // slot `M` satisfies `M < N`
+                    //
+                    // Proof: Assume for contradiction that we find a snapshot request for slot `N` here,
+                    // but cleanup has already happened on some slot `M >= N`. Because the call to
+                    // `bank.clean_accounts(true)` (in the code below) implies we only clean slots `<= bank - 1`,
+                    // then that means in some *previous* iteration of this loop, we must have gotten a root
+                    // bank for slot some slot `R` where `R > N`, but did not see the snapshot for `N` in the
+                    // snapshot request channel.
+                    //
+                    // However, this is impossible because BankForks.set_root() will always flush the snapshot
+                    // request for `N` to the snapshot request channel before setting a root `R > N`, and
+                    // snapshot_request_handler.handle_requests() will always look for the latest
+                    // available snapshot in the channel.
+                    let snapshot_block_height = request_handler.handle_snapshot_requests(
+                        accounts_db_caching_enabled,
+                        test_hash_calculation,
+                        use_index_hash_calculation,
+                        non_snapshot_time,
+                    );
+                    if snapshot_block_height.is_some() {
+                        last_snapshot_end_time = Some(Instant::now());
+                    }
 
-                if let Some(snapshot_block_height) = snapshot_block_height {
-                    // Safe, see proof above
-                    assert!(last_cleaned_block_height <= snapshot_block_height);
-                    last_cleaned_block_height = snapshot_block_height;
-                } else {
                     if accounts_db_caching_enabled {
-                        bank.shrink_candidate_slots();
-                    } else {
-                        // under sustained writes, shrink can lag behind so cap to
-                        // SHRUNKEN_ACCOUNT_PER_INTERVAL (which is based on INTERVAL_MS,
-                        // which in turn roughly associated block time)
-                        consumed_budget = bank
-                            .process_stale_slot_with_budget(
-                                consumed_budget,
-                                SHRUNKEN_ACCOUNT_PER_INTERVAL,
-                            )
-                            .min(SHRUNKEN_ACCOUNT_PER_INTERVAL);
+                        // Note that the flush will do an internal clean of the
+                        // cache up to bank.slot(), so should be safe as long
+                        // as any later snapshots that are taken are of
+                        // slots >= bank.slot()
+                        bank.flush_accounts_cache_if_needed();
                     }
-                    if bank.block_height() - last_cleaned_block_height
-                        > (CLEAN_INTERVAL_BLOCKS + thread_rng().gen_range(0, 10))
-                    {
+
+                    if let Some(snapshot_block_height) = snapshot_block_height {
+                        // Safe, see proof above
+                        assert!(last_cleaned_block_height <= snapshot_block_height);
+                        last_cleaned_block_height = snapshot_block_height;
+                    } else {
                         if accounts_db_caching_enabled {
-                            // Note that the flush will do an internal clean of the
-                            // cache up to bank.slot(), so should be safe as long
-                            // as any later snapshots that are taken are of
-                            // slots >= bank.slot()
-                            bank.force_flush_accounts_cache();
+                            bank.shrink_candidate_slots();
+                        } else {
+                            // under sustained writes, shrink can lag behind so cap to
+                            // SHRUNKEN_ACCOUNT_PER_INTERVAL (which is based on INTERVAL_MS,
+                            // which in turn roughly associated block time)
+                            consumed_budget = bank
+                                .process_stale_slot_with_budget(
+                                    consumed_budget,
+                                    SHRUNKEN_ACCOUNT_PER_INTERVAL,
+                                )
+                                .min(SHRUNKEN_ACCOUNT_PER_INTERVAL);
+                        }
+                        if bank.block_height() - last_cleaned_block_height
+                            > (CLEAN_INTERVAL_BLOCKS + thread_rng().gen_range(0, 10))
+                        {
+                            if accounts_db_caching_enabled {
+                                // Note that the flush will do an internal clean of the
+                                // cache up to bank.slot(), so should be safe as long
+                                // as any later snapshots that are taken are of
+                                // slots >= bank.slot()
+                                bank.force_flush_accounts_cache();
+                            }
+                            bank.clean_accounts(true, false);
+                            last_cleaned_block_height = bank.block_height();
                         }
-                        bank.clean_accounts(true, false);
-                        last_cleaned_block_height = bank.block_height();
                     }
+                    sleep(Duration::from_millis(INTERVAL_MS));
                 }
-                sleep(Duration::from_millis(INTERVAL_MS));
             })
             .unwrap();
         Self { t_background }
@@ -394,7 +420,7 @@ impl AccountsBackgroundService {
         total_remove_slots_time: &mut u64,
     ) {
         let mut remove_slots_time = Measure::start("remove_slots_time");
-        *removed_slots_count += request_handler.handle_pruned_banks(&bank, true);
+        *removed_slots_count += request_handler.handle_pruned_banks(bank, true);
         remove_slots_time.stop();
         *total_remove_slots_time += remove_slots_time.as_us();
 
@@ -444,7 +470,7 @@ mod test {
             &AccountSharedData::new(264, 0, &Pubkey::default()),
         );
         assert!(bank0.get_account(&account_key).is_some());
-        pruned_banks_sender.send(0).unwrap();
+        pruned_banks_sender.send((0, 0)).unwrap();
 
         assert!(!bank0.rc.accounts.scan_slot(0, |_| Some(())).is_empty());
 
diff --git a/runtime/src/accounts_cache.rs b/runtime/src/accounts_cache.rs
index 08a4e7eb171f11..8896a1eea04439 100644
--- a/runtime/src/accounts_cache.rs
+++ b/runtime/src/accounts_cache.rs
@@ -48,6 +48,10 @@ impl SlotCacheInner {
         );
     }
 
+    pub fn get_all_pubkeys(&self) -> Vec<Pubkey> {
+        self.cache.iter().map(|item| *item.key()).collect()
+    }
+
     pub fn insert(
         &self,
         pubkey: &Pubkey,
diff --git a/runtime/src/accounts_db.rs b/runtime/src/accounts_db.rs
index 8db96999da6596..9f308f0139fa14 100644
--- a/runtime/src/accounts_db.rs
+++ b/runtime/src/accounts_db.rs
@@ -24,12 +24,14 @@ use crate::{
     accounts_hash::{AccountsHash, CalculateHashIntermediate, HashStats, PreviousPass},
     accounts_index::{
         AccountIndexGetResult, AccountSecondaryIndexes, AccountsIndex, AccountsIndexRootsStats,
-        IndexKey, IsCached, SlotList, SlotSlice, ZeroLamport,
+        IndexKey, IsCached, ScanResult, SlotList, SlotSlice, ZeroLamport,
     },
     ancestors::Ancestors,
     append_vec::{AppendVec, StoredAccountMeta, StoredMeta, StoredMetaWriteVersion},
     contains::Contains,
+    pubkey_bins::PubkeyBinCalculator16,
     read_only_accounts_cache::ReadOnlyAccountsCache,
+    sorted_storages::SortedStorages,
 };
 use blake3::traits::digest::Digest;
 use crossbeam_channel::{unbounded, Receiver, Sender};
@@ -46,7 +48,7 @@ use solana_measure::measure::Measure;
 use solana_rayon_threadlimit::get_thread_count;
 use solana_sdk::{
     account::{AccountSharedData, ReadableAccount},
-    clock::{Epoch, Slot},
+    clock::{BankId, Epoch, Slot},
     genesis_config::ClusterType,
     hash::{Hash, Hasher},
     pubkey::Pubkey,
@@ -61,7 +63,7 @@ use std::{
     ops::{Range, RangeBounds},
     path::{Path, PathBuf},
     sync::atomic::{AtomicBool, AtomicU64, AtomicUsize, Ordering},
-    sync::{Arc, Mutex, MutexGuard, RwLock},
+    sync::{Arc, Condvar, Mutex, MutexGuard, RwLock},
     thread::Builder,
     time::Instant,
 };
@@ -80,7 +82,6 @@ const SCAN_SLOT_PAR_ITER_THRESHOLD: usize = 4000;
 pub const DEFAULT_FILE_SIZE: u64 = PAGE_SIZE * 1024;
 pub const DEFAULT_NUM_THREADS: u32 = 8;
 pub const DEFAULT_NUM_DIRS: u32 = 4;
-pub const SHRINK_RATIO: f64 = 0.80;
 
 // A specially reserved storage id just for entries in the cache, so that
 // operations that take a storage entry can maintain a common interface
@@ -112,6 +113,31 @@ lazy_static! {
     pub static ref FROZEN_ACCOUNT_PANIC: Arc<AtomicBool> = Arc::new(AtomicBool::new(false));
 }
 
+#[derive(Debug, Clone, Copy)]
+pub enum AccountShrinkThreshold {
+    /// Measure the total space sparseness across all candididates
+    /// And select the candidiates by using the top sparse account storage entries to shrink.
+    /// The value is the overall shrink threshold measured as ratio of the total live bytes
+    /// over the total bytes.
+    TotalSpace { shrink_ratio: f64 },
+    /// Use the following option to shrink all stores whose alive ratio is below
+    /// the specified threshold.
+    IndividalStore { shrink_ratio: f64 },
+}
+pub const DEFAULT_ACCOUNTS_SHRINK_OPTIMIZE_TOTAL_SPACE: bool = true;
+pub const DEFAULT_ACCOUNTS_SHRINK_RATIO: f64 = 0.80;
+// The default extra account space in percentage from the ideal target
+const DEFAULT_ACCOUNTS_SHRINK_THRESHOLD_OPTION: AccountShrinkThreshold =
+    AccountShrinkThreshold::TotalSpace {
+        shrink_ratio: DEFAULT_ACCOUNTS_SHRINK_RATIO,
+    };
+
+impl Default for AccountShrinkThreshold {
+    fn default() -> AccountShrinkThreshold {
+        DEFAULT_ACCOUNTS_SHRINK_THRESHOLD_OPTION
+    }
+}
+
 pub enum ScanStorageResult<R, B> {
     Cached(Vec<R>),
     Stored(B),
@@ -135,6 +161,31 @@ pub struct ErrorCounters {
     pub not_allowed_during_cluster_maintenance: usize,
 }
 
+#[derive(Default, Debug)]
+struct GenerateIndexTimings {
+    pub index_time: u64,
+    pub scan_time: u64,
+    pub insertion_time_us: u64,
+    pub min_bin_size: usize,
+    pub max_bin_size: usize,
+    pub total_items: usize,
+}
+
+impl GenerateIndexTimings {
+    pub fn report(&self) {
+        datapoint_info!(
+            "generate_index",
+            // we cannot accurately measure index insertion time because of many threads and lock contention
+            ("total_us", self.index_time, i64),
+            ("scan_stores_us", self.scan_time, i64),
+            ("insertion_time_us", self.insertion_time_us, i64),
+            ("min_bin_size", self.min_bin_size as i64, i64),
+            ("max_bin_size", self.max_bin_size as i64, i64),
+            ("total_items", self.total_items as i64, i64),
+        );
+    }
+}
+
 #[derive(Default, Debug, PartialEq, Clone)]
 pub struct AccountInfo {
     /// index identifying the append storage
@@ -163,6 +214,52 @@ impl ZeroLamport for AccountInfo {
     }
 }
 
+struct MultiThreadProgress<'a> {
+    last_update: Instant,
+    my_last_report_count: u64,
+    total_count: &'a AtomicU64,
+    report_delay_secs: u64,
+    first_caller: bool,
+    ultimate_count: u64,
+}
+
+impl<'a> MultiThreadProgress<'a> {
+    fn new(total_count: &'a AtomicU64, report_delay_secs: u64, ultimate_count: u64) -> Self {
+        Self {
+            last_update: Instant::now(),
+            my_last_report_count: 0,
+            total_count,
+            report_delay_secs,
+            first_caller: false,
+            ultimate_count,
+        }
+    }
+    fn report(&mut self, my_current_count: u64) {
+        let now = Instant::now();
+        if now.duration_since(self.last_update).as_secs() >= self.report_delay_secs {
+            let my_total_newly_processed_slots_since_last_report =
+                my_current_count - self.my_last_report_count;
+
+            self.my_last_report_count = my_current_count;
+            let previous_total_processed_slots_across_all_threads = self.total_count.fetch_add(
+                my_total_newly_processed_slots_since_last_report,
+                Ordering::Relaxed,
+            );
+            self.first_caller =
+                self.first_caller || 0 == previous_total_processed_slots_across_all_threads;
+            if self.first_caller {
+                info!(
+                    "generating index: {}/{} slots...",
+                    previous_total_processed_slots_across_all_threads
+                        + my_total_newly_processed_slots_since_last_report,
+                    self.ultimate_count
+                );
+            }
+            self.last_update = now;
+        }
+    }
+}
+
 /// An offset into the AccountsDb::storage vector
 pub type AppendVecId = usize;
 pub type SnapshotStorage = Vec<Arc<AccountStorageEntry>>;
@@ -282,7 +379,7 @@ impl<'a> LoadedAccount<'a> {
     pub fn owner(&self) -> &Pubkey {
         match self {
             LoadedAccount::Stored(stored_account_meta) => &stored_account_meta.account_meta.owner,
-            LoadedAccount::Cached((_, cached_account)) => &cached_account.account.owner(),
+            LoadedAccount::Cached((_, cached_account)) => cached_account.account.owner(),
         }
     }
 
@@ -305,7 +402,7 @@ impl<'a> LoadedAccount<'a> {
     pub fn pubkey(&self) -> &Pubkey {
         match self {
             LoadedAccount::Stored(stored_account_meta) => &stored_account_meta.meta.pubkey,
-            LoadedAccount::Cached((pubkey, _)) => &pubkey,
+            LoadedAccount::Cached((pubkey, _)) => pubkey,
         }
     }
 
@@ -319,7 +416,7 @@ impl<'a> LoadedAccount<'a> {
     pub fn compute_hash(&self, slot: Slot, pubkey: &Pubkey) -> Hash {
         match self {
             LoadedAccount::Stored(stored_account_meta) => {
-                AccountsDb::hash_stored_account(slot, &stored_account_meta)
+                AccountsDb::hash_stored_account(slot, stored_account_meta)
             }
             LoadedAccount::Cached((_, cached_account)) => {
                 AccountsDb::hash_account(slot, &cached_account.account, pubkey)
@@ -417,9 +514,9 @@ struct CleanKeyTimings {
     collect_delta_keys_us: u64,
     delta_insert_us: u64,
     hashset_to_vec_us: u64,
-    zero_lamport_key_clone_us: u64,
+    dirty_store_processing_us: u64,
     delta_key_count: u64,
-    zero_lamport_count: u64,
+    dirty_pubkeys_count: u64,
 }
 
 /// Persistent storage structure holding the accounts
@@ -753,11 +850,23 @@ impl RecycleStores {
     }
 }
 
+/// Removing unrooted slots in Accounts Background Service needs to be synchronized with flushing
+/// slots from the Accounts Cache.  This keeps track of those slots and the Mutex + Condvar for
+/// synchronization.
+#[derive(Debug, Default)]
+struct RemoveUnrootedSlotsSynchronization {
+    // slots being flushed from the cache or being purged
+    slots_under_contention: Mutex<HashSet<Slot>>,
+    signal: Condvar,
+}
+
+type AccountInfoAccountsIndex = AccountsIndex<AccountInfo>;
+
 // This structure handles the load/store of the accounts
 #[derive(Debug)]
 pub struct AccountsDb {
     /// Keeps tracks of index into AppendVec on a per slot basis
-    pub accounts_index: AccountsIndex<AccountInfo>,
+    pub accounts_index: AccountInfoAccountsIndex,
 
     pub storage: AccountStorage,
 
@@ -831,6 +940,18 @@ pub struct AccountsDb {
     load_limit: AtomicU64,
 
     is_bank_drop_callback_enabled: AtomicBool,
+
+    /// Set of slots currently being flushed by `flush_slot_cache()` or removed
+    /// by `remove_unrooted_slot()`. Used to ensure `remove_unrooted_slots(slots)`
+    /// can safely clear the set of unrooted slots `slots`.
+    remove_unrooted_slots_synchronization: RemoveUnrootedSlotsSynchronization,
+
+    shrink_ratio: AccountShrinkThreshold,
+
+    /// Set of stores which are recently rooted or had accounts removed
+    /// such that potentially a 0-lamport account update could be present which
+    /// means we can remove the account from the index entirely.
+    dirty_stores: DashMap<(Slot, AppendVecId), Arc<AccountStorageEntry>>,
 }
 
 #[derive(Debug, Default)]
@@ -973,7 +1094,6 @@ struct FlushStats {
     num_flushed: usize,
     num_purged: usize,
     total_size: u64,
-    did_flush: bool,
 }
 
 #[derive(Debug, Default)]
@@ -1079,6 +1199,8 @@ struct ShrinkStats {
     recycle_stores_write_elapsed: AtomicU64,
     accounts_removed: AtomicUsize,
     bytes_removed: AtomicU64,
+    bytes_written: AtomicU64,
+    skipped_shrink: AtomicU64,
 }
 
 impl ShrinkStats {
@@ -1170,6 +1292,16 @@ impl ShrinkStats {
                     self.bytes_removed.swap(0, Ordering::Relaxed) as i64,
                     i64
                 ),
+                (
+                    "bytes_written",
+                    self.bytes_written.swap(0, Ordering::Relaxed) as i64,
+                    i64
+                ),
+                (
+                    "skipped_shrink",
+                    self.skipped_shrink.swap(0, Ordering::Relaxed) as i64,
+                    i64
+                ),
             );
         }
     }
@@ -1262,10 +1394,16 @@ impl Default for AccountsDb {
             #[cfg(test)]
             load_limit: AtomicU64::default(),
             is_bank_drop_callback_enabled: AtomicBool::default(),
+            remove_unrooted_slots_synchronization: RemoveUnrootedSlotsSynchronization::default(),
+            shrink_ratio: AccountShrinkThreshold::default(),
+            dirty_stores: DashMap::default(),
         }
     }
 }
 
+type GenerateIndexAccountsMap<'a> =
+    HashMap<&'a Pubkey, (StoredMetaWriteVersion, AppendVecId, StoredAccountMeta<'a>)>;
+
 impl AccountsDb {
     pub fn new(paths: Vec<PathBuf>, cluster_type: &ClusterType) -> Self {
         AccountsDb::new_with_config(
@@ -1273,6 +1411,7 @@ impl AccountsDb {
             cluster_type,
             AccountSecondaryIndexes::default(),
             false,
+            AccountShrinkThreshold::default(),
         )
     }
 
@@ -1281,6 +1420,7 @@ impl AccountsDb {
         cluster_type: &ClusterType,
         account_indexes: AccountSecondaryIndexes,
         caching_enabled: bool,
+        shrink_ratio: AccountShrinkThreshold,
     ) -> Self {
         let mut new = if !paths.is_empty() {
             Self {
@@ -1289,6 +1429,7 @@ impl AccountsDb {
                 cluster_type: Some(*cluster_type),
                 account_indexes,
                 caching_enabled,
+                shrink_ratio,
                 ..Self::default()
             }
         } else {
@@ -1301,6 +1442,7 @@ impl AccountsDb {
                 cluster_type: Some(*cluster_type),
                 account_indexes,
                 caching_enabled,
+                shrink_ratio,
                 ..Self::default()
             }
         };
@@ -1367,11 +1509,8 @@ impl AccountsDb {
             .map(|pubkeys: &[Pubkey]| {
                 let mut reclaims = Vec::new();
                 for pubkey in pubkeys {
-                    self.accounts_index.clean_rooted_entries(
-                        &pubkey,
-                        &mut reclaims,
-                        max_clean_root,
-                    );
+                    self.accounts_index
+                        .clean_rooted_entries(pubkey, &mut reclaims, max_clean_root);
                 }
                 reclaims
             });
@@ -1444,7 +1583,7 @@ impl AccountsDb {
             };
             if no_delete {
                 let mut pending_store_ids: HashSet<usize> = HashSet::new();
-                for (_slot_id, account_info) in account_infos {
+                for (_bank_id, account_info) in account_infos {
                     if !already_counted.contains(&account_info.store_id) {
                         pending_store_ids.insert(account_info.store_id);
                     }
@@ -1460,7 +1599,7 @@ impl AccountsDb {
 
                     let affected_pubkeys = &store_counts.get(&id).unwrap().1;
                     for key in affected_pubkeys {
-                        for (_slot, account_info) in &purges.get(&key).unwrap().0 {
+                        for (_slot, account_info) in &purges.get(key).unwrap().0 {
                             if !already_counted.contains(&account_info.store_id) {
                                 pending_store_ids.insert(account_info.store_id);
                             }
@@ -1513,7 +1652,7 @@ impl AccountsDb {
         for (pubkey, slots_set) in pubkey_to_slot_set {
             let is_empty = self
                 .accounts_index
-                .purge_exact(&pubkey, slots_set, &mut reclaims);
+                .purge_exact(pubkey, slots_set, &mut reclaims);
             if is_empty {
                 dead_keys.push(pubkey);
             }
@@ -1581,20 +1720,40 @@ impl AccountsDb {
 
     // Construct a vec of pubkeys for cleaning from:
     //   uncleaned_pubkeys - the delta set of updated pubkeys in rooted slots from the last clean
-    //   zero_lamport_pubkeys - set of all alive pubkeys containing 0-lamport updates
+    //   dirty_stores - set of stores which had accounts removed or recently rooted
     fn construct_candidate_clean_keys(
         &self,
         max_clean_root: Option<Slot>,
         timings: &mut CleanKeyTimings,
     ) -> Vec<Pubkey> {
-        let mut zero_lamport_key_clone = Measure::start("zero_lamport_key");
-        let pubkeys = self.accounts_index.zero_lamport_pubkeys().clone();
-        timings.zero_lamport_count = pubkeys.len() as u64;
-        zero_lamport_key_clone.stop();
-        timings.zero_lamport_key_clone_us += zero_lamport_key_clone.as_us();
+        let mut dirty_store_processing_time = Measure::start("dirty_store_processing");
+        let max_slot = max_clean_root.unwrap_or_else(|| self.accounts_index.max_root());
+        let mut dirty_stores = Vec::with_capacity(self.dirty_stores.len());
+        self.dirty_stores.retain(|(slot, _store_id), store| {
+            if *slot > max_slot {
+                true
+            } else {
+                dirty_stores.push((*slot, store.clone()));
+                false
+            }
+        });
+        let dirty_stores_len = dirty_stores.len();
+        let pubkeys = DashSet::new();
+        for (_slot, store) in dirty_stores {
+            for account in store.accounts.accounts(0) {
+                pubkeys.insert(account.meta.pubkey);
+            }
+        }
+        trace!(
+            "dirty_stores.len: {} pubkeys.len: {}",
+            dirty_stores_len,
+            pubkeys.len()
+        );
+        timings.dirty_pubkeys_count = pubkeys.len() as u64;
+        dirty_store_processing_time.stop();
+        timings.dirty_store_processing_us += dirty_store_processing_time.as_us();
 
         let mut collect_delta_keys = Measure::start("key_create");
-        let max_slot = max_clean_root.unwrap_or_else(|| self.accounts_index.max_root());
         let delta_keys = self.remove_uncleaned_slots_and_collect_pubkeys_up_to_slot(max_slot);
         collect_delta_keys.stop();
         timings.collect_delta_keys_us += collect_delta_keys.as_us();
@@ -1657,16 +1816,6 @@ impl AccountsDb {
                                             self.accounts_index
                                                 .roots_and_ref_count(&locked_entry, max_clean_root),
                                         );
-                                    } else {
-                                        // prune zero_lamport_pubkey set which should contain all 0-lamport
-                                        // keys whether rooted or not. A 0-lamport update may become rooted
-                                        // in the future.
-                                        if !slot_list
-                                            .iter()
-                                            .any(|(_slot, account_info)| account_info.lamports == 0)
-                                        {
-                                            self.accounts_index.remove_zero_lamport_key(pubkey);
-                                        }
                                     }
                                     // Release the lock
                                     let slot = *slot;
@@ -1690,11 +1839,7 @@ impl AccountsDb {
                                     // touched in must be unrooted.
                                     purges_old_accounts.push(*pubkey);
                                 }
-                                AccountIndexGetResult::Missing(lock) => {
-                                    // pubkey is missing from index, so remove from zero_lamports_list
-                                    self.accounts_index.remove_zero_lamport_key(pubkey);
-                                    drop(lock);
-                                }
+                                AccountIndexGetResult::Missing(_lock) => {}
                             };
                         }
                         (purges_zero_lamports, purges_old_accounts)
@@ -1734,12 +1879,12 @@ impl AccountsDb {
         // Then purge if we can
         let mut store_counts: HashMap<AppendVecId, (usize, HashSet<Pubkey>)> = HashMap::new();
         for (key, (account_infos, ref_count)) in purges_zero_lamports.iter_mut() {
-            if purged_account_slots.contains_key(&key) {
-                *ref_count = self.accounts_index.ref_count_from_storage(&key);
+            if purged_account_slots.contains_key(key) {
+                *ref_count = self.accounts_index.ref_count_from_storage(key);
             }
             account_infos.retain(|(slot, account_info)| {
                 let was_slot_purged = purged_account_slots
-                    .get(&key)
+                    .get(key)
                     .map(|slots_removed| slots_removed.contains(slot))
                     .unwrap_or(false);
                 if was_slot_purged {
@@ -1836,8 +1981,8 @@ impl AccountsDb {
                 i64
             ),
             (
-                "zero_lamport_key_clone_us",
-                key_timings.zero_lamport_key_clone_us,
+                "dirty_store_processing_us",
+                key_timings.dirty_store_processing_us,
                 i64
             ),
             ("accounts_scan", accounts_scan.as_us() as i64, i64),
@@ -1847,7 +1992,7 @@ impl AccountsDb {
             ("calc_deps", calc_deps_time.as_us() as i64, i64),
             ("reclaims", reclaims_time.as_us() as i64, i64),
             ("delta_key_count", key_timings.delta_key_count, i64),
-            ("zero_lamport_count", key_timings.zero_lamport_count, i64),
+            ("dirty_pubkeys_count", key_timings.dirty_pubkeys_count, i64),
             ("total_keys_count", total_keys_count, i64),
         );
     }
@@ -1933,7 +2078,7 @@ impl AccountsDb {
             return;
         }
         let mut clean_dead_slots = Measure::start("reclaims::clean_dead_slots");
-        self.clean_stored_dead_slots(&dead_slots, purged_account_slots);
+        self.clean_stored_dead_slots(dead_slots, purged_account_slots);
         clean_dead_slots.stop();
 
         let mut purge_removed_slots = Measure::start("reclaims::purge_removed_slots");
@@ -1958,7 +2103,7 @@ impl AccountsDb {
         );
     }
 
-    fn do_shrink_slot_stores<'a, I>(&'a self, slot: Slot, stores: I, is_startup: bool) -> usize
+    fn do_shrink_slot_stores<'a, I>(&'a self, slot: Slot, stores: I, _is_startup: bool) -> usize
     where
         I: Iterator<Item = &'a Arc<AccountStorageEntry>>,
     {
@@ -1970,6 +2115,7 @@ impl AccountsDb {
         debug!("do_shrink_slot_stores: slot: {}", slot);
         let mut stored_accounts: HashMap<Pubkey, FoundStoredAccount> = HashMap::new();
         let mut original_bytes = 0;
+        let mut num_stores = 0;
         for store in stores {
             let mut start = 0;
             original_bytes += store.total_bytes();
@@ -1993,63 +2139,61 @@ impl AccountsDb {
                 }
                 start = next;
             }
+            num_stores += 1;
         }
 
         let mut index_read_elapsed = Measure::start("index_read_elapsed");
         let mut alive_total = 0;
-        let accounts_index_map_lock = if is_startup {
-            // at startup, there is nobody else to contend with the accounts_index read lock, so it is more efficient for us to keep it held
-            Some(self.accounts_index.get_account_maps_read_lock())
-        } else {
-            None
-        };
-        let accounts_index_map_lock_ref = accounts_index_map_lock.as_ref();
-
-        let alive_accounts: Vec<_> = stored_accounts
-            .iter()
-            .filter(|(pubkey, stored_account)| {
-                let lookup = if is_startup {
-                    self.accounts_index.get_account_read_entry_with_lock(
-                        pubkey,
-                        accounts_index_map_lock_ref.unwrap(),
-                    )
-                } else {
-                    self.accounts_index.get_account_read_entry(pubkey)
-                };
 
-                if let Some(locked_entry) = lookup {
-                    let is_alive = locked_entry.slot_list().iter().any(|(_slot, i)| {
-                        i.store_id == stored_account.store_id
-                            && i.offset == stored_account.account.offset
-                    });
-                    if !is_alive {
-                        // This pubkey was found in the storage, but no longer exists in the index.
-                        // It would have had a ref to the storage from the initial store, but it will
-                        // not exist in the re-written slot. Unref it to keep the index consistent with
-                        // rewriting the storage entries.
-                        locked_entry.unref()
-                    } else {
-                        alive_total += stored_account.account_size as u64;
-                    }
-                    is_alive
+        let mut alive_accounts: Vec<_> = Vec::with_capacity(stored_accounts.len());
+        let mut unrefed_pubkeys = vec![];
+        for (pubkey, stored_account) in &stored_accounts {
+            let lookup = self.accounts_index.get_account_read_entry(pubkey);
+            if let Some(locked_entry) = lookup {
+                let is_alive = locked_entry.slot_list().iter().any(|(_slot, i)| {
+                    i.store_id == stored_account.store_id
+                        && i.offset == stored_account.account.offset
+                });
+                if !is_alive {
+                    // This pubkey was found in the storage, but no longer exists in the index.
+                    // It would have had a ref to the storage from the initial store, but it will
+                    // not exist in the re-written slot. Unref it to keep the index consistent with
+                    // rewriting the storage entries.
+                    unrefed_pubkeys.push(pubkey);
+                    locked_entry.unref()
                 } else {
-                    false
+                    alive_accounts.push((pubkey, stored_account));
+                    alive_total += stored_account.account_size;
                 }
-            })
-            .collect();
-        drop(accounts_index_map_lock);
+            }
+        }
+
         index_read_elapsed.stop();
-        let aligned_total: u64 = self.page_align(alive_total);
+        let aligned_total: u64 = Self::page_align(alive_total as u64);
+
+        // This shouldn't happen if alive_bytes/approx_stored_count are accurate
+        if Self::should_not_shrink(aligned_total, original_bytes, num_stores) {
+            self.shrink_stats
+                .skipped_shrink
+                .fetch_add(1, Ordering::Relaxed);
+            for pubkey in unrefed_pubkeys {
+                if let Some(locked_entry) = self.accounts_index.get_account_read_entry(pubkey) {
+                    locked_entry.addref();
+                }
+            }
+            return 0;
+        }
 
         let total_starting_accounts = stored_accounts.len();
         let total_accounts_after_shrink = alive_accounts.len();
         debug!(
-            "shrinking: slot: {}, total_starting_accounts: {} => total_accounts_after_shrink: {} ({} bytes; aligned to: {})",
+            "shrinking: slot: {}, accounts: ({} => {}) bytes: ({} ; aligned to: {}) original: {}",
             slot,
             total_starting_accounts,
             total_accounts_after_shrink,
             alive_total,
-            aligned_total
+            aligned_total,
+            original_bytes,
         );
 
         let mut rewrite_elapsed = Measure::start("rewrite_elapsed");
@@ -2116,6 +2260,8 @@ impl AccountsDb {
             if let Some(slot_stores) = self.storage.get_slot_stores(slot) {
                 slot_stores.write().unwrap().retain(|_key, store| {
                     if store.count() == 0 {
+                        self.dirty_stores
+                            .insert((slot, store.append_vec_id()), store.clone());
                         dead_storages.push(store.clone());
                         false
                     } else {
@@ -2189,6 +2335,10 @@ impl AccountsDb {
             original_bytes.saturating_sub(aligned_total),
             Ordering::Relaxed,
         );
+        self.shrink_stats
+            .bytes_written
+            .fetch_add(aligned_total, Ordering::Relaxed);
+
         self.shrink_stats.report();
 
         total_accounts_after_shrink
@@ -2202,23 +2352,10 @@ impl AccountsDb {
         if let Some(stores_lock) = self.storage.get_slot_stores(slot) {
             let stores: Vec<Arc<AccountStorageEntry>> =
                 stores_lock.read().unwrap().values().cloned().collect();
-            let mut alive_count = 0;
-            let mut stored_count = 0;
-            for store in &stores {
-                alive_count += store.count();
-                stored_count += store.approx_stored_count();
-            }
-            if alive_count == stored_count && stores.len() == 1 {
-                trace!(
-                    "shrink_slot_forced ({}): not able to shrink at all: alive/stored: {} / {}",
-                    slot,
-                    alive_count,
-                    stored_count,
-                );
+            if !Self::is_shrinking_productive(slot, &stores) {
                 return 0;
             }
-            self.do_shrink_slot_stores(slot, stores.iter(), is_startup);
-            alive_count
+            self.do_shrink_slot_stores(slot, stores.iter(), is_startup)
         } else {
             0
         }
@@ -2232,25 +2369,123 @@ impl AccountsDb {
         self.accounts_index.all_roots()
     }
 
+    /// Given the input `ShrinkCandidates`, this function sorts the stores by their alive ratio
+    /// in increasing order with the most sparse entries in the front. It will then simulate the
+    /// shrinking by working on the most sparse entries first and if the overall alive ratio is
+    /// achieved, it will stop and return the filtered-down candidates.
+    fn select_candidates_by_total_usage(
+        &self,
+        shrink_slots: &ShrinkCandidates,
+        shrink_ratio: f64,
+    ) -> ShrinkCandidates {
+        struct StoreUsageInfo {
+            slot: Slot,
+            alive_ratio: f64,
+            store: Arc<AccountStorageEntry>,
+        }
+        let mut measure = Measure::start("select_top_sparse_storage_entries-ms");
+        let mut store_usage: Vec<StoreUsageInfo> = Vec::with_capacity(shrink_slots.len());
+        let mut total_alive_bytes: u64 = 0;
+        let mut candidates_count: usize = 0;
+        let mut total_bytes: u64 = 0;
+        for (slot, slot_shrink_candidates) in shrink_slots {
+            candidates_count += slot_shrink_candidates.len();
+            for store in slot_shrink_candidates.values() {
+                total_alive_bytes += Self::page_align(store.alive_bytes() as u64);
+                total_bytes += store.total_bytes();
+                let alive_ratio = Self::page_align(store.alive_bytes() as u64) as f64
+                    / store.total_bytes() as f64;
+                store_usage.push(StoreUsageInfo {
+                    slot: *slot,
+                    alive_ratio,
+                    store: store.clone(),
+                });
+            }
+        }
+        store_usage.sort_by(|a, b| {
+            a.alive_ratio
+                .partial_cmp(&b.alive_ratio)
+                .unwrap_or(std::cmp::Ordering::Equal)
+        });
+
+        // Working from the beginning of store_usage which are the most sparse and see when we can stop
+        // shrinking while still achieving the overall goals.
+        let mut shrink_slots: ShrinkCandidates = HashMap::new();
+        for usage in &store_usage {
+            let alive_ratio = (total_alive_bytes as f64) / (total_bytes as f64);
+            if alive_ratio > shrink_ratio {
+                // we have reached our goal, stop
+                debug!(
+                    "Shrinking goal can be achieved at slot {:?}, total_alive_bytes: {:?} \
+                    total_bytes: {:?}, alive_ratio: {:}, shrink_ratio: {:?}",
+                    usage.slot, total_alive_bytes, total_bytes, alive_ratio, shrink_ratio
+                );
+                break;
+            }
+            let store = &usage.store;
+            let current_store_size = store.total_bytes();
+            let after_shrink_size = Self::page_align(store.alive_bytes() as u64);
+            let bytes_saved = current_store_size.saturating_sub(after_shrink_size);
+            total_bytes -= bytes_saved;
+            shrink_slots
+                .entry(usage.slot)
+                .or_default()
+                .insert(store.append_vec_id(), store.clone());
+        }
+        measure.stop();
+        inc_new_counter_info!(
+            "select_top_sparse_storage_entries-ms",
+            measure.as_ms() as usize
+        );
+        inc_new_counter_info!("select_top_sparse_storage_entries-seeds", candidates_count);
+        shrink_slots
+    }
+
     pub fn shrink_candidate_slots(&self) -> usize {
-        let shrink_slots = std::mem::take(&mut *self.shrink_candidate_slots.lock().unwrap());
+        let shrink_candidates_slots =
+            std::mem::take(&mut *self.shrink_candidate_slots.lock().unwrap());
+        let shrink_slots = {
+            if let AccountShrinkThreshold::TotalSpace { shrink_ratio } = self.shrink_ratio {
+                self.select_candidates_by_total_usage(&shrink_candidates_slots, shrink_ratio)
+            } else {
+                shrink_candidates_slots
+            }
+        };
+
+        let mut measure_shrink_all_candidates = Measure::start("shrink_all_candidate_slots-ms");
         let num_candidates = shrink_slots.len();
+        let mut shrink_candidates_count: usize = 0;
         for (slot, slot_shrink_candidates) in shrink_slots {
+            shrink_candidates_count += slot_shrink_candidates.len();
             let mut measure = Measure::start("shrink_candidate_slots-ms");
             self.do_shrink_slot_stores(slot, slot_shrink_candidates.values(), false);
             measure.stop();
             inc_new_counter_info!("shrink_candidate_slots-ms", measure.as_ms() as usize);
         }
+        measure_shrink_all_candidates.stop();
+        inc_new_counter_info!(
+            "shrink_all_candidate_slots-ms",
+            measure_shrink_all_candidates.as_ms() as usize
+        );
+        inc_new_counter_info!("shrink_all_candidate_slots-count", shrink_candidates_count);
         num_candidates
     }
 
     pub fn shrink_all_slots(&self, is_startup: bool) {
+        const DIRTY_STORES_CLEANING_THRESHOLD: usize = 10_000;
+        const OUTER_CHUNK_SIZE: usize = 2000;
+        const INNER_CHUNK_SIZE: usize = OUTER_CHUNK_SIZE / 8;
         if is_startup && self.caching_enabled {
             let slots = self.all_slots_in_storage();
-            let chunk_size = std::cmp::max(slots.len() / 8, 1); // approximately 400k slots in a snapshot
-            slots.par_chunks(chunk_size).for_each(|slots| {
-                for slot in slots {
-                    self.shrink_slot_forced(*slot, is_startup);
+            let inner_chunk_size = std::cmp::max(INNER_CHUNK_SIZE, 1);
+            slots.chunks(OUTER_CHUNK_SIZE).for_each(|chunk| {
+                chunk.par_chunks(inner_chunk_size).for_each(|slots| {
+                    for slot in slots {
+                        self.shrink_slot_forced(*slot, is_startup);
+                    }
+                });
+                if self.dirty_stores.len() > DIRTY_STORES_CLEANING_THRESHOLD {
+                    self.clean_accounts(None, is_startup);
                 }
             });
         } else {
@@ -2260,25 +2495,36 @@ impl AccountsDb {
                 } else {
                     self.do_shrink_slot_forced_v1(slot);
                 }
+                if self.dirty_stores.len() > DIRTY_STORES_CLEANING_THRESHOLD {
+                    self.clean_accounts(None, is_startup);
+                }
             }
         }
     }
 
-    pub fn scan_accounts<F, A>(&self, ancestors: &Ancestors, scan_func: F) -> A
+    pub fn scan_accounts<F, A>(
+        &self,
+        ancestors: &Ancestors,
+        bank_id: BankId,
+        scan_func: F,
+    ) -> ScanResult<A>
     where
         F: Fn(&mut A, Option<(&Pubkey, AccountSharedData, Slot)>),
         A: Default,
     {
         let mut collector = A::default();
+
+        // This can error out if the slots being scanned over are aborted
         self.accounts_index
-            .scan_accounts(ancestors, |pubkey, (account_info, slot)| {
+            .scan_accounts(ancestors, bank_id, |pubkey, (account_info, slot)| {
                 let account_slot = self
                     .get_account_accessor(slot, pubkey, account_info.store_id, account_info.offset)
                     .get_loaded_account()
                     .map(|loaded_account| (pubkey, loaded_account.take_account(), slot));
                 scan_func(&mut collector, account_slot)
-            });
-        collector
+            })?;
+
+        Ok(collector)
     }
 
     pub fn unchecked_scan_accounts<F, A>(
@@ -2348,9 +2594,10 @@ impl AccountsDb {
     pub fn index_scan_accounts<F, A>(
         &self,
         ancestors: &Ancestors,
+        bank_id: BankId,
         index_key: IndexKey,
         scan_func: F,
-    ) -> (A, bool)
+    ) -> ScanResult<(A, bool)>
     where
         F: Fn(&mut A, Option<(&Pubkey, AccountSharedData, Slot)>),
         A: Default,
@@ -2363,12 +2610,14 @@ impl AccountsDb {
         if !self.account_indexes.include_key(key) {
             // the requested key was not indexed in the secondary index, so do a normal scan
             let used_index = false;
-            return (self.scan_accounts(ancestors, scan_func), used_index);
+            let scan_result = self.scan_accounts(ancestors, bank_id, scan_func)?;
+            return Ok((scan_result, used_index));
         }
 
         let mut collector = A::default();
         self.accounts_index.index_scan_accounts(
             ancestors,
+            bank_id,
             index_key,
             |pubkey, (account_info, slot)| {
                 let account_slot = self
@@ -2377,9 +2626,9 @@ impl AccountsDb {
                     .map(|loaded_account| (pubkey, loaded_account.take_account(), slot));
                 scan_func(&mut collector, account_slot)
             },
-        );
+        )?;
         let used_index = true;
-        (collector, used_index)
+        Ok((collector, used_index))
     }
 
     /// Scan a specific slot through all the account storage in parallel
@@ -3029,7 +3278,7 @@ impl AccountsDb {
         store
     }
 
-    fn page_align(&self, size: u64) -> u64 {
+    fn page_align(size: u64) -> u64 {
         (size + (PAGE_SIZE - 1)) & !(PAGE_SIZE - 1)
     }
 
@@ -3056,8 +3305,8 @@ impl AccountsDb {
         let path_index = thread_rng().gen_range(0, paths.len());
         let store = Arc::new(self.new_storage_entry(
             slot,
-            &Path::new(&paths[path_index]),
-            self.page_align(size),
+            Path::new(&paths[path_index]),
+            Self::page_align(size),
         ));
 
         if store.append_vec_id() == CACHE_VIRTUAL_STORAGE_ID {
@@ -3128,14 +3377,29 @@ impl AccountsDb {
         SendDroppedBankCallback::new(pruned_banks_sender)
     }
 
+    /// This should only be called after the `Bank::drop()` runs in bank.rs, See BANK_DROP_SAFETY
+    /// comment below for more explanation.
     /// `is_from_abs` is true if the caller is the AccountsBackgroundService
-    pub fn purge_slot(&self, slot: Slot, is_from_abs: bool) {
+    pub fn purge_slot(&self, slot: Slot, bank_id: BankId, is_from_abs: bool) {
         if self.is_bank_drop_callback_enabled.load(Ordering::SeqCst) && !is_from_abs {
             panic!("bad drop callpath detected; Bank::drop() must run serially with other logic in ABS like clean_accounts()")
         }
-        let mut slots = HashSet::new();
-        slots.insert(slot);
-        self.purge_slots(&slots);
+        // BANK_DROP_SAFETY: Because this function only runs once the bank is dropped,
+        // we know that there are no longer any ongoing scans on this bank, because scans require
+        // and hold a reference to the bank at the tip of the fork they're scanning. Hence it's
+        // safe to remove this bank_id from the `removed_bank_ids` list at this point.
+        if self
+            .accounts_index
+            .removed_bank_ids
+            .lock()
+            .unwrap()
+            .remove(&bank_id)
+        {
+            // If this slot was already cleaned up, no need to do any further cleans
+            return;
+        }
+
+        self.purge_slots(std::iter::once(&slot));
     }
 
     fn recycle_slot_stores(
@@ -3169,7 +3433,7 @@ impl AccountsDb {
     /// Purges every slot in `removed_slots` from both the cache and storage. This includes
     /// entries in the accounts index, cache entries, and any backing storage entries.
     fn purge_slots_from_cache_and_store<'a>(
-        &'a self,
+        &self,
         removed_slots: impl Iterator<Item = &'a Slot>,
         purge_stats: &PurgeStats,
     ) {
@@ -3180,7 +3444,11 @@ impl AccountsDb {
             // This function is only currently safe with respect to `flush_slot_cache()` because
             // both functions run serially in AccountsBackgroundService.
             let mut remove_cache_elapsed = Measure::start("remove_cache_elapsed");
-            if let Some(slot_cache) = self.accounts_cache.remove_slot(*remove_slot) {
+            // Note: we cannot remove this slot from the slot cache until we've removed its
+            // entries from the accounts index first. This is because `scan_accounts()` relies on
+            // holding the index lock, finding the index entry, and then looking up the entry
+            // in the cache. If it fails to find that entry, it will panic in `get_loaded_account()`
+            if let Some(slot_cache) = self.accounts_cache.slot_cache(*remove_slot) {
                 // If the slot is still in the cache, remove the backing storages for
                 // the slot and from the Accounts Index
                 num_cached_slots_removed += 1;
@@ -3188,6 +3456,8 @@ impl AccountsDb {
                 self.purge_slot_cache(*remove_slot, slot_cache);
                 remove_cache_elapsed.stop();
                 remove_cache_elapsed_across_slots += remove_cache_elapsed.as_us();
+                // Nobody else shoud have removed the slot cache entry yet
+                assert!(self.accounts_cache.remove_slot(*remove_slot).is_some());
             } else {
                 self.purge_slot_storage(*remove_slot, purge_stats);
             }
@@ -3237,7 +3507,7 @@ impl AccountsDb {
         let mut remove_storage_entries_elapsed = Measure::start("remove_storage_entries_elapsed");
         for remove_slot in removed_slots {
             // Remove the storage entries and collect some metrics
-            if let Some((_, slot_storages_to_be_removed)) = self.storage.0.remove(&remove_slot) {
+            if let Some((_, slot_storages_to_be_removed)) = self.storage.0.remove(remove_slot) {
                 {
                     let r_slot_removed_storages = slot_storages_to_be_removed.read().unwrap();
                     total_removed_storage_entries += r_slot_removed_storages.len();
@@ -3375,49 +3645,120 @@ impl AccountsDb {
     }
 
     #[allow(clippy::needless_collect)]
-    fn purge_slots(&self, slots: &HashSet<Slot>) {
+    fn purge_slots<'a>(&self, slots: impl Iterator<Item = &'a Slot>) {
         // `add_root()` should be called first
         let mut safety_checks_elapsed = Measure::start("safety_checks_elapsed");
-        let non_roots: Vec<&Slot> = slots
-            .iter()
-            .filter(|slot| !self.accounts_index.is_root(**slot))
-            .collect();
+        let non_roots = slots
+            // Only safe to check when there are  duplciate versions of a slot
+            // because ReplayStage will not make new roots before dumping the
+            // duplicate slots first. Thus we will not be in a case where we
+            // root slot `S`, then try to dump some other version of slot `S`, the
+            // dumping has to finish first
+            //
+            // Also note roots are never removed via `remove_unrooted_slot()`, so
+            // it's safe to filter them out here as they won't need deletion from
+            // self.accounts_index.removed_bank_ids in `purge_slots_from_cache_and_store()`.
+            .filter(|slot| !self.accounts_index.is_root(**slot));
         safety_checks_elapsed.stop();
         self.external_purge_slots_stats
             .safety_checks_elapsed
             .fetch_add(safety_checks_elapsed.as_us(), Ordering::Relaxed);
-        self.purge_slots_from_cache_and_store(
-            non_roots.into_iter(),
-            &self.external_purge_slots_stats,
-        );
+        self.purge_slots_from_cache_and_store(non_roots, &self.external_purge_slots_stats);
         self.external_purge_slots_stats
             .report("external_purge_slots_stats", Some(1000));
     }
 
-    // TODO: This is currently:
-    // 1. Unsafe with scan because it can remove a slot in the middle
-    // of a scan.
-    // 2. Doesn't handle cache flushes that happen during the slot deletion (see comment below).
-    pub fn remove_unrooted_slot(&self, remove_slot: Slot) {
-        if self.accounts_index.is_root(remove_slot) {
-            panic!("Trying to remove accounts for rooted slot {}", remove_slot);
-        }
-
-        // TODO: Handle if the slot was flushed to storage while we were removing the cached
-        // slot above, i.e. it's possible the storage contains partial version of the current
-        // slot. One way to handle this is to augment slots to contain a "version", That way,
-        // 1) We clean older versions via the natural clean() pipeline
-        // without having to call this function out of band.
-        // 2) This deletion doesn't have to block on scan
-        // Reads will then always read the latest version of a slot. Scans will also know
-        // which version their parents because banks will also be augmented with this version,
-        // which handles cases where a deletion of one version happens in the middle of the scan.
+    pub fn remove_unrooted_slots(&self, remove_slots: &[(Slot, BankId)]) {
+        let rooted_slots = self
+            .accounts_index
+            .get_rooted_from_list(remove_slots.iter().map(|(slot, _)| slot));
+        assert!(
+            rooted_slots.is_empty(),
+            "Trying to remove accounts for rooted slots {:?}",
+            rooted_slots
+        );
+
+        let RemoveUnrootedSlotsSynchronization {
+            slots_under_contention,
+            signal,
+        } = &self.remove_unrooted_slots_synchronization;
+
+        {
+            // Slots that are currently being flushed by flush_slot_cache()
+            let mut currently_contended_slots = slots_under_contention.lock().unwrap();
+
+            // Slots that are currently being flushed by flush_slot_cache() AND
+            // we want to remove in this function
+            let mut remaining_contended_flush_slots: Vec<Slot> = remove_slots
+                .iter()
+                .filter_map(|(remove_slot, _)| {
+                    let is_being_flushed = currently_contended_slots.contains(remove_slot);
+                    if !is_being_flushed {
+                        // Reserve the slots that we want to purge that aren't currently
+                        // being flushed to prevent cache from flushing those slots in
+                        // the future.
+                        //
+                        // Note that the single replay thread has to remove a specific slot `N`
+                        // before another version of the same slot can be replayed. This means
+                        // multiple threads should not call `remove_unrooted_slots()` simultaneously
+                        // with the same slot.
+                        currently_contended_slots.insert(*remove_slot);
+                    }
+                    // If the cache is currently flushing this slot, add it to the list
+                    Some(remove_slot).filter(|_| is_being_flushed)
+                })
+                .cloned()
+                .collect();
+
+            // Wait for cache flushes to finish
+            loop {
+                if !remaining_contended_flush_slots.is_empty() {
+                    // Wait for the signal that the cache has finished flushing a slot
+                    //
+                    // Don't wait if the remaining_contended_flush_slots is empty, otherwise
+                    // we may never get a signal since there's no cache flush thread to
+                    // do the signaling
+                    currently_contended_slots = signal.wait(currently_contended_slots).unwrap();
+                } else {
+                    // There are no slots being flushed to wait on, so it's safe to continue
+                    // to purging the slots we want to purge!
+                    break;
+                }
+
+                // For each slot the cache flush has finished, mark that we're about to start
+                // purging these slots by reserving it in `currently_contended_slots`.
+                remaining_contended_flush_slots.retain(|flush_slot| {
+                    let is_being_flushed = currently_contended_slots.contains(flush_slot);
+                    if !is_being_flushed {
+                        // Mark that we're about to delete this slot now
+                        currently_contended_slots.insert(*flush_slot);
+                    }
+                    is_being_flushed
+                });
+            }
+        }
+
+        // Mark down these slots are about to be purged so that new attempts to scan these
+        // banks fail, and any ongoing scans over these slots will detect that they should abort
+        // their results
+        {
+            let mut locked_removed_bank_ids = self.accounts_index.removed_bank_ids.lock().unwrap();
+            for (_slot, remove_bank_id) in remove_slots.iter() {
+                locked_removed_bank_ids.insert(*remove_bank_id);
+            }
+        }
+
         let remove_unrooted_purge_stats = PurgeStats::default();
         self.purge_slots_from_cache_and_store(
-            std::iter::once(&remove_slot),
+            remove_slots.iter().map(|(slot, _)| slot),
             &remove_unrooted_purge_stats,
         );
         remove_unrooted_purge_stats.report("remove_unrooted_slots_purge_slots_stats", Some(0));
+
+        let mut currently_contended_slots = slots_under_contention.lock().unwrap();
+        for (remove_slot, _) in remove_slots {
+            assert!(currently_contended_slots.remove(remove_slot));
+        }
     }
 
     pub fn hash_stored_account(slot: Slot, account: &StoredAccountMeta) -> Hash {
@@ -3436,10 +3777,10 @@ impl AccountsDb {
         Self::hash_account_data(
             slot,
             account.lamports(),
-            &account.owner(),
+            account.owner(),
             account.executable(),
             account.rent_epoch(),
-            &account.data(),
+            account.data(),
             pubkey,
         )
     }
@@ -3447,8 +3788,8 @@ impl AccountsDb {
     fn hash_frozen_account_data(account: &AccountSharedData) -> Hash {
         let mut hasher = Hasher::default();
 
-        hasher.hash(&account.data());
-        hasher.hash(&account.owner().as_ref());
+        hasher.hash(account.data());
+        hasher.hash(account.owner().as_ref());
 
         if account.executable() {
             hasher.hash(&[1u8; 1]);
@@ -3480,7 +3821,7 @@ impl AccountsDb {
 
         hasher.update(&rent_epoch.to_le_bytes());
 
-        hasher.update(&data);
+        hasher.update(data);
 
         if executable {
             hasher.update(&[1u8; 1]);
@@ -3488,8 +3829,8 @@ impl AccountsDb {
             hasher.update(&[0u8; 1]);
         }
 
-        hasher.update(&owner.as_ref());
-        hasher.update(&pubkey.as_ref());
+        hasher.update(owner.as_ref());
+        hasher.update(pubkey.as_ref());
 
         Hash(<[u8; solana_sdk::hash::HASH_BYTES]>::try_from(hasher.finalize().as_slice()).unwrap())
     }
@@ -3770,7 +4111,7 @@ impl AccountsDb {
                 should_flush_f.as_mut()
             };
 
-            if self.flush_slot_cache(root, should_flush_f).did_flush {
+            if self.flush_slot_cache(root, should_flush_f).is_some() {
                 num_roots_flushed += 1;
             }
 
@@ -3792,101 +4133,134 @@ impl AccountsDb {
         (num_new_roots, num_roots_flushed)
     }
 
-    // `should_flush_f` is an optional closure that determines whether a given
-    // account should be flushed. Passing `None` will by default flush all
-    // accounts
-    fn flush_slot_cache(
+    fn do_flush_slot_cache(
         &self,
         slot: Slot,
+        slot_cache: &SlotCache,
         mut should_flush_f: Option<&mut impl FnMut(&Pubkey, &AccountSharedData) -> bool>,
     ) -> FlushStats {
         let mut num_purged = 0;
         let mut total_size = 0;
         let mut num_flushed = 0;
-        let did_flush = if let Some(slot_cache) = self.accounts_cache.slot_cache(slot) {
-            let iter_items: Vec<_> = slot_cache.iter().collect();
-            let mut purged_slot_pubkeys: HashSet<(Slot, Pubkey)> = HashSet::new();
-            let mut pubkey_to_slot_set: Vec<(Pubkey, Slot)> = vec![];
-            let (accounts, hashes): (Vec<(&Pubkey, &AccountSharedData)>, Vec<Hash>) = iter_items
-                .iter()
-                .filter_map(|iter_item| {
-                    let key = iter_item.key();
-                    let account = &iter_item.value().account;
-                    let should_flush = should_flush_f
-                        .as_mut()
-                        .map(|should_flush_f| should_flush_f(key, account))
-                        .unwrap_or(true);
-                    if should_flush {
-                        let hash = iter_item.value().hash();
-                        total_size += (account.data().len() + STORE_META_OVERHEAD) as u64;
-                        num_flushed += 1;
-                        Some(((key, account), hash))
-                    } else {
-                        // If we don't flush, we have to remove the entry from the
-                        // index, since it's equivalent to purging
-                        purged_slot_pubkeys.insert((slot, *key));
-                        pubkey_to_slot_set.push((*key, slot));
-                        num_purged += 1;
-                        None
-                    }
-                })
-                .unzip();
-
-            let is_dead_slot = accounts.is_empty();
-            // Remove the account index entries from earlier roots that are outdated by later roots.
-            // Safe because queries to the index will be reading updates from later roots.
-            self.purge_slot_cache_pubkeys(
+        let iter_items: Vec<_> = slot_cache.iter().collect();
+        let mut purged_slot_pubkeys: HashSet<(Slot, Pubkey)> = HashSet::new();
+        let mut pubkey_to_slot_set: Vec<(Pubkey, Slot)> = vec![];
+        let (accounts, hashes): (Vec<(&Pubkey, &AccountSharedData)>, Vec<Hash>) = iter_items
+            .iter()
+            .filter_map(|iter_item| {
+                let key = iter_item.key();
+                let account = &iter_item.value().account;
+                let should_flush = should_flush_f
+                    .as_mut()
+                    .map(|should_flush_f| should_flush_f(key, account))
+                    .unwrap_or(true);
+                if should_flush {
+                    let hash = iter_item.value().hash();
+                    total_size += (account.data().len() + STORE_META_OVERHEAD) as u64;
+                    num_flushed += 1;
+                    Some(((key, account), hash))
+                } else {
+                    // If we don't flush, we have to remove the entry from the
+                    // index, since it's equivalent to purging
+                    purged_slot_pubkeys.insert((slot, *key));
+                    pubkey_to_slot_set.push((*key, slot));
+                    num_purged += 1;
+                    None
+                }
+            })
+            .unzip();
+
+        let is_dead_slot = accounts.is_empty();
+        // Remove the account index entries from earlier roots that are outdated by later roots.
+        // Safe because queries to the index will be reading updates from later roots.
+        self.purge_slot_cache_pubkeys(slot, purged_slot_pubkeys, pubkey_to_slot_set, is_dead_slot);
+
+        if !is_dead_slot {
+            let aligned_total_size = Self::page_align(total_size);
+            // This ensures that all updates are written to an AppendVec, before any
+            // updates to the index happen, so anybody that sees a real entry in the index,
+            // will be able to find the account in storage
+            let flushed_store =
+                self.create_and_insert_store(slot, aligned_total_size, "flush_slot_cache");
+            self.store_accounts_frozen(
                 slot,
-                purged_slot_pubkeys,
-                pubkey_to_slot_set,
-                is_dead_slot,
+                &accounts,
+                Some(&hashes),
+                Some(Box::new(move |_, _| flushed_store.clone())),
+                None,
             );
+            // If the above sizing function is correct, just one AppendVec is enough to hold
+            // all the data for the slot
+            assert_eq!(
+                self.storage
+                    .get_slot_stores(slot)
+                    .unwrap()
+                    .read()
+                    .unwrap()
+                    .len(),
+                1
+            );
+        }
 
-            if !is_dead_slot {
-                let aligned_total_size = self.page_align(total_size);
-                // This ensures that all updates are written to an AppendVec, before any
-                // updates to the index happen, so anybody that sees a real entry in the index,
-                // will be able to find the account in storage
-                let flushed_store =
-                    self.create_and_insert_store(slot, aligned_total_size, "flush_slot_cache");
-                self.store_accounts_frozen(
-                    slot,
-                    &accounts,
-                    Some(&hashes),
-                    Some(Box::new(move |_, _| flushed_store.clone())),
-                    None,
-                );
-                // If the above sizing function is correct, just one AppendVec is enough to hold
-                // all the data for the slot
-                assert_eq!(
-                    self.storage
-                        .get_slot_stores(slot)
-                        .unwrap()
-                        .read()
-                        .unwrap()
-                        .len(),
-                    1
-                );
-            }
-
-            // Remove this slot from the cache, which will to AccountsDb's new readers should look like an
-            // atomic switch from the cache to storage.
-            // There is some racy condition for existing readers who just has read exactly while
-            // flushing. That case is handled by retry_to_get_account_accessor()
-            assert!(self.accounts_cache.remove_slot(slot).is_some());
-            true
-        } else {
-            false
-        };
+        // Remove this slot from the cache, which will to AccountsDb's new readers should look like an
+        // atomic switch from the cache to storage.
+        // There is some racy condition for existing readers who just has read exactly while
+        // flushing. That case is handled by retry_to_get_account_accessor()
+        assert!(self.accounts_cache.remove_slot(slot).is_some());
         FlushStats {
             slot,
             num_flushed,
             num_purged,
             total_size,
-            did_flush,
         }
     }
 
+    /// `should_flush_f` is an optional closure that determines whether a given
+    /// account should be flushed. Passing `None` will by default flush all
+    /// accounts
+    fn flush_slot_cache(
+        &self,
+        slot: Slot,
+        should_flush_f: Option<&mut impl FnMut(&Pubkey, &AccountSharedData) -> bool>,
+    ) -> Option<FlushStats> {
+        self.accounts_cache.slot_cache(slot).and_then(|slot_cache| {
+            let is_being_purged = {
+                let mut slots_under_contention = self
+                    .remove_unrooted_slots_synchronization
+                    .slots_under_contention
+                    .lock()
+                    .unwrap();
+                // If we're purging this slot, don't flush it here
+                if slots_under_contention.contains(&slot) {
+                    true
+                } else {
+                    slots_under_contention.insert(slot);
+                    false
+                }
+            };
+            if !is_being_purged {
+                let flush_stats = self.do_flush_slot_cache(slot, &slot_cache, should_flush_f);
+                // Nobody else should have been purging this slot, so should not have been removed
+                // from `self.remove_unrooted_slots_synchronization`.
+                assert!(self
+                    .remove_unrooted_slots_synchronization
+                    .slots_under_contention
+                    .lock()
+                    .unwrap()
+                    .remove(&slot));
+
+                // Signal to any threads blocked on `remove_unrooted_slots(slot)` that we have finished
+                // flushing
+                self.remove_unrooted_slots_synchronization
+                    .signal
+                    .notify_all();
+                Some(flush_stats)
+            } else {
+                None
+            }
+        })
+    }
+
     fn write_accounts_to_cache(
         &self,
         slot: Slot,
@@ -4087,10 +4461,9 @@ impl AccountsDb {
         let keys: Vec<_> = self
             .accounts_index
             .account_maps
-            .read()
-            .unwrap()
-            .keys()
-            .cloned()
+            .iter()
+            .map(|btree| btree.read().unwrap().keys().cloned().collect::<Vec<_>>())
+            .flatten()
             .collect();
         collect.stop();
 
@@ -4198,40 +4571,126 @@ impl AccountsDb {
     }
 
     pub fn update_accounts_hash(&self, slot: Slot, ancestors: &Ancestors) -> (Hash, u64) {
-        self.update_accounts_hash_with_index_option(true, false, slot, ancestors, None)
+        self.update_accounts_hash_with_index_option(true, false, slot, ancestors, None, false)
     }
 
     pub fn update_accounts_hash_test(&self, slot: Slot, ancestors: &Ancestors) -> (Hash, u64) {
-        self.update_accounts_hash_with_index_option(true, true, slot, ancestors, None)
+        self.update_accounts_hash_with_index_option(true, true, slot, ancestors, None, false)
+    }
+
+    fn scan_multiple_account_storages_one_slot<F, B>(
+        storages: &[Arc<AccountStorageEntry>],
+        scan_func: &F,
+        slot: Slot,
+        retval: &mut B,
+    ) where
+        F: Fn(LoadedAccount, &mut B, Slot) + Send + Sync,
+        B: Send + Default,
+    {
+        // we have to call the scan_func in order of write_version within a slot if there are multiple storages per slot
+        let mut len = storages.len();
+        let mut progress = Vec::with_capacity(len);
+        let mut current = Vec::with_capacity(len);
+        for storage in storages {
+            let accounts = storage.accounts.accounts(0);
+            let mut iterator: std::vec::IntoIter<StoredAccountMeta<'_>> = accounts.into_iter();
+            if let Some(item) = iterator
+                .next()
+                .map(|stored_account| (stored_account.meta.write_version, Some(stored_account)))
+            {
+                current.push(item);
+                progress.push(iterator);
+            }
+        }
+        while !progress.is_empty() {
+            let mut min = current[0].0;
+            let mut min_index = 0;
+            for (i, (item, _)) in current.iter().enumerate().take(len).skip(1) {
+                if item < &min {
+                    min_index = i;
+                    min = *item;
+                }
+            }
+            let mut account = (0, None);
+            std::mem::swap(&mut account, &mut current[min_index]);
+            scan_func(LoadedAccount::Stored(account.1.unwrap()), retval, slot);
+            let next = progress[min_index]
+                .next()
+                .map(|stored_account| (stored_account.meta.write_version, Some(stored_account)));
+            match next {
+                Some(item) => {
+                    current[min_index] = item;
+                }
+                None => {
+                    current.remove(min_index);
+                    progress.remove(min_index);
+                    len -= 1;
+                }
+            }
+        }
     }
 
     /// Scan through all the account storage in parallel
-    fn scan_account_storage_no_bank<F, B>(
-        snapshot_storages: &[SnapshotStorage],
+    fn scan_account_storage_no_bank<F, F2, B, C>(
+        accounts_cache_and_ancestors: Option<(
+            &AccountsCache,
+            &Ancestors,
+            &AccountInfoAccountsIndex,
+        )>,
+        snapshot_storages: &SortedStorages,
         scan_func: F,
-    ) -> Vec<B>
+        after_func: F2,
+    ) -> Vec<C>
     where
         F: Fn(LoadedAccount, &mut B, Slot) + Send + Sync,
+        F2: Fn(B) -> C + Send + Sync,
         B: Send + Default,
+        C: Send + Default,
     {
         // Without chunks, we end up with 1 output vec for each outer snapshot storage.
         // This results in too many vectors to be efficient.
-        const MAX_ITEMS_PER_CHUNK: usize = 5_000;
-        snapshot_storages
-            .par_chunks(MAX_ITEMS_PER_CHUNK)
-            .map(|storages: &[Vec<Arc<AccountStorageEntry>>]| {
+        const MAX_ITEMS_PER_CHUNK: Slot = 5_000;
+        let chunks = 1 + (snapshot_storages.range_width() as Slot / MAX_ITEMS_PER_CHUNK);
+        (0..chunks)
+            .into_par_iter()
+            .map(|chunk| {
                 let mut retval = B::default();
-
-                for sub_storages in storages {
-                    for storage in sub_storages {
-                        let slot = storage.slot();
-                        let accounts = storage.accounts.accounts(0);
-                        accounts.into_iter().for_each(|stored_account| {
-                            scan_func(LoadedAccount::Stored(stored_account), &mut retval, slot)
-                        });
+                let start = snapshot_storages.range().start + chunk * MAX_ITEMS_PER_CHUNK;
+                let end = std::cmp::min(start + MAX_ITEMS_PER_CHUNK, snapshot_storages.range().end);
+                for slot in start..end {
+                    let sub_storages = snapshot_storages.get(slot);
+                    let mut valid_slot = false;
+                    if let Some(sub_storages) = sub_storages {
+                        valid_slot = true;
+                        Self::scan_multiple_account_storages_one_slot(
+                            sub_storages,
+                            &scan_func,
+                            slot,
+                            &mut retval,
+                        );
+                    }
+                    if let Some((cache, ancestors, accounts_index)) = accounts_cache_and_ancestors {
+                        if let Some(slot_cache) = cache.slot_cache(slot) {
+                            if valid_slot
+                                || ancestors.contains_key(&slot)
+                                || accounts_index.is_root(slot)
+                            {
+                                let keys = slot_cache.get_all_pubkeys();
+                                for key in keys {
+                                    if let Some(cached_account) = slot_cache.get_cloned(&key) {
+                                        let mut accessor = LoadedAccountAccessor::Cached(Some((
+                                            key,
+                                            Cow::Owned(cached_account),
+                                        )));
+                                        let account = accessor.get_loaded_account().unwrap();
+                                        scan_func(account, &mut retval, slot);
+                                    };
+                                }
+                            }
+                        }
                     }
                 }
-                retval
+                after_func(retval)
             })
             .collect()
     }
@@ -4241,69 +4700,144 @@ impl AccountsDb {
         use_index: bool,
         slot: Slot,
         ancestors: &Ancestors,
-    ) -> (Hash, u64) {
+        check_hash: bool,
+        can_cached_slot_be_unflushed: bool,
+    ) -> Result<(Hash, u64), BankHashVerificationError> {
         if !use_index {
-            let combined_maps = self.get_snapshot_storages(slot);
+            let accounts_cache_and_ancestors = if can_cached_slot_be_unflushed {
+                Some((&self.accounts_cache, ancestors, &self.accounts_index))
+            } else {
+                None
+            };
 
-            Self::calculate_accounts_hash_without_index(
-                &combined_maps,
+            let mut collect_time = Measure::start("collect");
+            let (combined_maps, slots) = self.get_snapshot_storages(slot, Some(ancestors));
+            collect_time.stop();
+
+            let mut sort_time = Measure::start("sort_storages");
+            let min_root = self.accounts_index.min_root();
+            let storages = SortedStorages::new_with_slots(
+                combined_maps.iter().zip(slots.iter()),
+                min_root,
+                Some(slot),
+            );
+            sort_time.stop();
+
+            let timings = HashStats {
+                collect_snapshots_us: collect_time.as_us(),
+                storage_sort_us: sort_time.as_us(),
+                ..HashStats::default()
+            };
+
+            Self::calculate_accounts_hash_without_index(
+                &storages,
                 Some(&self.thread_pool_clean),
+                timings,
+                check_hash,
+                accounts_cache_and_ancestors,
             )
         } else {
-            self.calculate_accounts_hash(slot, ancestors, false)
-                .unwrap()
+            self.calculate_accounts_hash(slot, ancestors, check_hash)
         }
     }
 
-    pub fn update_accounts_hash_with_index_option(
+    fn calculate_accounts_hash_helper_with_verify(
         &self,
         use_index: bool,
         debug_verify: bool,
         slot: Slot,
         ancestors: &Ancestors,
         expected_capitalization: Option<u64>,
-    ) -> (Hash, u64) {
-        let (hash, total_lamports) =
-            self.calculate_accounts_hash_helper(use_index, slot, ancestors);
+        can_cached_slot_be_unflushed: bool,
+        check_hash: bool,
+    ) -> Result<(Hash, u64), BankHashVerificationError> {
+        let (hash, total_lamports) = self.calculate_accounts_hash_helper(
+            use_index,
+            slot,
+            ancestors,
+            check_hash,
+            can_cached_slot_be_unflushed,
+        )?;
         if debug_verify {
             // calculate the other way (store or non-store) and verify results match.
-            let (hash_other, total_lamports_other) =
-                self.calculate_accounts_hash_helper(!use_index, slot, ancestors);
+            let (hash_other, total_lamports_other) = self.calculate_accounts_hash_helper(
+                !use_index,
+                slot,
+                ancestors,
+                check_hash,
+                can_cached_slot_be_unflushed,
+            )?;
 
             let success = hash == hash_other
                 && total_lamports == total_lamports_other
                 && total_lamports == expected_capitalization.unwrap_or(total_lamports);
             assert!(success, "update_accounts_hash_with_index_option mismatch. hashes: {}, {}; lamports: {}, {}; expected lamports: {:?}, using index: {}, slot: {}", hash, hash_other, total_lamports, total_lamports_other, expected_capitalization, use_index, slot);
         }
+        Ok((hash, total_lamports))
+    }
+
+    pub fn update_accounts_hash_with_index_option(
+        &self,
+        use_index: bool,
+        debug_verify: bool,
+        slot: Slot,
+        ancestors: &Ancestors,
+        expected_capitalization: Option<u64>,
+        can_cached_slot_be_unflushed: bool,
+    ) -> (Hash, u64) {
+        let check_hash = false;
+        let (hash, total_lamports) = self
+            .calculate_accounts_hash_helper_with_verify(
+                use_index,
+                debug_verify,
+                slot,
+                ancestors,
+                expected_capitalization,
+                can_cached_slot_be_unflushed,
+                check_hash,
+            )
+            .unwrap(); // unwrap here will never fail since check_hash = false
         let mut bank_hashes = self.bank_hashes.write().unwrap();
         let mut bank_hash_info = bank_hashes.get_mut(&slot).unwrap();
         bank_hash_info.snapshot_hash = hash;
         (hash, total_lamports)
     }
 
-    fn scan_snapshot_stores(
-        storage: &[SnapshotStorage],
+    fn scan_snapshot_stores_with_cache(
+        storage: &SortedStorages,
         mut stats: &mut crate::accounts_hash::HashStats,
         bins: usize,
         bin_range: &Range<usize>,
-    ) -> Vec<Vec<Vec<CalculateHashIntermediate>>> {
-        let max_plus_1 = std::u8::MAX as usize + 1;
-        assert!(bins <= max_plus_1 && bins > 0);
+        check_hash: bool,
+        accounts_cache_and_ancestors: Option<(
+            &AccountsCache,
+            &Ancestors,
+            &AccountInfoAccountsIndex,
+        )>,
+    ) -> Result<Vec<Vec<Vec<CalculateHashIntermediate>>>, BankHashVerificationError> {
+        let bin_calculator = PubkeyBinCalculator16::new(bins);
         assert!(bin_range.start < bins && bin_range.end <= bins && bin_range.start < bin_range.end);
         let mut time = Measure::start("scan all accounts");
-        stats.num_snapshot_storage = storage.len();
+        stats.num_snapshot_storage = storage.slot_count();
+        let mismatch_found = AtomicU64::new(0);
+        let range = bin_range.end - bin_range.start;
+        let sort_time = AtomicU64::new(0);
+
         let result: Vec<Vec<Vec<CalculateHashIntermediate>>> = Self::scan_account_storage_no_bank(
-            &storage,
+            accounts_cache_and_ancestors,
+            storage,
             |loaded_account: LoadedAccount,
              accum: &mut Vec<Vec<CalculateHashIntermediate>>,
              slot: Slot| {
-                let pubkey = *loaded_account.pubkey();
-                let pubkey_to_bin_index = pubkey.as_ref()[0] as usize * bins / max_plus_1;
+                let pubkey = loaded_account.pubkey();
+                let mut pubkey_to_bin_index = bin_calculator.bin_from_pubkey(pubkey);
                 if !bin_range.contains(&pubkey_to_bin_index) {
                     return;
                 }
 
-                let version = loaded_account.write_version();
+                // when we are scanning with bin ranges, we don't need to use exact bin numbers. Subtract to make first bin we care about at index 0.
+                pubkey_to_bin_index -= bin_range.start;
+
                 let raw_lamports = loaded_account.lamports();
                 let zero_raw_lamports = raw_lamports == 0;
                 let balance = if zero_raw_lamports {
@@ -4312,36 +4846,91 @@ impl AccountsDb {
                     raw_lamports
                 };
 
-                let source_item = CalculateHashIntermediate::new(
-                    version,
+                let source_item = CalculateHashIntermediate::new_without_slot(
                     loaded_account.loaded_hash(),
                     balance,
-                    slot,
-                    pubkey,
+                    *pubkey,
                 );
+
+                if check_hash {
+                    let computed_hash = loaded_account.compute_hash(slot, pubkey);
+                    if computed_hash != source_item.hash {
+                        info!(
+                            "hash mismatch found: computed: {}, loaded: {}, pubkey: {}",
+                            computed_hash, source_item.hash, pubkey
+                        );
+                        mismatch_found.fetch_add(1, Ordering::Relaxed);
+                    }
+                }
+
                 let max = accum.len();
                 if max == 0 {
-                    accum.extend(vec![Vec::new(); bins]);
+                    accum.extend(vec![Vec::new(); range]);
                 }
                 accum[pubkey_to_bin_index].push(source_item);
             },
+            |x| {
+                let (result, timing) = Self::sort_slot_storage_scan(x);
+                sort_time.fetch_add(timing, Ordering::Relaxed);
+                result
+            },
         );
+
+        stats.sort_time_total_us += sort_time.load(Ordering::Relaxed);
+
+        if check_hash && mismatch_found.load(Ordering::Relaxed) > 0 {
+            warn!(
+                "{} mismatched account hash(es) found",
+                mismatch_found.load(Ordering::Relaxed)
+            );
+            return Err(BankHashVerificationError::MismatchedAccountHash);
+        }
+
         time.stop();
         stats.scan_time_total_us += time.as_us();
-        result
+
+        Ok(result)
+    }
+
+    fn sort_slot_storage_scan(
+        accum: Vec<Vec<CalculateHashIntermediate>>,
+    ) -> (Vec<Vec<CalculateHashIntermediate>>, u64) {
+        let time = AtomicU64::new(0);
+        (
+            accum
+                .into_par_iter()
+                .map(|mut items| {
+                    let mut sort_time = Measure::start("sort");
+                    {
+                        // sort_by vs unstable because slot and write_version are already in order
+                        items.sort_by(AccountsHash::compare_two_hash_entries);
+                    }
+                    sort_time.stop();
+                    time.fetch_add(sort_time.as_us(), Ordering::Relaxed);
+                    items
+                })
+                .collect(),
+            time.load(Ordering::Relaxed),
+        )
     }
 
     // modeled after get_accounts_delta_hash
     // intended to be faster than calculate_accounts_hash
     pub fn calculate_accounts_hash_without_index(
-        storages: &[SnapshotStorage],
+        storages: &SortedStorages,
         thread_pool: Option<&ThreadPool>,
-    ) -> (Hash, u64) {
-        let scan_and_hash = || {
-            let mut stats = HashStats::default();
+        mut stats: HashStats,
+        check_hash: bool,
+        accounts_cache_and_ancestors: Option<(
+            &AccountsCache,
+            &Ancestors,
+            &AccountInfoAccountsIndex,
+        )>,
+    ) -> Result<(Hash, u64), BankHashVerificationError> {
+        let mut scan_and_hash = move || {
             // When calculating hashes, it is helpful to break the pubkeys found into bins based on the pubkey value.
             // More bins means smaller vectors to sort, copy, etc.
-            const PUBKEY_BINS_FOR_CALCULATING_HASHES: usize = 64;
+            const PUBKEY_BINS_FOR_CALCULATING_HASHES: usize = 65536;
 
             // # of passes should be a function of the total # of accounts that are active.
             // higher passes = slower total time, lower dynamic memory usage
@@ -4363,23 +4952,26 @@ impl AccountsDb {
                     end: (pass + 1) * bins_per_pass,
                 };
 
-                let result = Self::scan_snapshot_stores(
+                let result = Self::scan_snapshot_stores_with_cache(
                     storages,
                     &mut stats,
                     PUBKEY_BINS_FOR_CALCULATING_HASHES,
                     &bounds,
-                );
+                    check_hash,
+                    accounts_cache_and_ancestors,
+                )?;
 
                 let (hash, lamports, for_next_pass) = AccountsHash::rest_of_hash_calculation(
                     result,
                     &mut stats,
                     pass == num_scan_passes - 1,
                     previous_pass,
+                    bins_per_pass,
                 );
                 previous_pass = for_next_pass;
                 final_result = (hash, lamports);
             }
-            final_result
+            Ok(final_result)
         };
         if let Some(thread_pool) = thread_pool {
             thread_pool.install(scan_and_hash)
@@ -4393,11 +4985,23 @@ impl AccountsDb {
         slot: Slot,
         ancestors: &Ancestors,
         total_lamports: u64,
+        test_hash_calculation: bool,
     ) -> Result<(), BankHashVerificationError> {
         use BankHashVerificationError::*;
 
-        let (calculated_hash, calculated_lamports) =
-            self.calculate_accounts_hash(slot, ancestors, true)?;
+        let use_index = false;
+        let check_hash = true;
+        let can_cached_slot_be_unflushed = false;
+        let (calculated_hash, calculated_lamports) = self
+            .calculate_accounts_hash_helper_with_verify(
+                use_index,
+                test_hash_calculation,
+                slot,
+                ancestors,
+                None,
+                can_cached_slot_be_unflushed,
+                check_hash,
+            )?;
 
         if calculated_lamports != total_lamports {
             warn!(
@@ -4545,8 +5149,8 @@ impl AccountsDb {
             self.accounts_index.upsert(
                 slot,
                 pubkey,
-                &pubkey_account.1.owner(),
-                &pubkey_account.1.data(),
+                pubkey_account.1.owner(),
+                pubkey_account.1.data(),
                 &self.account_indexes,
                 info,
                 &mut reclaims,
@@ -4555,6 +5159,53 @@ impl AccountsDb {
         reclaims
     }
 
+    fn should_not_shrink(aligned_bytes: u64, total_bytes: u64, num_stores: usize) -> bool {
+        aligned_bytes + PAGE_SIZE > total_bytes && num_stores == 1
+    }
+
+    fn is_shrinking_productive(slot: Slot, stores: &[Arc<AccountStorageEntry>]) -> bool {
+        let mut alive_count = 0;
+        let mut stored_count = 0;
+        let mut alive_bytes = 0;
+        let mut total_bytes = 0;
+
+        for store in stores {
+            alive_count += store.count();
+            stored_count += store.approx_stored_count();
+            alive_bytes += store.alive_bytes();
+            total_bytes += store.total_bytes();
+        }
+
+        let aligned_bytes = Self::page_align(alive_bytes as u64);
+        if Self::should_not_shrink(aligned_bytes, total_bytes, stores.len()) {
+            trace!(
+                "shrink_slot_forced ({}, {}): not able to shrink at all: alive/stored: ({} / {}) ({}b / {}b) save: {}",
+                slot,
+                stores.len(),
+                alive_count,
+                stored_count,
+                aligned_bytes,
+                total_bytes,
+                total_bytes.saturating_sub(aligned_bytes),
+            );
+            return false;
+        }
+
+        true
+    }
+
+    fn is_candidate_for_shrink(&self, store: &Arc<AccountStorageEntry>) -> bool {
+        match self.shrink_ratio {
+            AccountShrinkThreshold::TotalSpace { shrink_ratio: _ } => {
+                Self::page_align(store.alive_bytes() as u64) < store.total_bytes()
+            }
+            AccountShrinkThreshold::IndividalStore { shrink_ratio } => {
+                (Self::page_align(store.alive_bytes() as u64) as f64 / store.total_bytes() as f64)
+                    < shrink_ratio
+            }
+        }
+    }
+
     fn remove_dead_accounts(
         &self,
         reclaims: SlotSlice<AccountInfo>,
@@ -4587,11 +5238,12 @@ impl AccountsDb {
                 );
                 let count = store.remove_account(account_info.stored_size, reset_accounts);
                 if count == 0 {
+                    self.dirty_stores
+                        .insert((*slot, store.append_vec_id()), store.clone());
                     dead_slots.insert(*slot);
                 } else if self.caching_enabled
-                    && (self.page_align(store.alive_bytes() as u64) as f64
-                        / store.total_bytes() as f64)
-                        < SHRINK_RATIO
+                    && Self::is_shrinking_productive(*slot, &[store.clone()])
+                    && self.is_candidate_for_shrink(&store)
                 {
                     // Checking that this single storage entry is ready for shrinking,
                     // should be a sufficient indication that the slot is ready to be shrunk
@@ -4612,10 +5264,24 @@ impl AccountsDb {
                 let mut shrink_candidate_slots = self.shrink_candidate_slots.lock().unwrap();
                 for (slot, slot_shrink_candidates) in new_shrink_candidates {
                     for (store_id, store) in slot_shrink_candidates {
-                        shrink_candidate_slots
-                            .entry(slot)
-                            .or_default()
-                            .insert(store_id, store);
+                        // count could be == 0 if multiple accounts are removed
+                        // at once
+                        if store.count() != 0 {
+                            debug!(
+                                "adding: {} {} to shrink candidates: count: {}/{} bytes: {}/{}",
+                                store_id,
+                                slot,
+                                store.approx_stored_count(),
+                                store.count(),
+                                store.alive_bytes(),
+                                store.total_bytes()
+                            );
+
+                            shrink_candidate_slots
+                                .entry(slot)
+                                .or_default()
+                                .insert(store_id, store);
+                        }
                     }
                 }
             }
@@ -4738,7 +5404,7 @@ impl AccountsDb {
 
     pub(crate) fn freeze_accounts(&mut self, ancestors: &Ancestors, account_pubkeys: &[Pubkey]) {
         for account_pubkey in account_pubkeys {
-            if let Some((account, _slot)) = self.load_without_fixed_root(ancestors, &account_pubkey)
+            if let Some((account, _slot)) = self.load_without_fixed_root(ancestors, account_pubkey)
             {
                 let frozen_account_info = FrozenAccountInfo {
                     hash: Self::hash_frozen_account_data(&account),
@@ -4776,7 +5442,7 @@ impl AccountsDb {
                     )
                 }
 
-                let hash = Self::hash_frozen_account_data(&account);
+                let hash = Self::hash_frozen_account_data(account);
                 if hash != frozen_account_info.hash {
                     FROZEN_ACCOUNT_PANIC.store(true, Ordering::Relaxed);
                     panic!(
@@ -5092,34 +5758,172 @@ impl AccountsDb {
         if self.caching_enabled {
             self.accounts_cache.add_root(slot);
         }
+        if let Some(slot_stores) = self.storage.get_slot_stores(slot) {
+            for (store_id, store) in slot_stores.read().unwrap().iter() {
+                self.dirty_stores.insert((slot, *store_id), store.clone());
+            }
+        }
     }
 
-    pub fn get_snapshot_storages(&self, snapshot_slot: Slot) -> SnapshotStorages {
-        self.storage
+    pub fn get_snapshot_storages(
+        &self,
+        snapshot_slot: Slot,
+        ancestors: Option<&Ancestors>,
+    ) -> (SnapshotStorages, Vec<Slot>) {
+        let mut m = Measure::start("get slots");
+        let slots = self
+            .storage
             .0
             .iter()
-            .filter(|iter_item| {
-                let slot = *iter_item.key();
-                slot <= snapshot_slot && self.accounts_index.is_root(slot)
+            .map(|k| *k.key() as Slot)
+            .collect::<Vec<_>>();
+        m.stop();
+        let mut m2 = Measure::start("filter");
+
+        let chunk_size = 5_000;
+        let wide = self.thread_pool_clean.install(|| {
+            slots
+                .par_chunks(chunk_size)
+                .map(|slots| {
+                    slots
+                        .iter()
+                        .filter_map(|slot| {
+                            if *slot <= snapshot_slot
+                                && (self.accounts_index.is_root(*slot)
+                                    || ancestors
+                                        .map(|ancestors| ancestors.contains_key(slot))
+                                        .unwrap_or_default())
+                            {
+                                self.storage.0.get(slot).map_or_else(
+                                    || None,
+                                    |item| {
+                                        let storages = item
+                                            .value()
+                                            .read()
+                                            .unwrap()
+                                            .values()
+                                            .filter(|x| x.has_accounts())
+                                            .cloned()
+                                            .collect::<Vec<_>>();
+                                        if !storages.is_empty() {
+                                            Some((storages, *slot))
+                                        } else {
+                                            None
+                                        }
+                                    },
+                                )
+                            } else {
+                                None
+                            }
+                        })
+                        .collect::<Vec<(SnapshotStorage, Slot)>>()
+                })
+                .collect::<Vec<_>>()
+        });
+        m2.stop();
+        let mut m3 = Measure::start("flatten");
+        // some slots we found above may not have been a root or met the slot # constraint.
+        // So the resulting 'slots' vector we return will be a subset of the raw keys we got initially.
+        let mut slots = Vec::with_capacity(slots.len());
+        let result = wide
+            .into_iter()
+            .flatten()
+            .map(|(storage, slot)| {
+                slots.push(slot);
+                storage
             })
-            .map(|iter_item| {
-                iter_item
-                    .value()
-                    .read()
-                    .unwrap()
-                    .values()
-                    .filter(|x| x.has_accounts())
-                    .cloned()
-                    .collect()
+            .collect::<Vec<_>>();
+        m3.stop();
+
+        debug!(
+            "hash_total: get slots: {}, filter: {}, flatten: {}",
+            m.as_us(),
+            m2.as_us(),
+            m3.as_us()
+        );
+        (result, slots)
+    }
+
+    fn process_storage_slot(
+        storage_maps: &[Arc<AccountStorageEntry>],
+    ) -> GenerateIndexAccountsMap<'_> {
+        let num_accounts = storage_maps
+            .iter()
+            .map(|storage| storage.approx_stored_count())
+            .sum();
+        let mut accounts_map = GenerateIndexAccountsMap::with_capacity(num_accounts);
+        storage_maps.iter().for_each(|storage| {
+            let accounts = storage.all_accounts();
+            accounts.into_iter().for_each(|stored_account| {
+                let this_version = stored_account.meta.write_version;
+                match accounts_map.entry(&stored_account.meta.pubkey) {
+                    std::collections::hash_map::Entry::Vacant(entry) => {
+                        entry.insert((this_version, storage.append_vec_id(), stored_account));
+                    }
+                    std::collections::hash_map::Entry::Occupied(mut entry) => {
+                        let occupied_version = entry.get().0;
+                        if occupied_version < this_version {
+                            entry.insert((this_version, storage.append_vec_id(), stored_account));
+                        } else {
+                            assert!(occupied_version != this_version);
+                        }
+                    }
+                }
             })
-            .filter(|snapshot_storage: &SnapshotStorage| !snapshot_storage.is_empty())
-            .collect()
+        });
+        accounts_map
+    }
+
+    fn generate_index_for_slot<'a>(
+        &self,
+        accounts_map: GenerateIndexAccountsMap<'a>,
+        slot: &Slot,
+    ) -> u64 {
+        if accounts_map.is_empty() {
+            return 0;
+        }
+
+        let len = accounts_map.len();
+        let items = accounts_map
+            .iter()
+            .map(|(pubkey, (_, store_id, stored_account))| {
+                (
+                    *pubkey,
+                    AccountInfo {
+                        store_id: *store_id,
+                        offset: stored_account.offset,
+                        stored_size: stored_account.stored_size,
+                        lamports: stored_account.account_meta.lamports,
+                    },
+                )
+            });
+
+        let (dirty_pubkeys, insert_us) = self
+            .accounts_index
+            .insert_new_if_missing_into_primary_index(*slot, len, items);
+
+        // dirty_pubkeys will contain a pubkey if an item has multiple rooted entries for
+        // a given pubkey. If there is just a single item, there is no cleaning to
+        // be done on that pubkey. Use only those pubkeys with multiple updates.
+        if !dirty_pubkeys.is_empty() {
+            self.uncleaned_pubkeys.insert(*slot, dirty_pubkeys);
+        }
+
+        if !self.account_indexes.is_empty() {
+            for (pubkey, (_, _store_id, stored_account)) in accounts_map.iter() {
+                self.accounts_index.update_secondary_indexes(
+                    pubkey,
+                    &stored_account.account_meta.owner,
+                    stored_account.data,
+                    &self.account_indexes,
+                );
+            }
+        }
+        insert_us
     }
 
     #[allow(clippy::needless_collect)]
     pub fn generate_index(&self, limit_load_slot_count_from_snapshot: Option<usize>) {
-        type AccountsMap<'a> =
-            HashMap<Pubkey, (StoredMetaWriteVersion, AppendVecId, StoredAccountMeta<'a>)>;
         let mut slots = self.storage.all_slots();
         #[allow(clippy::stable_sort_primitive)]
         slots.sort();
@@ -5130,138 +5934,58 @@ impl AccountsDb {
         let outer_slots_len = slots.len();
         let chunk_size = (outer_slots_len / 7) + 1; // approximately 400k slots in a snapshot
         let mut index_time = Measure::start("index");
+        let insertion_time_us = AtomicU64::new(0);
         let scan_time: u64 = slots
             .par_chunks(chunk_size)
             .map(|slots| {
-                let mut last_log_update = Instant::now();
-                let mut my_last_reported_number_of_processed_slots = 0;
-                let mut was_first = false;
+                let mut log_status = MultiThreadProgress::new(
+                    &total_processed_slots_across_all_threads,
+                    2,
+                    outer_slots_len as u64,
+                );
                 let mut scan_time_sum = 0;
                 for (index, slot) in slots.iter().enumerate() {
                     let mut scan_time = Measure::start("scan");
-                    let now = Instant::now();
-                    if now.duration_since(last_log_update).as_secs() >= 2 {
-                        let my_total_newly_processed_slots_since_last_report =
-                            (index as u64) - my_last_reported_number_of_processed_slots;
-                        my_last_reported_number_of_processed_slots = index as u64;
-                        let previous_total_processed_slots_across_all_threads =
-                            total_processed_slots_across_all_threads.fetch_add(
-                                my_total_newly_processed_slots_since_last_report,
-                                Ordering::Relaxed,
-                            );
-                        was_first =
-                            was_first || 0 == previous_total_processed_slots_across_all_threads;
-                        if was_first {
-                            info!(
-                                "generating index: {}/{} slots...",
-                                previous_total_processed_slots_across_all_threads
-                                    + my_total_newly_processed_slots_since_last_report,
-                                outer_slots_len
-                            );
-                        }
-                        last_log_update = now;
-                    }
+                    log_status.report(index as u64);
                     let storage_maps: Vec<Arc<AccountStorageEntry>> = self
                         .storage
                         .get_slot_storage_entries(*slot)
                         .unwrap_or_default();
-                    let num_accounts = storage_maps
-                        .iter()
-                        .map(|storage| storage.approx_stored_count())
-                        .sum();
-                    let mut accounts_map: AccountsMap = AccountsMap::with_capacity(num_accounts);
-                    storage_maps.iter().for_each(|storage| {
-                        let accounts = storage.all_accounts();
-                        accounts.into_iter().for_each(|stored_account| {
-                            let this_version = stored_account.meta.write_version;
-                            match accounts_map.entry(stored_account.meta.pubkey) {
-                                std::collections::hash_map::Entry::Vacant(entry) => {
-                                    entry.insert((
-                                        this_version,
-                                        storage.append_vec_id(),
-                                        stored_account,
-                                    ));
-                                }
-                                std::collections::hash_map::Entry::Occupied(mut entry) => {
-                                    let occupied_version = entry.get().0;
-                                    if occupied_version < this_version {
-                                        entry.insert((
-                                            this_version,
-                                            storage.append_vec_id(),
-                                            stored_account,
-                                        ));
-                                    } else {
-                                        assert!(occupied_version != this_version);
-                                    }
-                                }
-                            }
-                        })
-                    });
+                    let accounts_map = Self::process_storage_slot(&storage_maps);
                     scan_time.stop();
                     scan_time_sum += scan_time.as_us();
 
-                    if !accounts_map.is_empty() {
-                        let mut _reclaims: Vec<(u64, AccountInfo)> = vec![];
-                        let len = accounts_map.len();
-
-                        let mut items = Vec::with_capacity(len);
-                        let mut dirty_pubkeys = accounts_map
-                            .iter()
-                            .map(|(pubkey, (_, store_id, stored_account))| {
-                                items.push((
-                                    pubkey,
-                                    AccountInfo {
-                                        store_id: *store_id,
-                                        offset: stored_account.offset,
-                                        stored_size: stored_account.stored_size,
-                                        lamports: stored_account.account_meta.lamports,
-                                    },
-                                ));
-                                *pubkey
-                            })
-                            .collect::<Vec<_>>();
-
-                        let items_len = items.len();
-                        let dirty_pubkey_mask = self
-                            .accounts_index
-                            .insert_new_if_missing_into_primary_index(*slot, items);
-
-                        assert_eq!(dirty_pubkey_mask.len(), items_len);
-
-                        let mut dirty_pubkey_mask_iter = dirty_pubkey_mask.iter();
-
-                        // dirty_pubkey_mask will return true if an item has multiple rooted entries for
-                        // a given pubkey. If there is just a single item, there is no cleaning to
-                        // be done on that pubkey. Prune the touched pubkey set here for only those
-                        // pubkeys with multiple updates.
-                        dirty_pubkeys.retain(|_k| *dirty_pubkey_mask_iter.next().unwrap());
-                        if !dirty_pubkeys.is_empty() {
-                            self.uncleaned_pubkeys.insert(*slot, dirty_pubkeys);
-                        }
-
-                        if !self.account_indexes.is_empty() {
-                            for (pubkey, (_, _store_id, stored_account)) in accounts_map.iter() {
-                                self.accounts_index.update_secondary_indexes(
-                                    &pubkey,
-                                    &stored_account.account_meta.owner,
-                                    &stored_account.data,
-                                    &self.account_indexes,
-                                );
-                            }
-                        }
-                    }
+                    let insert_us = self.generate_index_for_slot(accounts_map, slot);
+                    insertion_time_us.fetch_add(insert_us, Ordering::Relaxed);
                 }
                 scan_time_sum
             })
             .sum();
         index_time.stop();
 
-        datapoint_info!(
-            "generate_index",
-            // we cannot accurately measure index insertion time because of many threads and lock contention
-            ("total_us", index_time.as_us(), i64),
-            ("scan_stores_us", scan_time, i64),
-        );
+        let mut min_bin_size = usize::MAX;
+        let mut max_bin_size = usize::MIN;
+        let total_items = self
+            .accounts_index
+            .account_maps
+            .iter()
+            .map(|i| {
+                let len = i.read().unwrap().len();
+                min_bin_size = std::cmp::min(min_bin_size, len);
+                max_bin_size = std::cmp::max(max_bin_size, len);
+                len
+            })
+            .sum();
+
+        let timings = GenerateIndexTimings {
+            scan_time,
+            index_time: index_time.as_us(),
+            insertion_time_us: insertion_time_us.load(Ordering::Relaxed),
+            min_bin_size,
+            max_bin_size,
+            total_items,
+        };
+        timings.report();
 
         // Need to add these last, otherwise older updates will be cleaned
         for slot in slots {
@@ -5269,7 +5993,13 @@ impl AccountsDb {
         }
 
         let mut stored_sizes_and_counts = HashMap::new();
-        for account_entry in self.accounts_index.account_maps.read().unwrap().values() {
+        for account_entry in self
+            .accounts_index
+            .account_maps
+            .iter()
+            .map(|i| i.read().unwrap().values().cloned().collect::<Vec<_>>())
+            .flatten()
+        {
             for (_slot, account_entry) in account_entry.slot_list.read().unwrap().iter() {
                 let storage_entry_meta = stored_sizes_and_counts
                     .entry(account_entry.store_id)
@@ -5282,7 +6012,7 @@ impl AccountsDb {
             for (id, store) in slot_stores.value().read().unwrap().iter() {
                 // Should be default at this point
                 assert_eq!(store.alive_bytes(), 0);
-                if let Some((stored_size, count)) = stored_sizes_and_counts.get(&id) {
+                if let Some((stored_size, count)) = stored_sizes_and_counts.get(id) {
                     trace!("id: {} setting count: {} cur: {}", id, count, store.count(),);
                     store.count_and_status.write().unwrap().0 = *count;
                     store.alive_bytes.store(*stored_size, Ordering::SeqCst);
@@ -5318,13 +6048,15 @@ impl AccountsDb {
         #[allow(clippy::stable_sort_primitive)]
         roots.sort();
         info!("{}: accounts_index roots: {:?}", label, roots,);
-        for (pubkey, account_entry) in self.accounts_index.account_maps.read().unwrap().iter() {
-            info!("  key: {} ref_count: {}", pubkey, account_entry.ref_count(),);
-            info!(
-                "      slots: {:?}",
-                *account_entry.slot_list.read().unwrap()
-            );
-        }
+        self.accounts_index.account_maps.iter().for_each(|i| {
+            for (pubkey, account_entry) in i.read().unwrap().iter() {
+                info!("  key: {} ref_count: {}", pubkey, account_entry.ref_count(),);
+                info!(
+                    "      slots: {:?}",
+                    *account_entry.slot_list.read().unwrap()
+                );
+            }
+        });
     }
 
     fn print_count_and_status(&self, label: &str) {
@@ -5373,7 +6105,7 @@ impl AccountsDb {
 
     pub fn get_append_vec_id(&self, pubkey: &Pubkey, slot: Slot) -> Option<AppendVecId> {
         let ancestors = vec![(slot, 1)].into_iter().collect();
-        let result = self.accounts_index.get(&pubkey, Some(&ancestors), None);
+        let result = self.accounts_index.get(pubkey, Some(&ancestors), None);
         result.map(|(list, index)| list.slot_list()[index].1.store_id)
     }
 
@@ -5543,7 +6275,7 @@ pub mod tests {
         accounts_hash::MERKLE_FANOUT,
         accounts_index::RefCount,
         accounts_index::{tests::*, AccountSecondaryIndexesIncludeExclude},
-        append_vec::AccountMeta,
+        append_vec::{test_utils::TempFile, AccountMeta},
         inline_spl_token_v2_0,
     };
     use assert_matches::assert_matches;
@@ -5568,21 +6300,20 @@ pub mod tests {
         ancestors
     }
 
-    #[test]
-    #[should_panic(expected = "assertion failed: bins <= max_plus_1 && bins > 0")]
-    fn test_accountsdb_scan_snapshot_stores_illegal_bins2() {
-        let mut stats = HashStats::default();
-        let bounds = Range { start: 0, end: 0 };
-
-        AccountsDb::scan_snapshot_stores(&[], &mut stats, 257, &bounds);
+    fn empty_storages<'a>() -> SortedStorages<'a> {
+        SortedStorages::new(&[])
     }
-    #[test]
-    #[should_panic(expected = "assertion failed: bins <= max_plus_1 && bins > 0")]
-    fn test_accountsdb_scan_snapshot_stores_illegal_bins() {
-        let mut stats = HashStats::default();
-        let bounds = Range { start: 0, end: 0 };
 
-        AccountsDb::scan_snapshot_stores(&[], &mut stats, 0, &bounds);
+    impl AccountsDb {
+        fn scan_snapshot_stores(
+            storage: &SortedStorages,
+            stats: &mut crate::accounts_hash::HashStats,
+            bins: usize,
+            bin_range: &Range<usize>,
+            check_hash: bool,
+        ) -> Result<Vec<Vec<Vec<CalculateHashIntermediate>>>, BankHashVerificationError> {
+            Self::scan_snapshot_stores_with_cache(storage, stats, bins, bin_range, check_hash, None)
+        }
     }
 
     #[test]
@@ -5593,7 +6324,7 @@ pub mod tests {
         let mut stats = HashStats::default();
         let bounds = Range { start: 2, end: 2 };
 
-        AccountsDb::scan_snapshot_stores(&[], &mut stats, 2, &bounds);
+        AccountsDb::scan_snapshot_stores(&empty_storages(), &mut stats, 2, &bounds, false).unwrap();
     }
     #[test]
     #[should_panic(
@@ -5603,7 +6334,7 @@ pub mod tests {
         let mut stats = HashStats::default();
         let bounds = Range { start: 1, end: 3 };
 
-        AccountsDb::scan_snapshot_stores(&[], &mut stats, 2, &bounds);
+        AccountsDb::scan_snapshot_stores(&empty_storages(), &mut stats, 2, &bounds, false).unwrap();
     }
 
     #[test]
@@ -5614,116 +6345,101 @@ pub mod tests {
         let mut stats = HashStats::default();
         let bounds = Range { start: 1, end: 0 };
 
-        AccountsDb::scan_snapshot_stores(&[], &mut stats, 2, &bounds);
+        AccountsDb::scan_snapshot_stores(&empty_storages(), &mut stats, 2, &bounds, false).unwrap();
     }
 
-    fn sample_storages_and_accounts() -> (SnapshotStorages, Vec<CalculateHashIntermediate>) {
+    fn sample_storages_and_account_in_slot(
+        slot: Slot,
+    ) -> (SnapshotStorages, Vec<CalculateHashIntermediate>) {
         let accounts = AccountsDb::new(Vec::new(), &ClusterType::Development);
         let pubkey0 = Pubkey::new(&[0u8; 32]);
         let pubkey127 = Pubkey::new(&[0x7fu8; 32]);
         let pubkey128 = Pubkey::new(&[0x80u8; 32]);
         let pubkey255 = Pubkey::new(&[0xffu8; 32]);
 
-        const SLOT: Slot = 1;
+        let mut raw_expected = vec![
+            CalculateHashIntermediate::new_without_slot(Hash::default(), 1, pubkey0),
+            CalculateHashIntermediate::new_without_slot(Hash::default(), 128, pubkey127),
+            CalculateHashIntermediate::new_without_slot(Hash::default(), 129, pubkey128),
+            CalculateHashIntermediate::new_without_slot(Hash::default(), 256, pubkey255),
+        ];
 
-        let raw_expected = vec![
-            CalculateHashIntermediate {
-                version: 0,
-                hash: Hash::from_str("5K3NW73xFHwgTWVe4LyCg4QfQda8f88uZj2ypDx2kmmH").unwrap(),
-                lamports: 1,
-                slot: SLOT,
-                pubkey: pubkey0,
-            },
-            CalculateHashIntermediate {
-                version: 1,
-                hash: Hash::from_str("84ozw83MZ8oeSF4hRAg7SeW1Tqs9LMXagX1BrDRjtZEx").unwrap(),
-                lamports: 128,
-                slot: SLOT,
-                pubkey: pubkey127,
-            },
-            CalculateHashIntermediate {
-                version: 2,
-                hash: Hash::from_str("5XqtnEJ41CG2JWNp7MAg9nxkRUAnyjLxfsKsdrLxQUbC").unwrap(),
-                lamports: 129,
-                slot: SLOT,
-                pubkey: pubkey128,
-            },
-            CalculateHashIntermediate {
-                version: 3,
-                hash: Hash::from_str("DpvwJcznzwULYh19Zu5CuAA4AT6WTBe4H6n15prATmqj").unwrap(),
-                lamports: 256,
-                slot: SLOT,
-                pubkey: pubkey255,
-            },
+        let expected_hashes = vec![
+            Hash::from_str("5K3NW73xFHwgTWVe4LyCg4QfQda8f88uZj2ypDx2kmmH").unwrap(),
+            Hash::from_str("84ozw83MZ8oeSF4hRAg7SeW1Tqs9LMXagX1BrDRjtZEx").unwrap(),
+            Hash::from_str("5XqtnEJ41CG2JWNp7MAg9nxkRUAnyjLxfsKsdrLxQUbC").unwrap(),
+            Hash::from_str("DpvwJcznzwULYh19Zu5CuAA4AT6WTBe4H6n15prATmqj").unwrap(),
         ];
 
-        accounts.store_uncached(
-            SLOT,
-            &[(
-                &pubkey0,
-                &AccountSharedData::new(
-                    raw_expected[0].lamports,
-                    1,
-                    AccountSharedData::default().owner(),
-                ),
-            )],
-        );
-        accounts.store_uncached(
-            SLOT,
-            &[(
-                &pubkey127,
-                &AccountSharedData::new(128, 1, AccountSharedData::default().owner()),
-            )],
-        );
-        accounts.store_uncached(
-            SLOT,
-            &[(
-                &pubkey128,
-                &AccountSharedData::new(129, 1, AccountSharedData::default().owner()),
-            )],
-        );
-        accounts.store_uncached(
-            SLOT,
-            &[(
-                &pubkey255,
-                &AccountSharedData::new(256, 1, AccountSharedData::default().owner()),
-            )],
-        );
-        accounts.add_root(SLOT);
+        let mut raw_accounts = Vec::default();
 
-        let storages = accounts.get_snapshot_storages(SLOT);
+        for i in 0..raw_expected.len() {
+            raw_accounts.push(AccountSharedData::new(
+                raw_expected[i].lamports,
+                1,
+                AccountSharedData::default().owner(),
+            ));
+            let hash = AccountsDb::hash_account(slot, &raw_accounts[i], &raw_expected[i].pubkey);
+            if slot == 1 {
+                assert_eq!(hash, expected_hashes[i]);
+            }
+            raw_expected[i].hash = hash;
+        }
+
+        let to_store = raw_accounts
+            .iter()
+            .zip(raw_expected.iter())
+            .map(|(account, intermediate)| (&intermediate.pubkey, account))
+            .collect::<Vec<_>>();
+
+        accounts.store_uncached(slot, &to_store[..]);
+        accounts.add_root(slot);
+
+        let storages = accounts.get_snapshot_storages(slot, None).0;
         (storages, raw_expected)
     }
 
+    fn sample_storages_and_accounts() -> (SnapshotStorages, Vec<CalculateHashIntermediate>) {
+        sample_storages_and_account_in_slot(1)
+    }
+
+    fn get_storage_refs(input: &[SnapshotStorage]) -> SortedStorages {
+        SortedStorages::new(input)
+    }
+
     #[test]
     fn test_accountsdb_scan_snapshot_stores() {
         solana_logger::setup();
-        let (mut storages, raw_expected) = sample_storages_and_accounts();
+        let (storages, raw_expected) = sample_storages_and_accounts();
 
         let bins = 1;
         let mut stats = HashStats::default();
 
         let result = AccountsDb::scan_snapshot_stores(
-            &storages,
+            &get_storage_refs(&storages),
             &mut stats,
             bins,
             &Range {
                 start: 0,
                 end: bins,
             },
-        );
+            false,
+        )
+        .unwrap();
         assert_eq!(result, vec![vec![raw_expected.clone()]]);
 
         let bins = 2;
         let result = AccountsDb::scan_snapshot_stores(
-            &storages,
+            &get_storage_refs(&storages),
             &mut stats,
             bins,
             &Range {
                 start: 0,
                 end: bins,
             },
-        );
+            false,
+        )
+        .unwrap();
         let mut expected = vec![Vec::new(); bins];
         expected[0].push(raw_expected[0].clone());
         expected[0].push(raw_expected[1].clone());
@@ -5733,14 +6449,16 @@ pub mod tests {
 
         let bins = 4;
         let result = AccountsDb::scan_snapshot_stores(
-            &storages,
+            &get_storage_refs(&storages),
             &mut stats,
             bins,
             &Range {
                 start: 0,
                 end: bins,
             },
-        );
+            false,
+        )
+        .unwrap();
         let mut expected = vec![Vec::new(); bins];
         expected[0].push(raw_expected[0].clone());
         expected[1].push(raw_expected[1].clone());
@@ -5750,36 +6468,48 @@ pub mod tests {
 
         let bins = 256;
         let result = AccountsDb::scan_snapshot_stores(
-            &storages,
+            &get_storage_refs(&storages),
             &mut stats,
             bins,
             &Range {
                 start: 0,
                 end: bins,
             },
-        );
+            false,
+        )
+        .unwrap();
         let mut expected = vec![Vec::new(); bins];
         expected[0].push(raw_expected[0].clone());
         expected[127].push(raw_expected[1].clone());
         expected[128].push(raw_expected[2].clone());
         expected[bins - 1].push(raw_expected.last().unwrap().clone());
         assert_eq!(result, vec![expected]);
+    }
 
+    #[test]
+    fn test_accountsdb_scan_snapshot_stores_2nd_chunk() {
         // enough stores to get to 2nd chunk
         let bins = 1;
         const MAX_ITEMS_PER_CHUNK: usize = 5_000;
-        storages.splice(0..0, vec![vec![]; MAX_ITEMS_PER_CHUNK]);
+        let slot = MAX_ITEMS_PER_CHUNK as Slot;
+        let (storages, raw_expected) = sample_storages_and_account_in_slot(slot);
+        let storage_data = vec![(&storages[0], slot)];
+
+        let sorted_storages =
+            SortedStorages::new_debug(&storage_data[..], 0, MAX_ITEMS_PER_CHUNK + 1);
 
         let mut stats = HashStats::default();
         let result = AccountsDb::scan_snapshot_stores(
-            &storages,
+            &sorted_storages,
             &mut stats,
             bins,
             &Range {
                 start: 0,
                 end: bins,
             },
-        );
+            false,
+        )
+        .unwrap();
         assert_eq!(result.len(), 2); // 2 chunks
         assert_eq!(result[0].len(), 0); // nothing found in first slots
         assert_eq!(result[1].len(), bins);
@@ -5789,54 +6519,62 @@ pub mod tests {
     #[test]
     fn test_accountsdb_scan_snapshot_stores_binning() {
         let mut stats = HashStats::default();
-        let (mut storages, raw_expected) = sample_storages_and_accounts();
+        let (storages, raw_expected) = sample_storages_and_accounts();
 
         // just the first bin of 2
         let bins = 2;
+        let half_bins = bins / 2;
         let result = AccountsDb::scan_snapshot_stores(
-            &storages,
+            &get_storage_refs(&storages),
             &mut stats,
             bins,
             &Range {
                 start: 0,
-                end: bins / 2,
+                end: half_bins,
             },
-        );
-        let mut expected = vec![Vec::new(); bins];
+            false,
+        )
+        .unwrap();
+        let mut expected = vec![Vec::new(); half_bins];
         expected[0].push(raw_expected[0].clone());
         expected[0].push(raw_expected[1].clone());
         assert_eq!(result, vec![expected]);
 
         // just the second bin of 2
         let result = AccountsDb::scan_snapshot_stores(
-            &storages,
+            &get_storage_refs(&storages),
             &mut stats,
             bins,
             &Range {
                 start: 1,
                 end: bins,
             },
-        );
+            false,
+        )
+        .unwrap();
 
-        let mut expected = vec![Vec::new(); bins];
-        expected[bins - 1].push(raw_expected[2].clone());
-        expected[bins - 1].push(raw_expected[3].clone());
+        let mut expected = vec![Vec::new(); half_bins];
+        let starting_bin_index = 0;
+        expected[starting_bin_index].push(raw_expected[2].clone());
+        expected[starting_bin_index].push(raw_expected[3].clone());
         assert_eq!(result, vec![expected]);
 
         // 1 bin at a time of 4
         let bins = 4;
-        for bin in 0..bins {
+        for (bin, expected_item) in raw_expected.iter().enumerate().take(bins) {
             let result = AccountsDb::scan_snapshot_stores(
-                &storages,
+                &get_storage_refs(&storages),
                 &mut stats,
                 bins,
                 &Range {
                     start: bin,
                     end: bin + 1,
                 },
-            );
-            let mut expected = vec![Vec::new(); bins];
-            expected[bin].push(raw_expected[bin].clone());
+                false,
+            )
+            .unwrap();
+            let mut expected = vec![Vec::new(); 1];
+            expected[0].push(expected_item.clone());
             assert_eq!(result, vec![expected]);
         }
 
@@ -5844,43 +6582,55 @@ pub mod tests {
         let bin_locations = vec![0, 127, 128, 255];
         for bin in 0..bins {
             let result = AccountsDb::scan_snapshot_stores(
-                &storages,
+                &get_storage_refs(&storages),
                 &mut stats,
                 bins,
                 &Range {
                     start: bin,
                     end: bin + 1,
                 },
-            );
+                false,
+            )
+            .unwrap();
             let mut expected = vec![];
             if let Some(index) = bin_locations.iter().position(|&r| r == bin) {
-                expected = vec![Vec::new(); bins];
-                expected[bin].push(raw_expected[index].clone());
+                expected = vec![Vec::new(); 1];
+                expected[0].push(raw_expected[index].clone());
             }
             assert_eq!(result, vec![expected]);
         }
+    }
 
+    #[test]
+    fn test_accountsdb_scan_snapshot_stores_binning_2nd_chunk() {
         // enough stores to get to 2nd chunk
         // range is for only 1 bin out of 256.
         let bins = 256;
         const MAX_ITEMS_PER_CHUNK: usize = 5_000;
-        storages.splice(0..0, vec![vec![]; MAX_ITEMS_PER_CHUNK]);
+        let slot = MAX_ITEMS_PER_CHUNK as Slot;
+        let (storages, raw_expected) = sample_storages_and_account_in_slot(slot);
+        let storage_data = vec![(&storages[0], slot)];
+
+        let sorted_storages =
+            SortedStorages::new_debug(&storage_data[..], 0, MAX_ITEMS_PER_CHUNK + 1);
 
         let mut stats = HashStats::default();
         let result = AccountsDb::scan_snapshot_stores(
-            &storages,
+            &sorted_storages,
             &mut stats,
             bins,
             &Range {
                 start: 127,
                 end: 128,
             },
-        );
+            false,
+        )
+        .unwrap();
         assert_eq!(result.len(), 2); // 2 chunks
         assert_eq!(result[0].len(), 0); // nothing found in first slots
-        let mut expected = vec![Vec::new(); bins];
-        expected[127].push(raw_expected[1].clone());
-        assert_eq!(result[1].len(), bins);
+        let mut expected = vec![Vec::new(); 1];
+        expected[0].push(raw_expected[1].clone());
+        assert_eq!(result[1].len(), 1);
         assert_eq!(result[1], expected);
     }
 
@@ -5889,7 +6639,14 @@ pub mod tests {
         solana_logger::setup();
 
         let (storages, _size, _slot_expected) = sample_storage();
-        let result = AccountsDb::calculate_accounts_hash_without_index(&storages, None);
+        let result = AccountsDb::calculate_accounts_hash_without_index(
+            &get_storage_refs(&storages),
+            None,
+            HashStats::default(),
+            false,
+            None,
+        )
+        .unwrap();
         let expected_hash = Hash::from_str("GKot5hBsd81kMupNCXHaqbhv3huEbxAFMLnpcX2hniwn").unwrap();
         assert_eq!(result, (expected_hash, 0));
     }
@@ -5904,7 +6661,14 @@ pub mod tests {
                 item.hash
             });
         let sum = raw_expected.iter().map(|item| item.lamports).sum();
-        let result = AccountsDb::calculate_accounts_hash_without_index(&storages, None);
+        let result = AccountsDb::calculate_accounts_hash_without_index(
+            &get_storage_refs(&storages),
+            None,
+            HashStats::default(),
+            false,
+            None,
+        )
+        .unwrap();
 
         assert_eq!(result, (expected_hash, sum));
     }
@@ -5950,16 +6714,142 @@ pub mod tests {
 
         let calls = AtomicU64::new(0);
         let result = AccountsDb::scan_account_storage_no_bank(
-            &storages,
+            None,
+            &get_storage_refs(&storages),
             |loaded_account: LoadedAccount, accum: &mut Vec<u64>, slot: Slot| {
                 calls.fetch_add(1, Ordering::Relaxed);
-                assert_eq!(loaded_account.pubkey(), &pubkey);
+                assert_eq!(loaded_account.pubkey(), &pubkey);
+                assert_eq!(slot_expected, slot);
+                accum.push(expected);
+            },
+            |a| a,
+        );
+        assert_eq!(calls.load(Ordering::Relaxed), 1);
+        assert_eq!(result, vec![vec![expected]]);
+    }
+
+    #[test]
+    fn test_accountsdb_scan_account_storage_no_bank_one_slot() {
+        solana_logger::setup();
+
+        let expected = 1;
+        let tf = crate::append_vec::test_utils::get_append_vec_path(
+            "test_accountsdb_scan_account_storage_no_bank",
+        );
+        let (_temp_dirs, paths) = get_temp_accounts_paths(1).unwrap();
+        let slot_expected: Slot = 0;
+        let size: usize = 123;
+        let mut data = AccountStorageEntry::new(&paths[0], slot_expected, 0, size as u64);
+        let av = AppendVec::new(&tf.path, true, 1024 * 1024);
+        data.accounts = av;
+
+        let arc = Arc::new(data);
+        let storages = vec![vec![arc]];
+        let pubkey = solana_sdk::pubkey::new_rand();
+        let acc = AccountSharedData::new(1, 48, AccountSharedData::default().owner());
+        let sm = StoredMeta {
+            data_len: 1,
+            pubkey,
+            write_version: 1,
+        };
+        storages[0][0]
+            .accounts
+            .append_accounts(&[(sm, Some(&acc))], &[&Hash::default()]);
+
+        let calls = AtomicU64::new(0);
+        let mut accum = Vec::new();
+        let scan_func = |loaded_account: LoadedAccount, accum: &mut Vec<u64>, slot: Slot| {
+            calls.fetch_add(1, Ordering::Relaxed);
+            assert_eq!(loaded_account.pubkey(), &pubkey);
+            assert_eq!(slot_expected, slot);
+            accum.push(expected);
+        };
+        AccountsDb::scan_multiple_account_storages_one_slot(
+            &storages[0],
+            &scan_func,
+            slot_expected,
+            &mut accum,
+        );
+        assert_eq!(calls.load(Ordering::Relaxed), 1);
+        assert_eq!(accum, vec![expected]);
+    }
+
+    fn sample_storage_with_entries(
+        tf: &TempFile,
+        write_version: StoredMetaWriteVersion,
+        slot: Slot,
+        pubkey: &Pubkey,
+    ) -> SnapshotStorages {
+        let (_temp_dirs, paths) = get_temp_accounts_paths(1).unwrap();
+        let size: usize = 123;
+        let mut data = AccountStorageEntry::new(&paths[0], slot, 0, size as u64);
+        let av = AppendVec::new(&tf.path, true, 1024 * 1024);
+        data.accounts = av;
+
+        let arc = Arc::new(data);
+        let storages = vec![vec![arc]];
+        let acc = AccountSharedData::new(1, 48, AccountSharedData::default().owner());
+        let sm = StoredMeta {
+            data_len: 1,
+            pubkey: *pubkey,
+            write_version,
+        };
+        storages[0][0]
+            .accounts
+            .append_accounts(&[(sm, Some(&acc))], &[&Hash::default()]);
+        storages
+    }
+
+    #[test]
+    fn test_accountsdb_scan_multiple_account_storage_no_bank_one_slot() {
+        solana_logger::setup();
+
+        let slot_expected: Slot = 0;
+        let tf = crate::append_vec::test_utils::get_append_vec_path(
+            "test_accountsdb_scan_account_storage_no_bank",
+        );
+        let write_version1 = 0;
+        let write_version2 = 1;
+        let pubkey1 = solana_sdk::pubkey::new_rand();
+        let pubkey2 = solana_sdk::pubkey::new_rand();
+        for swap in [false, true].iter() {
+            let mut storages = [
+                sample_storage_with_entries(&tf, write_version1, slot_expected, &pubkey1)
+                    .remove(0)
+                    .remove(0),
+                sample_storage_with_entries(&tf, write_version2, slot_expected, &pubkey2)
+                    .remove(0)
+                    .remove(0),
+            ];
+            if *swap {
+                storages[..].swap(0, 1);
+            }
+            let calls = AtomicU64::new(0);
+            let scan_func = |loaded_account: LoadedAccount, accum: &mut Vec<u64>, slot: Slot| {
+                calls.fetch_add(1, Ordering::Relaxed);
+                let write_version = loaded_account.write_version();
+                let first = loaded_account.pubkey() == &pubkey1 && write_version == write_version1;
+                assert!(
+                    first || loaded_account.pubkey() == &pubkey2 && write_version == write_version2
+                );
                 assert_eq!(slot_expected, slot);
-                accum.push(expected);
-            },
-        );
-        assert_eq!(calls.load(Ordering::Relaxed), 1);
-        assert_eq!(result, vec![vec![expected]]);
+                if first {
+                    assert!(accum.is_empty());
+                } else {
+                    assert!(accum.len() == 1);
+                }
+                accum.push(write_version);
+            };
+            let mut accum = Vec::new();
+            AccountsDb::scan_multiple_account_storages_one_slot(
+                &storages,
+                &scan_func,
+                slot_expected,
+                &mut accum,
+            );
+            assert_eq!(calls.load(Ordering::Relaxed), storages.len() as u64);
+            assert_eq!(accum, vec![write_version1, write_version2]);
+        }
     }
 
     #[test]
@@ -6222,6 +7112,7 @@ pub mod tests {
 
     fn run_test_remove_unrooted_slot(is_cached: bool) {
         let unrooted_slot = 9;
+        let unrooted_bank_id = 9;
         let mut db = AccountsDb::new(Vec::new(), &ClusterType::Development);
         db.caching_enabled = true;
         let key = Pubkey::default();
@@ -6243,7 +7134,7 @@ pub mod tests {
         assert_load_account(&db, unrooted_slot, key, 1);
 
         // Purge the slot
-        db.remove_unrooted_slot(unrooted_slot);
+        db.remove_unrooted_slots(&[(unrooted_slot, unrooted_bank_id)]);
         assert!(db.load_without_fixed_root(&ancestors, &key).is_none());
         assert!(db.bank_hashes.read().unwrap().get(&unrooted_slot).is_none());
         assert!(db.accounts_cache.slot_cache(unrooted_slot).is_none());
@@ -6274,13 +7165,14 @@ pub mod tests {
     fn test_remove_unrooted_slot_snapshot() {
         solana_logger::setup();
         let unrooted_slot = 9;
+        let unrooted_bank_id = 9;
         let db = AccountsDb::new(Vec::new(), &ClusterType::Development);
         let key = solana_sdk::pubkey::new_rand();
         let account0 = AccountSharedData::new(1, 0, &key);
         db.store_uncached(unrooted_slot, &[(&key, &account0)]);
 
         // Purge the slot
-        db.remove_unrooted_slot(unrooted_slot);
+        db.remove_unrooted_slots(&[(unrooted_slot, unrooted_bank_id)]);
 
         // Add a new root
         let key2 = solana_sdk::pubkey::new_rand();
@@ -6481,7 +7373,7 @@ pub mod tests {
         for (i, key) in keys.iter().enumerate() {
             assert_eq!(
                 accounts
-                    .load_without_fixed_root(&ancestors, &key)
+                    .load_without_fixed_root(&ancestors, key)
                     .unwrap()
                     .0
                     .lamports(),
@@ -6647,7 +7539,7 @@ pub mod tests {
         }
 
         fn ref_count_for_pubkey(&self, pubkey: &Pubkey) -> RefCount {
-            self.accounts_index.ref_count_from_storage(&pubkey)
+            self.accounts_index.ref_count_from_storage(pubkey)
         }
     }
 
@@ -6864,6 +7756,7 @@ pub mod tests {
             &ClusterType::Development,
             spl_token_mint_index_enabled(),
             false,
+            AccountShrinkThreshold::default(),
         );
         let pubkey1 = solana_sdk::pubkey::new_rand();
         let pubkey2 = solana_sdk::pubkey::new_rand();
@@ -6904,11 +7797,13 @@ pub mod tests {
         // Secondary index should still find both pubkeys
         let mut found_accounts = HashSet::new();
         let index_key = IndexKey::SplTokenMint(mint_key);
+        let bank_id = 0;
         accounts
             .accounts_index
-            .index_scan_accounts(&Ancestors::default(), index_key, |key, _| {
+            .index_scan_accounts(&Ancestors::default(), bank_id, index_key, |key, _| {
                 found_accounts.insert(*key);
-            });
+            })
+            .unwrap();
         assert_eq!(found_accounts.len(), 2);
         assert!(found_accounts.contains(&pubkey1));
         assert!(found_accounts.contains(&pubkey2));
@@ -6919,13 +7814,16 @@ pub mod tests {
                 keys: [mint_key].iter().cloned().collect::<HashSet<Pubkey>>(),
             });
             // Secondary index can't be used - do normal scan: should still find both pubkeys
-            let found_accounts = accounts.index_scan_accounts(
-                &Ancestors::default(),
-                index_key,
-                |collection: &mut HashSet<Pubkey>, account| {
-                    collection.insert(*account.unwrap().0);
-                },
-            );
+            let found_accounts = accounts
+                .index_scan_accounts(
+                    &Ancestors::default(),
+                    bank_id,
+                    index_key,
+                    |collection: &mut HashSet<Pubkey>, account| {
+                        collection.insert(*account.unwrap().0);
+                    },
+                )
+                .unwrap();
             assert!(!found_accounts.1);
             assert_eq!(found_accounts.0.len(), 2);
             assert!(found_accounts.0.contains(&pubkey1));
@@ -6934,13 +7832,16 @@ pub mod tests {
             accounts.account_indexes.keys = None;
 
             // Secondary index can now be used since it isn't marked as excluded
-            let found_accounts = accounts.index_scan_accounts(
-                &Ancestors::default(),
-                index_key,
-                |collection: &mut HashSet<Pubkey>, account| {
-                    collection.insert(*account.unwrap().0);
-                },
-            );
+            let found_accounts = accounts
+                .index_scan_accounts(
+                    &Ancestors::default(),
+                    bank_id,
+                    index_key,
+                    |collection: &mut HashSet<Pubkey>, account| {
+                        collection.insert(*account.unwrap().0);
+                    },
+                )
+                .unwrap();
             assert!(found_accounts.1);
             assert_eq!(found_accounts.0.len(), 2);
             assert!(found_accounts.0.contains(&pubkey1));
@@ -6965,11 +7866,15 @@ pub mod tests {
 
         // Secondary index should have purged `pubkey1` as well
         let mut found_accounts = vec![];
-        accounts.accounts_index.index_scan_accounts(
-            &Ancestors::default(),
-            IndexKey::SplTokenMint(mint_key),
-            |key, _| found_accounts.push(*key),
-        );
+        accounts
+            .accounts_index
+            .index_scan_accounts(
+                &Ancestors::default(),
+                bank_id,
+                IndexKey::SplTokenMint(mint_key),
+                |key, _| found_accounts.push(*key),
+            )
+            .unwrap();
         assert_eq!(found_accounts, vec![pubkey2]);
     }
 
@@ -7438,7 +8343,7 @@ pub mod tests {
         assert_load_account(&accounts, current_slot, dummy_pubkey, dummy_lamport);
 
         accounts
-            .verify_bank_hash_and_lamports(4, &Ancestors::default(), 1222)
+            .verify_bank_hash_and_lamports(4, &Ancestors::default(), 1222, true)
             .unwrap();
     }
 
@@ -7845,6 +8750,58 @@ pub mod tests {
         assert_eq!(bank_hash.stats.num_executable_accounts, 1);
     }
 
+    #[test]
+    fn test_calculate_accounts_hash_check_hash_mismatch() {
+        solana_logger::setup();
+        let db = AccountsDb::new(Vec::new(), &ClusterType::Development);
+
+        let key = solana_sdk::pubkey::new_rand();
+        let some_data_len = 0;
+        let some_slot: Slot = 0;
+        let account = AccountSharedData::new(1, some_data_len, &key);
+
+        let ancestors = vec![(some_slot, 0)].into_iter().collect();
+
+        // put wrong hash value in store so we get a mismatch
+        db.store_accounts_unfrozen(
+            some_slot,
+            &[(&key, &account)],
+            Some(&[&Hash::default()]),
+            false,
+        );
+        db.add_root(some_slot);
+        let check_hash = true;
+        assert!(db
+            .calculate_accounts_hash_helper(false, some_slot, &ancestors, check_hash, false)
+            .is_err());
+        assert!(db
+            .calculate_accounts_hash_helper(true, some_slot, &ancestors, check_hash, false)
+            .is_err());
+    }
+
+    #[test]
+    fn test_calculate_accounts_hash_check_hash() {
+        solana_logger::setup();
+        let db = AccountsDb::new(Vec::new(), &ClusterType::Development);
+
+        let key = solana_sdk::pubkey::new_rand();
+        let some_data_len = 0;
+        let some_slot: Slot = 0;
+        let account = AccountSharedData::new(1, some_data_len, &key);
+
+        let ancestors = vec![(some_slot, 0)].into_iter().collect();
+
+        db.store_uncached(some_slot, &[(&key, &account)]);
+        db.add_root(some_slot);
+        let check_hash = true;
+        assert_eq!(
+            db.calculate_accounts_hash_helper(false, some_slot, &ancestors, check_hash, false)
+                .unwrap(),
+            db.calculate_accounts_hash_helper(true, some_slot, &ancestors, check_hash, false)
+                .unwrap(),
+        );
+    }
+
     #[test]
     fn test_verify_bank_hash() {
         use BankHashVerificationError::*;
@@ -7861,13 +8818,13 @@ pub mod tests {
         db.add_root(some_slot);
         db.update_accounts_hash_test(some_slot, &ancestors);
         assert_matches!(
-            db.verify_bank_hash_and_lamports(some_slot, &ancestors, 1),
+            db.verify_bank_hash_and_lamports(some_slot, &ancestors, 1, true),
             Ok(_)
         );
 
         db.bank_hashes.write().unwrap().remove(&some_slot).unwrap();
         assert_matches!(
-            db.verify_bank_hash_and_lamports(some_slot, &ancestors, 1),
+            db.verify_bank_hash_and_lamports(some_slot, &ancestors, 1, true),
             Err(MissingBankHash)
         );
 
@@ -7882,7 +8839,7 @@ pub mod tests {
             .unwrap()
             .insert(some_slot, bank_hash_info);
         assert_matches!(
-            db.verify_bank_hash_and_lamports(some_slot, &ancestors, 1),
+            db.verify_bank_hash_and_lamports(some_slot, &ancestors, 1, true),
             Err(MismatchedBankHash)
         );
     }
@@ -7903,7 +8860,7 @@ pub mod tests {
         db.add_root(some_slot);
         db.update_accounts_hash_test(some_slot, &ancestors);
         assert_matches!(
-            db.verify_bank_hash_and_lamports(some_slot, &ancestors, 1),
+            db.verify_bank_hash_and_lamports(some_slot, &ancestors, 1, true),
             Ok(_)
         );
 
@@ -7917,12 +8874,12 @@ pub mod tests {
         );
         db.update_accounts_hash_test(some_slot, &ancestors);
         assert_matches!(
-            db.verify_bank_hash_and_lamports(some_slot, &ancestors, 2),
+            db.verify_bank_hash_and_lamports(some_slot, &ancestors, 2, true),
             Ok(_)
         );
 
         assert_matches!(
-            db.verify_bank_hash_and_lamports(some_slot, &ancestors, 10),
+            db.verify_bank_hash_and_lamports(some_slot, &ancestors, 10, true),
             Err(MismatchedTotalLamports(expected, actual)) if expected == 2 && actual == 10
         );
     }
@@ -7942,7 +8899,7 @@ pub mod tests {
         db.add_root(some_slot);
         db.update_accounts_hash_test(some_slot, &ancestors);
         assert_matches!(
-            db.verify_bank_hash_and_lamports(some_slot, &ancestors, 0),
+            db.verify_bank_hash_and_lamports(some_slot, &ancestors, 0, true),
             Ok(_)
         );
     }
@@ -7972,7 +8929,7 @@ pub mod tests {
         db.store_accounts_unfrozen(some_slot, accounts, Some(&[&some_hash]), false);
         db.add_root(some_slot);
         assert_matches!(
-            db.verify_bank_hash_and_lamports(some_slot, &ancestors, 1),
+            db.verify_bank_hash_and_lamports(some_slot, &ancestors, 1, true),
             Err(MismatchedAccountHash)
         );
     }
@@ -7993,7 +8950,7 @@ pub mod tests {
     #[test]
     fn test_get_snapshot_storages_empty() {
         let db = AccountsDb::new(Vec::new(), &ClusterType::Development);
-        assert!(db.get_snapshot_storages(0).is_empty());
+        assert!(db.get_snapshot_storages(0, None).0.is_empty());
     }
 
     #[test]
@@ -8008,10 +8965,10 @@ pub mod tests {
 
         db.add_root(base_slot);
         db.store_uncached(base_slot, &[(&key, &account)]);
-        assert!(db.get_snapshot_storages(before_slot).is_empty());
+        assert!(db.get_snapshot_storages(before_slot, None).0.is_empty());
 
-        assert_eq!(1, db.get_snapshot_storages(base_slot).len());
-        assert_eq!(1, db.get_snapshot_storages(after_slot).len());
+        assert_eq!(1, db.get_snapshot_storages(base_slot, None).0.len());
+        assert_eq!(1, db.get_snapshot_storages(after_slot, None).0.len());
     }
 
     #[test]
@@ -8031,10 +8988,10 @@ pub mod tests {
             .unwrap()
             .clear();
         db.add_root(base_slot);
-        assert!(db.get_snapshot_storages(after_slot).is_empty());
+        assert!(db.get_snapshot_storages(after_slot, None).0.is_empty());
 
         db.store_uncached(base_slot, &[(&key, &account)]);
-        assert_eq!(1, db.get_snapshot_storages(after_slot).len());
+        assert_eq!(1, db.get_snapshot_storages(after_slot, None).0.len());
     }
 
     #[test]
@@ -8047,10 +9004,10 @@ pub mod tests {
         let after_slot = base_slot + 1;
 
         db.store_uncached(base_slot, &[(&key, &account)]);
-        assert!(db.get_snapshot_storages(after_slot).is_empty());
+        assert!(db.get_snapshot_storages(after_slot, None).0.is_empty());
 
         db.add_root(base_slot);
-        assert_eq!(1, db.get_snapshot_storages(after_slot).len());
+        assert_eq!(1, db.get_snapshot_storages(after_slot, None).0.len());
     }
 
     #[test]
@@ -8064,7 +9021,7 @@ pub mod tests {
 
         db.store_uncached(base_slot, &[(&key, &account)]);
         db.add_root(base_slot);
-        assert_eq!(1, db.get_snapshot_storages(after_slot).len());
+        assert_eq!(1, db.get_snapshot_storages(after_slot, None).0.len());
 
         db.storage
             .get_slot_stores(0)
@@ -8075,7 +9032,7 @@ pub mod tests {
             .next()
             .unwrap()
             .remove_account(0, true);
-        assert!(db.get_snapshot_storages(after_slot).is_empty());
+        assert!(db.get_snapshot_storages(after_slot, None).0.is_empty());
     }
 
     #[test]
@@ -8239,7 +9196,7 @@ pub mod tests {
         accounts.store_uncached(current_slot, &[(&pubkey2, &zero_lamport_account)]);
         accounts.store_uncached(current_slot, &[(&pubkey3, &zero_lamport_account)]);
 
-        let snapshot_stores = accounts.get_snapshot_storages(current_slot);
+        let snapshot_stores = accounts.get_snapshot_storages(current_slot, None).0;
         let total_accounts: usize = snapshot_stores
             .iter()
             .flatten()
@@ -8387,6 +9344,9 @@ pub mod tests {
         // Do clean
         accounts.clean_accounts(None, false);
 
+        // 2nd clean needed to clean-up pubkey1
+        accounts.clean_accounts(None, false);
+
         // Ensure pubkey2 is cleaned from the index finally
         assert_not_load_account(&accounts, current_slot, pubkey1);
         assert_load_account(&accounts, current_slot, pubkey2, old_lamport);
@@ -8510,7 +9470,7 @@ pub mod tests {
 
             current_slot += 1;
             for pubkey in &pubkeys {
-                accounts.store_uncached(current_slot, &[(&pubkey, &account)]);
+                accounts.store_uncached(current_slot, &[(pubkey, &account)]);
             }
             let shrink_slot = current_slot;
             accounts.get_accounts_delta_hash(current_slot);
@@ -8521,7 +9481,7 @@ pub mod tests {
             let updated_pubkeys = &pubkeys[0..pubkey_count - pubkey_count_after_shrink];
 
             for pubkey in updated_pubkeys {
-                accounts.store_uncached(current_slot, &[(&pubkey, &account)]);
+                accounts.store_uncached(current_slot, &[(pubkey, &account)]);
             }
             accounts.get_accounts_delta_hash(current_slot);
             accounts.add_root(current_slot);
@@ -8541,12 +9501,12 @@ pub mod tests {
             let no_ancestors = Ancestors::default();
             accounts.update_accounts_hash(current_slot, &no_ancestors);
             accounts
-                .verify_bank_hash_and_lamports(current_slot, &no_ancestors, 22300)
+                .verify_bank_hash_and_lamports(current_slot, &no_ancestors, 22300, true)
                 .unwrap();
 
             let accounts = reconstruct_accounts_db_via_serialization(&accounts, current_slot);
             accounts
-                .verify_bank_hash_and_lamports(current_slot, &no_ancestors, 22300)
+                .verify_bank_hash_and_lamports(current_slot, &no_ancestors, 22300, true)
                 .unwrap();
 
             // repeating should be no-op
@@ -8579,7 +9539,7 @@ pub mod tests {
 
         current_slot += 1;
         for pubkey in &pubkeys {
-            accounts.store_uncached(current_slot, &[(&pubkey, &account)]);
+            accounts.store_uncached(current_slot, &[(pubkey, &account)]);
         }
         let shrink_slot = current_slot;
         accounts.get_accounts_delta_hash(current_slot);
@@ -8590,7 +9550,7 @@ pub mod tests {
         let updated_pubkeys = &pubkeys[0..pubkey_count - pubkey_count_after_shrink];
 
         for pubkey in updated_pubkeys {
-            accounts.store_uncached(current_slot, &[(&pubkey, &account)]);
+            accounts.store_uncached(current_slot, &[(pubkey, &account)]);
         }
         accounts.get_accounts_delta_hash(current_slot);
         accounts.add_root(current_slot);
@@ -8617,6 +9577,90 @@ pub mod tests {
         );
     }
 
+    #[test]
+    fn test_select_candidates_by_total_usage() {
+        solana_logger::setup();
+
+        // case 1: no candidates
+        let accounts = AccountsDb::new_single();
+
+        let mut candidates: ShrinkCandidates = HashMap::new();
+        let output_candidates =
+            accounts.select_candidates_by_total_usage(&candidates, DEFAULT_ACCOUNTS_SHRINK_RATIO);
+
+        assert_eq!(0, output_candidates.len());
+
+        // case 2: two candidates, only one selected
+        let dummy_path = Path::new("");
+        let dummy_slot = 12;
+        let dummy_size = 2 * PAGE_SIZE;
+
+        let dummy_id1 = 22;
+        let entry1 = Arc::new(AccountStorageEntry::new(
+            dummy_path, dummy_slot, dummy_id1, dummy_size,
+        ));
+        entry1.alive_bytes.store(8000, Ordering::Relaxed);
+
+        candidates
+            .entry(dummy_slot)
+            .or_default()
+            .insert(entry1.append_vec_id(), entry1.clone());
+
+        let dummy_id2 = 44;
+        let entry2 = Arc::new(AccountStorageEntry::new(
+            dummy_path, dummy_slot, dummy_id2, dummy_size,
+        ));
+        entry2.alive_bytes.store(3000, Ordering::Relaxed);
+        candidates
+            .entry(dummy_slot)
+            .or_default()
+            .insert(entry2.append_vec_id(), entry2.clone());
+
+        let output_candidates =
+            accounts.select_candidates_by_total_usage(&candidates, DEFAULT_ACCOUNTS_SHRINK_RATIO);
+        assert_eq!(1, output_candidates.len());
+        assert_eq!(1, output_candidates[&dummy_slot].len());
+        assert!(output_candidates[&dummy_slot].contains(&entry2.append_vec_id()));
+
+        // case 3: two candidates, both are selected
+        candidates.clear();
+        let dummy_size = 4 * PAGE_SIZE;
+        let dummy_id1 = 22;
+        let entry1 = Arc::new(AccountStorageEntry::new(
+            dummy_path, dummy_slot, dummy_id1, dummy_size,
+        ));
+        entry1.alive_bytes.store(3500, Ordering::Relaxed);
+
+        candidates
+            .entry(dummy_slot)
+            .or_default()
+            .insert(entry1.append_vec_id(), entry1.clone());
+
+        let dummy_id2 = 44;
+        let dummy_slot2 = 44;
+        let entry2 = Arc::new(AccountStorageEntry::new(
+            dummy_path,
+            dummy_slot2,
+            dummy_id2,
+            dummy_size,
+        ));
+        entry2.alive_bytes.store(3000, Ordering::Relaxed);
+
+        candidates
+            .entry(dummy_slot2)
+            .or_default()
+            .insert(entry2.append_vec_id(), entry2.clone());
+
+        let output_candidates =
+            accounts.select_candidates_by_total_usage(&candidates, DEFAULT_ACCOUNTS_SHRINK_RATIO);
+        assert_eq!(2, output_candidates.len());
+        assert_eq!(1, output_candidates[&dummy_slot].len());
+        assert_eq!(1, output_candidates[&dummy_slot2].len());
+
+        assert!(output_candidates[&dummy_slot].contains(&entry1.append_vec_id()));
+        assert!(output_candidates[&dummy_slot2].contains(&entry2.append_vec_id()));
+    }
+
     #[test]
     fn test_shrink_stale_slots_skipped() {
         solana_logger::setup();
@@ -8639,7 +9683,7 @@ pub mod tests {
 
         current_slot += 1;
         for pubkey in &pubkeys {
-            accounts.store_uncached(current_slot, &[(&pubkey, &account)]);
+            accounts.store_uncached(current_slot, &[(pubkey, &account)]);
         }
         let shrink_slot = current_slot;
         accounts.get_accounts_delta_hash(current_slot);
@@ -8650,7 +9694,7 @@ pub mod tests {
         let updated_pubkeys = &pubkeys[0..pubkey_count - pubkey_count_after_shrink];
 
         for pubkey in updated_pubkeys {
-            accounts.store_uncached(current_slot, &[(&pubkey, &account)]);
+            accounts.store_uncached(current_slot, &[(pubkey, &account)]);
         }
         accounts.get_accounts_delta_hash(current_slot);
         accounts.add_root(current_slot);
@@ -8793,7 +9837,7 @@ pub mod tests {
             info!(
                 "store: {:?} : {:?}",
                 store,
-                store_counts.get(&store).unwrap()
+                store_counts.get(store).unwrap()
             );
         }
         for x in 0..3 {
@@ -8849,6 +9893,55 @@ pub mod tests {
         assert!(total_len < STORE_META_OVERHEAD);
     }
 
+    #[test]
+    fn test_store_clean_after_shrink() {
+        solana_logger::setup();
+        let accounts = AccountsDb::new_with_config(
+            vec![],
+            &ClusterType::Development,
+            AccountSecondaryIndexes::default(),
+            true,
+            AccountShrinkThreshold::default(),
+        );
+
+        let account = AccountSharedData::new(1, 16 * 4096, &Pubkey::default());
+        let pubkey1 = solana_sdk::pubkey::new_rand();
+        accounts.store_cached(0, &[(&pubkey1, &account)]);
+
+        let pubkey2 = solana_sdk::pubkey::new_rand();
+        accounts.store_cached(0, &[(&pubkey2, &account)]);
+
+        let zero_account = AccountSharedData::new(0, 1, &Pubkey::default());
+        accounts.store_cached(1, &[(&pubkey1, &zero_account)]);
+
+        // Add root 0 and flush separately
+        accounts.get_accounts_delta_hash(0);
+        accounts.add_root(0);
+        accounts.flush_accounts_cache(true, None);
+
+        // clear out the dirty keys
+        accounts.clean_accounts(None, false);
+
+        // flush 1
+        accounts.get_accounts_delta_hash(1);
+        accounts.add_root(1);
+        accounts.flush_accounts_cache(true, None);
+
+        accounts.print_accounts_stats("pre-clean");
+
+        // clean to remove pubkey1 from 0,
+        // shrink to shrink pubkey1 from 0
+        // then another clean to remove pubkey1 from slot 1
+        accounts.clean_accounts(None, false);
+
+        accounts.shrink_candidate_slots();
+
+        accounts.clean_accounts(None, false);
+
+        accounts.print_accounts_stats("post-clean");
+        assert_eq!(accounts.accounts_index.ref_count_from_storage(&pubkey1), 0);
+    }
+
     #[test]
     fn test_store_reuse() {
         solana_logger::setup();
@@ -8873,6 +9966,10 @@ pub mod tests {
         accounts.add_root(1);
         accounts.clean_accounts(None, false);
         accounts.shrink_all_slots(false);
+
+        // Clean again to flush the dirty stores
+        // and allow them to be recycled in the next step
+        accounts.clean_accounts(None, false);
         accounts.print_accounts_stats("post-shrink");
         let num_stores = accounts.recycle_stores.read().unwrap().entry_count();
         assert!(num_stores > 0);
@@ -9115,6 +10212,7 @@ pub mod tests {
             &ClusterType::Development,
             AccountSecondaryIndexes::default(),
             caching_enabled,
+            AccountShrinkThreshold::default(),
         ));
 
         let account_key = Pubkey::new_unique();
@@ -9162,6 +10260,7 @@ pub mod tests {
             &ClusterType::Development,
             AccountSecondaryIndexes::default(),
             caching_enabled,
+            AccountShrinkThreshold::default(),
         ));
 
         let account_key = Pubkey::new_unique();
@@ -9210,6 +10309,7 @@ pub mod tests {
             &ClusterType::Development,
             AccountSecondaryIndexes::default(),
             caching_enabled,
+            AccountShrinkThreshold::default(),
         ));
 
         let zero_lamport_account_key = Pubkey::new_unique();
@@ -9295,6 +10395,7 @@ pub mod tests {
     fn setup_scan(
         db: Arc<AccountsDb>,
         scan_ancestors: Arc<Ancestors>,
+        bank_id: BankId,
         stall_key: Pubkey,
     ) -> ScanTracker {
         let exit = Arc::new(AtomicBool::new(false));
@@ -9307,6 +10408,7 @@ pub mod tests {
             .spawn(move || {
                 db.scan_accounts(
                     &scan_ancestors,
+                    bank_id,
                     |_collector: &mut Vec<(Pubkey, AccountSharedData)>, maybe_account| {
                         ready_.store(true, Ordering::Relaxed);
                         if let Some((pubkey, _, _)) = maybe_account {
@@ -9321,7 +10423,8 @@ pub mod tests {
                             }
                         }
                     },
-                );
+                )
+                .unwrap();
             })
             .unwrap();
 
@@ -9341,6 +10444,7 @@ pub mod tests {
             &ClusterType::Development,
             AccountSecondaryIndexes::default(),
             caching_enabled,
+            AccountShrinkThreshold::default(),
         ));
         let account_key = Pubkey::new_unique();
         let account_key2 = Pubkey::new_unique();
@@ -9366,7 +10470,8 @@ pub mod tests {
         let max_scan_root = 0;
         db.add_root(max_scan_root);
         let scan_ancestors: Arc<Ancestors> = Arc::new(vec![(0, 1), (1, 1)].into_iter().collect());
-        let scan_tracker = setup_scan(db.clone(), scan_ancestors.clone(), account_key2);
+        let bank_id = 0;
+        let scan_tracker = setup_scan(db.clone(), scan_ancestors.clone(), bank_id, account_key2);
 
         // Add a new root 2
         let new_root = 2;
@@ -9426,7 +10531,8 @@ pub mod tests {
         assert_eq!(account.0.lamports(), slot1_account.lamports());
 
         // Simulate dropping the bank, which finally removes the slot from the cache
-        db.purge_slot(1, false);
+        let bank_id = 1;
+        db.purge_slot(1, bank_id, false);
         assert!(db
             .do_load(
                 &scan_ancestors,
@@ -9445,6 +10551,7 @@ pub mod tests {
             &ClusterType::Development,
             AccountSecondaryIndexes::default(),
             caching_enabled,
+            AccountShrinkThreshold::default(),
         );
         let slot: Slot = 0;
         let num_keys = 10;
@@ -9499,6 +10606,7 @@ pub mod tests {
             &ClusterType::Development,
             AccountSecondaryIndexes::default(),
             caching_enabled,
+            AccountShrinkThreshold::default(),
         ));
         let slots: Vec<_> = (0..num_slots as Slot).into_iter().collect();
         let stall_slot = num_slots as Slot;
@@ -9529,7 +10637,13 @@ pub mod tests {
             accounts_db.add_root(*slot as Slot);
             if Some(*slot) == scan_slot {
                 let ancestors = Arc::new(vec![(stall_slot, 1), (*slot, 1)].into_iter().collect());
-                scan_tracker = Some(setup_scan(accounts_db.clone(), ancestors, scan_stall_key));
+                let bank_id = 0;
+                scan_tracker = Some(setup_scan(
+                    accounts_db.clone(),
+                    ancestors,
+                    bank_id,
+                    scan_stall_key,
+                ));
                 assert_eq!(
                     accounts_db.accounts_index.min_ongoing_scan_root().unwrap(),
                     *slot
@@ -9897,6 +11011,7 @@ pub mod tests {
             &ClusterType::Development,
             AccountSecondaryIndexes::default(),
             caching_enabled,
+            AccountShrinkThreshold::default(),
         );
         let account_key1 = Pubkey::new_unique();
         let account_key2 = Pubkey::new_unique();
@@ -10046,18 +11161,12 @@ pub mod tests {
 
         let dummy_id1 = 22;
         let entry1 = Arc::new(AccountStorageEntry::new(
-            &dummy_path,
-            dummy_slot,
-            dummy_id1,
-            dummy_size,
+            dummy_path, dummy_slot, dummy_id1, dummy_size,
         ));
 
         let dummy_id2 = 44;
         let entry2 = Arc::new(AccountStorageEntry::new(
-            &dummy_path,
-            dummy_slot,
-            dummy_id2,
-            dummy_size,
+            dummy_path, dummy_slot, dummy_id2, dummy_size,
         ));
 
         let mut recycle_stores = RecycleStores::default();
@@ -10159,6 +11268,7 @@ pub mod tests {
             &ClusterType::Development,
             AccountSecondaryIndexes::default(),
             caching_enabled,
+            AccountShrinkThreshold::default(),
         );
         db.load_delay = RACY_SLEEP_MS;
         let db = Arc::new(db);
@@ -10230,6 +11340,7 @@ pub mod tests {
             &ClusterType::Development,
             AccountSecondaryIndexes::default(),
             caching_enabled,
+            AccountShrinkThreshold::default(),
         );
         db.load_delay = RACY_SLEEP_MS;
         let db = Arc::new(db);
@@ -10297,6 +11408,140 @@ pub mod tests {
         do_test_load_account_and_shrink_race(false);
     }
 
+    #[test]
+    fn test_cache_flush_remove_unrooted_race() {
+        let caching_enabled = true;
+        let db = AccountsDb::new_with_config(
+            Vec::new(),
+            &ClusterType::Development,
+            AccountSecondaryIndexes::default(),
+            caching_enabled,
+            AccountShrinkThreshold::default(),
+        );
+        let db = Arc::new(db);
+        let num_cached_slots = 100;
+
+        let num_trials = 100;
+        let (new_trial_start_sender, new_trial_start_receiver) = unbounded();
+        let (flush_done_sender, flush_done_receiver) = unbounded();
+        // Start up a thread to flush the accounts cache
+        let t_flush_cache = {
+            let db = db.clone();
+
+            std::thread::Builder::new()
+                .name("account-cache-flush".to_string())
+                .spawn(move || loop {
+                    // Wait for the signal to start a trial
+                    if new_trial_start_receiver.recv().is_err() {
+                        return;
+                    }
+                    for slot in 0..num_cached_slots {
+                        db.flush_slot_cache(slot, None::<&mut fn(&_, &_) -> bool>);
+                    }
+                    flush_done_sender.send(()).unwrap();
+                })
+                .unwrap()
+        };
+
+        let exit = Arc::new(AtomicBool::new(false));
+
+        let t_spurious_signal = {
+            let db = db.clone();
+            let exit = exit.clone();
+            std::thread::Builder::new()
+                .name("account-cache-flush".to_string())
+                .spawn(move || loop {
+                    if exit.load(Ordering::Relaxed) {
+                        return;
+                    }
+                    // Simulate spurious wake-up that can happen, but is too rare to
+                    // otherwise depend on in tests.
+                    db.remove_unrooted_slots_synchronization.signal.notify_all();
+                })
+                .unwrap()
+        };
+
+        // Run multiple trials. Has the added benefit of rewriting the same slots after we've
+        // dumped them in previous trials.
+        for _ in 0..num_trials {
+            // Store an account
+            let lamports = 42;
+            let mut account = AccountSharedData::new(1, 0, AccountSharedData::default().owner());
+            account.set_lamports(lamports);
+
+            // Pick random 50% of the slots to pass to `remove_unrooted_slots()`
+            let mut all_slots: Vec<(Slot, BankId)> = (0..num_cached_slots)
+                .map(|slot| {
+                    let bank_id = slot + 1;
+                    (slot, bank_id)
+                })
+                .collect();
+            all_slots.shuffle(&mut rand::thread_rng());
+            let slots_to_dump = &all_slots[0..num_cached_slots as usize / 2];
+            let slots_to_keep = &all_slots[num_cached_slots as usize / 2..];
+
+            // Set up a one account per slot across many different slots, track which
+            // pubkey was stored in each slot.
+            let slot_to_pubkey_map: HashMap<Slot, Pubkey> = (0..num_cached_slots)
+                .map(|slot| {
+                    let pubkey = Pubkey::new_unique();
+                    db.store_cached(slot, &[(&pubkey, &account)]);
+                    (slot, pubkey)
+                })
+                .collect();
+
+            // Signal the flushing shred to start flushing
+            new_trial_start_sender.send(()).unwrap();
+
+            // Here we want to test both:
+            // 1) Flush thread starts flushing a slot before we try dumping it.
+            // 2) Flushing thread trying to flush while/after we're trying to dump the slot,
+            // in which case flush should ignore/move past the slot to be dumped
+            //
+            // Hence, we split into chunks to get the dumping of each chunk to race with the
+            // flushes. If we were to dump the entire chunk at once, then this lessens the possibility
+            // of the flush occurring first since the dumping logic reserves all the slots it's about
+            // to dump immediately.
+            for chunks in slots_to_dump.chunks(slots_to_dump.len() / 2) {
+                db.remove_unrooted_slots(chunks);
+            }
+
+            // Check that all the slots in `slots_to_dump` were completely removed from the
+            // cache, storage, and index
+            for (slot, _) in slots_to_dump {
+                assert!(db.storage.get_slot_storage_entries(*slot).is_none());
+                assert!(db.accounts_cache.slot_cache(*slot).is_none());
+                let account_in_slot = slot_to_pubkey_map[slot];
+                assert!(db
+                    .accounts_index
+                    .get_account_read_entry(&account_in_slot)
+                    .is_none());
+            }
+
+            // Wait for flush to finish before starting next trial
+            flush_done_receiver.recv().unwrap();
+
+            for (slot, bank_id) in slots_to_keep {
+                let account_in_slot = slot_to_pubkey_map[slot];
+                assert!(db
+                    .load(
+                        &Ancestors::from(vec![(*slot, 0)]),
+                        &account_in_slot,
+                        LoadHint::FixedMaxRoot
+                    )
+                    .is_some());
+                // Clear for next iteration so that `assert!(self.storage.get_slot_stores(purged_slot).is_none());`
+                // in `purge_slot_pubkeys()` doesn't trigger
+                db.remove_unrooted_slots(&[(*slot, *bank_id)]);
+            }
+        }
+
+        exit.store(true, Ordering::Relaxed);
+        drop(new_trial_start_sender);
+        t_flush_cache.join().unwrap();
+        t_spurious_signal.join().unwrap();
+    }
+
     #[test]
     fn test_collect_uncleaned_slots_up_to_slot() {
         solana_logger::setup();
@@ -10424,4 +11669,109 @@ pub mod tests {
         assert!(uncleaned_pubkeys.contains(&pubkey2));
         assert!(uncleaned_pubkeys.contains(&pubkey3));
     }
+
+    #[test]
+    fn test_shrink_productive() {
+        solana_logger::setup();
+        let s1 = AccountStorageEntry::new(Path::new("."), 0, 0, 1024);
+        let stores = vec![Arc::new(s1)];
+        assert!(!AccountsDb::is_shrinking_productive(0, &stores));
+
+        let s1 = AccountStorageEntry::new(Path::new("."), 0, 0, PAGE_SIZE * 4);
+        let stores = vec![Arc::new(s1)];
+        stores[0].add_account((3 * PAGE_SIZE as usize) - 1);
+        stores[0].add_account(10);
+        stores[0].remove_account(10, false);
+        assert!(AccountsDb::is_shrinking_productive(0, &stores));
+
+        stores[0].add_account(PAGE_SIZE as usize);
+        assert!(!AccountsDb::is_shrinking_productive(0, &stores));
+
+        let s1 = AccountStorageEntry::new(Path::new("."), 0, 0, PAGE_SIZE + 1);
+        s1.add_account(PAGE_SIZE as usize);
+        let s2 = AccountStorageEntry::new(Path::new("."), 0, 1, PAGE_SIZE + 1);
+        s2.add_account(PAGE_SIZE as usize);
+        let stores = vec![Arc::new(s1), Arc::new(s2)];
+        assert!(AccountsDb::is_shrinking_productive(0, &stores));
+    }
+
+    #[test]
+    fn test_is_candidate_for_shrink() {
+        solana_logger::setup();
+
+        let mut accounts = AccountsDb::new_single();
+        let dummy_path = Path::new("");
+        let dummy_size = 2 * PAGE_SIZE;
+        let entry = Arc::new(AccountStorageEntry::new(dummy_path, 0, 1, dummy_size));
+        match accounts.shrink_ratio {
+            AccountShrinkThreshold::TotalSpace { shrink_ratio } => {
+                assert_eq!(
+                    (DEFAULT_ACCOUNTS_SHRINK_RATIO * 100.) as u64,
+                    (shrink_ratio * 100.) as u64
+                )
+            }
+            AccountShrinkThreshold::IndividalStore { shrink_ratio: _ } => {
+                panic!("Expect the default to be TotalSpace")
+            }
+        }
+        entry.alive_bytes.store(3000, Ordering::Relaxed);
+        assert!(accounts.is_candidate_for_shrink(&entry));
+        entry.alive_bytes.store(5000, Ordering::Relaxed);
+        assert!(!accounts.is_candidate_for_shrink(&entry));
+        accounts.shrink_ratio = AccountShrinkThreshold::TotalSpace { shrink_ratio: 0.3 };
+        entry.alive_bytes.store(3000, Ordering::Relaxed);
+        assert!(accounts.is_candidate_for_shrink(&entry));
+        accounts.shrink_ratio = AccountShrinkThreshold::IndividalStore { shrink_ratio: 0.3 };
+        assert!(!accounts.is_candidate_for_shrink(&entry));
+    }
+
+    #[test]
+    fn test_purge_alive_unrooted_slots_after_clean() {
+        let accounts = AccountsDb::new_single();
+
+        // Key shared between rooted and nonrooted slot
+        let shared_key = solana_sdk::pubkey::new_rand();
+        // Key to keep the storage entry for the unrooted slot alive
+        let unrooted_key = solana_sdk::pubkey::new_rand();
+        let slot0 = 0;
+        let slot1 = 1;
+
+        // Store accounts with greater than 0 lamports
+        let account = AccountSharedData::new(1, 1, AccountSharedData::default().owner());
+        accounts.store_uncached(slot0, &[(&shared_key, &account)]);
+        accounts.store_uncached(slot0, &[(&unrooted_key, &account)]);
+
+        // Simulate adding dirty pubkeys on bank freeze. Note this is
+        // not a rooted slot
+        accounts.get_accounts_delta_hash(slot0);
+
+        // On the next *rooted* slot, update the `shared_key` account to zero lamports
+        let zero_lamport_account =
+            AccountSharedData::new(0, 0, AccountSharedData::default().owner());
+        accounts.store_uncached(slot1, &[(&shared_key, &zero_lamport_account)]);
+
+        // Simulate adding dirty pubkeys on bank freeze, set root
+        accounts.get_accounts_delta_hash(slot1);
+        accounts.add_root(slot1);
+
+        // The later rooted zero-lamport update to `shared_key` cannot be cleaned
+        // because it is kept alive by the unrooted slot.
+        accounts.clean_accounts(None, false);
+        assert!(accounts
+            .accounts_index
+            .get_account_read_entry(&shared_key)
+            .is_some());
+
+        // Simulate purge_slot() all from AccountsBackgroundService
+        let is_from_abs = true;
+        accounts.purge_slot(slot0, 0, is_from_abs);
+
+        // Now clean should clean up the remaining key
+        accounts.clean_accounts(None, false);
+        assert!(accounts
+            .accounts_index
+            .get_account_read_entry(&shared_key)
+            .is_none());
+        assert!(accounts.storage.get_slot_storage_entries(slot0).is_none());
+    }
 }
diff --git a/runtime/src/accounts_hash.rs b/runtime/src/accounts_hash.rs
index 86d46b39ccea9f..a5827dd21b859f 100644
--- a/runtime/src/accounts_hash.rs
+++ b/runtime/src/accounts_hash.rs
@@ -2,7 +2,6 @@ use log::*;
 use rayon::prelude::*;
 use solana_measure::measure::Measure;
 use solana_sdk::{
-    clock::Slot,
     hash::{Hash, Hasher},
     pubkey::Pubkey,
 };
@@ -23,11 +22,15 @@ pub struct HashStats {
     pub scan_time_total_us: u64,
     pub zeros_time_total_us: u64,
     pub hash_time_total_us: u64,
+    pub hash_time_pre_us: u64,
     pub sort_time_total_us: u64,
-    pub flatten_time_total_us: u64,
     pub hash_total: usize,
     pub unreduced_entries: usize,
     pub num_snapshot_storage: usize,
+    pub collect_snapshots_us: u64,
+    pub storage_sort_us: u64,
+    pub min_bin_size: usize,
+    pub max_bin_size: usize,
 }
 impl HashStats {
     fn log(&mut self) {
@@ -35,21 +38,30 @@ impl HashStats {
             + self.zeros_time_total_us
             + self.hash_time_total_us
             + self.sort_time_total_us
-            + self.flatten_time_total_us;
+            + self.collect_snapshots_us
+            + self.storage_sort_us;
         datapoint_info!(
             "calculate_accounts_hash_without_index",
             ("accounts_scan", self.scan_time_total_us, i64),
             ("eliminate_zeros", self.zeros_time_total_us, i64),
             ("hash", self.hash_time_total_us, i64),
+            ("hash_time_pre_us", self.hash_time_pre_us, i64),
             ("sort", self.sort_time_total_us, i64),
             ("hash_total", self.hash_total, i64),
-            ("flatten", self.flatten_time_total_us, i64),
+            ("storage_sort_us", self.storage_sort_us, i64),
             ("unreduced_entries", self.unreduced_entries as i64, i64),
+            (
+                "collect_snapshots_us",
+                self.collect_snapshots_us as i64,
+                i64
+            ),
             (
                 "num_snapshot_storage",
                 self.num_snapshot_storage as i64,
                 i64
             ),
+            ("min_bin_size", self.min_bin_size as i64, i64),
+            ("max_bin_size", self.max_bin_size as i64, i64),
             ("total", total_time_us as i64, i64),
         );
     }
@@ -57,26 +69,22 @@ impl HashStats {
 
 #[derive(Default, Debug, PartialEq, Clone)]
 pub struct CalculateHashIntermediate {
-    pub version: u64,
     pub hash: Hash,
     pub lamports: u64,
-    pub slot: Slot,
     pub pubkey: Pubkey,
 }
 
 impl CalculateHashIntermediate {
-    pub fn new(version: u64, hash: Hash, lamports: u64, slot: Slot, pubkey: Pubkey) -> Self {
+    pub fn new_without_slot(hash: Hash, lamports: u64, pubkey: Pubkey) -> Self {
         Self {
-            version,
             hash,
             lamports,
-            slot,
             pubkey,
         }
     }
 }
 
-#[derive(Default, Debug)]
+#[derive(Default, Debug, PartialEq)]
 pub struct CumulativeOffset {
     pub index: Vec<usize>,
     pub start_offset: usize,
@@ -91,6 +99,22 @@ impl CumulativeOffset {
     }
 }
 
+pub trait ExtractSliceFromRawData<'b, T: 'b> {
+    fn extract<'a>(&'b self, offset: &'a CumulativeOffset, start: usize) -> &'b [T];
+}
+
+impl<'b, T: 'b> ExtractSliceFromRawData<'b, T> for Vec<Vec<T>> {
+    fn extract<'a>(&'b self, offset: &'a CumulativeOffset, start: usize) -> &'b [T] {
+        &self[offset.index[0]][start..]
+    }
+}
+
+impl<'b, T: 'b> ExtractSliceFromRawData<'b, T> for Vec<Vec<Vec<T>>> {
+    fn extract<'a>(&'b self, offset: &'a CumulativeOffset, start: usize) -> &'b [T] {
+        &self[offset.index[0]][offset.index[1]][start..]
+    }
+}
+
 // Allow retrieving &[start..end] from a logical src: Vec<T>, where src is really Vec<Vec<T>> (or later Vec<Vec<Vec<T>>>)
 // This model prevents callers from having to flatten which saves both working memory and time.
 #[derive(Default, Debug)]
@@ -146,39 +170,28 @@ impl CumulativeOffsets {
         }
     }
 
-    // return the biggest slice possible that starts at 'start'
-    pub fn get_slice<'a, T>(&self, raw: &'a [Vec<T>], start: usize) -> &'a [T] {
-        // This could be binary search, but we expect a small number of vectors.
-        for i in (0..self.cumulative_offsets.len()).into_iter().rev() {
-            let index = &self.cumulative_offsets[i];
-            if start >= index.start_offset {
-                let start = start - index.start_offset;
-                const DIMENSION: usize = 0;
-                return &raw[index.index[DIMENSION]][start..];
-            }
+    fn find_index(&self, start: usize) -> usize {
+        assert!(!self.cumulative_offsets.is_empty());
+        match self.cumulative_offsets[..].binary_search_by(|index| index.start_offset.cmp(&start)) {
+            Ok(index) => index,
+            Err(index) => index - 1, // we would insert at index so we are before the item at index
         }
-        panic!(
-            "get_slice didn't find: {}, len: {}",
-            start, self.total_count
-        );
+    }
+
+    fn find(&self, start: usize) -> (usize, &CumulativeOffset) {
+        let index = self.find_index(start);
+        let index = &self.cumulative_offsets[index];
+        let start = start - index.start_offset;
+        (start, index)
     }
 
     // return the biggest slice possible that starts at 'start'
-    pub fn get_slice_2d<'a, T>(&self, raw: &'a [Vec<Vec<T>>], start: usize) -> &'a [T] {
-        // This could be binary search, but we expect a small number of vectors.
-        for i in (0..self.cumulative_offsets.len()).into_iter().rev() {
-            let index = &self.cumulative_offsets[i];
-            if start >= index.start_offset {
-                let start = start - index.start_offset;
-                const DIMENSION_0: usize = 0;
-                const DIMENSION_1: usize = 1;
-                return &raw[index.index[DIMENSION_0]][index.index[DIMENSION_1]][start..];
-            }
-        }
-        panic!(
-            "get_slice didn't find: {}, len: {}",
-            start, self.total_count
-        );
+    pub fn get_slice<'a, 'b, T, U>(&'a self, raw: &'b U, start: usize) -> &'b [T]
+    where
+        U: ExtractSliceFromRawData<'b, T> + 'b,
+    {
+        let (start, index) = self.find(start);
+        raw.extract(index, start)
     }
 }
 
@@ -243,7 +256,7 @@ impl AccountsHash {
 
                 let mut hasher = Hasher::default();
                 for item in hashes.iter().take(end_index).skip(start_index) {
-                    let h = extractor(&item);
+                    let h = extractor(item);
                     hasher.hash(h.as_ref());
                 }
 
@@ -476,94 +489,12 @@ impl AccountsHash {
         hashes.par_sort_unstable_by(|a, b| a.0.cmp(&b.0));
     }
 
-    fn flatten_hash_intermediate<T>(
-        mut data_sections_by_pubkey: Vec<Vec<Vec<T>>>,
-        stats: &mut HashStats,
-    ) -> Vec<Vec<T>>
-    where
-        T: Clone,
-    {
-        // flatten this:
-        // vec: just a level of hierarchy
-        //   vec: 1 vec per PUBKEY_BINS_FOR_CALCULATING_HASHES
-        //     vec: Intermediate data whose pubkey belongs in this division
-        // into this:
-        // vec: 1 vec per PUBKEY_BINS_FOR_CALCULATING_HASHES
-        //   vec: Intermediate data whose pubkey belongs in this division
-        let mut flatten_time = Measure::start("flatten");
-        let mut data_by_pubkey: Vec<Vec<T>> = vec![];
-        let mut raw_len = 0;
-        let mut lens = vec![];
-        // pass=0: calculate final lens, then allocate vecs with capacity
-        // pass=1: copy data into vecs with correct capacity
-        for pass in 0..2 {
-            for outer in &mut data_sections_by_pubkey {
-                let outer_len = outer.len();
-                for pubkey_index in 0..outer_len {
-                    let this_len = outer[pubkey_index].len();
-                    if this_len == 0 {
-                        continue;
-                    }
-                    if pass == 0 {
-                        raw_len += this_len;
-                        if lens.len() <= pubkey_index {
-                            lens.extend(vec![0; pubkey_index - lens.len() + 1]);
-                        }
-
-                        lens[pubkey_index] += outer[pubkey_index].len();
-                    } else {
-                        let mut data = vec![];
-                        std::mem::swap(&mut data, &mut outer[pubkey_index]);
-
-                        data_by_pubkey[pubkey_index].extend(data);
-                    }
-                }
-            }
-
-            if pass == 0 {
-                data_by_pubkey = lens
-                    .iter()
-                    .map(|len| Vec::with_capacity(*len))
-                    .collect::<Vec<_>>();
-                lens = vec![]; // we don't need this anymore
-            }
-        }
-        flatten_time.stop();
-        stats.flatten_time_total_us += flatten_time.as_us();
-        stats.unreduced_entries += raw_len;
-        data_by_pubkey
-    }
-
     pub fn compare_two_hash_entries(
         a: &CalculateHashIntermediate,
         b: &CalculateHashIntermediate,
     ) -> std::cmp::Ordering {
         // note partial_cmp only returns None with floating point comparisons
-        match a.pubkey.partial_cmp(&b.pubkey).unwrap() {
-            std::cmp::Ordering::Equal => match b.slot.partial_cmp(&a.slot).unwrap() {
-                std::cmp::Ordering::Equal => b.version.partial_cmp(&a.version).unwrap(),
-                other => other,
-            },
-            other => other,
-        }
-    }
-
-    fn sort_hash_intermediate(
-        data_by_pubkey: Vec<Vec<CalculateHashIntermediate>>,
-        stats: &mut HashStats,
-    ) -> Vec<Vec<CalculateHashIntermediate>> {
-        // sort each PUBKEY_DIVISION vec
-        let mut sort_time = Measure::start("sort");
-        let sorted_data_by_pubkey: Vec<Vec<_>> = data_by_pubkey
-            .into_par_iter()
-            .map(|mut pk_range| {
-                pk_range.par_sort_unstable_by(Self::compare_two_hash_entries);
-                pk_range
-            })
-            .collect();
-        sort_time.stop();
-        stats.sort_time_total_us += sort_time.as_us();
-        sorted_data_by_pubkey
+        a.pubkey.partial_cmp(&b.pubkey).unwrap()
     }
 
     pub fn checked_cast_for_capitalization(balance: u128) -> u64 {
@@ -573,157 +504,196 @@ impl AccountsHash {
     }
 
     fn de_dup_and_eliminate_zeros(
-        sorted_data_by_pubkey: Vec<Vec<CalculateHashIntermediate>>,
+        sorted_data_by_pubkey: Vec<Vec<Vec<CalculateHashIntermediate>>>,
         stats: &mut HashStats,
-    ) -> (Vec<Vec<Vec<Hash>>>, u64) {
+        max_bin: usize,
+    ) -> (Vec<Vec<Hash>>, u64) {
         // 1. eliminate zero lamport accounts
         // 2. pick the highest slot or (slot = and highest version) of each pubkey
         // 3. produce this output:
-        // vec: PUBKEY_BINS_FOR_CALCULATING_HASHES in pubkey order
-        //   vec: sorted sections from parallelism, in pubkey order
-        //     vec: individual hashes in pubkey order
+        // a. vec: PUBKEY_BINS_FOR_CALCULATING_HASHES in pubkey order
+        //      vec: individual hashes in pubkey order, 1 hash per
+        // b. lamports
         let mut zeros = Measure::start("eliminate zeros");
-        let overall_sum = Mutex::new(0u64);
-        const CHUNKS: usize = 10;
-        let hashes: Vec<Vec<Vec<Hash>>> = sorted_data_by_pubkey
+        let min_max_sum_entries_hashes = Mutex::new((usize::MAX, usize::MIN, 0u64, 0usize, 0usize));
+        let hashes: Vec<Vec<Hash>> = (0..max_bin)
             .into_par_iter()
-            .map(|pubkey_division| {
-                let (hashes, sum) = Self::de_dup_accounts_in_parallel(&pubkey_division, CHUNKS);
-                let mut overall = overall_sum.lock().unwrap();
-                *overall = Self::checked_cast_for_capitalization(sum as u128 + *overall as u128);
+            .map(|bin| {
+                let (hashes, lamports_bin, unreduced_entries_count) =
+                    Self::de_dup_accounts_in_parallel(&sorted_data_by_pubkey, bin);
+                {
+                    let mut lock = min_max_sum_entries_hashes.lock().unwrap();
+                    let (mut min, mut max, mut lamports_sum, mut entries, mut hash_total) = *lock;
+                    min = std::cmp::min(min, unreduced_entries_count);
+                    max = std::cmp::max(max, unreduced_entries_count);
+                    lamports_sum = Self::checked_cast_for_capitalization(
+                        lamports_sum as u128 + lamports_bin as u128,
+                    );
+                    entries += unreduced_entries_count;
+                    hash_total += hashes.len();
+                    *lock = (min, max, lamports_sum, entries, hash_total);
+                }
                 hashes
             })
             .collect();
         zeros.stop();
         stats.zeros_time_total_us += zeros.as_us();
-        let sum = *overall_sum.lock().unwrap();
-        (hashes, sum)
+        let (min, max, lamports_sum, entries, hash_total) =
+            *min_max_sum_entries_hashes.lock().unwrap();
+        stats.min_bin_size = min;
+        stats.max_bin_size = max;
+        stats.unreduced_entries += entries;
+        stats.hash_total += hash_total;
+        (hashes, lamports_sum)
+    }
+
+    // returns true if this vector was exhausted
+    fn get_item<'a, 'b>(
+        min_index: usize,
+        bin: usize,
+        first_items: &'a mut Vec<(Pubkey, usize)>,
+        pubkey_division: &'b [Vec<Vec<CalculateHashIntermediate>>],
+        indexes: &'a mut Vec<usize>,
+    ) -> (bool, &'b CalculateHashIntermediate) {
+        let first_item = first_items[min_index];
+        let key = &first_item.0;
+        let division_index = first_item.1;
+        let bin = &pubkey_division[division_index][bin];
+        let mut index = indexes[division_index];
+        index += 1;
+        while index < bin.len() {
+            // still more items where we found the previous key, so just increment the index for that slot group, skipping all pubkeys that are equal
+            if &bin[index].pubkey == key {
+                index += 1;
+                continue; // duplicate entries of same pubkey, so keep skipping
+            }
+
+            // point to the next pubkey > key
+            first_items[min_index] = (bin[index].pubkey, division_index);
+            indexes[division_index] = index;
+            break;
+        }
+
+        (
+            if index >= bin.len() {
+                first_items.remove(min_index); // stop looking in this vector - we exhausted it
+                true
+            } else {
+                false
+            }, // this is the last item with this pubkey
+            &bin[index - 1],
+        )
     }
 
+    // go through: [..][pubkey_bin][..] and return hashes and lamport sum
+    //   slot groups^                ^accounts found in a slot group, sorted by pubkey, higher slot, write_version
     // 1. eliminate zero lamport accounts
     // 2. pick the highest slot or (slot = and highest version) of each pubkey
     // 3. produce this output:
-    //   vec: sorted sections from parallelism, in pubkey order
-    //     vec: individual hashes in pubkey order
+    //   a. vec: individual hashes in pubkey order
+    //   b. lamport sum
+    //   c. unreduced count (ie. including duplicates and zero lamport)
     fn de_dup_accounts_in_parallel(
-        pubkey_division: &[CalculateHashIntermediate],
-        chunk_count: usize,
-    ) -> (Vec<Vec<Hash>>, u64) {
+        pubkey_division: &[Vec<Vec<CalculateHashIntermediate>>],
+        pubkey_bin: usize,
+    ) -> (Vec<Hash>, u64, usize) {
         let len = pubkey_division.len();
-        let max = if len > chunk_count {
-            std::cmp::max(chunk_count, 1)
-        } else {
-            1
-        };
-        let chunk_size = len / max;
-        let overall_sum = Mutex::new(0u64);
-        let hashes: Vec<Vec<Hash>> = (0..max)
-            .into_par_iter()
-            .map(|chunk_index| {
-                let mut start_index = chunk_index * chunk_size;
-                let mut end_index = start_index + chunk_size;
-                if chunk_index == max - 1 {
-                    end_index = len;
-                }
-
-                let is_first_slice = chunk_index == 0;
-                if !is_first_slice {
-                    // note that this causes all regions after region 0 to have 1 item that overlaps with the previous region
-                    start_index -= 1;
-                }
-
-                let (result, sum) = Self::de_dup_accounts_from_stores(
-                    chunk_index == 0,
-                    &pubkey_division[start_index..end_index],
-                );
-                let mut overall = overall_sum.lock().unwrap();
-                *overall = Self::checked_cast_for_capitalization(sum + *overall as u128);
-
-                result
-            })
-            .collect();
-
-        let sum = *overall_sum.lock().unwrap();
-        (hashes, sum)
-    }
-
-    fn de_dup_accounts_from_stores(
-        is_first_slice: bool,
-        slice: &[CalculateHashIntermediate],
-    ) -> (Vec<Hash>, u128) {
-        let len = slice.len();
-        let mut result: Vec<Hash> = Vec::with_capacity(len);
-
-        let mut sum: u128 = 0;
-        if len > 0 {
-            let mut i = 0;
-            // look_for_first_key means the first key we find in our slice may be a
-            //  continuation of accounts belonging to a key that started in the last slice.
-            // so, look_for_first_key=true means we have to find the first key different than
-            //  the first key we encounter in our slice. Note that if this is true,
-            //  our slice begins one index prior to the 'actual' start of our logical range.
-            let mut look_for_first_key = !is_first_slice;
-            'outer: loop {
-                // at start of loop, item at 'i' is the first entry for a given pubkey - unless look_for_first
-                let now = &slice[i];
-                let last = now.pubkey;
-                if !look_for_first_key && now.lamports != ZERO_RAW_LAMPORTS_SENTINEL {
-                    // first entry for this key that starts in our slice
-                    result.push(now.hash);
-                    sum += now.lamports as u128;
+        let mut item_len = 0;
+        let mut indexes = vec![0; len];
+        let mut first_items = Vec::with_capacity(len);
+
+        pubkey_division.iter().enumerate().for_each(|(i, bins)| {
+            if bins.len() > pubkey_bin {
+                let sub = &bins[pubkey_bin];
+                if !sub.is_empty() {
+                    item_len += bins[pubkey_bin].len();
+                    first_items.push((bins[pubkey_bin][0].pubkey, i));
                 }
-                for (k, now) in slice.iter().enumerate().skip(i + 1) {
-                    if now.pubkey != last {
-                        i = k;
-                        look_for_first_key = false;
-                        continue 'outer;
-                    } else {
-                        let prev = &slice[k - 1];
-                        assert!(
-                            !(prev.slot == now.slot
-                                && prev.version == now.version
-                                && (prev.hash != now.hash || prev.lamports != now.lamports)),
-                            "Conflicting store data. Pubkey: {}, Slot: {}, Version: {}, Hashes: {}, {}, Lamports: {}, {}", now.pubkey, now.slot, now.version, prev.hash, now.hash, prev.lamports, now.lamports
+            }
+        });
+        let mut overall_sum = 0;
+        let mut hashes: Vec<Hash> = Vec::with_capacity(item_len);
+
+        while !first_items.is_empty() {
+            let mut loop_stop = { first_items.len() - 1 }; // we increment at the beginning of the loop
+            let mut min_index = 0;
+            let mut min_pubkey = first_items[min_index].0;
+            let mut first_item_index = 0; // we will start iterating at item 1. +=1 is first instruction in loop
+
+            while first_item_index < loop_stop {
+                first_item_index += 1;
+                let (key, _) = first_items[first_item_index];
+                let cmp = min_pubkey.cmp(&key);
+                match cmp {
+                    std::cmp::Ordering::Less => {
+                        continue; // we still have the min item
+                    }
+                    std::cmp::Ordering::Equal => {
+                        // we found an item that masks an earlier slot, so skip the earlier item
+                        let (exhausted, _) = Self::get_item(
+                            min_index,
+                            pubkey_bin,
+                            &mut first_items,
+                            pubkey_division,
+                            &mut indexes,
                         );
+                        if exhausted {
+                            // this whole vector is exhausted, so we have to back our indices up since our search set has been reduced out from under us
+                            first_item_index -= 1;
+                            loop_stop -= 1;
+                        }
                     }
+                    std::cmp::Ordering::Greater => (),
                 }
+                // this is the new min pubkey
+                min_index = first_item_index;
+                min_pubkey = key;
+            }
 
-                break; // ran out of items in our slice, so our slice is done
+            // get the min item, add lamports, get hash
+            let (_, item) = Self::get_item(
+                min_index,
+                pubkey_bin,
+                &mut first_items,
+                pubkey_division,
+                &mut indexes,
+            );
+            if item.lamports != ZERO_RAW_LAMPORTS_SENTINEL {
+                overall_sum = Self::checked_cast_for_capitalization(
+                    item.lamports as u128 + overall_sum as u128,
+                );
+                hashes.push(item.hash);
             }
         }
-        (result, sum)
+        (hashes, overall_sum, item_len)
     }
 
     // input:
-    // vec: unordered, created by parallelism
-    //   vec: [0..bins] - where bins are pubkey ranges
-    //     vec: [..] - items which fit in the containing bin, unordered within this vec
-    // so, assumption is middle vec is bins sorted by pubkey
+    // vec: group of slot data, ordered by Slot (low to high)
+    //   vec: [0..bins] - where bins are pubkey ranges (these are ordered by Pubkey range)
+    //     vec: [..] - items which fit in the containing bin. Sorted by: Pubkey, higher Slot, higher Write version (if pubkey =)
     pub fn rest_of_hash_calculation(
         data_sections_by_pubkey: Vec<Vec<Vec<CalculateHashIntermediate>>>,
         mut stats: &mut HashStats,
         is_last_pass: bool,
         mut previous_state: PreviousPass,
+        max_bin: usize,
     ) -> (Hash, u64, PreviousPass) {
-        let outer = Self::flatten_hash_intermediate(data_sections_by_pubkey, &mut stats);
-
-        let sorted_data_by_pubkey = Self::sort_hash_intermediate(outer, &mut stats);
-
         let (mut hashes, mut total_lamports) =
-            Self::de_dup_and_eliminate_zeros(sorted_data_by_pubkey, &mut stats);
+            Self::de_dup_and_eliminate_zeros(data_sections_by_pubkey, &mut stats, max_bin);
 
         total_lamports += previous_state.lamports;
 
         if !previous_state.remaining_unhashed.is_empty() {
-            // these items were not hashed last iteration because they didn't divide evenly
-            hashes.insert(0, vec![previous_state.remaining_unhashed]);
+            // These items were not hashed last iteration because they didn't divide evenly.
+            // These are hashes for pubkeys that are < the pubkeys we are looking at now, so their hashes go first in order.
+            hashes.insert(0, previous_state.remaining_unhashed);
             previous_state.remaining_unhashed = Vec::new();
         }
 
         let mut next_pass = PreviousPass::default();
-        let cumulative = CumulativeOffsets::from_raw_2d(&hashes);
+        let cumulative = CumulativeOffsets::from_raw(&hashes);
         let mut hash_total = cumulative.total_count;
-        stats.hash_total += hash_total;
         next_pass.reduced_hashes = previous_state.reduced_hashes;
 
         const TARGET_FANOUT_LEVEL: usize = 3;
@@ -739,7 +709,7 @@ impl AccountsHash {
             // move tail hashes that don't evenly hash into a 1d vector for next time
             let mut i = hash_total - left_over_hashes;
             while i < hash_total {
-                let data = cumulative.get_slice_2d(&hashes, i);
+                let data = cumulative.get_slice(&hashes, i);
                 next_pass.remaining_unhashed.extend(data);
                 i += data.len();
             }
@@ -757,12 +727,13 @@ impl AccountsHash {
                 hash_total, // note this does not include the ones that didn't divide evenly, unless we're in the last iteration
                 MERKLE_FANOUT,
                 Some(TARGET_FANOUT_LEVEL),
-                |start| cumulative.get_slice_2d(&hashes, start),
+                |start| cumulative.get_slice(&hashes, start),
                 Some(TARGET_FANOUT_LEVEL),
             )
             .1;
             hash_time.stop();
             stats.hash_time_total_us += hash_time.as_us();
+            stats.hash_time_pre_us += hash_time.as_us();
             next_pass.reduced_hashes.push(partial_hashes);
         }
 
@@ -770,11 +741,9 @@ impl AccountsHash {
         if no_progress {
             // we never made partial progress, so hash everything now
             hashes.into_iter().for_each(|v| {
-                v.into_iter().for_each(|v| {
-                    if !v.is_empty() {
-                        next_pass.reduced_hashes.push(v);
-                    }
-                });
+                if !v.is_empty() {
+                    next_pass.reduced_hashes.push(v);
+                }
             });
         }
 
@@ -831,34 +800,36 @@ pub mod tests {
         assert_eq!(AccountsHash::div_ceil(10, 0), 0);
     }
 
+    fn for_rest(
+        original: Vec<CalculateHashIntermediate>,
+    ) -> Vec<Vec<Vec<CalculateHashIntermediate>>> {
+        vec![vec![original]]
+    }
+
     #[test]
     fn test_accountsdb_rest_of_hash_calculation() {
         solana_logger::setup();
 
-        let mut account_maps: Vec<CalculateHashIntermediate> = Vec::new();
+        let mut account_maps = Vec::new();
 
         let key = Pubkey::new(&[11u8; 32]);
         let hash = Hash::new(&[1u8; 32]);
-        let val = CalculateHashIntermediate::new(0, hash, 88, Slot::default(), key);
+        let val = CalculateHashIntermediate::new_without_slot(hash, 88, key);
         account_maps.push(val);
 
         // 2nd key - zero lamports, so will be removed
         let key = Pubkey::new(&[12u8; 32]);
         let hash = Hash::new(&[2u8; 32]);
-        let val = CalculateHashIntermediate::new(
-            0,
-            hash,
-            ZERO_RAW_LAMPORTS_SENTINEL,
-            Slot::default(),
-            key,
-        );
+        let val =
+            CalculateHashIntermediate::new_without_slot(hash, ZERO_RAW_LAMPORTS_SENTINEL, key);
         account_maps.push(val);
 
         let result = AccountsHash::rest_of_hash_calculation(
-            vec![vec![account_maps.clone()]],
+            for_rest(account_maps.clone()),
             &mut HashStats::default(),
             true,
             PreviousPass::default(),
+            one_range(),
         );
         let expected_hash = Hash::from_str("8j9ARGFv4W2GfML7d3sVJK2MePwrikqYnu6yqer28cCa").unwrap();
         assert_eq!((result.0, result.1), (expected_hash, 88));
@@ -866,14 +837,15 @@ pub mod tests {
         // 3rd key - with pubkey value before 1st key so it will be sorted first
         let key = Pubkey::new(&[10u8; 32]);
         let hash = Hash::new(&[2u8; 32]);
-        let val = CalculateHashIntermediate::new(0, hash, 20, Slot::default(), key);
-        account_maps.push(val);
+        let val = CalculateHashIntermediate::new_without_slot(hash, 20, key);
+        account_maps.insert(0, val);
 
         let result = AccountsHash::rest_of_hash_calculation(
-            vec![vec![account_maps.clone()]],
+            for_rest(account_maps.clone()),
             &mut HashStats::default(),
             true,
             PreviousPass::default(),
+            one_range(),
         );
         let expected_hash = Hash::from_str("EHv9C5vX7xQjjMpsJMzudnDTzoTSRwYkqLzY8tVMihGj").unwrap();
         assert_eq!((result.0, result.1), (expected_hash, 108));
@@ -881,19 +853,28 @@ pub mod tests {
         // 3rd key - with later slot
         let key = Pubkey::new(&[10u8; 32]);
         let hash = Hash::new(&[99u8; 32]);
-        let val = CalculateHashIntermediate::new(0, hash, 30, Slot::default() + 1, key);
-        account_maps.push(val);
+        let val = CalculateHashIntermediate::new_without_slot(hash, 30, key);
+        account_maps.insert(1, val);
 
         let result = AccountsHash::rest_of_hash_calculation(
-            vec![vec![account_maps]],
+            for_rest(account_maps),
             &mut HashStats::default(),
             true,
             PreviousPass::default(),
+            one_range(),
         );
         let expected_hash = Hash::from_str("7NNPg5A8Xsg1uv4UFm6KZNwsipyyUnmgCrznP6MBWoBZ").unwrap();
         assert_eq!((result.0, result.1), (expected_hash, 118));
     }
 
+    fn one_range() -> usize {
+        1
+    }
+
+    fn zero_range() -> usize {
+        0
+    }
+
     #[test]
     fn test_accountsdb_multi_pass_rest_of_hash_calculation() {
         solana_logger::setup();
@@ -903,23 +884,18 @@ pub mod tests {
         // 1: NON-empty, empty final
         // 2: NON-empty, empty, empty final
         for pass in 0..3 {
-            let mut account_maps: Vec<CalculateHashIntermediate> = Vec::new();
+            let mut account_maps = Vec::new();
 
             let key = Pubkey::new(&[11u8; 32]);
             let hash = Hash::new(&[1u8; 32]);
-            let val = CalculateHashIntermediate::new(0, hash, 88, Slot::default(), key);
+            let val = CalculateHashIntermediate::new_without_slot(hash, 88, key);
             account_maps.push(val);
 
             // 2nd key - zero lamports, so will be removed
             let key = Pubkey::new(&[12u8; 32]);
             let hash = Hash::new(&[2u8; 32]);
-            let val = CalculateHashIntermediate::new(
-                0,
-                hash,
-                ZERO_RAW_LAMPORTS_SENTINEL,
-                Slot::default(),
-                key,
-            );
+            let val =
+                CalculateHashIntermediate::new_without_slot(hash, ZERO_RAW_LAMPORTS_SENTINEL, key);
             account_maps.push(val);
 
             let mut previous_pass = PreviousPass::default();
@@ -931,6 +907,7 @@ pub mod tests {
                     &mut HashStats::default(),
                     false, // not last pass
                     previous_pass,
+                    one_range(),
                 );
                 assert_eq!(result.0, Hash::default());
                 assert_eq!(result.1, 0);
@@ -941,10 +918,11 @@ pub mod tests {
             }
 
             let result = AccountsHash::rest_of_hash_calculation(
-                vec![vec![account_maps.clone()]],
+                for_rest(account_maps.clone()),
                 &mut HashStats::default(),
                 false, // not last pass
                 previous_pass,
+                one_range(),
             );
 
             assert_eq!(result.0, Hash::default());
@@ -962,6 +940,7 @@ pub mod tests {
                     &mut HashStats::default(),
                     false,
                     previous_pass,
+                    one_range(),
                 );
 
                 previous_pass = result.2;
@@ -975,6 +954,7 @@ pub mod tests {
                 &mut HashStats::default(),
                 true, // finally, last pass
                 previous_pass,
+                one_range(),
             );
             let previous_pass = result.2;
 
@@ -990,23 +970,24 @@ pub mod tests {
     fn test_accountsdb_multi_pass_rest_of_hash_calculation_partial() {
         solana_logger::setup();
 
-        let mut account_maps: Vec<CalculateHashIntermediate> = Vec::new();
+        let mut account_maps = Vec::new();
 
         let key = Pubkey::new(&[11u8; 32]);
         let hash = Hash::new(&[1u8; 32]);
-        let val = CalculateHashIntermediate::new(0, hash, 88, Slot::default(), key);
+        let val = CalculateHashIntermediate::new_without_slot(hash, 88, key);
         account_maps.push(val);
 
         let key = Pubkey::new(&[12u8; 32]);
         let hash = Hash::new(&[2u8; 32]);
-        let val = CalculateHashIntermediate::new(0, hash, 20, Slot::default(), key);
+        let val = CalculateHashIntermediate::new_without_slot(hash, 20, key);
         account_maps.push(val);
 
         let result = AccountsHash::rest_of_hash_calculation(
-            vec![vec![vec![account_maps[0].clone()]]],
+            for_rest(vec![account_maps[0].clone()]),
             &mut HashStats::default(),
             false, // not last pass
             PreviousPass::default(),
+            one_range(),
         );
 
         assert_eq!(result.0, Hash::default());
@@ -1017,10 +998,11 @@ pub mod tests {
         assert_eq!(previous_pass.lamports, account_maps[0].lamports);
 
         let result = AccountsHash::rest_of_hash_calculation(
-            vec![vec![vec![account_maps[1].clone()]]],
+            for_rest(vec![account_maps[1].clone()]),
             &mut HashStats::default(),
             false, // not last pass
             previous_pass,
+            one_range(),
         );
 
         assert_eq!(result.0, Hash::default());
@@ -1039,6 +1021,7 @@ pub mod tests {
             &mut HashStats::default(),
             true,
             previous_pass,
+            one_range(),
         );
 
         let previous_pass = result.2;
@@ -1064,7 +1047,7 @@ pub mod tests {
     fn test_accountsdb_multi_pass_rest_of_hash_calculation_partial_hashes() {
         solana_logger::setup();
 
-        let mut account_maps: Vec<CalculateHashIntermediate> = Vec::new();
+        let mut account_maps = Vec::new();
 
         const TARGET_FANOUT_LEVEL: usize = 3;
         let target_fanout = MERKLE_FANOUT.pow(TARGET_FANOUT_LEVEL as u32);
@@ -1075,20 +1058,21 @@ pub mod tests {
             total_lamports_expected += lamports;
             let key = Pubkey::new_unique();
             let hash = Hash::new_unique();
-            let val = CalculateHashIntermediate::new(0, hash, lamports, Slot::default(), key);
+            let val = CalculateHashIntermediate::new_without_slot(hash, lamports, key);
             account_maps.push(val);
         }
 
-        let chunk = account_maps[0..plus1].to_vec();
-        let mut sorted = chunk.clone();
-        sorted.sort_by(AccountsHash::compare_two_hash_entries);
+        let mut chunk = account_maps[0..plus1].to_vec();
+        chunk.sort_by(AccountsHash::compare_two_hash_entries);
+        let sorted = chunk.clone();
 
         // first 4097 hashes (1 left over)
         let result = AccountsHash::rest_of_hash_calculation(
-            vec![vec![chunk]],
+            for_rest(chunk),
             &mut HashStats::default(),
             false, // not last pass
             PreviousPass::default(),
+            one_range(),
         );
 
         assert_eq!(result.0, Hash::default());
@@ -1113,9 +1097,9 @@ pub mod tests {
                 .sum::<u64>()
         );
 
-        let chunk = account_maps[plus1..plus1 * 2].to_vec();
-        let mut sorted2 = chunk.clone();
-        sorted2.sort_by(AccountsHash::compare_two_hash_entries);
+        let mut chunk = account_maps[plus1..plus1 * 2].to_vec();
+        chunk.sort_by(AccountsHash::compare_two_hash_entries);
+        let sorted2 = chunk.clone();
 
         let mut with_left_over = vec![left_over_1];
         with_left_over.extend(sorted2[0..plus1 - 2].to_vec().into_iter().map(|i| i.hash));
@@ -1129,10 +1113,11 @@ pub mod tests {
 
         // second 4097 hashes (2 left over)
         let result = AccountsHash::rest_of_hash_calculation(
-            vec![vec![chunk]],
+            for_rest(chunk),
             &mut HashStats::default(),
             false, // not last pass
             previous_pass,
+            one_range(),
         );
 
         assert_eq!(result.0, Hash::default());
@@ -1160,6 +1145,7 @@ pub mod tests {
             &mut HashStats::default(),
             true,
             previous_pass,
+            one_range(),
         );
 
         let previous_pass = result.2;
@@ -1185,9 +1171,11 @@ pub mod tests {
 
     #[test]
     fn test_accountsdb_de_dup_accounts_zero_chunks() {
-        let (hashes, lamports) =
-            AccountsHash::de_dup_accounts_in_parallel(&[CalculateHashIntermediate::default()], 0);
-        assert_eq!(vec![vec![Hash::default()]], hashes);
+        let (hashes, lamports, _) = AccountsHash::de_dup_accounts_in_parallel(
+            &[vec![vec![CalculateHashIntermediate::default()]]],
+            0,
+        );
+        assert_eq!(vec![Hash::default()], hashes);
         assert_eq!(lamports, 0);
     }
 
@@ -1198,31 +1186,29 @@ pub mod tests {
         let (hashes, lamports) = AccountsHash::de_dup_and_eliminate_zeros(
             vec![vec![], vec![]],
             &mut HashStats::default(),
+            one_range(),
         );
         assert_eq!(
-            vec![vec![Hash::default(); 0], vec![]],
+            vec![Hash::default(); 0],
             hashes.into_iter().flatten().collect::<Vec<_>>()
         );
         assert_eq!(lamports, 0);
 
-        let (hashes, lamports) =
-            AccountsHash::de_dup_and_eliminate_zeros(vec![], &mut HashStats::default());
-        let empty: Vec<Vec<Vec<Hash>>> = Vec::default();
+        let (hashes, lamports) = AccountsHash::de_dup_and_eliminate_zeros(
+            vec![],
+            &mut HashStats::default(),
+            zero_range(),
+        );
+        let empty: Vec<Vec<Hash>> = Vec::default();
         assert_eq!(empty, hashes);
         assert_eq!(lamports, 0);
 
-        let (hashes, lamports) = AccountsHash::de_dup_accounts_in_parallel(&[], 1);
-        assert_eq!(
-            vec![Hash::default(); 0],
-            hashes.into_iter().flatten().collect::<Vec<_>>()
-        );
+        let (hashes, lamports, _) = AccountsHash::de_dup_accounts_in_parallel(&[], 1);
+        assert_eq!(vec![Hash::default(); 0], hashes);
         assert_eq!(lamports, 0);
 
-        let (hashes, lamports) = AccountsHash::de_dup_accounts_in_parallel(&[], 2);
-        assert_eq!(
-            vec![Hash::default(); 0],
-            hashes.into_iter().flatten().collect::<Vec<_>>()
-        );
+        let (hashes, lamports, _) = AccountsHash::de_dup_accounts_in_parallel(&[], 2);
+        assert_eq!(vec![Hash::default(); 0], hashes);
         assert_eq!(lamports, 0);
     }
 
@@ -1234,64 +1220,53 @@ pub mod tests {
         let key_b = Pubkey::new(&[2u8; 32]);
         let key_c = Pubkey::new(&[3u8; 32]);
         const COUNT: usize = 6;
-        const VERSION: u64 = 0;
-        let hashes: Vec<_> = (0..COUNT)
-            .into_iter()
-            .map(|i| Hash::new(&[i as u8; 32]))
-            .collect();
+        let hashes = (0..COUNT).into_iter().map(|i| Hash::new(&[i as u8; 32]));
         // create this vector
         // abbbcc
         let keys = [key_a, key_b, key_b, key_b, key_c, key_c];
 
         let accounts: Vec<_> = hashes
-            .into_iter()
             .zip(keys.iter())
             .enumerate()
             .map(|(i, (hash, key))| {
-                CalculateHashIntermediate::new(
-                    VERSION,
-                    hash,
-                    (i + 1) as u64,
-                    u64::MAX - i as u64,
-                    *key,
-                )
+                CalculateHashIntermediate::new_without_slot(hash, (i + 1) as u64, *key)
             })
             .collect();
 
         type ExpectedType = (String, bool, u64, String);
         let expected:Vec<ExpectedType> = vec![
             // ("key/lamports key2/lamports ...",
-            // is_first_slice
+            // is_last_slice
             // result lamports
             // result hashes)
             // "a5" = key_a, 5 lamports
-            ("a1", false, 0, "[]"),
-            ("a1b2", false, 2, "[4vJ9JU1bJJE96FWSJKvHsmmFADCg4gpZQff4P3bkLKi]"),
-            ("a1b2b3", false, 2, "[4vJ9JU1bJJE96FWSJKvHsmmFADCg4gpZQff4P3bkLKi]"),
-            ("a1b2b3b4", false, 2, "[4vJ9JU1bJJE96FWSJKvHsmmFADCg4gpZQff4P3bkLKi]"),
-            ("a1b2b3b4c5", false, 7, "[4vJ9JU1bJJE96FWSJKvHsmmFADCg4gpZQff4P3bkLKi, GgBaCs3NCBuZN12kCJgAW63ydqohFkHEdfdEXBPzLHq]"),
-            ("b2", false, 0, "[]"),
-            ("b2b3", false, 0, "[]"),
-            ("b2b3b4", false, 0, "[]"),
-            ("b2b3b4c5", false, 5, "[GgBaCs3NCBuZN12kCJgAW63ydqohFkHEdfdEXBPzLHq]"),
-            ("b3", false, 0, "[]"),
-            ("b3b4", false, 0, "[]"),
-            ("b3b4c5", false, 5, "[GgBaCs3NCBuZN12kCJgAW63ydqohFkHEdfdEXBPzLHq]"),
-            ("b4", false, 0, "[]"),
-            ("b4c5", false, 5, "[GgBaCs3NCBuZN12kCJgAW63ydqohFkHEdfdEXBPzLHq]"),
-            ("c5", false, 0, "[]"),
+            ("a1", false, 1, "[11111111111111111111111111111111]"),
+            ("a1b2", false, 3, "[11111111111111111111111111111111, 4vJ9JU1bJJE96FWSJKvHsmmFADCg4gpZQff4P3bkLKi]"),
+            ("a1b2b3", false, 4, "[11111111111111111111111111111111, 8qbHbw2BbbTHBW1sbeqakYXVKRQM8Ne7pLK7m6CVfeR]"),
+            ("a1b2b3b4", false, 5, "[11111111111111111111111111111111, CktRuQ2mttgRGkXJtyksdKHjUdc2C4TgDzyB98oEzy8]"),
+            ("a1b2b3b4c5", false, 10, "[11111111111111111111111111111111, CktRuQ2mttgRGkXJtyksdKHjUdc2C4TgDzyB98oEzy8, GgBaCs3NCBuZN12kCJgAW63ydqohFkHEdfdEXBPzLHq]"),
+            ("b2", false, 2, "[4vJ9JU1bJJE96FWSJKvHsmmFADCg4gpZQff4P3bkLKi]"),
+            ("b2b3", false, 3, "[8qbHbw2BbbTHBW1sbeqakYXVKRQM8Ne7pLK7m6CVfeR]"),
+            ("b2b3b4", false, 4, "[CktRuQ2mttgRGkXJtyksdKHjUdc2C4TgDzyB98oEzy8]"),
+            ("b2b3b4c5", false, 9, "[CktRuQ2mttgRGkXJtyksdKHjUdc2C4TgDzyB98oEzy8, GgBaCs3NCBuZN12kCJgAW63ydqohFkHEdfdEXBPzLHq]"),
+            ("b3", false, 3, "[8qbHbw2BbbTHBW1sbeqakYXVKRQM8Ne7pLK7m6CVfeR]"),
+            ("b3b4", false, 4, "[CktRuQ2mttgRGkXJtyksdKHjUdc2C4TgDzyB98oEzy8]"),
+            ("b3b4c5", false, 9, "[CktRuQ2mttgRGkXJtyksdKHjUdc2C4TgDzyB98oEzy8, GgBaCs3NCBuZN12kCJgAW63ydqohFkHEdfdEXBPzLHq]"),
+            ("b4", false, 4, "[CktRuQ2mttgRGkXJtyksdKHjUdc2C4TgDzyB98oEzy8]"),
+            ("b4c5", false, 9, "[CktRuQ2mttgRGkXJtyksdKHjUdc2C4TgDzyB98oEzy8, GgBaCs3NCBuZN12kCJgAW63ydqohFkHEdfdEXBPzLHq]"),
+            ("c5", false, 5, "[GgBaCs3NCBuZN12kCJgAW63ydqohFkHEdfdEXBPzLHq]"),
             ("a1", true, 1, "[11111111111111111111111111111111]"),
             ("a1b2", true, 3, "[11111111111111111111111111111111, 4vJ9JU1bJJE96FWSJKvHsmmFADCg4gpZQff4P3bkLKi]"),
-            ("a1b2b3", true, 3, "[11111111111111111111111111111111, 4vJ9JU1bJJE96FWSJKvHsmmFADCg4gpZQff4P3bkLKi]"),
-            ("a1b2b3b4", true, 3, "[11111111111111111111111111111111, 4vJ9JU1bJJE96FWSJKvHsmmFADCg4gpZQff4P3bkLKi]"),
-            ("a1b2b3b4c5", true, 8, "[11111111111111111111111111111111, 4vJ9JU1bJJE96FWSJKvHsmmFADCg4gpZQff4P3bkLKi, GgBaCs3NCBuZN12kCJgAW63ydqohFkHEdfdEXBPzLHq]"),
+            ("a1b2b3", true, 4, "[11111111111111111111111111111111, 8qbHbw2BbbTHBW1sbeqakYXVKRQM8Ne7pLK7m6CVfeR]"),
+            ("a1b2b3b4", true, 5, "[11111111111111111111111111111111, CktRuQ2mttgRGkXJtyksdKHjUdc2C4TgDzyB98oEzy8]"),
+            ("a1b2b3b4c5", true, 10, "[11111111111111111111111111111111, CktRuQ2mttgRGkXJtyksdKHjUdc2C4TgDzyB98oEzy8, GgBaCs3NCBuZN12kCJgAW63ydqohFkHEdfdEXBPzLHq]"),
             ("b2", true, 2, "[4vJ9JU1bJJE96FWSJKvHsmmFADCg4gpZQff4P3bkLKi]"),
-            ("b2b3", true, 2, "[4vJ9JU1bJJE96FWSJKvHsmmFADCg4gpZQff4P3bkLKi]"),
-            ("b2b3b4", true, 2, "[4vJ9JU1bJJE96FWSJKvHsmmFADCg4gpZQff4P3bkLKi]"),
-            ("b2b3b4c5", true, 7, "[4vJ9JU1bJJE96FWSJKvHsmmFADCg4gpZQff4P3bkLKi, GgBaCs3NCBuZN12kCJgAW63ydqohFkHEdfdEXBPzLHq]"),
+            ("b2b3", true, 3, "[8qbHbw2BbbTHBW1sbeqakYXVKRQM8Ne7pLK7m6CVfeR]"),
+            ("b2b3b4", true, 4, "[CktRuQ2mttgRGkXJtyksdKHjUdc2C4TgDzyB98oEzy8]"),
+            ("b2b3b4c5", true, 9, "[CktRuQ2mttgRGkXJtyksdKHjUdc2C4TgDzyB98oEzy8, GgBaCs3NCBuZN12kCJgAW63ydqohFkHEdfdEXBPzLHq]"),
             ("b3", true, 3, "[8qbHbw2BbbTHBW1sbeqakYXVKRQM8Ne7pLK7m6CVfeR]"),
-            ("b3b4", true, 3, "[8qbHbw2BbbTHBW1sbeqakYXVKRQM8Ne7pLK7m6CVfeR]"),
-            ("b3b4c5", true, 8, "[8qbHbw2BbbTHBW1sbeqakYXVKRQM8Ne7pLK7m6CVfeR, GgBaCs3NCBuZN12kCJgAW63ydqohFkHEdfdEXBPzLHq]"),
+            ("b3b4", true, 4, "[CktRuQ2mttgRGkXJtyksdKHjUdc2C4TgDzyB98oEzy8]"),
+            ("b3b4c5", true, 9, "[CktRuQ2mttgRGkXJtyksdKHjUdc2C4TgDzyB98oEzy8, GgBaCs3NCBuZN12kCJgAW63ydqohFkHEdfdEXBPzLHq]"),
             ("b4", true, 4, "[CktRuQ2mttgRGkXJtyksdKHjUdc2C4TgDzyB98oEzy8]"),
             ("b4c5", true, 9, "[CktRuQ2mttgRGkXJtyksdKHjUdc2C4TgDzyB98oEzy8, GgBaCs3NCBuZN12kCJgAW63ydqohFkHEdfdEXBPzLHq]"),
             ("c5", true, 5, "[GgBaCs3NCBuZN12kCJgAW63ydqohFkHEdfdEXBPzLHq]"),
@@ -1306,59 +1281,65 @@ pub mod tests {
             }).collect();
 
         let mut expected_index = 0;
-        for first_slice in 0..2 {
+        for last_slice in 0..2 {
             for start in 0..COUNT {
                 for end in start + 1..COUNT {
-                    let is_first_slice = first_slice == 1;
+                    let is_last_slice = last_slice == 1;
                     let accounts = accounts.clone();
                     let slice = &accounts[start..end];
 
-                    let result = AccountsHash::de_dup_accounts_from_stores(is_first_slice, slice);
-                    let (hashes2, lamports2) = AccountsHash::de_dup_accounts_in_parallel(slice, 1);
-                    let (hashes3, lamports3) = AccountsHash::de_dup_accounts_in_parallel(slice, 2);
+                    let slice2 = vec![vec![slice.to_vec()]];
+                    let slice = &slice2[..];
+                    let (hashes2, lamports2, _) =
+                        AccountsHash::de_dup_accounts_in_parallel(slice, 0);
+                    let (hashes3, lamports3, _) =
+                        AccountsHash::de_dup_accounts_in_parallel(slice, 0);
                     let (hashes4, lamports4) = AccountsHash::de_dup_and_eliminate_zeros(
-                        vec![slice.to_vec()],
+                        slice.to_vec(),
                         &mut HashStats::default(),
+                        end - start,
                     );
                     let (hashes5, lamports5) = AccountsHash::de_dup_and_eliminate_zeros(
-                        vec![slice.to_vec(), slice.to_vec()],
+                        slice.to_vec(),
                         &mut HashStats::default(),
+                        end - start,
                     );
                     let (hashes6, lamports6) = AccountsHash::de_dup_and_eliminate_zeros(
-                        vec![vec![], slice.to_vec()],
+                        slice.to_vec(),
                         &mut HashStats::default(),
+                        end - start,
                     );
 
-                    assert_eq!(
-                        hashes2.iter().flatten().collect::<Vec<_>>(),
-                        hashes3.iter().flatten().collect::<Vec<_>>()
-                    );
-                    let expected2 = hashes2.clone().into_iter().flatten().collect::<Vec<_>>();
+                    assert_eq!(hashes2, hashes3);
+                    let expected2 = hashes2.clone();
                     assert_eq!(
                         expected2,
-                        hashes4
-                            .into_iter()
-                            .flatten()
-                            .into_iter()
-                            .flatten()
-                            .collect::<Vec<_>>()
+                        hashes4.into_iter().flatten().collect::<Vec<_>>(),
+                        "last_slice: {}, start: {}, end: {}, slice: {:?}",
+                        last_slice,
+                        start,
+                        end,
+                        slice
                     );
                     assert_eq!(
-                        vec![expected2.clone(), expected2.clone()],
-                        hashes5.into_iter().flatten().collect::<Vec<_>>()
+                        expected2.clone(),
+                        hashes5.iter().flatten().copied().collect::<Vec<_>>(),
+                        "last_slice: {}, start: {}, end: {}, slice: {:?}",
+                        last_slice,
+                        start,
+                        end,
+                        slice
                     );
                     assert_eq!(
-                        vec![vec![], expected2.clone()],
-                        hashes6.into_iter().flatten().collect::<Vec<_>>()
+                        expected2.clone(),
+                        hashes6.iter().flatten().copied().collect::<Vec<_>>()
                     );
                     assert_eq!(lamports2, lamports3);
                     assert_eq!(lamports2, lamports4);
-                    assert_eq!(lamports2 * 2, lamports5);
+                    assert_eq!(lamports2, lamports5);
                     assert_eq!(lamports2, lamports6);
 
-                    let hashes: Vec<_> = hashes2.into_iter().flatten().collect();
-
-                    let human_readable = slice
+                    let human_readable = slice[0][0]
                         .iter()
                         .map(|v| {
                             let mut s = (if v.pubkey == key_a {
@@ -1375,29 +1356,14 @@ pub mod tests {
                         })
                         .collect::<String>();
 
-                    let hash_result_as_string = format!("{:?}", result.0);
+                    let hash_result_as_string = format!("{:?}", hashes2);
 
                     let packaged_result: ExpectedType = (
                         human_readable,
-                        is_first_slice,
-                        result.1 as u64,
+                        is_last_slice,
+                        lamports2 as u64,
                         hash_result_as_string,
                     );
-
-                    if is_first_slice {
-                        // the parallel version always starts with 'first slice'
-                        assert_eq!(
-                            result.0, hashes,
-                            "description: {:?}, expected index: {}",
-                            packaged_result, expected_index
-                        );
-                        assert_eq!(
-                            result.1 as u64, lamports2,
-                            "description: {:?}, expected index: {}",
-                            packaged_result, expected_index
-                        );
-                    }
-
                     assert_eq!(expected[expected_index], packaged_result);
 
                     // for generating expected results
@@ -1406,46 +1372,6 @@ pub mod tests {
                 }
             }
         }
-
-        for first_slice in 0..2 {
-            let result = AccountsHash::de_dup_accounts_from_stores(first_slice == 1, &[]);
-            assert_eq!((vec![Hash::default(); 0], 0), result);
-        }
-    }
-
-    #[test]
-    fn test_sort_hash_intermediate() {
-        solana_logger::setup();
-        let mut stats = HashStats::default();
-        let key = Pubkey::new_unique();
-        let hash = Hash::new_unique();
-        let val = CalculateHashIntermediate::new(1, hash, 1, 1, key);
-
-        // slot same, version <
-        let hash2 = Hash::new_unique();
-        let val2 = CalculateHashIntermediate::new(0, hash2, 4, 1, key);
-        let val3 = CalculateHashIntermediate::new(3, hash2, 4, 1, key);
-        let val4 = CalculateHashIntermediate::new(4, hash2, 4, 1, key);
-
-        let src = vec![vec![val2.clone()], vec![val.clone()]];
-        let result = AccountsHash::sort_hash_intermediate(src.clone(), &mut stats);
-        assert_eq!(result, src);
-
-        let src = vec![
-            vec![val2.clone(), val.clone()],
-            vec![val3.clone(), val4.clone()],
-        ];
-        let sorted = vec![vec![val, val2], vec![val4, val3]];
-        let result = AccountsHash::sort_hash_intermediate(src, &mut stats);
-        assert_eq!(result, sorted);
-
-        let src = vec![vec![]];
-        let result = AccountsHash::sort_hash_intermediate(src.clone(), &mut stats);
-        assert_eq!(result, src);
-
-        let src = vec![];
-        let result = AccountsHash::sort_hash_intermediate(src.clone(), &mut stats);
-        assert_eq!(result, src);
     }
 
     #[test]
@@ -1453,31 +1379,19 @@ pub mod tests {
         solana_logger::setup();
         let key = Pubkey::new_unique();
         let hash = Hash::new_unique();
-        let val = CalculateHashIntermediate::new(1, hash, 1, 1, key);
+        let val = CalculateHashIntermediate::new_without_slot(hash, 1, key);
 
         // slot same, version <
         let hash2 = Hash::new_unique();
-        let val2 = CalculateHashIntermediate::new(0, hash2, 4, 1, key);
+        let val2 = CalculateHashIntermediate::new_without_slot(hash2, 4, key);
         assert_eq!(
-            std::cmp::Ordering::Less,
+            std::cmp::Ordering::Equal, // no longer comparing slots or versions
             AccountsHash::compare_two_hash_entries(&val, &val2)
         );
 
-        let list = vec![val.clone(), val2.clone()];
-        let mut list_bkup = list.clone();
-        list_bkup.sort_by(AccountsHash::compare_two_hash_entries);
-        let list = AccountsHash::sort_hash_intermediate(vec![list], &mut HashStats::default());
-        assert_eq!(list, vec![list_bkup]);
-
-        let list = vec![val2, val.clone()]; // reverse args
-        let mut list_bkup = list.clone();
-        list_bkup.sort_by(AccountsHash::compare_two_hash_entries);
-        let list = AccountsHash::sort_hash_intermediate(vec![list], &mut HashStats::default());
-        assert_eq!(list, vec![list_bkup]);
-
         // slot same, vers =
         let hash3 = Hash::new_unique();
-        let val3 = CalculateHashIntermediate::new(1, hash3, 2, 1, key);
+        let val3 = CalculateHashIntermediate::new_without_slot(hash3, 2, key);
         assert_eq!(
             std::cmp::Ordering::Equal,
             AccountsHash::compare_two_hash_entries(&val, &val3)
@@ -1485,46 +1399,47 @@ pub mod tests {
 
         // slot same, vers >
         let hash4 = Hash::new_unique();
-        let val4 = CalculateHashIntermediate::new(2, hash4, 6, 1, key);
+        let val4 = CalculateHashIntermediate::new_without_slot(hash4, 6, key);
         assert_eq!(
-            std::cmp::Ordering::Greater,
+            std::cmp::Ordering::Equal, // no longer comparing slots or versions
             AccountsHash::compare_two_hash_entries(&val, &val4)
         );
 
         // slot >, version <
         let hash5 = Hash::new_unique();
-        let val5 = CalculateHashIntermediate::new(0, hash5, 8, 2, key);
+        let val5 = CalculateHashIntermediate::new_without_slot(hash5, 8, key);
         assert_eq!(
-            std::cmp::Ordering::Greater,
+            std::cmp::Ordering::Equal, // no longer comparing slots or versions
             AccountsHash::compare_two_hash_entries(&val, &val5)
         );
     }
 
+    fn test_de_dup_accounts_in_parallel(
+        account_maps: &[CalculateHashIntermediate],
+    ) -> (Vec<Hash>, u64, usize) {
+        AccountsHash::de_dup_accounts_in_parallel(&vec![vec![account_maps.to_vec()]][..], 0)
+    }
+
     #[test]
     fn test_accountsdb_remove_zero_balance_accounts() {
         solana_logger::setup();
 
         let key = Pubkey::new_unique();
         let hash = Hash::new_unique();
-        let mut account_maps: Vec<CalculateHashIntermediate> = Vec::new();
-        let val = CalculateHashIntermediate::new(0, hash, 1, Slot::default(), key);
+        let mut account_maps = Vec::new();
+        let val = CalculateHashIntermediate::new_without_slot(hash, 1, key);
         account_maps.push(val.clone());
 
-        let result = AccountsHash::de_dup_accounts_from_stores(true, &account_maps[..]);
-        assert_eq!(result, (vec![val.hash], val.lamports as u128));
+        let result = test_de_dup_accounts_in_parallel(&account_maps[..]);
+        assert_eq!(result, (vec![val.hash], val.lamports as u64, 1));
 
         // zero original lamports, higher version
-        let val = CalculateHashIntermediate::new(
-            1,
-            hash,
-            ZERO_RAW_LAMPORTS_SENTINEL,
-            Slot::default(),
-            key,
-        );
-        account_maps.insert(0, val); // has to be before other entry since sort order matters
+        let val =
+            CalculateHashIntermediate::new_without_slot(hash, ZERO_RAW_LAMPORTS_SENTINEL, key);
+        account_maps.push(val); // has to be after previous entry since account_maps are in slot order
 
-        let result = AccountsHash::de_dup_accounts_from_stores(true, &account_maps[..]);
-        assert_eq!(result, (vec![], 0));
+        let result = test_de_dup_accounts_in_parallel(&account_maps[..]);
+        assert_eq!(result, (vec![], 0, 2));
     }
 
     #[test]
@@ -1581,9 +1496,49 @@ pub mod tests {
         assert_eq!(cumulative.cumulative_offsets.len(), 0); // 2 non-empty vectors
     }
 
+    #[should_panic(expected = "is_empty")]
+    #[test]
+    fn test_accountsdb_cumulative_find_empty() {
+        let input = CumulativeOffsets {
+            cumulative_offsets: vec![],
+            total_count: 0,
+        };
+        input.find(0);
+    }
+
+    #[test]
+    fn test_accountsdb_cumulative_find() {
+        let input = CumulativeOffsets {
+            cumulative_offsets: vec![CumulativeOffset {
+                index: vec![0],
+                start_offset: 0,
+            }],
+            total_count: 0,
+        };
+        assert_eq!(input.find(0), (0, &input.cumulative_offsets[0]));
+
+        let input = CumulativeOffsets {
+            cumulative_offsets: vec![
+                CumulativeOffset {
+                    index: vec![0],
+                    start_offset: 0,
+                },
+                CumulativeOffset {
+                    index: vec![1],
+                    start_offset: 2,
+                },
+            ],
+            total_count: 0,
+        };
+        assert_eq!(input.find(0), (0, &input.cumulative_offsets[0])); // = first start_offset
+        assert_eq!(input.find(1), (1, &input.cumulative_offsets[0])); // > first start_offset
+        assert_eq!(input.find(2), (0, &input.cumulative_offsets[1])); // = last start_offset
+        assert_eq!(input.find(3), (1, &input.cumulative_offsets[1])); // > last start_offset
+    }
+
     #[test]
     fn test_accountsdb_cumulative_offsets2_d() {
-        let input = vec![vec![vec![0, 1], vec![], vec![2, 3, 4], vec![]]];
+        let input: Vec<Vec<Vec<u64>>> = vec![vec![vec![0, 1], vec![], vec![2, 3, 4], vec![]]];
         let cumulative = CumulativeOffsets::from_raw_2d(&input);
 
         let src: Vec<_> = input
@@ -1608,7 +1563,7 @@ pub mod tests {
         assert_eq!(cumulative.cumulative_offsets[1].start_offset, 2);
 
         for start in 0..len {
-            let slice = cumulative.get_slice_2d(&input, start);
+            let slice: &[u64] = cumulative.get_slice(&input, start);
             let len = slice.len();
             assert!(len > 0);
             assert_eq!(&src[start..(start + len)], slice);
@@ -1637,7 +1592,7 @@ pub mod tests {
         assert_eq!(cumulative.cumulative_offsets[1].start_offset, 2);
 
         for start in 0..len {
-            let slice = cumulative.get_slice_2d(&input, start);
+            let slice: &[u64] = cumulative.get_slice(&input, start);
             let len = slice.len();
             assert!(len > 0);
             assert_eq!(&src[start..(start + len)], slice);
@@ -1678,139 +1633,13 @@ pub mod tests {
         assert_eq!(cumulative.cumulative_offsets[1].start_offset, 2);
 
         for start in 0..len {
-            let slice = cumulative.get_slice_2d(&input, start);
+            let slice: &[u64] = cumulative.get_slice(&input, start);
             let len = slice.len();
             assert!(len > 0);
             assert_eq!(&src[start..(start + len)], slice);
         }
     }
 
-    #[test]
-    fn test_accountsdb_flatten_hash_intermediate() {
-        solana_logger::setup();
-        let test = vec![vec![vec![CalculateHashIntermediate::new(
-            1,
-            Hash::new_unique(),
-            2,
-            3,
-            Pubkey::new_unique(),
-        )]]];
-        let mut stats = HashStats::default();
-        let result = AccountsHash::flatten_hash_intermediate(test.clone(), &mut stats);
-        assert_eq!(result, test[0]);
-        assert_eq!(stats.unreduced_entries, 1);
-
-        let mut stats = HashStats::default();
-        let result = AccountsHash::flatten_hash_intermediate(
-            vec![vec![vec![CalculateHashIntermediate::default(); 0]]],
-            &mut stats,
-        );
-        assert_eq!(result.iter().flatten().count(), 0);
-        assert_eq!(stats.unreduced_entries, 0);
-
-        let test = vec![
-            vec![vec![
-                CalculateHashIntermediate::new(1, Hash::new_unique(), 2, 3, Pubkey::new_unique()),
-                CalculateHashIntermediate::new(8, Hash::new_unique(), 9, 10, Pubkey::new_unique()),
-            ]],
-            vec![vec![CalculateHashIntermediate::new(
-                4,
-                Hash::new_unique(),
-                5,
-                6,
-                Pubkey::new_unique(),
-            )]],
-        ];
-        let mut stats = HashStats::default();
-        let result = AccountsHash::flatten_hash_intermediate(test.clone(), &mut stats);
-        let expected = test
-            .into_iter()
-            .flatten()
-            .into_iter()
-            .flatten()
-            .collect::<Vec<_>>();
-        assert_eq!(result.into_iter().flatten().collect::<Vec<_>>(), expected);
-        assert_eq!(stats.unreduced_entries, expected.len());
-    }
-
-    #[test]
-    fn test_accountsdb_flatten_hash_intermediate2() {
-        solana_logger::setup();
-        // data is ordered:
-        // vec: just a level of hierarchy
-        //   vec: 1 vec per PUBKEY_BINS_FOR_CALCULATING_HASHES
-        //     vec: Intermediate data whose pubkey belongs in this division
-        let binned_data = vec![
-            vec![vec![1, 2], vec![3, 4], vec![], vec![5]],
-            vec![vec![], vec![11, 12]],
-        ];
-        let mut combined: Vec<Vec<Vec<i32>>> = vec![vec![]];
-        binned_data.iter().enumerate().for_each(|(bin, v)| {
-            v.iter()
-                .enumerate()
-                .for_each(|(dimension0, v): (usize, &Vec<i32>)| {
-                    while combined.len() <= dimension0 {
-                        combined.push(vec![]);
-                    }
-                    let vec: &mut Vec<Vec<i32>> = &mut combined[dimension0];
-                    while vec.len() <= bin {
-                        vec.push(vec![]);
-                    }
-                    vec[bin].extend(v.clone());
-                });
-        });
-
-        let mut stats = HashStats::default();
-        let result = AccountsHash::flatten_hash_intermediate(combined, &mut stats);
-        assert_eq!(
-            result,
-            binned_data
-                .clone()
-                .into_iter()
-                .map(|x| x.into_iter().flatten().collect::<Vec<_>>())
-                .collect::<Vec<_>>()
-        );
-        assert_eq!(
-            stats.unreduced_entries,
-            binned_data
-                .into_iter()
-                .flatten()
-                .into_iter()
-                .flatten()
-                .count()
-        );
-
-        let src = vec![vec![vec![0]]];
-        let result = AccountsHash::flatten_hash_intermediate(src, &mut stats);
-        assert_eq!(result, vec![vec![0]]);
-
-        let src = vec![vec![vec![0], vec![1]]];
-        let result = AccountsHash::flatten_hash_intermediate(src, &mut stats);
-        assert_eq!(result, vec![vec![0], vec![1]]);
-
-        let src = vec![vec![vec![]], vec![vec![], vec![1]]];
-        let result = AccountsHash::flatten_hash_intermediate(src, &mut stats);
-        assert_eq!(result, vec![vec![], vec![1]]);
-
-        let src: Vec<Vec<Vec<i32>>> = vec![vec![vec![], vec![]]];
-        let result = AccountsHash::flatten_hash_intermediate(src, &mut stats);
-        let expected: Vec<Vec<i32>> = vec![];
-        assert_eq!(result, expected);
-
-        let src: Vec<Vec<Vec<i32>>> = vec![vec![vec![], vec![]], vec![vec![], vec![]]];
-        let result = AccountsHash::flatten_hash_intermediate(src, &mut stats);
-        assert_eq!(result, expected);
-
-        let src: Vec<Vec<Vec<i32>>> = vec![vec![vec![], vec![]], vec![vec![]]];
-        let result = AccountsHash::flatten_hash_intermediate(src, &mut stats);
-        assert_eq!(result, expected);
-
-        let src: Vec<Vec<Vec<i32>>> = vec![vec![], vec![vec![]]];
-        let result = AccountsHash::flatten_hash_intermediate(src, &mut stats);
-        let expected: Vec<Vec<i32>> = vec![];
-        assert_eq!(result, expected);
-    }
-
     fn test_hashing_larger(hashes: Vec<(Pubkey, Hash)>, fanout: usize) -> Hash {
         let result = AccountsHash::compute_merkle_root(hashes.clone(), fanout);
         let reduced: Vec<_> = hashes.iter().map(|x| x.1).collect();
@@ -1850,7 +1679,7 @@ pub mod tests {
                 ];
                 let offsets = CumulativeOffsets::from_raw_2d(&src);
 
-                let get_slice = |start: usize| -> &[Hash] { offsets.get_slice_2d(&src, start) };
+                let get_slice = |start: usize| -> &[Hash] { offsets.get_slice(&src, start) };
                 let result2 = AccountsHash::compute_merkle_root_from_slices(
                     offsets.total_count,
                     fanout,
@@ -1974,22 +1803,18 @@ pub mod tests {
 
         let offset = 2;
         let input = vec![
-            CalculateHashIntermediate::new(
-                0,
-                Hash::new_unique(),
+            CalculateHashIntermediate::new_without_slot(
+                Hash::new(&[1u8; 32]),
                 u64::MAX - offset,
-                0,
                 Pubkey::new_unique(),
             ),
-            CalculateHashIntermediate::new(
-                0,
-                Hash::new_unique(),
+            CalculateHashIntermediate::new_without_slot(
+                Hash::new(&[2u8; 32]),
                 offset + 1,
-                0,
                 Pubkey::new_unique(),
             ),
         ];
-        AccountsHash::de_dup_accounts_in_parallel(&input, 1);
+        AccountsHash::de_dup_accounts_in_parallel(&[vec![input]], 0);
     }
 
     #[test]
@@ -1999,21 +1824,21 @@ pub mod tests {
 
         let offset = 2;
         let input = vec![
-            vec![CalculateHashIntermediate::new(
-                0,
-                Hash::new_unique(),
+            vec![CalculateHashIntermediate::new_without_slot(
+                Hash::new(&[1u8; 32]),
                 u64::MAX - offset,
-                0,
                 Pubkey::new_unique(),
             )],
-            vec![CalculateHashIntermediate::new(
-                0,
-                Hash::new_unique(),
+            vec![CalculateHashIntermediate::new_without_slot(
+                Hash::new(&[2u8; 32]),
                 offset + 1,
-                0,
                 Pubkey::new_unique(),
             )],
         ];
-        AccountsHash::de_dup_and_eliminate_zeros(input, &mut HashStats::default());
+        AccountsHash::de_dup_and_eliminate_zeros(
+            vec![input],
+            &mut HashStats::default(),
+            2, // accounts above are in 2 groups
+        );
     }
 }
diff --git a/runtime/src/accounts_index.rs b/runtime/src/accounts_index.rs
index b3920ade71c418..680577e47ab22f 100644
--- a/runtime/src/accounts_index.rs
+++ b/runtime/src/accounts_index.rs
@@ -5,17 +5,16 @@ use crate::{
     secondary_index::*,
 };
 use bv::BitVec;
-use dashmap::DashSet;
 use log::*;
 use ouroboros::self_referencing;
 use solana_measure::measure::Measure;
 use solana_sdk::{
-    clock::Slot,
+    clock::{BankId, Slot},
     pubkey::{Pubkey, PUBKEY_BYTES},
 };
 use std::{
     collections::{
-        btree_map::{self, BTreeMap},
+        btree_map::{self, BTreeMap, Entry},
         HashSet,
     },
     ops::{
@@ -25,15 +24,16 @@ use std::{
     },
     sync::{
         atomic::{AtomicU64, Ordering},
-        Arc, RwLock, RwLockReadGuard, RwLockWriteGuard,
+        Arc, Mutex, RwLock, RwLockReadGuard, RwLockWriteGuard,
     },
 };
+use thiserror::Error;
 
 pub const ITER_BATCH_SIZE: usize = 1000;
-
+const BINS: usize = 16;
+pub type ScanResult<T> = Result<T, ScanError>;
 pub type SlotList<T> = Vec<(Slot, T)>;
 pub type SlotSlice<'s, T> = &'s [(Slot, T)];
-
 pub type RefCount = u64;
 pub type AccountMap<K, V> = BTreeMap<K, V>;
 
@@ -55,6 +55,12 @@ impl IsCached for u64 {
     }
 }
 
+#[derive(Error, Debug, PartialEq)]
+pub enum ScanError {
+    #[error("Node detected it replayed bad version of slot {slot:?} with id {bank_id:?}, thus the scan on said slot was aborted")]
+    SlotRemoved { slot: Slot, bank_id: BankId },
+}
+
 enum ScanTypes<R: RangeBounds<Pubkey>> {
     Unindexed(Option<R>),
     Indexed(IndexKey),
@@ -123,6 +129,7 @@ pub enum AccountIndexGetResult<'a, T: 'static> {
 pub struct ReadAccountMapEntry<T: 'static> {
     owned_entry: AccountMapEntry<T>,
     #[borrows(owned_entry)]
+    #[covariant]
     slot_list_guard: RwLockReadGuard<'this, SlotList<T>>,
 }
 
@@ -140,18 +147,23 @@ impl<T: Clone> ReadAccountMapEntry<T> {
     }
 
     pub fn ref_count(&self) -> &AtomicU64 {
-        &self.borrow_owned_entry_contents().ref_count
+        &self.borrow_owned_entry().ref_count
     }
 
     pub fn unref(&self) {
         self.ref_count().fetch_sub(1, Ordering::Relaxed);
     }
+
+    pub fn addref(&self) {
+        self.ref_count().fetch_add(1, Ordering::Relaxed);
+    }
 }
 
 #[self_referencing]
 pub struct WriteAccountMapEntry<T: 'static> {
     owned_entry: AccountMapEntry<T>,
     #[borrows(owned_entry)]
+    #[covariant]
     slot_list_guard: RwLockWriteGuard<'this, SlotList<T>>,
 }
 
@@ -176,18 +188,18 @@ impl<T: 'static + Clone + IsCached> WriteAccountMapEntry<T> {
     }
 
     pub fn ref_count(&self) -> &AtomicU64 {
-        &self.borrow_owned_entry_contents().ref_count
+        &self.borrow_owned_entry().ref_count
     }
 
     // create an entry that is equivalent to this process:
     // 1. new empty (refcount=0, slot_list={})
     // 2. update(slot, account_info)
     // This code is called when the first entry [ie. (slot,account_info)] for a pubkey is inserted into the index.
-    pub fn new_entry_after_update(slot: Slot, account_info: &T) -> AccountMapEntry<T> {
+    pub fn new_entry_after_update(slot: Slot, account_info: T) -> AccountMapEntry<T> {
         let ref_count = if account_info.is_cached() { 0 } else { 1 };
         Arc::new(AccountMapEntryInner {
             ref_count: AtomicU64::new(ref_count),
-            slot_list: RwLock::new(vec![(slot, account_info.clone())]),
+            slot_list: RwLock::new(vec![(slot, account_info)]),
         })
     }
 
@@ -223,7 +235,7 @@ impl<T: 'static + Clone + IsCached> WriteAccountMapEntry<T> {
     }
 }
 
-#[derive(Debug, Default)]
+#[derive(Debug, Default, AbiExample, Clone)]
 pub struct RollingBitField {
     max_width: u64,
     min: u64,
@@ -232,9 +244,26 @@ pub struct RollingBitField {
     count: usize,
     // These are items that are true and lower than min.
     // They would cause us to exceed max_width if we stored them in our bit field.
-    // We only expect these items in conditions where there is some other bug in the system.
+    // We only expect these items in conditions where there is some other bug in the system
+    //  or in testing when large ranges are created.
     excess: HashSet<u64>,
 }
+
+impl PartialEq<RollingBitField> for RollingBitField {
+    fn eq(&self, other: &Self) -> bool {
+        // 2 instances could have different internal data for the same values,
+        // so we have to compare data.
+        self.len() == other.len() && {
+            for item in self.get_all() {
+                if !other.contains(&item) {
+                    return false;
+                }
+            }
+            true
+        }
+    }
+}
+
 // functionally similar to a hashset
 // Relies on there being a sliding window of key values. The key values continue to increase.
 // Old key values are removed from the lesser values and do not accumulate.
@@ -263,8 +292,26 @@ impl RollingBitField {
         self.max - self.min
     }
 
+    pub fn min(&self) -> Option<u64> {
+        if self.is_empty() {
+            None
+        } else if self.excess.is_empty() {
+            Some(self.min)
+        } else {
+            let mut min = if self.all_items_in_excess() {
+                u64::MAX
+            } else {
+                self.min
+            };
+            for item in &self.excess {
+                min = std::cmp::min(min, *item);
+            }
+            Some(min)
+        }
+    }
+
     pub fn insert(&mut self, key: u64) {
-        let bits_empty = self.count == 0 || self.count == self.excess.len();
+        let mut bits_empty = self.count == 0 || self.all_items_in_excess();
         let update_bits = if bits_empty {
             true // nothing in bits, so in range
         } else if key < self.min {
@@ -293,6 +340,12 @@ impl RollingBitField {
                 let address = self.get_address(&key);
                 self.bits.set(address, false);
                 self.purge(&key);
+
+                if self.all_items_in_excess() {
+                    // if we moved the last existing item to excess, then we are ready to insert the new item in the bits
+                    bits_empty = true;
+                    break;
+                }
             }
 
             true // moved things to excess if necessary, so update bits with the new entry
@@ -309,6 +362,13 @@ impl RollingBitField {
                 } else {
                     self.min = std::cmp::min(self.min, key);
                     self.max = std::cmp::max(self.max, key + 1);
+                    assert!(
+                        self.min + self.max_width >= self.max,
+                        "min: {}, max: {}, max_width: {}",
+                        self.min,
+                        self.max,
+                        self.max_width
+                    );
                 }
                 self.count += 1;
             }
@@ -340,9 +400,13 @@ impl RollingBitField {
         }
     }
 
+    fn all_items_in_excess(&self) -> bool {
+        self.excess.len() == self.count
+    }
+
     // after removing 'key' where 'key' = min, make min the correct new min value
     fn purge(&mut self, key: &u64) {
-        if self.count > 0 {
+        if self.count > 0 && !self.all_items_in_excess() {
             if key == &self.min {
                 let start = self.min + 1; // min just got removed
                 for key in start..self.max {
@@ -353,8 +417,18 @@ impl RollingBitField {
                 }
             }
         } else {
-            self.min = Slot::default();
-            self.max = Slot::default();
+            // The idea is that there are no items in the bitfield anymore.
+            // But, there MAY be items in excess. The model works such that items < min go into excess.
+            // So, after purging all items from bitfield, we hold max to be what it previously was, but set min to max.
+            // Thus, if we lookup >= max, answer is always false without having to look in excess.
+            // If we changed max here to 0, we would lose the ability to know the range of items in excess (if any).
+            // So, now, with min updated = max:
+            // If we lookup < max, then we first check min.
+            // If >= min, then we look in bitfield.
+            // Otherwise, we look in excess since the request is < min.
+            // So, resetting min like this after a remove results in the correct behavior for the model.
+            // Later, if we insert and there are 0 items total (excess + bitfield), then we reset min/max to reflect the new item only.
+            self.min = self.max;
         }
     }
 
@@ -364,9 +438,12 @@ impl RollingBitField {
         self.bits.get(address)
     }
 
+    // This is the 99% use case.
+    // This needs be fast for the most common case of asking for key >= min.
     pub fn contains(&self, key: &u64) -> bool {
         if key < &self.max {
             if key >= &self.min {
+                // in the bitfield range
                 self.contains_assume_in_range(key)
             } else {
                 self.excess.contains(key)
@@ -389,6 +466,10 @@ impl RollingBitField {
         std::mem::swap(&mut n, self);
     }
 
+    pub fn max(&self) -> u64 {
+        self.max
+    }
+
     pub fn get_all(&self) -> Vec<u64> {
         let mut all = Vec::with_capacity(self.count);
         self.excess.iter().for_each(|slot| all.push(*slot));
@@ -427,6 +508,10 @@ impl RootsTracker {
             previous_uncleaned_roots: HashSet::new(),
         }
     }
+
+    pub fn min_root(&self) -> Option<Slot> {
+        self.roots.min()
+    }
 }
 
 #[derive(Debug, Default)]
@@ -440,7 +525,7 @@ pub struct AccountsIndexRootsStats {
 }
 
 pub struct AccountsIndexIterator<'a, T> {
-    account_maps: &'a RwLock<AccountMap<Pubkey, AccountMapEntry<T>>>,
+    account_maps: &'a LockMapTypeSlice<T>,
     start_bound: Bound<Pubkey>,
     end_bound: Bound<Pubkey>,
     is_finished: bool,
@@ -455,10 +540,7 @@ impl<'a, T> AccountsIndexIterator<'a, T> {
         }
     }
 
-    pub fn new<R>(
-        account_maps: &'a RwLock<AccountMap<Pubkey, AccountMapEntry<T>>>,
-        range: Option<R>,
-    ) -> Self
+    pub fn new<R>(account_maps: &'a LockMapTypeSlice<T>, range: Option<R>) -> Self
     where
         R: RangeBounds<Pubkey>,
     {
@@ -484,14 +566,18 @@ impl<'a, T: 'static + Clone> Iterator for AccountsIndexIterator<'a, T> {
             return None;
         }
 
-        let chunk: Vec<(Pubkey, AccountMapEntry<T>)> = self
-            .account_maps
-            .read()
-            .unwrap()
-            .range((self.start_bound, self.end_bound))
-            .map(|(pubkey, account_map_entry)| (*pubkey, account_map_entry.clone()))
-            .take(ITER_BATCH_SIZE)
-            .collect();
+        let mut chunk: Vec<(Pubkey, AccountMapEntry<T>)> = Vec::with_capacity(ITER_BATCH_SIZE);
+        'outer: for i in self.account_maps.iter() {
+            for (pubkey, account_map_entry) in
+                i.read().unwrap().range((self.start_bound, self.end_bound))
+            {
+                if chunk.len() >= ITER_BATCH_SIZE {
+                    break 'outer;
+                }
+                let item = (*pubkey, account_map_entry.clone());
+                chunk.push(item);
+            }
+        }
 
         if chunk.is_empty() {
             self.is_finished = true;
@@ -507,25 +593,61 @@ pub trait ZeroLamport {
     fn is_zero_lamport(&self) -> bool;
 }
 
+fn get_bin_pubkey(pubkey: &Pubkey) -> usize {
+    let byte_of_pubkey_to_bin = 0; // TODO: this should not be 0. For now it needs to be due to requests for in-order pubkeys
+    (pubkey.as_ref()[byte_of_pubkey_to_bin] as usize) * BINS / ((u8::MAX as usize) + 1)
+}
+
 type MapType<T> = AccountMap<Pubkey, AccountMapEntry<T>>;
-type AccountMapsWriteLock<'a, T> = RwLockWriteGuard<'a, AccountMap<Pubkey, AccountMapEntry<T>>>;
-type AccountMapsReadLock<'a, T> = RwLockReadGuard<'a, AccountMap<Pubkey, AccountMapEntry<T>>>;
+type LockMapType<T> = Vec<RwLock<MapType<T>>>;
+type LockMapTypeSlice<T> = [RwLock<MapType<T>>];
+type AccountMapsWriteLock<'a, T> = RwLockWriteGuard<'a, MapType<T>>;
+type AccountMapsReadLock<'a, T> = RwLockReadGuard<'a, MapType<T>>;
+
+#[derive(Debug, Default)]
+pub struct ScanSlotTracker {
+    is_removed: bool,
+    ref_count: u64,
+}
+
+impl ScanSlotTracker {
+    pub fn is_removed(&self) -> bool {
+        self.is_removed
+    }
+
+    pub fn mark_removed(&mut self) {
+        self.is_removed = true;
+    }
+}
 
 #[derive(Debug)]
 pub struct AccountsIndex<T> {
-    pub account_maps: RwLock<MapType<T>>,
+    pub account_maps: LockMapType<T>,
     program_id_index: SecondaryIndex<DashMapSecondaryIndexEntry>,
     spl_token_mint_index: SecondaryIndex<DashMapSecondaryIndexEntry>,
     spl_token_owner_index: SecondaryIndex<RwLockSecondaryIndexEntry>,
     roots_tracker: RwLock<RootsTracker>,
     ongoing_scan_roots: RwLock<BTreeMap<Slot, u64>>,
-    zero_lamport_pubkeys: DashSet<Pubkey>,
+    // Each scan has some latest slot `S` that is the tip of the fork the scan
+    // is iterating over. The unique id of that slot `S` is recorded here (note we don't use
+    // `S` as the id because there can be more than one version of a slot `S`). If a fork
+    // is abandoned, all of the slots on that fork up to `S` will be removed via
+    // `AccountsDb::remove_unrooted_slots()`. When the scan finishes, it'll realize that the
+    // results of the scan may have been corrupted by `remove_unrooted_slots` and abort its results.
+    //
+    // `removed_bank_ids` tracks all the slot ids that were removed via `remove_unrooted_slots()` so any attempted scans
+    // on any of these slots fails. This is safe to purge once the associated Bank is dropped and
+    // scanning the fork with that Bank at the tip is no longer possible.
+    pub removed_bank_ids: Mutex<HashSet<BankId>>,
 }
 
 impl<T> Default for AccountsIndex<T> {
     fn default() -> Self {
         Self {
-            account_maps: RwLock::<AccountMap<Pubkey, AccountMapEntry<T>>>::default(),
+            account_maps: (0..BINS)
+                .into_iter()
+                .map(|_| RwLock::new(AccountMap::<Pubkey, AccountMapEntry<T>>::default()))
+                .collect::<Vec<_>>(),
             program_id_index: SecondaryIndex::<DashMapSecondaryIndexEntry>::new(
                 "program_id_index_stats",
             ),
@@ -537,12 +659,14 @@ impl<T> Default for AccountsIndex<T> {
             ),
             roots_tracker: RwLock::<RootsTracker>::default(),
             ongoing_scan_roots: RwLock::<BTreeMap<Slot, u64>>::default(),
-            zero_lamport_pubkeys: DashSet::<Pubkey>::default(),
+            removed_bank_ids: Mutex::<HashSet<BankId>>::default(),
         }
     }
 }
 
-impl<T: 'static + Clone + IsCached + ZeroLamport> AccountsIndex<T> {
+impl<T: 'static + Clone + IsCached + ZeroLamport + std::marker::Sync + std::marker::Send>
+    AccountsIndex<T>
+{
     fn iter<R>(&self, range: Option<R>) -> AccountsIndexIterator<T>
     where
         R: RangeBounds<Pubkey>,
@@ -554,12 +678,24 @@ impl<T: 'static + Clone + IsCached + ZeroLamport> AccountsIndex<T> {
         &self,
         metric_name: &'static str,
         ancestors: &Ancestors,
+        scan_bank_id: BankId,
         func: F,
         scan_type: ScanTypes<R>,
-    ) where
+    ) -> Result<(), ScanError>
+    where
         F: FnMut(&Pubkey, (&T, Slot)),
         R: RangeBounds<Pubkey>,
     {
+        {
+            let locked_removed_bank_ids = self.removed_bank_ids.lock().unwrap();
+            if locked_removed_bank_ids.contains(&scan_bank_id) {
+                return Err(ScanError::SlotRemoved {
+                    slot: ancestors.max_slot(),
+                    bank_id: scan_bank_id,
+                });
+            }
+        }
+
         let max_root = {
             let mut w_ongoing_scan_roots = self
                 // This lock is also grabbed by clean_accounts(), so clean
@@ -736,6 +872,23 @@ impl<T: 'static + Clone + IsCached + ZeroLamport> AccountsIndex<T> {
                 ongoing_scan_roots.remove(&max_root);
             }
         }
+
+        // If the fork with tip at bank `scan_bank_id` was removed during our scan, then the scan
+        // may have been corrupted, so abort the results.
+        let was_scan_corrupted = self
+            .removed_bank_ids
+            .lock()
+            .unwrap()
+            .contains(&scan_bank_id);
+
+        if was_scan_corrupted {
+            Err(ScanError::SlotRemoved {
+                slot: ancestors.max_slot(),
+                bank_id: scan_bank_id,
+            })
+        } else {
+            Ok(())
+        }
     }
 
     fn do_unchecked_scan_accounts<F, R>(
@@ -784,7 +937,7 @@ impl<T: 'static + Clone + IsCached + ZeroLamport> AccountsIndex<T> {
                 read_lock_timer.stop();
                 read_lock_elapsed += read_lock_timer.as_us();
                 let mut latest_slot_timer = Measure::start("latest_slot");
-                if let Some(index) = self.latest_slot(Some(ancestors), &list_r, max_root) {
+                if let Some(index) = self.latest_slot(Some(ancestors), list_r, max_root) {
                     latest_slot_timer.stop();
                     latest_slot_elapsed += latest_slot_timer.as_us();
                     let mut load_account_timer = Measure::start("load_account");
@@ -838,7 +991,7 @@ impl<T: 'static + Clone + IsCached + ZeroLamport> AccountsIndex<T> {
     }
 
     pub fn get_account_read_entry(&self, pubkey: &Pubkey) -> Option<ReadAccountMapEntry<T>> {
-        let lock = self.get_account_maps_read_lock();
+        let lock = self.get_account_maps_read_lock(pubkey);
         self.get_account_read_entry_with_lock(pubkey, &lock)
     }
 
@@ -853,7 +1006,7 @@ impl<T: 'static + Clone + IsCached + ZeroLamport> AccountsIndex<T> {
     }
 
     fn get_account_write_entry(&self, pubkey: &Pubkey) -> Option<WriteAccountMapEntry<T>> {
-        self.account_maps
+        self.account_maps[get_bin_pubkey(pubkey)]
             .read()
             .unwrap()
             .get(pubkey)
@@ -865,40 +1018,42 @@ impl<T: 'static + Clone + IsCached + ZeroLamport> AccountsIndex<T> {
         &self,
         pubkey: &Pubkey,
         slot: Slot,
-        info: &T,
+        info: T,
         w_account_maps: Option<&mut AccountMapsWriteLock<T>>,
-    ) -> Option<WriteAccountMapEntry<T>> {
+    ) -> Option<(WriteAccountMapEntry<T>, T)> {
         let new_entry = WriteAccountMapEntry::new_entry_after_update(slot, info);
         match w_account_maps {
             Some(w_account_maps) => {
-                self.insert_new_entry_if_missing_with_lock(pubkey, w_account_maps, new_entry)
+                self.insert_new_entry_if_missing_with_lock(*pubkey, w_account_maps, new_entry)
             }
             None => {
-                let mut w_account_maps = self.get_account_maps_write_lock();
-                self.insert_new_entry_if_missing_with_lock(pubkey, &mut w_account_maps, new_entry)
+                let mut w_account_maps = self.get_account_maps_write_lock(pubkey);
+                self.insert_new_entry_if_missing_with_lock(*pubkey, &mut w_account_maps, new_entry)
             }
         }
+        .map(|x| (x.0, x.1))
     }
 
     // return None if item was created new
     // if entry for pubkey already existed, return Some(entry). Caller needs to call entry.update.
     fn insert_new_entry_if_missing_with_lock(
         &self,
-        pubkey: &Pubkey,
+        pubkey: Pubkey,
         w_account_maps: &mut AccountMapsWriteLock<T>,
         new_entry: AccountMapEntry<T>,
-    ) -> Option<WriteAccountMapEntry<T>> {
-        let mut is_newly_inserted = false;
-        let account_entry = w_account_maps.entry(*pubkey).or_insert_with(|| {
-            is_newly_inserted = true;
-            new_entry
-        });
-        if is_newly_inserted {
-            None
-        } else {
-            Some(WriteAccountMapEntry::from_account_map_entry(
-                account_entry.clone(),
-            ))
+    ) -> Option<(WriteAccountMapEntry<T>, T, Pubkey)> {
+        let account_entry = w_account_maps.entry(pubkey);
+        match account_entry {
+            Entry::Occupied(account_entry) => Some((
+                WriteAccountMapEntry::from_account_map_entry(account_entry.get().clone()),
+                // extract the new account_info from the unused 'new_entry'
+                new_entry.slot_list.write().unwrap().remove(0).1,
+                *account_entry.key(),
+            )),
+            Entry::Vacant(account_entry) => {
+                account_entry.insert(new_entry);
+                None
+            }
         }
     }
 
@@ -906,10 +1061,12 @@ impl<T: 'static + Clone + IsCached + ZeroLamport> AccountsIndex<T> {
         &self,
         pubkey: &Pubkey,
         slot: Slot,
-        info: &T,
-    ) -> Option<WriteAccountMapEntry<T>> {
-        let w_account_entry = self.get_account_write_entry(pubkey);
-        w_account_entry.or_else(|| self.insert_new_entry_if_missing(pubkey, slot, info, None))
+        info: T,
+    ) -> Option<(WriteAccountMapEntry<T>, T)> {
+        match self.get_account_write_entry(pubkey) {
+            Some(w_account_entry) => Some((w_account_entry, info)),
+            None => self.insert_new_entry_if_missing(pubkey, slot, info, None),
+        }
     }
 
     pub fn handle_dead_keys(
@@ -919,7 +1076,7 @@ impl<T: 'static + Clone + IsCached + ZeroLamport> AccountsIndex<T> {
     ) {
         if !dead_keys.is_empty() {
             for key in dead_keys.iter() {
-                let mut w_index = self.get_account_maps_write_lock();
+                let mut w_index = self.get_account_maps_write_lock(key);
                 if let btree_map::Entry::Occupied(index_entry) = w_index.entry(**key) {
                     if index_entry.get().slot_list.read().unwrap().is_empty() {
                         index_entry.remove();
@@ -935,7 +1092,12 @@ impl<T: 'static + Clone + IsCached + ZeroLamport> AccountsIndex<T> {
     }
 
     /// call func with every pubkey and index visible from a given set of ancestors
-    pub(crate) fn scan_accounts<F>(&self, ancestors: &Ancestors, func: F)
+    pub(crate) fn scan_accounts<F>(
+        &self,
+        ancestors: &Ancestors,
+        scan_bank_id: BankId,
+        func: F,
+    ) -> Result<(), ScanError>
     where
         F: FnMut(&Pubkey, (&T, Slot)),
     {
@@ -943,9 +1105,10 @@ impl<T: 'static + Clone + IsCached + ZeroLamport> AccountsIndex<T> {
         self.do_checked_scan_accounts(
             "",
             ancestors,
+            scan_bank_id,
             func,
             ScanTypes::Unindexed(None::<Range<Pubkey>>),
-        );
+        )
     }
 
     pub(crate) fn unchecked_scan_accounts<F>(
@@ -975,7 +1138,13 @@ impl<T: 'static + Clone + IsCached + ZeroLamport> AccountsIndex<T> {
     }
 
     /// call func with every pubkey and index visible from a given set of ancestors
-    pub(crate) fn index_scan_accounts<F>(&self, ancestors: &Ancestors, index_key: IndexKey, func: F)
+    pub(crate) fn index_scan_accounts<F>(
+        &self,
+        ancestors: &Ancestors,
+        scan_bank_id: BankId,
+        index_key: IndexKey,
+        func: F,
+    ) -> Result<(), ScanError>
     where
         F: FnMut(&Pubkey, (&T, Slot)),
     {
@@ -983,9 +1152,10 @@ impl<T: 'static + Clone + IsCached + ZeroLamport> AccountsIndex<T> {
         self.do_checked_scan_accounts(
             "",
             ancestors,
+            scan_bank_id,
             func,
             ScanTypes::<Range<Pubkey>>::Indexed(index_key),
-        );
+        )
     }
 
     pub fn get_rooted_entries(&self, slice: SlotSlice<T>, max: Option<Slot>) -> SlotList<T> {
@@ -1005,7 +1175,7 @@ impl<T: 'static + Clone + IsCached + ZeroLamport> AccountsIndex<T> {
         max: Option<Slot>,
     ) -> (SlotList<T>, RefCount) {
         (
-            self.get_rooted_entries(&locked_account_entry.slot_list(), max),
+            self.get_rooted_entries(locked_account_entry.slot_list(), max),
             locked_account_entry.ref_count().load(Ordering::Relaxed),
         )
     }
@@ -1019,19 +1189,22 @@ impl<T: 'static + Clone + IsCached + ZeroLamport> AccountsIndex<T> {
     where
         C: Contains<'a, Slot>,
     {
-        let mut write_account_map_entry = self.get_account_write_entry(pubkey).unwrap();
-        write_account_map_entry.slot_list_mut(|slot_list| {
-            slot_list.retain(|(slot, item)| {
-                let should_purge = slots_to_purge.contains(&slot);
-                if should_purge {
-                    reclaims.push((*slot, item.clone()));
-                    false
-                } else {
-                    true
-                }
-            });
-            slot_list.is_empty()
-        })
+        if let Some(mut write_account_map_entry) = self.get_account_write_entry(pubkey) {
+            write_account_map_entry.slot_list_mut(|slot_list| {
+                slot_list.retain(|(slot, item)| {
+                    let should_purge = slots_to_purge.contains(slot);
+                    if should_purge {
+                        reclaims.push((*slot, item.clone()));
+                        false
+                    } else {
+                        true
+                    }
+                });
+                slot_list.is_empty()
+            })
+        } else {
+            true
+        }
     }
 
     pub fn min_ongoing_scan_root(&self) -> Option<Slot> {
@@ -1073,7 +1246,7 @@ impl<T: 'static + Clone + IsCached + ZeroLamport> AccountsIndex<T> {
                     Some(inner) => inner,
                     None => self.roots_tracker.read().unwrap(),
                 };
-                if lock.roots.contains(&slot) {
+                if lock.roots.contains(slot) {
                     rv = Some(i);
                     current_max = *slot;
                 }
@@ -1092,7 +1265,7 @@ impl<T: 'static + Clone + IsCached + ZeroLamport> AccountsIndex<T> {
         ancestors: Option<&Ancestors>,
         max_root: Option<Slot>,
     ) -> AccountIndexGetResult<'_, T> {
-        let read_lock = self.account_maps.read().unwrap();
+        let read_lock = self.account_maps[get_bin_pubkey(pubkey)].read().unwrap();
         let account = read_lock
             .get(pubkey)
             .cloned()
@@ -1186,12 +1359,12 @@ impl<T: 'static + Clone + IsCached + ZeroLamport> AccountsIndex<T> {
         }
     }
 
-    fn get_account_maps_write_lock(&self) -> AccountMapsWriteLock<T> {
-        self.account_maps.write().unwrap()
+    fn get_account_maps_write_lock(&self, pubkey: &Pubkey) -> AccountMapsWriteLock<T> {
+        self.account_maps[get_bin_pubkey(pubkey)].write().unwrap()
     }
 
-    pub(crate) fn get_account_maps_read_lock(&self) -> AccountMapsReadLock<T> {
-        self.account_maps.read().unwrap()
+    pub(crate) fn get_account_maps_read_lock(&self, pubkey: &Pubkey) -> AccountMapsReadLock<T> {
+        self.account_maps[get_bin_pubkey(pubkey)].read().unwrap()
     }
 
     // Same functionally to upsert, but:
@@ -1201,42 +1374,58 @@ impl<T: 'static + Clone + IsCached + ZeroLamport> AccountsIndex<T> {
     // But, does NOT update secondary index
     // This is designed to be called at startup time.
     #[allow(clippy::needless_collect)]
-    pub(crate) fn insert_new_if_missing_into_primary_index(
-        &self,
+    pub(crate) fn insert_new_if_missing_into_primary_index<'a>(
+        &'a self,
         slot: Slot,
-        items: Vec<(&Pubkey, T)>,
-    ) -> Vec<bool> {
-        let potentially_new_items = items
-            .iter()
-            .map(|(_pubkey, account_info)| {
-                // this value is equivalent to what update() below would have created if we inserted a new item
-                WriteAccountMapEntry::new_entry_after_update(slot, account_info)
-            })
-            .collect::<Vec<_>>(); // collect here so we have created all data prior to obtaining lock
+        item_len: usize,
+        items: impl Iterator<Item = (&'a Pubkey, T)>,
+    ) -> (Vec<Pubkey>, u64) {
+        let expected_items_per_bin = item_len * 2 / BINS; // big enough so not likely to re-allocate, small enough to not over-allocate
+        let mut binned = (0..BINS)
+            .into_iter()
+            .map(|pubkey_bin| (pubkey_bin, Vec::with_capacity(expected_items_per_bin)))
+            .collect::<Vec<_>>();
+        items.for_each(|(pubkey, account_info)| {
+            let bin = get_bin_pubkey(pubkey);
+            // this value is equivalent to what update() below would have created if we inserted a new item
+            let is_zero_lamport = account_info.is_zero_lamport();
+            let info = WriteAccountMapEntry::new_entry_after_update(slot, account_info);
+            binned[bin].1.push((*pubkey, info, is_zero_lamport));
+        });
+        binned.retain(|x| !x.1.is_empty());
 
-        let mut _reclaims = SlotList::new();
+        let insertion_time = AtomicU64::new(0);
 
-        let mut w_account_maps = self.get_account_maps_write_lock();
-        items
+        let dirty_pubkeys = binned
             .into_iter()
-            .zip(potentially_new_items.into_iter())
-            .map(|((pubkey, account_info), new_item)| {
-                let account_entry = self.insert_new_entry_if_missing_with_lock(
-                    pubkey,
-                    &mut w_account_maps,
-                    new_item,
-                );
-                if account_info.is_zero_lamport() {
-                    self.zero_lamport_pubkeys.insert(*pubkey);
-                }
-                if let Some(mut w_account_entry) = account_entry {
-                    w_account_entry.update(slot, account_info, &mut _reclaims);
-                    true
-                } else {
-                    false
-                }
+            .map(|(pubkey_bin, items)| {
+                let mut _reclaims = SlotList::new();
+                let mut w_account_maps = self.account_maps[pubkey_bin].write().unwrap();
+                let mut insert_time = Measure::start("insert_into_primary_index"); // really should be in each loop
+                let mut dirty_pubkeys = Vec::with_capacity(items.len());
+                items
+                    .into_iter()
+                    .for_each(|(pubkey, new_item, is_zero_lamport)| {
+                        let already_exists = self.insert_new_entry_if_missing_with_lock(
+                            pubkey,
+                            &mut w_account_maps,
+                            new_item,
+                        );
+                        if let Some((mut w_account_entry, account_info, pubkey)) = already_exists {
+                            w_account_entry.update(slot, account_info, &mut _reclaims);
+                            dirty_pubkeys.push(pubkey);
+                        } else if is_zero_lamport {
+                            dirty_pubkeys.push(pubkey);
+                        }
+                    });
+                insert_time.stop();
+                insertion_time.fetch_add(insert_time.as_us(), Ordering::Relaxed);
+                dirty_pubkeys
             })
-            .collect()
+            .flatten()
+            .collect::<Vec<_>>();
+
+        (dirty_pubkeys, insertion_time.load(Ordering::Relaxed))
     }
 
     // Updates the given pubkey at the given slot with the new account information.
@@ -1253,8 +1442,6 @@ impl<T: 'static + Clone + IsCached + ZeroLamport> AccountsIndex<T> {
         reclaims: &mut SlotList<T>,
     ) -> bool {
         let is_newly_inserted = {
-            let w_account_entry =
-                self.get_account_write_entry_else_create(pubkey, slot, &account_info);
             // We don't atomically update both primary index and secondary index together.
             // This certainly creates small time window with inconsistent state across the two indexes.
             // However, this is acceptable because:
@@ -1266,10 +1453,9 @@ impl<T: 'static + Clone + IsCached + ZeroLamport> AccountsIndex<T> {
             //  - The secondary index is never consulted as primary source of truth for gets/stores.
             //  So, what the accounts_index sees alone is sufficient as a source of truth for other non-scan
             //  account operations.
-            if account_info.is_zero_lamport() {
-                self.zero_lamport_pubkeys.insert(*pubkey);
-            }
-            if let Some(mut w_account_entry) = w_account_entry {
+            if let Some((mut w_account_entry, account_info)) =
+                self.get_account_write_entry_else_create(pubkey, slot, account_info)
+            {
                 w_account_entry.update(slot, account_info, reclaims);
                 false
             } else {
@@ -1280,14 +1466,6 @@ impl<T: 'static + Clone + IsCached + ZeroLamport> AccountsIndex<T> {
         is_newly_inserted
     }
 
-    pub fn remove_zero_lamport_key(&self, pubkey: &Pubkey) {
-        self.zero_lamport_pubkeys.remove(pubkey);
-    }
-
-    pub fn zero_lamport_pubkeys(&self) -> &DashSet<Pubkey> {
-        &self.zero_lamport_pubkeys
-    }
-
     pub fn unref_from_storage(&self, pubkey: &Pubkey) {
         if let Some(locked_entry) = self.get_account_read_entry(pubkey) {
             locked_entry.unref();
@@ -1328,17 +1506,15 @@ impl<T: 'static + Clone + IsCached + ZeroLamport> AccountsIndex<T> {
     ) {
         let roots_tracker = &self.roots_tracker.read().unwrap();
         let newest_root_in_slot_list =
-            Self::get_newest_root_in_slot_list(&roots_tracker.roots, &slot_list, max_clean_root);
+            Self::get_newest_root_in_slot_list(&roots_tracker.roots, slot_list, max_clean_root);
         let max_clean_root = max_clean_root.unwrap_or(roots_tracker.max_root);
 
-        let mut purged_slots: HashSet<Slot> = HashSet::new();
         slot_list.retain(|(slot, value)| {
             let should_purge =
                 Self::can_purge_older_entries(max_clean_root, newest_root_in_slot_list, *slot)
                     && !value.is_cached();
             if should_purge {
                 reclaims.push((*slot, value.clone()));
-                purged_slots.insert(*slot);
             }
             !should_purge
         });
@@ -1363,7 +1539,7 @@ impl<T: 'static + Clone + IsCached + ZeroLamport> AccountsIndex<T> {
         // locked and inserted the pubkey inbetween when `is_slot_list_empty=true` and the call to
         // remove() below.
         if is_slot_list_empty {
-            let mut w_maps = self.get_account_maps_write_lock();
+            let mut w_maps = self.get_account_maps_write_lock(pubkey);
             if let Some(x) = w_maps.get(pubkey) {
                 if x.slot_list.read().unwrap().is_empty() {
                     w_maps.remove(pubkey);
@@ -1477,6 +1653,10 @@ impl<T: 'static + Clone + IsCached + ZeroLamport> AccountsIndex<T> {
         })
     }
 
+    pub fn min_root(&self) -> Option<Slot> {
+        self.roots_tracker.read().unwrap().min_root()
+    }
+
     pub fn reset_uncleaned_roots(&self, max_clean_root: Option<Slot>) -> HashSet<Slot> {
         let mut cleaned_roots = HashSet::new();
         let mut w_roots_tracker = self.roots_tracker.write().unwrap();
@@ -1629,6 +1809,82 @@ pub mod tests {
         )
     }
 
+    #[test]
+    fn test_bitfield_delete_non_excess() {
+        solana_logger::setup();
+        let len = 16;
+        let mut bitfield = RollingBitField::new(len);
+        assert_eq!(bitfield.min(), None);
+
+        bitfield.insert(0);
+        assert_eq!(bitfield.min(), Some(0));
+        let too_big = len + 1;
+        bitfield.insert(too_big);
+        assert!(bitfield.contains(&0));
+        assert!(bitfield.contains(&too_big));
+        assert_eq!(bitfield.len(), 2);
+        assert_eq!(bitfield.excess.len(), 1);
+        assert_eq!(bitfield.min, too_big);
+        assert_eq!(bitfield.min(), Some(0));
+        assert_eq!(bitfield.max, too_big + 1);
+
+        // delete the thing that is NOT in excess
+        bitfield.remove(&too_big);
+        assert_eq!(bitfield.min, too_big + 1);
+        assert_eq!(bitfield.max, too_big + 1);
+        let too_big_times_2 = too_big * 2;
+        bitfield.insert(too_big_times_2);
+        assert!(bitfield.contains(&0));
+        assert!(bitfield.contains(&too_big_times_2));
+        assert_eq!(bitfield.len(), 2);
+        assert_eq!(bitfield.excess.len(), 1);
+        assert_eq!(bitfield.min(), bitfield.excess.iter().min().copied());
+        assert_eq!(bitfield.min, too_big_times_2);
+        assert_eq!(bitfield.max, too_big_times_2 + 1);
+
+        bitfield.remove(&0);
+        bitfield.remove(&too_big_times_2);
+        assert!(bitfield.is_empty());
+        let other = 5;
+        bitfield.insert(other);
+        assert!(bitfield.contains(&other));
+        assert!(bitfield.excess.is_empty());
+        assert_eq!(bitfield.min, other);
+        assert_eq!(bitfield.max, other + 1);
+    }
+
+    #[test]
+    fn test_bitfield_insert_excess() {
+        solana_logger::setup();
+        let len = 16;
+        let mut bitfield = RollingBitField::new(len);
+
+        bitfield.insert(0);
+        let too_big = len + 1;
+        bitfield.insert(too_big);
+        assert!(bitfield.contains(&0));
+        assert!(bitfield.contains(&too_big));
+        assert_eq!(bitfield.len(), 2);
+        assert_eq!(bitfield.excess.len(), 1);
+        assert!(bitfield.excess.contains(&0));
+        assert_eq!(bitfield.min, too_big);
+        assert_eq!(bitfield.max, too_big + 1);
+
+        // delete the thing that IS in excess
+        // this does NOT affect min/max
+        bitfield.remove(&0);
+        assert_eq!(bitfield.min, too_big);
+        assert_eq!(bitfield.max, too_big + 1);
+        // re-add to excess
+        bitfield.insert(0);
+        assert!(bitfield.contains(&0));
+        assert!(bitfield.contains(&too_big));
+        assert_eq!(bitfield.len(), 2);
+        assert_eq!(bitfield.excess.len(), 1);
+        assert_eq!(bitfield.min, too_big);
+        assert_eq!(bitfield.max, too_big + 1);
+    }
+
     #[test]
     fn test_bitfield_permutations() {
         solana_logger::setup();
@@ -1711,7 +1967,7 @@ pub mod tests {
         fn remove(&mut self, slot: &u64) -> bool {
             let result = self.bitfield.remove(slot);
             assert_eq!(result, self.hash_set.remove(slot));
-            assert!(!self.bitfield.contains(&slot));
+            assert!(!self.bitfield.contains(slot));
             self.compare();
             result
         }
@@ -1934,11 +2190,12 @@ pub mod tests {
         assert!(!tester.remove(&slot));
     }
 
-    fn compare(hashset: &HashSet<u64>, bitfield: &RollingBitField) {
+    fn compare_internal(hashset: &HashSet<u64>, bitfield: &RollingBitField) {
         assert_eq!(hashset.len(), bitfield.len());
         assert_eq!(hashset.is_empty(), bitfield.is_empty());
         if !bitfield.is_empty() {
             let mut min = Slot::MAX;
+            let mut overall_min = Slot::MAX;
             let mut max = Slot::MIN;
             for item in bitfield.get_all() {
                 assert!(hashset.contains(&item));
@@ -1946,7 +2203,9 @@ pub mod tests {
                     min = std::cmp::min(min, item);
                     max = std::cmp::max(max, item);
                 }
+                overall_min = std::cmp::min(overall_min, item);
             }
+            assert_eq!(bitfield.min(), Some(overall_min));
             assert_eq!(bitfield.get_all().len(), hashset.len());
             // range isn't tracked for excess items
             if bitfield.excess.len() != bitfield.len() {
@@ -1964,9 +2223,19 @@ pub mod tests {
                     width,
                 );
             }
+        } else {
+            assert_eq!(bitfield.min(), None);
         }
     }
 
+    fn compare(hashset: &HashSet<u64>, bitfield: &RollingBitField) {
+        compare_internal(hashset, bitfield);
+        let clone = bitfield.clone();
+        compare_internal(hashset, &clone);
+        assert!(clone.eq(bitfield));
+        assert_eq!(clone, *bitfield);
+    }
+
     #[test]
     fn test_bitfield_functionality() {
         solana_logger::setup();
@@ -2014,8 +2283,8 @@ pub mod tests {
 
                 // remove the rest, including a call that removes slot again
                 for item in all.iter() {
-                    assert!(tester.remove(&item));
-                    assert!(!tester.remove(&item));
+                    assert!(tester.remove(item));
+                    assert!(!tester.remove(item));
                 }
 
                 let min = max + ((width * 2) as u64) + 3;
@@ -2285,20 +2554,18 @@ pub mod tests {
         let index = AccountsIndex::<bool>::default();
         let account_info = true;
         let items = vec![(pubkey, account_info)];
-        index.insert_new_if_missing_into_primary_index(slot, items);
-
-        assert!(index.zero_lamport_pubkeys().is_empty());
+        index.insert_new_if_missing_into_primary_index(slot, items.len(), items.into_iter());
 
         let mut ancestors = Ancestors::default();
-        assert!(index.get(&pubkey, Some(&ancestors), None).is_none());
-        assert!(index.get(&pubkey, None, None).is_none());
+        assert!(index.get(pubkey, Some(&ancestors), None).is_none());
+        assert!(index.get(pubkey, None, None).is_none());
 
         let mut num = 0;
         index.unchecked_scan_accounts("", &ancestors, |_pubkey, _index| num += 1);
         assert_eq!(num, 0);
         ancestors.insert(slot, 0);
-        assert!(index.get(&pubkey, Some(&ancestors), None).is_some());
-        assert_eq!(index.ref_count_from_storage(&pubkey), 1);
+        assert!(index.get(pubkey, Some(&ancestors), None).is_some());
+        assert_eq!(index.ref_count_from_storage(pubkey), 1);
         index.unchecked_scan_accounts("", &ancestors, |_pubkey, _index| num += 1);
         assert_eq!(num, 1);
 
@@ -2306,20 +2573,18 @@ pub mod tests {
         let index = AccountsIndex::<AccountInfoTest>::default();
         let account_info: AccountInfoTest = 0 as AccountInfoTest;
         let items = vec![(pubkey, account_info)];
-        index.insert_new_if_missing_into_primary_index(slot, items);
-
-        assert!(!index.zero_lamport_pubkeys().is_empty());
+        index.insert_new_if_missing_into_primary_index(slot, items.len(), items.into_iter());
 
         let mut ancestors = Ancestors::default();
-        assert!(index.get(&pubkey, Some(&ancestors), None).is_none());
-        assert!(index.get(&pubkey, None, None).is_none());
+        assert!(index.get(pubkey, Some(&ancestors), None).is_none());
+        assert!(index.get(pubkey, None, None).is_none());
 
         let mut num = 0;
         index.unchecked_scan_accounts("", &ancestors, |_pubkey, _index| num += 1);
         assert_eq!(num, 0);
         ancestors.insert(slot, 0);
-        assert!(index.get(&pubkey, Some(&ancestors), None).is_some());
-        assert_eq!(index.ref_count_from_storage(&pubkey), 0); // cached, so 0
+        assert!(index.get(pubkey, Some(&ancestors), None).is_some());
+        assert_eq!(index.ref_count_from_storage(pubkey), 0); // cached, so 0
         index.unchecked_scan_accounts("", &ancestors, |_pubkey, _index| num += 1);
         assert_eq!(num, 1);
     }
@@ -2330,7 +2595,7 @@ pub mod tests {
         // account_info type that IS cached
         let account_info = AccountInfoTest::default();
 
-        let new_entry = WriteAccountMapEntry::new_entry_after_update(slot, &account_info);
+        let new_entry = WriteAccountMapEntry::new_entry_after_update(slot, account_info);
         assert_eq!(new_entry.ref_count.load(Ordering::Relaxed), 0);
         assert_eq!(new_entry.slot_list.read().unwrap().capacity(), 1);
         assert_eq!(
@@ -2341,7 +2606,7 @@ pub mod tests {
         // account_info type that is NOT cached
         let account_info = true;
 
-        let new_entry = WriteAccountMapEntry::new_entry_after_update(slot, &account_info);
+        let new_entry = WriteAccountMapEntry::new_entry_after_update(slot, account_info);
         assert_eq!(new_entry.ref_count.load(Ordering::Relaxed), 1);
         assert_eq!(new_entry.slot_list.read().unwrap().capacity(), 1);
         assert_eq!(
@@ -2359,10 +2624,8 @@ pub mod tests {
         let index = AccountsIndex::<bool>::default();
         let account_infos = [true, false];
 
-        index.insert_new_if_missing_into_primary_index(
-            slot0,
-            vec![(&key0, account_infos[0]), (&key1, account_infos[1])],
-        );
+        let items = vec![(&key0, account_infos[0]), (&key1, account_infos[1])];
+        index.insert_new_if_missing_into_primary_index(slot0, items.len(), items.into_iter());
 
         for (i, key) in [key0, key1].iter().enumerate() {
             let entry = index.get_account_read_entry(key).unwrap();
@@ -2372,7 +2635,14 @@ pub mod tests {
     }
 
     fn test_new_entry_code_paths_helper<
-        T: 'static + Clone + IsCached + ZeroLamport + std::cmp::PartialEq + std::fmt::Debug,
+        T: 'static
+            + Sync
+            + Send
+            + Clone
+            + IsCached
+            + ZeroLamport
+            + std::cmp::PartialEq
+            + std::fmt::Debug,
     >(
         account_infos: [T; 2],
         is_cached: bool,
@@ -2397,10 +2667,8 @@ pub mod tests {
                 &mut gc,
             );
         } else {
-            index.insert_new_if_missing_into_primary_index(
-                slot0,
-                vec![(&key, account_infos[0].clone())],
-            );
+            let items = vec![(&key, account_infos[0].clone())];
+            index.insert_new_if_missing_into_primary_index(slot0, items.len(), items.into_iter());
         }
         assert!(gc.is_empty());
 
@@ -2413,7 +2681,8 @@ pub mod tests {
             );
             let expected = vec![(slot0, account_infos[0].clone())];
             assert_eq!(entry.slot_list().to_vec(), expected);
-            let new_entry = WriteAccountMapEntry::new_entry_after_update(slot0, &account_infos[0]);
+            let new_entry =
+                WriteAccountMapEntry::new_entry_after_update(slot0, account_infos[0].clone());
             assert_eq!(
                 entry.slot_list().to_vec(),
                 new_entry.slot_list.read().unwrap().to_vec(),
@@ -2432,16 +2701,14 @@ pub mod tests {
                 &mut gc,
             );
         } else {
-            index.insert_new_if_missing_into_primary_index(
-                slot1,
-                vec![(&key, account_infos[1].clone())],
-            );
+            let items = vec![(&key, account_infos[1].clone())];
+            index.insert_new_if_missing_into_primary_index(slot1, items.len(), items.into_iter());
         }
         assert!(gc.is_empty());
 
         for lock in &[false, true] {
             let read_lock = if *lock {
-                Some(index.get_account_maps_read_lock())
+                Some(index.get_account_maps_read_lock(&key))
             } else {
                 None
             };
@@ -2466,7 +2733,8 @@ pub mod tests {
                 ]
             );
 
-            let new_entry = WriteAccountMapEntry::new_entry_after_update(slot1, &account_infos[1]);
+            let new_entry =
+                WriteAccountMapEntry::new_entry_after_update(slot1, account_infos[1].clone());
             assert_eq!(entry.slot_list()[1], new_entry.slot_list.read().unwrap()[0],);
         }
     }
@@ -2489,10 +2757,10 @@ pub mod tests {
         let slot = 0;
         let account_info = true;
 
-        let new_entry = WriteAccountMapEntry::new_entry_after_update(slot, &account_info);
-        let mut w_account_maps = index.get_account_maps_write_lock();
+        let new_entry = WriteAccountMapEntry::new_entry_after_update(slot, account_info);
+        let mut w_account_maps = index.get_account_maps_write_lock(&key.pubkey());
         let write = index.insert_new_entry_if_missing_with_lock(
-            &key.pubkey(),
+            key.pubkey(),
             &mut w_account_maps,
             new_entry,
         );
@@ -3433,7 +3701,7 @@ pub mod tests {
 
         // Both pubkeys will now be present in the index
         check_secondary_index_mapping_correct(
-            &secondary_index,
+            secondary_index,
             &[secondary_key1, secondary_key2],
             &account_key,
         );
diff --git a/runtime/src/ancestors.rs b/runtime/src/ancestors.rs
index 22aae9eb4d108f..5c5e16bcea8be0 100644
--- a/runtime/src/ancestors.rs
+++ b/runtime/src/ancestors.rs
@@ -1,47 +1,34 @@
+use crate::accounts_index::RollingBitField;
 use solana_sdk::clock::Slot;
-use std::collections::{HashMap, HashSet};
+use std::collections::HashMap;
 
 pub type AncestorsForSerialization = HashMap<Slot, usize>;
 
-#[derive(Debug, Default, Clone, PartialEq, Serialize, Deserialize, AbiExample)]
+#[derive(Debug, Clone, PartialEq, AbiExample)]
 pub struct Ancestors {
-    min: Slot,
-    slots: Vec<Option<usize>>,
-    count: usize,
-    max: Slot,
-    large_range_slots: HashSet<Slot>,
+    ancestors: RollingBitField,
 }
 
 // some tests produce ancestors ranges that are too large such
 // that we prefer to implement them in a sparse HashMap
-const ANCESTORS_HASH_MAP_SIZE: u64 = 10_000;
+const ANCESTORS_HASH_MAP_SIZE: u64 = 8192;
+
+impl Default for Ancestors {
+    fn default() -> Self {
+        Self {
+            ancestors: RollingBitField::new(ANCESTORS_HASH_MAP_SIZE),
+        }
+    }
+}
 
 impl From<Vec<Slot>> for Ancestors {
-    fn from(source: Vec<Slot>) -> Ancestors {
+    fn from(mut source: Vec<Slot>) -> Ancestors {
+        // bitfield performs optimally when we insert the minimum value first so that it knows the correct start/end values
+        source.sort_unstable();
         let mut result = Ancestors::default();
-        if !source.is_empty() {
-            result.min = Slot::MAX;
-            result.max = Slot::MIN;
-            source.iter().for_each(|slot| {
-                result.min = std::cmp::min(result.min, *slot);
-                result.max = std::cmp::max(result.max, *slot + 1);
-            });
-            let range = result.range();
-            if range > ANCESTORS_HASH_MAP_SIZE {
-                result.large_range_slots = source.into_iter().collect();
-                result.min = 0;
-                result.max = 0;
-            } else {
-                result.slots = vec![None; range as usize];
-                source.into_iter().for_each(|slot| {
-                    let slot = result.slot_index(&slot);
-                    if result.slots[slot].is_none() {
-                        result.count += 1;
-                    }
-                    result.slots[slot] = Some(0);
-                });
-            }
-        }
+        source.into_iter().for_each(|slot| {
+            result.ancestors.insert(slot);
+        });
 
         result
     }
@@ -49,32 +36,8 @@ impl From<Vec<Slot>> for Ancestors {
 
 impl From<&HashMap<Slot, usize>> for Ancestors {
     fn from(source: &HashMap<Slot, usize>) -> Ancestors {
-        let mut result = Ancestors::default();
-        if !source.is_empty() {
-            result.min = Slot::MAX;
-            result.max = Slot::MIN;
-            source.iter().for_each(|(slot, _)| {
-                result.min = std::cmp::min(result.min, *slot);
-                result.max = std::cmp::max(result.max, *slot + 1);
-            });
-            let range = result.range();
-            if range > ANCESTORS_HASH_MAP_SIZE {
-                result.large_range_slots = source.iter().map(|(slot, _size)| *slot).collect();
-                result.min = 0;
-                result.max = 0;
-            } else {
-                result.slots = vec![None; range as usize];
-                source.iter().for_each(|(slot, size)| {
-                    let slot = result.slot_index(&slot);
-                    if result.slots[slot].is_none() {
-                        result.count += 1;
-                    }
-                    result.slots[slot] = Some(*size);
-                });
-            }
-        }
-
-        result
+        let vec = source.iter().map(|(slot, _)| *slot).collect::<Vec<_>>();
+        Ancestors::from(vec)
     }
 }
 
@@ -90,74 +53,31 @@ impl From<&Ancestors> for HashMap<Slot, usize> {
 
 impl Ancestors {
     pub fn keys(&self) -> Vec<Slot> {
-        if self.large_range_slots.is_empty() {
-            self.slots
-                .iter()
-                .enumerate()
-                .filter_map(|(size, i)| i.map(|_| size as u64 + self.min))
-                .collect::<Vec<_>>()
-        } else {
-            self.large_range_slots.iter().copied().collect::<Vec<_>>()
-        }
+        self.ancestors.get_all()
     }
 
     pub fn get(&self, slot: &Slot) -> bool {
-        if self.large_range_slots.is_empty() {
-            if slot < &self.min || slot >= &self.max {
-                return false;
-            }
-            let slot = self.slot_index(slot);
-            self.slots[slot].is_some()
-        } else {
-            self.large_range_slots.get(slot).is_some()
-        }
+        self.ancestors.contains(slot)
     }
 
     pub fn remove(&mut self, slot: &Slot) {
-        if self.large_range_slots.is_empty() {
-            if slot < &self.min || slot >= &self.max {
-                return;
-            }
-            let slot = self.slot_index(slot);
-            if self.slots[slot].is_some() {
-                self.count -= 1;
-                self.slots[slot] = None;
-            }
-        } else {
-            self.large_range_slots.remove(slot);
-        }
+        self.ancestors.remove(slot);
     }
 
     pub fn contains_key(&self, slot: &Slot) -> bool {
-        if self.large_range_slots.is_empty() {
-            if slot < &self.min || slot >= &self.max {
-                return false;
-            }
-            let slot = self.slot_index(slot);
-            self.slots[slot].is_some()
-        } else {
-            self.large_range_slots.contains(slot)
-        }
+        self.ancestors.contains(slot)
     }
 
     pub fn len(&self) -> usize {
-        if self.large_range_slots.is_empty() {
-            self.count
-        } else {
-            self.large_range_slots.len()
-        }
+        self.ancestors.len()
     }
 
     pub fn is_empty(&self) -> bool {
         self.len() == 0
     }
 
-    fn slot_index(&self, slot: &Slot) -> usize {
-        (slot - self.min) as usize
-    }
-
-    fn range(&self) -> Slot {
-        self.max - self.min
+    pub fn max_slot(&self) -> Slot {
+        self.ancestors.max() - 1
     }
 }
 #[cfg(test)]
@@ -187,34 +107,8 @@ pub mod tests {
         }
     }
     impl Ancestors {
-        pub fn insert(&mut self, mut slot: Slot, size: usize) {
-            if self.large_range_slots.is_empty() {
-                if slot < self.min || slot >= self.max {
-                    let new_min = std::cmp::min(self.min, slot);
-                    let new_max = std::cmp::max(self.max, slot + 1);
-                    let new_range = new_max - new_min;
-                    if new_min == self.min {
-                        self.max = slot + 1;
-                        self.slots.resize(new_range as usize, None);
-                    } else {
-                        // min changed
-                        let mut new_slots = vec![None; new_range as usize];
-                        self.slots.iter().enumerate().for_each(|(i, size)| {
-                            new_slots[i as usize + self.min as usize - slot as usize] = *size
-                        });
-                        self.slots = new_slots;
-                        self.min = slot;
-                        // fall through and set this value in
-                    }
-                }
-                slot -= self.min;
-                if self.slots[slot as usize].is_none() {
-                    self.count += 1;
-                }
-                self.slots[slot as usize] = Some(size);
-            } else {
-                self.large_range_slots.insert(slot);
-            }
+        pub fn insert(&mut self, slot: Slot, _size: usize) {
+            self.ancestors.insert(slot);
         }
     }
 
@@ -276,7 +170,7 @@ pub mod tests {
             let key = item.0;
             min = std::cmp::min(min, *key);
             max = std::cmp::max(max, *key);
-            assert!(ancestors.get(&key));
+            assert!(ancestors.get(key));
         }
         for slot in min - 1..max + 2 {
             assert_eq!(ancestors.get(&slot), hashset.contains(&slot));
diff --git a/runtime/src/append_vec.rs b/runtime/src/append_vec.rs
index fe38721fd62c95..1f8f9744eae8f9 100644
--- a/runtime/src/append_vec.rs
+++ b/runtime/src/append_vec.rs
@@ -305,7 +305,14 @@ impl AppendVec {
         let file_size = std::fs::metadata(&path)?.len();
         AppendVec::sanitize_len_and_size(current_len, file_size as usize)?;
 
-        let map = unsafe { MmapMut::map_mut(&data)? };
+        let map = unsafe {
+            let result = MmapMut::map_mut(&data);
+            if result.is_err() {
+                // for vm.max_map_count, error is: {code: 12, kind: Other, message: "Cannot allocate memory"}
+                info!("memory map error: {:?}. This may be because vm.max_map_count is not set correctly.", result);
+            }
+            result?
+        };
 
         let new = AppendVec {
             path: path.as_ref().to_path_buf(),
@@ -771,7 +778,7 @@ pub mod tests {
     fn test_new_from_file_crafted_zero_lamport_account() {
         let file = get_append_vec_path("test_append");
         let path = &file.path;
-        let mut av = AppendVec::new(&path, true, 1024 * 1024);
+        let mut av = AppendVec::new(path, true, 1024 * 1024);
         av.set_no_remove_on_drop();
 
         let pubkey = solana_sdk::pubkey::new_rand();
@@ -799,7 +806,7 @@ pub mod tests {
     fn test_new_from_file_crafted_data_len() {
         let file = get_append_vec_path("test_new_from_file_crafted_data_len");
         let path = &file.path;
-        let mut av = AppendVec::new(&path, true, 1024 * 1024);
+        let mut av = AppendVec::new(path, true, 1024 * 1024);
         av.set_no_remove_on_drop();
 
         let crafted_data_len = 1;
@@ -827,7 +834,7 @@ pub mod tests {
     fn test_new_from_file_too_large_data_len() {
         let file = get_append_vec_path("test_new_from_file_too_large_data_len");
         let path = &file.path;
-        let mut av = AppendVec::new(&path, true, 1024 * 1024);
+        let mut av = AppendVec::new(path, true, 1024 * 1024);
         av.set_no_remove_on_drop();
 
         let too_large_data_len = u64::max_value();
@@ -853,7 +860,7 @@ pub mod tests {
     fn test_new_from_file_crafted_executable() {
         let file = get_append_vec_path("test_new_from_crafted_executable");
         let path = &file.path;
-        let mut av = AppendVec::new(&path, true, 1024 * 1024);
+        let mut av = AppendVec::new(path, true, 1024 * 1024);
         av.set_no_remove_on_drop();
         av.append_account_test(&create_test_account(10)).unwrap();
         {
diff --git a/runtime/src/bank.rs b/runtime/src/bank.rs
index 74fd6d6001a88a..3dde42ec494ad6 100644
--- a/runtime/src/bank.rs
+++ b/runtime/src/bank.rs
@@ -35,11 +35,11 @@
 //! already been signed and verified.
 use crate::{
     accounts::{
-        AccountAddressFilter, Accounts, TransactionAccountDeps, TransactionAccounts,
-        TransactionLoadResult, TransactionLoaders,
+        AccountAddressFilter, Accounts, TransactionAccounts, TransactionLoadResult,
+        TransactionLoaders,
     },
-    accounts_db::{ErrorCounters, SnapshotStorages},
-    accounts_index::{AccountSecondaryIndexes, IndexKey},
+    accounts_db::{AccountShrinkThreshold, ErrorCounters, SnapshotStorages},
+    accounts_index::{AccountSecondaryIndexes, IndexKey, ScanResult},
     ancestors::{Ancestors, AncestorsForSerialization},
     blockhash_queue::BlockhashQueue,
     builtins::{self, ActivationType},
@@ -50,6 +50,10 @@ use crate::{
     log_collector::LogCollector,
     message_processor::{ExecuteDetailsTimings, Executors, MessageProcessor},
     rent_collector::RentCollector,
+    stake_weighted_timestamp::{
+        calculate_stake_weighted_timestamp, MaxAllowableDrift, MAX_ALLOWABLE_DRIFT_PERCENTAGE,
+        MAX_ALLOWABLE_DRIFT_PERCENTAGE_FAST, MAX_ALLOWABLE_DRIFT_PERCENTAGE_SLOW,
+    },
     stakes::Stakes,
     status_cache::{SlotDelta, StatusCache},
     system_instruction_processor::{get_system_account_kind, SystemAccountKind},
@@ -67,8 +71,9 @@ use solana_sdk::{
         create_account_shared_data_with_fields as create_account, from_account, Account,
         AccountSharedData, InheritableAccountFields, ReadableAccount, WritableAccount,
     },
+    account_utils::StateMut,
     clock::{
-        Epoch, Slot, SlotCount, SlotIndex, UnixTimestamp, DEFAULT_TICKS_PER_SECOND,
+        BankId, Epoch, Slot, SlotCount, SlotIndex, UnixTimestamp, DEFAULT_TICKS_PER_SECOND,
         INITIAL_RENT_EPOCH, MAX_PROCESSING_AGE, MAX_RECENT_BLOCKHASHES,
         MAX_TRANSACTION_FORWARDING_DELAY, SECONDS_PER_DAY,
     },
@@ -76,7 +81,7 @@ use solana_sdk::{
     epoch_schedule::EpochSchedule,
     feature,
     feature_set::{self, FeatureSet},
-    fee_calculator::{FeeCalculator, FeeConfig, FeeRateGovernor},
+    fee_calculator::{FeeCalculator, FeeRateGovernor},
     genesis_config::{ClusterType, GenesisConfig},
     hard_forks::HardForks,
     hash::{extend_and_hash, hashv, Hash},
@@ -96,19 +101,17 @@ use solana_sdk::{
     signature::{Keypair, Signature},
     slot_hashes::SlotHashes,
     slot_history::SlotHistory,
-    stake_weighted_timestamp::{
-        calculate_stake_weighted_timestamp, MaxAllowableDrift, MAX_ALLOWABLE_DRIFT_PERCENTAGE,
-        MAX_ALLOWABLE_DRIFT_PERCENTAGE_FAST, MAX_ALLOWABLE_DRIFT_PERCENTAGE_SLOW,
-    },
+    stake::{self, state::Delegation},
     system_transaction,
     sysvar::{self},
     timing::years_as_slots,
     transaction::{self, Result, Transaction, TransactionError},
 };
-use solana_stake_program::stake_state::{
-    self, Delegation, InflationPointCalculationEvent, PointValue,
+use solana_stake_program::stake_state::{self, InflationPointCalculationEvent, PointValue};
+use solana_vote_program::{
+    vote_instruction::VoteInstruction,
+    vote_state::{VoteState, VoteStateVersions},
 };
-use solana_vote_program::vote_instruction::VoteInstruction;
 use std::{
     borrow::Cow,
     cell::RefCell,
@@ -143,6 +146,7 @@ impl RentDebits {
                     reward_type: RewardType::Rent,
                     lamports: rent_debit,
                     post_balance,
+                    commission: None, // Not applicable
                 };
                 self.0.push((*account, reward_info));
             } else {
@@ -158,6 +162,8 @@ pub struct ExecuteTimings {
     pub load_us: u64,
     pub execute_us: u64,
     pub store_us: u64,
+    pub total_batches_len: usize,
+    pub num_execute_batches: u64,
     pub details: ExecuteDetailsTimings,
 }
 
@@ -167,15 +173,16 @@ impl ExecuteTimings {
         self.load_us += other.load_us;
         self.execute_us += other.execute_us;
         self.store_us += other.store_us;
+        self.total_batches_len += other.total_batches_len;
+        self.num_execute_batches += other.num_execute_batches;
         self.details.accumulate(&other.details);
     }
 }
 
 type BankStatusCache = StatusCache<Result<()>>;
-#[frozen_abi(digest = "F3Ubz2Sx973pKSYNHTEmj6LY3te1DKUo3fs3cgzQ1uqJ")]
+#[frozen_abi(digest = "HhY4tMP5KZU9fw9VLpMMUikfvNVCLksocZBUKjt8ZjYH")]
 pub type BankSlotDelta = SlotDelta<Result<()>>;
-type TransactionAccountRefCells = Vec<Rc<RefCell<AccountSharedData>>>;
-type TransactionAccountDepRefCells = Vec<(Pubkey, Rc<RefCell<AccountSharedData>>)>;
+type TransactionAccountRefCells = Vec<(Pubkey, Rc<RefCell<AccountSharedData>>)>;
 type TransactionLoaderRefCells = Vec<Vec<(Pubkey, Rc<RefCell<AccountSharedData>>)>>;
 
 // Eager rent collection repeats in cyclic manner.
@@ -416,6 +423,8 @@ pub struct BankRc {
 
     /// Current slot
     pub(crate) slot: Slot,
+
+    pub(crate) bank_id_generator: Arc<AtomicU64>,
 }
 
 #[cfg(RUSTC_WITH_SPECIALIZATION)]
@@ -430,6 +439,7 @@ impl AbiExample for BankRc {
             // AbiExample for Accounts is specially implemented to contain a storage example
             accounts: AbiExample::example(),
             slot: AbiExample::example(),
+            bank_id_generator: Arc::new(AtomicU64::new(0)),
         }
     }
 }
@@ -440,11 +450,15 @@ impl BankRc {
             accounts: Arc::new(accounts),
             parent: RwLock::new(None),
             slot,
+            bank_id_generator: Arc::new(AtomicU64::new(0)),
         }
     }
 
     pub fn get_snapshot_storages(&self, slot: Slot) -> SnapshotStorages {
-        self.accounts.accounts_db.get_snapshot_storages(slot)
+        self.accounts
+            .accounts_db
+            .get_snapshot_storages(slot, None)
+            .0
     }
 }
 
@@ -615,30 +629,32 @@ impl NonceRollbackFull {
     pub fn from_partial(
         partial: NonceRollbackPartial,
         message: &Message,
-        accounts: &[AccountSharedData],
+        accounts: &[(Pubkey, AccountSharedData)],
     ) -> Result<Self> {
         let NonceRollbackPartial {
             nonce_address,
             nonce_account,
         } = partial;
-        let fee_payer = message
-            .account_keys
-            .iter()
-            .enumerate()
-            .find(|(i, k)| message.is_non_loader_key(k, *i))
-            .and_then(|(i, k)| accounts.get(i).cloned().map(|a| (*k, a)));
+        let fee_payer = (0..message.account_keys.len()).find_map(|i| {
+            if let Some((k, a)) = &accounts.get(i) {
+                if message.is_non_loader_key(k, i) {
+                    return Some((k, a));
+                }
+            }
+            None
+        });
         if let Some((fee_pubkey, fee_account)) = fee_payer {
-            if fee_pubkey == nonce_address {
+            if *fee_pubkey == nonce_address {
                 Ok(Self {
                     nonce_address,
-                    nonce_account: fee_account,
+                    nonce_account: fee_account.clone(),
                     fee_account: None,
                 })
             } else {
                 Ok(Self {
                     nonce_address,
                     nonce_account,
-                    fee_account: Some(fee_account),
+                    fee_account: Some(fee_account.clone()),
                 })
             }
         } else {
@@ -819,8 +835,9 @@ pub trait DropCallback: fmt::Debug {
 #[derive(Debug, PartialEq, Serialize, Deserialize, AbiExample, Clone, Copy)]
 pub struct RewardInfo {
     pub reward_type: RewardType,
-    pub lamports: i64,     // Reward amount
-    pub post_balance: u64, // Account balance in lamports after `lamports` was applied
+    pub lamports: i64,          // Reward amount
+    pub post_balance: u64,      // Account balance in lamports after `lamports` was applied
+    pub commission: Option<u8>, // Vote account commission when the reward was credited, only present for voting and staking rewards
 }
 
 #[derive(Debug, Default)]
@@ -906,6 +923,8 @@ pub struct Bank {
     /// Bank slot (i.e. block)
     slot: Slot,
 
+    bank_id: BankId,
+
     /// Bank epoch
     epoch: Epoch,
 
@@ -962,14 +981,10 @@ pub struct Bank {
     /// Protocol-level rewards that were distributed by this bank
     pub rewards: RwLock<Vec<(Pubkey, RewardInfo)>>,
 
-    pub skip_drop: AtomicBool,
-
     pub cluster_type: Option<ClusterType>,
 
     pub lazy_rent_collection: AtomicBool,
 
-    pub no_stake_rewrite: AtomicBool,
-
     // this is temporary field only to remove rewards_pool entirely
     pub rewards_pool_pubkeys: Arc<HashSet<Pubkey>>,
 
@@ -1001,25 +1016,29 @@ impl Default for BlockhashQueue {
 impl Bank {
     pub fn new(genesis_config: &GenesisConfig) -> Self {
         Self::new_with_paths(
-            &genesis_config,
+            genesis_config,
             Vec::new(),
             &[],
             None,
             None,
             AccountSecondaryIndexes::default(),
             false,
+            AccountShrinkThreshold::default(),
+            false,
         )
     }
 
     pub fn new_no_wallclock_throttle(genesis_config: &GenesisConfig) -> Self {
         let mut bank = Self::new_with_paths(
-            &genesis_config,
+            genesis_config,
             Vec::new(),
             &[],
             None,
             None,
             AccountSecondaryIndexes::default(),
             false,
+            AccountShrinkThreshold::default(),
+            false,
         );
 
         bank.ns_per_slot = std::u128::MAX;
@@ -1031,15 +1050,18 @@ impl Bank {
         genesis_config: &GenesisConfig,
         account_indexes: AccountSecondaryIndexes,
         accounts_db_caching_enabled: bool,
+        shrink_ratio: AccountShrinkThreshold,
     ) -> Self {
         Self::new_with_paths(
-            &genesis_config,
+            genesis_config,
             Vec::new(),
             &[],
             None,
             None,
             account_indexes,
             accounts_db_caching_enabled,
+            shrink_ratio,
+            false,
         )
     }
 
@@ -1051,6 +1073,8 @@ impl Bank {
         additional_builtins: Option<&Builtins>,
         account_indexes: AccountSecondaryIndexes,
         accounts_db_caching_enabled: bool,
+        shrink_ratio: AccountShrinkThreshold,
+        debug_do_not_add_builtins: bool,
     ) -> Self {
         let mut bank = Self::default();
         bank.ancestors = Ancestors::from(vec![bank.slot()]);
@@ -1062,9 +1086,14 @@ impl Bank {
             &genesis_config.cluster_type,
             account_indexes,
             accounts_db_caching_enabled,
+            shrink_ratio,
         ));
         bank.process_genesis_config(genesis_config);
-        bank.finish_init(genesis_config, additional_builtins);
+        bank.finish_init(
+            genesis_config,
+            additional_builtins,
+            debug_do_not_add_builtins,
+        );
 
         // Freeze accounts after process_genesis_config creates the initial append vecs
         Arc::get_mut(&mut Arc::get_mut(&mut bank.rc.accounts).unwrap().accounts_db)
@@ -1122,6 +1151,7 @@ impl Bank {
             )),
             parent: RwLock::new(Some(parent.clone())),
             slot,
+            bank_id_generator: parent.rc.bank_id_generator.clone(),
         };
         let src = StatusCacheRc {
             status_cache: parent.src.status_cache.clone(),
@@ -1130,10 +1160,12 @@ impl Bank {
         let fee_rate_governor =
             FeeRateGovernor::new_derived(&parent.fee_rate_governor, parent.signature_count());
 
+        let bank_id = rc.bank_id_generator.fetch_add(1, Relaxed) + 1;
         let mut new = Bank {
             rc,
             src,
             slot,
+            bank_id,
             epoch,
             blockhash_queue: RwLock::new(parent.blockhash_queue.read().unwrap().clone()),
 
@@ -1175,10 +1207,8 @@ impl Bank {
             hard_forks: parent.hard_forks.clone(),
             last_vote_sync: AtomicU64::new(parent.last_vote_sync.load(Relaxed)),
             rewards: RwLock::new(vec![]),
-            skip_drop: AtomicBool::new(false),
             cluster_type: parent.cluster_type,
             lazy_rent_collection: AtomicBool::new(parent.lazy_rent_collection.load(Relaxed)),
-            no_stake_rewrite: AtomicBool::new(parent.no_stake_rewrite.load(Relaxed)),
             rewards_pool_pubkeys: parent.rewards_pool_pubkeys.clone(),
             cached_executors: RwLock::new(
                 (*parent.cached_executors.read().unwrap()).clone_with_epoch(epoch),
@@ -1202,7 +1232,8 @@ impl Bank {
         datapoint_info!(
             "bank-new_from_parent-heights",
             ("slot_height", slot, i64),
-            ("block_height", new.block_height, i64)
+            ("block_height", new.block_height, i64),
+            ("parent_slot_height", parent.slot(), i64),
         );
 
         let mut ancestors = Vec::with_capacity(1 + new.parents().len());
@@ -1215,14 +1246,10 @@ impl Bank {
         // Following code may touch AccountsDb, requiring proper ancestors
         let parent_epoch = parent.epoch();
         if parent_epoch < new.epoch() {
-            new.apply_feature_activations(false);
+            new.apply_feature_activations(false, false);
         }
 
-        let cloned = new
-            .stakes
-            .read()
-            .unwrap()
-            .clone_with_epoch(epoch, new.stake_program_v2_enabled());
+        let cloned = new.stakes.read().unwrap().clone_with_epoch(epoch);
         *new.stakes.write().unwrap() = cloned;
 
         let leader_schedule_epoch = epoch_schedule.get_leader_schedule_epoch(slot);
@@ -1259,7 +1286,7 @@ impl Bank {
     pub fn warp_from_parent(parent: &Arc<Bank>, collector_id: &Pubkey, slot: Slot) -> Self {
         let parent_timestamp = parent.clock().unix_timestamp;
         let mut new = Bank::new_from_parent(parent, collector_id, slot);
-        new.apply_feature_activations(true);
+        new.apply_feature_activations(true, false);
         new.update_epoch_stakes(new.epoch_schedule().get_epoch(slot));
         new.tick_height.store(new.max_tick_height(), Relaxed);
 
@@ -1285,6 +1312,7 @@ impl Bank {
         fields: BankFieldsToDeserialize,
         debug_keys: Option<Arc<HashSet<Pubkey>>>,
         additional_builtins: Option<&Builtins>,
+        debug_do_not_add_builtins: bool,
     ) -> Self {
         fn new<T: Default>() -> T {
             T::default()
@@ -1313,6 +1341,7 @@ impl Bank {
             slots_per_year: fields.slots_per_year,
             unused: genesis_config.unused,
             slot: fields.slot,
+            bank_id: 0,
             epoch: fields.epoch,
             block_height: fields.block_height,
             collector_id: fields.collector_id,
@@ -1332,10 +1361,8 @@ impl Bank {
             feature_builtins: new(),
             last_vote_sync: new(),
             rewards: new(),
-            skip_drop: new(),
             cluster_type: Some(genesis_config.cluster_type),
             lazy_rent_collection: new(),
-            no_stake_rewrite: new(),
             rewards_pool_pubkeys: new(),
             cached_executors: RwLock::new(CowCachedExecutors::new(Arc::new(RwLock::new(
                 CachedExecutors::new(MAX_CACHED_EXECUTORS, fields.epoch),
@@ -1347,7 +1374,11 @@ impl Bank {
             drop_callback: RwLock::new(OptionalDropCallback(None)),
             freeze_started: AtomicBool::new(fields.hash != Hash::default()),
         };
-        bank.finish_init(genesis_config, additional_builtins);
+        bank.finish_init(
+            genesis_config,
+            additional_builtins,
+            debug_do_not_add_builtins,
+        );
 
         // Sanity assertions between bank snapshot and genesis config
         // Consider removing from serializable bank state
@@ -1428,10 +1459,18 @@ impl Bank {
         &self.collector_id
     }
 
+    pub fn genesis_creation_time(&self) -> UnixTimestamp {
+        self.genesis_creation_time
+    }
+
     pub fn slot(&self) -> Slot {
         self.slot
     }
 
+    pub fn bank_id(&self) -> BankId {
+        self.bank_id
+    }
+
     pub fn epoch(&self) -> Epoch {
         self.epoch
     }
@@ -1480,8 +1519,33 @@ impl Bank {
     where
         F: Fn(&Option<AccountSharedData>) -> AccountSharedData,
     {
-        let old_account = self.get_sysvar_account_with_fixed_root(pubkey);
-        let new_account = updater(&old_account);
+        let old_account = if !self.rent_for_sysvars() {
+            // This old behavior is being retired for simpler reasoning for the benefits of all.
+            // Specifically, get_sysvar_account_with_fixed_root() doesn't work nicely with eager
+            // rent collection, which becomes significant for sysvars after rent_for_sysvars
+            // activation. That's because get_sysvar_account_with_fixed_root() invocations by both
+            // update_slot_history() and update_recent_blockhashes() ignores any updates
+            // by eager rent collection in this slot.
+            // Also, it turned out that get_sysvar_account_with_fixed_root()'s special
+            // behavior (idempotent) isn't needed to begin with, because we're fairly certain that
+            // we don't call new_from_parent() with same child slot multiple times in the
+            // production code (except after proper handling of duplicate slot dumping)...
+            self.get_sysvar_account_with_fixed_root(pubkey)
+        } else {
+            self.get_account_with_fixed_root(pubkey)
+        };
+        let mut new_account = updater(&old_account);
+
+        if self.rent_for_sysvars() {
+            // When new sysvar comes into existence (with RENT_UNADJUSTED_INITIAL_BALANCE lamports),
+            // this code ensures that the sysvar's balance is adjusted to be rent-exempt.
+            // Note that all of existing sysvar balances must be adjusted immediately (i.e. reset) upon
+            // the `rent_for_sysvars` feature activation (ref: reset_all_sysvar_balances).
+            //
+            // More generally, this code always re-calculates for possible sysvar data size change,
+            // although there is no such sysvars currently.
+            self.adjust_sysvar_balance_for_rent(&mut new_account);
+        }
 
         self.store_account_and_update_capitalization(pubkey, &new_account);
     }
@@ -1490,9 +1554,23 @@ impl Bank {
         &self,
         old_account: &Option<AccountSharedData>,
     ) -> InheritableAccountFields {
+        const RENT_UNADJUSTED_INITIAL_BALANCE: u64 = 1;
+
         (
-            old_account.as_ref().map(|a| a.lamports()).unwrap_or(1),
-            INITIAL_RENT_EPOCH,
+            old_account
+                .as_ref()
+                .map(|a| a.lamports())
+                .unwrap_or(RENT_UNADJUSTED_INITIAL_BALANCE),
+            if !self.rent_for_sysvars() {
+                INITIAL_RENT_EPOCH
+            } else {
+                // start to inherit rent_epoch updated by rent collection to be consistent with
+                // other normal accounts
+                old_account
+                    .as_ref()
+                    .map(|a| a.rent_epoch())
+                    .unwrap_or(INITIAL_RENT_EPOCH)
+            },
         )
     }
 
@@ -1677,7 +1755,7 @@ impl Bank {
         // if I'm the first Bank in an epoch, ensure stake_history is updated
         self.update_sysvar_account(&sysvar::stake_history::id(), |account| {
             create_account::<sysvar::stake_history::StakeHistory>(
-                &self.stakes.read().unwrap().history(),
+                self.stakes.read().unwrap().history(),
                 self.inherit_specially_retained_account_fields(account),
             )
         });
@@ -1690,41 +1768,6 @@ impl Bank {
         self.epoch_schedule.get_slots_in_epoch(prev_epoch) as f64 / self.slots_per_year
     }
 
-    fn rewrite_stakes(&self) -> (usize, usize) {
-        let mut examined_count = 0;
-        let mut rewritten_count = 0;
-        self.cloned_stake_delegations()
-            .into_iter()
-            .for_each(|(stake_pubkey, _delegation)| {
-                examined_count += 1;
-                if let Some(mut stake_account) = self.get_account_with_fixed_root(&stake_pubkey) {
-                    if let Ok(result) =
-                        stake_state::rewrite_stakes(&mut stake_account, &self.rent_collector.rent)
-                    {
-                        self.store_account(&stake_pubkey, &stake_account);
-                        let message = format!("rewrote stake: {}, {:?}", stake_pubkey, result);
-                        info!("{}", message);
-                        datapoint_info!("stake_info", ("info", message, String));
-                        rewritten_count += 1;
-                    }
-                }
-            });
-
-        info!(
-            "bank (slot: {}): rewrite_stakes: {} accounts rewritten / {} accounts examined",
-            self.slot(),
-            rewritten_count,
-            examined_count,
-        );
-        datapoint_info!(
-            "rewrite-stakes",
-            ("examined_count", examined_count, i64),
-            ("rewritten_count", rewritten_count, i64)
-        );
-
-        (examined_count, rewritten_count)
-    }
-
     // Calculates the starting-slot for inflation from the activation slot.
     // This method assumes that `pico_inflation` will be enabled before `full_inflation`, giving
     // precedence to the latter. However, since `pico_inflation` is fixed-rate Inflation, should
@@ -1735,7 +1778,7 @@ impl Bank {
             .feature_set
             .full_inflation_features_enabled()
             .iter()
-            .filter_map(|id| self.feature_set.activated_slot(&id))
+            .filter_map(|id| self.feature_set.activated_slot(id))
             .collect::<Vec<_>>();
         slots.sort_unstable();
         slots.get(0).cloned().unwrap_or_else(|| {
@@ -1791,12 +1834,8 @@ impl Bank {
 
         let old_vote_balance_and_staked = self.stakes.read().unwrap().vote_balance_and_staked();
 
-        let validator_point_value = self.pay_validator_rewards(
-            prev_epoch,
-            validator_rewards,
-            reward_calc_tracer,
-            self.stake_program_v2_enabled(),
-        );
+        let validator_point_value =
+            self.pay_validator_rewards(prev_epoch, validator_rewards, reward_calc_tracer);
 
         if !self
             .feature_set
@@ -1882,7 +1921,7 @@ impl Bank {
             .iter()
             .for_each(|(stake_pubkey, delegation)| {
                 match (
-                    self.get_account_with_fixed_root(&stake_pubkey),
+                    self.get_account_with_fixed_root(stake_pubkey),
                     self.get_account_with_fixed_root(&delegation.voter_pubkey),
                 ) {
                     (Some(stake_account), Some(vote_account)) => {
@@ -1899,7 +1938,7 @@ impl Bank {
                         if self
                             .feature_set
                             .is_active(&feature_set::filter_stake_delegation_accounts::id())
-                            && (stake_account.owner() != &solana_stake_program::id()
+                            && (stake_account.owner() != &stake::program::id()
                                 || vote_account.owner() != &solana_vote_program::id())
                         {
                             datapoint_warn!(
@@ -1933,7 +1972,6 @@ impl Bank {
         rewarded_epoch: Epoch,
         rewards: u64,
         reward_calc_tracer: &mut Option<impl FnMut(&RewardCalculationEvent)>,
-        fix_stake_deactivate: bool,
     ) -> f64 {
         let stake_history = self.stakes.read().unwrap().history().clone();
 
@@ -1947,13 +1985,8 @@ impl Bank {
                     .map(move |(_stake_pubkey, stake_account)| (stake_account, vote_account))
             })
             .map(|(stake_account, vote_account)| {
-                stake_state::calculate_points(
-                    &stake_account,
-                    &vote_account,
-                    Some(&stake_history),
-                    fix_stake_deactivate,
-                )
-                .unwrap_or(0)
+                stake_state::calculate_points(stake_account, vote_account, Some(&stake_history))
+                    .unwrap_or(0)
             })
             .sum();
 
@@ -1968,6 +2001,17 @@ impl Bank {
         for (vote_pubkey, (stake_group, vote_account)) in stake_delegation_accounts.iter_mut() {
             let mut vote_account_changed = false;
             let voters_account_pre_balance = vote_account.lamports();
+            let vote_state: VoteState = match StateMut::<VoteStateVersions>::state(vote_account) {
+                Ok(vote_state) => vote_state.convert_to_current(),
+                Err(err) => {
+                    debug!(
+                        "failed to deserialize vote account {}: {}",
+                        vote_pubkey, err
+                    );
+                    continue;
+                }
+            };
+            let commission = Some(vote_state.commission);
 
             for (stake_pubkey, stake_account) in stake_group.iter_mut() {
                 // curry closure to add the contextual stake_pubkey
@@ -1982,13 +2026,13 @@ impl Bank {
                     rewarded_epoch,
                     stake_account,
                     vote_account,
+                    &vote_state,
                     &point_value,
                     Some(&stake_history),
                     &mut reward_calc_tracer.as_mut(),
-                    fix_stake_deactivate,
                 );
                 if let Ok((stakers_reward, _voters_reward)) = redeemed {
-                    self.store_account(&stake_pubkey, &stake_account);
+                    self.store_account(stake_pubkey, stake_account);
                     vote_account_changed = true;
 
                     if stakers_reward > 0 {
@@ -1998,6 +2042,7 @@ impl Bank {
                                 reward_type: RewardType::Staking,
                                 lamports: stakers_reward as i64,
                                 post_balance: stake_account.lamports(),
+                                commission,
                             },
                         ));
                     }
@@ -2019,10 +2064,11 @@ impl Bank {
                             reward_type: RewardType::Voting,
                             lamports,
                             post_balance,
+                            commission,
                         },
                     ));
                 }
-                self.store_account(&vote_pubkey, &vote_account);
+                self.store_account(vote_pubkey, vote_account);
             }
         }
         self.rewards.write().unwrap().append(&mut rewards);
@@ -2130,6 +2176,7 @@ impl Bank {
                                 reward_type: RewardType::Fee,
                                 lamports: deposit as i64,
                                 post_balance,
+                                commission: None,
                             },
                         ));
                     }
@@ -2265,7 +2312,7 @@ impl Bank {
         self.fee_calculator = self.fee_rate_governor.create_fee_calculator();
 
         for (pubkey, account) in genesis_config.accounts.iter() {
-            if self.get_account(&pubkey).is_some() {
+            if self.get_account(pubkey).is_some() {
                 panic!("{} repeated in genesis config", pubkey);
             }
             self.store_account(pubkey, &AccountSharedData::from(account.clone()));
@@ -2276,7 +2323,7 @@ impl Bank {
         self.update_fees();
 
         for (pubkey, account) in genesis_config.rewards_pools.iter() {
-            if self.get_account(&pubkey).is_some() {
+            if self.get_account(pubkey).is_some() {
                 panic!("{} repeated in genesis config", pubkey);
             }
             self.store_account(pubkey, &AccountSharedData::from(account.clone()));
@@ -2323,11 +2370,11 @@ impl Bank {
     // NOTE: must hold idempotent for the same set of arguments
     pub fn add_native_program(&self, name: &str, program_id: &Pubkey, must_replace: bool) {
         let existing_genuine_program =
-            if let Some(mut account) = self.get_account_with_fixed_root(&program_id) {
+            if let Some(mut account) = self.get_account_with_fixed_root(program_id) {
                 // it's very unlikely to be squatted at program_id as non-system account because of burden to
                 // find victim's pubkey/hash. So, when account.owner is indeed native_loader's, it's
                 // safe to assume it's a genuine program.
-                if native_loader::check_id(&account.owner()) {
+                if native_loader::check_id(account.owner()) {
                     Some(account)
                 } else {
                     // malicious account is pre-occupying at program_id
@@ -2338,7 +2385,7 @@ impl Bank {
                     // Resetting account balance to 0 is needed to really purge from AccountsDb and
                     // flush the Stakes cache
                     account.set_lamports(0);
-                    self.store_account(&program_id, &account);
+                    self.store_account(program_id, &account);
                     None
                 }
             } else {
@@ -2354,7 +2401,7 @@ impl Bank {
                     name, program_id
                 ),
                 Some(account) => {
-                    if *name == String::from_utf8_lossy(&account.data()) {
+                    if *name == String::from_utf8_lossy(account.data()) {
                         // nop; it seems that already AccountsDb is updated.
                         return;
                     }
@@ -2394,7 +2441,7 @@ impl Bank {
             name,
             self.inherit_specially_retained_account_fields(&existing_genuine_program),
         );
-        self.store_account_and_update_capitalization(&program_id, &account);
+        self.store_account_and_update_capitalization(program_id, &account);
 
         debug!("Added native program {} under {:?}", name, program_id);
     }
@@ -2437,7 +2484,10 @@ impl Bank {
         &self.fee_rate_governor
     }
 
-    // DEPRECATED
+    #[deprecated(
+        since = "1.6.11",
+        note = "Please use `get_blockhash_last_valid_block_height`"
+    )]
     pub fn get_blockhash_last_valid_slot(&self, blockhash: &Hash) -> Option<Slot> {
         let blockhash_queue = self.blockhash_queue.read().unwrap();
         // This calculation will need to be updated to consider epoch boundaries if BlockhashQueue
@@ -2499,15 +2549,20 @@ impl Bank {
         for (hashed_tx, (res, _nonce_rollback)) in hashed_txs.iter().zip(res) {
             let tx = hashed_tx.transaction();
             if Self::can_commit(res) && !tx.signatures.is_empty() {
+                // Add the message hash to the status cache to ensure that this message
+                // won't be processed again with a different signature.
                 status_cache.insert(
                     &tx.message().recent_blockhash,
-                    &tx.signatures[0],
+                    &hashed_tx.message_hash,
                     self.slot(),
                     res.clone(),
                 );
+                // Add the transaction signature to the status cache so that transaction status
+                // can be queried by transaction signature over RPC. In the future, this should
+                // only be added for API nodes because voting validators don't need to do this.
                 status_cache.insert(
                     &tx.message().recent_blockhash,
-                    &hashed_tx.message_hash,
+                    &tx.signatures[0],
                     self.slot(),
                     res.clone(),
                 );
@@ -2549,41 +2604,45 @@ impl Bank {
         tick_height % self.ticks_per_slot == 0
     }
 
-    pub fn demote_sysvar_write_locks(&self) -> bool {
-        self.feature_set
-            .is_active(&feature_set::demote_sysvar_write_locks::id())
-    }
-
     pub fn prepare_batch<'a, 'b>(
         &'a self,
         txs: impl Iterator<Item = &'b Transaction>,
     ) -> TransactionBatch<'a, 'b> {
         let hashed_txs: Vec<HashedTransaction> = txs.map(HashedTransaction::from).collect();
-        let lock_results = self.rc.accounts.lock_accounts(
-            hashed_txs.as_transactions_iter(),
-            self.demote_sysvar_write_locks(),
-        );
-        TransactionBatch::new(lock_results, &self, Cow::Owned(hashed_txs))
+        let lock_results = self
+            .rc
+            .accounts
+            .lock_accounts(hashed_txs.as_transactions_iter());
+        TransactionBatch::new(lock_results, self, Cow::Owned(hashed_txs))
     }
 
     pub fn prepare_hashed_batch<'a, 'b>(
         &'a self,
         hashed_txs: &'b [HashedTransaction],
     ) -> TransactionBatch<'a, 'b> {
-        let lock_results = self.rc.accounts.lock_accounts(
-            hashed_txs.as_transactions_iter(),
-            self.demote_sysvar_write_locks(),
-        );
-        TransactionBatch::new(lock_results, &self, Cow::Borrowed(hashed_txs))
+        let lock_results = self
+            .rc
+            .accounts
+            .lock_accounts(hashed_txs.as_transactions_iter());
+        TransactionBatch::new(lock_results, self, Cow::Borrowed(hashed_txs))
     }
 
     pub(crate) fn prepare_simulation_batch<'a, 'b>(
         &'a self,
         tx: &'b Transaction,
     ) -> TransactionBatch<'a, 'b> {
+        let check_transaction = |tx: &Transaction| -> Result<()> {
+            tx.sanitize().map_err(TransactionError::from)?;
+            if Accounts::has_duplicates(&tx.message.account_keys) {
+                Err(TransactionError::AccountLoadedTwice)
+            } else {
+                Ok(())
+            }
+        };
+
         let mut batch = TransactionBatch::new(
-            vec![tx.sanitize().map_err(|e| e.into())],
-            &self,
+            vec![check_transaction(tx)],
+            self,
             Cow::Owned(vec![HashedTransaction::from(tx)]),
         );
         batch.needs_unlock = false;
@@ -2594,15 +2653,19 @@ impl Bank {
     pub fn simulate_transaction(
         &self,
         transaction: &Transaction,
-    ) -> (Result<()>, TransactionLogMessages, Vec<AccountSharedData>) {
+    ) -> (
+        Result<()>,
+        TransactionLogMessages,
+        Vec<(Pubkey, AccountSharedData)>,
+    ) {
         assert!(self.is_frozen(), "simulation bank must be frozen");
 
-        let batch = self.prepare_simulation_batch(&transaction);
+        let batch = self.prepare_simulation_batch(transaction);
 
         let mut timings = ExecuteTimings::default();
 
         let (
-            loaded_accounts,
+            loaded_txs,
             executed,
             _inner_instructions,
             log_messages,
@@ -2621,10 +2684,8 @@ impl Bank {
         );
 
         let transaction_result = executed[0].0.clone().map(|_| ());
-        let log_messages = log_messages
-            .get(0)
-            .map_or(vec![], |messages| messages.to_vec());
-        let post_transaction_accounts = loaded_accounts
+        let log_messages = log_messages.get(0).cloned().flatten().unwrap_or_default();
+        let post_transaction_accounts = loaded_txs
             .into_iter()
             .next()
             .unwrap()
@@ -2641,16 +2702,14 @@ impl Bank {
     pub fn unlock_accounts(&self, batch: &mut TransactionBatch) {
         if batch.needs_unlock {
             batch.needs_unlock = false;
-            self.rc.accounts.unlock_accounts(
-                batch.transactions_iter(),
-                batch.lock_results(),
-                self.demote_sysvar_write_locks(),
-            )
+            self.rc
+                .accounts
+                .unlock_accounts(batch.transactions_iter(), batch.lock_results())
         }
     }
 
-    pub fn remove_unrooted_slot(&self, slot: Slot) {
-        self.rc.accounts.accounts_db.remove_unrooted_slot(slot)
+    pub fn remove_unrooted_slots(&self, slots: &[(Slot, BankId)]) {
+        self.rc.accounts.accounts_db.remove_unrooted_slots(slots)
     }
 
     pub fn set_shrink_paths(&self, paths: Vec<PathBuf>) {
@@ -2672,7 +2731,7 @@ impl Bank {
                     let hash_age = hash_queue.check_hash_age(&message.recent_blockhash, max_age);
                     if hash_age == Some(true) {
                         (Ok(()), None)
-                    } else if let Some((pubkey, acc)) = self.check_tx_durable_nonce(&tx) {
+                    } else if let Some((pubkey, acc)) = self.check_tx_durable_nonce(tx) {
                         (Ok(()), Some(NonceRollbackPartial::new(pubkey, acc)))
                     } else if hash_age == Some(false) {
                         error_counters.blockhash_too_old += 1;
@@ -2691,18 +2750,11 @@ impl Bank {
         &self,
         hashed_tx: &HashedTransaction,
         status_cache: &StatusCache<Result<()>>,
-        check_duplicates_by_hash_enabled: bool,
     ) -> bool {
-        let tx = hashed_tx.transaction();
-        let status_cache_key: Option<&[u8]> = if check_duplicates_by_hash_enabled {
-            Some(hashed_tx.message_hash.as_ref())
-        } else {
-            tx.signatures.get(0).map(|sig0| sig0.as_ref())
-        };
-        status_cache_key
-            .and_then(|key| {
-                status_cache.get_status(key, &tx.message().recent_blockhash, &self.ancestors)
-            })
+        let key = &hashed_tx.message_hash;
+        let transaction_blockhash = &hashed_tx.transaction().message().recent_blockhash;
+        status_cache
+            .get_status(key, transaction_blockhash, &self.ancestors)
             .is_some()
     }
 
@@ -2713,18 +2765,11 @@ impl Bank {
         error_counters: &mut ErrorCounters,
     ) -> Vec<TransactionCheckResult> {
         let rcache = self.src.status_cache.read().unwrap();
-        let check_duplicates_by_hash_enabled = self.check_duplicates_by_hash_enabled();
         hashed_txs
             .iter()
             .zip(lock_results)
             .map(|(hashed_tx, (lock_res, nonce_rollback))| {
-                if lock_res.is_ok()
-                    && self.is_tx_already_processed(
-                        hashed_tx,
-                        &rcache,
-                        check_duplicates_by_hash_enabled,
-                    )
-                {
+                if lock_res.is_ok() && self.is_tx_already_processed(hashed_tx, &rcache) {
                     error_counters.already_processed += 1;
                     return (Err(TransactionError::AlreadyProcessed), None);
                 }
@@ -2763,10 +2808,10 @@ impl Bank {
     }
 
     pub fn check_tx_durable_nonce(&self, tx: &Transaction) -> Option<(Pubkey, AccountSharedData)> {
-        transaction::uses_durable_nonce(&tx)
-            .and_then(|nonce_ix| transaction::get_nonce_pubkey_from_instruction(&nonce_ix, &tx))
+        transaction::uses_durable_nonce(tx)
+            .and_then(|nonce_ix| transaction::get_nonce_pubkey_from_instruction(nonce_ix, tx))
             .and_then(|nonce_pubkey| {
-                self.get_account(&nonce_pubkey)
+                self.get_account(nonce_pubkey)
                     .map(|acc| (*nonce_pubkey, acc))
             })
             .filter(|(_pubkey, nonce_account)| {
@@ -2905,20 +2950,11 @@ impl Bank {
     /// ownership by draining the source
     fn accounts_to_refcells(
         accounts: &mut TransactionAccounts,
-        account_deps: &mut TransactionAccountDeps,
         loaders: &mut TransactionLoaders,
-    ) -> (
-        TransactionAccountRefCells,
-        TransactionAccountDepRefCells,
-        TransactionLoaderRefCells,
-    ) {
+    ) -> (TransactionAccountRefCells, TransactionLoaderRefCells) {
         let account_refcells: Vec<_> = accounts
             .drain(..)
-            .map(|account| Rc::new(RefCell::new(account)))
-            .collect();
-        let account_dep_refcells: Vec<_> = account_deps
-            .drain(..)
-            .map(|(pubkey, account_dep)| (pubkey, Rc::new(RefCell::new(account_dep))))
+            .map(|(pubkey, account)| (pubkey, Rc::new(RefCell::new(account))))
             .collect();
         let loader_refcells: Vec<Vec<_>> = loaders
             .iter_mut()
@@ -2928,7 +2964,7 @@ impl Bank {
                     .collect()
             })
             .collect();
-        (account_refcells, account_dep_refcells, loader_refcells)
+        (account_refcells, loader_refcells)
     }
 
     /// Converts back from RefCell<AccountSharedData> to AccountSharedData, this involves moving
@@ -2939,12 +2975,13 @@ impl Bank {
         mut account_refcells: TransactionAccountRefCells,
         loader_refcells: TransactionLoaderRefCells,
     ) -> std::result::Result<(), TransactionError> {
-        for account_refcell in account_refcells.drain(..) {
-            accounts.push(
+        for (pubkey, account_refcell) in account_refcells.drain(..) {
+            accounts.push((
+                pubkey,
                 Rc::try_unwrap(account_refcell)
                     .map_err(|_| TransactionError::AccountBorrowOutstanding)?
                     .into_inner(),
-            )
+            ))
         }
         for (ls, mut lrcs) in loaders.iter_mut().zip(loader_refcells) {
             for (pubkey, lrc) in lrcs.drain(..) {
@@ -2960,17 +2997,22 @@ impl Bank {
         Ok(())
     }
 
+    fn collect_log_messages(
+        log_collector: Option<Rc<LogCollector>>,
+    ) -> Option<TransactionLogMessages> {
+        log_collector.and_then(|log_collector| Rc::try_unwrap(log_collector).map(Into::into).ok())
+    }
+
     fn compile_recorded_instructions(
-        inner_instructions: &mut Vec<Option<InnerInstructionsList>>,
         instruction_recorders: Option<Vec<InstructionRecorder>>,
         message: &Message,
-    ) {
-        inner_instructions.push(instruction_recorders.map(|instruction_recorders| {
+    ) -> Option<InnerInstructionsList> {
+        instruction_recorders.map(|instruction_recorders| {
             instruction_recorders
                 .into_iter()
                 .map(|r| r.compile_instructions(message))
                 .collect()
-        }));
+        })
     }
 
     /// Get any cached executors needed by the transaction
@@ -3037,7 +3079,7 @@ impl Bank {
         Vec<TransactionLoadResult>,
         Vec<TransactionExecutionResult>,
         Vec<Option<InnerInstructionsList>>,
-        Vec<TransactionLogMessages>,
+        Vec<Option<TransactionLogMessages>>,
         Vec<usize>,
         u64,
         u64,
@@ -3071,7 +3113,7 @@ impl Bank {
         check_time.stop();
 
         let mut load_time = Measure::start("accounts_load");
-        let mut loaded_accounts = self.rc.accounts.load_accounts(
+        let mut loaded_txs = self.rc.accounts.load_accounts(
             &self.ancestors,
             hashed_txs.as_transactions_iter(),
             check_results,
@@ -3086,26 +3128,29 @@ impl Bank {
         let mut signature_count: u64 = 0;
         let mut inner_instructions: Vec<Option<InnerInstructionsList>> =
             Vec::with_capacity(hashed_txs.len());
-        let mut transaction_log_messages = Vec::with_capacity(hashed_txs.len());
+        let mut transaction_log_messages: Vec<Option<Vec<String>>> =
+            Vec::with_capacity(hashed_txs.len());
         let bpf_compute_budget = self
             .bpf_compute_budget
             .unwrap_or_else(BpfComputeBudget::new);
 
-        let executed: Vec<TransactionExecutionResult> = loaded_accounts
+        let executed: Vec<TransactionExecutionResult> = loaded_txs
             .iter_mut()
             .zip(hashed_txs.as_transactions_iter())
             .map(|(accs, tx)| match accs {
-                (Err(e), _nonce_rollback) => (Err(e.clone()), None),
+                (Err(e), _nonce_rollback) => {
+                    inner_instructions.push(None);
+                    transaction_log_messages.push(None);
+                    (Err(e.clone()), None)
+                }
                 (Ok(loaded_transaction), nonce_rollback) => {
                     signature_count += u64::from(tx.message().header.num_required_signatures);
                     let executors = self.get_executors(&tx.message, &loaded_transaction.loaders);
 
-                    let (account_refcells, account_dep_refcells, loader_refcells) =
-                        Self::accounts_to_refcells(
-                            &mut loaded_transaction.accounts,
-                            &mut loaded_transaction.account_deps,
-                            &mut loaded_transaction.loaders,
-                        );
+                    let (account_refcells, loader_refcells) = Self::accounts_to_refcells(
+                        &mut loaded_transaction.accounts,
+                        &mut loaded_transaction.loaders,
+                    );
 
                     let instruction_recorders = if enable_cpi_recording {
                         let ix_count = tx.message.instructions.len();
@@ -3126,7 +3171,6 @@ impl Bank {
                         tx.message(),
                         &loader_refcells,
                         &account_refcells,
-                        &account_dep_refcells,
                         &self.rent_collector,
                         log_collector.clone(),
                         executors.clone(),
@@ -3138,20 +3182,11 @@ impl Bank {
                         &self.ancestors,
                     );
 
-                    if enable_log_recording {
-                        let log_messages: TransactionLogMessages =
-                            Rc::try_unwrap(log_collector.unwrap_or_default())
-                                .unwrap_or_default()
-                                .into();
-
-                        transaction_log_messages.push(log_messages);
-                    }
-
-                    Self::compile_recorded_instructions(
-                        &mut inner_instructions,
+                    transaction_log_messages.push(Self::collect_log_messages(log_collector));
+                    inner_instructions.push(Self::compile_recorded_instructions(
                         instruction_recorders,
                         &tx.message,
-                    );
+                    ));
 
                     if let Err(e) = Self::refcells_to_accounts(
                         &mut loaded_transaction.accounts,
@@ -3237,7 +3272,6 @@ impl Bank {
                 }
 
                 let is_vote = is_simple_vote_transaction(tx);
-
                 let store = match transaction_log_collector_config.filter {
                     TransactionLogCollectorFilter::All => !is_vote || mentioned_address,
                     TransactionLogCollectorFilter::AllWithVotes => true,
@@ -3246,12 +3280,14 @@ impl Bank {
                 };
 
                 if store {
-                    transaction_log_collector.logs.push(TransactionLogInfo {
-                        signature: tx.signatures[0],
-                        result: r.clone(),
-                        is_vote,
-                        log_messages: transaction_log_messages.get(i).cloned().unwrap_or_default(),
-                    });
+                    if let Some(log_messages) = transaction_log_messages.get(i).cloned().flatten() {
+                        transaction_log_collector.logs.push(TransactionLogInfo {
+                            signature: tx.signatures[0],
+                            result: r.clone(),
+                            is_vote,
+                            log_messages,
+                        });
+                    }
                 }
             }
 
@@ -3273,7 +3309,7 @@ impl Bank {
         }
         Self::update_error_counters(&error_counters);
         (
-            loaded_accounts,
+            loaded_txs,
             executed,
             inner_instructions,
             transaction_log_messages,
@@ -3291,10 +3327,6 @@ impl Bank {
         let hash_queue = self.blockhash_queue.read().unwrap();
         let mut fees = 0;
 
-        let fee_config = FeeConfig {
-            secp256k1_program_enabled: self.secp256k1_program_enabled(),
-        };
-
         let results = txs
             .zip(executed)
             .map(|(tx, (res, nonce_rollback))| {
@@ -3312,7 +3344,7 @@ impl Bank {
                     });
                 let fee_calculator = fee_calculator.ok_or(TransactionError::BlockhashNotFound)?;
 
-                let fee = fee_calculator.calculate_fee_with_config(tx.message(), &fee_config);
+                let fee = fee_calculator.calculate_fee(tx.message());
 
                 let message = tx.message();
                 match *res {
@@ -3345,7 +3377,7 @@ impl Bank {
     pub fn commit_transactions(
         &self,
         hashed_txs: &[HashedTransaction],
-        loaded_accounts: &mut [TransactionLoadResult],
+        loaded_txs: &mut [TransactionLoadResult],
         executed: &[TransactionExecutionResult],
         tx_count: u64,
         signature_count: u64,
@@ -3384,19 +3416,17 @@ impl Bank {
             self.slot(),
             hashed_txs.as_transactions_iter(),
             executed,
-            loaded_accounts,
+            loaded_txs,
             &self.rent_collector,
             &self.last_blockhash_with_fee_calculator(),
             self.fix_recent_blockhashes_sysvar_delay(),
-            self.demote_sysvar_write_locks(),
+            self.rent_for_sysvars(),
+            self.merge_nonce_error_into_system_error(),
         );
-        let rent_debits = self.collect_rent(executed, loaded_accounts);
+        let rent_debits = self.collect_rent(executed, loaded_txs);
 
-        let overwritten_vote_accounts = self.update_cached_accounts(
-            hashed_txs.as_transactions_iter(),
-            executed,
-            loaded_accounts,
-        );
+        let overwritten_vote_accounts =
+            self.update_cached_accounts(hashed_txs.as_transactions_iter(), executed, loaded_txs);
 
         // once committed there is no way to unroll
         write_time.stop();
@@ -3406,7 +3436,7 @@ impl Bank {
             hashed_txs.len()
         );
         timings.store_us += write_time.as_us();
-        self.update_transaction_statuses(hashed_txs, &executed);
+        self.update_transaction_statuses(hashed_txs, executed);
         let fee_collection_results =
             self.filter_program_errors_and_collect_fee(hashed_txs.as_transactions_iter(), executed);
 
@@ -3534,6 +3564,7 @@ impl Bank {
                                 reward_type: RewardType::Rent,
                                 lamports: rent_to_be_paid as i64,
                                 post_balance: account.lamports(),
+                                commission: None,
                             },
                         ));
                     }
@@ -3576,11 +3607,11 @@ impl Bank {
     fn collect_rent(
         &self,
         res: &[TransactionExecutionResult],
-        loaded_accounts: &mut [TransactionLoadResult],
+        loaded_txs: &mut [TransactionLoadResult],
     ) -> Vec<RentDebits> {
         let mut collected_rent: u64 = 0;
-        let mut rent_debits: Vec<RentDebits> = Vec::with_capacity(loaded_accounts.len());
-        for (i, (raccs, _nonce_rollback)) in loaded_accounts.iter_mut().enumerate() {
+        let mut rent_debits: Vec<RentDebits> = Vec::with_capacity(loaded_txs.len());
+        for (i, (raccs, _nonce_rollback)) in loaded_txs.iter_mut().enumerate() {
             let (res, _nonce_rollback) = &res[i];
             if res.is_err() || raccs.is_err() {
                 rent_debits.push(RentDebits::default());
@@ -3622,7 +3653,6 @@ impl Bank {
     #[cfg(test)]
     fn restore_old_behavior_for_fragile_tests(&self) {
         self.lazy_rent_collection.store(true, Relaxed);
-        self.no_stake_rewrite.store(true, Relaxed);
     }
 
     fn enable_eager_rent_collection(&self) -> bool {
@@ -3663,12 +3693,15 @@ impl Bank {
         let account_count = accounts.len();
 
         // parallelize?
+        let rent_for_sysvars = self.rent_for_sysvars();
         let mut total_rent = 0;
         let mut rent_debits = RentDebits::default();
         for (pubkey, mut account) in accounts {
-            let rent = self
-                .rent_collector
-                .collect_from_existing_account(&pubkey, &mut account);
+            let rent = self.rent_collector.collect_from_existing_account(
+                &pubkey,
+                &mut account,
+                rent_for_sysvars,
+            );
             total_rent += rent;
             // Store all of them unconditionally to purge old AppendVec,
             // even if collected rent is 0 (= not updated).
@@ -4010,7 +4043,7 @@ impl Bank {
         TransactionResults,
         TransactionBalancesSet,
         Vec<Option<InnerInstructionsList>>,
-        Vec<TransactionLogMessages>,
+        Vec<Option<TransactionLogMessages>>,
     ) {
         let pre_balances = if collect_balances {
             self.collect_balances(batch)
@@ -4019,7 +4052,7 @@ impl Bank {
         };
 
         let (
-            mut loaded_accounts,
+            mut loaded_txs,
             executed,
             inner_instructions,
             transaction_logs,
@@ -4036,7 +4069,7 @@ impl Bank {
 
         let results = self.commit_transactions(
             batch.hashed_transactions(),
-            &mut loaded_accounts,
+            &mut loaded_txs,
             &executed,
             tx_count,
             signature_count,
@@ -4133,7 +4166,6 @@ impl Bank {
             self.stakes.write().unwrap().store(
                 pubkey,
                 account,
-                self.stake_program_v2_enabled(),
                 self.check_init_vote_data_enabled(),
             );
         }
@@ -4164,19 +4196,34 @@ impl Bank {
         pubkey: &Pubkey,
         new_account: &AccountSharedData,
     ) {
-        if let Some(old_account) = self.get_account_with_fixed_root(&pubkey) {
+        if let Some(old_account) = self.get_account_with_fixed_root(pubkey) {
             match new_account.lamports().cmp(&old_account.lamports()) {
                 std::cmp::Ordering::Greater => {
-                    self.capitalization
-                        .fetch_add(new_account.lamports() - old_account.lamports(), Relaxed);
+                    let increased = new_account.lamports() - old_account.lamports();
+                    trace!(
+                        "store_account_and_update_capitalization: increased: {} {}",
+                        pubkey,
+                        increased
+                    );
+                    self.capitalization.fetch_add(increased, Relaxed);
                 }
                 std::cmp::Ordering::Less => {
-                    self.capitalization
-                        .fetch_sub(old_account.lamports() - new_account.lamports(), Relaxed);
+                    let decreased = old_account.lamports() - new_account.lamports();
+                    trace!(
+                        "store_account_and_update_capitalization: decreased: {} {}",
+                        pubkey,
+                        decreased
+                    );
+                    self.capitalization.fetch_sub(decreased, Relaxed);
                 }
                 std::cmp::Ordering::Equal => {}
             }
         } else {
+            trace!(
+                "store_account_and_update_capitalization: created: {} {}",
+                pubkey,
+                new_account.lamports()
+            );
             self.capitalization
                 .fetch_add(new_account.lamports(), Relaxed);
         }
@@ -4231,6 +4278,7 @@ impl Bank {
         &mut self,
         genesis_config: &GenesisConfig,
         additional_builtins: Option<&Builtins>,
+        debug_do_not_add_builtins: bool,
     ) {
         self.rewards_pool_pubkeys =
             Arc::new(genesis_config.rewards_pools.keys().cloned().collect());
@@ -4244,16 +4292,18 @@ impl Bank {
                 .feature_builtins
                 .extend_from_slice(&additional_builtins.feature_builtins);
         }
-        for builtin in builtins.genesis_builtins {
-            self.add_builtin(
-                &builtin.name,
-                builtin.id,
-                builtin.process_instruction_with_context,
-            );
+        if !debug_do_not_add_builtins {
+            for builtin in builtins.genesis_builtins {
+                self.add_builtin(
+                    &builtin.name,
+                    builtin.id,
+                    builtin.process_instruction_with_context,
+                );
+            }
         }
         self.feature_builtins = Arc::new(builtins.feature_builtins);
 
-        self.apply_feature_activations(true);
+        self.apply_feature_activations(true, debug_do_not_add_builtins);
     }
 
     pub fn set_inflation(&self, inflation: Inflation) {
@@ -4317,6 +4367,8 @@ impl Bank {
     // multiple times with the same parent_slot in the case of forking.
     //
     // Generally, all of sysvar update granularity should be slot boundaries.
+    //
+    // This behavior is deprecated... See comment in update_sysvar_account() for details
     fn get_sysvar_account_with_fixed_root(&self, pubkey: &Pubkey) -> Option<AccountSharedData> {
         let mut ancestors = self.ancestors.clone();
         ancestors.remove(&self.slot());
@@ -4326,38 +4378,49 @@ impl Bank {
             .map(|(acc, _slot)| acc)
     }
 
-    pub fn get_program_accounts(&self, program_id: &Pubkey) -> Vec<(Pubkey, AccountSharedData)> {
+    pub fn get_program_accounts(
+        &self,
+        program_id: &Pubkey,
+    ) -> ScanResult<Vec<(Pubkey, AccountSharedData)>> {
         self.rc
             .accounts
-            .load_by_program(&self.ancestors, program_id)
+            .load_by_program(&self.ancestors, self.bank_id, program_id)
     }
 
     pub fn get_filtered_program_accounts<F: Fn(&AccountSharedData) -> bool>(
         &self,
         program_id: &Pubkey,
         filter: F,
-    ) -> Vec<(Pubkey, AccountSharedData)> {
-        self.rc
-            .accounts
-            .load_by_program_with_filter(&self.ancestors, program_id, filter)
+    ) -> ScanResult<Vec<(Pubkey, AccountSharedData)>> {
+        self.rc.accounts.load_by_program_with_filter(
+            &self.ancestors,
+            self.bank_id,
+            program_id,
+            filter,
+        )
     }
 
     pub fn get_filtered_indexed_accounts<F: Fn(&AccountSharedData) -> bool>(
         &self,
         index_key: &IndexKey,
         filter: F,
-    ) -> Vec<(Pubkey, AccountSharedData)> {
-        self.rc
-            .accounts
-            .load_by_index_key_with_filter(&self.ancestors, index_key, filter)
+    ) -> ScanResult<Vec<(Pubkey, AccountSharedData)>> {
+        self.rc.accounts.load_by_index_key_with_filter(
+            &self.ancestors,
+            self.bank_id,
+            index_key,
+            filter,
+        )
     }
 
     pub fn account_indexes_include_key(&self, key: &Pubkey) -> bool {
         self.rc.accounts.account_indexes_include_key(key)
     }
 
-    pub fn get_all_accounts_with_modified_slots(&self) -> Vec<(Pubkey, AccountSharedData, Slot)> {
-        self.rc.accounts.load_all(&self.ancestors)
+    pub fn get_all_accounts_with_modified_slots(
+        &self,
+    ) -> ScanResult<Vec<(Pubkey, AccountSharedData, Slot)>> {
+        self.rc.accounts.load_all(&self.ancestors, self.bank_id)
     }
 
     pub fn get_program_accounts_modified_since_parent(
@@ -4412,10 +4475,14 @@ impl Bank {
         num: usize,
         filter_by_address: &HashSet<Pubkey>,
         filter: AccountAddressFilter,
-    ) -> Vec<(Pubkey, u64)> {
-        self.rc
-            .accounts
-            .load_largest_accounts(&self.ancestors, num, filter_by_address, filter)
+    ) -> ScanResult<Vec<(Pubkey, u64)>> {
+        self.rc.accounts.load_largest_accounts(
+            &self.ancestors,
+            self.bank_id,
+            num,
+            filter_by_address,
+            filter,
+        )
     }
 
     pub fn transaction_count(&self) -> u64 {
@@ -4528,19 +4595,17 @@ impl Bank {
     /// Recalculate the hash_internal_state from the account stores. Would be used to verify a
     /// snapshot.
     #[must_use]
-    fn verify_bank_hash(&self) -> bool {
+    fn verify_bank_hash(&self, test_hash_calculation: bool) -> bool {
         self.rc.accounts.verify_bank_hash_and_lamports(
             self.slot(),
             &self.ancestors,
             self.capitalization(),
+            test_hash_calculation,
         )
     }
 
     pub fn get_snapshot_storages(&self) -> SnapshotStorages {
-        self.rc
-            .get_snapshot_storages(self.slot())
-            .into_iter()
-            .collect()
+        self.rc.get_snapshot_storages(self.slot())
     }
 
     #[must_use]
@@ -4562,12 +4627,18 @@ impl Bank {
         }
     }
 
-    pub fn calculate_capitalization(&self) -> u64 {
-        self.rc.accounts.calculate_capitalization(&self.ancestors)
+    pub fn calculate_capitalization(&self, debug_verify: bool) -> u64 {
+        let can_cached_slot_be_unflushed = true; // implied yes
+        self.rc.accounts.calculate_capitalization(
+            &self.ancestors,
+            self.slot(),
+            can_cached_slot_be_unflushed,
+            debug_verify,
+        )
     }
 
-    pub fn calculate_and_verify_capitalization(&self) -> bool {
-        let calculated = self.calculate_capitalization();
+    pub fn calculate_and_verify_capitalization(&self, debug_verify: bool) -> bool {
+        let calculated = self.calculate_capitalization(debug_verify);
         let expected = self.capitalization();
         if calculated == expected {
             true
@@ -4584,8 +4655,9 @@ impl Bank {
     /// This should only be used for developing purposes.
     pub fn set_capitalization(&self) -> u64 {
         let old = self.capitalization();
+        let debug_verify = true;
         self.capitalization
-            .store(self.calculate_capitalization(), Relaxed);
+            .store(self.calculate_capitalization(debug_verify), Relaxed);
         old
     }
 
@@ -4612,8 +4684,23 @@ impl Bank {
                 self.slot(),
                 &self.ancestors,
                 Some(self.capitalization()),
+                false,
+            );
+        if total_lamports != self.capitalization() {
+            datapoint_info!(
+                "capitalization_mismatch",
+                ("slot", self.slot(), i64),
+                ("calculated_lamports", total_lamports, i64),
+                ("capitalization", self.capitalization(), i64),
+            );
+
+            panic!(
+                "capitalization_mismatch. slot: {}, calculated_lamports: {}, capitalization: {}",
+                self.slot(),
+                total_lamports,
+                self.capitalization()
             );
-        assert_eq!(total_lamports, self.capitalization());
+        }
         hash
     }
 
@@ -4623,7 +4710,11 @@ impl Bank {
 
     /// A snapshot bank should be purged of 0 lamport accounts which are not part of the hash
     /// calculation and could shield other real accounts.
-    pub fn verify_snapshot_bank(&self) -> bool {
+    pub fn verify_snapshot_bank(
+        &self,
+        test_hash_calculation: bool,
+        accounts_db_skip_shrink: bool,
+    ) -> bool {
         info!("cleaning..");
         let mut clean_time = Measure::start("clean");
         if self.slot() > 0 {
@@ -4631,16 +4722,16 @@ impl Bank {
         }
         clean_time.stop();
 
-        info!("shrinking..");
         let mut shrink_all_slots_time = Measure::start("shrink_all_slots");
-        if self.slot() > 0 {
+        if !accounts_db_skip_shrink && self.slot() > 0 {
+            info!("shrinking..");
             self.shrink_all_slots(true);
         }
         shrink_all_slots_time.stop();
 
         info!("verify_bank_hash..");
         let mut verify_time = Measure::start("verify_bank_hash");
-        let mut verify = self.verify_bank_hash();
+        let mut verify = self.verify_bank_hash(test_hash_calculation);
         verify_time.stop();
 
         info!("verify_hash..");
@@ -4720,10 +4811,10 @@ impl Bank {
         &self,
         txs: impl Iterator<Item = &'a Transaction>,
         res: &[TransactionExecutionResult],
-        loaded: &[TransactionLoadResult],
+        loaded_txs: &[TransactionLoadResult],
     ) -> Vec<OverwrittenVoteAccount> {
         let mut overwritten_vote_accounts = vec![];
-        for (i, ((raccs, _load_nonce_rollback), tx)) in loaded.iter().zip(txs).enumerate() {
+        for (i, ((raccs, _load_nonce_rollback), tx)) in loaded_txs.iter().zip(txs).enumerate() {
             let (res, _res_nonce_rollback) = &res[i];
             if res.is_err() || raccs.is_err() {
                 continue;
@@ -4732,17 +4823,14 @@ impl Bank {
             let message = &tx.message();
             let loaded_transaction = raccs.as_ref().unwrap();
 
-            for (pubkey, account) in message
-                .account_keys
-                .iter()
+            for (_i, (pubkey, account)) in (0..message.account_keys.len())
                 .zip(loaded_transaction.accounts.iter())
-                .filter(|(_key, account)| (Stakes::is_stake(account)))
+                .filter(|(_i, (_pubkey, account))| (Stakes::is_stake(account)))
             {
                 if Stakes::is_stake(account) {
                     if let Some(old_vote_account) = self.stakes.write().unwrap().store(
                         pubkey,
                         account,
-                        self.stake_program_v2_enabled(),
                         self.check_init_vote_data_enabled(),
                     ) {
                         // TODO: one of the indices is redundant.
@@ -4958,29 +5046,29 @@ impl Bank {
         self.rc.accounts.accounts_db.shrink_candidate_slots()
     }
 
-    pub fn secp256k1_program_enabled(&self) -> bool {
+    pub fn no_overflow_rent_distribution_enabled(&self) -> bool {
         self.feature_set
-            .is_active(&feature_set::secp256k1_program_enabled::id())
+            .is_active(&feature_set::no_overflow_rent_distribution::id())
     }
 
-    pub fn no_overflow_rent_distribution_enabled(&self) -> bool {
+    pub fn check_init_vote_data_enabled(&self) -> bool {
         self.feature_set
-            .is_active(&feature_set::no_overflow_rent_distribution::id())
+            .is_active(&feature_set::check_init_vote_data::id())
     }
 
-    pub fn stake_program_v2_enabled(&self) -> bool {
+    pub fn verify_tx_signatures_len_enabled(&self) -> bool {
         self.feature_set
-            .is_active(&feature_set::stake_program_v2::id())
+            .is_active(&feature_set::verify_tx_signatures_len::id())
     }
 
-    pub fn check_init_vote_data_enabled(&self) -> bool {
+    pub fn libsecp256k1_0_5_upgrade_enabled(&self) -> bool {
         self.feature_set
-            .is_active(&feature_set::check_init_vote_data::id())
+            .is_active(&feature_set::libsecp256k1_0_5_upgrade_enabled::id())
     }
 
-    pub fn check_duplicates_by_hash_enabled(&self) -> bool {
+    pub fn merge_nonce_error_into_system_error(&self) -> bool {
         self.feature_set
-            .is_active(&feature_set::check_duplicates_by_hash::id())
+            .is_active(&feature_set::merge_nonce_error_into_system_error::id())
     }
 
     // Check if the wallclock time from bank creation to now has exceeded the allotted
@@ -4995,7 +5083,7 @@ impl Bank {
 
     pub fn deactivate_feature(&mut self, id: &Pubkey) {
         let mut feature_set = Arc::make_mut(&mut self.feature_set).clone();
-        feature_set.active.remove(&id);
+        feature_set.active.remove(id);
         feature_set.inactive.insert(*id);
         self.feature_set = Arc::new(feature_set);
     }
@@ -5009,7 +5097,11 @@ impl Bank {
 
     // This is called from snapshot restore AND for each epoch boundary
     // The entire code path herein must be idempotent
-    fn apply_feature_activations(&mut self, init_finish_or_warp: bool) {
+    fn apply_feature_activations(
+        &mut self,
+        init_finish_or_warp: bool,
+        debug_do_not_add_builtins: bool,
+    ) {
         let new_feature_activations = self.compute_active_feature_set(!init_finish_or_warp);
 
         if new_feature_activations.contains(&feature_set::pico_inflation::id()) {
@@ -5025,25 +5117,60 @@ impl Bank {
             self.rent_collector.rent.burn_percent = 50; // 50% rent burn
         }
 
-        if new_feature_activations.contains(&feature_set::spl_token_v2_self_transfer_fix::id()) {
-            self.apply_spl_token_v2_self_transfer_fix();
+        if new_feature_activations.contains(&feature_set::spl_token_v2_set_authority_fix::id()) {
+            self.apply_spl_token_v2_set_authority_fix();
         }
-        // Remove me after a while around v1.6
-        if !self.no_stake_rewrite.load(Relaxed)
-            && new_feature_activations.contains(&feature_set::rewrite_stake::id())
-        {
-            // to avoid any potential risk of wrongly rewriting accounts in the future,
-            // only do this once, taking small risk of unknown
-            // bugs which again creates bad stake accounts..
-
-            self.rewrite_stakes();
+        if new_feature_activations.contains(&feature_set::rent_for_sysvars::id()) {
+            // when this feature is activated, immediately all of existing sysvars are susceptible
+            // to rent collection and account data removal due to insufficient balance due to only
+            // having 1 lamport.
+            // so before any is accessed, reset the balance to be rent-exempt here at the same
+            // timing when perpetual balance adjustment is started in update_sysvar_account().
+            self.reset_all_sysvar_balances();
         }
 
-        self.ensure_feature_builtins(init_finish_or_warp, &new_feature_activations);
-        self.reconfigure_token2_native_mint();
+        if !debug_do_not_add_builtins {
+            self.ensure_feature_builtins(init_finish_or_warp, &new_feature_activations);
+            self.reconfigure_token2_native_mint();
+        }
         self.ensure_no_storage_rewards_pool();
     }
 
+    fn reset_all_sysvar_balances(&self) {
+        for sysvar_id in &[
+            sysvar::clock::id(),
+            sysvar::epoch_schedule::id(),
+            sysvar::fees::id(),
+            sysvar::recent_blockhashes::id(),
+            sysvar::rent::id(),
+            sysvar::rewards::id(),
+            sysvar::slot_hashes::id(),
+            sysvar::slot_history::id(),
+            sysvar::stake_history::id(),
+        ] {
+            if let Some(mut account) = self.get_account(sysvar_id) {
+                let (old_data_len, old_lamports) = (account.data().len(), account.lamports());
+                self.adjust_sysvar_balance_for_rent(&mut account);
+                info!(
+                    "reset_all_sysvar_balances (slot: {}): {} ({} bytes) is reset from {} to {}",
+                    self.slot(),
+                    sysvar_id,
+                    old_data_len,
+                    old_lamports,
+                    account.lamports()
+                );
+                self.store_account_and_update_capitalization(sysvar_id, &account);
+            }
+        }
+    }
+
+    fn adjust_sysvar_balance_for_rent(&self, account: &mut AccountSharedData) {
+        account.set_lamports(
+            self.get_minimum_balance_for_rent_exemption(account.data().len())
+                .max(account.lamports()),
+        );
+    }
+
     // Compute the active feature set based on the current bank state, and return the set of newly activated features
     fn compute_active_feature_set(&mut self, allow_new_activations: bool) -> HashSet<Pubkey> {
         let mut active = self.feature_set.active.clone();
@@ -5095,8 +5222,8 @@ impl Bank {
     ) {
         let feature_builtins = self.feature_builtins.clone();
         for (builtin, feature, activation_type) in feature_builtins.iter() {
-            let should_populate = init_or_warp && self.feature_set.is_active(&feature)
-                || !init_or_warp && new_feature_activations.contains(&feature);
+            let should_populate = init_or_warp && self.feature_set.is_active(feature)
+                || !init_or_warp && new_feature_activations.contains(feature);
             if should_populate {
                 match activation_type {
                     ActivationType::NewProgram => self.add_builtin(
@@ -5114,13 +5241,13 @@ impl Bank {
         }
     }
 
-    fn apply_spl_token_v2_self_transfer_fix(&mut self) {
+    fn apply_spl_token_v2_set_authority_fix(&mut self) {
         if let Some(old_account) = self.get_account_with_fixed_root(&inline_spl_token_v2_0::id()) {
             if let Some(new_account) =
                 self.get_account_with_fixed_root(&inline_spl_token_v2_0::new_token_program::id())
             {
                 datapoint_info!(
-                    "bank-apply_spl_token_v2_self_transfer_fix",
+                    "bank-apply_spl_token_v2_set_authority_fix",
                     ("slot", self.slot, i64),
                 );
 
@@ -5198,10 +5325,10 @@ impl Bank {
 
         if purge_window_epoch {
             for reward_pubkey in self.rewards_pool_pubkeys.iter() {
-                if let Some(mut reward_account) = self.get_account_with_fixed_root(&reward_pubkey) {
+                if let Some(mut reward_account) = self.get_account_with_fixed_root(reward_pubkey) {
                     if reward_account.lamports() == u64::MAX {
                         reward_account.set_lamports(0);
-                        self.store_account(&reward_pubkey, &reward_account);
+                        self.store_account(reward_pubkey, &reward_account);
                         // Adjust capitalization.... it has been wrapping, reducing the real capitalization by 1-lamport
                         self.capitalization.fetch_add(1, Relaxed);
                         info!(
@@ -5223,14 +5350,15 @@ impl Bank {
                 .is_active(&feature_set::consistent_recent_blockhashes_sysvar::id()),
         }
     }
+
+    fn rent_for_sysvars(&self) -> bool {
+        self.feature_set
+            .is_active(&feature_set::rent_for_sysvars::id())
+    }
 }
 
 impl Drop for Bank {
     fn drop(&mut self) {
-        if self.skip_drop.load(Relaxed) {
-            return;
-        }
-
         if let Some(drop_callback) = self.drop_callback.read().unwrap().0.as_ref() {
             drop_callback.callback(self);
         } else {
@@ -5238,7 +5366,9 @@ impl Drop for Bank {
             // 1. Tests
             // 2. At startup when replaying blockstore and there's no
             // AccountsBackgroundService to perform cleanups yet.
-            self.rc.accounts.purge_slot(self.slot(), false);
+            self.rc
+                .accounts
+                .purge_slot(self.slot(), self.bank_id(), false);
         }
     }
 }
@@ -5246,7 +5376,7 @@ impl Drop for Bank {
 pub fn goto_end_of_slot(bank: &mut Bank) {
     let mut tick_hash = bank.last_blockhash();
     loop {
-        tick_hash = hashv(&[&tick_hash.as_ref(), &[42]]);
+        tick_hash = hashv(&[tick_hash.as_ref(), &[42]]);
         bank.register_tick(&tick_hash);
         if tick_hash == bank.last_blockhash() {
             bank.freeze();
@@ -5278,8 +5408,10 @@ pub(crate) mod tests {
     use super::*;
     use crate::{
         accounts_background_service::{AbsRequestHandler, SendDroppedBankCallback},
-        accounts_db::SHRINK_RATIO,
-        accounts_index::{AccountIndex, AccountMap, AccountSecondaryIndexes, ITER_BATCH_SIZE},
+        accounts_db::DEFAULT_ACCOUNTS_SHRINK_RATIO,
+        accounts_index::{
+            AccountIndex, AccountMap, AccountSecondaryIndexes, ScanError, ITER_BATCH_SIZE,
+        },
         ancestors::Ancestors,
         genesis_utils::{
             activate_all_features, bootstrap_validator_stake_lamports,
@@ -5292,7 +5424,6 @@ pub(crate) mod tests {
     use crossbeam_channel::{bounded, unbounded};
     use solana_sdk::{
         account::Account,
-        account_utils::StateMut,
         clock::{DEFAULT_SLOTS_PER_EPOCH, DEFAULT_TICKS_PER_SLOT},
         epoch_schedule::MINIMUM_SLOTS_PER_EPOCH,
         feature::Feature,
@@ -5304,15 +5435,15 @@ pub(crate) mod tests {
         process_instruction::InvokeContext,
         rent::Rent,
         signature::{keypair_from_seed, Keypair, Signer},
+        stake::{
+            instruction as stake_instruction,
+            state::{Authorized, Delegation, Lockup, Stake},
+        },
         system_instruction::{self, SystemError},
         system_program,
         sysvar::{fees::Fees, rewards::Rewards},
         timing::duration_as_s,
     };
-    use solana_stake_program::{
-        stake_instruction,
-        stake_state::{self, Authorized, Delegation, Lockup, Stake},
-    };
     use solana_vote_program::{
         vote_instruction,
         vote_state::{
@@ -5354,10 +5485,13 @@ pub(crate) mod tests {
         let to_account = AccountSharedData::new(45, 0, &Pubkey::default());
         let recent_blockhashes_sysvar_account = AccountSharedData::new(4, 0, &Pubkey::default());
         let accounts = [
-            from_account.clone(),
-            nonce_account.clone(),
-            to_account.clone(),
-            recent_blockhashes_sysvar_account.clone(),
+            (message.account_keys[0], from_account.clone()),
+            (message.account_keys[1], nonce_account.clone()),
+            (message.account_keys[2], to_account.clone()),
+            (
+                message.account_keys[3],
+                recent_blockhashes_sysvar_account.clone(),
+            ),
         ];
 
         // NonceRollbackFull create + NonceRollbackInfo impl
@@ -5369,10 +5503,10 @@ pub(crate) mod tests {
 
         let message = Message::new(&instructions, Some(&nonce_address));
         let accounts = [
-            nonce_account,
-            from_account,
-            to_account,
-            recent_blockhashes_sysvar_account,
+            (message.account_keys[0], nonce_account),
+            (message.account_keys[1], from_account),
+            (message.account_keys[2], to_account),
+            (message.account_keys[3], recent_blockhashes_sysvar_account),
         ];
 
         // Nonce account is fee-payer
@@ -5529,7 +5663,7 @@ pub(crate) mod tests {
             cluster_type: ClusterType::MainnetBeta,
             ..GenesisConfig::default()
         }));
-        let sysvar_and_native_proram_delta0 = 10;
+        let sysvar_and_native_proram_delta0 = 11;
         assert_eq!(
             bank0.capitalization(),
             42 * 42 + sysvar_and_native_proram_delta0
@@ -5829,7 +5963,20 @@ pub(crate) mod tests {
         updater();
         let new = bank.capitalization();
         asserter(old, new);
-        assert_eq!(bank.capitalization(), bank.calculate_capitalization());
+        assert_eq!(bank.capitalization(), bank.calculate_capitalization(true));
+    }
+
+    fn assert_capitalization_diff_with_new_bank(
+        bank: &Bank,
+        updater: impl Fn() -> Bank,
+        asserter: impl Fn(u64, u64),
+    ) -> Bank {
+        let old = bank.capitalization();
+        let bank = updater();
+        let new = bank.capitalization();
+        asserter(old, new);
+        assert_eq!(bank.capitalization(), bank.calculate_capitalization(true));
+        bank
     }
 
     #[test]
@@ -6119,13 +6266,15 @@ pub(crate) mod tests {
 
         let current_capitalization = bank.capitalization.load(Relaxed);
 
-        let sysvar_and_native_proram_delta = 1;
+        // only slot history is newly created
+        let sysvar_and_native_proram_delta =
+            min_rent_excempt_balance_for_sysvars(&bank, &[sysvar::slot_history::id()]);
         assert_eq!(
             previous_capitalization - (current_capitalization - sysvar_and_native_proram_delta),
             burned_portion
         );
 
-        assert!(bank.calculate_and_verify_capitalization());
+        assert!(bank.calculate_and_verify_capitalization(true));
 
         assert_eq!(
             rent_to_be_distributed,
@@ -7023,7 +7172,7 @@ pub(crate) mod tests {
                 .accounts
                 .accounts_db
                 .accounts_index
-                .get(&pubkey, Some(&ancestors), None)
+                .get(pubkey, Some(ancestors), None)
                 .unwrap();
             locked_entry
                 .slot_list()
@@ -7031,6 +7180,11 @@ pub(crate) mod tests {
                 .map(|(slot, _)| *slot)
                 .collect::<Vec<Slot>>()
         }
+
+        fn first_slot_in_next_epoch(&self) -> Slot {
+            self.epoch_schedule()
+                .get_first_slot_in_epoch(self.epoch() + 1)
+        }
     }
 
     #[test]
@@ -7211,10 +7365,10 @@ pub(crate) mod tests {
         // not being eagerly-collected for exact rewards calculation
         bank0.restore_old_behavior_for_fragile_tests();
 
-        let sysvar_and_native_proram_delta0 = 10;
+        let sysvar_and_native_program_delta0 = 11;
         assert_eq!(
             bank0.capitalization(),
-            42 * 1_000_000_000 + sysvar_and_native_proram_delta0
+            42 * 1_000_000_000 + sysvar_and_native_program_delta0
         );
         assert!(bank0.rewards.read().unwrap().is_empty());
 
@@ -7251,8 +7405,7 @@ pub(crate) mod tests {
                     .map(move |(_stake_pubkey, stake_account)| (stake_account, vote_account))
             })
             .map(|(stake_account, vote_account)| {
-                stake_state::calculate_points(&stake_account, &vote_account, None, true)
-                    .unwrap_or(0)
+                stake_state::calculate_points(stake_account, vote_account, None).unwrap_or(0)
             })
             .sum();
 
@@ -7297,11 +7450,12 @@ pub(crate) mod tests {
                     reward_type: RewardType::Staking,
                     lamports: (rewards.validator_point_value * validator_points as f64) as i64,
                     post_balance: bank1.get_balance(&stake_id),
+                    commission: Some(0),
                 }
             )]
         );
         bank1.freeze();
-        assert!(bank1.calculate_and_verify_capitalization());
+        assert!(bank1.calculate_and_verify_capitalization(true));
     }
 
     fn do_test_bank_update_rewards_determinism() -> u64 {
@@ -7334,7 +7488,7 @@ pub(crate) mod tests {
         // not being eagerly-collected for exact rewards calculation
         bank.restore_old_behavior_for_fragile_tests();
 
-        let sysvar_and_native_proram_delta = 10;
+        let sysvar_and_native_proram_delta = 11;
         assert_eq!(
             bank.capitalization(),
             42 * 1_000_000_000 + sysvar_and_native_proram_delta
@@ -7379,7 +7533,7 @@ pub(crate) mod tests {
         assert_ne!(bank1.capitalization(), bank.capitalization());
 
         bank1.freeze();
-        assert!(bank1.calculate_and_verify_capitalization());
+        assert!(bank1.calculate_and_verify_capitalization(true));
 
         // verify voting and staking rewards are recorded
         let rewards = bank1.rewards.read().unwrap();
@@ -7462,17 +7616,17 @@ pub(crate) mod tests {
         assert_eq!(bank0.get_account(&keypair.pubkey()).unwrap().lamports(), 10);
         assert_eq!(bank1.get_account(&keypair.pubkey()), None);
 
-        assert!(bank0.verify_bank_hash());
+        assert!(bank0.verify_bank_hash(true));
 
         // Squash and then verify hash_internal value
         bank0.freeze();
         bank0.squash();
-        assert!(bank0.verify_bank_hash());
+        assert!(bank0.verify_bank_hash(true));
 
         bank1.freeze();
         bank1.squash();
         bank1.update_accounts_hash();
-        assert!(bank1.verify_bank_hash());
+        assert!(bank1.verify_bank_hash(true));
 
         // keypair should have 0 tokens on both forks
         assert_eq!(bank0.get_account(&keypair.pubkey()), None);
@@ -7480,7 +7634,7 @@ pub(crate) mod tests {
         bank1.force_flush_accounts_cache();
         bank1.clean_accounts(false, false);
 
-        assert!(bank1.verify_bank_hash());
+        assert!(bank1.verify_bank_hash(true));
     }
 
     #[test]
@@ -7644,13 +7798,14 @@ pub(crate) mod tests {
         assert_eq!(bank.get_balance(&sysvar_pubkey), 1);
 
         bank.transfer(500, &mint_keypair, &normal_pubkey).unwrap();
-        bank.transfer(500, &mint_keypair, &sysvar_pubkey).unwrap();
+        bank.transfer(500, &mint_keypair, &sysvar_pubkey)
+            .unwrap_err();
         assert_eq!(bank.get_balance(&normal_pubkey), 500);
-        assert_eq!(bank.get_balance(&sysvar_pubkey), 501);
+        assert_eq!(bank.get_balance(&sysvar_pubkey), 1);
 
         let bank = Arc::new(new_from_parent(&bank));
         assert_eq!(bank.get_balance(&normal_pubkey), 500);
-        assert_eq!(bank.get_balance(&sysvar_pubkey), 501);
+        assert_eq!(bank.get_balance(&sysvar_pubkey), 1);
     }
 
     #[test]
@@ -7797,6 +7952,7 @@ pub(crate) mod tests {
                     reward_type: RewardType::Fee,
                     lamports: expected_fee_collected as i64,
                     post_balance: initial_balance + expected_fee_collected,
+                    commission: None,
                 }
             )]
         );
@@ -7832,6 +7988,7 @@ pub(crate) mod tests {
                     reward_type: RewardType::Fee,
                     lamports: expected_fee_collected as i64,
                     post_balance: initial_balance + 2 * expected_fee_collected,
+                    commission: None,
                 }
             )]
         );
@@ -8201,8 +8358,7 @@ pub(crate) mod tests {
     #[test]
     fn test_tx_already_processed() {
         let (genesis_config, mint_keypair) = create_genesis_config(2);
-        let mut bank = Bank::new(&genesis_config);
-        assert!(!bank.check_duplicates_by_hash_enabled());
+        let bank = Bank::new(&genesis_config);
 
         let key1 = Keypair::new();
         let mut tx =
@@ -8217,12 +8373,10 @@ pub(crate) mod tests {
             Err(TransactionError::AlreadyProcessed)
         );
 
-        // Clear transaction signature
+        // Change transaction signature to simulate processing a transaction with a different signature
+        // for the same message.
         tx.signatures[0] = Signature::default();
 
-        // Enable duplicate check by message hash
-        bank.feature_set = Arc::new(FeatureSet::all_enabled());
-
         // Ensure that message hash check works
         assert_eq!(
             bank.process_transaction(&tx),
@@ -8286,7 +8440,7 @@ pub(crate) mod tests {
         info!("transfer 2 {}", pubkey2);
         bank2.transfer(10, &mint_keypair, &pubkey2).unwrap();
         bank2.update_accounts_hash();
-        assert!(bank2.verify_bank_hash());
+        assert!(bank2.verify_bank_hash(true));
     }
 
     #[test]
@@ -8310,19 +8464,19 @@ pub(crate) mod tests {
         // Checkpointing should never modify the checkpoint's state once frozen
         let bank0_state = bank0.hash_internal_state();
         bank2.update_accounts_hash();
-        assert!(bank2.verify_bank_hash());
+        assert!(bank2.verify_bank_hash(true));
         let bank3 = Bank::new_from_parent(&bank0, &solana_sdk::pubkey::new_rand(), 2);
         assert_eq!(bank0_state, bank0.hash_internal_state());
-        assert!(bank2.verify_bank_hash());
+        assert!(bank2.verify_bank_hash(true));
         bank3.update_accounts_hash();
-        assert!(bank3.verify_bank_hash());
+        assert!(bank3.verify_bank_hash(true));
 
         let pubkey2 = solana_sdk::pubkey::new_rand();
         info!("transfer 2 {}", pubkey2);
         bank2.transfer(10, &mint_keypair, &pubkey2).unwrap();
         bank2.update_accounts_hash();
-        assert!(bank2.verify_bank_hash());
-        assert!(bank3.verify_bank_hash());
+        assert!(bank2.verify_bank_hash(true));
+        assert!(bank3.verify_bank_hash(true));
     }
 
     #[test]
@@ -8342,11 +8496,11 @@ pub(crate) mod tests {
         bank.transfer(1_000, &mint_keypair, &pubkey).unwrap();
         bank.freeze();
         bank.update_accounts_hash();
-        assert!(bank.verify_snapshot_bank());
+        assert!(bank.verify_snapshot_bank(true, false));
 
         // tamper the bank after freeze!
         bank.increment_signature_count(1);
-        assert!(!bank.verify_snapshot_bank());
+        assert!(!bank.verify_snapshot_bank(true, false));
     }
 
     // Test that two bank forks with the same accounts should not hash to the same value.
@@ -8605,12 +8759,12 @@ pub(crate) mod tests {
         let (mut genesis_config, _mint_keypair) = create_genesis_config(500);
 
         let expected_previous_slot = 3;
-        let expected_next_slot = expected_previous_slot + 1;
+        let mut expected_next_slot = expected_previous_slot + 1;
 
         // First, initialize the clock sysvar
         activate_all_features(&mut genesis_config);
         let bank1 = Arc::new(Bank::new(&genesis_config));
-        assert_eq!(bank1.calculate_capitalization(), bank1.capitalization());
+        assert_eq!(bank1.calculate_capitalization(true), bank1.capitalization());
 
         assert_capitalization_diff(
             &bank1,
@@ -8636,7 +8790,10 @@ pub(crate) mod tests {
                 assert_eq!(dummy_rent_epoch, current_account.rent_epoch());
             },
             |old, new| {
-                assert_eq!(old + 1, new);
+                assert_eq!(
+                    old + min_rent_excempt_balance_for_sysvars(&bank1, &[sysvar::clock::id()]),
+                    new
+                );
             },
         );
 
@@ -8644,7 +8801,7 @@ pub(crate) mod tests {
             &bank1,
             || {
                 bank1.update_sysvar_account(&dummy_clock_id, |optional_account| {
-                    assert!(optional_account.is_none());
+                    assert!(optional_account.is_some());
 
                     create_account(
                         &Clock {
@@ -8685,7 +8842,9 @@ pub(crate) mod tests {
                     expected_next_slot,
                     from_account::<Clock, _>(&current_account).unwrap().slot
                 );
-                assert_eq!(INITIAL_RENT_EPOCH, current_account.rent_epoch());
+                // inherit_specially_retained_account_fields() now starts to inherit rent_epoch too
+                // with rent_for_sysvars
+                assert_eq!(dummy_rent_epoch, current_account.rent_epoch());
             },
             |old, new| {
                 // if existing, capitalization shouldn't change
@@ -8693,8 +8852,9 @@ pub(crate) mod tests {
             },
         );
 
-        // Updating again should give bank1's sysvar to the closure not bank2's.
-        // Thus, assert with same expected_next_slot as previously
+        // Updating again should give bank2's sysvar to the closure not bank1's.
+        // Thus, increment expected_next_slot accordingly
+        expected_next_slot += 1;
         assert_capitalization_diff(
             &bank2,
             || {
@@ -8784,7 +8944,7 @@ pub(crate) mod tests {
             // epoch_stakes are a snapshot at the leader_schedule_slot_offset boundary
             //   in the prior epoch (0 in this case)
             assert_eq!(
-                leader_stake.stake(0, None, true),
+                leader_stake.stake(0, None),
                 vote_accounts.unwrap().get(&leader_vote_account).unwrap().0
             );
 
@@ -8800,7 +8960,7 @@ pub(crate) mod tests {
 
         assert!(child.epoch_vote_accounts(epoch).is_some());
         assert_eq!(
-            leader_stake.stake(child.epoch(), None, true),
+            leader_stake.stake(child.epoch(), None),
             child
                 .epoch_vote_accounts(epoch)
                 .unwrap()
@@ -8818,7 +8978,7 @@ pub(crate) mod tests {
         );
         assert!(child.epoch_vote_accounts(epoch).is_some());
         assert_eq!(
-            leader_stake.stake(child.epoch(), None, true),
+            leader_stake.stake(child.epoch(), None),
             child
                 .epoch_vote_accounts(epoch)
                 .unwrap()
@@ -9117,7 +9277,7 @@ pub(crate) mod tests {
         let parent = Arc::new(Bank::new(&genesis_config));
         parent.restore_old_behavior_for_fragile_tests();
 
-        let genesis_accounts: Vec<_> = parent.get_all_accounts_with_modified_slots();
+        let genesis_accounts: Vec<_> = parent.get_all_accounts_with_modified_slots().unwrap();
         assert!(
             genesis_accounts
                 .iter()
@@ -9145,11 +9305,11 @@ pub(crate) mod tests {
         let bank1 = Arc::new(new_from_parent(&bank0));
         bank1.squash();
         assert_eq!(
-            bank0.get_program_accounts(&program_id),
+            bank0.get_program_accounts(&program_id).unwrap(),
             vec![(pubkey0, account0.clone())]
         );
         assert_eq!(
-            bank1.get_program_accounts(&program_id),
+            bank1.get_program_accounts(&program_id).unwrap(),
             vec![(pubkey0, account0)]
         );
         assert_eq!(
@@ -9168,8 +9328,8 @@ pub(crate) mod tests {
 
         let bank3 = Arc::new(new_from_parent(&bank2));
         bank3.squash();
-        assert_eq!(bank1.get_program_accounts(&program_id).len(), 2);
-        assert_eq!(bank3.get_program_accounts(&program_id).len(), 2);
+        assert_eq!(bank1.get_program_accounts(&program_id).unwrap().len(), 2);
+        assert_eq!(bank3.get_program_accounts(&program_id).unwrap().len(), 2);
     }
 
     #[test]
@@ -9181,6 +9341,7 @@ pub(crate) mod tests {
             &genesis_config,
             account_indexes,
             false,
+            AccountShrinkThreshold::default(),
         ));
 
         let address = Pubkey::new_unique();
@@ -9188,8 +9349,9 @@ pub(crate) mod tests {
         let account = AccountSharedData::new(1, 0, &program_id);
         bank.store_account(&address, &account);
 
-        let indexed_accounts =
-            bank.get_filtered_indexed_accounts(&IndexKey::ProgramId(program_id), |_| true);
+        let indexed_accounts = bank
+            .get_filtered_indexed_accounts(&IndexKey::ProgramId(program_id), |_| true)
+            .unwrap();
         assert_eq!(indexed_accounts.len(), 1);
         assert_eq!(indexed_accounts[0], (address, account));
 
@@ -9200,12 +9362,14 @@ pub(crate) mod tests {
         let new_account = AccountSharedData::new(1, 0, &another_program_id);
         let bank = Arc::new(new_from_parent(&bank));
         bank.store_account(&address, &new_account);
-        let indexed_accounts =
-            bank.get_filtered_indexed_accounts(&IndexKey::ProgramId(program_id), |_| true);
+        let indexed_accounts = bank
+            .get_filtered_indexed_accounts(&IndexKey::ProgramId(program_id), |_| true)
+            .unwrap();
         assert_eq!(indexed_accounts.len(), 1);
         assert_eq!(indexed_accounts[0], (address, new_account.clone()));
-        let indexed_accounts =
-            bank.get_filtered_indexed_accounts(&IndexKey::ProgramId(another_program_id), |_| true);
+        let indexed_accounts = bank
+            .get_filtered_indexed_accounts(&IndexKey::ProgramId(another_program_id), |_| true)
+            .unwrap();
         assert_eq!(indexed_accounts.len(), 1);
         assert_eq!(indexed_accounts[0], (address, new_account.clone()));
 
@@ -9213,12 +9377,14 @@ pub(crate) mod tests {
         let indexed_accounts = bank
             .get_filtered_indexed_accounts(&IndexKey::ProgramId(program_id), |account| {
                 account.owner() == &program_id
-            });
+            })
+            .unwrap();
         assert!(indexed_accounts.is_empty());
         let indexed_accounts = bank
             .get_filtered_indexed_accounts(&IndexKey::ProgramId(another_program_id), |account| {
                 account.owner() == &another_program_id
-            });
+            })
+            .unwrap();
         assert_eq!(indexed_accounts.len(), 1);
         assert_eq!(indexed_accounts[0], (address, new_account));
     }
@@ -9368,7 +9534,7 @@ pub(crate) mod tests {
         // Non-native loader accounts can not be used for instruction processing
         assert!(bank.stakes.read().unwrap().vote_accounts().is_empty());
         assert!(bank.stakes.read().unwrap().stake_delegations().is_empty());
-        assert_eq!(bank.calculate_capitalization(), bank.capitalization());
+        assert_eq!(bank.calculate_capitalization(true), bank.capitalization());
 
         let ((vote_id, vote_account), (stake_id, stake_account)) =
             crate::stakes::tests::create_staked_node_accounts(1_0000);
@@ -9378,20 +9544,20 @@ pub(crate) mod tests {
         bank.store_account(&stake_id, &stake_account);
         assert!(!bank.stakes.read().unwrap().vote_accounts().is_empty());
         assert!(!bank.stakes.read().unwrap().stake_delegations().is_empty());
-        assert_eq!(bank.calculate_capitalization(), bank.capitalization());
+        assert_eq!(bank.calculate_capitalization(true), bank.capitalization());
 
         bank.add_builtin("mock_program1", vote_id, mock_ix_processor);
         bank.add_builtin("mock_program2", stake_id, mock_ix_processor);
         assert!(bank.stakes.read().unwrap().vote_accounts().is_empty());
         assert!(bank.stakes.read().unwrap().stake_delegations().is_empty());
-        assert_eq!(bank.calculate_capitalization(), bank.capitalization());
+        assert_eq!(bank.calculate_capitalization(true), bank.capitalization());
         assert_eq!(
             "mock_program1",
-            String::from_utf8_lossy(&bank.get_account(&vote_id).unwrap_or_default().data())
+            String::from_utf8_lossy(bank.get_account(&vote_id).unwrap_or_default().data())
         );
         assert_eq!(
             "mock_program2",
-            String::from_utf8_lossy(&bank.get_account(&stake_id).unwrap_or_default().data())
+            String::from_utf8_lossy(bank.get_account(&stake_id).unwrap_or_default().data())
         );
 
         // Re-adding builtin programs should be no-op
@@ -9404,14 +9570,14 @@ pub(crate) mod tests {
         assert_eq!(old_hash, new_hash);
         assert!(bank.stakes.read().unwrap().vote_accounts().is_empty());
         assert!(bank.stakes.read().unwrap().stake_delegations().is_empty());
-        assert_eq!(bank.calculate_capitalization(), bank.capitalization());
+        assert_eq!(bank.calculate_capitalization(true), bank.capitalization());
         assert_eq!(
             "mock_program1",
-            String::from_utf8_lossy(&bank.get_account(&vote_id).unwrap_or_default().data())
+            String::from_utf8_lossy(bank.get_account(&vote_id).unwrap_or_default().data())
         );
         assert_eq!(
             "mock_program2",
-            String::from_utf8_lossy(&bank.get_account(&stake_id).unwrap_or_default().data())
+            String::from_utf8_lossy(bank.get_account(&stake_id).unwrap_or_default().data())
         );
     }
 
@@ -9499,7 +9665,7 @@ pub(crate) mod tests {
                 let pubkey = solana_sdk::pubkey::new_rand();
                 genesis_config.add_account(
                     pubkey,
-                    solana_stake_program::stake_state::create_lockup_stake_account(
+                    stake_state::create_lockup_stake_account(
                         &Authorized::auto(&pubkey),
                         &Lockup::default(),
                         &Rent::default(),
@@ -9548,7 +9714,7 @@ pub(crate) mod tests {
     }
 
     fn get_nonce_account(bank: &Bank, nonce_pubkey: &Pubkey) -> Option<Hash> {
-        bank.get_account(&nonce_pubkey).and_then(|acc| {
+        bank.get_account(nonce_pubkey).and_then(|acc| {
             let state =
                 StateMut::<nonce::state::Versions>::state(&acc).map(|v| v.convert_to_current());
             match state {
@@ -9865,7 +10031,7 @@ pub(crate) mod tests {
     }
 
     #[test]
-    fn test_nonce_payer() {
+    fn test_nonce_authority() {
         solana_logger::setup();
         let (mut bank, _mint_keypair, custodian_keypair, nonce_keypair) =
             setup_nonce_with_bank(10_000_000, |_| {}, 5_000_000, 250_000, None).unwrap();
@@ -9873,14 +10039,20 @@ pub(crate) mod tests {
         let alice_pubkey = alice_keypair.pubkey();
         let custodian_pubkey = custodian_keypair.pubkey();
         let nonce_pubkey = nonce_keypair.pubkey();
+        let bad_nonce_authority_keypair = Keypair::new();
+        let bad_nonce_authority = bad_nonce_authority_keypair.pubkey();
+        let custodian_account = bank.get_account(&custodian_pubkey).unwrap();
 
         debug!("alice: {}", alice_pubkey);
         debug!("custodian: {}", custodian_pubkey);
         debug!("nonce: {}", nonce_pubkey);
         debug!("nonce account: {:?}", bank.get_account(&nonce_pubkey));
-        debug!("cust: {:?}", bank.get_account(&custodian_pubkey));
+        debug!("cust: {:?}", custodian_account);
         let nonce_hash = get_nonce_account(&bank, &nonce_pubkey).unwrap();
 
+        Arc::get_mut(&mut bank)
+            .unwrap()
+            .activate_feature(&feature_set::merge_nonce_error_into_system_error::id());
         for _ in 0..MAX_RECENT_BLOCKHASHES + 1 {
             goto_end_of_slot(Arc::get_mut(&mut bank).unwrap());
             bank = Arc::new(new_from_parent(&bank));
@@ -9888,7 +10060,55 @@ pub(crate) mod tests {
 
         let durable_tx = Transaction::new_signed_with_payer(
             &[
-                system_instruction::advance_nonce_account(&nonce_pubkey, &nonce_pubkey),
+                system_instruction::advance_nonce_account(&nonce_pubkey, &bad_nonce_authority),
+                system_instruction::transfer(&custodian_pubkey, &alice_pubkey, 42),
+            ],
+            Some(&custodian_pubkey),
+            &[&custodian_keypair, &bad_nonce_authority_keypair],
+            nonce_hash,
+        );
+        debug!("{:?}", durable_tx);
+        let initial_custodian_balance = custodian_account.lamports();
+        assert_eq!(
+            bank.process_transaction(&durable_tx),
+            Err(TransactionError::InstructionError(
+                0,
+                InstructionError::MissingRequiredSignature,
+            ))
+        );
+        /* Check fee charged and nonce has *not* advanced */
+        assert_eq!(
+            bank.get_balance(&custodian_pubkey),
+            initial_custodian_balance - 10_000
+        );
+        assert_eq!(nonce_hash, get_nonce_account(&bank, &nonce_pubkey).unwrap());
+    }
+
+    #[test]
+    fn test_nonce_payer() {
+        solana_logger::setup();
+        let (mut bank, _mint_keypair, custodian_keypair, nonce_keypair) =
+            setup_nonce_with_bank(10_000_000, |_| {}, 5_000_000, 250_000, None).unwrap();
+        let alice_keypair = Keypair::new();
+        let alice_pubkey = alice_keypair.pubkey();
+        let custodian_pubkey = custodian_keypair.pubkey();
+        let nonce_pubkey = nonce_keypair.pubkey();
+
+        debug!("alice: {}", alice_pubkey);
+        debug!("custodian: {}", custodian_pubkey);
+        debug!("nonce: {}", nonce_pubkey);
+        debug!("nonce account: {:?}", bank.get_account(&nonce_pubkey));
+        debug!("cust: {:?}", bank.get_account(&custodian_pubkey));
+        let nonce_hash = get_nonce_account(&bank, &nonce_pubkey).unwrap();
+
+        for _ in 0..MAX_RECENT_BLOCKHASHES + 1 {
+            goto_end_of_slot(Arc::get_mut(&mut bank).unwrap());
+            bank = Arc::new(new_from_parent(&bank));
+        }
+
+        let durable_tx = Transaction::new_signed_with_payer(
+            &[
+                system_instruction::advance_nonce_account(&nonce_pubkey, &nonce_pubkey),
                 system_instruction::transfer(&custodian_pubkey, &alice_pubkey, 100_000_000),
             ],
             Some(&nonce_pubkey),
@@ -10039,7 +10259,7 @@ pub(crate) mod tests {
         let pubkey2 = solana_sdk::pubkey::new_rand();
         let keypair0_account = AccountSharedData::new(8, 0, &Pubkey::default());
         let keypair1_account = AccountSharedData::new(9, 0, &Pubkey::default());
-        let account0 = AccountSharedData::new(11, 0, &&Pubkey::default());
+        let account0 = AccountSharedData::new(11, 0, &Pubkey::default());
         bank0.store_account(&keypair0.pubkey(), &keypair0_account);
         bank0.store_account(&keypair1.pubkey(), &keypair1_account);
         bank0.store_account(&pubkey0, &account0);
@@ -10062,9 +10282,11 @@ pub(crate) mod tests {
                 &mut ExecuteTimings::default(),
             );
 
-        assert!(inner_instructions[0].iter().all(|ix| ix.is_empty()));
-        assert_eq!(transaction_logs.len(), 0);
+        assert!(inner_instructions.iter().all(Option::is_none));
+        assert!(transaction_logs.iter().all(Option::is_none));
 
+        assert_eq!(inner_instructions.len(), 3);
+        assert_eq!(transaction_logs.len(), 3);
         assert_eq!(transaction_balances_set.pre_balances.len(), 3);
         assert_eq!(transaction_balances_set.post_balances.len(), 3);
 
@@ -10556,25 +10778,25 @@ pub(crate) mod tests {
             if bank.slot == 0 {
                 assert_eq!(
                     bank.hash().to_string(),
-                    "Cn7Wmi7w1n9NbK7RGnTQ4LpbJ2LtoJoc1sufiTwb57Ya"
+                    "BfvaoHkrQwrkQo7T1mW6jmJXveRy11rut8bva2H1Rt5H"
                 );
             }
             if bank.slot == 32 {
                 assert_eq!(
                     bank.hash().to_string(),
-                    "BXupB8XsZukMTnDbKshJ8qPCydWnc8BKtSj7YTJ6gAH"
+                    "JBGPApnSMPKZaYiR16v46XSSGcKxy8kCbVtN1CG1XDxW"
                 );
             }
             if bank.slot == 64 {
                 assert_eq!(
                     bank.hash().to_string(),
-                    "EDkKefgSMSV1NhxnGnJP7R5AGZ2JZD6oxnoZtGuEGBCU"
+                    "BDCt9cGPfxpgJXzp8Tq1nX1zSqpbs8xrkAFyRhmXKiuX"
                 );
             }
             if bank.slot == 128 {
                 assert_eq!(
                     bank.hash().to_string(),
-                    "AtWu4tubU9zGFChfHtQghQx3RVWtMQu6Rj49rQymFc4z"
+                    "4zUpK4VUhKLaPUgeMMSeDR2w827goriRL5NndJxGDVmz"
                 );
                 break;
             }
@@ -10630,6 +10852,7 @@ pub(crate) mod tests {
             &genesis_config,
             AccountSecondaryIndexes::default(),
             false,
+            AccountShrinkThreshold::default(),
         ));
         bank0.restore_old_behavior_for_fragile_tests();
         goto_end_of_slot(Arc::<Bank>::get_mut(&mut bank0).unwrap());
@@ -10641,11 +10864,13 @@ pub(crate) mod tests {
             .accounts
             .scan_slot(0, |stored_account| Some(stored_account.stored_size()));
 
-        // Create an account such that it takes SHRINK_RATIO of the total account space for
+        // Create an account such that it takes DEFAULT_ACCOUNTS_SHRINK_RATIO of the total account space for
         // the slot, so when it gets pruned, the storage entry will become a shrink candidate.
         let bank0_total_size: usize = sizes.into_iter().sum();
-        let pubkey0_size = (bank0_total_size as f64 / (1.0 - SHRINK_RATIO)).ceil();
-        assert!(pubkey0_size / (pubkey0_size + bank0_total_size as f64) > SHRINK_RATIO);
+        let pubkey0_size = (bank0_total_size as f64 / (1.0 - DEFAULT_ACCOUNTS_SHRINK_RATIO)).ceil();
+        assert!(
+            pubkey0_size / (pubkey0_size + bank0_total_size as f64) > DEFAULT_ACCOUNTS_SHRINK_RATIO
+        );
         pubkey0_size as usize
     }
 
@@ -10663,6 +10888,7 @@ pub(crate) mod tests {
             &genesis_config,
             AccountSecondaryIndexes::default(),
             true,
+            AccountShrinkThreshold::default(),
         ));
         bank0.restore_old_behavior_for_fragile_tests();
 
@@ -10720,7 +10946,7 @@ pub(crate) mod tests {
         // No more slots should be shrunk
         assert_eq!(bank2.shrink_candidate_slots(), 0);
         // alive_counts represents the count of alive accounts in the three slots 0,1,2
-        assert_eq!(alive_counts, vec![9, 1, 7]);
+        assert_eq!(alive_counts, vec![10, 1, 7]);
     }
 
     #[test]
@@ -10768,7 +10994,7 @@ pub(crate) mod tests {
             .map(|_| bank.process_stale_slot_with_budget(0, force_to_return_alive_account))
             .sum();
         // consumed_budgets represents the count of alive accounts in the three slots 0,1,2
-        assert_eq!(consumed_budgets, 10);
+        assert_eq!(consumed_budgets, 11);
     }
 
     #[test]
@@ -11012,16 +11238,16 @@ pub(crate) mod tests {
         let program_id = solana_sdk::pubkey::new_rand();
 
         bank.add_native_program("mock_program", &program_id, false);
-        assert_eq!(bank.capitalization(), bank.calculate_capitalization());
+        assert_eq!(bank.capitalization(), bank.calculate_capitalization(true));
 
         // someone mess with program_id's balance
         bank.withdraw(&mint_keypair.pubkey(), 10).unwrap();
-        assert_ne!(bank.capitalization(), bank.calculate_capitalization());
+        assert_ne!(bank.capitalization(), bank.calculate_capitalization(true));
         bank.deposit(&program_id, 10).unwrap();
-        assert_eq!(bank.capitalization(), bank.calculate_capitalization());
+        assert_eq!(bank.capitalization(), bank.calculate_capitalization(true));
 
         bank.add_native_program("mock_program v2", &program_id, true);
-        assert_eq!(bank.capitalization(), bank.calculate_capitalization());
+        assert_eq!(bank.capitalization(), bank.calculate_capitalization(true));
     }
 
     #[test]
@@ -11032,12 +11258,12 @@ pub(crate) mod tests {
 
         // someone managed to squat at program_id!
         bank.withdraw(&mint_keypair.pubkey(), 10).unwrap();
-        assert_ne!(bank.capitalization(), bank.calculate_capitalization());
+        assert_ne!(bank.capitalization(), bank.calculate_capitalization(true));
         bank.deposit(&program_id, 10).unwrap();
-        assert_eq!(bank.capitalization(), bank.calculate_capitalization());
+        assert_eq!(bank.capitalization(), bank.calculate_capitalization(true));
 
         bank.add_native_program("mock_program", &program_id, false);
-        assert_eq!(bank.capitalization(), bank.calculate_capitalization());
+        assert_eq!(bank.capitalization(), bank.calculate_capitalization(true));
     }
 
     #[test]
@@ -11188,13 +11414,13 @@ pub(crate) mod tests {
             bank0.capitalization() + 1 + 1_000_000_000 + sysvar_and_native_proram_delta,
             bank1.capitalization()
         );
-        assert_eq!(bank1.capitalization(), bank1.calculate_capitalization());
+        assert_eq!(bank1.capitalization(), bank1.calculate_capitalization(true));
 
         // Depending on RUSTFLAGS, this test exposes rust's checked math behavior or not...
         // So do some convolted setup; anyway this test itself will just be temporary
         let bank0 = std::panic::AssertUnwindSafe(bank0);
         let overflowing_capitalization =
-            std::panic::catch_unwind(|| bank0.calculate_capitalization());
+            std::panic::catch_unwind(|| bank0.calculate_capitalization(true));
         if let Ok(overflowing_capitalization) = overflowing_capitalization {
             info!("asserting overflowing capitalization for bank0");
             assert_eq!(overflowing_capitalization, bank0.capitalization());
@@ -11474,7 +11700,7 @@ pub(crate) mod tests {
     }
 
     #[test]
-    fn test_spl_token_v2_self_transfer_fix() {
+    fn test_spl_token_v2_replacement() {
         let (genesis_config, _mint_keypair) = create_genesis_config(0);
         let mut bank = Bank::new(&genesis_config);
 
@@ -11504,7 +11730,7 @@ pub(crate) mod tests {
 
         let original_capitalization = bank.capitalization();
 
-        bank.apply_spl_token_v2_self_transfer_fix();
+        bank.apply_spl_token_v2_set_authority_fix();
 
         // New token account is now empty
         assert_eq!(
@@ -11535,6 +11761,265 @@ pub(crate) mod tests {
         bank.store_account(vote_pubkey, &vote_account);
     }
 
+    fn min_rent_excempt_balance_for_sysvars(bank: &Bank, sysvar_ids: &[Pubkey]) -> u64 {
+        sysvar_ids
+            .iter()
+            .map(|sysvar_id| {
+                trace!("min_rent_excempt_balance_for_sysvars: {}", sysvar_id);
+                bank.get_minimum_balance_for_rent_exemption(
+                    bank.get_account(sysvar_id).unwrap().data().len(),
+                )
+            })
+            .sum()
+    }
+
+    fn expected_cap_delta_after_sysvar_reset(bank: &Bank, sysvar_ids: &[Pubkey]) -> u64 {
+        min_rent_excempt_balance_for_sysvars(bank, sysvar_ids) - sysvar_ids.len() as u64
+    }
+
+    #[test]
+    fn test_adjust_sysvar_balance_for_rent() {
+        let (genesis_config, _mint_keypair) = create_genesis_config(0);
+        let bank = Bank::new(&genesis_config);
+        let mut smaller_sample_sysvar = bank.get_account(&sysvar::clock::id()).unwrap();
+        assert_eq!(smaller_sample_sysvar.lamports(), 1);
+        bank.adjust_sysvar_balance_for_rent(&mut smaller_sample_sysvar);
+        assert_eq!(
+            smaller_sample_sysvar.lamports(),
+            bank.get_minimum_balance_for_rent_exemption(smaller_sample_sysvar.data().len()),
+        );
+
+        let mut bigger_sample_sysvar = AccountSharedData::new(
+            1,
+            smaller_sample_sysvar.data().len() + 1,
+            &Pubkey::default(),
+        );
+        bank.adjust_sysvar_balance_for_rent(&mut bigger_sample_sysvar);
+        assert!(smaller_sample_sysvar.lamports() < bigger_sample_sysvar.lamports());
+
+        // excess lamports shouldn't be reduced by adjust_sysvar_balance_for_rent()
+        let excess_lamports = smaller_sample_sysvar.lamports() + 999;
+        smaller_sample_sysvar.set_lamports(excess_lamports);
+        bank.adjust_sysvar_balance_for_rent(&mut smaller_sample_sysvar);
+        assert_eq!(smaller_sample_sysvar.lamports(), excess_lamports);
+    }
+
+    // this test can be removed after rent_for_sysvars activation on mainnet-beta
+    #[test]
+    fn test_no_deletion_due_to_rent_upon_rent_for_sysvar_activation() {
+        solana_logger::setup();
+
+        let (mut genesis_config, _mint_keypair) = create_genesis_config(0);
+        let feature_balance =
+            std::cmp::max(genesis_config.rent.minimum_balance(Feature::size_of()), 1);
+
+        // activate all features but rent_for_sysvars
+        activate_all_features(&mut genesis_config);
+        genesis_config
+            .accounts
+            .remove(&feature_set::rent_for_sysvars::id());
+        let bank0 = Bank::new(&genesis_config);
+        let bank1 = Arc::new(new_from_parent(&Arc::new(bank0)));
+
+        // schedule activation of simple capitalization
+        bank1.store_account_and_update_capitalization(
+            &feature_set::rent_for_sysvars::id(),
+            &feature::create_account(&Feature { activated_at: None }, feature_balance),
+        );
+
+        let bank2 =
+            Bank::new_from_parent(&bank1, &Pubkey::default(), bank1.first_slot_in_next_epoch());
+        assert_eq!(bank2.get_program_accounts(&sysvar::id()).unwrap().len(), 8);
+
+        // force rent collection for sysvars
+        bank2.collect_rent_in_partition((0, 0, 1)); // all range
+
+        // no sysvar should be deleted due to rent
+        assert_eq!(bank2.get_program_accounts(&sysvar::id()).unwrap().len(), 8);
+    }
+
+    // this test can be removed after rent_for_sysvars activation on mainnet-beta
+    #[test]
+    fn test_rent_for_sysvars_adjustment_minimum_genesis_set() {
+        solana_logger::setup();
+
+        let (mut genesis_config, _mint_keypair) = create_genesis_config(0);
+        let feature_balance =
+            std::cmp::max(genesis_config.rent.minimum_balance(Feature::size_of()), 1);
+
+        // inhibit deprecated rewards sysvar creation altogether
+        genesis_config.accounts.insert(
+            feature_set::deprecate_rewards_sysvar::id(),
+            Account::from(feature::create_account(
+                &Feature {
+                    activated_at: Some(0),
+                },
+                feature_balance,
+            )),
+        );
+
+        let bank0 = Bank::new(&genesis_config);
+        let bank1 = Arc::new(new_from_parent(&Arc::new(bank0)));
+
+        // schedule activation of rent_for_sysvars
+        bank1.store_account_and_update_capitalization(
+            &feature_set::rent_for_sysvars::id(),
+            &feature::create_account(&Feature { activated_at: None }, feature_balance),
+        );
+
+        {
+            let sysvars = bank1.get_program_accounts(&sysvar::id()).unwrap();
+            assert_eq!(sysvars.len(), 8);
+            assert!(sysvars
+                .iter()
+                .map(|(_pubkey, account)| account.lamports())
+                .all(|lamports| lamports == 1));
+        }
+
+        // 8 sysvars should be reset by reset_all_sysvar_balances()
+        let bank2 = assert_capitalization_diff_with_new_bank(
+            &bank1,
+            || Bank::new_from_parent(&bank1, &Pubkey::default(), bank1.first_slot_in_next_epoch()),
+            |old, new| {
+                assert_eq!(
+                    old + expected_cap_delta_after_sysvar_reset(
+                        &bank1,
+                        &[
+                            sysvar::clock::id(),
+                            sysvar::epoch_schedule::id(),
+                            sysvar::fees::id(),
+                            sysvar::recent_blockhashes::id(),
+                            sysvar::rent::id(),
+                            sysvar::slot_hashes::id(),
+                            sysvar::slot_history::id(),
+                            sysvar::stake_history::id(),
+                        ]
+                    ),
+                    new
+                )
+            },
+        );
+
+        {
+            let sysvars = bank2.get_program_accounts(&sysvar::id()).unwrap();
+            assert_eq!(sysvars.len(), 8);
+            assert!(sysvars
+                .iter()
+                .map(|(_pubkey, account)| account.lamports())
+                .all(|lamports| lamports > 1));
+        }
+    }
+
+    // this test can be removed after rent_for_sysvars activation on mainnet-beta
+    #[test]
+    fn test_rent_for_sysvars_adjustment_full_set() {
+        solana_logger::setup();
+
+        let (mut genesis_config, _mint_keypair) = create_genesis_config(0);
+        let feature_balance =
+            std::cmp::max(genesis_config.rent.minimum_balance(Feature::size_of()), 1);
+
+        // activate all features but rent_for_sysvars
+        activate_all_features(&mut genesis_config);
+        genesis_config
+            .accounts
+            .remove(&feature_set::rent_for_sysvars::id());
+        // intentionally create deprecated rewards sysvar creation
+        genesis_config
+            .accounts
+            .remove(&feature_set::deprecate_rewards_sysvar::id());
+
+        // intentionally create bogus native programs
+        #[allow(clippy::unnecessary_wraps)]
+        fn mock_process_instruction(
+            _program_id: &Pubkey,
+            _data: &[u8],
+            _invoke_context: &mut dyn InvokeContext,
+        ) -> std::result::Result<(), solana_sdk::instruction::InstructionError> {
+            Ok(())
+        }
+        let builtins = Builtins {
+            genesis_builtins: vec![
+                Builtin::new(
+                    "mock bpf",
+                    solana_sdk::bpf_loader::id(),
+                    mock_process_instruction,
+                ),
+                Builtin::new(
+                    "mock bpf",
+                    solana_sdk::bpf_loader_deprecated::id(),
+                    mock_process_instruction,
+                ),
+            ],
+            feature_builtins: (vec![]),
+        };
+
+        let bank0 = Arc::new(Bank::new_with_paths(
+            &genesis_config,
+            Vec::new(),
+            &[],
+            None,
+            Some(&builtins),
+            AccountSecondaryIndexes::default(),
+            false,
+            AccountShrinkThreshold::default(),
+            false,
+        ));
+        // move to next epoch to create now deprecated rewards sysvar intentionally
+        let bank1 = Arc::new(Bank::new_from_parent(
+            &bank0,
+            &Pubkey::default(),
+            bank0.first_slot_in_next_epoch(),
+        ));
+
+        // schedule activation of simple capitalization
+        bank1.store_account_and_update_capitalization(
+            &feature_set::rent_for_sysvars::id(),
+            &feature::create_account(&Feature { activated_at: None }, feature_balance),
+        );
+        {
+            let sysvars = bank1.get_program_accounts(&sysvar::id()).unwrap();
+            assert_eq!(sysvars.len(), 9);
+            assert!(sysvars
+                .iter()
+                .map(|(_pubkey, account)| account.lamports())
+                .all(|lamports| lamports == 1));
+        }
+
+        // 9 sysvars should be reset by reset_all_sysvar_balances()
+        let bank2 = assert_capitalization_diff_with_new_bank(
+            &bank1,
+            || Bank::new_from_parent(&bank1, &Pubkey::default(), bank1.first_slot_in_next_epoch()),
+            |old, new| {
+                assert_eq!(
+                    old + expected_cap_delta_after_sysvar_reset(
+                        &bank1,
+                        &[
+                            sysvar::clock::id(),
+                            sysvar::epoch_schedule::id(),
+                            sysvar::fees::id(),
+                            sysvar::recent_blockhashes::id(),
+                            sysvar::rent::id(),
+                            sysvar::rewards::id(),
+                            sysvar::slot_hashes::id(),
+                            sysvar::slot_history::id(),
+                            sysvar::stake_history::id(),
+                        ]
+                    ),
+                    new
+                )
+            },
+        );
+        {
+            let sysvars = bank2.get_program_accounts(&sysvar::id()).unwrap();
+            assert_eq!(sysvars.len(), 9);
+            assert!(sysvars
+                .iter()
+                .map(|(_pubkey, account)| account.lamports())
+                .all(|lamports| lamports > 1));
+        }
+    }
+
     #[test]
     fn test_update_clock_timestamp() {
         let leader_pubkey = solana_sdk::pubkey::new_rand();
@@ -11857,18 +12342,32 @@ pub(crate) mod tests {
     fn test_debug_bank() {
         let (genesis_config, _mint_keypair) = create_genesis_config(50000);
         let mut bank = Bank::new(&genesis_config);
-        bank.finish_init(&genesis_config, None);
+        bank.finish_init(&genesis_config, None, false);
         let debug = format!("{:#?}", bank);
         assert!(!debug.is_empty());
     }
 
+    #[derive(Debug)]
+    enum AcceptableScanResults {
+        DroppedSlotError,
+        NoFailure,
+        Both,
+    }
+
     fn test_store_scan_consistency<F: 'static>(
         accounts_db_caching_enabled: bool,
         update_f: F,
         drop_callback: Option<Box<dyn DropCallback + Send + Sync>>,
+        acceptable_scan_results: AcceptableScanResults,
     ) where
-        F: Fn(Arc<Bank>, crossbeam_channel::Sender<Arc<Bank>>, Arc<HashSet<Pubkey>>, Pubkey, u64)
-            + std::marker::Send,
+        F: Fn(
+                Arc<Bank>,
+                crossbeam_channel::Sender<Arc<Bank>>,
+                crossbeam_channel::Receiver<BankId>,
+                Arc<HashSet<Pubkey>>,
+                Pubkey,
+                u64,
+            ) + std::marker::Send,
     {
         // Set up initial bank
         let mut genesis_config = create_genesis_config_with_leader(
@@ -11882,6 +12381,7 @@ pub(crate) mod tests {
             &genesis_config,
             AccountSecondaryIndexes::default(),
             accounts_db_caching_enabled,
+            AccountShrinkThreshold::default(),
         ));
         bank0.set_callback(drop_callback);
 
@@ -11897,7 +12397,7 @@ pub(crate) mod tests {
 
         // Write accounts to the store
         for key in &all_pubkeys {
-            bank0.store_account(&key, &starting_account);
+            bank0.store_account(key, &starting_account);
         }
 
         // Set aside a subset of accounts to modify
@@ -11912,48 +12412,83 @@ pub(crate) mod tests {
         // Thread that runs scan and constantly checks for
         // consistency
         let pubkeys_to_modify_ = pubkeys_to_modify.clone();
-        let exit_ = exit.clone();
 
         // Channel over which the bank to scan is sent
         let (bank_to_scan_sender, bank_to_scan_receiver): (
             crossbeam_channel::Sender<Arc<Bank>>,
             crossbeam_channel::Receiver<Arc<Bank>>,
         ) = bounded(1);
-        let scan_thread = Builder::new()
-            .name("scan".to_string())
-            .spawn(move || loop {
-                if exit_.load(Relaxed) {
-                    return;
-                }
-                if let Ok(bank_to_scan) =
-                    bank_to_scan_receiver.recv_timeout(Duration::from_millis(10))
-                {
-                    let accounts = bank_to_scan.get_program_accounts(&program_id);
-                    // Should never see empty accounts because no slot ever deleted
-                    // any of the original accounts, and the scan should reflect the
-                    // account state at some frozen slot `X` (no partial updates).
-                    assert!(!accounts.is_empty());
-                    let mut expected_lamports = None;
-                    let mut target_accounts_found = HashSet::new();
-                    for (pubkey, account) in accounts {
-                        let account_balance = account.lamports();
-                        if pubkeys_to_modify_.contains(&pubkey) {
-                            target_accounts_found.insert(pubkey);
-                            if let Some(expected_lamports) = expected_lamports {
-                                assert_eq!(account_balance, expected_lamports);
-                            } else {
-                                // All pubkeys in the specified set should have the same balance
-                                expected_lamports = Some(account_balance);
+
+        let (scan_finished_sender, scan_finished_receiver): (
+            crossbeam_channel::Sender<BankId>,
+            crossbeam_channel::Receiver<BankId>,
+        ) = unbounded();
+        let num_banks_scanned = Arc::new(AtomicU64::new(0));
+        let scan_thread = {
+            let exit = exit.clone();
+            let num_banks_scanned = num_banks_scanned.clone();
+            Builder::new()
+                .name("scan".to_string())
+                .spawn(move || {
+                    loop {
+                        info!("starting scan iteration");
+                        if exit.load(Relaxed) {
+                            info!("scan exiting");
+                            return;
+                        }
+                        if let Ok(bank_to_scan) =
+                            bank_to_scan_receiver.recv_timeout(Duration::from_millis(10))
+                        {
+                            info!("scanning program accounts for slot {}", bank_to_scan.slot());
+                            let accounts_result = bank_to_scan.get_program_accounts(&program_id);
+                            let _ = scan_finished_sender.send(bank_to_scan.bank_id());
+                            num_banks_scanned.fetch_add(1, Relaxed);
+                            match (&acceptable_scan_results, accounts_result.is_err()) {
+                                (AcceptableScanResults::DroppedSlotError, _)
+                                | (AcceptableScanResults::Both, true) => {
+                                    assert_eq!(
+                                        accounts_result,
+                                        Err(ScanError::SlotRemoved {
+                                            slot: bank_to_scan.slot(),
+                                            bank_id: bank_to_scan.bank_id()
+                                        })
+                                    );
+                                }
+                                (AcceptableScanResults::NoFailure, _)
+                                | (AcceptableScanResults::Both, false) => {
+                                    assert!(accounts_result.is_ok())
+                                }
+                            }
+
+                            // Should never see empty accounts because no slot ever deleted
+                            // any of the original accounts, and the scan should reflect the
+                            // account state at some frozen slot `X` (no partial updates).
+                            if let Ok(accounts) = accounts_result {
+                                assert!(!accounts.is_empty());
+                                let mut expected_lamports = None;
+                                let mut target_accounts_found = HashSet::new();
+                                for (pubkey, account) in accounts {
+                                    let account_balance = account.lamports();
+                                    if pubkeys_to_modify_.contains(&pubkey) {
+                                        target_accounts_found.insert(pubkey);
+                                        if let Some(expected_lamports) = expected_lamports {
+                                            assert_eq!(account_balance, expected_lamports);
+                                        } else {
+                                            // All pubkeys in the specified set should have the same balance
+                                            expected_lamports = Some(account_balance);
+                                        }
+                                    }
+                                }
+
+                                // Should've found all the accounts, i.e. no partial cleans should
+                                // be detected
+                                assert_eq!(target_accounts_found.len(), total_pubkeys_to_modify);
                             }
                         }
                     }
-
-                    // Should've found all the accounts, i.e. no partial cleans should
-                    // be detected
-                    assert_eq!(target_accounts_found.len(), total_pubkeys_to_modify);
-                }
-            })
-            .unwrap();
+                })
+                .unwrap()
+        };
 
         // Thread that constantly updates the accounts, sets
         // roots, and cleans
@@ -11963,6 +12498,7 @@ pub(crate) mod tests {
                 update_f(
                     bank0,
                     bank_to_scan_sender,
+                    scan_finished_receiver,
                     pubkeys_to_modify,
                     program_id,
                     starting_lamports,
@@ -11971,7 +12507,15 @@ pub(crate) mod tests {
             .unwrap();
 
         // Let threads run for a while, check the scans didn't see any mixed slots
+        let min_expected_number_of_scans = 5;
         std::thread::sleep(Duration::new(5, 0));
+        loop {
+            if num_banks_scanned.load(Relaxed) > min_expected_number_of_scans {
+                break;
+            } else {
+                std::thread::sleep(Duration::from_millis(100));
+            }
+        }
         exit.store(true, Relaxed);
         scan_thread.join().unwrap();
         update_thread.join().unwrap();
@@ -11989,6 +12533,7 @@ pub(crate) mod tests {
                 *accounts_db_caching_enabled,
                 move |bank0,
                       bank_to_scan_sender,
+                      _scan_finished_receiver,
                       pubkeys_to_modify,
                       program_id,
                       starting_lamports| {
@@ -12073,6 +12618,7 @@ pub(crate) mod tests {
                 Some(Box::new(SendDroppedBankCallback::new(
                     pruned_banks_sender.clone(),
                 ))),
+                AcceptableScanResults::NoFailure,
             )
         }
     }
@@ -12082,7 +12628,12 @@ pub(crate) mod tests {
         for accounts_db_caching_enabled in &[false, true] {
             test_store_scan_consistency(
                 *accounts_db_caching_enabled,
-                |bank0, bank_to_scan_sender, pubkeys_to_modify, program_id, starting_lamports| {
+                |bank0,
+                 bank_to_scan_sender,
+                 _scan_finished_receiver,
+                 pubkeys_to_modify,
+                 program_id,
+                 starting_lamports| {
                     let mut current_bank = bank0.clone();
                     let mut prev_bank = bank0;
                     loop {
@@ -12117,28 +12668,244 @@ pub(crate) mod tests {
                     }
                 },
                 None,
+                AcceptableScanResults::NoFailure,
             );
         }
     }
 
+    fn setup_banks_on_fork_to_remove(
+        bank0: Arc<Bank>,
+        pubkeys_to_modify: Arc<HashSet<Pubkey>>,
+        program_id: &Pubkey,
+        starting_lamports: u64,
+        num_banks_on_fork: usize,
+        step_size: usize,
+    ) -> (Arc<Bank>, Vec<(Slot, BankId)>, Ancestors) {
+        // Need at least 2 keys to create inconsistency in account balances when deleting
+        // slots
+        assert!(pubkeys_to_modify.len() > 1);
+
+        // Tracks the bank at the tip of the to be created fork
+        let mut bank_at_fork_tip = bank0;
+
+        // All the slots on the fork except slot 0
+        let mut slots_on_fork = Vec::with_capacity(num_banks_on_fork);
+
+        // All accounts in each set of `step_size` slots will have the same account balances.
+        // The account balances of the accounts changes every `step_size` banks. Thus if you
+        // delete any one of the latest `step_size` slots, then you will see varying account
+        // balances when loading the accounts.
+        assert!(num_banks_on_fork >= 2);
+        assert!(step_size >= 2);
+        let pubkeys_to_modify: Vec<Pubkey> = pubkeys_to_modify.iter().cloned().collect();
+        let pubkeys_to_modify_per_slot = (pubkeys_to_modify.len() / step_size).max(1);
+        for _ in (0..num_banks_on_fork).step_by(step_size) {
+            let mut lamports_this_round = 0;
+            for i in 0..step_size {
+                bank_at_fork_tip = Arc::new(Bank::new_from_parent(
+                    &bank_at_fork_tip,
+                    &solana_sdk::pubkey::new_rand(),
+                    bank_at_fork_tip.slot() + 1,
+                ));
+                if lamports_this_round == 0 {
+                    lamports_this_round = bank_at_fork_tip.bank_id() + starting_lamports + 1;
+                }
+                let pubkey_to_modify_starting_index = i * pubkeys_to_modify_per_slot;
+                let account = AccountSharedData::new(lamports_this_round, 0, program_id);
+                for pubkey_index_to_modify in pubkey_to_modify_starting_index
+                    ..pubkey_to_modify_starting_index + pubkeys_to_modify_per_slot
+                {
+                    let key = pubkeys_to_modify[pubkey_index_to_modify % pubkeys_to_modify.len()];
+                    bank_at_fork_tip.store_account(&key, &account);
+                }
+                bank_at_fork_tip.freeze();
+                slots_on_fork.push((bank_at_fork_tip.slot(), bank_at_fork_tip.bank_id()));
+            }
+        }
+
+        let ancestors: Vec<(Slot, usize)> = slots_on_fork.iter().map(|(s, _)| (*s, 0)).collect();
+        let ancestors = Ancestors::from(ancestors);
+
+        (bank_at_fork_tip, slots_on_fork, ancestors)
+    }
+
     #[test]
-    fn test_stake_rewrite() {
-        let GenesisConfigInfo { genesis_config, .. } =
-            create_genesis_config_with_leader(500, &solana_sdk::pubkey::new_rand(), 1);
-        let bank = Arc::new(Bank::new(&genesis_config));
+    fn test_remove_unrooted_before_scan() {
+        for accounts_db_caching_enabled in &[false, true] {
+            test_store_scan_consistency(
+                *accounts_db_caching_enabled,
+                |bank0,
+                 bank_to_scan_sender,
+                 scan_finished_receiver,
+                 pubkeys_to_modify,
+                 program_id,
+                 starting_lamports| {
+                    loop {
+                        let (bank_at_fork_tip, slots_on_fork, ancestors) =
+                            setup_banks_on_fork_to_remove(
+                                bank0.clone(),
+                                pubkeys_to_modify.clone(),
+                                &program_id,
+                                starting_lamports,
+                                10,
+                                2,
+                            );
+                        // Test removing the slot before the scan starts, should cause
+                        // SlotRemoved error every time
+                        for k in pubkeys_to_modify.iter() {
+                            assert!(bank_at_fork_tip.load_slow(&ancestors, k).is_some());
+                        }
+                        bank_at_fork_tip.remove_unrooted_slots(&slots_on_fork);
 
-        // quickest way of creting bad stake account
-        let bootstrap_stake_pubkey = bank
-            .cloned_stake_delegations()
-            .keys()
-            .next()
-            .copied()
-            .unwrap();
-        let mut bootstrap_stake_account = bank.get_account(&bootstrap_stake_pubkey).unwrap();
-        bootstrap_stake_account.set_lamports(10000000);
-        bank.store_account(&bootstrap_stake_pubkey, &bootstrap_stake_account);
+                        // Accounts on this fork should not be found after removal
+                        for k in pubkeys_to_modify.iter() {
+                            assert!(bank_at_fork_tip.load_slow(&ancestors, k).is_none());
+                        }
+                        if bank_to_scan_sender.send(bank_at_fork_tip.clone()).is_err() {
+                            return;
+                        }
 
-        assert_eq!(bank.rewrite_stakes(), (1, 1));
+                        // Wait for scan to finish before starting next iteration
+                        let finished_scan_bank_id = scan_finished_receiver.recv();
+                        if finished_scan_bank_id.is_err() {
+                            return;
+                        }
+                        assert_eq!(finished_scan_bank_id.unwrap(), bank_at_fork_tip.bank_id());
+                    }
+                },
+                None,
+                // Test removing the slot before the scan starts, should error every time
+                AcceptableScanResults::DroppedSlotError,
+            );
+        }
+    }
+
+    #[test]
+    fn test_remove_unrooted_scan_then_recreate_same_slot_before_scan() {
+        for accounts_db_caching_enabled in &[false, true] {
+            test_store_scan_consistency(
+                *accounts_db_caching_enabled,
+                |bank0,
+                 bank_to_scan_sender,
+                 scan_finished_receiver,
+                 pubkeys_to_modify,
+                 program_id,
+                 starting_lamports| {
+                    let mut prev_bank = bank0.clone();
+                    loop {
+                        let start = Instant::now();
+                        let (bank_at_fork_tip, slots_on_fork, ancestors) =
+                            setup_banks_on_fork_to_remove(
+                                bank0.clone(),
+                                pubkeys_to_modify.clone(),
+                                &program_id,
+                                starting_lamports,
+                                10,
+                                2,
+                            );
+                        info!("setting up banks elapsed: {}", start.elapsed().as_millis());
+                        // Remove the fork. Then we'll recreate the slots and only after we've
+                        // recreated the slots, do we send this old bank for scanning.
+                        // Skip scanning bank 0 on first iteration of loop, since those accounts
+                        // aren't being removed
+                        if prev_bank.slot() != 0 {
+                            info!(
+                                "sending bank with slot: {:?}, elapsed: {}",
+                                prev_bank.slot(),
+                                start.elapsed().as_millis()
+                            );
+                            // Although we dumped the slots last iteration via `remove_unrooted_slots()`,
+                            // we've recreated those slots this iteration, so they should be findable
+                            // again
+                            for k in pubkeys_to_modify.iter() {
+                                assert!(bank_at_fork_tip.load_slow(&ancestors, k).is_some());
+                            }
+
+                            // Now after we've recreated the slots removed in the previous loop
+                            // iteration, send the previous bank, should fail even though the
+                            // same slots were recreated
+                            if bank_to_scan_sender.send(prev_bank.clone()).is_err() {
+                                return;
+                            }
+
+                            let finished_scan_bank_id = scan_finished_receiver.recv();
+                            if finished_scan_bank_id.is_err() {
+                                return;
+                            }
+                            // Wait for scan to finish before starting next iteration
+                            assert_eq!(finished_scan_bank_id.unwrap(), prev_bank.bank_id());
+                        }
+                        bank_at_fork_tip.remove_unrooted_slots(&slots_on_fork);
+                        prev_bank = bank_at_fork_tip;
+                    }
+                },
+                None,
+                // Test removing the slot before the scan starts, should error every time
+                AcceptableScanResults::DroppedSlotError,
+            );
+        }
+    }
+
+    #[test]
+    fn test_remove_unrooted_scan_interleaved_with_remove_unrooted_slots() {
+        for accounts_db_caching_enabled in &[false, true] {
+            test_store_scan_consistency(
+                *accounts_db_caching_enabled,
+                |bank0,
+                 bank_to_scan_sender,
+                 scan_finished_receiver,
+                 pubkeys_to_modify,
+                 program_id,
+                 starting_lamports| {
+                    loop {
+                        let step_size = 2;
+                        let (bank_at_fork_tip, slots_on_fork, ancestors) =
+                            setup_banks_on_fork_to_remove(
+                                bank0.clone(),
+                                pubkeys_to_modify.clone(),
+                                &program_id,
+                                starting_lamports,
+                                10,
+                                step_size,
+                            );
+                        // Although we dumped the slots last iteration via `remove_unrooted_slots()`,
+                        // we've recreated those slots this iteration, so they should be findable
+                        // again
+                        for k in pubkeys_to_modify.iter() {
+                            assert!(bank_at_fork_tip.load_slow(&ancestors, k).is_some());
+                        }
+
+                        // Now after we've recreated the slots removed in the previous loop
+                        // iteration, send the previous bank, should fail even though the
+                        // same slots were recreated
+                        if bank_to_scan_sender.send(bank_at_fork_tip.clone()).is_err() {
+                            return;
+                        }
+
+                        // Remove 1 < `step_size` of the *latest* slots while the scan is happening.
+                        // This should create inconsistency between the account balances of accounts
+                        // stored in that slot, and the accounts stored in earlier slots
+                        let slot_to_remove = *slots_on_fork.last().unwrap();
+                        bank_at_fork_tip.remove_unrooted_slots(&[slot_to_remove]);
+
+                        // Wait for scan to finish before starting next iteration
+                        let finished_scan_bank_id = scan_finished_receiver.recv();
+                        if finished_scan_bank_id.is_err() {
+                            return;
+                        }
+                        assert_eq!(finished_scan_bank_id.unwrap(), bank_at_fork_tip.bank_id());
+
+                        // Remove the rest of the slots before the next iteration
+                        for (slot, bank_id) in slots_on_fork {
+                            bank_at_fork_tip.remove_unrooted_slots(&[(slot, bank_id)]);
+                        }
+                    }
+                },
+                None,
+                // Test removing the slot before the scan starts, should error every time
+                AcceptableScanResults::Both,
+            );
+        }
     }
 
     #[test]
@@ -12547,7 +13314,9 @@ pub(crate) mod tests {
         let success_sig = tx0.signatures[0];
         let tx1 = system_transaction::transfer(&sender1, &recipient1, 110, blockhash); // Should produce insufficient funds log
         let failure_sig = tx1.signatures[0];
-        let txs = vec![tx1, tx0];
+        let mut invalid_tx = system_transaction::transfer(&sender1, &recipient1, 10, blockhash);
+        invalid_tx.message.header.num_required_signatures = 0; // this tx won't be processed because it has no signers
+        let txs = vec![invalid_tx, tx1, tx0];
         let batch = bank.prepare_batch(txs.iter());
 
         let log_results = bank
@@ -12560,17 +13329,10 @@ pub(crate) mod tests {
                 &mut ExecuteTimings::default(),
             )
             .3;
-        assert_eq!(log_results.len(), 2);
-        assert!(log_results[0]
-            .clone()
-            .pop()
-            .unwrap()
-            .contains(&"failed".to_string()));
-        assert!(log_results[1]
-            .clone()
-            .pop()
-            .unwrap()
-            .contains(&"success".to_string()));
+        assert_eq!(log_results.len(), 3);
+        assert!(log_results[0].as_ref().is_none());
+        assert!(log_results[1].as_ref().unwrap()[2].contains(&"failed".to_string()));
+        assert!(log_results[2].as_ref().unwrap()[1].contains(&"success".to_string()));
 
         let stored_logs = &bank.transaction_log_collector.read().unwrap().logs;
         let success_log_info = stored_logs
@@ -12630,21 +13392,25 @@ pub(crate) mod tests {
 
         // Return only one largest account
         assert_eq!(
-            bank.get_largest_accounts(1, &pubkeys_hashset, AccountAddressFilter::Include),
+            bank.get_largest_accounts(1, &pubkeys_hashset, AccountAddressFilter::Include)
+                .unwrap(),
             vec![(pubkeys[4], sol_to_lamports(5.0))]
         );
         assert_eq!(
-            bank.get_largest_accounts(1, &HashSet::new(), AccountAddressFilter::Exclude),
+            bank.get_largest_accounts(1, &HashSet::new(), AccountAddressFilter::Exclude)
+                .unwrap(),
             vec![(pubkeys[4], sol_to_lamports(5.0))]
         );
         assert_eq!(
-            bank.get_largest_accounts(1, &exclude4, AccountAddressFilter::Exclude),
+            bank.get_largest_accounts(1, &exclude4, AccountAddressFilter::Exclude)
+                .unwrap(),
             vec![(pubkeys[3], sol_to_lamports(4.0))]
         );
 
         // Return all added accounts
-        let results =
-            bank.get_largest_accounts(10, &pubkeys_hashset, AccountAddressFilter::Include);
+        let results = bank
+            .get_largest_accounts(10, &pubkeys_hashset, AccountAddressFilter::Include)
+            .unwrap();
         assert_eq!(results.len(), sorted_accounts.len());
         for pubkey_balance in sorted_accounts.iter() {
             assert!(results.contains(pubkey_balance));
@@ -12654,7 +13420,9 @@ pub(crate) mod tests {
         assert_eq!(sorted_results, results);
 
         let expected_accounts = sorted_accounts[1..].to_vec();
-        let results = bank.get_largest_accounts(10, &exclude4, AccountAddressFilter::Exclude);
+        let results = bank
+            .get_largest_accounts(10, &exclude4, AccountAddressFilter::Exclude)
+            .unwrap();
         // results include 5 Bank builtins
         assert_eq!(results.len(), 10);
         for pubkey_balance in expected_accounts.iter() {
@@ -12666,14 +13434,18 @@ pub(crate) mod tests {
 
         // Return 3 added accounts
         let expected_accounts = sorted_accounts[0..4].to_vec();
-        let results = bank.get_largest_accounts(4, &pubkeys_hashset, AccountAddressFilter::Include);
+        let results = bank
+            .get_largest_accounts(4, &pubkeys_hashset, AccountAddressFilter::Include)
+            .unwrap();
         assert_eq!(results.len(), expected_accounts.len());
         for pubkey_balance in expected_accounts.iter() {
             assert!(results.contains(pubkey_balance));
         }
 
         let expected_accounts = expected_accounts[1..4].to_vec();
-        let results = bank.get_largest_accounts(3, &exclude4, AccountAddressFilter::Exclude);
+        let results = bank
+            .get_largest_accounts(3, &exclude4, AccountAddressFilter::Exclude)
+            .unwrap();
         assert_eq!(results.len(), expected_accounts.len());
         for pubkey_balance in expected_accounts.iter() {
             assert!(results.contains(pubkey_balance));
@@ -12685,7 +13457,8 @@ pub(crate) mod tests {
             .cloned()
             .collect();
         assert_eq!(
-            bank.get_largest_accounts(2, &exclude, AccountAddressFilter::Exclude),
+            bank.get_largest_accounts(2, &exclude, AccountAddressFilter::Exclude)
+                .unwrap(),
             vec![pubkeys_balances[3], pubkeys_balances[1]]
         );
     }
diff --git a/runtime/src/bank_client.rs b/runtime/src/bank_client.rs
index 55d29f70456d17..0033614ff1412f 100644
--- a/runtime/src/bank_client.rs
+++ b/runtime/src/bank_client.rs
@@ -156,6 +156,7 @@ impl SyncClient for BankClient {
         _commitment_config: CommitmentConfig,
     ) -> Result<(Hash, FeeCalculator, u64)> {
         let (blockhash, fee_calculator) = self.bank.last_blockhash_with_fee_calculator();
+        #[allow(deprecated)]
         let last_valid_slot = self
             .bank
             .get_blockhash_last_valid_slot(&blockhash)
diff --git a/runtime/src/bank_forks.rs b/runtime/src/bank_forks.rs
index 08ea15147ef751..012f7244fd7ca9 100644
--- a/runtime/src/bank_forks.rs
+++ b/runtime/src/bank_forks.rs
@@ -516,7 +516,7 @@ mod tests {
                             slot: child.slot(),
                             timestamp: recent_timestamp + additional_timestamp_secs,
                         },
-                        &child,
+                        child,
                         &voting_keypair.pubkey(),
                     );
                 }
diff --git a/runtime/src/blockhash_queue.rs b/runtime/src/blockhash_queue.rs
index ee109c7a023346..5e2b76f3b50b86 100644
--- a/runtime/src/blockhash_queue.rs
+++ b/runtime/src/blockhash_queue.rs
@@ -127,7 +127,7 @@ impl BlockhashQueue {
             .map(|(k, v)| recent_blockhashes::IterItem(v.hash_height, k, &v.fee_calculator))
     }
 
-    pub fn len(&self) -> usize {
+    pub(crate) fn len(&self) -> usize {
         self.max_age
     }
 }
diff --git a/runtime/src/builtins.rs b/runtime/src/builtins.rs
index 899ad9a04e98c0..11a9837a476926 100644
--- a/runtime/src/builtins.rs
+++ b/runtime/src/builtins.rs
@@ -3,11 +3,10 @@ use crate::{
     system_instruction_processor,
 };
 use solana_sdk::{
-    feature_set,
     instruction::InstructionError,
     process_instruction::{stable_log, InvokeContext, ProcessInstructionWithContext},
     pubkey::Pubkey,
-    system_program,
+    stake, system_program,
 };
 
 fn process_instruction_with_program_logging(
@@ -56,7 +55,7 @@ fn genesis_builtins() -> Vec<Builtin> {
         ),
         Builtin::new(
             "stake_program",
-            solana_stake_program::id(),
+            stake::program::id(),
             with_program_logging!(solana_stake_program::stake_instruction::process_instruction),
         ),
         Builtin::new(
@@ -64,6 +63,11 @@ fn genesis_builtins() -> Vec<Builtin> {
             solana_config_program::id(),
             with_program_logging!(solana_config_program::config_processor::process_instruction),
         ),
+        Builtin::new(
+            "secp256k1_program",
+            solana_sdk::secp256k1_program::id(),
+            solana_secp256k1_program::process_instruction,
+        ),
     ]
 }
 
@@ -82,15 +86,7 @@ pub enum ActivationType {
 /// normal child Bank creation.
 /// https://github.com/solana-labs/solana/blob/84b139cc94b5be7c9e0c18c2ad91743231b85a0d/runtime/src/bank.rs#L1723
 fn feature_builtins() -> Vec<(Builtin, Pubkey, ActivationType)> {
-    vec![(
-        Builtin::new(
-            "secp256k1_program",
-            solana_sdk::secp256k1_program::id(),
-            solana_secp256k1_program::process_instruction,
-        ),
-        feature_set::secp256k1_program_enabled::id(),
-        ActivationType::NewProgram,
-    )]
+    vec![]
 }
 
 pub(crate) fn get() -> Builtins {
diff --git a/runtime/src/epoch_stakes.rs b/runtime/src/epoch_stakes.rs
index 3185d4bdb3086b..2fdc4ba91a9f4c 100644
--- a/runtime/src/epoch_stakes.rs
+++ b/runtime/src/epoch_stakes.rs
@@ -24,7 +24,7 @@ impl EpochStakes {
     pub fn new(stakes: &Stakes, leader_schedule_epoch: Epoch) -> Self {
         let epoch_vote_accounts = Stakes::vote_accounts(stakes);
         let (total_stake, node_id_to_vote_accounts, epoch_authorized_voters) =
-            Self::parse_epoch_vote_accounts(&epoch_vote_accounts, leader_schedule_epoch);
+            Self::parse_epoch_vote_accounts(epoch_vote_accounts, leader_schedule_epoch);
         Self {
             stakes: Arc::new(stakes.clone()),
             total_stake,
diff --git a/runtime/src/genesis_utils.rs b/runtime/src/genesis_utils.rs
index 25dec5e47bb459..eea539905cb834 100644
--- a/runtime/src/genesis_utils.rs
+++ b/runtime/src/genesis_utils.rs
@@ -8,10 +8,10 @@ use solana_sdk::{
     pubkey::Pubkey,
     rent::Rent,
     signature::{Keypair, Signer},
+    stake::state::StakeState,
     system_program,
 };
 use solana_stake_program::stake_state;
-use solana_stake_program::stake_state::StakeState;
 use solana_vote_program::vote_state;
 use std::borrow::Borrow;
 
@@ -191,15 +191,15 @@ pub fn create_genesis_config_with_leader_ex(
     mut initial_accounts: Vec<(Pubkey, AccountSharedData)>,
 ) -> GenesisConfig {
     let validator_vote_account = vote_state::create_account(
-        &validator_vote_account_pubkey,
-        &validator_pubkey,
+        validator_vote_account_pubkey,
+        validator_pubkey,
         0,
         validator_stake_lamports,
     );
 
     let validator_stake_account = stake_state::create_account(
         validator_stake_account_pubkey,
-        &validator_vote_account_pubkey,
+        validator_vote_account_pubkey,
         &validator_vote_account,
         &rent,
         validator_stake_lamports,
diff --git a/runtime/src/hardened_unpack.rs b/runtime/src/hardened_unpack.rs
index 090c3c4211ce04..7580ab4b10e61d 100644
--- a/runtime/src/hardened_unpack.rs
+++ b/runtime/src/hardened_unpack.rs
@@ -9,7 +9,7 @@ use {
         fs::{self, File},
         io::{BufReader, Read},
         path::{
-            Component::{CurDir, Normal},
+            Component::{self, CurDir, Normal},
             Path, PathBuf,
         },
         time::Instant,
@@ -84,6 +84,12 @@ fn check_unpack_result(unpack_result: bool, path: String) -> Result<()> {
     Ok(())
 }
 
+pub enum UnpackPath<'a> {
+    Valid(&'a Path),
+    Ignore,
+    Invalid,
+}
+
 fn unpack_archive<'a, A: Read, C>(
     archive: &mut Archive<A>,
     apparent_limit_size: u64,
@@ -92,7 +98,7 @@ fn unpack_archive<'a, A: Read, C>(
     mut entry_checker: C,
 ) -> Result<()>
 where
-    C: FnMut(&[&str], tar::EntryType) -> Option<&'a Path>,
+    C: FnMut(&[&str], tar::EntryType) -> UnpackPath<'a>,
 {
     let mut apparent_total_size: u64 = 0;
     let mut actual_total_size: u64 = 0;
@@ -130,14 +136,17 @@ where
 
         let parts: Vec<_> = parts.map(|p| p.unwrap()).collect();
         let unpack_dir = match entry_checker(parts.as_slice(), kind) {
-            None => {
+            UnpackPath::Invalid => {
                 return Err(UnpackError::Archive(format!(
                     "extra entry found: {:?} {:?}",
                     path_str,
                     entry.header().entry_type(),
                 )));
             }
-            Some(unpack_dir) => unpack_dir,
+            UnpackPath::Ignore => {
+                continue;
+            }
+            UnpackPath::Valid(unpack_dir) => unpack_dir,
         };
 
         apparent_total_size = checked_total_size_sum(
@@ -152,9 +161,14 @@ where
         )?;
         total_count = checked_total_count_increment(total_count, limit_count)?;
 
-        // unpack_in does its own sanitization
-        // ref: https://docs.rs/tar/*/tar/struct.Entry.html#method.unpack_in
-        check_unpack_result(entry.unpack_in(unpack_dir)?, path_str)?;
+        let target = sanitize_path(&entry.path()?, unpack_dir)?; // ? handles file system errors
+        if target.is_none() {
+            continue; // skip it
+        }
+        let target = target.unwrap();
+
+        let unpack = entry.unpack(target);
+        check_unpack_result(unpack.map(|_unpack| true)?, path_str)?;
 
         // Sanitize permissions.
         let mode = match entry.header().entry_type() {
@@ -190,16 +204,104 @@ where
     }
 }
 
-// Map from AppendVec file name to unpacked file system location
+// return Err on file system error
+// return Some(path) if path is good
+// return None if we should skip this file
+fn sanitize_path(entry_path: &Path, dst: &Path) -> Result<Option<PathBuf>> {
+    // We cannot call unpack_in because it errors if we try to use 2 account paths.
+    // So, this code is borrowed from unpack_in
+    // ref: https://docs.rs/tar/*/tar/struct.Entry.html#method.unpack_in
+    let mut file_dst = dst.to_path_buf();
+    const SKIP: Result<Option<PathBuf>> = Ok(None);
+    {
+        let path = entry_path;
+        for part in path.components() {
+            match part {
+                // Leading '/' characters, root paths, and '.'
+                // components are just ignored and treated as "empty
+                // components"
+                Component::Prefix(..) | Component::RootDir | Component::CurDir => continue,
+
+                // If any part of the filename is '..', then skip over
+                // unpacking the file to prevent directory traversal
+                // security issues.  See, e.g.: CVE-2001-1267,
+                // CVE-2002-0399, CVE-2005-1918, CVE-2007-4131
+                Component::ParentDir => return SKIP,
+
+                Component::Normal(part) => file_dst.push(part),
+            }
+        }
+    }
+
+    // Skip cases where only slashes or '.' parts were seen, because
+    // this is effectively an empty filename.
+    if *dst == *file_dst {
+        return SKIP;
+    }
+
+    // Skip entries without a parent (i.e. outside of FS root)
+    let parent = match file_dst.parent() {
+        Some(p) => p,
+        None => return SKIP,
+    };
+
+    fs::create_dir_all(parent)?;
+
+    // Here we are different than untar_in. The code for tar::unpack_in internally calling unpack is a little different.
+    // ignore return value here
+    validate_inside_dst(dst, parent)?;
+    let target = parent.join(entry_path.file_name().unwrap());
+
+    Ok(Some(target))
+}
+
+// copied from:
+// https://github.com/alexcrichton/tar-rs/blob/d90a02f582c03dfa0fd11c78d608d0974625ae5d/src/entry.rs#L781
+fn validate_inside_dst(dst: &Path, file_dst: &Path) -> Result<PathBuf> {
+    // Abort if target (canonical) parent is outside of `dst`
+    let canon_parent = file_dst.canonicalize().map_err(|err| {
+        UnpackError::Archive(format!(
+            "{} while canonicalizing {}",
+            err,
+            file_dst.display()
+        ))
+    })?;
+    let canon_target = dst.canonicalize().map_err(|err| {
+        UnpackError::Archive(format!("{} while canonicalizing {}", err, dst.display()))
+    })?;
+    if !canon_parent.starts_with(&canon_target) {
+        return Err(UnpackError::Archive(format!(
+            "trying to unpack outside of destination path: {}",
+            canon_target.display()
+        )));
+    }
+    Ok(canon_target)
+}
+
+/// Map from AppendVec file name to unpacked file system location
 pub type UnpackedAppendVecMap = HashMap<String, PathBuf>;
 
+// select/choose only 'index' out of each # of 'divisions' of total items.
+pub struct ParallelSelector {
+    pub index: usize,
+    pub divisions: usize,
+}
+
+impl ParallelSelector {
+    pub fn select_index(&self, index: usize) -> bool {
+        index % self.divisions == self.index
+    }
+}
+
 pub fn unpack_snapshot<A: Read>(
     archive: &mut Archive<A>,
     ledger_dir: &Path,
     account_paths: &[PathBuf],
+    parallel_selector: Option<ParallelSelector>,
 ) -> Result<UnpackedAppendVecMap> {
     assert!(!account_paths.is_empty());
     let mut unpacked_append_vec_map = UnpackedAppendVecMap::new();
+    let mut i = 0;
 
     unpack_archive(
         archive,
@@ -208,19 +310,31 @@ pub fn unpack_snapshot<A: Read>(
         MAX_SNAPSHOT_ARCHIVE_UNPACKED_COUNT,
         |parts, kind| {
             if is_valid_snapshot_archive_entry(parts, kind) {
+                i += 1;
+                match &parallel_selector {
+                    Some(parallel_selector) => {
+                        if !parallel_selector.select_index(i - 1) {
+                            return UnpackPath::Ignore;
+                        }
+                    }
+                    None => {}
+                };
                 if let ["accounts", file] = parts {
                     // Randomly distribute the accounts files about the available `account_paths`,
                     let path_index = thread_rng().gen_range(0, account_paths.len());
-                    account_paths.get(path_index).map(|path_buf| {
+                    match account_paths.get(path_index).map(|path_buf| {
                         unpacked_append_vec_map
                             .insert(file.to_string(), path_buf.join("accounts").join(file));
                         path_buf.as_path()
-                    })
+                    }) {
+                        Some(path) => UnpackPath::Valid(path),
+                        None => UnpackPath::Invalid,
+                    }
                 } else {
-                    Some(ledger_dir)
+                    UnpackPath::Valid(ledger_dir)
                 }
             } else {
-                None
+                UnpackPath::Invalid
             }
         },
     )
@@ -280,7 +394,7 @@ pub fn open_genesis_config(
     ledger_path: &Path,
     max_genesis_archive_unpacked_size: u64,
 ) -> GenesisConfig {
-    GenesisConfig::load(&ledger_path).unwrap_or_else(|load_err| {
+    GenesisConfig::load(ledger_path).unwrap_or_else(|load_err| {
         let genesis_package = ledger_path.join(DEFAULT_GENESIS_ARCHIVE);
         unpack_genesis_archive(
             &genesis_package,
@@ -296,7 +410,7 @@ pub fn open_genesis_config(
         });
 
         // loading must succeed at this moment
-        GenesisConfig::load(&ledger_path).unwrap()
+        GenesisConfig::load(ledger_path).unwrap()
     })
 }
 
@@ -337,9 +451,9 @@ fn unpack_genesis<A: Read>(
         MAX_GENESIS_ARCHIVE_UNPACKED_COUNT,
         |p, k| {
             if is_valid_genesis_archive_entry(p, k) {
-                Some(unpack_dir)
+                UnpackPath::Valid(unpack_dir)
             } else {
-                None
+                UnpackPath::Invalid
             }
         },
     )
@@ -530,7 +644,7 @@ mod tests {
 
     fn finalize_and_unpack_snapshot(archive: tar::Builder<Vec<u8>>) -> Result<()> {
         with_finalize_and_unpack(archive, |a, b| {
-            unpack_snapshot(a, b, &[PathBuf::new()]).map(|_| ())
+            unpack_snapshot(a, b, &[PathBuf::new()], None).map(|_| ())
         })
     }
 
diff --git a/runtime/src/inline_spl_token_v2_0.rs b/runtime/src/inline_spl_token_v2_0.rs
index 0f09bf259d0030..1f92e3d790f74a 100644
--- a/runtime/src/inline_spl_token_v2_0.rs
+++ b/runtime/src/inline_spl_token_v2_0.rs
@@ -2,7 +2,7 @@
 solana_sdk::declare_id!("TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA");
 
 pub(crate) mod new_token_program {
-    solana_sdk::declare_id!("t31zsgDmRntje65uXV3LrnWaJtJJpMd4LyJxq2R2VrU");
+    solana_sdk::declare_id!("nTokHfnBtpt4V6xiEbBSduiGCrQ6wSF3rxC8WeWAQ9F");
 }
 
 /*
diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs
index abc3f761785af7..0d1570b38fc504 100644
--- a/runtime/src/lib.rs
+++ b/runtime/src/lib.rs
@@ -12,7 +12,7 @@ pub mod bank;
 pub mod bank_client;
 pub mod bank_forks;
 pub mod bank_utils;
-mod blockhash_queue;
+pub mod blockhash_queue;
 pub mod bloom;
 pub mod builtins;
 pub mod commitment;
@@ -27,13 +27,17 @@ pub mod loader_utils;
 pub mod log_collector;
 pub mod message_processor;
 mod native_loader;
+pub mod neon_evm_program;
 pub mod non_circulating_supply;
+mod pubkey_bins;
 mod read_only_accounts_cache;
 pub mod rent_collector;
 pub mod secondary_index;
 pub mod serde_snapshot;
 pub mod snapshot_package;
 pub mod snapshot_utils;
+pub mod sorted_storages;
+pub mod stake_weighted_timestamp;
 pub mod stakes;
 pub mod status_cache;
 mod system_instruction_processor;
diff --git a/runtime/src/loader_utils.rs b/runtime/src/loader_utils.rs
index 9f304df037db6e..7580ef873b75f6 100644
--- a/runtime/src/loader_utils.rs
+++ b/runtime/src/loader_utils.rs
@@ -70,7 +70,7 @@ pub fn load_buffer_account<T: Client>(
 
     bank_client
         .send_and_confirm_message(
-            &[from_keypair, &buffer_keypair],
+            &[from_keypair, buffer_keypair],
             Message::new(
                 &bpf_loader_upgradeable::create_buffer(
                     &from_keypair.pubkey(),
@@ -102,7 +102,7 @@ pub fn load_buffer_account<T: Client>(
             Some(&from_keypair.pubkey()),
         );
         bank_client
-            .send_and_confirm_message(&[from_keypair, &buffer_authority_keypair], message)
+            .send_and_confirm_message(&[from_keypair, buffer_authority_keypair], message)
             .unwrap();
         offset += chunk_size as u32;
     }
@@ -121,7 +121,7 @@ pub fn load_upgradeable_program<T: Client>(
 
     load_buffer_account(
         bank_client,
-        &from_keypair,
+        from_keypair,
         buffer_keypair,
         authority_keypair,
         &program,
@@ -147,7 +147,7 @@ pub fn load_upgradeable_program<T: Client>(
     );
     bank_client
         .send_and_confirm_message(
-            &[from_keypair, &executable_keypair, &authority_keypair],
+            &[from_keypair, executable_keypair, authority_keypair],
             message,
         )
         .unwrap();
@@ -163,15 +163,15 @@ pub fn upgrade_program<T: Client>(
 ) {
     let message = Message::new(
         &[bpf_loader_upgradeable::upgrade(
-            &program_pubkey,
-            &buffer_pubkey,
+            program_pubkey,
+            buffer_pubkey,
             &authority_keypair.pubkey(),
-            &spill_pubkey,
+            spill_pubkey,
         )],
         Some(&from_keypair.pubkey()),
     );
     bank_client
-        .send_and_confirm_message(&[from_keypair, &authority_keypair], message)
+        .send_and_confirm_message(&[from_keypair, authority_keypair], message)
         .unwrap();
 }
 
@@ -191,7 +191,7 @@ pub fn set_upgrade_authority<T: Client>(
         Some(&from_keypair.pubkey()),
     );
     bank_client
-        .send_and_confirm_message(&[from_keypair, &current_authority_keypair], message)
+        .send_and_confirm_message(&[from_keypair, current_authority_keypair], message)
         .unwrap();
 }
 
diff --git a/runtime/src/message_processor.rs b/runtime/src/message_processor.rs
index 7fa60e5fb38491..fe5348a9395bc4 100644
--- a/runtime/src/message_processor.rs
+++ b/runtime/src/message_processor.rs
@@ -9,10 +9,9 @@ use solana_sdk::{
     account_utils::StateMut,
     bpf_loader_upgradeable::{self, UpgradeableLoaderState},
     feature_set::{
-        cpi_share_ro_and_exec_accounts, demote_sysvar_write_locks, instructions_sysvar_enabled,
-        FeatureSet,
+        instructions_sysvar_enabled, neon_evm_compute_budget, updated_verify_policy, FeatureSet,
     },
-    ic_msg,
+    ic_logger_msg, ic_msg,
     instruction::{CompiledInstruction, Instruction, InstructionError},
     keyed_account::{create_keyed_accounts_unified, keyed_account_at_index, KeyedAccount},
     message::Message,
@@ -106,6 +105,7 @@ impl PreAccount {
         post: &AccountSharedData,
         timings: &mut ExecuteDetailsTimings,
         outermost_call: bool,
+        updated_verify_policy: bool,
     ) -> Result<(), InstructionError> {
         let pre = self.account.borrow();
 
@@ -118,7 +118,7 @@ impl PreAccount {
             && (!is_writable // line coverage used to get branch coverage
                 || pre.executable()
                 || program_id != pre.owner()
-            || !Self::is_zeroed(&post.data()))
+            || !Self::is_zeroed(post.data()))
         {
             return Err(InstructionError::ModifiedProgramId);
         }
@@ -174,9 +174,14 @@ impl PreAccount {
             if !rent.is_exempt(post.lamports(), post.data().len()) {
                 return Err(InstructionError::ExecutableAccountNotRentExempt);
             }
+            let owner = if updated_verify_policy {
+                post.owner()
+            } else {
+                pre.owner()
+            };
             if !is_writable // line coverage used to get branch coverage
                 || pre.executable()
-                || program_id != pre.owner()
+                || program_id != owner
             {
                 return Err(InstructionError::ExecutableModified);
             }
@@ -223,6 +228,10 @@ impl PreAccount {
         self.account.borrow().lamports()
     }
 
+    pub fn executable(&self) -> bool {
+        self.account.borrow().executable()
+    }
+
     pub fn is_zeroed(buf: &[u8]) -> bool {
         const ZEROS_LEN: usize = 1024;
         static ZEROS: [u8; ZEROS_LEN] = [0; ZEROS_LEN];
@@ -252,10 +261,8 @@ impl ComputeMeter for ThisComputeMeter {
 pub struct ThisInvokeContext<'a> {
     invoke_stack: Vec<InvokeContextStackFrame<'a>>,
     rent: Rent,
-    message: &'a Message,
     pre_accounts: Vec<PreAccount>,
-    executable_accounts: &'a [(Pubkey, Rc<RefCell<AccountSharedData>>)],
-    account_deps: &'a [(Pubkey, Rc<RefCell<AccountSharedData>>)],
+    accounts: &'a [(Pubkey, Rc<RefCell<AccountSharedData>>)],
     programs: &'a [(Pubkey, ProcessInstructionWithContext)],
     logger: Rc<RefCell<dyn Logger>>,
     bpf_compute_budget: BpfComputeBudget,
@@ -277,8 +284,7 @@ impl<'a> ThisInvokeContext<'a> {
         message: &'a Message,
         instruction: &'a CompiledInstruction,
         executable_accounts: &'a [(Pubkey, Rc<RefCell<AccountSharedData>>)],
-        accounts: &'a [Rc<RefCell<AccountSharedData>>],
-        account_deps: &'a [(Pubkey, Rc<RefCell<AccountSharedData>>)],
+        accounts: &'a [(Pubkey, Rc<RefCell<AccountSharedData>>)],
         programs: &'a [(Pubkey, ProcessInstructionWithContext)],
         log_collector: Option<Rc<LogCollector>>,
         bpf_compute_budget: BpfComputeBudget,
@@ -294,15 +300,12 @@ impl<'a> ThisInvokeContext<'a> {
             instruction,
             executable_accounts,
             accounts,
-            feature_set.is_active(&demote_sysvar_write_locks::id()),
         );
         let mut invoke_context = Self {
             invoke_stack: Vec::with_capacity(bpf_compute_budget.max_invoke_depth),
             rent,
-            message,
             pre_accounts,
-            executable_accounts,
-            account_deps,
+            accounts,
             programs,
             logger: Rc::new(RefCell::new(ThisLogger { log_collector })),
             bpf_compute_budget,
@@ -335,11 +338,18 @@ impl<'a> InvokeContext for ThisInvokeContext<'a> {
         if self.invoke_stack.len() > self.bpf_compute_budget.max_invoke_depth {
             return Err(InstructionError::CallDepth);
         }
-        let frame_index = self.invoke_stack.iter().position(|frame| frame.key == *key);
-        if frame_index != None && frame_index != Some(self.invoke_stack.len().saturating_sub(1)) {
+
+        let contains = self.invoke_stack.iter().any(|frame| frame.key == *key);
+        let is_last = if let Some(last_frame) = self.invoke_stack.last() {
+            last_frame.key == *key
+        } else {
+            false
+        };
+        if contains && !is_last {
             // Reentrancy not allowed unless caller is calling itself
             return Err(InstructionError::ReentrancyNotAllowed);
         }
+
         // Alias the keys and account references in the provided keyed_accounts
         // with the ones already existing in self, so that the lifetime 'a matches.
         fn transmute_lifetime<'a, 'b, T: Sized>(value: &'a T) -> &'b T {
@@ -348,25 +358,21 @@ impl<'a> InvokeContext for ThisInvokeContext<'a> {
         let keyed_accounts = keyed_accounts
             .iter()
             .map(|(is_signer, is_writable, search_key, account)| {
-                self.account_deps
+                self.accounts
                     .iter()
-                    .map(|(key, _account)| key)
-                    .chain(self.message.account_keys.iter())
-                    .position(|key| key == *search_key)
-                    .map(|mut index| {
+                    .position(|(key, _account)| key == *search_key)
+                    .map(|index| {
                         // TODO
                         // Currently we are constructing new accounts on the stack
                         // before calling MessageProcessor::process_cross_program_instruction
                         // Ideally we would recycle the existing accounts here.
-                        let key = if index < self.account_deps.len() {
-                            &self.account_deps[index].0
-                            // &self.account_deps[index].1 as &RefCell<AccountSharedData>,
-                        } else {
-                            index = index.saturating_sub(self.account_deps.len());
-                            &self.message.account_keys[index]
-                            // &self.accounts[index] as &RefCell<AccountSharedData>,
-                        };
-                        (*is_signer, *is_writable, key, transmute_lifetime(*account))
+                        (
+                            *is_signer,
+                            *is_writable,
+                            &self.accounts[index].0,
+                            // &self.accounts[index] as &RefCell<AccountSharedData>
+                            transmute_lifetime(*account),
+                        )
                     })
             })
             .collect::<Option<Vec<_>>>()
@@ -385,25 +391,25 @@ impl<'a> InvokeContext for ThisInvokeContext<'a> {
     }
     fn verify_and_update(
         &mut self,
-        message: &Message,
         instruction: &CompiledInstruction,
-        accounts: &[Rc<RefCell<AccountSharedData>>],
-        caller_write_privileges: Option<&[bool]>,
+        accounts: &[(Pubkey, Rc<RefCell<AccountSharedData>>)],
+        write_privileges: &[bool],
     ) -> Result<(), InstructionError> {
         let stack_frame = self
             .invoke_stack
             .last()
             .ok_or(InstructionError::CallDepth)?;
+        let logger = self.get_logger();
         MessageProcessor::verify_and_update(
-            message,
             instruction,
             &mut self.pre_accounts,
             accounts,
             &stack_frame.key,
             &self.rent,
-            caller_write_privileges,
+            write_privileges,
             &mut self.timings,
-            self.feature_set.is_active(&demote_sysvar_write_locks::id()),
+            logger,
+            self.feature_set.is_active(&updated_verify_policy::id()),
         )
     }
     fn get_caller(&self) -> Result<&Pubkey, InstructionError> {
@@ -443,7 +449,7 @@ impl<'a> InvokeContext for ThisInvokeContext<'a> {
         self.executors.borrow_mut().insert(*pubkey, executor);
     }
     fn get_executor(&self, pubkey: &Pubkey) -> Option<Arc<dyn Executor>> {
-        self.executors.borrow().get(&pubkey)
+        self.executors.borrow().get(pubkey)
     }
     fn record_instruction(&self, instruction: &Instruction) {
         if let Some(recorder) = &self.instruction_recorder {
@@ -454,41 +460,13 @@ impl<'a> InvokeContext for ThisInvokeContext<'a> {
         self.feature_set.is_active(feature_id)
     }
     fn get_account(&self, pubkey: &Pubkey) -> Option<Rc<RefCell<AccountSharedData>>> {
-        if self.is_feature_active(&cpi_share_ro_and_exec_accounts::id()) {
-            if let Some((_, account)) = self
-                .executable_accounts
-                .iter()
-                .find(|(key, _)| key == pubkey)
-            {
-                Some(account.clone())
-            } else if let Some((_, account)) =
-                self.account_deps.iter().find(|(key, _)| key == pubkey)
-            {
+        self.accounts.iter().find_map(|(key, account)| {
+            if key == pubkey {
                 Some(account.clone())
             } else {
-                self.pre_accounts
-                    .iter()
-                    .find(|pre| pre.key == *pubkey)
-                    .map(|pre| pre.account.clone())
-            }
-        } else {
-            if let Some(account) = self.pre_accounts.iter().find_map(|pre| {
-                if pre.key == *pubkey {
-                    Some(pre.account.clone())
-                } else {
-                    None
-                }
-            }) {
-                return Some(account);
+                None
             }
-            self.account_deps.iter().find_map(|(key, account)| {
-                if key == pubkey {
-                    Some(account.clone())
-                } else {
-                    None
-                }
-            })
-        }
+        })
     }
     fn update_timing(
         &mut self,
@@ -632,8 +610,7 @@ impl MessageProcessor {
         message: &'a Message,
         instruction: &'a CompiledInstruction,
         executable_accounts: &'a [(Pubkey, Rc<RefCell<AccountSharedData>>)],
-        accounts: &'a [Rc<RefCell<AccountSharedData>>],
-        demote_sysvar_write_locks: bool,
+        accounts: &'a [(Pubkey, Rc<RefCell<AccountSharedData>>)],
     ) -> Vec<(bool, bool, &'a Pubkey, &'a RefCell<AccountSharedData>)> {
         executable_accounts
             .iter()
@@ -642,9 +619,9 @@ impl MessageProcessor {
                 let index = *index as usize;
                 (
                     message.is_signer(index),
-                    message.is_writable(index, demote_sysvar_write_locks),
-                    &message.account_keys[index],
-                    &accounts[index] as &RefCell<AccountSharedData>,
+                    message.is_writable(index),
+                    &accounts[index].0,
+                    &accounts[index].1 as &RefCell<AccountSharedData>,
                 )
             }))
             .collect::<Vec<_>>()
@@ -665,7 +642,7 @@ impl MessageProcessor {
                     if id == root_id {
                         invoke_context.remove_first_keyed_account()?;
                         // Call the builtin program
-                        return process_instruction(&program_id, instruction_data, invoke_context);
+                        return process_instruction(program_id, instruction_data, invoke_context);
                     }
                 }
                 // Call the program via the native loader
@@ -679,7 +656,7 @@ impl MessageProcessor {
                 for (id, process_instruction) in &self.programs {
                     if id == owner_id {
                         // Call the program via a builtin loader
-                        return process_instruction(&program_id, instruction_data, invoke_context);
+                        return process_instruction(program_id, instruction_data, invoke_context);
                     }
                 }
             }
@@ -779,7 +756,6 @@ impl MessageProcessor {
             accounts,
             keyed_account_indices_reordered,
             caller_write_privileges,
-            demote_sysvar_write_locks,
         ) = {
             let invoke_context = invoke_context.borrow();
 
@@ -790,7 +766,7 @@ impl MessageProcessor {
                 .map(|index| keyed_account_at_index(keyed_accounts, *index))
                 .collect::<Result<Vec<&KeyedAccount>, InstructionError>>()?;
             let (message, callee_program_id, _) =
-                Self::create_message(&instruction, &keyed_accounts, &signers, &invoke_context)?;
+                Self::create_message(&instruction, &keyed_accounts, signers, &invoke_context)?;
             let keyed_accounts = invoke_context.get_keyed_accounts()?;
             let mut caller_write_privileges = keyed_account_indices
                 .iter()
@@ -804,7 +780,7 @@ impl MessageProcessor {
                 for keyed_account_index in keyed_account_indices {
                     let keyed_account = &keyed_accounts[*keyed_account_index];
                     if account_key == keyed_account.unsigned_key() {
-                        accounts.push(Rc::new(keyed_account.account.clone()));
+                        accounts.push((*account_key, Rc::new(keyed_account.account.clone())));
                         keyed_account_indices_reordered.push(*keyed_account_index);
                         continue 'root;
                     }
@@ -872,7 +848,6 @@ impl MessageProcessor {
                 accounts,
                 keyed_account_indices_reordered,
                 caller_write_privileges,
-                invoke_context.is_feature_active(&demote_sysvar_write_locks::id()),
             )
         };
 
@@ -890,16 +865,14 @@ impl MessageProcessor {
         {
             let invoke_context = invoke_context.borrow();
             let keyed_accounts = invoke_context.get_keyed_accounts()?;
-            for (src_keyed_account_index, (account, dst_keyed_account_index)) in accounts
+            for (src_keyed_account_index, ((_key, account), dst_keyed_account_index)) in accounts
                 .iter()
                 .zip(keyed_account_indices_reordered)
                 .enumerate()
             {
                 let dst_keyed_account = &keyed_accounts[dst_keyed_account_index];
                 let src_keyed_account = account.borrow();
-                if message.is_writable(src_keyed_account_index, demote_sysvar_write_locks)
-                    && !src_keyed_account.executable()
-                {
+                if message.is_writable(src_keyed_account_index) && !src_keyed_account.executable() {
                     if dst_keyed_account.data_len()? != src_keyed_account.data().len()
                         && dst_keyed_account.data_len()? != 0
                     {
@@ -932,7 +905,7 @@ impl MessageProcessor {
     pub fn process_cross_program_instruction(
         message: &Message,
         executable_accounts: &[(Pubkey, Rc<RefCell<AccountSharedData>>)],
-        accounts: &[Rc<RefCell<AccountSharedData>>],
+        accounts: &[(Pubkey, Rc<RefCell<AccountSharedData>>)],
         caller_write_privileges: &[bool],
         invoke_context: &mut dyn InvokeContext,
     ) -> Result<(), InstructionError> {
@@ -940,21 +913,11 @@ impl MessageProcessor {
             let program_id = instruction.program_id(&message.account_keys);
 
             // Verify the calling program hasn't misbehaved
-            invoke_context.verify_and_update(
-                message,
-                instruction,
-                accounts,
-                Some(caller_write_privileges),
-            )?;
+            invoke_context.verify_and_update(instruction, accounts, caller_write_privileges)?;
 
             // Construct keyed accounts
-            let keyed_accounts = Self::create_keyed_accounts(
-                message,
-                instruction,
-                executable_accounts,
-                accounts,
-                invoke_context.is_feature_active(&demote_sysvar_write_locks::id()),
-            );
+            let keyed_accounts =
+                Self::create_keyed_accounts(message, instruction, executable_accounts, accounts);
 
             // Invoke callee
             invoke_context.push(program_id, &keyed_accounts)?;
@@ -971,7 +934,10 @@ impl MessageProcessor {
             );
             if result.is_ok() {
                 // Verify the called program has not misbehaved
-                result = invoke_context.verify_and_update(message, instruction, accounts, None);
+                let write_privileges: Vec<bool> = (0..message.account_keys.len())
+                    .map(|i| message.is_writable(i))
+                    .collect();
+                result = invoke_context.verify_and_update(instruction, accounts, &write_privileges);
             }
 
             // Restore previous state
@@ -988,15 +954,17 @@ impl MessageProcessor {
     pub fn create_pre_accounts(
         message: &Message,
         instruction: &CompiledInstruction,
-        accounts: &[Rc<RefCell<AccountSharedData>>],
+        accounts: &[(Pubkey, Rc<RefCell<AccountSharedData>>)],
     ) -> Vec<PreAccount> {
         let mut pre_accounts = Vec::with_capacity(instruction.accounts.len());
         {
             let mut work = |_unique_index: usize, account_index: usize| {
-                let key = &message.account_keys[account_index];
-                let account = accounts[account_index].borrow();
-                pre_accounts.push(PreAccount::new(key, &account));
-                Ok(())
+                if account_index < message.account_keys.len() && account_index < accounts.len() {
+                    let account = accounts[account_index].1.borrow();
+                    pre_accounts.push(PreAccount::new(&accounts[account_index].0, &account));
+                    return Ok(());
+                }
+                Err(InstructionError::MissingAccount)
             };
             let _ = instruction.visit_each_account(&mut work);
         }
@@ -1021,10 +989,11 @@ impl MessageProcessor {
         instruction: &CompiledInstruction,
         pre_accounts: &[PreAccount],
         executable_accounts: &[(Pubkey, Rc<RefCell<AccountSharedData>>)],
-        accounts: &[Rc<RefCell<AccountSharedData>>],
+        accounts: &[(Pubkey, Rc<RefCell<AccountSharedData>>)],
         rent: &Rent,
         timings: &mut ExecuteDetailsTimings,
-        demote_sysvar_write_locks: bool,
+        logger: Rc<RefCell<dyn Logger>>,
+        updated_verify_policy: bool,
     ) -> Result<(), InstructionError> {
         // Verify all executable accounts have zero outstanding refs
         Self::verify_account_references(executable_accounts)?;
@@ -1037,18 +1006,30 @@ impl MessageProcessor {
                 {
                     // Verify account has no outstanding references
                     let _ = accounts[account_index]
+                        .1
                         .try_borrow_mut()
                         .map_err(|_| InstructionError::AccountBorrowOutstanding)?;
                 }
-                let account = accounts[account_index].borrow();
-                pre_accounts[unique_index].verify(
-                    &program_id,
-                    message.is_writable(account_index, demote_sysvar_write_locks),
-                    rent,
-                    &account,
-                    timings,
-                    true,
-                )?;
+                let account = accounts[account_index].1.borrow();
+                pre_accounts[unique_index]
+                    .verify(
+                        program_id,
+                        message.is_writable(account_index),
+                        rent,
+                        &account,
+                        timings,
+                        true,
+                        updated_verify_policy,
+                    )
+                    .map_err(|err| {
+                        ic_logger_msg!(
+                            logger,
+                            "failed to verify account {}: {}",
+                            pre_accounts[unique_index].key,
+                            err
+                        );
+                        err
+                    })?;
                 pre_sum += u128::from(pre_accounts[unique_index].lamports());
                 post_sum += u128::from(account.lamports());
                 Ok(())
@@ -1064,28 +1045,24 @@ impl MessageProcessor {
     }
 
     /// Verify the results of a cross-program instruction
+    #[allow(clippy::too_many_arguments)]
     fn verify_and_update(
-        message: &Message,
         instruction: &CompiledInstruction,
         pre_accounts: &mut [PreAccount],
-        accounts: &[Rc<RefCell<AccountSharedData>>],
+        accounts: &[(Pubkey, Rc<RefCell<AccountSharedData>>)],
         program_id: &Pubkey,
         rent: &Rent,
-        caller_write_privileges: Option<&[bool]>,
+        write_privileges: &[bool],
         timings: &mut ExecuteDetailsTimings,
-        demote_sysvar_write_locks: bool,
+        logger: Rc<RefCell<dyn Logger>>,
+        updated_verify_policy: bool,
     ) -> Result<(), InstructionError> {
         // Verify the per-account instruction results
         let (mut pre_sum, mut post_sum) = (0_u128, 0_u128);
         let mut work = |_unique_index: usize, account_index: usize| {
-            if account_index < message.account_keys.len() && account_index < accounts.len() {
-                let key = &message.account_keys[account_index];
-                let account = &accounts[account_index];
-                let is_writable = if let Some(caller_write_privileges) = caller_write_privileges {
-                    caller_write_privileges[account_index]
-                } else {
-                    message.is_writable(account_index, demote_sysvar_write_locks)
-                };
+            if account_index < write_privileges.len() && account_index < accounts.len() {
+                let (key, account) = &accounts[account_index];
+                let is_writable = write_privileges[account_index];
                 // Find the matching PreAccount
                 for pre_account in pre_accounts.iter_mut() {
                     if key == pre_account.key() {
@@ -1096,17 +1073,23 @@ impl MessageProcessor {
                                 .map_err(|_| InstructionError::AccountBorrowOutstanding)?;
                         }
                         let account = account.borrow();
-                        pre_account.verify(
-                            &program_id,
-                            is_writable,
-                            &rent,
-                            &account,
-                            timings,
-                            false,
-                        )?;
+                        pre_account
+                            .verify(
+                                program_id,
+                                is_writable,
+                                rent,
+                                &account,
+                                timings,
+                                false,
+                                updated_verify_policy,
+                            )
+                            .map_err(|err| {
+                                ic_logger_msg!(logger, "failed to verify account {}: {}", key, err);
+                                err
+                            })?;
                         pre_sum += u128::from(pre_account.lamports());
                         post_sum += u128::from(account.lamports());
-                        if is_writable && !account.executable() {
+                        if is_writable && !pre_account.executable() {
                             pre_account.update(&account);
                         }
                         return Ok(());
@@ -1135,8 +1118,7 @@ impl MessageProcessor {
         message: &Message,
         instruction: &CompiledInstruction,
         executable_accounts: &[(Pubkey, Rc<RefCell<AccountSharedData>>)],
-        accounts: &[Rc<RefCell<AccountSharedData>>],
-        account_deps: &[(Pubkey, Rc<RefCell<AccountSharedData>>)],
+        accounts: &[(Pubkey, Rc<RefCell<AccountSharedData>>)],
         rent_collector: &RentCollector,
         log_collector: Option<Rc<LogCollector>>,
         executors: Rc<RefCell<Executors>>,
@@ -1145,16 +1127,15 @@ impl MessageProcessor {
         feature_set: Arc<FeatureSet>,
         bpf_compute_budget: BpfComputeBudget,
         timings: &mut ExecuteDetailsTimings,
-        demote_sysvar_write_locks: bool,
         account_db: Arc<Accounts>,
         ancestors: &Ancestors,
     ) -> Result<(), InstructionError> {
         // Fixup the special instructions key if present
         // before the account pre-values are taken care of
         if feature_set.is_active(&instructions_sysvar_enabled::id()) {
-            for (i, key) in message.account_keys.iter().enumerate() {
-                if instructions::check_id(key) {
-                    let mut mut_account_ref = accounts[i].borrow_mut();
+            for (pubkey, accont) in accounts.iter().take(message.account_keys.len()) {
+                if instructions::check_id(pubkey) {
+                    let mut mut_account_ref = accont.borrow_mut();
                     instructions::store_current_index(
                         mut_account_ref.data_as_mut_slice(),
                         instruction_index as u16,
@@ -1165,6 +1146,16 @@ impl MessageProcessor {
         }
 
         let program_id = instruction.program_id(&message.account_keys);
+
+        let mut bpf_compute_budget = bpf_compute_budget;
+        if feature_set.is_active(&neon_evm_compute_budget::id())
+            && *program_id == crate::neon_evm_program::id()
+        {
+            // Bump the compute budget for neon_evm
+            bpf_compute_budget.max_units = 500_000;
+            bpf_compute_budget.heap_size = Some(256 * 1024);
+        }
+
         let mut invoke_context = ThisInvokeContext::new(
             program_id,
             rent_collector.rent,
@@ -1172,7 +1163,6 @@ impl MessageProcessor {
             instruction,
             executable_accounts,
             accounts,
-            account_deps,
             &self.programs,
             log_collector,
             bpf_compute_budget,
@@ -1191,7 +1181,8 @@ impl MessageProcessor {
             accounts,
             &rent_collector.rent,
             timings,
-            demote_sysvar_write_locks,
+            invoke_context.get_logger(),
+            invoke_context.is_feature_active(&updated_verify_policy::id()),
         )?;
 
         timings.accumulate(&invoke_context.timings);
@@ -1208,8 +1199,7 @@ impl MessageProcessor {
         &self,
         message: &Message,
         loaders: &[Vec<(Pubkey, Rc<RefCell<AccountSharedData>>)>],
-        accounts: &[Rc<RefCell<AccountSharedData>>],
-        account_deps: &[(Pubkey, Rc<RefCell<AccountSharedData>>)],
+        accounts: &[(Pubkey, Rc<RefCell<AccountSharedData>>)],
         rent_collector: &RentCollector,
         log_collector: Option<Rc<LogCollector>>,
         executors: Rc<RefCell<Executors>>,
@@ -1220,7 +1210,6 @@ impl MessageProcessor {
         account_db: Arc<Accounts>,
         ancestors: &Ancestors,
     ) -> Result<(), TransactionError> {
-        let demote_sysvar_write_locks = feature_set.is_active(&demote_sysvar_write_locks::id());
         for (instruction_index, instruction) in message.instructions.iter().enumerate() {
             let instruction_recorder = instruction_recorders
                 .as_ref()
@@ -1230,7 +1219,6 @@ impl MessageProcessor {
                 instruction,
                 &loaders[instruction_index],
                 accounts,
-                account_deps,
                 rent_collector,
                 log_collector.clone(),
                 executors.clone(),
@@ -1239,7 +1227,6 @@ impl MessageProcessor {
                 feature_set.clone(),
                 bpf_compute_budget,
                 timings,
-                demote_sysvar_write_locks,
                 account_db.clone(),
                 ancestors,
             )
@@ -1263,25 +1250,29 @@ mod tests {
     fn test_invoke_context() {
         const MAX_DEPTH: usize = 10;
         let mut invoke_stack = vec![];
-        let mut keys = vec![];
         let mut accounts = vec![];
         let mut metas = vec![];
         for i in 0..MAX_DEPTH {
             invoke_stack.push(solana_sdk::pubkey::new_rand());
-            keys.push(solana_sdk::pubkey::new_rand());
-            accounts.push(Rc::new(RefCell::new(AccountSharedData::new(
-                i as u64,
-                1,
-                &invoke_stack[i],
-            ))));
-            metas.push(AccountMeta::new(keys[i], false));
+            accounts.push((
+                solana_sdk::pubkey::new_rand(),
+                Rc::new(RefCell::new(AccountSharedData::new(
+                    i as u64,
+                    1,
+                    &invoke_stack[i],
+                ))),
+            ));
+            metas.push(AccountMeta::new(accounts[i].0, false));
         }
         for program_id in invoke_stack.iter() {
-            accounts.push(Rc::new(RefCell::new(AccountSharedData::new(
-                1,
-                1,
-                &solana_sdk::pubkey::Pubkey::default(),
-            ))));
+            accounts.push((
+                *program_id,
+                Rc::new(RefCell::new(AccountSharedData::new(
+                    1,
+                    1,
+                    &solana_sdk::pubkey::Pubkey::default(),
+                ))),
+            ));
             metas.push(AccountMeta::new(*program_id, false));
         }
 
@@ -1298,7 +1289,6 @@ mod tests {
             &[],
             &accounts,
             &[],
-            &[],
             None,
             BpfComputeBudget::default(),
             Rc::new(RefCell::new(Executors::default())),
@@ -1323,8 +1313,8 @@ mod tests {
         for owned_index in (1..depth_reached).rev() {
             let not_owned_index = owned_index - 1;
             let metas = vec![
-                AccountMeta::new(keys[not_owned_index], false),
-                AccountMeta::new(keys[owned_index], false),
+                AccountMeta::new(accounts[not_owned_index].0, false),
+                AccountMeta::new(accounts[owned_index].0, false),
             ];
             let message = Message::new(
                 &[Instruction::new_with_bytes(
@@ -1336,16 +1326,22 @@ mod tests {
             );
 
             // modify account owned by the program
-            accounts[owned_index].borrow_mut().data_as_mut_slice()[0] =
+            accounts[owned_index].1.borrow_mut().data_as_mut_slice()[0] =
                 (MAX_DEPTH + owned_index) as u8;
             let mut these_accounts = accounts[not_owned_index..owned_index + 1].to_vec();
-            these_accounts.push(Rc::new(RefCell::new(AccountSharedData::new(
-                1,
-                1,
-                &solana_sdk::pubkey::Pubkey::default(),
-            ))));
+            these_accounts.push((
+                message.account_keys[2],
+                Rc::new(RefCell::new(AccountSharedData::new(
+                    1,
+                    1,
+                    &solana_sdk::pubkey::Pubkey::default(),
+                ))),
+            ));
+            let write_privileges: Vec<bool> = (0..message.account_keys.len())
+                .map(|i| message.is_writable(i))
+                .collect();
             invoke_context
-                .verify_and_update(&message, &message.instructions[0], &these_accounts, None)
+                .verify_and_update(&message.instructions[0], &these_accounts, &write_privileges)
                 .unwrap();
             assert_eq!(
                 invoke_context.pre_accounts[owned_index]
@@ -1356,15 +1352,14 @@ mod tests {
             );
 
             // modify account not owned by the program
-            let data = accounts[not_owned_index].borrow_mut().data()[0];
-            accounts[not_owned_index].borrow_mut().data_as_mut_slice()[0] =
+            let data = accounts[not_owned_index].1.borrow_mut().data()[0];
+            accounts[not_owned_index].1.borrow_mut().data_as_mut_slice()[0] =
                 (MAX_DEPTH + not_owned_index) as u8;
             assert_eq!(
                 invoke_context.verify_and_update(
-                    &message,
                     &message.instructions[0],
                     &accounts[not_owned_index..owned_index + 1],
-                    None
+                    &write_privileges,
                 ),
                 Err(InstructionError::ExternalAccountDataModified)
             );
@@ -1375,7 +1370,7 @@ mod tests {
                     .data()[0],
                 data
             );
-            accounts[not_owned_index].borrow_mut().data_as_mut_slice()[0] = data;
+            accounts[not_owned_index].1.borrow_mut().data_as_mut_slice()[0] = data;
 
             invoke_context.pop();
         }
@@ -1484,6 +1479,7 @@ mod tests {
                 &self.post,
                 &mut ExecuteDetailsTimings::default(),
                 false,
+                true,
             )
         }
     }
@@ -1806,6 +1802,21 @@ mod tests {
         );
     }
 
+    #[test]
+    fn test_verify_account_changes_owner_executable() {
+        let alice_program_id = solana_sdk::pubkey::new_rand();
+        let bob_program_id = solana_sdk::pubkey::new_rand();
+
+        assert_eq!(
+            Change::new(&alice_program_id, &alice_program_id)
+                .owner(&bob_program_id)
+                .executable(false, true)
+                .verify(),
+            Err(InstructionError::ExecutableModified),
+            "Program should not be able to change owner and executable at the same time"
+        );
+    }
+
     #[test]
     fn test_process_message_readonly_handling() {
         #[derive(Serialize, Deserialize)]
@@ -1851,26 +1862,28 @@ mod tests {
         let mut message_processor = MessageProcessor::default();
         message_processor.add_program(mock_system_program_id, mock_system_process_instruction);
 
-        let mut accounts: Vec<Rc<RefCell<AccountSharedData>>> = Vec::new();
-        let account = AccountSharedData::new_ref(100, 1, &mock_system_program_id);
-        accounts.push(account);
-        let account = AccountSharedData::new_ref(0, 1, &mock_system_program_id);
-        accounts.push(account);
+        let accounts = vec![
+            (
+                solana_sdk::pubkey::new_rand(),
+                AccountSharedData::new_ref(100, 1, &mock_system_program_id),
+            ),
+            (
+                solana_sdk::pubkey::new_rand(),
+                AccountSharedData::new_ref(0, 1, &mock_system_program_id),
+            ),
+        ];
 
-        let mut loaders: Vec<Vec<(Pubkey, Rc<RefCell<AccountSharedData>>)>> = Vec::new();
         let account = Rc::new(RefCell::new(create_loadable_account_for_test(
             "mock_system_program",
         )));
-        loaders.push(vec![(mock_system_program_id, account)]);
+        let loaders = vec![vec![(mock_system_program_id, account)]];
 
         let executors = Rc::new(RefCell::new(Executors::default()));
         let ancestors = Ancestors::default();
 
-        let from_pubkey = solana_sdk::pubkey::new_rand();
-        let to_pubkey = solana_sdk::pubkey::new_rand();
         let account_metas = vec![
-            AccountMeta::new(from_pubkey, true),
-            AccountMeta::new_readonly(to_pubkey, false),
+            AccountMeta::new(accounts[0].0, true),
+            AccountMeta::new_readonly(accounts[1].0, false),
         ];
         let message = Message::new(
             &[Instruction::new_with_bincode(
@@ -1878,14 +1891,13 @@ mod tests {
                 &MockSystemInstruction::Correct,
                 account_metas.clone(),
             )],
-            Some(&from_pubkey),
+            Some(&accounts[0].0),
         );
 
         let result = message_processor.process_message(
             &message,
             &loaders,
             &accounts,
-            &[],
             &rent_collector,
             None,
             executors.clone(),
@@ -1897,8 +1909,8 @@ mod tests {
             &ancestors,
         );
         assert_eq!(result, Ok(()));
-        assert_eq!(accounts[0].borrow().lamports(), 100);
-        assert_eq!(accounts[1].borrow().lamports(), 0);
+        assert_eq!(accounts[0].1.borrow().lamports(), 100);
+        assert_eq!(accounts[1].1.borrow().lamports(), 0);
 
         let message = Message::new(
             &[Instruction::new_with_bincode(
@@ -1906,14 +1918,13 @@ mod tests {
                 &MockSystemInstruction::AttemptCredit { lamports: 50 },
                 account_metas.clone(),
             )],
-            Some(&from_pubkey),
+            Some(&accounts[0].0),
         );
 
         let result = message_processor.process_message(
             &message,
             &loaders,
             &accounts,
-            &[],
             &rent_collector,
             None,
             executors.clone(),
@@ -1938,14 +1949,13 @@ mod tests {
                 &MockSystemInstruction::AttemptDataChange { data: 50 },
                 account_metas,
             )],
-            Some(&from_pubkey),
+            Some(&accounts[0].0),
         );
 
         let result = message_processor.process_message(
             &message,
             &loaders,
             &accounts,
-            &[],
             &rent_collector,
             None,
             executors,
@@ -2031,28 +2041,29 @@ mod tests {
         let mut message_processor = MessageProcessor::default();
         message_processor.add_program(mock_program_id, mock_system_process_instruction);
 
-        let mut accounts: Vec<Rc<RefCell<AccountSharedData>>> = Vec::new();
-        let account = AccountSharedData::new_ref(100, 1, &mock_program_id);
-        accounts.push(account);
-        let account = AccountSharedData::new_ref(0, 1, &mock_program_id);
-        accounts.push(account);
+        let accounts = vec![
+            (
+                solana_sdk::pubkey::new_rand(),
+                AccountSharedData::new_ref(100, 1, &mock_program_id),
+            ),
+            (
+                solana_sdk::pubkey::new_rand(),
+                AccountSharedData::new_ref(0, 1, &mock_program_id),
+            ),
+        ];
 
-        let mut loaders: Vec<Vec<(Pubkey, Rc<RefCell<AccountSharedData>>)>> = Vec::new();
         let account = Rc::new(RefCell::new(create_loadable_account_for_test(
             "mock_system_program",
         )));
-        loaders.push(vec![(mock_program_id, account)]);
+        let loaders = vec![vec![(mock_program_id, account)]];
 
         let executors = Rc::new(RefCell::new(Executors::default()));
         let ancestors = Ancestors::default();
 
-        let from_pubkey = solana_sdk::pubkey::new_rand();
-        let to_pubkey = solana_sdk::pubkey::new_rand();
-        let dup_pubkey = from_pubkey;
         let account_metas = vec![
-            AccountMeta::new(from_pubkey, true),
-            AccountMeta::new(to_pubkey, false),
-            AccountMeta::new(dup_pubkey, false),
+            AccountMeta::new(accounts[0].0, true),
+            AccountMeta::new(accounts[1].0, false),
+            AccountMeta::new(accounts[0].0, false),
         ];
 
         // Try to borrow mut the same account
@@ -2062,13 +2073,12 @@ mod tests {
                 &MockSystemInstruction::BorrowFail,
                 account_metas.clone(),
             )],
-            Some(&from_pubkey),
+            Some(&accounts[0].0),
         );
         let result = message_processor.process_message(
             &message,
             &loaders,
             &accounts,
-            &[],
             &rent_collector,
             None,
             executors.clone(),
@@ -2094,13 +2104,12 @@ mod tests {
                 &MockSystemInstruction::MultiBorrowMut,
                 account_metas.clone(),
             )],
-            Some(&from_pubkey),
+            Some(&accounts[0].0),
         );
         let result = message_processor.process_message(
             &message,
             &loaders,
             &accounts,
-            &[],
             &rent_collector,
             None,
             executors.clone(),
@@ -2123,14 +2132,13 @@ mod tests {
                 },
                 account_metas,
             )],
-            Some(&from_pubkey),
+            Some(&accounts[0].0),
         );
         let ancestors = Ancestors::default();
         let result = message_processor.process_message(
             &message,
             &loaders,
             &accounts,
-            &[],
             &rent_collector,
             None,
             executors,
@@ -2142,9 +2150,9 @@ mod tests {
             &ancestors,
         );
         assert_eq!(result, Ok(()));
-        assert_eq!(accounts[0].borrow().lamports(), 80);
-        assert_eq!(accounts[1].borrow().lamports(), 20);
-        assert_eq!(accounts[0].borrow().data(), &vec![42]);
+        assert_eq!(accounts[0].1.borrow().lamports(), 80);
+        assert_eq!(accounts[1].1.borrow().lamports(), 20);
+        assert_eq!(accounts[0].1.borrow().data(), &vec![42]);
     }
 
     #[test]
@@ -2196,25 +2204,28 @@ mod tests {
             Rc::new(RefCell::new(program_account.clone())),
         )];
 
-        let owned_key = solana_sdk::pubkey::new_rand();
         let owned_account = AccountSharedData::new(42, 1, &callee_program_id);
-
-        let not_owned_key = solana_sdk::pubkey::new_rand();
         let not_owned_account = AccountSharedData::new(84, 1, &solana_sdk::pubkey::new_rand());
 
         #[allow(unused_mut)]
-        let mut accounts = vec![
-            Rc::new(RefCell::new(owned_account)),
-            Rc::new(RefCell::new(not_owned_account)),
-            Rc::new(RefCell::new(program_account)),
+        let accounts = vec![
+            (
+                solana_sdk::pubkey::new_rand(),
+                Rc::new(RefCell::new(owned_account)),
+            ),
+            (
+                solana_sdk::pubkey::new_rand(),
+                Rc::new(RefCell::new(not_owned_account)),
+            ),
+            (callee_program_id, Rc::new(RefCell::new(program_account))),
         ];
 
         let compiled_instruction = CompiledInstruction::new(2, &(), vec![0, 1, 2]);
         let programs: Vec<(_, ProcessInstructionWithContext)> =
             vec![(callee_program_id, mock_process_instruction)];
         let metas = vec![
-            AccountMeta::new(owned_key, false),
-            AccountMeta::new(not_owned_key, false),
+            AccountMeta::new(accounts[0].0, false),
+            AccountMeta::new(accounts[1].0, false),
         ];
 
         let instruction = Instruction::new_with_bincode(
@@ -2232,7 +2243,6 @@ mod tests {
             &compiled_instruction,
             &executable_accounts,
             &accounts,
-            &[],
             programs.as_slice(),
             None,
             BpfComputeBudget::default(),
@@ -2244,15 +2254,13 @@ mod tests {
         );
 
         // not owned account modified by the caller (before the invoke)
-        let demote_sysvar_write_locks =
-            invoke_context.is_feature_active(&demote_sysvar_write_locks::id());
         let caller_write_privileges = message
             .account_keys
             .iter()
             .enumerate()
-            .map(|(i, _)| message.is_writable(i, demote_sysvar_write_locks))
+            .map(|(i, _)| message.is_writable(i))
             .collect::<Vec<bool>>();
-        accounts[0].borrow_mut().data_as_mut_slice()[0] = 1;
+        accounts[0].1.borrow_mut().data_as_mut_slice()[0] = 1;
         assert_eq!(
             MessageProcessor::process_cross_program_instruction(
                 &message,
@@ -2263,7 +2271,7 @@ mod tests {
             ),
             Err(InstructionError::ExternalAccountDataModified)
         );
-        accounts[0].borrow_mut().data_as_mut_slice()[0] = 0;
+        accounts[0].1.borrow_mut().data_as_mut_slice()[0] = 0;
 
         let cases = vec![
             (MockInstruction::NoopSuccess, Ok(())),
@@ -2291,7 +2299,6 @@ mod tests {
                 &compiled_instruction,
                 &executable_accounts,
                 &accounts,
-                &[],
                 programs.as_slice(),
                 None,
                 BpfComputeBudget::default(),
@@ -2306,7 +2313,7 @@ mod tests {
                 .account_keys
                 .iter()
                 .enumerate()
-                .map(|(i, _)| message.is_writable(i, demote_sysvar_write_locks))
+                .map(|(i, _)| message.is_writable(i))
                 .collect::<Vec<bool>>();
             assert_eq!(
                 MessageProcessor::process_cross_program_instruction(
diff --git a/runtime/src/native_loader.rs b/runtime/src/native_loader.rs
index 0e51a0f8ba7893..7a313945d072b0 100644
--- a/runtime/src/native_loader.rs
+++ b/runtime/src/native_loader.rs
@@ -110,7 +110,7 @@ impl NativeLoader {
         if let Some(entrypoint) = cache.get(name) {
             Ok(entrypoint.clone())
         } else {
-            match Self::library_open(&Self::create_path(&name)?) {
+            match Self::library_open(&Self::create_path(name)?) {
                 Ok(library) => {
                     let result = unsafe { library.get::<T>(name.as_bytes()) };
                     match result {
diff --git a/runtime/src/neon_evm_program.rs b/runtime/src/neon_evm_program.rs
new file mode 100644
index 00000000000000..45ada6fe34be16
--- /dev/null
+++ b/runtime/src/neon_evm_program.rs
@@ -0,0 +1,11 @@
+solana_sdk::declare_id!("eeLSJgWzzxrqKv1UxtRVVH8FX3qCQWUs9QuAjJpETGU");
+
+#[cfg(test)]
+pub mod tests {
+    use super::*;
+
+    #[test]
+    fn test_id() {
+        id().log();
+    }
+}
diff --git a/runtime/src/non_circulating_supply.rs b/runtime/src/non_circulating_supply.rs
index fee9a314d2f493..cccfb9615e09e2 100644
--- a/runtime/src/non_circulating_supply.rs
+++ b/runtime/src/non_circulating_supply.rs
@@ -1,11 +1,15 @@
 use {
     crate::{
-        accounts_index::{AccountIndex, IndexKey},
+        accounts_index::{AccountIndex, IndexKey, ScanResult},
         bank::Bank,
     },
     log::*,
-    solana_sdk::{account::ReadableAccount, pubkey::Pubkey},
-    solana_stake_program::stake_state::StakeState,
+    solana_sdk::{
+        account::ReadableAccount,
+        pubkey::Pubkey,
+        stake::{self, state::StakeState},
+    },
+    solana_stake_program::stake_state,
     std::{collections::HashSet, sync::Arc},
 };
 
@@ -14,7 +18,7 @@ pub struct NonCirculatingSupply {
     pub accounts: Vec<Pubkey>,
 }
 
-pub fn calculate_non_circulating_supply(bank: &Arc<Bank>) -> NonCirculatingSupply {
+pub fn calculate_non_circulating_supply(bank: &Arc<Bank>) -> ScanResult<NonCirculatingSupply> {
     debug!("Updating Bank supply, epoch: {}", bank.epoch());
     let mut non_circulating_accounts_set: HashSet<Pubkey> = HashSet::new();
 
@@ -32,18 +36,19 @@ pub fn calculate_non_circulating_supply(bank: &Arc<Bank>) -> NonCirculatingSuppl
         .contains(&AccountIndex::ProgramId)
     {
         bank.get_filtered_indexed_accounts(
-            &IndexKey::ProgramId(solana_stake_program::id()),
+            &IndexKey::ProgramId(stake::program::id()),
             // The program-id account index checks for Account owner on inclusion. However, due to
             // the current AccountsDb implementation, an account may remain in storage as a
             // zero-lamport Account::Default() after being wiped and reinitialized in later
             // updates. We include the redundant filter here to avoid returning these accounts.
-            |account| account.owner() == &solana_stake_program::id(),
-        )
+            |account| account.owner() == &stake::program::id(),
+        )?
     } else {
-        bank.get_program_accounts(&solana_stake_program::id())
+        bank.get_program_accounts(&stake::program::id())?
     };
+
     for (pubkey, account) in stake_accounts.iter() {
-        let stake_account = StakeState::from(account).unwrap_or_default();
+        let stake_account = stake_state::from(account).unwrap_or_default();
         match stake_account {
             StakeState::Initialized(meta) => {
                 if meta.lockup.is_in_force(&clock, None)
@@ -65,13 +70,13 @@ pub fn calculate_non_circulating_supply(bank: &Arc<Bank>) -> NonCirculatingSuppl
 
     let lamports = non_circulating_accounts_set
         .iter()
-        .map(|pubkey| bank.get_balance(&pubkey))
+        .map(|pubkey| bank.get_balance(pubkey))
         .sum();
 
-    NonCirculatingSupply {
+    Ok(NonCirculatingSupply {
         lamports,
         accounts: non_circulating_accounts_set.into_iter().collect(),
-    }
+    })
 }
 
 // Mainnet-beta accounts that should be considered non-circulating
@@ -195,8 +200,8 @@ mod tests {
         account::AccountSharedData,
         epoch_schedule::EpochSchedule,
         genesis_config::{ClusterType, GenesisConfig},
+        stake::state::{Authorized, Lockup, Meta},
     };
-    use solana_stake_program::stake_state::{Authorized, Lockup, Meta, StakeState};
     use std::{collections::BTreeMap, sync::Arc};
 
     fn new_from_parent(parent: &Arc<Bank>) -> Bank {
@@ -235,7 +240,7 @@ mod tests {
                 balance,
                 &StakeState::Initialized(meta),
                 std::mem::size_of::<StakeState>(),
-                &solana_stake_program::id(),
+                &stake::program::id(),
             )
             .unwrap();
             accounts.insert(pubkey, stake_account);
@@ -249,14 +254,14 @@ mod tests {
             ..GenesisConfig::default()
         };
         let mut bank = Arc::new(Bank::new(&genesis_config));
-        let sysvar_and_native_program_delta = 10;
+        let sysvar_and_native_program_delta = 11;
         assert_eq!(
             bank.capitalization(),
             (num_genesis_accounts + num_non_circulating_accounts + num_stake_accounts) * balance
                 + sysvar_and_native_program_delta,
         );
 
-        let non_circulating_supply = calculate_non_circulating_supply(&bank);
+        let non_circulating_supply = calculate_non_circulating_supply(&bank).unwrap();
         assert_eq!(
             non_circulating_supply.lamports,
             (num_non_circulating_accounts + num_stake_accounts) * balance
@@ -274,7 +279,7 @@ mod tests {
                 &AccountSharedData::new(new_balance, 0, &Pubkey::default()),
             );
         }
-        let non_circulating_supply = calculate_non_circulating_supply(&bank);
+        let non_circulating_supply = calculate_non_circulating_supply(&bank).unwrap();
         assert_eq!(
             non_circulating_supply.lamports,
             (num_non_circulating_accounts * new_balance) + (num_stake_accounts * balance)
@@ -289,7 +294,7 @@ mod tests {
             bank = Arc::new(new_from_parent(&bank));
         }
         assert_eq!(bank.epoch(), 1);
-        let non_circulating_supply = calculate_non_circulating_supply(&bank);
+        let non_circulating_supply = calculate_non_circulating_supply(&bank).unwrap();
         assert_eq!(
             non_circulating_supply.lamports,
             num_non_circulating_accounts * new_balance
diff --git a/runtime/src/pubkey_bins.rs b/runtime/src/pubkey_bins.rs
new file mode 100644
index 00000000000000..302d133132beaf
--- /dev/null
+++ b/runtime/src/pubkey_bins.rs
@@ -0,0 +1,143 @@
+use solana_sdk::pubkey::Pubkey;
+
+pub(crate) struct PubkeyBinCalculator16 {
+    // how many bits from the first 2 bytes to shift away to ignore when calculating bin
+    shift_bits: u32,
+}
+
+impl PubkeyBinCalculator16 {
+    const fn num_bits<T>() -> usize {
+        std::mem::size_of::<T>() * 8
+    }
+
+    fn log_2(x: u32) -> u32 {
+        assert!(x > 0);
+        Self::num_bits::<u32>() as u32 - x.leading_zeros() - 1
+    }
+
+    pub fn new(bins: usize) -> Self {
+        const MAX_BITS: u32 = 16;
+        assert!(bins > 0);
+        let max_plus_1 = 1 << MAX_BITS;
+        assert!(bins <= max_plus_1);
+        assert!(bins.is_power_of_two());
+        let bits = Self::log_2(bins as u32);
+        Self {
+            shift_bits: MAX_BITS - bits,
+        }
+    }
+
+    pub fn bin_from_pubkey(&self, pubkey: &Pubkey) -> usize {
+        let as_ref = pubkey.as_ref();
+        ((as_ref[0] as usize * 256 + as_ref[1] as usize) as usize) >> self.shift_bits
+    }
+}
+
+#[cfg(test)]
+pub mod tests {
+    use super::*;
+
+    #[test]
+    fn test_pubkey_bins_log2() {
+        assert_eq!(PubkeyBinCalculator16::num_bits::<u8>(), 8);
+        assert_eq!(PubkeyBinCalculator16::num_bits::<u32>(), 32);
+        for i in 0..32 {
+            assert_eq!(PubkeyBinCalculator16::log_2(2u32.pow(i)), i);
+        }
+    }
+
+    #[test]
+    fn test_pubkey_bins() {
+        for i in 0..=16 {
+            let bins = 2u32.pow(i);
+            let calc = PubkeyBinCalculator16::new(bins as usize);
+            assert_eq!(calc.shift_bits, 16 - i, "i: {}", i);
+        }
+    }
+
+    #[test]
+    fn test_pubkey_bins_pubkeys() {
+        let mut pk = Pubkey::new(&[0; 32]);
+        for i in 0..=8 {
+            let bins = 2usize.pow(i);
+            let calc = PubkeyBinCalculator16::new(bins);
+
+            let shift_bits = calc.shift_bits - 8; // we are only dealing with first byte
+
+            pk.as_mut()[0] = 0;
+            assert_eq!(0, calc.bin_from_pubkey(&pk));
+            pk.as_mut()[0] = 0xff;
+            assert_eq!(bins - 1, calc.bin_from_pubkey(&pk));
+
+            for bin in 0..bins {
+                pk.as_mut()[0] = (bin << shift_bits) as u8;
+                assert_eq!(
+                    bin,
+                    calc.bin_from_pubkey(&pk),
+                    "bin: {}/{}, bits: {}, val: {}",
+                    bin,
+                    bins,
+                    shift_bits,
+                    pk.as_ref()[0]
+                );
+                if bin > 0 {
+                    pk.as_mut()[0] = ((bin << shift_bits) - 1) as u8;
+                    assert_eq!(bin - 1, calc.bin_from_pubkey(&pk));
+                }
+            }
+        }
+
+        for i in 9..=16 {
+            let mut pk = Pubkey::new(&[0; 32]);
+            let bins = 2usize.pow(i);
+            let calc = PubkeyBinCalculator16::new(bins);
+
+            let shift_bits = calc.shift_bits;
+
+            pk.as_mut()[1] = 0;
+            assert_eq!(0, calc.bin_from_pubkey(&pk));
+            pk.as_mut()[0] = 0xff;
+            pk.as_mut()[1] = 0xff;
+            assert_eq!(bins - 1, calc.bin_from_pubkey(&pk));
+
+            let mut pk = Pubkey::new(&[0; 32]);
+            for bin in 0..bins {
+                let mut target = (bin << shift_bits) as u16;
+                pk.as_mut()[0] = (target / 256) as u8;
+                pk.as_mut()[1] = (target % 256) as u8;
+                assert_eq!(
+                    bin,
+                    calc.bin_from_pubkey(&pk),
+                    "bin: {}/{}, bits: {}, val: {}",
+                    bin,
+                    bins,
+                    shift_bits,
+                    pk.as_ref()[0]
+                );
+                if bin > 0 {
+                    target -= 1;
+                    pk.as_mut()[0] = (target / 256) as u8;
+                    pk.as_mut()[1] = (target % 256) as u8;
+                    assert_eq!(bin - 1, calc.bin_from_pubkey(&pk));
+                }
+            }
+        }
+    }
+
+    #[test]
+    #[should_panic(expected = "bins.is_power_of_two()")]
+    fn test_pubkey_bins_illegal_bins3() {
+        PubkeyBinCalculator16::new(3);
+    }
+
+    #[test]
+    #[should_panic(expected = "bins <= max_plus_1")]
+    fn test_pubkey_bins_illegal_bins2() {
+        PubkeyBinCalculator16::new(65537);
+    }
+    #[test]
+    #[should_panic(expected = "bins > 0")]
+    fn test_pubkey_bins_illegal_bins() {
+        PubkeyBinCalculator16::new(0);
+    }
+}
diff --git a/runtime/src/rent_collector.rs b/runtime/src/rent_collector.rs
index 98d609d843ad75..744bd7ee0a4f11 100644
--- a/runtime/src/rent_collector.rs
+++ b/runtime/src/rent_collector.rs
@@ -60,10 +60,11 @@ impl RentCollector {
         &self,
         address: &Pubkey,
         account: &mut AccountSharedData,
+        rent_for_sysvars: bool,
     ) -> u64 {
         if account.executable() // executable accounts must be rent-exempt balance
             || account.rent_epoch() > self.epoch
-            || sysvar::check_id(account.owner())
+            || (!rent_for_sysvars && sysvar::check_id(account.owner()))
             || *address == incinerator::id()
         {
             0
@@ -115,10 +116,11 @@ impl RentCollector {
         &self,
         address: &Pubkey,
         account: &mut AccountSharedData,
+        rent_for_sysvars: bool,
     ) -> u64 {
         // initialize rent_epoch as created at this epoch
         account.set_rent_epoch(self.epoch);
-        self.collect_from_existing_account(address, account)
+        self.collect_from_existing_account(address, account, rent_for_sysvars)
     }
 }
 
@@ -146,15 +148,21 @@ mod tests {
         let rent_collector = RentCollector::default().clone_with_epoch(new_epoch);
 
         // collect rent on a newly-created account
-        let collected = rent_collector
-            .collect_from_created_account(&solana_sdk::pubkey::new_rand(), &mut created_account);
+        let collected = rent_collector.collect_from_created_account(
+            &solana_sdk::pubkey::new_rand(),
+            &mut created_account,
+            true,
+        );
         assert!(created_account.lamports() < old_lamports);
         assert_eq!(created_account.lamports() + collected, old_lamports);
         assert_ne!(created_account.rent_epoch(), old_epoch);
 
         // collect rent on a already-existing account
-        let collected = rent_collector
-            .collect_from_existing_account(&solana_sdk::pubkey::new_rand(), &mut existing_account);
+        let collected = rent_collector.collect_from_existing_account(
+            &solana_sdk::pubkey::new_rand(),
+            &mut existing_account,
+            true,
+        );
         assert!(existing_account.lamports() < old_lamports);
         assert_eq!(existing_account.lamports() + collected, old_lamports);
         assert_ne!(existing_account.rent_epoch(), old_epoch);
@@ -180,7 +188,7 @@ mod tests {
         let rent_collector = RentCollector::default().clone_with_epoch(epoch);
 
         // first mark account as being collected while being rent-exempt
-        collected = rent_collector.collect_from_existing_account(&pubkey, &mut account);
+        collected = rent_collector.collect_from_existing_account(&pubkey, &mut account, true);
         assert_eq!(account.lamports(), huge_lamports);
         assert_eq!(collected, 0);
 
@@ -188,8 +196,33 @@ mod tests {
         account.set_lamports(tiny_lamports);
 
         // ... and trigger another rent collection on the same epoch and check that rent is working
-        collected = rent_collector.collect_from_existing_account(&pubkey, &mut account);
+        collected = rent_collector.collect_from_existing_account(&pubkey, &mut account, true);
         assert_eq!(account.lamports(), tiny_lamports - collected);
         assert_ne!(collected, 0);
     }
+
+    #[test]
+    fn test_rent_exempt_sysvar() {
+        let tiny_lamports = 1;
+        let mut account = AccountSharedData::default();
+        account.set_owner(sysvar::id());
+        account.set_lamports(tiny_lamports);
+
+        let pubkey = solana_sdk::pubkey::new_rand();
+
+        assert_eq!(account.rent_epoch(), 0);
+
+        let epoch = 3;
+        let rent_collector = RentCollector::default().clone_with_epoch(epoch);
+
+        // old behavior: sysvars are special-cased
+        let collected = rent_collector.collect_from_existing_account(&pubkey, &mut account, false);
+        assert_eq!(account.lamports(), tiny_lamports);
+        assert_eq!(collected, 0);
+
+        // new behavior: sysvars are NOT special-cased
+        let collected = rent_collector.collect_from_existing_account(&pubkey, &mut account, true);
+        assert_eq!(account.lamports(), 0);
+        assert_eq!(collected, 1);
+    }
 }
diff --git a/runtime/src/secondary_index.rs b/runtime/src/secondary_index.rs
index c6d45961b49c14..37199f2668517c 100644
--- a/runtime/src/secondary_index.rs
+++ b/runtime/src/secondary_index.rs
@@ -134,10 +134,10 @@ impl<SecondaryIndexEntryType: SecondaryIndexEntry + Default + Sync + Send>
                 .downgrade()
         });
 
-        let should_insert = !outer_keys.read().unwrap().contains(&key);
+        let should_insert = !outer_keys.read().unwrap().contains(key);
         if should_insert {
             let mut w_outer_keys = outer_keys.write().unwrap();
-            if !w_outer_keys.contains(&key) {
+            if !w_outer_keys.contains(key) {
                 w_outer_keys.push(*key);
             }
         }
@@ -175,11 +175,11 @@ impl<SecondaryIndexEntryType: SecondaryIndexEntry + Default + Sync + Send>
         let is_outer_key_empty = {
             let inner_key_map = self
                 .index
-                .get_mut(&outer_key)
+                .get_mut(outer_key)
                 .expect("If we're removing a key, then it must have an entry in the map");
             // If we deleted a pubkey from the reverse_index, then the corresponding entry
             // better exist in this index as well or the two indexes are out of sync!
-            assert!(inner_key_map.value().remove_inner_key(&removed_inner_key));
+            assert!(inner_key_map.value().remove_inner_key(removed_inner_key));
             inner_key_map.is_empty()
         };
 
diff --git a/runtime/src/serde_snapshot.rs b/runtime/src/serde_snapshot.rs
index 33ca72178ec26b..999bbe38400efe 100644
--- a/runtime/src/serde_snapshot.rs
+++ b/runtime/src/serde_snapshot.rs
@@ -1,7 +1,9 @@
 use {
     crate::{
         accounts::Accounts,
-        accounts_db::{AccountStorageEntry, AccountsDb, AppendVecId, BankHashInfo},
+        accounts_db::{
+            AccountShrinkThreshold, AccountStorageEntry, AccountsDb, AppendVecId, BankHashInfo,
+        },
         accounts_index::AccountSecondaryIndexes,
         ancestors::Ancestors,
         append_vec::{AppendVec, StoredMetaWriteVersion},
@@ -17,6 +19,7 @@ use {
     bincode,
     bincode::{config::Options, Error},
     log::*,
+    rayon::prelude::*,
     serde::{de::DeserializeOwned, Deserialize, Serialize},
     solana_sdk::{
         clock::{Epoch, Slot, UnixTimestamp},
@@ -32,10 +35,9 @@ use {
     std::{
         collections::{HashMap, HashSet},
         io::{self, BufReader, BufWriter, Read, Write},
-        path::PathBuf,
+        path::{Path, PathBuf},
         result::Result,
         sync::{atomic::Ordering, Arc, RwLock},
-        time::Instant,
     },
 };
 
@@ -76,7 +78,8 @@ trait TypeContext<'a> {
     type SerializableAccountStorageEntry: Serialize
         + DeserializeOwned
         + From<&'a AccountStorageEntry>
-        + SerializableStorage;
+        + SerializableStorage
+        + Sync;
 
     fn serialize_bank_and_storage<S: serde::ser::Serializer>(
         serializer: S,
@@ -136,6 +139,7 @@ pub(crate) fn bank_from_stream<R>(
     account_indexes: AccountSecondaryIndexes,
     caching_enabled: bool,
     limit_load_slot_count_from_snapshot: Option<usize>,
+    shrink_ratio: AccountShrinkThreshold,
 ) -> std::result::Result<Bank, Error>
 where
     R: Read,
@@ -156,6 +160,7 @@ where
                 account_indexes,
                 caching_enabled,
                 limit_load_slot_count_from_snapshot,
+                shrink_ratio,
             )?;
             Ok(bank)
         }};
@@ -246,9 +251,10 @@ fn reconstruct_bank_from_fields<E>(
     account_indexes: AccountSecondaryIndexes,
     caching_enabled: bool,
     limit_load_slot_count_from_snapshot: Option<usize>,
+    shrink_ratio: AccountShrinkThreshold,
 ) -> Result<Bank, Error>
 where
-    E: SerializableStorage,
+    E: SerializableStorage + std::marker::Sync,
 {
     let mut accounts_db = reconstruct_accountsdb_from_fields(
         accounts_db_fields,
@@ -258,6 +264,7 @@ where
         account_indexes,
         caching_enabled,
         limit_load_slot_count_from_snapshot,
+        shrink_ratio,
     )?;
     accounts_db.freeze_accounts(
         &Ancestors::from(&bank_fields.ancestors),
@@ -265,17 +272,39 @@ where
     );
 
     let bank_rc = BankRc::new(Accounts::new_empty(accounts_db), bank_fields.slot);
+
+    // if limit_load_slot_count_from_snapshot is set, then we need to side-step some correctness checks beneath this call
+    let debug_do_not_add_builtins = limit_load_slot_count_from_snapshot.is_some();
     let bank = Bank::new_from_fields(
         bank_rc,
         genesis_config,
         bank_fields,
         debug_keys,
         additional_builtins,
+        debug_do_not_add_builtins,
     );
 
     Ok(bank)
 }
 
+fn reconstruct_single_storage<E>(
+    slot: &Slot,
+    append_vec_path: &Path,
+    storage_entry: &E,
+    new_slot_storage: &mut HashMap<AppendVecId, Arc<AccountStorageEntry>>,
+) -> Result<(), Error>
+where
+    E: SerializableStorage,
+{
+    let (accounts, num_accounts) =
+        AppendVec::new_from_file(append_vec_path, storage_entry.current_len())?;
+    let u_storage_entry =
+        AccountStorageEntry::new_existing(*slot, storage_entry.id(), accounts, num_accounts);
+
+    new_slot_storage.insert(storage_entry.id(), Arc::new(u_storage_entry));
+    Ok(())
+}
+
 fn reconstruct_accountsdb_from_fields<E>(
     accounts_db_fields: AccountsDbFields<E>,
     account_paths: &[PathBuf],
@@ -284,15 +313,17 @@ fn reconstruct_accountsdb_from_fields<E>(
     account_indexes: AccountSecondaryIndexes,
     caching_enabled: bool,
     limit_load_slot_count_from_snapshot: Option<usize>,
+    shrink_ratio: AccountShrinkThreshold,
 ) -> Result<AccountsDb, Error>
 where
-    E: SerializableStorage,
+    E: SerializableStorage + std::marker::Sync,
 {
     let mut accounts_db = AccountsDb::new_with_config(
         account_paths.to_vec(),
         cluster_type,
         account_indexes,
         caching_enabled,
+        shrink_ratio,
     );
     let AccountsDbFields(storage, version, slot, bank_hash_info) = accounts_db_fields;
 
@@ -302,23 +333,16 @@ where
             .unwrap_or_else(|err| panic!("Failed to create directory {}: {}", path.display(), err));
     }
 
-    let mut last_log_update = Instant::now();
-    let mut remaining_slots_to_process = storage.len();
+    let storage = storage.into_iter().collect::<Vec<_>>();
 
     // Remap the deserialized AppendVec paths to point to correct local paths
-    let mut storage = storage
-        .into_iter()
-        .map(|(slot, mut slot_storage)| {
-            let now = Instant::now();
-            if now.duration_since(last_log_update).as_secs() >= 10 {
-                info!("{} slots remaining...", remaining_slots_to_process);
-                last_log_update = now;
-            }
-            remaining_slots_to_process -= 1;
-
+    let mut storage = (0..storage.len())
+        .into_par_iter()
+        .map(|i| {
+            let (slot, slot_storage) = &storage[i];
             let mut new_slot_storage = HashMap::new();
-            for storage_entry in slot_storage.drain(..) {
-                let file_name = AppendVec::file_name(slot, storage_entry.id());
+            for storage_entry in slot_storage {
+                let file_name = AppendVec::file_name(*slot, storage_entry.id());
 
                 let append_vec_path = unpacked_append_vec_map.get(&file_name).ok_or_else(|| {
                     io::Error::new(
@@ -327,18 +351,14 @@ where
                     )
                 })?;
 
-                let (accounts, num_accounts) =
-                    AppendVec::new_from_file(append_vec_path, storage_entry.current_len())?;
-                let u_storage_entry = AccountStorageEntry::new_existing(
-                    slot,
-                    storage_entry.id(),
-                    accounts,
-                    num_accounts,
-                );
-
-                new_slot_storage.insert(storage_entry.id(), Arc::new(u_storage_entry));
+                reconstruct_single_storage(
+                    &slot,
+                    append_vec_path,
+                    storage_entry,
+                    &mut new_slot_storage,
+                )?;
             }
-            Ok((slot, new_slot_storage))
+            Ok((*slot, new_slot_storage))
         })
         .collect::<Result<HashMap<Slot, _>, Error>>()?;
 
diff --git a/runtime/src/serde_snapshot/future.rs b/runtime/src/serde_snapshot/future.rs
index b822da5825f72a..1002c1cddb40a2 100644
--- a/runtime/src/serde_snapshot/future.rs
+++ b/runtime/src/serde_snapshot/future.rs
@@ -165,7 +165,7 @@ impl<'a> From<crate::bank::BankFieldsToSerialize<'a>> for SerializableVersionedB
         }
         Self {
             blockhash_queue: rhs.blockhash_queue,
-            ancestors: &rhs.ancestors,
+            ancestors: rhs.ancestors,
             hash: rhs.hash,
             parent_hash: rhs.parent_hash,
             parent_slot: rhs.parent_slot,
diff --git a/runtime/src/serde_snapshot/tests.rs b/runtime/src/serde_snapshot/tests.rs
index 4971ee2d0a7702..c7bf8a9bda8d72 100644
--- a/runtime/src/serde_snapshot/tests.rs
+++ b/runtime/src/serde_snapshot/tests.rs
@@ -3,7 +3,7 @@ use {
     super::*,
     crate::{
         accounts::{create_test_accounts, Accounts},
-        accounts_db::get_temp_accounts_paths,
+        accounts_db::{get_temp_accounts_paths, AccountShrinkThreshold},
         bank::{Bank, StatusCacheRc},
         hardened_unpack::UnpackedAppendVecMap,
     },
@@ -28,7 +28,7 @@ fn copy_append_vecs<P: AsRef<Path>>(
     accounts_db: &AccountsDb,
     output_dir: P,
 ) -> std::io::Result<UnpackedAppendVecMap> {
-    let storage_entries = accounts_db.get_snapshot_storages(Slot::max_value());
+    let storage_entries = accounts_db.get_snapshot_storages(Slot::max_value(), None).0;
     let mut unpacked_append_vec_map = UnpackedAppendVecMap::new();
     for storage in storage_entries.iter().flatten() {
         let storage_path = storage.get_path();
@@ -74,6 +74,7 @@ where
         AccountSecondaryIndexes::default(),
         false,
         None,
+        AccountShrinkThreshold::default(),
     )
 }
 
@@ -129,6 +130,7 @@ fn test_accounts_serialize_style(serde_style: SerdeStyle) {
         &ClusterType::Development,
         AccountSecondaryIndexes::default(),
         false,
+        AccountShrinkThreshold::default(),
     );
 
     let mut pubkeys: Vec<Pubkey> = vec![];
@@ -142,7 +144,7 @@ fn test_accounts_serialize_style(serde_style: SerdeStyle) {
         &mut writer,
         &*accounts.accounts_db,
         0,
-        &accounts.accounts_db.get_snapshot_storages(0),
+        &accounts.accounts_db.get_snapshot_storages(0, None).0,
     )
     .unwrap();
 
@@ -228,6 +230,7 @@ fn test_bank_serialize_style(serde_style: SerdeStyle) {
         AccountSecondaryIndexes::default(),
         false,
         None,
+        AccountShrinkThreshold::default(),
     )
     .unwrap();
     dbank.src = ref_sc;
@@ -243,11 +246,11 @@ pub(crate) fn reconstruct_accounts_db_via_serialization(
     slot: Slot,
 ) -> AccountsDb {
     let mut writer = Cursor::new(vec![]);
-    let snapshot_storages = accounts.get_snapshot_storages(slot);
+    let snapshot_storages = accounts.get_snapshot_storages(slot, None).0;
     accountsdb_to_stream(
         SerdeStyle::Newer,
         &mut writer,
-        &accounts,
+        accounts,
         slot,
         &snapshot_storages,
     )
@@ -258,7 +261,7 @@ pub(crate) fn reconstruct_accounts_db_via_serialization(
     let copied_accounts = TempDir::new().unwrap();
 
     // Simulate obtaining a copy of the AppendVecs from a tarball
-    let unpacked_append_vec_map = copy_append_vecs(&accounts, copied_accounts.path()).unwrap();
+    let unpacked_append_vec_map = copy_append_vecs(accounts, copied_accounts.path()).unwrap();
     let mut accounts_db =
         accountsdb_from_stream(SerdeStyle::Newer, &mut reader, &[], unpacked_append_vec_map)
             .unwrap();
@@ -290,7 +293,7 @@ mod test_bank_serialize {
 
     // This some what long test harness is required to freeze the ABI of
     // Bank's serialization due to versioned nature
-    #[frozen_abi(digest = "DuRGntVwLGNAv5KooafUSpxk67BPAx2yC7Z8A9c8wr2G")]
+    #[frozen_abi(digest = "6msodEzE7YzFtorBhiP6ax4PKBaPZTkmYdGAdpoxLCvV")]
     #[derive(Serialize, AbiExample)]
     pub struct BankAbiTestWrapperFuture {
         #[serde(serialize_with = "wrapper_future")]
@@ -301,7 +304,12 @@ mod test_bank_serialize {
     where
         S: serde::Serializer,
     {
-        let snapshot_storages = bank.rc.accounts.accounts_db.get_snapshot_storages(0);
+        let snapshot_storages = bank
+            .rc
+            .accounts
+            .accounts_db
+            .get_snapshot_storages(0, None)
+            .0;
         // ensure there is a single snapshot storage example for ABI digesting
         assert_eq!(snapshot_storages.len(), 1);
 
diff --git a/runtime/src/snapshot_utils.rs b/runtime/src/snapshot_utils.rs
index d59eb54c4f3de0..af468a8b4e4e77 100644
--- a/runtime/src/snapshot_utils.rs
+++ b/runtime/src/snapshot_utils.rs
@@ -1,22 +1,23 @@
 use {
     crate::{
-        accounts_db::AccountsDb,
+        accounts_db::{AccountShrinkThreshold, AccountsDb},
         accounts_index::AccountSecondaryIndexes,
         bank::{Bank, BankSlotDelta, Builtins},
         bank_forks::ArchiveFormat,
-        hardened_unpack::{unpack_snapshot, UnpackError, UnpackedAppendVecMap},
+        hardened_unpack::{unpack_snapshot, ParallelSelector, UnpackError, UnpackedAppendVecMap},
         serde_snapshot::{
             bank_from_stream, bank_to_stream, SerdeStyle, SnapshotStorage, SnapshotStorages,
         },
         snapshot_package::{
             AccountsPackage, AccountsPackagePre, AccountsPackageSendError, AccountsPackageSender,
         },
+        sorted_storages::SortedStorages,
     },
     bincode::{config::Options, serialize_into},
     bzip2::bufread::BzDecoder,
     flate2::read::GzDecoder,
     log::*,
-    rayon::ThreadPool,
+    rayon::{prelude::*, ThreadPool},
     regex::Regex,
     solana_measure::measure::Measure,
     solana_sdk::{clock::Slot, genesis_config::GenesisConfig, hash::Hash, pubkey::Pubkey},
@@ -127,6 +128,9 @@ pub enum SnapshotError {
 
     #[error("accounts package send error")]
     AccountsPackageSendError(#[from] AccountsPackageSendError),
+
+    #[error("source({1}) - I/O error: {0}")]
+    IoWithSource(std::io::Error, &'static str),
 }
 pub type Result<T> = std::result::Result<T, SnapshotError>;
 
@@ -197,10 +201,10 @@ pub fn package_snapshot<P: AsRef<Path>, Q: AsRef<Path>>(
 
 fn get_archive_ext(archive_format: ArchiveFormat) -> &'static str {
     match archive_format {
-        ArchiveFormat::TarBzip2 => ".tar.bz2",
-        ArchiveFormat::TarGzip => ".tar.gz",
-        ArchiveFormat::TarZstd => ".tar.zst",
-        ArchiveFormat::Tar => ".tar",
+        ArchiveFormat::TarBzip2 => "tar.bz2",
+        ArchiveFormat::TarGzip => "tar.gz",
+        ArchiveFormat::TarZstd => "tar.zst",
+        ArchiveFormat::Tar => "tar",
     }
 }
 
@@ -252,7 +256,8 @@ pub fn archive_snapshot_package(
         .parent()
         .expect("Tar output path is invalid");
 
-    fs::create_dir_all(tar_dir)?;
+    fs::create_dir_all(tar_dir)
+        .map_err(|e| SnapshotError::IoWithSource(e, "create archive path"))?;
 
     // Create the staging directories
     let staging_dir = tempfile::Builder::new()
@@ -260,18 +265,21 @@ pub fn archive_snapshot_package(
             "{}{}-",
             TMP_SNAPSHOT_PREFIX, snapshot_package.slot
         ))
-        .tempdir_in(tar_dir)?;
+        .tempdir_in(tar_dir)
+        .map_err(|e| SnapshotError::IoWithSource(e, "create archive tempdir"))?;
 
     let staging_accounts_dir = staging_dir.path().join("accounts");
     let staging_snapshots_dir = staging_dir.path().join("snapshots");
     let staging_version_file = staging_dir.path().join("version");
-    fs::create_dir_all(&staging_accounts_dir)?;
+    fs::create_dir_all(&staging_accounts_dir)
+        .map_err(|e| SnapshotError::IoWithSource(e, "create staging path"))?;
 
     // Add the snapshots to the staging directory
     symlink::symlink_dir(
         snapshot_package.snapshot_links.path(),
         &staging_snapshots_dir,
-    )?;
+    )
+    .map_err(|e| SnapshotError::IoWithSource(e, "create staging symlinks"))?;
 
     // Add the AppendVecs into the compressible list
     for storage in snapshot_package.storages.iter().flatten() {
@@ -286,7 +294,8 @@ pub fn archive_snapshot_package(
         // `output_path` - The file path where the AppendVec will be placed in the staging directory.
         let storage_path =
             fs::canonicalize(storage_path).expect("Could not get absolute path for accounts");
-        symlink::symlink_file(storage_path, &output_path)?;
+        symlink::symlink_file(storage_path, &output_path)
+            .map_err(|e| SnapshotError::IoWithSource(e, "create storage symlink"))?;
         if !output_path.is_file() {
             return Err(SnapshotError::StoragePathSymlinkInvalid);
         }
@@ -294,8 +303,10 @@ pub fn archive_snapshot_package(
 
     // Write version file
     {
-        let mut f = fs::File::create(staging_version_file)?;
-        f.write_all(snapshot_package.snapshot_version.as_str().as_bytes())?;
+        let mut f = fs::File::create(staging_version_file)
+            .map_err(|e| SnapshotError::IoWithSource(e, "create version file"))?;
+        f.write_all(snapshot_package.snapshot_version.as_str().as_bytes())
+            .map_err(|e| SnapshotError::IoWithSource(e, "write version file"))?;
     }
 
     let file_ext = get_archive_ext(snapshot_package.archive_format);
@@ -304,7 +315,7 @@ pub fn archive_snapshot_package(
     //
     // system `tar` program is used for -S (sparse file support)
     let archive_path = tar_dir.join(format!(
-        "{}{}{}",
+        "{}{}.{}",
         TMP_SNAPSHOT_PREFIX, snapshot_package.slot, file_ext
     ));
 
@@ -320,7 +331,8 @@ pub fn archive_snapshot_package(
         .stdin(process::Stdio::null())
         .stdout(process::Stdio::piped())
         .stderr(process::Stdio::inherit())
-        .spawn()?;
+        .spawn()
+        .map_err(|e| SnapshotError::IoWithSource(e, "tar process spawn"))?;
 
     match &mut tar.stdout {
         None => {
@@ -357,15 +369,19 @@ pub fn archive_snapshot_package(
         }
     }
 
-    let tar_exit_status = tar.wait()?;
+    let tar_exit_status = tar
+        .wait()
+        .map_err(|e| SnapshotError::IoWithSource(e, "tar process wait"))?;
     if !tar_exit_status.success() {
         warn!("tar command failed with exit code: {}", tar_exit_status);
         return Err(SnapshotError::ArchiveGenerationFailure(tar_exit_status));
     }
 
     // Atomically move the archive into position for other validators to find
-    let metadata = fs::metadata(&archive_path)?;
-    fs::rename(&archive_path, &snapshot_package.tar_output_file)?;
+    let metadata = fs::metadata(&archive_path)
+        .map_err(|e| SnapshotError::IoWithSource(e, "archive path stat"))?;
+    fs::rename(&archive_path, &snapshot_package.tar_output_file)
+        .map_err(|e| SnapshotError::IoWithSource(e, "archive path rename"))?;
 
     purge_old_snapshot_archives(
         snapshot_package.tar_output_file.parent().unwrap(),
@@ -591,8 +607,18 @@ pub fn remove_snapshot<P: AsRef<Path>>(slot: Slot, snapshot_path: P) -> Result<(
     Ok(())
 }
 
+#[derive(Debug, Default)]
+pub struct BankFromArchiveTimings {
+    pub rebuild_bank_from_snapshots_us: u64,
+    pub untar_us: u64,
+    pub verify_snapshot_bank_us: u64,
+}
+
+// From testing, 4 seems to be a sweet spot for ranges of 60M-360M accounts and 16-64 cores. This may need to be tuned later.
+pub const PARALLEL_UNTAR_READERS_DEFAULT: usize = 4;
+
 #[allow(clippy::too_many_arguments)]
-pub fn bank_from_archive<P: AsRef<Path>>(
+pub fn bank_from_archive<P: AsRef<Path> + std::marker::Sync>(
     account_paths: &[PathBuf],
     frozen_account_pubkeys: &[Pubkey],
     snapshot_path: &Path,
@@ -604,17 +630,28 @@ pub fn bank_from_archive<P: AsRef<Path>>(
     account_indexes: AccountSecondaryIndexes,
     accounts_db_caching_enabled: bool,
     limit_load_slot_count_from_snapshot: Option<usize>,
-) -> Result<Bank> {
+    shrink_ratio: AccountShrinkThreshold,
+    test_hash_calculation: bool,
+    accounts_db_skip_shrink: bool,
+) -> Result<(Bank, BankFromArchiveTimings)> {
     let unpack_dir = tempfile::Builder::new()
         .prefix(TMP_SNAPSHOT_PREFIX)
         .tempdir_in(snapshot_path)?;
 
+    let mut untar = Measure::start("snapshot untar");
+    let divisions = std::cmp::min(
+        PARALLEL_UNTAR_READERS_DEFAULT,
+        std::cmp::max(1, num_cpus::get() / 4),
+    );
     let unpacked_append_vec_map = untar_snapshot_in(
         &snapshot_tar,
-        &unpack_dir.as_ref(),
+        unpack_dir.as_ref(),
         account_paths,
         archive_format,
+        divisions,
     )?;
+    untar.stop();
+    info!("{}", untar);
 
     let mut measure = Measure::start("bank rebuild from snapshot");
     let unpacked_snapshots_dir = unpack_dir.as_ref().join("snapshots");
@@ -635,15 +672,24 @@ pub fn bank_from_archive<P: AsRef<Path>>(
         account_indexes,
         accounts_db_caching_enabled,
         limit_load_slot_count_from_snapshot,
+        shrink_ratio,
     )?;
+    measure.stop();
 
-    if !bank.verify_snapshot_bank() {
+    let mut verify = Measure::start("verify");
+    if !bank.verify_snapshot_bank(test_hash_calculation, accounts_db_skip_shrink)
+        && limit_load_slot_count_from_snapshot.is_none()
+    {
         panic!("Snapshot bank for slot {} failed to verify", bank.slot());
     }
-    measure.stop();
-    info!("{}", measure);
+    verify.stop();
+    let timings = BankFromArchiveTimings {
+        rebuild_bank_from_snapshots_us: measure.as_us(),
+        untar_us: untar.as_us(),
+        verify_snapshot_bank_us: verify.as_us(),
+    };
 
-    Ok(bank)
+    Ok((bank, timings))
 }
 
 pub fn get_snapshot_archive_path(
@@ -652,7 +698,7 @@ pub fn get_snapshot_archive_path(
     archive_format: ArchiveFormat,
 ) -> PathBuf {
     snapshot_output_dir.join(format!(
-        "snapshot-{}-{}{}",
+        "snapshot-{}-{}.{}",
         snapshot_hash.0,
         snapshot_hash.1,
         get_archive_ext(archive_format),
@@ -669,27 +715,27 @@ fn archive_format_from_str(archive_format: &str) -> Option<ArchiveFormat> {
     }
 }
 
-fn snapshot_hash_of(archive_filename: &str) -> Option<(Slot, Hash, ArchiveFormat)> {
-    let snapshot_filename_regex =
-        Regex::new(r"^snapshot-(\d+)-([[:alnum:]]+)\.(tar|tar\.bz2|tar\.zst|tar\.gz)$").unwrap();
-
-    if let Some(captures) = snapshot_filename_regex.captures(archive_filename) {
-        let slot_str = captures.get(1).unwrap().as_str();
-        let hash_str = captures.get(2).unwrap().as_str();
-        let ext = captures.get(3).unwrap().as_str();
-
-        if let (Ok(slot), Ok(hash), Some(archive_format)) = (
-            slot_str.parse::<Slot>(),
-            hash_str.parse::<Hash>(),
-            archive_format_from_str(ext),
-        ) {
-            return Some((slot, hash, archive_format));
-        }
-    }
-    None
+/// Parse a snapshot archive filename into its Slot, Hash, and Archive Format
+fn parse_snapshot_archive_filename(archive_filename: &str) -> Option<(Slot, Hash, ArchiveFormat)> {
+    let snapshot_archive_filename_regex =
+        Regex::new(r"^snapshot-(\d+)-([[:alnum:]]+)\.(tar|tar\.bz2|tar\.zst|tar\.gz)$");
+
+    snapshot_archive_filename_regex
+        .ok()?
+        .captures(archive_filename)
+        .and_then(|captures| {
+            let slot = captures.get(1).map(|x| x.as_str().parse::<Slot>())?.ok()?;
+            let hash = captures.get(2).map(|x| x.as_str().parse::<Hash>())?.ok()?;
+            let archive_format = captures
+                .get(3)
+                .map(|x| archive_format_from_str(x.as_str()))??;
+
+            Some((slot, hash, archive_format))
+        })
 }
 
-pub fn get_snapshot_archives<P: AsRef<Path>>(
+/// Get a list of the snapshot archives in a directory, sorted by Slot in descending order
+fn get_snapshot_archives<P: AsRef<Path>>(
     snapshot_output_dir: P,
 ) -> Vec<(PathBuf, (Slot, Hash, ArchiveFormat))> {
     match fs::read_dir(&snapshot_output_dir) {
@@ -703,9 +749,9 @@ pub fn get_snapshot_archives<P: AsRef<Path>>(
                     if let Ok(entry) = entry {
                         let path = entry.path();
                         if path.is_file() {
-                            if let Some(snapshot_hash) =
-                                snapshot_hash_of(path.file_name().unwrap().to_str().unwrap())
-                            {
+                            if let Some(snapshot_hash) = parse_snapshot_archive_filename(
+                                path.file_name().unwrap().to_str().unwrap(),
+                            ) {
                                 return Some((path, snapshot_hash));
                             }
                         }
@@ -720,6 +766,7 @@ pub fn get_snapshot_archives<P: AsRef<Path>>(
     }
 }
 
+/// Get the snapshot archive with the highest Slot in a directory
 pub fn get_highest_snapshot_archive_path<P: AsRef<Path>>(
     snapshot_output_dir: P,
 ) -> Option<(PathBuf, (Slot, Hash, ArchiveFormat))> {
@@ -746,55 +793,80 @@ pub fn purge_old_snapshot_archives<P: AsRef<Path>>(
     }
 }
 
+fn unpack_snapshot_local<T: 'static + Read + std::marker::Send, F: Fn() -> T>(
+    reader: F,
+    ledger_dir: &Path,
+    account_paths: &[PathBuf],
+    parallel_archivers: usize,
+) -> Result<UnpackedAppendVecMap> {
+    assert!(parallel_archivers > 0);
+    let readers = (0..parallel_archivers)
+        .into_iter()
+        .map(|_| reader())
+        .collect::<Vec<_>>();
+
+    // create 'parallel_archivers' # of parallel workers, each responsible for 1/parallel_archivers of all the files to extract.
+    let all_unpacked_append_vec_map = readers
+        .into_par_iter()
+        .enumerate()
+        .map(|(index, reader)| {
+            let parallel_selector = Some(ParallelSelector {
+                index,
+                divisions: parallel_archivers,
+            });
+            let mut archive = Archive::new(reader);
+            unpack_snapshot(&mut archive, ledger_dir, account_paths, parallel_selector)
+        })
+        .collect::<Vec<_>>();
+    let mut unpacked_append_vec_map = UnpackedAppendVecMap::new();
+    for h in all_unpacked_append_vec_map {
+        unpacked_append_vec_map.extend(h?);
+    }
+
+    Ok(unpacked_append_vec_map)
+}
+
 fn untar_snapshot_in<P: AsRef<Path>>(
     snapshot_tar: P,
     unpack_dir: &Path,
     account_paths: &[PathBuf],
     archive_format: ArchiveFormat,
+    parallel_divisions: usize,
 ) -> Result<UnpackedAppendVecMap> {
-    let mut measure = Measure::start("snapshot untar");
-    let tar_name = File::open(&snapshot_tar)?;
+    let open_file = || File::open(&snapshot_tar).unwrap();
     let account_paths_map = match archive_format {
-        ArchiveFormat::TarBzip2 => {
-            let tar = BzDecoder::new(BufReader::new(tar_name));
-            let mut archive = Archive::new(tar);
-            unpack_snapshot(&mut archive, unpack_dir, account_paths)?
-        }
-        ArchiveFormat::TarGzip => {
-            let tar = GzDecoder::new(BufReader::new(tar_name));
-            let mut archive = Archive::new(tar);
-            unpack_snapshot(&mut archive, unpack_dir, account_paths)?
-        }
-        ArchiveFormat::TarZstd => {
-            let tar = zstd::stream::read::Decoder::new(BufReader::new(tar_name))?;
-            let mut archive = Archive::new(tar);
-            unpack_snapshot(&mut archive, unpack_dir, account_paths)?
-        }
-        ArchiveFormat::Tar => {
-            let tar = BufReader::new(tar_name);
-            let mut archive = Archive::new(tar);
-            unpack_snapshot(&mut archive, unpack_dir, account_paths)?
-        }
+        ArchiveFormat::TarBzip2 => unpack_snapshot_local(
+            || BzDecoder::new(BufReader::new(open_file())),
+            unpack_dir,
+            account_paths,
+            parallel_divisions,
+        )?,
+        ArchiveFormat::TarGzip => unpack_snapshot_local(
+            || GzDecoder::new(BufReader::new(open_file())),
+            unpack_dir,
+            account_paths,
+            parallel_divisions,
+        )?,
+        ArchiveFormat::TarZstd => unpack_snapshot_local(
+            || zstd::stream::read::Decoder::new(BufReader::new(open_file())).unwrap(),
+            unpack_dir,
+            account_paths,
+            parallel_divisions,
+        )?,
+        ArchiveFormat::Tar => unpack_snapshot_local(
+            || BufReader::new(open_file()),
+            unpack_dir,
+            account_paths,
+            parallel_divisions,
+        )?,
     };
-    measure.stop();
-    info!("{}", measure);
     Ok(account_paths_map)
 }
 
-#[allow(clippy::too_many_arguments)]
-fn rebuild_bank_from_snapshots(
+fn verify_snapshot_version_and_folder(
     snapshot_version: &str,
-    frozen_account_pubkeys: &[Pubkey],
     unpacked_snapshots_dir: &Path,
-    account_paths: &[PathBuf],
-    unpacked_append_vec_map: UnpackedAppendVecMap,
-    genesis_config: &GenesisConfig,
-    debug_keys: Option<Arc<HashSet<Pubkey>>>,
-    additional_builtins: Option<&Builtins>,
-    account_indexes: AccountSecondaryIndexes,
-    accounts_db_caching_enabled: bool,
-    limit_load_slot_count_from_snapshot: Option<usize>,
-) -> Result<Bank> {
+) -> Result<(SnapshotVersion, SlotSnapshotPaths)> {
     info!("snapshot version: {}", snapshot_version);
 
     let snapshot_version_enum =
@@ -811,7 +883,26 @@ fn rebuild_bank_from_snapshots(
     let root_paths = snapshot_paths
         .pop()
         .ok_or_else(|| get_io_error("No snapshots found in snapshots directory"))?;
+    Ok((snapshot_version_enum, root_paths))
+}
 
+#[allow(clippy::too_many_arguments)]
+fn rebuild_bank_from_snapshots(
+    snapshot_version: &str,
+    frozen_account_pubkeys: &[Pubkey],
+    unpacked_snapshots_dir: &Path,
+    account_paths: &[PathBuf],
+    unpacked_append_vec_map: UnpackedAppendVecMap,
+    genesis_config: &GenesisConfig,
+    debug_keys: Option<Arc<HashSet<Pubkey>>>,
+    additional_builtins: Option<&Builtins>,
+    account_indexes: AccountSecondaryIndexes,
+    accounts_db_caching_enabled: bool,
+    limit_load_slot_count_from_snapshot: Option<usize>,
+    shrink_ratio: AccountShrinkThreshold,
+) -> Result<Bank> {
+    let (snapshot_version_enum, root_paths) =
+        verify_snapshot_version_and_folder(snapshot_version, unpacked_snapshots_dir)?;
     info!(
         "Loading bank from {}",
         &root_paths.snapshot_file_path.display()
@@ -830,6 +921,7 @@ fn rebuild_bank_from_snapshots(
                 account_indexes,
                 accounts_db_caching_enabled,
                 limit_load_slot_count_from_snapshot,
+                shrink_ratio,
             ),
         }?)
     })?;
@@ -881,9 +973,10 @@ pub fn verify_snapshot_archive<P, Q, R>(
     let unpack_dir = temp_dir.path();
     untar_snapshot_in(
         snapshot_archive,
-        &unpack_dir,
+        unpack_dir,
         &[unpack_dir.to_path_buf()],
         archive_format,
+        1,
     )
     .unwrap();
 
@@ -921,7 +1014,7 @@ pub fn snapshot_bank(
 ) -> Result<()> {
     let storages: Vec<_> = root_bank.get_snapshot_storages();
     let mut add_snapshot_time = Measure::start("add-snapshot-ms");
-    add_snapshot(snapshot_path, &root_bank, &storages, snapshot_version)?;
+    add_snapshot(snapshot_path, root_bank, &storages, snapshot_version)?;
     add_snapshot_time.stop();
     inc_new_counter_info!("add-snapshot-ms", add_snapshot_time.as_ms() as usize);
 
@@ -932,7 +1025,7 @@ pub fn snapshot_bank(
         .expect("no snapshots found in config snapshot_path");
 
     let package = package_snapshot(
-        &root_bank,
+        root_bank,
         latest_slot_snapshot_paths,
         snapshot_path,
         status_cache_slot_deltas,
@@ -971,9 +1064,9 @@ pub fn bank_to_snapshot_archive<P: AsRef<Path>, Q: AsRef<Path>>(
     let temp_dir = tempfile::tempdir_in(snapshot_path)?;
 
     let storages: Vec<_> = bank.get_snapshot_storages();
-    let slot_snapshot_paths = add_snapshot(&temp_dir, &bank, &storages, snapshot_version)?;
+    let slot_snapshot_paths = add_snapshot(&temp_dir, bank, &storages, snapshot_version)?;
     let package = package_snapshot(
-        &bank,
+        bank,
         &slot_snapshot_paths,
         &temp_dir,
         bank.src.slot_deltas(&bank.src.roots()),
@@ -998,10 +1091,15 @@ pub fn process_accounts_package_pre(
 
     let hash = accounts_package.hash; // temporarily remaining here
     if let Some(expected_hash) = accounts_package.hash_for_testing {
+        let sorted_storages = SortedStorages::new(&accounts_package.storages);
         let (hash, lamports) = AccountsDb::calculate_accounts_hash_without_index(
-            &accounts_package.storages,
+            &sorted_storages,
             thread_pool,
-        );
+            crate::accounts_hash::HashStats::default(),
+            false,
+            None,
+        )
+        .unwrap();
 
         assert_eq!(accounts_package.expected_capitalization, lamports);
 
@@ -1146,21 +1244,57 @@ mod tests {
     }
 
     #[test]
-    fn test_snapshot_hash_of() {
+    fn test_parse_snapshot_archive_filename() {
         assert_eq!(
-            snapshot_hash_of(&format!("snapshot-42-{}.tar.bz2", Hash::default())),
+            parse_snapshot_archive_filename(&format!("snapshot-42-{}.tar.bz2", Hash::default())),
             Some((42, Hash::default(), ArchiveFormat::TarBzip2))
         );
         assert_eq!(
-            snapshot_hash_of(&format!("snapshot-43-{}.tar.zst", Hash::default())),
+            parse_snapshot_archive_filename(&format!("snapshot-43-{}.tar.zst", Hash::default())),
             Some((43, Hash::default(), ArchiveFormat::TarZstd))
         );
         assert_eq!(
-            snapshot_hash_of(&format!("snapshot-42-{}.tar", Hash::default())),
+            parse_snapshot_archive_filename(&format!("snapshot-42-{}.tar", Hash::default())),
             Some((42, Hash::default(), ArchiveFormat::Tar))
         );
 
-        assert!(snapshot_hash_of("invalid").is_none());
+        assert!(parse_snapshot_archive_filename("invalid").is_none());
+        assert!(parse_snapshot_archive_filename("snapshot-bad!slot-bad!hash.bad!ext").is_none());
+
+        assert!(parse_snapshot_archive_filename("snapshot-12345678-bad!hash.bad!ext").is_none());
+        assert!(parse_snapshot_archive_filename("snapshot-12345678-HASH1234.bad!ext").is_none());
+        assert!(parse_snapshot_archive_filename("snapshot-12345678-bad!hash.tar").is_none());
+
+        assert!(parse_snapshot_archive_filename("snapshot-bad!slot-HASH1234.bad!ext").is_none());
+        assert!(parse_snapshot_archive_filename("snapshot-12345678-HASH1234.bad!ext").is_none());
+        assert!(parse_snapshot_archive_filename("snapshot-bad!slot-HASH1234.tar").is_none());
+
+        assert!(parse_snapshot_archive_filename("snapshot-bad!slot-bad!hash.tar").is_none());
+        assert!(parse_snapshot_archive_filename("snapshot-12345678-bad!hash.tar").is_none());
+        assert!(parse_snapshot_archive_filename("snapshot-bad!slot-HASH1234.tar").is_none());
+    }
+
+    #[test]
+    fn test_get_snapshot_archives() {
+        let temp_snapshot_archives_dir = tempfile::TempDir::new().unwrap();
+
+        let min_slot = 123;
+        let max_slot = 456;
+        for slot in min_slot..max_slot {
+            let snapshot_filename = format!("snapshot-{}-{}.tar", slot, Hash::default());
+            let snapshot_filepath = temp_snapshot_archives_dir.path().join(snapshot_filename);
+            File::create(snapshot_filepath).unwrap();
+        }
+
+        // Add in a snapshot with a bad filename and high slot to ensure filename are filtered and
+        // sorted correctly
+        let bad_filename = format!("snapshot-{}-{}.bad!ext", max_slot + 1, Hash::default());
+        let bad_filepath = temp_snapshot_archives_dir.path().join(bad_filename);
+        File::create(bad_filepath).unwrap();
+
+        let results = get_snapshot_archives(temp_snapshot_archives_dir);
+        assert_eq!(results.len(), max_slot - min_slot);
+        assert_eq!(results[0].1 .0 as usize, max_slot - 1);
     }
 
     fn common_test_purge_old_snapshot_archives(
diff --git a/runtime/src/sorted_storages.rs b/runtime/src/sorted_storages.rs
new file mode 100644
index 00000000000000..cb87cad55ac708
--- /dev/null
+++ b/runtime/src/sorted_storages.rs
@@ -0,0 +1,207 @@
+use crate::accounts_db::SnapshotStorage;
+use log::*;
+use solana_measure::measure::Measure;
+use solana_sdk::clock::Slot;
+use std::ops::Range;
+
+pub struct SortedStorages<'a> {
+    range: Range<Slot>,
+    storages: Vec<Option<&'a SnapshotStorage>>,
+    slot_count: usize,
+}
+
+impl<'a> SortedStorages<'a> {
+    pub fn get(&self, slot: Slot) -> Option<&SnapshotStorage> {
+        if !self.range.contains(&slot) {
+            None
+        } else {
+            let index = (slot - self.range.start) as usize;
+            self.storages[index]
+        }
+    }
+
+    pub fn range_width(&self) -> Slot {
+        self.range.end - self.range.start
+    }
+
+    pub fn range(&self) -> &Range<Slot> {
+        &self.range
+    }
+
+    pub fn slot_count(&self) -> usize {
+        self.slot_count
+    }
+
+    // assumptions:
+    // 1. each SnapshotStorage.!is_empty()
+    // 2. SnapshotStorage.first().unwrap().get_slot() is unique from all other SnapshotStorage items.
+    pub fn new(source: &'a [SnapshotStorage]) -> Self {
+        let slots = source
+            .iter()
+            .map(|storages| {
+                let first = storages.first();
+                assert!(first.is_some(), "SnapshotStorage.is_empty()");
+                let storage = first.unwrap();
+                storage.slot() // this must be unique. Will be enforced in new_with_slots
+            })
+            .collect::<Vec<_>>();
+        Self::new_with_slots(source.iter().zip(slots.iter()), None, None)
+    }
+
+    // source[i] is in slot slots[i]
+    // assumptions:
+    // 1. slots vector contains unique slot #s.
+    // 2. slots and source are the same len
+    pub fn new_with_slots<'b>(
+        source: impl Iterator<Item = (&'a SnapshotStorage, &'b Slot)> + Clone,
+        // A slot used as a lower bound, but potentially smaller than the smallest slot in the given 'source' iterator
+        min_slot: Option<Slot>,
+        // highest valid slot. Only matters if source array does not contain a slot >= max_slot_inclusive.
+        // An example is a slot that has accounts in the write cache at slots <= 'max_slot_inclusive' but no storages at those slots.
+        // None => self.range.end = source.1.max() + 1
+        // Some(slot) => self.range.end = std::cmp::max(slot, source.1.max())
+        max_slot_inclusive: Option<Slot>,
+    ) -> Self {
+        let mut min = Slot::MAX;
+        let mut max = Slot::MIN;
+        let mut adjust_min_max = |slot| {
+            min = std::cmp::min(slot, min);
+            max = std::cmp::max(slot + 1, max);
+        };
+        // none, either, or both of min/max could be specified
+        if let Some(slot) = min_slot {
+            adjust_min_max(slot);
+        }
+        if let Some(slot) = max_slot_inclusive {
+            adjust_min_max(slot);
+        }
+
+        let mut slot_count = 0;
+        let mut time = Measure::start("get slot");
+        let source_ = source.clone();
+        source_.for_each(|(_, slot)| {
+            slot_count += 1;
+            adjust_min_max(*slot);
+        });
+        time.stop();
+        let mut time2 = Measure::start("sort");
+        let range;
+        let mut storages;
+        if min > max {
+            range = Range::default();
+            storages = vec![];
+        } else {
+            range = Range {
+                start: min,
+                end: max,
+            };
+            let len = max - min;
+            storages = vec![None; len as usize];
+            source.for_each(|(original_storages, slot)| {
+                let index = (slot - min) as usize;
+                assert!(storages[index].is_none(), "slots are not unique"); // we should not encounter the same slot twice
+                storages[index] = Some(original_storages);
+            });
+        }
+        time2.stop();
+        debug!("SortedStorages, times: {}, {}", time.as_us(), time2.as_us());
+        Self {
+            range,
+            storages,
+            slot_count,
+        }
+    }
+}
+
+#[cfg(test)]
+pub mod tests {
+    use super::*;
+    impl<'a> SortedStorages<'a> {
+        pub fn new_debug(source: &[(&'a SnapshotStorage, Slot)], min: Slot, len: usize) -> Self {
+            let mut storages = vec![None; len];
+            let range = Range {
+                start: min,
+                end: min + len as Slot,
+            };
+            let slot_count = source.len();
+            for (storage, slot) in source {
+                storages[*slot as usize] = Some(*storage);
+            }
+
+            Self {
+                range,
+                storages,
+                slot_count,
+            }
+        }
+    }
+
+    #[test]
+    #[should_panic(expected = "SnapshotStorage.is_empty()")]
+    fn test_sorted_storages_empty() {
+        SortedStorages::new(&[Vec::new()]);
+    }
+
+    #[test]
+    #[should_panic(expected = "slots are not unique")]
+    fn test_sorted_storages_duplicate_slots() {
+        SortedStorages::new_with_slots(
+            [Vec::new(), Vec::new()].iter().zip([0, 0].iter()),
+            None,
+            None,
+        );
+    }
+
+    #[test]
+    fn test_sorted_storages_none() {
+        let result = SortedStorages::new_with_slots([].iter().zip([].iter()), None, None);
+        assert_eq!(result.range, Range::default());
+        assert_eq!(result.slot_count, 0);
+        assert_eq!(result.storages.len(), 0);
+        assert!(result.get(0).is_none());
+    }
+
+    #[test]
+    fn test_sorted_storages_1() {
+        let vec = vec![];
+        let vec_check = vec.clone();
+        let slot = 4;
+        let vecs = [vec];
+        let result = SortedStorages::new_with_slots(vecs.iter().zip([slot].iter()), None, None);
+        assert_eq!(
+            result.range,
+            Range {
+                start: slot,
+                end: slot + 1
+            }
+        );
+        assert_eq!(result.slot_count, 1);
+        assert_eq!(result.storages.len(), 1);
+        assert_eq!(result.get(slot).unwrap().len(), vec_check.len());
+    }
+
+    #[test]
+    fn test_sorted_storages_2() {
+        let vec = vec![];
+        let vec_check = vec.clone();
+        let slots = [4, 7];
+        let vecs = [vec.clone(), vec];
+        let result = SortedStorages::new_with_slots(vecs.iter().zip(slots.iter()), None, None);
+        assert_eq!(
+            result.range,
+            Range {
+                start: slots[0],
+                end: slots[1] + 1,
+            }
+        );
+        assert_eq!(result.slot_count, 2);
+        assert_eq!(result.storages.len() as Slot, slots[1] - slots[0] + 1);
+        assert!(result.get(0).is_none());
+        assert!(result.get(3).is_none());
+        assert!(result.get(5).is_none());
+        assert!(result.get(6).is_none());
+        assert!(result.get(8).is_none());
+        assert_eq!(result.get(slots[0]).unwrap().len(), vec_check.len());
+        assert_eq!(result.get(slots[1]).unwrap().len(), vec_check.len());
+    }
+}
diff --git a/sdk/src/stake_weighted_timestamp.rs b/runtime/src/stake_weighted_timestamp.rs
similarity index 98%
rename from sdk/src/stake_weighted_timestamp.rs
rename to runtime/src/stake_weighted_timestamp.rs
index 44478e28562504..6674024686f2ab 100644
--- a/sdk/src/stake_weighted_timestamp.rs
+++ b/runtime/src/stake_weighted_timestamp.rs
@@ -11,22 +11,17 @@ use std::{
     time::Duration,
 };
 
-pub const MAX_ALLOWABLE_DRIFT_PERCENTAGE: u32 = 50;
-pub const MAX_ALLOWABLE_DRIFT_PERCENTAGE_FAST: u32 = 25;
-pub const MAX_ALLOWABLE_DRIFT_PERCENTAGE_SLOW: u32 = 80;
-
-pub enum EstimateType {
-    Bounded(MaxAllowableDrift), // Value represents max allowable drift percentage
-    Unbounded,                  // Deprecated.  Remove in the Solana v1.6.0 timeframe
-}
+pub(crate) const MAX_ALLOWABLE_DRIFT_PERCENTAGE: u32 = 50;
+pub(crate) const MAX_ALLOWABLE_DRIFT_PERCENTAGE_FAST: u32 = 25;
+pub(crate) const MAX_ALLOWABLE_DRIFT_PERCENTAGE_SLOW: u32 = 80;
 
 #[derive(Copy, Clone)]
-pub struct MaxAllowableDrift {
+pub(crate) struct MaxAllowableDrift {
     pub fast: u32, // Max allowable drift percentage faster than poh estimate
     pub slow: u32, // Max allowable drift percentage slower than poh estimate
 }
 
-pub fn calculate_stake_weighted_timestamp<I, K, V, T>(
+pub(crate) fn calculate_stake_weighted_timestamp<I, K, V, T>(
     unique_timestamps: I,
     stakes: &HashMap<Pubkey, (u64, T /*Account|ArcVoteAccount*/)>,
     slot: Slot,
diff --git a/runtime/src/stakes.rs b/runtime/src/stakes.rs
index 69dc59053a50bc..c2790c33dbea84 100644
--- a/runtime/src/stakes.rs
+++ b/runtime/src/stakes.rs
@@ -5,9 +5,13 @@ use solana_sdk::{
     account::{AccountSharedData, ReadableAccount},
     clock::Epoch,
     pubkey::Pubkey,
+    stake::{
+        self,
+        state::{Delegation, StakeState},
+    },
     sysvar::stake_history::StakeHistory,
 };
-use solana_stake_program::stake_state::{new_stake_history_entry, Delegation, StakeState};
+use solana_stake_program::stake_state;
 use solana_vote_program::vote_state::VoteState;
 use std::{borrow::Borrow, collections::HashMap};
 
@@ -33,7 +37,7 @@ impl Stakes {
     pub fn history(&self) -> &StakeHistory {
         &self.stake_history
     }
-    pub fn clone_with_epoch(&self, next_epoch: Epoch, fix_stake_deactivate: bool) -> Self {
+    pub fn clone_with_epoch(&self, next_epoch: Epoch) -> Self {
         let prev_epoch = self.epoch;
         if prev_epoch == next_epoch {
             self.clone()
@@ -42,13 +46,12 @@ impl Stakes {
             let mut stake_history_upto_prev_epoch = self.stake_history.clone();
             stake_history_upto_prev_epoch.add(
                 prev_epoch,
-                new_stake_history_entry(
+                stake_state::new_stake_history_entry(
                     prev_epoch,
                     self.stake_delegations
                         .iter()
                         .map(|(_pubkey, stake_delegation)| stake_delegation),
                     Some(&self.stake_history),
-                    fix_stake_deactivate,
                 ),
             );
 
@@ -61,7 +64,6 @@ impl Stakes {
                         pubkey,
                         next_epoch,
                         Some(&stake_history_upto_prev_epoch),
-                        fix_stake_deactivate,
                     );
                     (*pubkey, (stake, account.clone()))
                 })
@@ -83,13 +85,12 @@ impl Stakes {
         voter_pubkey: &Pubkey,
         epoch: Epoch,
         stake_history: Option<&StakeHistory>,
-        fix_stake_deactivate: bool,
     ) -> u64 {
         self.stake_delegations
             .iter()
             .map(|(_, stake_delegation)| {
                 if &stake_delegation.voter_pubkey == voter_pubkey {
-                    stake_delegation.stake(epoch, stake_history, fix_stake_deactivate)
+                    stake_delegation.stake(epoch, stake_history)
                 } else {
                     0
                 }
@@ -111,7 +112,7 @@ impl Stakes {
 
     pub fn is_stake(account: &AccountSharedData) -> bool {
         solana_vote_program::check_id(account.owner())
-            || solana_stake_program::check_id(account.owner())
+            || stake::program::check_id(account.owner())
                 && account.data().len() >= std::mem::size_of::<StakeState>()
     }
 
@@ -119,7 +120,6 @@ impl Stakes {
         &mut self,
         pubkey: &Pubkey,
         account: &AccountSharedData,
-        fix_stake_deactivate: bool,
         check_vote_init: bool,
     ) -> Option<ArcVoteAccount> {
         if solana_vote_program::check_id(account.owner()) {
@@ -130,17 +130,10 @@ impl Stakes {
             // when account is removed (lamports == 0 or data uninitialized), don't read so that
             // given `pubkey` can be used for any owner in the future, while not affecting Stakes.
             if account.lamports() != 0
-                && !(check_vote_init && VoteState::is_uninitialized_no_deser(&account.data()))
+                && !(check_vote_init && VoteState::is_uninitialized_no_deser(account.data()))
             {
                 let stake = old.as_ref().map_or_else(
-                    || {
-                        self.calculate_stake(
-                            pubkey,
-                            self.epoch,
-                            Some(&self.stake_history),
-                            fix_stake_deactivate,
-                        )
-                    },
+                    || self.calculate_stake(pubkey, self.epoch, Some(&self.stake_history)),
                     |v| v.0,
                 );
 
@@ -148,26 +141,22 @@ impl Stakes {
                     .insert(*pubkey, (stake, ArcVoteAccount::from(account.clone())));
             }
             old.map(|(_, account)| account)
-        } else if solana_stake_program::check_id(account.owner()) {
+        } else if stake::program::check_id(account.owner()) {
             //  old_stake is stake lamports and voter_pubkey from the pre-store() version
             let old_stake = self.stake_delegations.get(pubkey).map(|delegation| {
                 (
                     delegation.voter_pubkey,
-                    delegation.stake(self.epoch, Some(&self.stake_history), fix_stake_deactivate),
+                    delegation.stake(self.epoch, Some(&self.stake_history)),
                 )
             });
 
-            let delegation = StakeState::delegation_from(account);
+            let delegation = stake_state::delegation_from(account);
 
             let stake = delegation.map(|delegation| {
                 (
                     delegation.voter_pubkey,
                     if account.lamports() != 0 {
-                        delegation.stake(
-                            self.epoch,
-                            Some(&self.stake_history),
-                            fix_stake_deactivate,
-                        )
+                        delegation.stake(self.epoch, Some(&self.stake_history))
                     } else {
                         // when account is removed (lamports == 0), this special `else` clause ensures
                         // resetting cached stake value below, even if the account happens to be
@@ -254,8 +243,8 @@ pub mod tests {
             stake_pubkey,
             stake_state::create_account(
                 &stake_pubkey,
-                &vote_pubkey,
-                &vote_state::create_account(&vote_pubkey, &solana_sdk::pubkey::new_rand(), 0, 1),
+                vote_pubkey,
+                &vote_state::create_account(vote_pubkey, &solana_sdk::pubkey::new_rand(), 0, 1),
                 &Rent::free(),
                 stake,
             ),
@@ -286,8 +275,8 @@ pub mod tests {
             stake_pubkey,
             stake_state::create_account_with_activation_epoch(
                 &stake_pubkey,
-                &vote_pubkey,
-                &vote_state::create_account(&vote_pubkey, &solana_sdk::pubkey::new_rand(), 0, 1),
+                vote_pubkey,
+                &vote_state::create_account(vote_pubkey, &solana_sdk::pubkey::new_rand(), 0, 1),
                 &Rent::free(),
                 stake,
                 epoch,
@@ -306,44 +295,44 @@ pub mod tests {
             let ((vote_pubkey, vote_account), (stake_pubkey, mut stake_account)) =
                 create_staked_node_accounts(10);
 
-            stakes.store(&vote_pubkey, &vote_account, true, true);
-            stakes.store(&stake_pubkey, &stake_account, true, true);
-            let stake = StakeState::stake_from(&stake_account).unwrap();
+            stakes.store(&vote_pubkey, &vote_account, true);
+            stakes.store(&stake_pubkey, &stake_account, true);
+            let stake = stake_state::stake_from(&stake_account).unwrap();
             {
                 let vote_accounts = stakes.vote_accounts();
                 assert!(vote_accounts.get(&vote_pubkey).is_some());
                 assert_eq!(
                     vote_accounts.get(&vote_pubkey).unwrap().0,
-                    stake.stake(i, None, true)
+                    stake.stake(i, None)
                 );
             }
 
             stake_account.set_lamports(42);
-            stakes.store(&stake_pubkey, &stake_account, true, true);
+            stakes.store(&stake_pubkey, &stake_account, true);
             {
                 let vote_accounts = stakes.vote_accounts();
                 assert!(vote_accounts.get(&vote_pubkey).is_some());
                 assert_eq!(
                     vote_accounts.get(&vote_pubkey).unwrap().0,
-                    stake.stake(i, None, true)
+                    stake.stake(i, None)
                 ); // stays old stake, because only 10 is activated
             }
 
             // activate more
             let (_stake_pubkey, mut stake_account) = create_stake_account(42, &vote_pubkey);
-            stakes.store(&stake_pubkey, &stake_account, true, true);
-            let stake = StakeState::stake_from(&stake_account).unwrap();
+            stakes.store(&stake_pubkey, &stake_account, true);
+            let stake = stake_state::stake_from(&stake_account).unwrap();
             {
                 let vote_accounts = stakes.vote_accounts();
                 assert!(vote_accounts.get(&vote_pubkey).is_some());
                 assert_eq!(
                     vote_accounts.get(&vote_pubkey).unwrap().0,
-                    stake.stake(i, None, true)
+                    stake.stake(i, None)
                 ); // now stake of 42 is activated
             }
 
             stake_account.set_lamports(0);
-            stakes.store(&stake_pubkey, &stake_account, true, true);
+            stakes.store(&stake_pubkey, &stake_account, true);
             {
                 let vote_accounts = stakes.vote_accounts();
                 assert!(vote_accounts.get(&vote_pubkey).is_some());
@@ -361,14 +350,14 @@ pub mod tests {
         let ((vote_pubkey, vote_account), (stake_pubkey, stake_account)) =
             create_staked_node_accounts(10);
 
-        stakes.store(&vote_pubkey, &vote_account, true, true);
-        stakes.store(&stake_pubkey, &stake_account, true, true);
+        stakes.store(&vote_pubkey, &vote_account, true);
+        stakes.store(&stake_pubkey, &stake_account, true);
 
         let ((vote11_pubkey, vote11_account), (stake11_pubkey, stake11_account)) =
             create_staked_node_accounts(20);
 
-        stakes.store(&vote11_pubkey, &vote11_account, true, true);
-        stakes.store(&stake11_pubkey, &stake11_account, true, true);
+        stakes.store(&vote11_pubkey, &vote11_account, true);
+        stakes.store(&stake11_pubkey, &stake11_account, true);
 
         let vote11_node_pubkey = VoteState::from(&vote11_account).unwrap().node_pubkey;
 
@@ -385,8 +374,8 @@ pub mod tests {
         let ((vote_pubkey, mut vote_account), (stake_pubkey, stake_account)) =
             create_staked_node_accounts(10);
 
-        stakes.store(&vote_pubkey, &vote_account, true, true);
-        stakes.store(&stake_pubkey, &stake_account, true, true);
+        stakes.store(&vote_pubkey, &vote_account, true);
+        stakes.store(&stake_pubkey, &stake_account, true);
 
         {
             let vote_accounts = stakes.vote_accounts();
@@ -395,7 +384,7 @@ pub mod tests {
         }
 
         vote_account.set_lamports(0);
-        stakes.store(&vote_pubkey, &vote_account, true, true);
+        stakes.store(&vote_pubkey, &vote_account, true);
 
         {
             let vote_accounts = stakes.vote_accounts();
@@ -403,7 +392,7 @@ pub mod tests {
         }
 
         vote_account.set_lamports(1);
-        stakes.store(&vote_pubkey, &vote_account, true, true);
+        stakes.store(&vote_pubkey, &vote_account, true);
 
         {
             let vote_accounts = stakes.vote_accounts();
@@ -416,7 +405,7 @@ pub mod tests {
         let mut pushed = vote_account.data().to_vec();
         pushed.push(0);
         vote_account.set_data(pushed);
-        stakes.store(&vote_pubkey, &vote_account, true, true);
+        stakes.store(&vote_pubkey, &vote_account, true);
 
         {
             let vote_accounts = stakes.vote_accounts();
@@ -427,7 +416,7 @@ pub mod tests {
         let default_vote_state = VoteState::default();
         let versioned = VoteStateVersions::new_current(default_vote_state);
         VoteState::to(&versioned, &mut vote_account).unwrap();
-        stakes.store(&vote_pubkey, &vote_account, true, true);
+        stakes.store(&vote_pubkey, &vote_account, true);
 
         {
             let vote_accounts = stakes.vote_accounts();
@@ -435,7 +424,7 @@ pub mod tests {
         }
 
         vote_account.set_data(cache_data);
-        stakes.store(&vote_pubkey, &vote_account, true, true);
+        stakes.store(&vote_pubkey, &vote_account, true);
 
         {
             let vote_accounts = stakes.vote_accounts();
@@ -457,27 +446,27 @@ pub mod tests {
         let ((vote_pubkey2, vote_account2), (_stake_pubkey2, stake_account2)) =
             create_staked_node_accounts(10);
 
-        stakes.store(&vote_pubkey, &vote_account, true, true);
-        stakes.store(&vote_pubkey2, &vote_account2, true, true);
+        stakes.store(&vote_pubkey, &vote_account, true);
+        stakes.store(&vote_pubkey2, &vote_account2, true);
 
         // delegates to vote_pubkey
-        stakes.store(&stake_pubkey, &stake_account, true, true);
+        stakes.store(&stake_pubkey, &stake_account, true);
 
-        let stake = StakeState::stake_from(&stake_account).unwrap();
+        let stake = stake_state::stake_from(&stake_account).unwrap();
 
         {
             let vote_accounts = stakes.vote_accounts();
             assert!(vote_accounts.get(&vote_pubkey).is_some());
             assert_eq!(
                 vote_accounts.get(&vote_pubkey).unwrap().0,
-                stake.stake(stakes.epoch, Some(&stakes.stake_history), true)
+                stake.stake(stakes.epoch, Some(&stakes.stake_history))
             );
             assert!(vote_accounts.get(&vote_pubkey2).is_some());
             assert_eq!(vote_accounts.get(&vote_pubkey2).unwrap().0, 0);
         }
 
         // delegates to vote_pubkey2
-        stakes.store(&stake_pubkey, &stake_account2, true, true);
+        stakes.store(&stake_pubkey, &stake_account2, true);
 
         {
             let vote_accounts = stakes.vote_accounts();
@@ -486,7 +475,7 @@ pub mod tests {
             assert!(vote_accounts.get(&vote_pubkey2).is_some());
             assert_eq!(
                 vote_accounts.get(&vote_pubkey2).unwrap().0,
-                stake.stake(stakes.epoch, Some(&stakes.stake_history), true)
+                stake.stake(stakes.epoch, Some(&stakes.stake_history))
             );
         }
     }
@@ -502,11 +491,11 @@ pub mod tests {
 
         let (stake_pubkey2, stake_account2) = create_stake_account(10, &vote_pubkey);
 
-        stakes.store(&vote_pubkey, &vote_account, true, true);
+        stakes.store(&vote_pubkey, &vote_account, true);
 
         // delegates to vote_pubkey
-        stakes.store(&stake_pubkey, &stake_account, true, true);
-        stakes.store(&stake_pubkey2, &stake_account2, true, true);
+        stakes.store(&stake_pubkey, &stake_account, true);
+        stakes.store(&stake_pubkey2, &stake_account2, true);
 
         {
             let vote_accounts = stakes.vote_accounts();
@@ -521,23 +510,23 @@ pub mod tests {
         let ((vote_pubkey, vote_account), (stake_pubkey, stake_account)) =
             create_staked_node_accounts(10);
 
-        stakes.store(&vote_pubkey, &vote_account, true, true);
-        stakes.store(&stake_pubkey, &stake_account, true, true);
-        let stake = StakeState::stake_from(&stake_account).unwrap();
+        stakes.store(&vote_pubkey, &vote_account, true);
+        stakes.store(&stake_pubkey, &stake_account, true);
+        let stake = stake_state::stake_from(&stake_account).unwrap();
 
         {
             let vote_accounts = stakes.vote_accounts();
             assert_eq!(
                 vote_accounts.get(&vote_pubkey).unwrap().0,
-                stake.stake(stakes.epoch, Some(&stakes.stake_history), true)
+                stake.stake(stakes.epoch, Some(&stakes.stake_history))
             );
         }
-        let stakes = stakes.clone_with_epoch(3, true);
+        let stakes = stakes.clone_with_epoch(3);
         {
             let vote_accounts = stakes.vote_accounts();
             assert_eq!(
                 vote_accounts.get(&vote_pubkey).unwrap().0,
-                stake.stake(stakes.epoch, Some(&stakes.stake_history), true)
+                stake.stake(stakes.epoch, Some(&stakes.stake_history))
             );
         }
     }
@@ -552,8 +541,8 @@ pub mod tests {
         let ((vote_pubkey, vote_account), (stake_pubkey, stake_account)) =
             create_staked_node_accounts(10);
 
-        stakes.store(&vote_pubkey, &vote_account, true, true);
-        stakes.store(&stake_pubkey, &stake_account, true, true);
+        stakes.store(&vote_pubkey, &vote_account, true);
+        stakes.store(&stake_pubkey, &stake_account, true);
 
         {
             let vote_accounts = stakes.vote_accounts();
@@ -564,8 +553,7 @@ pub mod tests {
         // not a stake account, and whacks above entry
         stakes.store(
             &stake_pubkey,
-            &AccountSharedData::new(1, 0, &solana_stake_program::id()),
-            true,
+            &AccountSharedData::new(1, 0, &stake::program::id()),
             true,
         );
         {
@@ -596,14 +584,14 @@ pub mod tests {
         let genesis_epoch = 0;
         let ((vote_pubkey, vote_account), (stake_pubkey, stake_account)) =
             create_warming_staked_node_accounts(10, genesis_epoch);
-        stakes.store(&vote_pubkey, &vote_account, true, true);
-        stakes.store(&stake_pubkey, &stake_account, true, true);
+        stakes.store(&vote_pubkey, &vote_account, true);
+        stakes.store(&stake_pubkey, &stake_account, true);
 
         assert_eq!(stakes.vote_balance_and_staked(), 11);
         assert_eq!(stakes.vote_balance_and_warmed_staked(), 1);
 
         for (epoch, expected_warmed_stake) in ((genesis_epoch + 1)..=3).zip(&[2, 3, 4]) {
-            stakes = stakes.clone_with_epoch(epoch, true);
+            stakes = stakes.clone_with_epoch(epoch);
             // vote_balance_and_staked() always remain to return same lamports
             // while vote_balance_and_warmed_staked() gradually increases
             assert_eq!(stakes.vote_balance_and_staked(), 11);
diff --git a/runtime/src/status_cache.rs b/runtime/src/status_cache.rs
index 96fb54cd8aeb3b..d07ee5356e8765 100644
--- a/runtime/src/status_cache.rs
+++ b/runtime/src/status_cache.rs
@@ -251,7 +251,7 @@ impl<T: Serialize + Clone> StatusCache<T> {
                 .iter()
                 .for_each(|(tx_hash, (key_index, statuses))| {
                     for (key_slice, res) in statuses.iter() {
-                        self.insert_with_slice(&tx_hash, *slot, *key_index, *key_slice, res.clone())
+                        self.insert_with_slice(tx_hash, *slot, *key_index, *key_slice, res.clone())
                     }
                 });
             if *is_root {
diff --git a/runtime/src/system_instruction_processor.rs b/runtime/src/system_instruction_processor.rs
index 155ea991e0aeb7..2d7ba746138655 100644
--- a/runtime/src/system_instruction_processor.rs
+++ b/runtime/src/system_instruction_processor.rs
@@ -2,7 +2,7 @@ use log::*;
 use solana_sdk::{
     account::{AccountSharedData, ReadableAccount, WritableAccount},
     account_utils::StateMut,
-    ic_msg,
+    feature_set, ic_msg,
     instruction::InstructionError,
     keyed_account::{from_keyed_account, get_signers, keyed_account_at_index, KeyedAccount},
     nonce,
@@ -79,7 +79,7 @@ fn allocate(
 
     // if it looks like the `to` account is already in use, bail
     //   (note that the id check is also enforced by message_processor)
-    if !account.data().is_empty() || !system_program::check_id(&account.owner()) {
+    if !account.data().is_empty() || !system_program::check_id(account.owner()) {
         ic_msg!(
             invoke_context,
             "Allocate: account {:?} already in use",
@@ -115,13 +115,18 @@ fn assign(
         return Ok(());
     }
 
-    if !address.is_signer(&signers) {
+    if !address.is_signer(signers) {
         ic_msg!(invoke_context, "Assign: account {:?} must sign", address);
         return Err(InstructionError::MissingRequiredSignature);
     }
 
-    // guard against sysvars being made
-    if sysvar::check_id(&owner) {
+    // bpf programs are allowed to do this; so this is inconsistent...
+    // Thus, we're starting to remove this restriction from system instruction
+    // processor for consistency and fewer special casing by piggybacking onto
+    // the related feature gate..
+    let rent_for_sysvars = invoke_context.is_feature_active(&feature_set::rent_for_sysvars::id());
+    if !rent_for_sysvars && sysvar::check_id(owner) {
+        // guard against sysvars being made
         ic_msg!(invoke_context, "Assign: cannot assign to sysvar, {}", owner);
         return Err(SystemError::InvalidProgramId.into());
     }
@@ -200,7 +205,9 @@ fn transfer(
     lamports: u64,
     invoke_context: &dyn InvokeContext,
 ) -> Result<(), InstructionError> {
-    if lamports == 0 {
+    if !invoke_context.is_feature_active(&feature_set::system_transfer_zero_check::id())
+        && lamports == 0
+    {
         return Ok(());
     }
 
@@ -225,7 +232,9 @@ fn transfer_with_seed(
     lamports: u64,
     invoke_context: &dyn InvokeContext,
 ) -> Result<(), InstructionError> {
-    if lamports == 0 {
+    if !invoke_context.is_feature_active(&feature_set::system_transfer_zero_check::id())
+        && lamports == 0
+    {
         return Ok(());
     }
 
@@ -296,13 +305,13 @@ pub fn process_instruction(
             let from = keyed_account_at_index(keyed_accounts, 0)?;
             let to = keyed_account_at_index(keyed_accounts, 1)?;
             let to_address = Address::create(
-                &to.unsigned_key(),
+                to.unsigned_key(),
                 Some((&base, &seed, &owner)),
                 invoke_context,
             )?;
             create_account(
                 from,
-                &to,
+                to,
                 &to_address,
                 lamports,
                 space,
@@ -666,21 +675,21 @@ mod tests {
     fn test_create_with_zero_lamports() {
         // create account with zero lamports transferred
         let new_owner = Pubkey::new(&[9; 32]);
-        let from = solana_sdk::pubkey::new_rand();
-        let from_account = AccountSharedData::new_ref(100, 1, &solana_sdk::pubkey::new_rand()); // not from system account
+        let from = Pubkey::new_unique();
+        let from_account = AccountSharedData::new_ref(100, 0, &Pubkey::new_unique()); // not from system account
 
-        let to = solana_sdk::pubkey::new_rand();
+        let to = Pubkey::new_unique();
         let to_account = AccountSharedData::new_ref(0, 0, &Pubkey::default());
 
         assert_eq!(
             create_account(
-                &KeyedAccount::new(&from, false, &from_account), // no signer
-                &KeyedAccount::new(&to, false, &to_account),
+                &KeyedAccount::new(&from, true, &from_account),
+                &KeyedAccount::new(&to, true, &to_account),
                 &to.into(),
                 0,
                 2,
                 &new_owner,
-                &[to].iter().cloned().collect::<HashSet<_>>(),
+                &[from, to].iter().cloned().collect::<HashSet<_>>(),
                 &MockInvokeContext::new(vec![]),
             ),
             Ok(())
@@ -732,11 +741,11 @@ mod tests {
         let result = create_account(
             &KeyedAccount::new(&from, true, &from_account),
             &KeyedAccount::new(&to, false, &to_account),
-            &address,
+            address,
             50,
             MAX_PERMITTED_DATA_LENGTH + 1,
             &system_program::id(),
-            &signers,
+            signers,
             &MockInvokeContext::new(vec![]),
         );
         assert!(result.is_err());
@@ -749,11 +758,11 @@ mod tests {
         let result = create_account(
             &KeyedAccount::new(&from, true, &from_account),
             &KeyedAccount::new(&to, false, &to_account),
-            &address,
+            address,
             50,
             MAX_PERMITTED_DATA_LENGTH,
             &system_program::id(),
-            &signers,
+            signers,
             &MockInvokeContext::new(vec![]),
         );
         assert!(result.is_ok());
@@ -786,7 +795,7 @@ mod tests {
             50,
             2,
             &new_owner,
-            &signers,
+            signers,
             &MockInvokeContext::new(vec![]),
         );
         assert_eq!(result, Err(SystemError::AccountAlreadyInUse.into()));
@@ -805,7 +814,7 @@ mod tests {
             50,
             2,
             &new_owner,
-            &signers,
+            signers,
             &MockInvokeContext::new(vec![]),
         );
         assert_eq!(result, Err(SystemError::AccountAlreadyInUse.into()));
@@ -823,7 +832,7 @@ mod tests {
             50,
             2,
             &new_owner,
-            &signers,
+            signers,
             &MockInvokeContext::new(vec![]),
         );
         assert_eq!(result, Err(SystemError::AccountAlreadyInUse.into()));
@@ -870,11 +879,11 @@ mod tests {
         );
         assert_eq!(result, Err(InstructionError::MissingRequiredSignature));
 
-        // support creation/assignment with zero lamports (ephemeral account)
+        // Don't support unsigned creation with zero lamports (ephemeral account)
         let owned_account = AccountSharedData::new_ref(0, 0, &Pubkey::default());
         let result = create_account(
             &KeyedAccount::new(&from, false, &from_account),
-            &KeyedAccount::new(&owned_key, false, &owned_account),
+            &KeyedAccount::new(&owned_key, true, &owned_account),
             &owned_address,
             0,
             2,
@@ -882,11 +891,11 @@ mod tests {
             &[owned_key].iter().cloned().collect::<HashSet<_>>(),
             &MockInvokeContext::new(vec![]),
         );
-        assert_eq!(result, Ok(()));
+        assert_eq!(result, Err(InstructionError::MissingRequiredSignature));
     }
 
     #[test]
-    fn test_create_sysvar_invalid_id() {
+    fn test_create_sysvar_invalid_id_with_feature() {
         // Attempt to create system account in account already owned by another program
         let from = solana_sdk::pubkey::new_rand();
         let from_account = AccountSharedData::new_ref(100, 0, &system_program::id());
@@ -908,7 +917,36 @@ mod tests {
             &signers,
             &MockInvokeContext::new(vec![]),
         );
+        assert_eq!(result, Ok(()));
+    }
 
+    #[test]
+    fn test_create_sysvar_invalid_id_without_feature() {
+        // Attempt to create system account in account already owned by another program
+        let from = solana_sdk::pubkey::new_rand();
+        let from_account = AccountSharedData::new_ref(100, 0, &system_program::id());
+
+        let to = solana_sdk::pubkey::new_rand();
+        let to_account = AccountSharedData::new_ref(0, 0, &system_program::id());
+
+        let signers = [from, to].iter().cloned().collect::<HashSet<_>>();
+        let to_address = to.into();
+
+        let result = create_account(
+            &KeyedAccount::new(&from, true, &from_account),
+            &KeyedAccount::new(&to, false, &to_account),
+            &to_address,
+            50,
+            2,
+            &sysvar::id(),
+            &signers,
+            &MockInvokeContext {
+                disabled_features: vec![feature_set::rent_for_sysvars::id()]
+                    .into_iter()
+                    .collect(),
+                ..MockInvokeContext::new(vec![])
+            },
+        );
         assert_eq!(result, Err(SystemError::InvalidProgramId.into()));
     }
 
@@ -1021,7 +1059,7 @@ mod tests {
     }
 
     #[test]
-    fn test_assign_to_sysvar() {
+    fn test_assign_to_sysvar_with_feature() {
         let new_owner = sysvar::id();
 
         let from = solana_sdk::pubkey::new_rand();
@@ -1035,6 +1073,30 @@ mod tests {
                 &[from].iter().cloned().collect::<HashSet<_>>(),
                 &MockInvokeContext::new(vec![]),
             ),
+            Ok(())
+        );
+    }
+
+    #[test]
+    fn test_assign_to_sysvar_without_feature() {
+        let new_owner = sysvar::id();
+
+        let from = solana_sdk::pubkey::new_rand();
+        let mut from_account = AccountSharedData::new(100, 0, &system_program::id());
+
+        assert_eq!(
+            assign(
+                &mut from_account,
+                &from.into(),
+                &new_owner,
+                &[from].iter().cloned().collect::<HashSet<_>>(),
+                &MockInvokeContext {
+                    disabled_features: vec![feature_set::rent_for_sysvars::id()]
+                        .into_iter()
+                        .collect(),
+                    ..MockInvokeContext::new(vec![])
+                },
+            ),
             Err(SystemError::InvalidProgramId.into())
         );
     }
@@ -1094,9 +1156,7 @@ mod tests {
         assert_eq!(from_keyed_account.account.borrow().lamports(), 50);
         assert_eq!(to_keyed_account.account.borrow().lamports(), 51);
 
-        // test unsigned transfer of zero
-        let from_keyed_account = KeyedAccount::new(&from, false, &from_account);
-
+        // test signed transfer of zero
         assert!(transfer(
             &from_keyed_account,
             &to_keyed_account,
@@ -1106,6 +1166,21 @@ mod tests {
         .is_ok(),);
         assert_eq!(from_keyed_account.account.borrow().lamports(), 50);
         assert_eq!(to_keyed_account.account.borrow().lamports(), 51);
+
+        // test unsigned transfer of zero
+        let from_keyed_account = KeyedAccount::new(&from, false, &from_account);
+
+        assert_eq!(
+            transfer(
+                &from_keyed_account,
+                &to_keyed_account,
+                0,
+                &MockInvokeContext::new(vec![]),
+            ),
+            Err(InstructionError::MissingRequiredSignature)
+        );
+        assert_eq!(from_keyed_account.account.borrow().lamports(), 50);
+        assert_eq!(to_keyed_account.account.borrow().lamports(), 51);
     }
 
     #[test]
@@ -1124,7 +1199,7 @@ mod tests {
         transfer_with_seed(
             &from_keyed_account,
             &from_base_keyed_account,
-            &from_seed,
+            from_seed,
             &from_owner,
             &to_keyed_account,
             50,
@@ -1141,7 +1216,7 @@ mod tests {
         let result = transfer_with_seed(
             &from_keyed_account,
             &from_base_keyed_account,
-            &from_seed,
+            from_seed,
             &from_owner,
             &to_keyed_account,
             100,
@@ -1156,7 +1231,7 @@ mod tests {
         assert!(transfer_with_seed(
             &from_keyed_account,
             &from_base_keyed_account,
-            &from_seed,
+            from_seed,
             &from_owner,
             &to_keyed_account,
             0,
diff --git a/runtime/store-tool/Cargo.toml b/runtime/store-tool/Cargo.toml
index 1c730d57924aff..3406265f62ed23 100644
--- a/runtime/store-tool/Cargo.toml
+++ b/runtime/store-tool/Cargo.toml
@@ -3,7 +3,7 @@ authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 edition = "2018"
 name = "solana-store-tool"
 description = "Tool to inspect append vecs"
-version = "1.7.0"
+version = "1.7.11"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
@@ -11,11 +11,11 @@ publish = false
 
 [dependencies]
 log = { version = "0.4.11" }
-solana-logger = { path = "../../logger", version = "=1.7.0" }
-solana-version = { path = "../../version", version = "=1.7.0" }
-solana-measure = { path = "../../measure", version = "=1.7.0" }
-solana-runtime = { path = "..", version = "=1.7.0" }
-solana-sdk = { path = "../../sdk", version = "=1.7.0" }
+solana-logger = { path = "../../logger", version = "=1.7.11" }
+solana-version = { path = "../../version", version = "=1.7.11" }
+solana-measure = { path = "../../measure", version = "=1.7.11" }
+solana-runtime = { path = "..", version = "=1.7.11" }
+solana-sdk = { path = "../../sdk", version = "=1.7.11" }
 clap = "2.33.1"
 
 [package.metadata.docs.rs]
diff --git a/runtime/tests/accounts.rs b/runtime/tests/accounts.rs
index 977a65a42becc1..7439d0a8477c6b 100644
--- a/runtime/tests/accounts.rs
+++ b/runtime/tests/accounts.rs
@@ -52,7 +52,7 @@ fn test_shrink_and_clean() {
 
             for (pubkey, account) in alive_accounts.iter_mut() {
                 account.checked_sub_lamports(1).unwrap();
-                accounts.store_uncached(current_slot, &[(&pubkey, &account)]);
+                accounts.store_uncached(current_slot, &[(pubkey, account)]);
             }
             accounts.add_root(current_slot);
         }
@@ -121,9 +121,9 @@ fn test_bad_bank_hash() {
 
         for (key, account) in &account_refs {
             assert_eq!(
-                db.load_account_hash(&ancestors, &key, None, LoadHint::Unspecified)
+                db.load_account_hash(&ancestors, key, None, LoadHint::Unspecified)
                     .unwrap(),
-                AccountsDb::hash_account(some_slot, *account, &key)
+                AccountsDb::hash_account(some_slot, *account, key)
             );
         }
         existing.clear();
diff --git a/runtime/tests/stake.rs b/runtime/tests/stake.rs
index 400420ccc55569..f81b6e70b3b766 100644
--- a/runtime/tests/stake.rs
+++ b/runtime/tests/stake.rs
@@ -11,14 +11,13 @@ use solana_sdk::{
     message::Message,
     pubkey::Pubkey,
     signature::{Keypair, Signer},
-    system_instruction::SystemError,
+    stake::{
+        self, instruction as stake_instruction,
+        state::{Authorized, Lockup, StakeState},
+    },
     sysvar::{self, stake_history::StakeHistory},
-    transaction::TransactionError,
-};
-use solana_stake_program::{
-    stake_instruction::{self},
-    stake_state::{self, StakeState},
 };
+use solana_stake_program::stake_state;
 use solana_vote_program::{
     vote_instruction,
     vote_state::{Vote, VoteInit, VoteState, VoteStateVersions},
@@ -29,7 +28,7 @@ fn next_epoch(bank: &Arc<Bank>) -> Arc<Bank> {
     bank.squash();
 
     Arc::new(Bank::new_from_parent(
-        &bank,
+        bank,
         &Pubkey::default(),
         bank.get_slots_in_epoch(bank.epoch()) + bank.slot(),
     ))
@@ -71,7 +70,7 @@ fn fill_epoch_with_votes(
 }
 
 fn warmed_up(bank: &Bank, stake_pubkey: &Pubkey) -> bool {
-    let stake = StakeState::stake_from(&bank.get_account(stake_pubkey).unwrap()).unwrap();
+    let stake = stake_state::stake_from(&bank.get_account(stake_pubkey).unwrap()).unwrap();
 
     stake.delegation.stake
         == stake.stake(
@@ -82,12 +81,11 @@ fn warmed_up(bank: &Bank, stake_pubkey: &Pubkey) -> bool {
                 )
                 .unwrap(),
             ),
-            true,
         )
 }
 
 fn get_staked(bank: &Bank, stake_pubkey: &Pubkey) -> u64 {
-    StakeState::stake_from(&bank.get_account(stake_pubkey).unwrap())
+    stake_state::stake_from(&bank.get_account(stake_pubkey).unwrap())
         .unwrap()
         .stake(
             bank.epoch(),
@@ -97,7 +95,6 @@ fn get_staked(bank: &Bank, stake_pubkey: &Pubkey) -> u64 {
                 )
                 .unwrap(),
             ),
-            true,
         )
 }
 
@@ -120,9 +117,9 @@ fn test_stake_create_and_split_single_signature() {
     let bank_client = BankClient::new_shared(&Arc::new(Bank::new(&genesis_config)));
 
     let stake_address =
-        Pubkey::create_with_seed(&staker_pubkey, "stake", &solana_stake_program::id()).unwrap();
+        Pubkey::create_with_seed(&staker_pubkey, "stake", &stake::program::id()).unwrap();
 
-    let authorized = stake_state::Authorized::auto(&staker_pubkey);
+    let authorized = Authorized::auto(&staker_pubkey);
 
     let lamports = 1_000_000;
 
@@ -134,7 +131,7 @@ fn test_stake_create_and_split_single_signature() {
             &staker_pubkey, // base
             "stake",        // seed
             &authorized,
-            &stake_state::Lockup::default(),
+            &Lockup::default(),
             lamports,
         ),
         Some(&staker_pubkey),
@@ -147,8 +144,7 @@ fn test_stake_create_and_split_single_signature() {
 
     // split the stake
     let split_stake_address =
-        Pubkey::create_with_seed(&staker_pubkey, "split_stake", &solana_stake_program::id())
-            .unwrap();
+        Pubkey::create_with_seed(&staker_pubkey, "split_stake", &stake::program::id()).unwrap();
     // Test split
     let message = Message::new(
         &stake_instruction::split_with_seed(
@@ -171,7 +167,7 @@ fn test_stake_create_and_split_single_signature() {
 
 #[test]
 fn test_stake_create_and_split_to_existing_system_account() {
-    // Ensure stake-split does not allow the user to promote an existing system account into
+    // Ensure stake-split allows the user to promote an existing system account into
     // a stake account.
 
     solana_logger::setup();
@@ -191,9 +187,9 @@ fn test_stake_create_and_split_to_existing_system_account() {
     let bank_client = BankClient::new_shared(&Arc::new(Bank::new(&genesis_config)));
 
     let stake_address =
-        Pubkey::create_with_seed(&staker_pubkey, "stake", &solana_stake_program::id()).unwrap();
+        Pubkey::create_with_seed(&staker_pubkey, "stake", &stake::program::id()).unwrap();
 
-    let authorized = stake_state::Authorized::auto(&staker_pubkey);
+    let authorized = Authorized::auto(&staker_pubkey);
 
     let lamports = 1_000_000;
 
@@ -205,7 +201,7 @@ fn test_stake_create_and_split_to_existing_system_account() {
             &staker_pubkey, // base
             "stake",        // seed
             &authorized,
-            &stake_state::Lockup::default(),
+            &Lockup::default(),
             lamports,
         ),
         Some(&staker_pubkey),
@@ -216,8 +212,7 @@ fn test_stake_create_and_split_to_existing_system_account() {
         .expect("failed to create and delegate stake account");
 
     let split_stake_address =
-        Pubkey::create_with_seed(&staker_pubkey, "split_stake", &solana_stake_program::id())
-            .unwrap();
+        Pubkey::create_with_seed(&staker_pubkey, "split_stake", &stake::program::id()).unwrap();
 
     // First, put a system account where we want the new stake account
     let existing_lamports = 42;
@@ -229,7 +224,7 @@ fn test_stake_create_and_split_to_existing_system_account() {
         existing_lamports
     );
 
-    // Verify the split fails because the account is already in use
+    // Verify the split succeeds with lamports in the destination account
     let message = Message::new(
         &stake_instruction::split_with_seed(
             &stake_address, // original
@@ -241,16 +236,12 @@ fn test_stake_create_and_split_to_existing_system_account() {
         ),
         Some(&staker_keypair.pubkey()),
     );
-    assert_eq!(
-        bank_client
-            .send_and_confirm_message(&[&staker_keypair], message)
-            .unwrap_err()
-            .unwrap(),
-        TransactionError::InstructionError(0, SystemError::AccountAlreadyInUse.into())
-    );
+    bank_client
+        .send_and_confirm_message(&[&staker_keypair], message)
+        .expect("failed to split into account with lamports");
     assert_eq!(
         bank_client.get_balance(&split_stake_address).unwrap(),
-        existing_lamports
+        existing_lamports + lamports / 2
     );
 }
 
@@ -296,7 +287,7 @@ fn test_stake_account_lifetime() {
         .send_and_confirm_message(&[&mint_keypair, &vote_keypair, &identity_keypair], message)
         .expect("failed to create vote account");
 
-    let authorized = stake_state::Authorized::auto(&stake_pubkey);
+    let authorized = Authorized::auto(&stake_pubkey);
     // Create stake account and delegate to vote account
     let message = Message::new(
         &stake_instruction::create_account_and_delegate_stake(
@@ -304,7 +295,7 @@ fn test_stake_account_lifetime() {
             &stake_pubkey,
             &vote_pubkey,
             &authorized,
-            &stake_state::Lockup::default(),
+            &Lockup::default(),
             1_000_000,
         ),
         Some(&mint_pubkey),
@@ -522,8 +513,7 @@ fn test_create_stake_account_from_seed() {
     let bank_client = BankClient::new_shared(&bank);
 
     let seed = "test-string";
-    let stake_pubkey =
-        Pubkey::create_with_seed(&mint_pubkey, seed, &solana_stake_program::id()).unwrap();
+    let stake_pubkey = Pubkey::create_with_seed(&mint_pubkey, seed, &stake::program::id()).unwrap();
 
     // Create Vote Account
     let message = Message::new(
@@ -544,7 +534,7 @@ fn test_create_stake_account_from_seed() {
         .send_and_confirm_message(&[&mint_keypair, &vote_keypair, &identity_keypair], message)
         .expect("failed to create vote account");
 
-    let authorized = stake_state::Authorized::auto(&mint_pubkey);
+    let authorized = Authorized::auto(&mint_pubkey);
     // Create stake account and delegate to vote account
     let message = Message::new(
         &stake_instruction::create_account_with_seed_and_delegate_stake(
@@ -554,7 +544,7 @@ fn test_create_stake_account_from_seed() {
             seed,
             &vote_pubkey,
             &authorized,
-            &stake_state::Lockup::default(),
+            &Lockup::default(),
             1_000_000,
         ),
         Some(&mint_pubkey),
diff --git a/scripts/Cargo.toml b/scripts/Cargo.toml
index 6946044a917192..818a787ce69893 100644
--- a/scripts/Cargo.toml
+++ b/scripts/Cargo.toml
@@ -3,7 +3,7 @@ authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 edition = "2018"
 name = "solana-scripts"
 description = "Blockchain, Rebuilt for Scale"
-version = "1.7.0"
+version = "1.7.11"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
diff --git a/scripts/build-downstream-projects.sh b/scripts/build-downstream-projects.sh
index f3a4117b6ad549..ffcd444307b08c 100755
--- a/scripts/build-downstream-projects.sh
+++ b/scripts/build-downstream-projects.sh
@@ -21,12 +21,12 @@ update_solana_dependencies() {
   declare tomls=()
   while IFS='' read -r line; do tomls+=("$line"); done < <(find "$1" -name Cargo.toml)
 
-  sed -i -e "s#\(solana-program = \"\)[^\"]*\(\"\)#\1$solana_ver\2#g" "${tomls[@]}" || return $?
-  sed -i -e "s#\(solana-program-test = \"\)[^\"]*\(\"\)#\1$solana_ver\2#g" "${tomls[@]}" || return $?
-  sed -i -e "s#\(solana-sdk = \"\).*\(\"\)#\1$solana_ver\2#g" "${tomls[@]}" || return $?
-  sed -i -e "s#\(solana-sdk = { version = \"\)[^\"]*\(\"\)#\1$solana_ver\2#g" "${tomls[@]}" || return $?
-  sed -i -e "s#\(solana-client = \"\)[^\"]*\(\"\)#\1$solana_ver\2#g" "${tomls[@]}" || return $?
-  sed -i -e "s#\(solana-client = { version = \"\)[^\"]*\(\"\)#\1$solana_ver\2#g" "${tomls[@]}" || return $?
+  sed -i -e "s#\(solana-program = \"\)[^\"]*\(\"\)#\1=$solana_ver\2#g" "${tomls[@]}" || return $?
+  sed -i -e "s#\(solana-program-test = \"\)[^\"]*\(\"\)#\1=$solana_ver\2#g" "${tomls[@]}" || return $?
+  sed -i -e "s#\(solana-sdk = \"\).*\(\"\)#\1=$solana_ver\2#g" "${tomls[@]}" || return $?
+  sed -i -e "s#\(solana-sdk = { version = \"\)[^\"]*\(\"\)#\1=$solana_ver\2#g" "${tomls[@]}" || return $?
+  sed -i -e "s#\(solana-client = \"\)[^\"]*\(\"\)#\1=$solana_ver\2#g" "${tomls[@]}" || return $?
+  sed -i -e "s#\(solana-client = { version = \"\)[^\"]*\(\"\)#\1=$solana_ver\2#g" "${tomls[@]}" || return $?
 }
 
 patch_crates_io() {
diff --git a/scripts/cargo-install-all.sh b/scripts/cargo-install-all.sh
index 9105826981295b..ae795cda98befc 100755
--- a/scripts/cargo-install-all.sh
+++ b/scripts/cargo-install-all.sh
@@ -105,7 +105,6 @@ else
       solana-dos
       solana-install-init
       solana-stake-accounts
-      solana-stake-monitor
       solana-test-validator
       solana-tokens
       solana-watchtower
diff --git a/scripts/increment-cargo-version.sh b/scripts/increment-cargo-version.sh
index e15534ae5f82e3..283aaab9c2f196 100755
--- a/scripts/increment-cargo-version.sh
+++ b/scripts/increment-cargo-version.sh
@@ -148,7 +148,7 @@ for file in "${markdownFiles[@]}"; do
 done
 
 # Update cargo lock files
-scripts/cargo-for-all-lock-files.sh tree
+scripts/cargo-for-all-lock-files.sh tree >/dev/null
 
 echo "$currentVersion -> $newVersion"
 
diff --git a/sdk/Cargo.toml b/sdk/Cargo.toml
index 88e6b3a23709d4..5f9efa26468b47 100644
--- a/sdk/Cargo.toml
+++ b/sdk/Cargo.toml
@@ -1,11 +1,12 @@
 [package]
 name = "solana-sdk"
-version = "1.7.0"
+version = "1.7.11"
 description = "Solana SDK"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
 homepage = "https://solana.com/"
 documentation = "https://docs.rs/solana-sdk"
+readme = "README.md"
 license = "Apache-2.0"
 edition = "2018"
 
@@ -53,7 +54,7 @@ hex = "0.4.2"
 hmac = "0.10.1"
 itertools =  "0.9.0"
 lazy_static = "1.4.0"
-libsecp256k1 = { version = "0.3.5", optional = true }
+libsecp256k1 = { version = "0.5.0", optional = true }
 log = "0.4.11"
 memmap2 = { version = "0.1.0", optional = true }
 num-derive = "0.3"
@@ -70,12 +71,12 @@ serde_derive = "1.0.103"
 serde_json = { version = "1.0.56", optional = true }
 sha2 = "0.9.2"
 sha3 = { version = "0.9.1", optional = true }
-solana-crate-features = { path = "../crate-features", version = "=1.7.0", optional = true }
-solana-logger = { path = "../logger", version = "=1.7.0", optional = true }
-solana-frozen-abi = { path = "../frozen-abi", version = "=1.7.0" }
-solana-frozen-abi-macro = { path = "../frozen-abi/macro", version = "=1.7.0" }
-solana-program = { path = "program", version = "=1.7.0" }
-solana-sdk-macro = { path = "macro", version = "=1.7.0" }
+solana-crate-features = { path = "../crate-features", version = "=1.7.11", optional = true }
+solana-logger = { path = "../logger", version = "=1.7.11", optional = true }
+solana-frozen-abi = { path = "../frozen-abi", version = "=1.7.11" }
+solana-frozen-abi-macro = { path = "../frozen-abi/macro", version = "=1.7.11" }
+solana-program = { path = "program", version = "=1.7.11" }
+solana-sdk-macro = { path = "macro", version = "=1.7.11" }
 thiserror = "1.0"
 uriparse = "0.6.3"
 
diff --git a/sdk/README.md b/sdk/README.md
new file mode 100644
index 00000000000000..da1a7e4a11d7fc
--- /dev/null
+++ b/sdk/README.md
@@ -0,0 +1,15 @@
+<p align="center">
+  <a href="https://solana.com">
+    <img alt="Solana" src="https://i.imgur.com/uBVzyX3.png" width="250" />
+  </a>
+</p>
+
+# Solana SDK
+
+Use the Solana SDK Crate to write client side applications in Rust.  If writing on-chain programs, use the [Solana Program Crate](https://crates.io/crates/solana-program) instead.
+
+More information about Solana is available in the [Solana documentation](https://docs.solana.com/).
+
+The [Solana Program Library](https://github.com/solana-labs/solana-program-library) provides examples of how to use this crate.
+
+Still have questions?  Ask us on [Discord](https://discordapp.com/invite/pquxPsq)
diff --git a/sdk/benches/serialize_instructions.rs b/sdk/benches/serialize_instructions.rs
index 1367c0474bfae4..dae549c98ee009 100644
--- a/sdk/benches/serialize_instructions.rs
+++ b/sdk/benches/serialize_instructions.rs
@@ -27,9 +27,7 @@ fn bench_manual_instruction_serialize(b: &mut Bencher) {
     let instructions = make_instructions();
     let message = Message::new(&instructions, None);
     b.iter(|| {
-        test::black_box(message.serialize_instructions(
-            true, // demote_sysvar_write_locks
-        ));
+        test::black_box(message.serialize_instructions());
     });
 }
 
@@ -46,9 +44,7 @@ fn bench_bincode_instruction_deserialize(b: &mut Bencher) {
 fn bench_manual_instruction_deserialize(b: &mut Bencher) {
     let instructions = make_instructions();
     let message = Message::new(&instructions, None);
-    let serialized = message.serialize_instructions(
-        true, // demote_sysvar_write_locks
-    );
+    let serialized = message.serialize_instructions();
     b.iter(|| {
         for i in 0..instructions.len() {
             test::black_box(instructions::load_instruction_at(i, &serialized).unwrap());
@@ -60,9 +56,7 @@ fn bench_manual_instruction_deserialize(b: &mut Bencher) {
 fn bench_manual_instruction_deserialize_single(b: &mut Bencher) {
     let instructions = make_instructions();
     let message = Message::new(&instructions, None);
-    let serialized = message.serialize_instructions(
-        true, // demote_sysvar_write_locks
-    );
+    let serialized = message.serialize_instructions();
     b.iter(|| {
         test::black_box(instructions::load_instruction_at(3, &serialized).unwrap());
     });
diff --git a/sdk/bpf/c/bpf.mk b/sdk/bpf/c/bpf.mk
index 076cd5e6c62df1..4b3039db149297 100644
--- a/sdk/bpf/c/bpf.mk
+++ b/sdk/bpf/c/bpf.mk
@@ -194,6 +194,7 @@ endef
 
 define TEST_EXEC_RULE
 $1: $2
+	LD_LIBRARY_PATH=$(TESTFRAMEWORK_RPATH) \
 	$2$(\n)
 endef
 
diff --git a/sdk/bpf/c/inc/solana_sdk.h b/sdk/bpf/c/inc/solana_sdk.h
index bb24e758e46f65..b5cad9833f5df9 100644
--- a/sdk/bpf/c/inc/solana_sdk.h
+++ b/sdk/bpf/c/inc/solana_sdk.h
@@ -457,6 +457,37 @@ uint64_t sol_keccak256(
     uint8_t *result
 );
 
+
+/** Length of a secp256k1 recover input hash */
+#define SECP256K1_RECOVER_HASH_LENGTH 32
+/** Length of a secp256k1 input signature */
+#define SECP256K1_RECOVER_SIGNATURE_LENGTH 64
+/** Length of a secp256k1 recover result */
+#define SECP256K1_RECOVER_RESULT_LENGTH 64
+
+/** The hash provided to a sol_secp256k1_recover is invalid */
+#define SECP256K1_RECOVER_ERROR_INVALID_HASH 1
+/** The recovery_id provided to a sol_secp256k1_recover is invalid */
+#define SECP256K1_RECOVER_ERROR_INVALID_RECOVERY_ID 2
+/** The signature provided to a sol_secp256k1_recover is invalid */
+#define SECP256K1_RECOVER_ERROR_INVALID_SIGNATURE 3
+
+/**
+ * Recover public key from a signed message.
+ *
+ * @param hash Hashed message
+ * @param recovery_id Tag used for public key recovery from signatures. Can be 0 or 1
+ * @param signature An ECDSA signature
+ * @param result 64 byte array to hold the result. A recovered public key
+ * @return 0 if executed successfully
+ */
+uint64_t sol_secp256k1_recover(
+    const uint8_t *hash,
+    uint64_t recovery_id,
+    const uint8_t *signature,
+    uint8_t *result
+);
+
 /**
  * Account Meta
  */
diff --git a/sdk/bpf/env.sh b/sdk/bpf/env.sh
index 3bdf0555f877a6..8c156258711960 100644
--- a/sdk/bpf/env.sh
+++ b/sdk/bpf/env.sh
@@ -14,3 +14,5 @@ export CC="$bpf_sdk/dependencies/bpf-tools/llvm/bin/clang"
 export AR="$bpf_sdk/dependencies/bpf-tools/llvm/bin/llvm-ar"
 export OBJDUMP="$bpf_sdk/dependencies/bpf-tools/llvm/bin/llvm-objdump"
 export OBJCOPY="$bpf_sdk/dependencies/bpf-tools/llvm/bin/llvm-objcopy"
+
+export RUSTFLAGS="-C lto=no -C opt-level=2"
diff --git a/sdk/cargo-build-bpf/Cargo.toml b/sdk/cargo-build-bpf/Cargo.toml
index 46d84c6d234f85..a2156eff0c01c4 100644
--- a/sdk/cargo-build-bpf/Cargo.toml
+++ b/sdk/cargo-build-bpf/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "solana-cargo-build-bpf"
-version = "1.7.0"
+version = "1.7.11"
 description = "Compile a local package and all of its dependencies using the Solana BPF SDK"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -14,9 +14,9 @@ bzip2 = "0.3.3"
 clap = "2.33.3"
 regex = "1.4.5"
 cargo_metadata = "0.12.0"
-solana-sdk = { path = "..", version = "=1.7.0" }
-solana-download-utils = { path = "../../download-utils", version = "=1.7.0" }
-tar = "0.4.28"
+solana-sdk = { path = "..", version = "=1.7.11" }
+solana-download-utils = { path = "../../download-utils", version = "=1.7.11" }
+tar = "0.4.37"
 
 [features]
 program = []
diff --git a/sdk/cargo-build-bpf/src/main.rs b/sdk/cargo-build-bpf/src/main.rs
index ba0bf06d901271..859a11c1ebf84a 100644
--- a/sdk/cargo-build-bpf/src/main.rs
+++ b/sdk/cargo-build-bpf/src/main.rs
@@ -7,7 +7,7 @@ use {
     solana_download_utils::download_file,
     solana_sdk::signature::{write_keypair_file, Keypair},
     std::{
-        collections::HashMap,
+        collections::{HashMap, HashSet},
         env,
         ffi::OsStr,
         fs::{self, File},
@@ -112,7 +112,7 @@ fn install_if_missing(
         url.push_str(version);
         url.push('/');
         url.push_str(file.to_str().unwrap());
-        download_file(&url.as_str(), &file, true, &mut None)?;
+        download_file(url.as_str(), file, true, &mut None)?;
         fs::create_dir_all(&target_path).map_err(|err| err.to_string())?;
         let zip = File::open(&file).map_err(|err| err.to_string())?;
         let tar = BzDecoder::new(BufReader::new(zip));
@@ -250,6 +250,71 @@ fn postprocess_dump(program_dump: &Path) {
     fs::rename(postprocessed_dump, program_dump).unwrap();
 }
 
+// Check whether the built .so file contains undefined symbols that are
+// not known to the runtime and warn about them if any.
+fn check_undefined_symbols(config: &Config, program: &Path) {
+    let syscalls: HashSet<String> = [
+        "abort",
+        "sol_panic_",
+        "sol_log_",
+        "sol_log_64_",
+        "sol_log_compute_units_",
+        "sol_log_pubkey",
+        "sol_create_program_address",
+        "sol_try_find_program_address",
+        "sol_sha256",
+        "sol_keccak256",
+        "sol_get_clock_sysvar",
+        "sol_get_epoch_schedule_sysvar",
+        "sol_get_fees_sysvar",
+        "sol_get_rent_sysvar",
+        "sol_memcpy_",
+        "sol_memmove_",
+        "sol_memcmp_",
+        "sol_memset_",
+        "sol_invoke_signed_c",
+        "sol_invoke_signed_rust",
+        "sol_alloc_free_",
+    ]
+    .iter()
+    .map(|&symbol| symbol.to_owned())
+    .collect();
+    let entry =
+        Regex::new(r"^ *[0-9]+: [0-9a-f]{16} +[0-9a-f]+ +NOTYPE +GLOBAL +DEFAULT +UND +(.+)")
+            .unwrap();
+    let readelf = config
+        .bpf_sdk
+        .join("dependencies")
+        .join("bpf-tools")
+        .join("llvm")
+        .join("bin")
+        .join("llvm-readelf");
+    let mut readelf_args = vec!["--dyn-symbols"];
+    readelf_args.push(program.to_str().unwrap());
+    let output = spawn(&readelf, &readelf_args);
+    if config.verbose {
+        println!("{}", output);
+    }
+    let mut unresolved_symbols: Vec<String> = Vec::new();
+    for line in output.lines() {
+        let line = line.trim_end();
+        if entry.is_match(line) {
+            let captures = entry.captures(line).unwrap();
+            let symbol = captures[1].to_string();
+            if !syscalls.contains(&symbol) {
+                unresolved_symbols.push(symbol);
+            }
+        }
+    }
+    if !unresolved_symbols.is_empty() {
+        println!(
+            "Warning: the following functions are undefined and not known syscalls {:?}.",
+            unresolved_symbols
+        );
+        println!("         Calling them will trigger a run-time error.");
+    }
+}
+
 // check whether custom BPF toolchain is linked, and link it if it is not.
 fn link_bpf_toolchain(config: &Config) {
     let toolchain_path = config
@@ -358,14 +423,14 @@ fn build_bpf_package(config: &Config, target_directory: &Path, package: &cargo_m
         "solana-bpf-tools-linux.tar.bz2"
     };
     install_if_missing(
-        &config,
+        config,
         "bpf-tools",
         "v1.9",
         "https://github.com/solana-labs/bpf-tools/releases/download",
         &PathBuf::from(bpf_tools_filename),
     )
     .expect("Failed to install bpf-tools");
-    link_bpf_toolchain(&config);
+    link_bpf_toolchain(config);
 
     let llvm_bin = config
         .bpf_sdk
@@ -377,7 +442,9 @@ fn build_bpf_package(config: &Config, target_directory: &Path, package: &cargo_m
     env::set_var("AR", llvm_bin.join("llvm-ar"));
     env::set_var("OBJDUMP", llvm_bin.join("llvm-objdump"));
     env::set_var("OBJCOPY", llvm_bin.join("llvm-objcopy"));
-
+    let mut rust_flags = String::from("-C lto=no");
+    rust_flags.push_str(" -C opt-level=2");
+    env::set_var("RUSTFLAGS", rust_flags);
     let cargo_build = PathBuf::from("cargo");
     let mut cargo_build_args = vec![
         "+bpf",
@@ -455,6 +522,8 @@ fn build_bpf_package(config: &Config, target_directory: &Path, package: &cargo_m
             postprocess_dump(&program_dump);
         }
 
+        check_undefined_symbols(config, &program_so);
+
         println!();
         println!("To deploy this program:");
         println!("  $ solana program deploy {}", program_so.display());
diff --git a/sdk/cargo-test-bpf/Cargo.toml b/sdk/cargo-test-bpf/Cargo.toml
index 2c9af0c75bfe6d..e0483428207421 100644
--- a/sdk/cargo-test-bpf/Cargo.toml
+++ b/sdk/cargo-test-bpf/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "solana-cargo-test-bpf"
-version = "1.7.0"
+version = "1.7.11"
 description = "Execute all unit and integration tests after building with the Solana BPF SDK"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
diff --git a/sdk/cargo-test-bpf/src/main.rs b/sdk/cargo-test-bpf/src/main.rs
index fa0bb3c166ade9..92392d4f8c6543 100644
--- a/sdk/cargo-test-bpf/src/main.rs
+++ b/sdk/cargo-test-bpf/src/main.rs
@@ -122,7 +122,7 @@ fn test_bpf_package(config: &Config, target_directory: &Path, package: &cargo_me
         cargo_args.push("test-bpf");
     }
     for extra_cargo_test_arg in &config.extra_cargo_test_args {
-        cargo_args.push(&extra_cargo_test_arg);
+        cargo_args.push(extra_cargo_test_arg);
     }
     spawn(&config.cargo, &cargo_args);
 }
diff --git a/sdk/docker-solana/README.md b/sdk/docker-solana/README.md
index 5910506997274c..8a8041ea153986 100644
--- a/sdk/docker-solana/README.md
+++ b/sdk/docker-solana/README.md
@@ -6,12 +6,12 @@ https://hub.docker.com/r/solanalabs/solana/
 ### Usage:
 Run the latest beta image:
 ```bash
-$ docker run --rm -p 8899:8899 --ulimit nofile=700000 solanalabs/solana:beta
+$ docker run --rm -p 8899:8899 --ulimit nofile=1000000 solanalabs/solana:beta
 ```
 
 Run the latest edge image:
 ```bash
-$ docker run --rm -p 8899:8899 --ulimit nofile=700000 solanalabs/solana:edge
+$ docker run --rm -p 8899:8899 --ulimit nofile=1000000 solanalabs/solana:edge
 ```
 
 Port *8899* is the JSON RPC port, which is used by clients to communicate with the network.
diff --git a/sdk/macro/Cargo.toml b/sdk/macro/Cargo.toml
index 13c0846f415c83..7c0de7503b5204 100644
--- a/sdk/macro/Cargo.toml
+++ b/sdk/macro/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "solana-sdk-macro"
-version = "1.7.0"
+version = "1.7.11"
 description = "Solana SDK Macro"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
diff --git a/sdk/program/Cargo.toml b/sdk/program/Cargo.toml
index 3b42e9d14af6cf..a3132525a5ebd9 100644
--- a/sdk/program/Cargo.toml
+++ b/sdk/program/Cargo.toml
@@ -1,18 +1,19 @@
 [package]
 name = "solana-program"
-version = "1.7.0"
+version = "1.7.11"
 description = "Solana Program"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
 homepage = "https://solana.com/"
 documentation = "https://docs.rs/solana-program"
+readme = "README.md"
 license = "Apache-2.0"
 edition = "2018"
 
 [dependencies]
 bincode = "1.3.1"
-borsh = "0.8.1"
-borsh-derive = "0.8.1"
+borsh = "0.9.0"
+borsh-derive = "0.9.0"
 bs58 = "0.3.1"
 bv = { version = "0.11.1", features = ["serde"] }
 hex = "0.4.2"
@@ -27,16 +28,17 @@ serde_bytes = "0.11"
 serde_derive = "1.0.103"
 sha2 = "0.9.2"
 sha3 = "0.9.1"
-solana-frozen-abi = { path = "../../frozen-abi", version = "=1.7.0" }
-solana-frozen-abi-macro = { path = "../../frozen-abi/macro", version = "=1.7.0" }
-solana-sdk-macro = { path = "../macro", version = "=1.7.0" }
+solana-frozen-abi = { path = "../../frozen-abi", version = "=1.7.11" }
+solana-frozen-abi-macro = { path = "../../frozen-abi/macro", version = "=1.7.11" }
+solana-sdk-macro = { path = "../macro", version = "=1.7.11" }
 thiserror = "1.0"
 
 [target.'cfg(not(target_arch = "bpf"))'.dependencies]
 blake3 = "0.3.7"
 curve25519-dalek = "2.1.0"
+libsecp256k1 = "0.5.0"
 rand = "0.7.0"
-solana-logger = { path = "../../logger", version = "=1.7.0" }
+solana-logger = { path = "../../logger", version = "=1.7.11" }
 
 [dev-dependencies]
 static_assertions = "1.1.0"
diff --git a/sdk/program/README.md b/sdk/program/README.md
new file mode 100644
index 00000000000000..7f1335ebe5a76d
--- /dev/null
+++ b/sdk/program/README.md
@@ -0,0 +1,15 @@
+<p align="center">
+  <a href="https://solana.com">
+    <img alt="Solana" src="https://i.imgur.com/uBVzyX3.png" width="250" />
+  </a>
+</p>
+
+# Solana Program
+
+Use the Solana Program Crate to write on-chain programs in Rust.  If writing client-side applications, use the [Solana SDK Crate](https://crates.io/crates/solana-program) instead.
+
+More information about Solana is available in the [Solana documentation](https://docs.solana.com/).
+
+[Helloworld](https://github.com/solana-labs/example-helloworld) and the [Solana Program Library](https://github.com/solana-labs/solana-program-library) provide examples of how to use this crate.
+
+Still have questions?  Ask us on [Discord](https://discordapp.com/invite/pquxPsq)
diff --git a/sdk/program/src/account_info.rs b/sdk/program/src/account_info.rs
index 1a49578eac7c9d..084e08c807eb8f 100644
--- a/sdk/program/src/account_info.rs
+++ b/sdk/program/src/account_info.rs
@@ -220,6 +220,12 @@ pub fn next_account_infos<'a, 'b: 'a>(
     Ok(accounts)
 }
 
+impl<'a> AsRef<AccountInfo<'a>> for AccountInfo<'a> {
+    fn as_ref(&self) -> &AccountInfo<'a> {
+        self
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;
@@ -260,4 +266,13 @@ mod tests {
         assert_eq!(k4, *info2_3_4[2].key);
         assert_eq!(k5, *info5.key);
     }
+
+    #[test]
+    fn test_account_info_as_ref() {
+        let k = Pubkey::new_unique();
+        let l = &mut 0;
+        let d = &mut [0u8];
+        let info = AccountInfo::new(&k, false, false, l, d, &k, false, 0);
+        assert_eq!(info.key, info.as_ref().key);
+    }
 }
diff --git a/sdk/program/src/borsh.rs b/sdk/program/src/borsh.rs
index 0137de6f2a3b07..fdc0e2daf11462 100644
--- a/sdk/program/src/borsh.rs
+++ b/sdk/program/src/borsh.rs
@@ -44,7 +44,7 @@ fn get_declaration_packed_len(
             .map(|element| get_declaration_packed_len(element, definitions))
             .sum(),
         None => match declaration {
-            "u8" | "i8" => 1,
+            "bool" | "u8" | "i8" => 1,
             "u16" | "i16" => 2,
             "u32" | "i32" => 4,
             "u64" | "i64" => 8,
@@ -143,6 +143,7 @@ mod tests {
         pub number_u32: u32,
         pub tuple: (u8, u16),
         pub enumeration: TestEnum,
+        pub r#bool: bool,
     }
 
     #[derive(Debug, PartialEq, BorshSerialize, BorshDeserialize, BorshSchema)]
@@ -192,6 +193,7 @@ mod tests {
         assert_eq!(
             get_packed_len::<TestStruct>(),
             size_of::<u64>() * 16
+                + size_of::<bool>()
                 + size_of::<u128>()
                 + size_of::<u32>()
                 + size_of::<u8>()
diff --git a/sdk/program/src/bpf_loader_upgradeable.rs b/sdk/program/src/bpf_loader_upgradeable.rs
index 25a4878ee77bfb..2ff747ba76846e 100644
--- a/sdk/program/src/bpf_loader_upgradeable.rs
+++ b/sdk/program/src/bpf_loader_upgradeable.rs
@@ -189,11 +189,11 @@ pub fn upgrade(
 }
 
 pub fn is_upgrade_instruction(instruction_data: &[u8]) -> bool {
-    3 == instruction_data[0]
+    !instruction_data.is_empty() && 3 == instruction_data[0]
 }
 
 pub fn is_set_authority_instruction(instruction_data: &[u8]) -> bool {
-    4 == instruction_data[0]
+    !instruction_data.is_empty() && 4 == instruction_data[0]
 }
 
 /// Returns the instructions required to set a buffers's authority.
@@ -331,6 +331,7 @@ mod tests {
 
     #[test]
     fn test_is_set_authority_instruction() {
+        assert!(!is_set_authority_instruction(&[]));
         assert_is_instruction(
             is_set_authority_instruction,
             UpgradeableLoaderInstruction::SetAuthority {},
@@ -339,6 +340,7 @@ mod tests {
 
     #[test]
     fn test_is_upgrade_instruction() {
+        assert!(!is_upgrade_instruction(&[]));
         assert_is_instruction(
             is_upgrade_instruction,
             UpgradeableLoaderInstruction::Upgrade {},
diff --git a/sdk/program/src/clock.rs b/sdk/program/src/clock.rs
index 51f45fc23a9dd0..5cf5b27fc4ecf6 100644
--- a/sdk/program/src/clock.rs
+++ b/sdk/program/src/clock.rs
@@ -77,6 +77,10 @@ pub const MAX_TRANSACTION_FORWARDING_DELAY: usize = 6;
 ///  is some some number of Ticks long.
 pub type Slot = u64;
 
+/// Uniquely distinguishes every version of a slot, even if the
+/// slot number is the same, i.e. duplicate slots
+pub type BankId = u64;
+
 /// Epoch is a unit of time a given leader schedule is honored,
 ///  some number of Slots.
 pub type Epoch = u64;
diff --git a/sdk/program/src/fee_calculator.rs b/sdk/program/src/fee_calculator.rs
index 070b6f3f923968..f9a9f48bb17dad 100644
--- a/sdk/program/src/fee_calculator.rs
+++ b/sdk/program/src/fee_calculator.rs
@@ -20,18 +20,6 @@ impl Default for FeeCalculator {
     }
 }
 
-pub struct FeeConfig {
-    pub secp256k1_program_enabled: bool,
-}
-
-impl Default for FeeConfig {
-    fn default() -> Self {
-        Self {
-            secp256k1_program_enabled: true,
-        }
-    }
-}
-
 impl FeeCalculator {
     pub fn new(lamports_per_signature: u64) -> Self {
         Self {
@@ -40,20 +28,14 @@ impl FeeCalculator {
     }
 
     pub fn calculate_fee(&self, message: &Message) -> u64 {
-        self.calculate_fee_with_config(message, &FeeConfig::default())
-    }
-
-    pub fn calculate_fee_with_config(&self, message: &Message, fee_config: &FeeConfig) -> u64 {
         let mut num_secp256k1_signatures: u64 = 0;
-        if fee_config.secp256k1_program_enabled {
-            for instruction in &message.instructions {
-                let program_index = instruction.program_id_index as usize;
-                // Transaction may not be sanitized here
-                if program_index < message.account_keys.len() {
-                    let id = message.account_keys[program_index];
-                    if secp256k1_program::check_id(&id) && !instruction.data.is_empty() {
-                        num_secp256k1_signatures += instruction.data[0] as u64;
-                    }
+        for instruction in &message.instructions {
+            let program_index = instruction.program_id_index as usize;
+            // Transaction may not be sanitized here
+            if program_index < message.account_keys.len() {
+                let id = message.account_keys[program_index];
+                if secp256k1_program::check_id(&id) && !instruction.data.is_empty() {
+                    num_secp256k1_signatures += instruction.data[0] as u64;
                 }
             }
         }
@@ -259,15 +241,6 @@ mod tests {
             Some(&pubkey0),
         );
         assert_eq!(FeeCalculator::new(1).calculate_fee(&message), 2);
-        assert_eq!(
-            FeeCalculator::new(1).calculate_fee_with_config(
-                &message,
-                &FeeConfig {
-                    secp256k1_program_enabled: false
-                }
-            ),
-            1
-        );
 
         secp_instruction.data = vec![0];
         secp_instruction2.data = vec![10];
diff --git a/sdk/program/src/instruction.rs b/sdk/program/src/instruction.rs
index b6847c27d42011..1ad9cfa9d7e373 100644
--- a/sdk/program/src/instruction.rs
+++ b/sdk/program/src/instruction.rs
@@ -9,6 +9,14 @@ use serde::Serialize;
 use thiserror::Error;
 
 /// Reasons the runtime might have rejected an instruction.
+///
+/// Instructions errors are included in the bank hashes and therefore are
+/// included as part of the transaction results when determining consensus.
+/// Because of this, members of this enum must not be removed, but new ones can
+/// be added.  Also, it is crucial that meta-information if any that comes along
+/// with an error be consistent across software versions.  For example, it is
+/// dangerous to include error strings from 3rd party crates because they could
+/// change at any time and changes to them are difficult to detect.
 #[derive(
     Serialize, Deserialize, Debug, Error, PartialEq, Eq, Clone, AbiExample, AbiEnumVisitor,
 )]
@@ -197,6 +205,14 @@ pub enum InstructionError {
     IncorrectAuthority,
 
     /// Failed to serialize or deserialize account data
+    ///
+    /// Warning: This error should never be emitted by the runtime.
+    ///
+    /// This error includes strings from the underlying 3rd party Borsh crate
+    /// which can be dangerous beause the error strings could change across
+    /// Borsh versions. Only programs can use this error because they are
+    /// consistent across Solana software versions.
+    ///
     #[error("Failed to serialize or deserialize account data: {0}")]
     BorshIoError(String),
 
@@ -215,6 +231,12 @@ pub enum InstructionError {
     /// Unsupported sysvar
     #[error("Unsupported sysvar")]
     UnsupportedSysvar,
+
+    /// Illegal account owner
+    #[error("Provided owner is not allowed")]
+    IllegalOwner,
+    // Note: For any new error added here an equivilent ProgramError and it's
+    // conversions must also be added
 }
 
 #[derive(Debug, PartialEq, Clone, Serialize, Deserialize)]
diff --git a/sdk/program/src/lib.rs b/sdk/program/src/lib.rs
index 7b550008e1f6ae..c71d19cbf0305c 100644
--- a/sdk/program/src/lib.rs
+++ b/sdk/program/src/lib.rs
@@ -30,6 +30,7 @@ pub mod native_token;
 pub mod nonce;
 pub mod program;
 pub mod program_error;
+pub mod program_memory;
 pub mod program_option;
 pub mod program_pack;
 pub mod program_stubs;
@@ -37,15 +38,29 @@ pub mod pubkey;
 pub mod rent;
 pub mod sanitize;
 pub mod secp256k1_program;
+pub mod secp256k1_recover;
 pub mod serialize_utils;
 pub mod short_vec;
 pub mod slot_hashes;
 pub mod slot_history;
+pub mod stake;
 pub mod stake_history;
 pub mod system_instruction;
 pub mod system_program;
 pub mod sysvar;
 
+pub mod config {
+    pub mod program {
+        crate::declare_id!("Config1111111111111111111111111111111111111");
+    }
+}
+
+pub mod vote {
+    pub mod program {
+        crate::declare_id!("Vote111111111111111111111111111111111111111");
+    }
+}
+
 /// Convenience macro to declare a static public key and functions to interact with it
 ///
 /// Input: a single literal base58 string representation of a program's id
diff --git a/sdk/program/src/message.rs b/sdk/program/src/message.rs
index a8b0aa5fe8b1ba..28b44eec3773c6 100644
--- a/sdk/program/src/message.rs
+++ b/sdk/program/src/message.rs
@@ -308,10 +308,8 @@ impl Message {
         nonce_account_pubkey: &Pubkey,
         nonce_authority_pubkey: &Pubkey,
     ) -> Self {
-        let nonce_ix = system_instruction::advance_nonce_account(
-            &nonce_account_pubkey,
-            &nonce_authority_pubkey,
-        );
+        let nonce_ix =
+            system_instruction::advance_nonce_account(nonce_account_pubkey, nonce_authority_pubkey);
         instructions.insert(0, nonce_ix);
         Self::new(&instructions, payer)
     }
@@ -393,7 +391,7 @@ impl Message {
         self.program_position(i).is_some()
     }
 
-    pub fn is_writable(&self, i: usize, demote_sysvar_write_locks: bool) -> bool {
+    pub fn is_writable(&self, i: usize) -> bool {
         (i < (self.header.num_required_signatures - self.header.num_readonly_signed_accounts)
             as usize
             || (i >= self.header.num_required_signatures as usize
@@ -401,8 +399,7 @@ impl Message {
                     - self.header.num_readonly_unsigned_accounts as usize))
             && !{
                 let key = self.account_keys[i];
-                demote_sysvar_write_locks
-                    && (sysvar::is_sysvar_id(&key) || BUILTIN_PROGRAMS_KEYS.contains(&key))
+                sysvar::is_sysvar_id(&key) || BUILTIN_PROGRAMS_KEYS.contains(&key)
             }
     }
 
@@ -410,14 +407,11 @@ impl Message {
         i < self.header.num_required_signatures as usize
     }
 
-    pub fn get_account_keys_by_lock_type(
-        &self,
-        demote_sysvar_write_locks: bool,
-    ) -> (Vec<&Pubkey>, Vec<&Pubkey>) {
+    pub fn get_account_keys_by_lock_type(&self) -> (Vec<&Pubkey>, Vec<&Pubkey>) {
         let mut writable_keys = vec![];
         let mut readonly_keys = vec![];
         for (i, key) in self.account_keys.iter().enumerate() {
-            if self.is_writable(i, demote_sysvar_write_locks) {
+            if self.is_writable(i) {
                 writable_keys.push(key);
             } else {
                 readonly_keys.push(key);
@@ -439,7 +433,7 @@ impl Message {
     //   35..67 - program_id
     //   67..69 - data len - u16
     //   69..data_len - data
-    pub fn serialize_instructions(&self, demote_sysvar_write_locks: bool) -> Vec<u8> {
+    pub fn serialize_instructions(&self) -> Vec<u8> {
         // 64 bytes is a reasonable guess, calculating exactly is slower in benchmarks
         let mut data = Vec::with_capacity(self.instructions.len() * (32 * 2));
         append_u16(&mut data, self.instructions.len() as u16);
@@ -454,7 +448,7 @@ impl Message {
             for account_index in &instruction.accounts {
                 let account_index = *account_index as usize;
                 let is_signer = self.is_signer(account_index);
-                let is_writable = self.is_writable(account_index, demote_sysvar_write_locks);
+                let is_writable = self.is_writable(account_index);
                 let mut meta_byte = 0;
                 if is_signer {
                     meta_byte |= 1 << Self::IS_SIGNER_BIT;
@@ -482,20 +476,20 @@ impl Message {
         data: &[u8],
     ) -> Result<Instruction, SanitizeError> {
         let mut current = 0;
-        let num_instructions = read_u16(&mut current, &data)?;
+        let num_instructions = read_u16(&mut current, data)?;
         if index >= num_instructions as usize {
             return Err(SanitizeError::IndexOutOfBounds);
         }
 
         // index into the instruction byte-offset table.
         current += index * 2;
-        let start = read_u16(&mut current, &data)?;
+        let start = read_u16(&mut current, data)?;
 
         current = start as usize;
-        let num_accounts = read_u16(&mut current, &data)?;
+        let num_accounts = read_u16(&mut current, data)?;
         let mut accounts = Vec::with_capacity(num_accounts as usize);
         for _ in 0..num_accounts {
-            let meta_byte = read_u8(&mut current, &data)?;
+            let meta_byte = read_u8(&mut current, data)?;
             let mut is_signer = false;
             let mut is_writable = false;
             if meta_byte & (1 << Self::IS_SIGNER_BIT) != 0 {
@@ -504,16 +498,16 @@ impl Message {
             if meta_byte & (1 << Self::IS_WRITABLE_BIT) != 0 {
                 is_writable = true;
             }
-            let pubkey = read_pubkey(&mut current, &data)?;
+            let pubkey = read_pubkey(&mut current, data)?;
             accounts.push(AccountMeta {
                 pubkey,
                 is_signer,
                 is_writable,
             });
         }
-        let program_id = read_pubkey(&mut current, &data)?;
-        let data_len = read_u16(&mut current, &data)?;
-        let data = read_slice(&mut current, &data, data_len as usize)?;
+        let program_id = read_pubkey(&mut current, data)?;
+        let data_len = read_u16(&mut current, data)?;
+        let data = read_slice(&mut current, data, data_len as usize)?;
         Ok(Instruction {
             program_id,
             accounts,
@@ -893,13 +887,12 @@ mod tests {
             recent_blockhash: Hash::default(),
             instructions: vec![],
         };
-        let demote_sysvar_write_locks = true;
-        assert!(message.is_writable(0, demote_sysvar_write_locks));
-        assert!(!message.is_writable(1, demote_sysvar_write_locks));
-        assert!(!message.is_writable(2, demote_sysvar_write_locks));
-        assert!(message.is_writable(3, demote_sysvar_write_locks));
-        assert!(message.is_writable(4, demote_sysvar_write_locks));
-        assert!(!message.is_writable(5, demote_sysvar_write_locks));
+        assert!(message.is_writable(0));
+        assert!(!message.is_writable(1));
+        assert!(!message.is_writable(2));
+        assert!(message.is_writable(3));
+        assert!(message.is_writable(4));
+        assert!(!message.is_writable(5));
     }
 
     #[test]
@@ -927,9 +920,7 @@ mod tests {
             Some(&id1),
         );
         assert_eq!(
-            message.get_account_keys_by_lock_type(
-                true, // demote_sysvar_write_locks
-            ),
+            message.get_account_keys_by_lock_type(),
             (vec![&id1, &id0], vec![&id3, &id2, &program_id])
         );
     }
@@ -959,9 +950,7 @@ mod tests {
         ];
 
         let message = Message::new(&instructions, Some(&id1));
-        let serialized = message.serialize_instructions(
-            true, // demote_sysvar_write_locks
-        );
+        let serialized = message.serialize_instructions();
         for (i, instruction) in instructions.iter().enumerate() {
             assert_eq!(
                 Message::deserialize_instruction(i, &serialized).unwrap(),
@@ -982,9 +971,7 @@ mod tests {
         ];
 
         let message = Message::new(&instructions, Some(&id1));
-        let serialized = message.serialize_instructions(
-            true, // demote_sysvar_write_locks
-        );
+        let serialized = message.serialize_instructions();
         assert_eq!(
             Message::deserialize_instruction(instructions.len(), &serialized).unwrap_err(),
             SanitizeError::IndexOutOfBounds,
diff --git a/sdk/program/src/nonce/mod.rs b/sdk/program/src/nonce/mod.rs
index 5aa54121a0543c..3247fbe4ecfe48 100644
--- a/sdk/program/src/nonce/mod.rs
+++ b/sdk/program/src/nonce/mod.rs
@@ -1,2 +1,4 @@
 pub mod state;
 pub use state::State;
+
+pub const NONCED_TX_MARKER_IX_INDEX: u8 = 0;
diff --git a/sdk/program/src/program_error.rs b/sdk/program/src/program_error.rs
index 7d7aa4718070c9..f07936cc3711fd 100644
--- a/sdk/program/src/program_error.rs
+++ b/sdk/program/src/program_error.rs
@@ -45,6 +45,8 @@ pub enum ProgramError {
     AccountNotRentExempt,
     #[error("Unsupported sysvar")]
     UnsupportedSysvar,
+    #[error("Provided owner is not allowed")]
+    IllegalOwner,
 }
 
 pub trait PrintProgramError {
@@ -82,6 +84,7 @@ impl PrintProgramError for ProgramError {
             Self::BorshIoError(_) => msg!("Error: BorshIoError"),
             Self::AccountNotRentExempt => msg!("Error: AccountNotRentExempt"),
             Self::UnsupportedSysvar => msg!("Error: UnsupportedSysvar"),
+            Self::IllegalOwner => msg!("Error: IllegalOwner"),
         }
     }
 }
@@ -111,6 +114,12 @@ pub const INVALID_SEEDS: u64 = to_builtin!(14);
 pub const BORSH_IO_ERROR: u64 = to_builtin!(15);
 pub const ACCOUNT_NOT_RENT_EXEMPT: u64 = to_builtin!(16);
 pub const UNSUPPORTED_SYSVAR: u64 = to_builtin!(17);
+pub const ILLEGAL_OWNER: u64 = to_builtin!(18);
+// Warning: Any new program errors added here must also be:
+// - Added to the below conversions
+// - Added as an equivilent to InstructionError
+// - Be featureized in the BPF loader to return `InstructionError::InvalidError`
+//   until the feature is activated
 
 impl From<ProgramError> for u64 {
     fn from(error: ProgramError) -> Self {
@@ -131,7 +140,7 @@ impl From<ProgramError> for u64 {
             ProgramError::BorshIoError(_) => BORSH_IO_ERROR,
             ProgramError::AccountNotRentExempt => ACCOUNT_NOT_RENT_EXEMPT,
             ProgramError::UnsupportedSysvar => UNSUPPORTED_SYSVAR,
-
+            ProgramError::IllegalOwner => ILLEGAL_OWNER,
             ProgramError::Custom(error) => {
                 if error == 0 {
                     CUSTOM_ZERO
@@ -146,22 +155,25 @@ impl From<ProgramError> for u64 {
 impl From<u64> for ProgramError {
     fn from(error: u64) -> Self {
         match error {
-            INVALID_ARGUMENT => ProgramError::InvalidArgument,
-            INVALID_INSTRUCTION_DATA => ProgramError::InvalidInstructionData,
-            INVALID_ACCOUNT_DATA => ProgramError::InvalidAccountData,
-            ACCOUNT_DATA_TOO_SMALL => ProgramError::AccountDataTooSmall,
-            INSUFFICIENT_FUNDS => ProgramError::InsufficientFunds,
-            INCORRECT_PROGRAM_ID => ProgramError::IncorrectProgramId,
-            MISSING_REQUIRED_SIGNATURES => ProgramError::MissingRequiredSignature,
-            ACCOUNT_ALREADY_INITIALIZED => ProgramError::AccountAlreadyInitialized,
-            UNINITIALIZED_ACCOUNT => ProgramError::UninitializedAccount,
-            NOT_ENOUGH_ACCOUNT_KEYS => ProgramError::NotEnoughAccountKeys,
-            ACCOUNT_BORROW_FAILED => ProgramError::AccountBorrowFailed,
-            MAX_SEED_LENGTH_EXCEEDED => ProgramError::MaxSeedLengthExceeded,
-            INVALID_SEEDS => ProgramError::InvalidSeeds,
-            UNSUPPORTED_SYSVAR => ProgramError::UnsupportedSysvar,
-            CUSTOM_ZERO => ProgramError::Custom(0),
-            _ => ProgramError::Custom(error as u32),
+            CUSTOM_ZERO => Self::Custom(0),
+            INVALID_ARGUMENT => Self::InvalidArgument,
+            INVALID_INSTRUCTION_DATA => Self::InvalidInstructionData,
+            INVALID_ACCOUNT_DATA => Self::InvalidAccountData,
+            ACCOUNT_DATA_TOO_SMALL => Self::AccountDataTooSmall,
+            INSUFFICIENT_FUNDS => Self::InsufficientFunds,
+            INCORRECT_PROGRAM_ID => Self::IncorrectProgramId,
+            MISSING_REQUIRED_SIGNATURES => Self::MissingRequiredSignature,
+            ACCOUNT_ALREADY_INITIALIZED => Self::AccountAlreadyInitialized,
+            UNINITIALIZED_ACCOUNT => Self::UninitializedAccount,
+            NOT_ENOUGH_ACCOUNT_KEYS => Self::NotEnoughAccountKeys,
+            ACCOUNT_BORROW_FAILED => Self::AccountBorrowFailed,
+            MAX_SEED_LENGTH_EXCEEDED => Self::MaxSeedLengthExceeded,
+            INVALID_SEEDS => Self::InvalidSeeds,
+            BORSH_IO_ERROR => Self::BorshIoError("Unkown".to_string()),
+            ACCOUNT_NOT_RENT_EXEMPT => Self::AccountNotRentExempt,
+            UNSUPPORTED_SYSVAR => Self::UnsupportedSysvar,
+            ILLEGAL_OWNER => Self::IllegalOwner,
+            _ => Self::Custom(error as u32),
         }
     }
 }
@@ -184,9 +196,11 @@ impl TryFrom<InstructionError> for ProgramError {
             Self::Error::NotEnoughAccountKeys => Ok(Self::NotEnoughAccountKeys),
             Self::Error::AccountBorrowFailed => Ok(Self::AccountBorrowFailed),
             Self::Error::MaxSeedLengthExceeded => Ok(Self::MaxSeedLengthExceeded),
+            Self::Error::InvalidSeeds => Ok(Self::InvalidSeeds),
             Self::Error::BorshIoError(err) => Ok(Self::BorshIoError(err)),
             Self::Error::AccountNotRentExempt => Ok(Self::AccountNotRentExempt),
             Self::Error::UnsupportedSysvar => Ok(Self::UnsupportedSysvar),
+            Self::Error::IllegalOwner => Ok(Self::IllegalOwner),
             _ => Err(error),
         }
     }
@@ -199,25 +213,28 @@ where
     fn from(error: T) -> Self {
         let error = error.to_u64().unwrap_or(0xbad_c0de);
         match error {
-            CUSTOM_ZERO => InstructionError::Custom(0),
-            INVALID_ARGUMENT => InstructionError::InvalidArgument,
-            INVALID_INSTRUCTION_DATA => InstructionError::InvalidInstructionData,
-            INVALID_ACCOUNT_DATA => InstructionError::InvalidAccountData,
-            ACCOUNT_DATA_TOO_SMALL => InstructionError::AccountDataTooSmall,
-            INSUFFICIENT_FUNDS => InstructionError::InsufficientFunds,
-            INCORRECT_PROGRAM_ID => InstructionError::IncorrectProgramId,
-            MISSING_REQUIRED_SIGNATURES => InstructionError::MissingRequiredSignature,
-            ACCOUNT_ALREADY_INITIALIZED => InstructionError::AccountAlreadyInitialized,
-            UNINITIALIZED_ACCOUNT => InstructionError::UninitializedAccount,
-            NOT_ENOUGH_ACCOUNT_KEYS => InstructionError::NotEnoughAccountKeys,
-            ACCOUNT_BORROW_FAILED => InstructionError::AccountBorrowFailed,
-            MAX_SEED_LENGTH_EXCEEDED => InstructionError::MaxSeedLengthExceeded,
-            INVALID_SEEDS => InstructionError::InvalidSeeds,
-            UNSUPPORTED_SYSVAR => InstructionError::UnsupportedSysvar,
+            CUSTOM_ZERO => Self::Custom(0),
+            INVALID_ARGUMENT => Self::InvalidArgument,
+            INVALID_INSTRUCTION_DATA => Self::InvalidInstructionData,
+            INVALID_ACCOUNT_DATA => Self::InvalidAccountData,
+            ACCOUNT_DATA_TOO_SMALL => Self::AccountDataTooSmall,
+            INSUFFICIENT_FUNDS => Self::InsufficientFunds,
+            INCORRECT_PROGRAM_ID => Self::IncorrectProgramId,
+            MISSING_REQUIRED_SIGNATURES => Self::MissingRequiredSignature,
+            ACCOUNT_ALREADY_INITIALIZED => Self::AccountAlreadyInitialized,
+            UNINITIALIZED_ACCOUNT => Self::UninitializedAccount,
+            NOT_ENOUGH_ACCOUNT_KEYS => Self::NotEnoughAccountKeys,
+            ACCOUNT_BORROW_FAILED => Self::AccountBorrowFailed,
+            MAX_SEED_LENGTH_EXCEEDED => Self::MaxSeedLengthExceeded,
+            INVALID_SEEDS => Self::InvalidSeeds,
+            BORSH_IO_ERROR => Self::BorshIoError("Unkown".to_string()),
+            ACCOUNT_NOT_RENT_EXEMPT => Self::AccountNotRentExempt,
+            UNSUPPORTED_SYSVAR => Self::UnsupportedSysvar,
+            ILLEGAL_OWNER => Self::IllegalOwner,
             _ => {
                 // A valid custom error has no bits set in the upper 32
                 if error >> BUILTIN_BIT_SHIFT == 0 {
-                    InstructionError::Custom(error as u32)
+                    Self::Custom(error as u32)
                 } else {
                     Self::InvalidError
                 }
@@ -229,14 +246,15 @@ where
 impl From<PubkeyError> for ProgramError {
     fn from(error: PubkeyError) -> Self {
         match error {
-            PubkeyError::MaxSeedLengthExceeded => ProgramError::MaxSeedLengthExceeded,
-            PubkeyError::InvalidSeeds => ProgramError::InvalidSeeds,
+            PubkeyError::MaxSeedLengthExceeded => Self::MaxSeedLengthExceeded,
+            PubkeyError::InvalidSeeds => Self::InvalidSeeds,
+            PubkeyError::IllegalOwner => Self::IllegalOwner,
         }
     }
 }
 
 impl From<BorshIoError> for ProgramError {
     fn from(error: BorshIoError) -> Self {
-        ProgramError::BorshIoError(format!("{}", error))
+        Self::BorshIoError(format!("{}", error))
     }
 }
diff --git a/sdk/program/src/program_memory.rs b/sdk/program/src/program_memory.rs
new file mode 100644
index 00000000000000..b213aa03425900
--- /dev/null
+++ b/sdk/program/src/program_memory.rs
@@ -0,0 +1,89 @@
+//! @brief Solana Rust-based BPF memory operations
+
+/// Memcpy
+///
+/// @param dst - Destination
+/// @param src - Source
+/// @param n - Number of bytes to copy
+#[inline]
+pub fn sol_memcpy(dst: &mut [u8], src: &[u8], n: usize) {
+    #[cfg(target_arch = "bpf")]
+    {
+        extern "C" {
+            fn sol_memcpy_(dst: *mut u8, src: *const u8, n: u64);
+        }
+        unsafe {
+            sol_memcpy_(dst.as_mut_ptr(), src.as_ptr(), n as u64);
+        }
+    }
+
+    #[cfg(not(target_arch = "bpf"))]
+    crate::program_stubs::sol_memcpy(dst.as_mut_ptr(), src.as_ptr(), n);
+}
+
+/// Memmove
+///
+/// @param dst - Destination
+/// @param src - Source
+/// @param n - Number of bytes to copy
+///
+/// # Safety
+#[inline]
+pub unsafe fn sol_memmove(dst: *mut u8, src: *mut u8, n: usize) {
+    #[cfg(target_arch = "bpf")]
+    {
+        extern "C" {
+            fn sol_memmove_(dst: *mut u8, src: *const u8, n: u64);
+        }
+        sol_memmove_(dst, src, n as u64);
+    }
+
+    #[cfg(not(target_arch = "bpf"))]
+    crate::program_stubs::sol_memmove(dst, src, n);
+}
+
+/// Memcmp
+///
+/// @param s1 - Slice to be compared
+/// @param s2 - Slice to be compared
+/// @param n - Number of bytes to compare
+#[inline]
+pub fn sol_memcmp(s1: &[u8], s2: &[u8], n: usize) -> i32 {
+    let mut result = 0;
+
+    #[cfg(target_arch = "bpf")]
+    {
+        extern "C" {
+            fn sol_memcmp_(s1: *const u8, s2: *const u8, n: u64, result: *mut i32);
+        }
+        unsafe {
+            sol_memcmp_(s1.as_ptr(), s2.as_ptr(), n as u64, &mut result as *mut i32);
+        }
+    }
+
+    #[cfg(not(target_arch = "bpf"))]
+    crate::program_stubs::sol_memcmp(s1.as_ptr(), s2.as_ptr(), n, &mut result as *mut i32);
+
+    result
+}
+
+/// Memset
+///
+/// @param s1 - Slice to be compared
+/// @param s2 - Slice to be compared
+/// @param n - Number of bytes to compare
+#[inline]
+pub fn sol_memset(s: &mut [u8], c: u8, n: usize) {
+    #[cfg(target_arch = "bpf")]
+    {
+        extern "C" {
+            fn sol_memset_(s: *mut u8, c: u8, n: u64);
+        }
+        unsafe {
+            sol_memset_(s.as_mut_ptr(), c, n as u64);
+        }
+    }
+
+    #[cfg(not(target_arch = "bpf"))]
+    crate::program_stubs::sol_memset(s.as_mut_ptr(), c, n);
+}
diff --git a/sdk/program/src/program_stubs.rs b/sdk/program/src/program_stubs.rs
index 8aa67b6c780b00..f576ae723e2a63 100644
--- a/sdk/program/src/program_stubs.rs
+++ b/sdk/program/src/program_stubs.rs
@@ -12,12 +12,13 @@ lazy_static::lazy_static! {
     static ref SYSCALL_STUBS: Arc<RwLock<Box<dyn SyscallStubs>>> = Arc::new(RwLock::new(Box::new(DefaultSyscallStubs {})));
 }
 
-// The default syscall stubs don't do much, but `set_syscalls()` can be used to swap in
-// alternatives
+// The default syscall stubs may not do much, but `set_syscalls()` can be used
+// to swap in alternatives
 pub fn set_syscall_stubs(syscall_stubs: Box<dyn SyscallStubs>) -> Box<dyn SyscallStubs> {
     std::mem::replace(&mut SYSCALL_STUBS.write().unwrap(), syscall_stubs)
 }
 
+#[allow(clippy::integer_arithmetic)]
 pub trait SyscallStubs: Sync + Send {
     fn sol_log(&self, message: &str) {
         println!("{}", message);
@@ -34,7 +35,6 @@ pub trait SyscallStubs: Sync + Send {
         sol_log("SyscallStubs: sol_invoke_signed() not available");
         Ok(())
     }
-
     fn sol_get_clock_sysvar(&self, _var_addr: *mut u8) -> u64 {
         UNSUPPORTED_SYSVAR
     }
@@ -47,6 +47,39 @@ pub trait SyscallStubs: Sync + Send {
     fn sol_get_rent_sysvar(&self, _var_addr: *mut u8) -> u64 {
         UNSUPPORTED_SYSVAR
     }
+    /// # Safety
+    unsafe fn sol_memcpy(&self, dst: *mut u8, src: *const u8, n: usize) {
+        // cannot be overlapping
+        if dst as usize + n > src as usize && src as usize > dst as usize {
+            panic!("memcpy does not support oveerlapping regions");
+        }
+        std::ptr::copy_nonoverlapping(src, dst, n as usize);
+    }
+    /// # Safety
+    unsafe fn sol_memmove(&self, dst: *mut u8, src: *const u8, n: usize) {
+        std::ptr::copy(src, dst, n as usize);
+    }
+    /// # Safety
+    unsafe fn sol_memcmp(&self, s1: *const u8, s2: *const u8, n: usize, result: *mut i32) {
+        let mut i = 0;
+        while i < n {
+            let a = *s1.add(i);
+            let b = *s2.add(i);
+            if a != b {
+                *result = a as i32 - b as i32;
+                return;
+            }
+            i += 1;
+        }
+        *result = 0
+    }
+    /// # Safety
+    unsafe fn sol_memset(&self, s: *mut u8, c: u8, n: usize) {
+        let s = std::slice::from_raw_parts_mut(s, n);
+        for val in s.iter_mut().take(n) {
+            *val = c;
+        }
+    }
 }
 
 struct DefaultSyscallStubs {}
@@ -96,3 +129,27 @@ pub(crate) fn sol_get_fees_sysvar(var_addr: *mut u8) -> u64 {
 pub(crate) fn sol_get_rent_sysvar(var_addr: *mut u8) -> u64 {
     SYSCALL_STUBS.read().unwrap().sol_get_rent_sysvar(var_addr)
 }
+
+pub(crate) fn sol_memcpy(dst: *mut u8, src: *const u8, n: usize) {
+    unsafe {
+        SYSCALL_STUBS.read().unwrap().sol_memcpy(dst, src, n);
+    }
+}
+
+pub(crate) fn sol_memmove(dst: *mut u8, src: *const u8, n: usize) {
+    unsafe {
+        SYSCALL_STUBS.read().unwrap().sol_memmove(dst, src, n);
+    }
+}
+
+pub(crate) fn sol_memcmp(s1: *const u8, s2: *const u8, n: usize, result: *mut i32) {
+    unsafe {
+        SYSCALL_STUBS.read().unwrap().sol_memcmp(s1, s2, n, result);
+    }
+}
+
+pub(crate) fn sol_memset(s: *mut u8, c: u8, n: usize) {
+    unsafe {
+        SYSCALL_STUBS.read().unwrap().sol_memset(s, c, n);
+    }
+}
diff --git a/sdk/program/src/pubkey.rs b/sdk/program/src/pubkey.rs
index eade06d999249b..e7d3f9d58fad9b 100644
--- a/sdk/program/src/pubkey.rs
+++ b/sdk/program/src/pubkey.rs
@@ -1,5 +1,9 @@
 #![allow(clippy::integer_arithmetic)]
-use crate::{decode_error::DecodeError, hash::hashv};
+use crate::{
+    bpf_loader, bpf_loader_deprecated, config, decode_error::DecodeError, feature, hash::hashv,
+    secp256k1_program, stake, system_program, sysvar, vote,
+};
+
 use borsh::{BorshDeserialize, BorshSchema, BorshSerialize};
 use num_derive::{FromPrimitive, ToPrimitive};
 use std::{
@@ -18,6 +22,8 @@ pub const MAX_SEEDS: usize = 16;
 /// Maximum string length of a base58 encoded pubkey
 const MAX_BASE58_LEN: usize = 44;
 
+const PDA_MARKER: &[u8; 21] = b"ProgramDerivedAddress";
+
 #[derive(Error, Debug, Serialize, Clone, PartialEq, FromPrimitive, ToPrimitive)]
 pub enum PubkeyError {
     /// Length of the seed is too long for address generation
@@ -25,6 +31,8 @@ pub enum PubkeyError {
     MaxSeedLengthExceeded,
     #[error("Provided seeds do not result in a valid address")]
     InvalidSeeds,
+    #[error("Provided owner is not allowed")]
+    IllegalOwner,
 }
 impl<T> DecodeError<T> for PubkeyError {
     fn type_of() -> &'static str {
@@ -68,13 +76,11 @@ pub enum ParsePubkeyError {
     WrongSize,
     #[error("Invalid Base58 string")]
     Invalid,
-    #[error("Infallible")]
-    Infallible,
 }
 
 impl From<Infallible> for ParsePubkeyError {
     fn from(_: Infallible) -> Self {
-        Self::Infallible
+        unreachable!("Infallible unihnabited");
     }
 }
 
@@ -159,8 +165,16 @@ impl Pubkey {
             return Err(PubkeyError::MaxSeedLengthExceeded);
         }
 
+        let owner = owner.as_ref();
+        if owner.len() >= PDA_MARKER.len() {
+            let slice = &owner[owner.len() - PDA_MARKER.len()..];
+            if slice == PDA_MARKER {
+                return Err(PubkeyError::IllegalOwner);
+            }
+        }
+
         Ok(Pubkey::new(
-            hashv(&[base.as_ref(), seed.as_ref(), owner.as_ref()]).as_ref(),
+            hashv(&[base.as_ref(), seed.as_ref(), owner]).as_ref(),
         ))
     }
 
@@ -200,6 +214,10 @@ impl Pubkey {
             }
         }
 
+        if program_id.is_native_program_id() {
+            return Err(PubkeyError::IllegalOwner);
+        }
+
         // Perform the calculation inline, calling this from within a program is
         // not supported
         #[cfg(not(target_arch = "bpf"))]
@@ -208,7 +226,7 @@ impl Pubkey {
             for seed in seeds.iter() {
                 hasher.hash(seed);
             }
-            hasher.hashv(&[program_id.as_ref(), "ProgramDerivedAddress".as_ref()]);
+            hasher.hashv(&[program_id.as_ref(), PDA_MARKER]);
             let hash = hasher.result();
 
             if bytes_are_curve_point(hash) {
@@ -289,9 +307,10 @@ impl Pubkey {
                 {
                     let mut seeds_with_bump = seeds.to_vec();
                     seeds_with_bump.push(&bump_seed);
-                    if let Ok(address) = Self::create_program_address(&seeds_with_bump, program_id)
-                    {
-                        return Some((address, bump_seed[0]));
+                    match Self::create_program_address(&seeds_with_bump, program_id) {
+                        Ok(address) => return Some((address, bump_seed[0])),
+                        Err(PubkeyError::InvalidSeeds) => (),
+                        _ => break,
                     }
                 }
                 bump_seed[0] -= 1;
@@ -349,6 +368,22 @@ impl Pubkey {
         #[cfg(not(target_arch = "bpf"))]
         crate::program_stubs::sol_log(&self.to_string());
     }
+
+    pub fn is_native_program_id(&self) -> bool {
+        let all_program_ids = [
+            bpf_loader::id(),
+            bpf_loader_deprecated::id(),
+            feature::id(),
+            config::program::id(),
+            stake::program::id(),
+            stake::config::id(),
+            vote::program::id(),
+            secp256k1_program::id(),
+            system_program::id(),
+            sysvar::id(),
+        ];
+        all_program_ids.contains(self)
+    }
 }
 
 impl AsRef<[u8]> for Pubkey {
@@ -485,7 +520,7 @@ mod tests {
     fn test_create_program_address() {
         let exceeded_seed = &[127; MAX_SEED_LEN + 1];
         let max_seed = &[0; MAX_SEED_LEN];
-        let program_id = Pubkey::from_str("BPFLoader1111111111111111111111111111111111").unwrap();
+        let program_id = Pubkey::from_str("BPFLoaderUpgradeab1e11111111111111111111111").unwrap();
         let public_key = Pubkey::from_str("SeedPubey1111111111111111111111111111111111").unwrap();
 
         assert_eq!(
@@ -499,25 +534,25 @@ mod tests {
         assert!(Pubkey::create_program_address(&[max_seed], &program_id).is_ok());
         assert_eq!(
             Pubkey::create_program_address(&[b"", &[1]], &program_id),
-            Ok("3gF2KMe9KiC6FNVBmfg9i267aMPvK37FewCip4eGBFcT"
+            Ok("BwqrghZA2htAcqq8dzP1WDAhTXYTYWj7CHxF5j7TDBAe"
                 .parse()
                 .unwrap())
         );
         assert_eq!(
-            Pubkey::create_program_address(&["☉".as_ref()], &program_id),
-            Ok("7ytmC1nT1xY4RfxCV2ZgyA7UakC93do5ZdyhdF3EtPj7"
+            Pubkey::create_program_address(&["☉".as_ref(), &[0]], &program_id),
+            Ok("13yWmRpaTR4r5nAktwLqMpRNr28tnVUZw26rTvPSSB19"
                 .parse()
                 .unwrap())
         );
         assert_eq!(
             Pubkey::create_program_address(&[b"Talking", b"Squirrels"], &program_id),
-            Ok("HwRVBufQ4haG5XSgpspwKtNd3PC9GM9m1196uJW36vds"
+            Ok("2fnQrngrQT4SeLcdToJAD96phoEjNL2man2kfRLCASVk"
                 .parse()
                 .unwrap())
         );
         assert_eq!(
-            Pubkey::create_program_address(&[public_key.as_ref()], &program_id),
-            Ok("GUs5qLUfsEHkcMB9T38vjr18ypEhRuNWiePW2LoK4E3K"
+            Pubkey::create_program_address(&[public_key.as_ref(), &[1]], &program_id),
+            Ok("976ymqVnfE32QFe6NfGDctSvVa36LWnvYxhU6G2232YL"
                 .parse()
                 .unwrap())
         );
@@ -564,4 +599,40 @@ mod tests {
             );
         }
     }
+
+    #[test]
+    fn test_is_native_program_id() {
+        assert!(bpf_loader::id().is_native_program_id());
+        assert!(bpf_loader_deprecated::id().is_native_program_id());
+        assert!(config::program::id().is_native_program_id());
+        assert!(feature::id().is_native_program_id());
+        assert!(secp256k1_program::id().is_native_program_id());
+        assert!(stake::program::id().is_native_program_id());
+        assert!(stake::config::id().is_native_program_id());
+        assert!(system_program::id().is_native_program_id());
+        assert!(sysvar::id().is_native_program_id());
+        assert!(vote::program::id().is_native_program_id());
+    }
+
+    fn pubkey_from_seed_by_marker(marker: &[u8]) -> Result<Pubkey, PubkeyError> {
+        let key = Pubkey::new_unique();
+        let owner = Pubkey::default();
+
+        let mut to_fake = owner.to_bytes().to_vec();
+        to_fake.extend_from_slice(marker);
+
+        let seed = &String::from_utf8(to_fake[..to_fake.len() - 32].to_vec()).expect("not utf8");
+        let base = &Pubkey::try_from_slice(&to_fake[to_fake.len() - 32..]).unwrap();
+
+        Pubkey::create_with_seed(&key, seed, base)
+    }
+
+    #[test]
+    fn test_create_with_seed_rejects_illegal_owner() {
+        assert_eq!(
+            pubkey_from_seed_by_marker(PDA_MARKER),
+            Err(PubkeyError::IllegalOwner)
+        );
+        assert!(pubkey_from_seed_by_marker(&PDA_MARKER[1..]).is_ok());
+    }
 }
diff --git a/sdk/program/src/rent.rs b/sdk/program/src/rent.rs
index e3da194b66f467..7d47ffe2fc4cfc 100644
--- a/sdk/program/src/rent.rs
+++ b/sdk/program/src/rent.rs
@@ -1,5 +1,6 @@
 #![allow(clippy::integer_arithmetic)]
 //! configuration for network rent
+use crate::clock::DEFAULT_SLOTS_PER_EPOCH;
 
 #[repr(C)]
 #[derive(Serialize, Deserialize, PartialEq, Clone, Copy, Debug, AbiExample)]
@@ -82,6 +83,17 @@ impl Rent {
             ..Rent::default()
         }
     }
+
+    pub fn with_slots_per_epoch(slots_per_epoch: u64) -> Self {
+        let ratio = slots_per_epoch as f64 / DEFAULT_SLOTS_PER_EPOCH as f64;
+        let exemption_threshold = DEFAULT_EXEMPTION_THRESHOLD as f64 * ratio;
+        let lamports_per_byte_year = (DEFAULT_LAMPORTS_PER_BYTE_YEAR as f64 / ratio) as u64;
+        Self {
+            lamports_per_byte_year,
+            exemption_threshold,
+            ..Self::default()
+        }
+    }
 }
 
 #[cfg(test)]
diff --git a/sdk/program/src/secp256k1_recover.rs b/sdk/program/src/secp256k1_recover.rs
new file mode 100644
index 00000000000000..4a6433d5dadf73
--- /dev/null
+++ b/sdk/program/src/secp256k1_recover.rs
@@ -0,0 +1,113 @@
+use borsh::{BorshDeserialize, BorshSchema, BorshSerialize};
+use core::convert::TryFrom;
+use thiserror::Error;
+
+#[derive(Debug, Clone, PartialEq, Eq, Error)]
+pub enum Secp256k1RecoverError {
+    #[error("The hash provided to a secp256k1_recover is invalid")]
+    InvalidHash,
+    #[error("The recovery_id provided to a secp256k1_recover is invalid")]
+    InvalidRecoveryId,
+    #[error("The signature provided to a secp256k1_recover is invalid")]
+    InvalidSignature,
+}
+
+impl From<u64> for Secp256k1RecoverError {
+    fn from(v: u64) -> Secp256k1RecoverError {
+        match v {
+            1 => Secp256k1RecoverError::InvalidHash,
+            2 => Secp256k1RecoverError::InvalidRecoveryId,
+            3 => Secp256k1RecoverError::InvalidSignature,
+            _ => panic!("Unsupported Secp256k1RecoverError"),
+        }
+    }
+}
+
+impl From<Secp256k1RecoverError> for u64 {
+    fn from(v: Secp256k1RecoverError) -> u64 {
+        match v {
+            Secp256k1RecoverError::InvalidHash => 1,
+            Secp256k1RecoverError::InvalidRecoveryId => 2,
+            Secp256k1RecoverError::InvalidSignature => 3,
+        }
+    }
+}
+
+pub const SECP256K1_SIGNATURE_LENGTH: usize = 64;
+pub const SECP256K1_PUBLIC_KEY_LENGTH: usize = 64;
+
+#[repr(transparent)]
+#[derive(
+    BorshSerialize,
+    BorshDeserialize,
+    BorshSchema,
+    Clone,
+    Copy,
+    Eq,
+    PartialEq,
+    Ord,
+    PartialOrd,
+    Hash,
+    AbiExample,
+)]
+pub struct Secp256k1Pubkey(pub [u8; SECP256K1_PUBLIC_KEY_LENGTH]);
+
+impl Secp256k1Pubkey {
+    pub fn new(pubkey_vec: &[u8]) -> Self {
+        Self(
+            <[u8; SECP256K1_PUBLIC_KEY_LENGTH]>::try_from(<&[u8]>::clone(&pubkey_vec))
+                .expect("Slice must be the same length as a Pubkey"),
+        )
+    }
+
+    pub fn to_bytes(self) -> [u8; 64] {
+        self.0
+    }
+}
+
+pub fn secp256k1_recover(
+    hash: &[u8],
+    recovery_id: u8,
+    signature: &[u8],
+) -> Result<Secp256k1Pubkey, Secp256k1RecoverError> {
+    #[cfg(target_arch = "bpf")]
+    {
+        extern "C" {
+            fn sol_secp256k1_recover(
+                hash: *const u8,
+                recovery_id: u64,
+                signature: *const u8,
+                result: *mut u8,
+            ) -> u64;
+        }
+
+        let mut pubkey_buffer = [0u8; SECP256K1_PUBLIC_KEY_LENGTH];
+        let result = unsafe {
+            sol_secp256k1_recover(
+                hash.as_ptr(),
+                recovery_id as u64,
+                signature.as_ptr(),
+                pubkey_buffer.as_mut_ptr(),
+            )
+        };
+
+        match result {
+            0 => Ok(Secp256k1Pubkey::new(&pubkey_buffer)),
+            error => Err(Secp256k1RecoverError::from(error)),
+        }
+    }
+
+    #[cfg(not(target_arch = "bpf"))]
+    {
+        let message = libsecp256k1::Message::parse_slice(hash)
+            .map_err(|_| Secp256k1RecoverError::InvalidHash)?;
+        let recovery_id = libsecp256k1::RecoveryId::parse(recovery_id)
+            .map_err(|_| Secp256k1RecoverError::InvalidRecoveryId)?;
+        let signature = libsecp256k1::Signature::parse_standard_slice(signature)
+            .map_err(|_| Secp256k1RecoverError::InvalidSignature)?;
+
+        let secp256k1_key = libsecp256k1::recover(&message, &signature, &recovery_id)
+            .map_err(|_| Secp256k1RecoverError::InvalidSignature)?;
+        Ok(Secp256k1Pubkey::new(&secp256k1_key.serialize()[1..65]))
+    }
+}
diff --git a/sdk/program/src/slot_hashes.rs b/sdk/program/src/slot_hashes.rs
index ff1f0b2e1ea7fb..8016505a0a0792 100644
--- a/sdk/program/src/slot_hashes.rs
+++ b/sdk/program/src/slot_hashes.rs
@@ -17,7 +17,7 @@ pub struct SlotHashes(Vec<SlotHash>);
 
 impl SlotHashes {
     pub fn add(&mut self, slot: Slot, hash: Hash) {
-        match self.binary_search_by(|(probe, _)| slot.cmp(&probe)) {
+        match self.binary_search_by(|(probe, _)| slot.cmp(probe)) {
             Ok(index) => (self.0)[index] = (slot, hash),
             Err(index) => (self.0).insert(index, (slot, hash)),
         }
@@ -25,7 +25,7 @@ impl SlotHashes {
     }
     #[allow(clippy::trivially_copy_pass_by_ref)]
     pub fn get(&self, slot: &Slot) -> Option<&Hash> {
-        self.binary_search_by(|(probe, _)| slot.cmp(&probe))
+        self.binary_search_by(|(probe, _)| slot.cmp(probe))
             .ok()
             .map(|index| &self[index].1)
     }
diff --git a/sdk/program/src/stake/config.rs b/sdk/program/src/stake/config.rs
new file mode 100644
index 00000000000000..9470b2940a27fc
--- /dev/null
+++ b/sdk/program/src/stake/config.rs
@@ -0,0 +1,28 @@
+//! config for staking
+//!  carries variables that the stake program cares about
+use serde_derive::{Deserialize, Serialize};
+
+// stake config ID
+crate::declare_id!("StakeConfig11111111111111111111111111111111");
+
+// means that no more than RATE of current effective stake may be added or subtracted per
+//  epoch
+pub const DEFAULT_WARMUP_COOLDOWN_RATE: f64 = 0.25;
+pub const DEFAULT_SLASH_PENALTY: u8 = ((5 * std::u8::MAX as usize) / 100) as u8;
+
+#[derive(Serialize, Deserialize, Debug, PartialEq, Clone, Copy)]
+pub struct Config {
+    /// how much stake we can activate/deactivate per-epoch as a fraction of currently effective stake
+    pub warmup_cooldown_rate: f64,
+    /// percentage of stake lost when slash, expressed as a portion of std::u8::MAX
+    pub slash_penalty: u8,
+}
+
+impl Default for Config {
+    fn default() -> Self {
+        Self {
+            warmup_cooldown_rate: DEFAULT_WARMUP_COOLDOWN_RATE,
+            slash_penalty: DEFAULT_SLASH_PENALTY,
+        }
+    }
+}
diff --git a/sdk/program/src/stake/instruction.rs b/sdk/program/src/stake/instruction.rs
new file mode 100644
index 00000000000000..6fadfd7a0456f8
--- /dev/null
+++ b/sdk/program/src/stake/instruction.rs
@@ -0,0 +1,711 @@
+use {
+    crate::stake::{
+        config,
+        program::id,
+        state::{Authorized, Lockup, StakeAuthorize, StakeState},
+    },
+    crate::{
+        clock::{Epoch, UnixTimestamp},
+        decode_error::DecodeError,
+        instruction::{AccountMeta, Instruction},
+        pubkey::Pubkey,
+        system_instruction, sysvar,
+    },
+    log::*,
+    num_derive::{FromPrimitive, ToPrimitive},
+    serde_derive::{Deserialize, Serialize},
+    thiserror::Error,
+};
+
+/// Reasons the stake might have had an error
+#[derive(Error, Debug, Clone, PartialEq, FromPrimitive, ToPrimitive)]
+pub enum StakeError {
+    #[error("not enough credits to redeem")]
+    NoCreditsToRedeem,
+
+    #[error("lockup has not yet expired")]
+    LockupInForce,
+
+    #[error("stake already deactivated")]
+    AlreadyDeactivated,
+
+    #[error("one re-delegation permitted per epoch")]
+    TooSoonToRedelegate,
+
+    #[error("split amount is more than is staked")]
+    InsufficientStake,
+
+    #[error("stake account with transient stake cannot be merged")]
+    MergeTransientStake,
+
+    #[error("stake account merge failed due to different authority, lockups or state")]
+    MergeMismatch,
+
+    #[error("custodian address not present")]
+    CustodianMissing,
+
+    #[error("custodian signature not present")]
+    CustodianSignatureMissing,
+}
+
+impl<E> DecodeError<E> for StakeError {
+    fn type_of() -> &'static str {
+        "StakeError"
+    }
+}
+
+#[derive(Serialize, Deserialize, Debug, PartialEq, Clone)]
+pub enum StakeInstruction {
+    /// Initialize a stake with lockup and authorization information
+    ///
+    /// # Account references
+    ///   0. [WRITE] Uninitialized stake account
+    ///   1. [] Rent sysvar
+    ///
+    /// Authorized carries pubkeys that must sign staker transactions
+    ///   and withdrawer transactions.
+    /// Lockup carries information about withdrawal restrictions
+    Initialize(Authorized, Lockup),
+
+    /// Authorize a key to manage stake or withdrawal
+    ///
+    /// # Account references
+    ///   0. [WRITE] Stake account to be updated
+    ///   1. [] Clock sysvar
+    ///   2. [SIGNER] The stake or withdraw authority
+    ///   3. Optional: [SIGNER] Lockup authority, if updating StakeAuthorize::Withdrawer before
+    ///      lockup expiration
+    Authorize(Pubkey, StakeAuthorize),
+
+    /// Delegate a stake to a particular vote account
+    ///
+    /// # Account references
+    ///   0. [WRITE] Initialized stake account to be delegated
+    ///   1. [] Vote account to which this stake will be delegated
+    ///   2. [] Clock sysvar
+    ///   3. [] Stake history sysvar that carries stake warmup/cooldown history
+    ///   4. [] Address of config account that carries stake config
+    ///   5. [SIGNER] Stake authority
+    ///
+    /// The entire balance of the staking account is staked.  DelegateStake
+    ///   can be called multiple times, but re-delegation is delayed
+    ///   by one epoch
+    DelegateStake,
+
+    /// Split u64 tokens and stake off a stake account into another stake account.
+    ///
+    /// # Account references
+    ///   0. [WRITE] Stake account to be split; must be in the Initialized or Stake state
+    ///   1. [WRITE] Uninitialized stake account that will take the split-off amount
+    ///   2. [SIGNER] Stake authority
+    Split(u64),
+
+    /// Withdraw unstaked lamports from the stake account
+    ///
+    /// # Account references
+    ///   0. [WRITE] Stake account from which to withdraw
+    ///   1. [WRITE] Recipient account
+    ///   2. [] Clock sysvar
+    ///   3. [] Stake history sysvar that carries stake warmup/cooldown history
+    ///   4. [SIGNER] Withdraw authority
+    ///   5. Optional: [SIGNER] Lockup authority, if before lockup expiration
+    ///
+    /// The u64 is the portion of the stake account balance to be withdrawn,
+    ///    must be `<= StakeAccount.lamports - staked_lamports`.
+    Withdraw(u64),
+
+    /// Deactivates the stake in the account
+    ///
+    /// # Account references
+    ///   0. [WRITE] Delegated stake account
+    ///   1. [] Clock sysvar
+    ///   2. [SIGNER] Stake authority
+    Deactivate,
+
+    /// Set stake lockup
+    ///
+    /// If a lockup is not active, the withdraw authority may set a new lockup
+    /// If a lockup is active, the lockup custodian may update the lockup parameters
+    ///
+    /// # Account references
+    ///   0. [WRITE] Initialized stake account
+    ///   1. [SIGNER] Lockup authority or withdraw authority
+    SetLockup(LockupArgs),
+
+    /// Merge two stake accounts.
+    ///
+    /// Both accounts must have identical lockup and authority keys. A merge
+    /// is possible between two stakes in the following states with no additional
+    /// conditions:
+    ///
+    /// * two deactivated stakes
+    /// * an inactive stake into an activating stake during its activation epoch
+    ///
+    /// For the following cases, the voter pubkey and vote credits observed must match:
+    ///
+    /// * two activated stakes
+    /// * two activating accounts that share an activation epoch, during the activation epoch
+    ///
+    /// All other combinations of stake states will fail to merge, including all
+    /// "transient" states, where a stake is activating or deactivating with a
+    /// non-zero effective stake.
+    ///
+    /// # Account references
+    ///   0. [WRITE] Destination stake account for the merge
+    ///   1. [WRITE] Source stake account for to merge.  This account will be drained
+    ///   2. [] Clock sysvar
+    ///   3. [] Stake history sysvar that carries stake warmup/cooldown history
+    ///   4. [SIGNER] Stake authority
+    Merge,
+
+    /// Authorize a key to manage stake or withdrawal with a derived key
+    ///
+    /// # Account references
+    ///   0. [WRITE] Stake account to be updated
+    ///   1. [SIGNER] Base key of stake or withdraw authority
+    ///   2. [] Clock sysvar
+    ///   3. Optional: [SIGNER] Lockup authority, if updating StakeAuthorize::Withdrawer before
+    ///      lockup expiration
+    AuthorizeWithSeed(AuthorizeWithSeedArgs),
+
+    /// Initialize a stake with authorization information
+    ///
+    /// This instruction is similar to `Initialize` except that the withdraw authority
+    /// must be a signer, and no lockup is applied to the account.
+    ///
+    /// # Account references
+    ///   0. [WRITE] Uninitialized stake account
+    ///   1. [] Rent sysvar
+    ///   2. [] The stake authority
+    ///   3. [SIGNER] The withdraw authority
+    ///
+    InitializeChecked,
+
+    /// Authorize a key to manage stake or withdrawal
+    ///
+    /// This instruction behaves like `Authorize` with the additional requirement that the new
+    /// stake or withdraw authority must also be a signer.
+    ///
+    /// # Account references
+    ///   0. [WRITE] Stake account to be updated
+    ///   1. [] Clock sysvar
+    ///   2. [SIGNER] The stake or withdraw authority
+    ///   3. [SIGNER] The new stake or withdraw authority
+    ///   4. Optional: [SIGNER] Lockup authority, if updating StakeAuthorize::Withdrawer before
+    ///      lockup expiration
+    AuthorizeChecked(StakeAuthorize),
+
+    /// Authorize a key to manage stake or withdrawal with a derived key
+    ///
+    /// This instruction behaves like `AuthorizeWithSeed` with the additional requirement that
+    /// the new stake or withdraw authority must also be a signer.
+    ///
+    /// # Account references
+    ///   0. [WRITE] Stake account to be updated
+    ///   1. [SIGNER] Base key of stake or withdraw authority
+    ///   2. [] Clock sysvar
+    ///   3. [SIGNER] The new stake or withdraw authority
+    ///   4. Optional: [SIGNER] Lockup authority, if updating StakeAuthorize::Withdrawer before
+    ///      lockup expiration
+    AuthorizeCheckedWithSeed(AuthorizeCheckedWithSeedArgs),
+
+    /// Set stake lockup
+    ///
+    /// This instruction behaves like `SetLockup` with the additional requirement that
+    /// the new lockup authority also be a signer.
+    ///
+    /// If a lockup is not active, the withdraw authority may set a new lockup
+    /// If a lockup is active, the lockup custodian may update the lockup parameters
+    ///
+    /// # Account references
+    ///   0. [WRITE] Initialized stake account
+    ///   1. [SIGNER] Lockup authority or withdraw authority
+    ///   2. Optional: [SIGNER] New lockup authority
+    SetLockupChecked(LockupCheckedArgs),
+}
+
+#[derive(Default, Debug, Serialize, Deserialize, PartialEq, Clone, Copy)]
+pub struct LockupArgs {
+    pub unix_timestamp: Option<UnixTimestamp>,
+    pub epoch: Option<Epoch>,
+    pub custodian: Option<Pubkey>,
+}
+
+#[derive(Default, Debug, Serialize, Deserialize, PartialEq, Clone, Copy)]
+pub struct LockupCheckedArgs {
+    pub unix_timestamp: Option<UnixTimestamp>,
+    pub epoch: Option<Epoch>,
+}
+
+#[derive(Debug, Serialize, Deserialize, PartialEq, Clone)]
+pub struct AuthorizeWithSeedArgs {
+    pub new_authorized_pubkey: Pubkey,
+    pub stake_authorize: StakeAuthorize,
+    pub authority_seed: String,
+    pub authority_owner: Pubkey,
+}
+
+#[derive(Debug, Serialize, Deserialize, PartialEq, Clone)]
+pub struct AuthorizeCheckedWithSeedArgs {
+    pub stake_authorize: StakeAuthorize,
+    pub authority_seed: String,
+    pub authority_owner: Pubkey,
+}
+
+pub fn initialize(stake_pubkey: &Pubkey, authorized: &Authorized, lockup: &Lockup) -> Instruction {
+    Instruction::new_with_bincode(
+        id(),
+        &StakeInstruction::Initialize(*authorized, *lockup),
+        vec![
+            AccountMeta::new(*stake_pubkey, false),
+            AccountMeta::new_readonly(sysvar::rent::id(), false),
+        ],
+    )
+}
+
+pub fn initialize_checked(stake_pubkey: &Pubkey, authorized: &Authorized) -> Instruction {
+    Instruction::new_with_bincode(
+        id(),
+        &StakeInstruction::InitializeChecked,
+        vec![
+            AccountMeta::new(*stake_pubkey, false),
+            AccountMeta::new_readonly(sysvar::rent::id(), false),
+            AccountMeta::new_readonly(authorized.staker, false),
+            AccountMeta::new_readonly(authorized.withdrawer, true),
+        ],
+    )
+}
+
+pub fn create_account_with_seed(
+    from_pubkey: &Pubkey,
+    stake_pubkey: &Pubkey,
+    base: &Pubkey,
+    seed: &str,
+    authorized: &Authorized,
+    lockup: &Lockup,
+    lamports: u64,
+) -> Vec<Instruction> {
+    vec![
+        system_instruction::create_account_with_seed(
+            from_pubkey,
+            stake_pubkey,
+            base,
+            seed,
+            lamports,
+            std::mem::size_of::<StakeState>() as u64,
+            &id(),
+        ),
+        initialize(stake_pubkey, authorized, lockup),
+    ]
+}
+
+pub fn create_account(
+    from_pubkey: &Pubkey,
+    stake_pubkey: &Pubkey,
+    authorized: &Authorized,
+    lockup: &Lockup,
+    lamports: u64,
+) -> Vec<Instruction> {
+    vec![
+        system_instruction::create_account(
+            from_pubkey,
+            stake_pubkey,
+            lamports,
+            std::mem::size_of::<StakeState>() as u64,
+            &id(),
+        ),
+        initialize(stake_pubkey, authorized, lockup),
+    ]
+}
+
+pub fn create_account_with_seed_checked(
+    from_pubkey: &Pubkey,
+    stake_pubkey: &Pubkey,
+    base: &Pubkey,
+    seed: &str,
+    authorized: &Authorized,
+    lamports: u64,
+) -> Vec<Instruction> {
+    vec![
+        system_instruction::create_account_with_seed(
+            from_pubkey,
+            stake_pubkey,
+            base,
+            seed,
+            lamports,
+            std::mem::size_of::<StakeState>() as u64,
+            &id(),
+        ),
+        initialize_checked(stake_pubkey, authorized),
+    ]
+}
+
+pub fn create_account_checked(
+    from_pubkey: &Pubkey,
+    stake_pubkey: &Pubkey,
+    authorized: &Authorized,
+    lamports: u64,
+) -> Vec<Instruction> {
+    vec![
+        system_instruction::create_account(
+            from_pubkey,
+            stake_pubkey,
+            lamports,
+            std::mem::size_of::<StakeState>() as u64,
+            &id(),
+        ),
+        initialize_checked(stake_pubkey, authorized),
+    ]
+}
+
+fn _split(
+    stake_pubkey: &Pubkey,
+    authorized_pubkey: &Pubkey,
+    lamports: u64,
+    split_stake_pubkey: &Pubkey,
+) -> Instruction {
+    let account_metas = vec![
+        AccountMeta::new(*stake_pubkey, false),
+        AccountMeta::new(*split_stake_pubkey, false),
+        AccountMeta::new_readonly(*authorized_pubkey, true),
+    ];
+
+    Instruction::new_with_bincode(id(), &StakeInstruction::Split(lamports), account_metas)
+}
+
+pub fn split(
+    stake_pubkey: &Pubkey,
+    authorized_pubkey: &Pubkey,
+    lamports: u64,
+    split_stake_pubkey: &Pubkey,
+) -> Vec<Instruction> {
+    vec![
+        system_instruction::allocate(split_stake_pubkey, std::mem::size_of::<StakeState>() as u64),
+        system_instruction::assign(split_stake_pubkey, &id()),
+        _split(
+            stake_pubkey,
+            authorized_pubkey,
+            lamports,
+            split_stake_pubkey,
+        ),
+    ]
+}
+
+pub fn split_with_seed(
+    stake_pubkey: &Pubkey,
+    authorized_pubkey: &Pubkey,
+    lamports: u64,
+    split_stake_pubkey: &Pubkey, // derived using create_with_seed()
+    base: &Pubkey,               // base
+    seed: &str,                  // seed
+) -> Vec<Instruction> {
+    vec![
+        system_instruction::allocate_with_seed(
+            split_stake_pubkey,
+            base,
+            seed,
+            std::mem::size_of::<StakeState>() as u64,
+            &id(),
+        ),
+        _split(
+            stake_pubkey,
+            authorized_pubkey,
+            lamports,
+            split_stake_pubkey,
+        ),
+    ]
+}
+
+pub fn merge(
+    destination_stake_pubkey: &Pubkey,
+    source_stake_pubkey: &Pubkey,
+    authorized_pubkey: &Pubkey,
+) -> Vec<Instruction> {
+    let account_metas = vec![
+        AccountMeta::new(*destination_stake_pubkey, false),
+        AccountMeta::new(*source_stake_pubkey, false),
+        AccountMeta::new_readonly(sysvar::clock::id(), false),
+        AccountMeta::new_readonly(sysvar::stake_history::id(), false),
+        AccountMeta::new_readonly(*authorized_pubkey, true),
+    ];
+
+    vec![Instruction::new_with_bincode(
+        id(),
+        &StakeInstruction::Merge,
+        account_metas,
+    )]
+}
+
+pub fn create_account_and_delegate_stake(
+    from_pubkey: &Pubkey,
+    stake_pubkey: &Pubkey,
+    vote_pubkey: &Pubkey,
+    authorized: &Authorized,
+    lockup: &Lockup,
+    lamports: u64,
+) -> Vec<Instruction> {
+    let mut instructions = create_account(from_pubkey, stake_pubkey, authorized, lockup, lamports);
+    instructions.push(delegate_stake(
+        stake_pubkey,
+        &authorized.staker,
+        vote_pubkey,
+    ));
+    instructions
+}
+
+pub fn create_account_with_seed_and_delegate_stake(
+    from_pubkey: &Pubkey,
+    stake_pubkey: &Pubkey,
+    base: &Pubkey,
+    seed: &str,
+    vote_pubkey: &Pubkey,
+    authorized: &Authorized,
+    lockup: &Lockup,
+    lamports: u64,
+) -> Vec<Instruction> {
+    let mut instructions = create_account_with_seed(
+        from_pubkey,
+        stake_pubkey,
+        base,
+        seed,
+        authorized,
+        lockup,
+        lamports,
+    );
+    instructions.push(delegate_stake(
+        stake_pubkey,
+        &authorized.staker,
+        vote_pubkey,
+    ));
+    instructions
+}
+
+pub fn authorize(
+    stake_pubkey: &Pubkey,
+    authorized_pubkey: &Pubkey,
+    new_authorized_pubkey: &Pubkey,
+    stake_authorize: StakeAuthorize,
+    custodian_pubkey: Option<&Pubkey>,
+) -> Instruction {
+    let mut account_metas = vec![
+        AccountMeta::new(*stake_pubkey, false),
+        AccountMeta::new_readonly(sysvar::clock::id(), false),
+        AccountMeta::new_readonly(*authorized_pubkey, true),
+    ];
+
+    if let Some(custodian_pubkey) = custodian_pubkey {
+        account_metas.push(AccountMeta::new_readonly(*custodian_pubkey, true));
+    }
+
+    Instruction::new_with_bincode(
+        id(),
+        &StakeInstruction::Authorize(*new_authorized_pubkey, stake_authorize),
+        account_metas,
+    )
+}
+
+pub fn authorize_checked(
+    stake_pubkey: &Pubkey,
+    authorized_pubkey: &Pubkey,
+    new_authorized_pubkey: &Pubkey,
+    stake_authorize: StakeAuthorize,
+    custodian_pubkey: Option<&Pubkey>,
+) -> Instruction {
+    let mut account_metas = vec![
+        AccountMeta::new(*stake_pubkey, false),
+        AccountMeta::new_readonly(sysvar::clock::id(), false),
+        AccountMeta::new_readonly(*authorized_pubkey, true),
+        AccountMeta::new_readonly(*new_authorized_pubkey, true),
+    ];
+
+    if let Some(custodian_pubkey) = custodian_pubkey {
+        account_metas.push(AccountMeta::new_readonly(*custodian_pubkey, true));
+    }
+
+    Instruction::new_with_bincode(
+        id(),
+        &StakeInstruction::AuthorizeChecked(stake_authorize),
+        account_metas,
+    )
+}
+
+pub fn authorize_with_seed(
+    stake_pubkey: &Pubkey,
+    authority_base: &Pubkey,
+    authority_seed: String,
+    authority_owner: &Pubkey,
+    new_authorized_pubkey: &Pubkey,
+    stake_authorize: StakeAuthorize,
+    custodian_pubkey: Option<&Pubkey>,
+) -> Instruction {
+    let mut account_metas = vec![
+        AccountMeta::new(*stake_pubkey, false),
+        AccountMeta::new_readonly(*authority_base, true),
+        AccountMeta::new_readonly(sysvar::clock::id(), false),
+    ];
+
+    if let Some(custodian_pubkey) = custodian_pubkey {
+        account_metas.push(AccountMeta::new_readonly(*custodian_pubkey, true));
+    }
+
+    let args = AuthorizeWithSeedArgs {
+        new_authorized_pubkey: *new_authorized_pubkey,
+        stake_authorize,
+        authority_seed,
+        authority_owner: *authority_owner,
+    };
+
+    Instruction::new_with_bincode(
+        id(),
+        &StakeInstruction::AuthorizeWithSeed(args),
+        account_metas,
+    )
+}
+
+pub fn authorize_checked_with_seed(
+    stake_pubkey: &Pubkey,
+    authority_base: &Pubkey,
+    authority_seed: String,
+    authority_owner: &Pubkey,
+    new_authorized_pubkey: &Pubkey,
+    stake_authorize: StakeAuthorize,
+    custodian_pubkey: Option<&Pubkey>,
+) -> Instruction {
+    let mut account_metas = vec![
+        AccountMeta::new(*stake_pubkey, false),
+        AccountMeta::new_readonly(*authority_base, true),
+        AccountMeta::new_readonly(sysvar::clock::id(), false),
+        AccountMeta::new_readonly(*new_authorized_pubkey, true),
+    ];
+
+    if let Some(custodian_pubkey) = custodian_pubkey {
+        account_metas.push(AccountMeta::new_readonly(*custodian_pubkey, true));
+    }
+
+    let args = AuthorizeCheckedWithSeedArgs {
+        stake_authorize,
+        authority_seed,
+        authority_owner: *authority_owner,
+    };
+
+    Instruction::new_with_bincode(
+        id(),
+        &StakeInstruction::AuthorizeCheckedWithSeed(args),
+        account_metas,
+    )
+}
+
+pub fn delegate_stake(
+    stake_pubkey: &Pubkey,
+    authorized_pubkey: &Pubkey,
+    vote_pubkey: &Pubkey,
+) -> Instruction {
+    let account_metas = vec![
+        AccountMeta::new(*stake_pubkey, false),
+        AccountMeta::new_readonly(*vote_pubkey, false),
+        AccountMeta::new_readonly(sysvar::clock::id(), false),
+        AccountMeta::new_readonly(sysvar::stake_history::id(), false),
+        AccountMeta::new_readonly(config::id(), false),
+        AccountMeta::new_readonly(*authorized_pubkey, true),
+    ];
+    Instruction::new_with_bincode(id(), &StakeInstruction::DelegateStake, account_metas)
+}
+
+pub fn withdraw(
+    stake_pubkey: &Pubkey,
+    withdrawer_pubkey: &Pubkey,
+    to_pubkey: &Pubkey,
+    lamports: u64,
+    custodian_pubkey: Option<&Pubkey>,
+) -> Instruction {
+    let mut account_metas = vec![
+        AccountMeta::new(*stake_pubkey, false),
+        AccountMeta::new(*to_pubkey, false),
+        AccountMeta::new_readonly(sysvar::clock::id(), false),
+        AccountMeta::new_readonly(sysvar::stake_history::id(), false),
+        AccountMeta::new_readonly(*withdrawer_pubkey, true),
+    ];
+
+    if let Some(custodian_pubkey) = custodian_pubkey {
+        account_metas.push(AccountMeta::new_readonly(*custodian_pubkey, true));
+    }
+
+    Instruction::new_with_bincode(id(), &StakeInstruction::Withdraw(lamports), account_metas)
+}
+
+pub fn deactivate_stake(stake_pubkey: &Pubkey, authorized_pubkey: &Pubkey) -> Instruction {
+    let account_metas = vec![
+        AccountMeta::new(*stake_pubkey, false),
+        AccountMeta::new_readonly(sysvar::clock::id(), false),
+        AccountMeta::new_readonly(*authorized_pubkey, true),
+    ];
+    Instruction::new_with_bincode(id(), &StakeInstruction::Deactivate, account_metas)
+}
+
+pub fn set_lockup(
+    stake_pubkey: &Pubkey,
+    lockup: &LockupArgs,
+    custodian_pubkey: &Pubkey,
+) -> Instruction {
+    let account_metas = vec![
+        AccountMeta::new(*stake_pubkey, false),
+        AccountMeta::new_readonly(*custodian_pubkey, true),
+    ];
+    Instruction::new_with_bincode(id(), &StakeInstruction::SetLockup(*lockup), account_metas)
+}
+
+pub fn set_lockup_checked(
+    stake_pubkey: &Pubkey,
+    lockup: &LockupArgs,
+    custodian_pubkey: &Pubkey,
+) -> Instruction {
+    let mut account_metas = vec![
+        AccountMeta::new(*stake_pubkey, false),
+        AccountMeta::new_readonly(*custodian_pubkey, true),
+    ];
+
+    let lockup_checked = LockupCheckedArgs {
+        unix_timestamp: lockup.unix_timestamp,
+        epoch: lockup.epoch,
+    };
+    if let Some(new_custodian) = lockup.custodian {
+        account_metas.push(AccountMeta::new_readonly(new_custodian, true));
+    }
+    Instruction::new_with_bincode(
+        id(),
+        &StakeInstruction::SetLockupChecked(lockup_checked),
+        account_metas,
+    )
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::instruction::InstructionError;
+
+    #[test]
+    fn test_custom_error_decode() {
+        use num_traits::FromPrimitive;
+        fn pretty_err<T>(err: InstructionError) -> String
+        where
+            T: 'static + std::error::Error + DecodeError<T> + FromPrimitive,
+        {
+            if let InstructionError::Custom(code) = err {
+                let specific_error: T = T::decode_custom_error_to_enum(code).unwrap();
+                format!(
+                    "{:?}: {}::{:?} - {}",
+                    err,
+                    T::type_of(),
+                    specific_error,
+                    specific_error,
+                )
+            } else {
+                "".to_string()
+            }
+        }
+        assert_eq!(
+            "Custom(0): StakeError::NoCreditsToRedeem - not enough credits to redeem",
+            pretty_err::<StakeError>(StakeError::NoCreditsToRedeem.into())
+        )
+    }
+}
diff --git a/sdk/program/src/stake/mod.rs b/sdk/program/src/stake/mod.rs
new file mode 100644
index 00000000000000..bb43a067f6387d
--- /dev/null
+++ b/sdk/program/src/stake/mod.rs
@@ -0,0 +1,7 @@
+pub mod config;
+pub mod instruction;
+pub mod state;
+
+pub mod program {
+    crate::declare_id!("Stake11111111111111111111111111111111111111");
+}
diff --git a/sdk/program/src/stake/state.rs b/sdk/program/src/stake/state.rs
new file mode 100644
index 00000000000000..399b50c4a25ab4
--- /dev/null
+++ b/sdk/program/src/stake/state.rs
@@ -0,0 +1,498 @@
+#![allow(clippy::integer_arithmetic)]
+use {
+    crate::{
+        clock::{Clock, Epoch, UnixTimestamp},
+        instruction::InstructionError,
+        pubkey::Pubkey,
+        rent::Rent,
+        stake::{
+            config::Config,
+            instruction::{LockupArgs, StakeError},
+        },
+        stake_history::StakeHistory,
+    },
+    std::collections::HashSet,
+};
+
+#[derive(Debug, Serialize, Deserialize, PartialEq, Clone, Copy, AbiExample)]
+#[allow(clippy::large_enum_variant)]
+pub enum StakeState {
+    Uninitialized,
+    Initialized(Meta),
+    Stake(Meta, Stake),
+    RewardsPool,
+}
+
+impl Default for StakeState {
+    fn default() -> Self {
+        StakeState::Uninitialized
+    }
+}
+
+impl StakeState {
+    pub fn get_rent_exempt_reserve(rent: &Rent) -> u64 {
+        rent.minimum_balance(std::mem::size_of::<StakeState>())
+    }
+
+    pub fn stake(&self) -> Option<Stake> {
+        match self {
+            StakeState::Stake(_meta, stake) => Some(*stake),
+            _ => None,
+        }
+    }
+
+    pub fn delegation(&self) -> Option<Delegation> {
+        match self {
+            StakeState::Stake(_meta, stake) => Some(stake.delegation),
+            _ => None,
+        }
+    }
+
+    pub fn authorized(&self) -> Option<Authorized> {
+        match self {
+            StakeState::Stake(meta, _stake) => Some(meta.authorized),
+            StakeState::Initialized(meta) => Some(meta.authorized),
+            _ => None,
+        }
+    }
+
+    pub fn lockup(&self) -> Option<Lockup> {
+        self.meta().map(|meta| meta.lockup)
+    }
+
+    pub fn meta(&self) -> Option<Meta> {
+        match self {
+            StakeState::Stake(meta, _stake) => Some(*meta),
+            StakeState::Initialized(meta) => Some(*meta),
+            _ => None,
+        }
+    }
+}
+
+#[derive(Debug, Serialize, Deserialize, PartialEq, Clone, Copy, AbiExample)]
+pub enum StakeAuthorize {
+    Staker,
+    Withdrawer,
+}
+
+#[derive(Default, Debug, Serialize, Deserialize, PartialEq, Clone, Copy, AbiExample)]
+pub struct Lockup {
+    /// UnixTimestamp at which this stake will allow withdrawal, unless the
+    ///   transaction is signed by the custodian
+    pub unix_timestamp: UnixTimestamp,
+    /// epoch height at which this stake will allow withdrawal, unless the
+    ///   transaction is signed by the custodian
+    pub epoch: Epoch,
+    /// custodian signature on a transaction exempts the operation from
+    ///  lockup constraints
+    pub custodian: Pubkey,
+}
+
+impl Lockup {
+    pub fn is_in_force(&self, clock: &Clock, custodian: Option<&Pubkey>) -> bool {
+        if custodian == Some(&self.custodian) {
+            return false;
+        }
+        self.unix_timestamp > clock.unix_timestamp || self.epoch > clock.epoch
+    }
+}
+
+#[derive(Default, Debug, Serialize, Deserialize, PartialEq, Clone, Copy, AbiExample)]
+pub struct Authorized {
+    pub staker: Pubkey,
+    pub withdrawer: Pubkey,
+}
+
+impl Authorized {
+    pub fn auto(authorized: &Pubkey) -> Self {
+        Self {
+            staker: *authorized,
+            withdrawer: *authorized,
+        }
+    }
+    pub fn check(
+        &self,
+        signers: &HashSet<Pubkey>,
+        stake_authorize: StakeAuthorize,
+    ) -> Result<(), InstructionError> {
+        match stake_authorize {
+            StakeAuthorize::Staker if signers.contains(&self.staker) => Ok(()),
+            StakeAuthorize::Withdrawer if signers.contains(&self.withdrawer) => Ok(()),
+            _ => Err(InstructionError::MissingRequiredSignature),
+        }
+    }
+
+    pub fn authorize(
+        &mut self,
+        signers: &HashSet<Pubkey>,
+        new_authorized: &Pubkey,
+        stake_authorize: StakeAuthorize,
+        lockup_custodian_args: Option<(&Lockup, &Clock, Option<&Pubkey>)>,
+    ) -> Result<(), InstructionError> {
+        match stake_authorize {
+            StakeAuthorize::Staker => {
+                // Allow either the staker or the withdrawer to change the staker key
+                if !signers.contains(&self.staker) && !signers.contains(&self.withdrawer) {
+                    return Err(InstructionError::MissingRequiredSignature);
+                }
+                self.staker = *new_authorized
+            }
+            StakeAuthorize::Withdrawer => {
+                if let Some((lockup, clock, custodian)) = lockup_custodian_args {
+                    if lockup.is_in_force(clock, None) {
+                        match custodian {
+                            None => {
+                                return Err(StakeError::CustodianMissing.into());
+                            }
+                            Some(custodian) => {
+                                if !signers.contains(custodian) {
+                                    return Err(StakeError::CustodianSignatureMissing.into());
+                                }
+
+                                if lockup.is_in_force(clock, Some(custodian)) {
+                                    return Err(StakeError::LockupInForce.into());
+                                }
+                            }
+                        }
+                    }
+                }
+                self.check(signers, stake_authorize)?;
+                self.withdrawer = *new_authorized
+            }
+        }
+        Ok(())
+    }
+}
+
+#[derive(Default, Debug, Serialize, Deserialize, PartialEq, Clone, Copy, AbiExample)]
+pub struct Meta {
+    pub rent_exempt_reserve: u64,
+    pub authorized: Authorized,
+    pub lockup: Lockup,
+}
+
+impl Meta {
+    pub fn set_lockup(
+        &mut self,
+        lockup: &LockupArgs,
+        signers: &HashSet<Pubkey>,
+        clock: Option<&Clock>,
+    ) -> Result<(), InstructionError> {
+        match clock {
+            None => {
+                // pre-stake_program_v4 behavior: custodian can set lockups at any time
+                if !signers.contains(&self.lockup.custodian) {
+                    return Err(InstructionError::MissingRequiredSignature);
+                }
+            }
+            Some(clock) => {
+                // post-stake_program_v4 behavior:
+                // * custodian can update the lockup while in force
+                // * withdraw authority can set a new lockup
+                //
+                if self.lockup.is_in_force(clock, None) {
+                    if !signers.contains(&self.lockup.custodian) {
+                        return Err(InstructionError::MissingRequiredSignature);
+                    }
+                } else if !signers.contains(&self.authorized.withdrawer) {
+                    return Err(InstructionError::MissingRequiredSignature);
+                }
+            }
+        }
+        if let Some(unix_timestamp) = lockup.unix_timestamp {
+            self.lockup.unix_timestamp = unix_timestamp;
+        }
+        if let Some(epoch) = lockup.epoch {
+            self.lockup.epoch = epoch;
+        }
+        if let Some(custodian) = lockup.custodian {
+            self.lockup.custodian = custodian;
+        }
+        Ok(())
+    }
+
+    pub fn rewrite_rent_exempt_reserve(
+        &mut self,
+        rent: &Rent,
+        data_len: usize,
+    ) -> Option<(u64, u64)> {
+        let corrected_rent_exempt_reserve = rent.minimum_balance(data_len);
+        if corrected_rent_exempt_reserve != self.rent_exempt_reserve {
+            // We forcibly update rent_excempt_reserve even
+            // if rent_exempt_reserve > account_balance, hoping user might restore
+            // rent_exempt status by depositing.
+            let (old, new) = (self.rent_exempt_reserve, corrected_rent_exempt_reserve);
+            self.rent_exempt_reserve = corrected_rent_exempt_reserve;
+            Some((old, new))
+        } else {
+            None
+        }
+    }
+
+    pub fn auto(authorized: &Pubkey) -> Self {
+        Self {
+            authorized: Authorized::auto(authorized),
+            ..Meta::default()
+        }
+    }
+}
+
+#[derive(Debug, Serialize, Deserialize, PartialEq, Clone, Copy, AbiExample)]
+pub struct Delegation {
+    /// to whom the stake is delegated
+    pub voter_pubkey: Pubkey,
+    /// activated stake amount, set at delegate() time
+    pub stake: u64,
+    /// epoch at which this stake was activated, std::Epoch::MAX if is a bootstrap stake
+    pub activation_epoch: Epoch,
+    /// epoch the stake was deactivated, std::Epoch::MAX if not deactivated
+    pub deactivation_epoch: Epoch,
+    /// how much stake we can activate per-epoch as a fraction of currently effective stake
+    pub warmup_cooldown_rate: f64,
+}
+
+impl Default for Delegation {
+    fn default() -> Self {
+        Self {
+            voter_pubkey: Pubkey::default(),
+            stake: 0,
+            activation_epoch: 0,
+            deactivation_epoch: std::u64::MAX,
+            warmup_cooldown_rate: Config::default().warmup_cooldown_rate,
+        }
+    }
+}
+
+impl Delegation {
+    pub fn new(
+        voter_pubkey: &Pubkey,
+        stake: u64,
+        activation_epoch: Epoch,
+        warmup_cooldown_rate: f64,
+    ) -> Self {
+        Self {
+            voter_pubkey: *voter_pubkey,
+            stake,
+            activation_epoch,
+            warmup_cooldown_rate,
+            ..Delegation::default()
+        }
+    }
+    pub fn is_bootstrap(&self) -> bool {
+        self.activation_epoch == std::u64::MAX
+    }
+
+    pub fn stake(&self, epoch: Epoch, history: Option<&StakeHistory>) -> u64 {
+        self.stake_activating_and_deactivating(epoch, history).0
+    }
+
+    // returned tuple is (effective, activating, deactivating) stake
+    #[allow(clippy::comparison_chain)]
+    pub fn stake_activating_and_deactivating(
+        &self,
+        target_epoch: Epoch,
+        history: Option<&StakeHistory>,
+    ) -> (u64, u64, u64) {
+        let delegated_stake = self.stake;
+
+        // first, calculate an effective and activating stake
+        let (effective_stake, activating_stake) = self.stake_and_activating(target_epoch, history);
+
+        // then de-activate some portion if necessary
+        if target_epoch < self.deactivation_epoch {
+            // not deactivated
+            (effective_stake, activating_stake, 0)
+        } else if target_epoch == self.deactivation_epoch {
+            // can only deactivate what's activated
+            (effective_stake, 0, effective_stake.min(delegated_stake))
+        } else if let Some((history, mut prev_epoch, mut prev_cluster_stake)) =
+            history.and_then(|history| {
+                history
+                    .get(&self.deactivation_epoch)
+                    .map(|cluster_stake_at_deactivation_epoch| {
+                        (
+                            history,
+                            self.deactivation_epoch,
+                            cluster_stake_at_deactivation_epoch,
+                        )
+                    })
+            })
+        {
+            // target_epoch > self.deactivation_epoch
+
+            // loop from my deactivation epoch until the target epoch
+            // current effective stake is updated using its previous epoch's cluster stake
+            let mut current_epoch;
+            let mut current_effective_stake = effective_stake;
+            loop {
+                current_epoch = prev_epoch + 1;
+                // if there is no deactivating stake at prev epoch, we should have been
+                // fully undelegated at this moment
+                if prev_cluster_stake.deactivating == 0 {
+                    break;
+                }
+
+                // I'm trying to get to zero, how much of the deactivation in stake
+                //   this account is entitled to take
+                let weight =
+                    current_effective_stake as f64 / prev_cluster_stake.deactivating as f64;
+
+                // portion of newly not-effective cluster stake I'm entitled to at current epoch
+                let newly_not_effective_cluster_stake =
+                    prev_cluster_stake.effective as f64 * self.warmup_cooldown_rate;
+                let newly_not_effective_stake =
+                    ((weight * newly_not_effective_cluster_stake) as u64).max(1);
+
+                current_effective_stake =
+                    current_effective_stake.saturating_sub(newly_not_effective_stake);
+                if current_effective_stake == 0 {
+                    break;
+                }
+
+                if current_epoch >= target_epoch {
+                    break;
+                }
+                if let Some(current_cluster_stake) = history.get(&current_epoch) {
+                    prev_epoch = current_epoch;
+                    prev_cluster_stake = current_cluster_stake;
+                } else {
+                    break;
+                }
+            }
+
+            // deactivating stake should equal to all of currently remaining effective stake
+            (current_effective_stake, 0, current_effective_stake)
+        } else {
+            // no history or I've dropped out of history, so assume fully deactivated
+            (0, 0, 0)
+        }
+    }
+
+    // returned tuple is (effective, activating) stake
+    fn stake_and_activating(
+        &self,
+        target_epoch: Epoch,
+        history: Option<&StakeHistory>,
+    ) -> (u64, u64) {
+        let delegated_stake = self.stake;
+
+        if self.is_bootstrap() {
+            // fully effective immediately
+            (delegated_stake, 0)
+        } else if self.activation_epoch == self.deactivation_epoch {
+            // activated but instantly deactivated; no stake at all regardless of target_epoch
+            // this must be after the bootstrap check and before all-is-activating check
+            (0, 0)
+        } else if target_epoch == self.activation_epoch {
+            // all is activating
+            (0, delegated_stake)
+        } else if target_epoch < self.activation_epoch {
+            // not yet enabled
+            (0, 0)
+        } else if let Some((history, mut prev_epoch, mut prev_cluster_stake)) =
+            history.and_then(|history| {
+                history
+                    .get(&self.activation_epoch)
+                    .map(|cluster_stake_at_activation_epoch| {
+                        (
+                            history,
+                            self.activation_epoch,
+                            cluster_stake_at_activation_epoch,
+                        )
+                    })
+            })
+        {
+            // target_epoch > self.activation_epoch
+
+            // loop from my activation epoch until the target epoch summing up my entitlement
+            // current effective stake is updated using its previous epoch's cluster stake
+            let mut current_epoch;
+            let mut current_effective_stake = 0;
+            loop {
+                current_epoch = prev_epoch + 1;
+                // if there is no activating stake at prev epoch, we should have been
+                // fully effective at this moment
+                if prev_cluster_stake.activating == 0 {
+                    break;
+                }
+
+                // how much of the growth in stake this account is
+                //  entitled to take
+                let remaining_activating_stake = delegated_stake - current_effective_stake;
+                let weight =
+                    remaining_activating_stake as f64 / prev_cluster_stake.activating as f64;
+
+                // portion of newly effective cluster stake I'm entitled to at current epoch
+                let newly_effective_cluster_stake =
+                    prev_cluster_stake.effective as f64 * self.warmup_cooldown_rate;
+                let newly_effective_stake =
+                    ((weight * newly_effective_cluster_stake) as u64).max(1);
+
+                current_effective_stake += newly_effective_stake;
+                if current_effective_stake >= delegated_stake {
+                    current_effective_stake = delegated_stake;
+                    break;
+                }
+
+                if current_epoch >= target_epoch || current_epoch >= self.deactivation_epoch {
+                    break;
+                }
+                if let Some(current_cluster_stake) = history.get(&current_epoch) {
+                    prev_epoch = current_epoch;
+                    prev_cluster_stake = current_cluster_stake;
+                } else {
+                    break;
+                }
+            }
+
+            (
+                current_effective_stake,
+                delegated_stake - current_effective_stake,
+            )
+        } else {
+            // no history or I've dropped out of history, so assume fully effective
+            (delegated_stake, 0)
+        }
+    }
+}
+
+#[derive(Debug, Default, Serialize, Deserialize, PartialEq, Clone, Copy, AbiExample)]
+pub struct Stake {
+    pub delegation: Delegation,
+    /// credits observed is credits from vote account state when delegated or redeemed
+    pub credits_observed: u64,
+}
+
+impl Stake {
+    pub fn stake(&self, epoch: Epoch, history: Option<&StakeHistory>) -> u64 {
+        self.delegation.stake(epoch, history)
+    }
+
+    pub fn split(
+        &mut self,
+        remaining_stake_delta: u64,
+        split_stake_amount: u64,
+    ) -> Result<Self, StakeError> {
+        if remaining_stake_delta > self.delegation.stake {
+            return Err(StakeError::InsufficientStake);
+        }
+        self.delegation.stake -= remaining_stake_delta;
+        let new = Self {
+            delegation: Delegation {
+                stake: split_stake_amount,
+                ..self.delegation
+            },
+            ..*self
+        };
+        Ok(new)
+    }
+
+    pub fn deactivate(&mut self, epoch: Epoch) -> Result<(), StakeError> {
+        if self.delegation.deactivation_epoch != std::u64::MAX {
+            Err(StakeError::AlreadyDeactivated)
+        } else {
+            self.delegation.deactivation_epoch = epoch;
+            Ok(())
+        }
+    }
+}
diff --git a/sdk/program/src/system_instruction.rs b/sdk/program/src/system_instruction.rs
index 5294e9edb5a980..01e2ce66b588c1 100644
--- a/sdk/program/src/system_instruction.rs
+++ b/sdk/program/src/system_instruction.rs
@@ -1,6 +1,6 @@
 use crate::{
     decode_error::DecodeError,
-    instruction::{AccountMeta, Instruction},
+    instruction::{AccountMeta, Instruction, InstructionError},
     nonce,
     pubkey::Pubkey,
     system_program,
@@ -23,6 +23,12 @@ pub enum SystemError {
     MaxSeedLengthExceeded,
     #[error("provided address does not match addressed derived from seed")]
     AddressWithSeedMismatch,
+    #[error("advancing stored nonce requires a populated RecentBlockhashes sysvar")]
+    NonceNoRecentBlockhashes,
+    #[error("stored nonce is still in recent_blockhashes")]
+    NonceBlockhashNotExpired,
+    #[error("specified nonce does not match stored nonce")]
+    NonceUnexpectedBlockhashValue,
 }
 
 impl<T> DecodeError<T> for SystemError {
@@ -49,6 +55,83 @@ impl<E> DecodeError<E> for NonceError {
     }
 }
 
+#[derive(Error, Debug, Clone, PartialEq, FromPrimitive, ToPrimitive)]
+enum NonceErrorAdapter {
+    #[error("recent blockhash list is empty")]
+    NoRecentBlockhashes,
+    #[error("stored nonce is still in recent_blockhashes")]
+    NotExpired,
+    #[error("specified nonce does not match stored nonce")]
+    UnexpectedValue,
+    #[error("cannot handle request in current account state")]
+    BadAccountState,
+}
+
+impl<E> DecodeError<E> for NonceErrorAdapter {
+    fn type_of() -> &'static str {
+        "NonceErrorAdapter"
+    }
+}
+
+impl From<NonceErrorAdapter> for NonceError {
+    fn from(e: NonceErrorAdapter) -> Self {
+        match e {
+            NonceErrorAdapter::NoRecentBlockhashes => NonceError::NoRecentBlockhashes,
+            NonceErrorAdapter::NotExpired => NonceError::NotExpired,
+            NonceErrorAdapter::UnexpectedValue => NonceError::UnexpectedValue,
+            NonceErrorAdapter::BadAccountState => NonceError::BadAccountState,
+        }
+    }
+}
+
+pub fn nonce_to_instruction_error(error: NonceError, use_system_variant: bool) -> InstructionError {
+    if use_system_variant {
+        match error {
+            NonceError::NoRecentBlockhashes => SystemError::NonceNoRecentBlockhashes.into(),
+            NonceError::NotExpired => SystemError::NonceBlockhashNotExpired.into(),
+            NonceError::UnexpectedValue => SystemError::NonceUnexpectedBlockhashValue.into(),
+            NonceError::BadAccountState => InstructionError::InvalidAccountData,
+        }
+    } else {
+        match error {
+            NonceError::NoRecentBlockhashes => NonceErrorAdapter::NoRecentBlockhashes.into(),
+            NonceError::NotExpired => NonceErrorAdapter::NotExpired.into(),
+            NonceError::UnexpectedValue => NonceErrorAdapter::UnexpectedValue.into(),
+            NonceError::BadAccountState => NonceErrorAdapter::BadAccountState.into(),
+        }
+    }
+}
+
+pub fn instruction_to_nonce_error(
+    error: &InstructionError,
+    use_system_variant: bool,
+) -> Option<NonceError> {
+    if use_system_variant {
+        match error {
+            InstructionError::Custom(discriminant) => {
+                match SystemError::decode_custom_error_to_enum(*discriminant) {
+                    Some(SystemError::NonceNoRecentBlockhashes) => {
+                        Some(NonceError::NoRecentBlockhashes)
+                    }
+                    Some(SystemError::NonceBlockhashNotExpired) => Some(NonceError::NotExpired),
+                    Some(SystemError::NonceUnexpectedBlockhashValue) => {
+                        Some(NonceError::UnexpectedValue)
+                    }
+                    _ => None,
+                }
+            }
+            InstructionError::InvalidAccountData => Some(NonceError::BadAccountState),
+            _ => None,
+        }
+    } else if let InstructionError::Custom(discriminant) = error {
+        let maybe: Option<NonceErrorAdapter> =
+            NonceErrorAdapter::decode_custom_error_to_enum(*discriminant);
+        maybe.map(NonceError::from)
+    } else {
+        None
+    }
+}
+
 /// maximum permitted size of data: 10 MB
 pub const MAX_PERMITTED_DATA_LENGTH: u64 = 10 * 1024 * 1024;
 
@@ -486,6 +569,7 @@ pub fn authorize_nonce_account(
 mod tests {
     use super::*;
     use crate::instruction::{Instruction, InstructionError};
+    use num_traits::ToPrimitive;
 
     fn get_keys(instruction: &Instruction) -> Vec<Pubkey> {
         instruction.accounts.iter().map(|x| x.pubkey).collect()
@@ -555,4 +639,127 @@ mod tests {
             pretty_err::<NonceError>(NonceError::BadAccountState.into())
         );
     }
+
+    #[test]
+    fn test_nonce_to_instruction_error() {
+        assert_eq!(
+            nonce_to_instruction_error(NonceError::NoRecentBlockhashes, false),
+            NonceError::NoRecentBlockhashes.into(),
+        );
+        assert_eq!(
+            nonce_to_instruction_error(NonceError::NotExpired, false),
+            NonceError::NotExpired.into(),
+        );
+        assert_eq!(
+            nonce_to_instruction_error(NonceError::UnexpectedValue, false),
+            NonceError::UnexpectedValue.into(),
+        );
+        assert_eq!(
+            nonce_to_instruction_error(NonceError::BadAccountState, false),
+            NonceError::BadAccountState.into(),
+        );
+        assert_eq!(
+            nonce_to_instruction_error(NonceError::NoRecentBlockhashes, true),
+            SystemError::NonceNoRecentBlockhashes.into(),
+        );
+        assert_eq!(
+            nonce_to_instruction_error(NonceError::NotExpired, true),
+            SystemError::NonceBlockhashNotExpired.into(),
+        );
+        assert_eq!(
+            nonce_to_instruction_error(NonceError::UnexpectedValue, true),
+            SystemError::NonceUnexpectedBlockhashValue.into(),
+        );
+        assert_eq!(
+            nonce_to_instruction_error(NonceError::BadAccountState, true),
+            InstructionError::InvalidAccountData,
+        );
+    }
+
+    #[test]
+    fn test_instruction_to_nonce_error() {
+        assert_eq!(
+            instruction_to_nonce_error(
+                &InstructionError::Custom(NonceErrorAdapter::NoRecentBlockhashes.to_u32().unwrap(),),
+                false,
+            ),
+            Some(NonceError::NoRecentBlockhashes),
+        );
+        assert_eq!(
+            instruction_to_nonce_error(
+                &InstructionError::Custom(NonceErrorAdapter::NotExpired.to_u32().unwrap(),),
+                false,
+            ),
+            Some(NonceError::NotExpired),
+        );
+        assert_eq!(
+            instruction_to_nonce_error(
+                &InstructionError::Custom(NonceErrorAdapter::UnexpectedValue.to_u32().unwrap(),),
+                false,
+            ),
+            Some(NonceError::UnexpectedValue),
+        );
+        assert_eq!(
+            instruction_to_nonce_error(
+                &InstructionError::Custom(NonceErrorAdapter::BadAccountState.to_u32().unwrap(),),
+                false,
+            ),
+            Some(NonceError::BadAccountState),
+        );
+        assert_eq!(
+            instruction_to_nonce_error(&InstructionError::Custom(u32::MAX), false),
+            None,
+        );
+        assert_eq!(
+            instruction_to_nonce_error(
+                &InstructionError::Custom(SystemError::NonceNoRecentBlockhashes.to_u32().unwrap(),),
+                true,
+            ),
+            Some(NonceError::NoRecentBlockhashes),
+        );
+        assert_eq!(
+            instruction_to_nonce_error(
+                &InstructionError::Custom(SystemError::NonceBlockhashNotExpired.to_u32().unwrap(),),
+                true,
+            ),
+            Some(NonceError::NotExpired),
+        );
+        assert_eq!(
+            instruction_to_nonce_error(
+                &InstructionError::Custom(
+                    SystemError::NonceUnexpectedBlockhashValue.to_u32().unwrap(),
+                ),
+                true,
+            ),
+            Some(NonceError::UnexpectedValue),
+        );
+        assert_eq!(
+            instruction_to_nonce_error(&InstructionError::InvalidAccountData, true),
+            Some(NonceError::BadAccountState),
+        );
+        assert_eq!(
+            instruction_to_nonce_error(&InstructionError::Custom(u32::MAX), true),
+            None,
+        );
+    }
+
+    #[test]
+    fn test_nonce_error_adapter_compat() {
+        assert_eq!(
+            NonceError::NoRecentBlockhashes.to_u32(),
+            NonceErrorAdapter::NoRecentBlockhashes.to_u32(),
+        );
+        assert_eq!(
+            NonceError::NotExpired.to_u32(),
+            NonceErrorAdapter::NotExpired.to_u32(),
+        );
+        assert_eq!(
+            NonceError::UnexpectedValue.to_u32(),
+            NonceErrorAdapter::UnexpectedValue.to_u32(),
+        );
+        assert_eq!(
+            NonceError::BadAccountState.to_u32(),
+            NonceErrorAdapter::BadAccountState.to_u32(),
+        );
+    }
 }
diff --git a/sdk/program/src/sysvar/mod.rs b/sdk/program/src/sysvar/mod.rs
index 51f739aef7f1f8..1cc67068d9b9fd 100644
--- a/sdk/program/src/sysvar/mod.rs
+++ b/sdk/program/src/sysvar/mod.rs
@@ -32,6 +32,10 @@ macro_rules! declare_sysvar_id(
         $crate::declare_id!($name);
 
         impl $crate::sysvar::SysvarId for $type {
+            fn id() -> $crate::pubkey::Pubkey {
+                id()
+            }
+
             fn check_id(pubkey: &$crate::pubkey::Pubkey) -> bool {
                 check_id(pubkey)
             }
@@ -51,6 +55,8 @@ macro_rules! declare_sysvar_id(
 crate::declare_id!("Sysvar1111111111111111111111111111111111111");
 
 pub trait SysvarId {
+    fn id() -> Pubkey;
+
     fn check_id(pubkey: &Pubkey) -> bool;
 }
 
@@ -113,6 +119,10 @@ mod tests {
     }
     crate::declare_id!("TestSysvar111111111111111111111111111111111");
     impl crate::sysvar::SysvarId for TestSysvar {
+        fn id() -> crate::pubkey::Pubkey {
+            id()
+        }
+
         fn check_id(pubkey: &crate::pubkey::Pubkey) -> bool {
             check_id(pubkey)
         }
diff --git a/sdk/program/src/sysvar/recent_blockhashes.rs b/sdk/program/src/sysvar/recent_blockhashes.rs
index 93fee5e4dc0bdf..00f822c74ec745 100644
--- a/sdk/program/src/sysvar/recent_blockhashes.rs
+++ b/sdk/program/src/sysvar/recent_blockhashes.rs
@@ -53,6 +53,10 @@ impl<'a> PartialOrd for IterItem<'a> {
     }
 }
 
+/// Contains recent block hashes and fee calculators.
+///
+/// The entries are ordered by descending block height, so the first entry holds
+/// the most recent block hash, and the last entry holds an old block hash.
 #[repr(C)]
 #[derive(Serialize, Deserialize, Clone, Debug, PartialEq)]
 pub struct RecentBlockhashes(Vec<Entry>);
diff --git a/sdk/src/account.rs b/sdk/src/account.rs
index 4d6d397e1fc082..a3f467d5a5a810 100644
--- a/sdk/src/account.rs
+++ b/sdk/src/account.rs
@@ -588,7 +588,7 @@ pub mod tests {
     use super::*;
 
     fn make_two_accounts(key: &Pubkey) -> (Account, AccountSharedData) {
-        let mut account1 = Account::new(1, 2, &key);
+        let mut account1 = Account::new(1, 2, key);
         account1.executable = true;
         account1.rent_epoch = 4;
         let mut account2 = AccountSharedData::new(1, 2, key);
diff --git a/sdk/src/derivation_path.rs b/sdk/src/derivation_path.rs
index 11c563177682eb..06feb0cfbd2e5b 100644
--- a/sdk/src/derivation_path.rs
+++ b/sdk/src/derivation_path.rs
@@ -46,7 +46,7 @@ impl TryFrom<&str> for DerivationPath {
 
 impl AsRef<[ChildIndex]> for DerivationPath {
     fn as_ref(&self) -> &[ChildIndex] {
-        &self.0.as_ref()
+        self.0.as_ref()
     }
 }
 
@@ -88,7 +88,7 @@ impl DerivationPath {
     }
 
     fn _from_absolute_path_insecure_str(path: &str) -> Result<Self, DerivationPathError> {
-        Ok(Self(DerivationPathInner::from_str(&path).map_err(
+        Ok(Self(DerivationPathInner::from_str(path).map_err(
             |err| DerivationPathError::InvalidDerivationPath(err.to_string()),
         )?))
     }
diff --git a/sdk/src/exit.rs b/sdk/src/exit.rs
new file mode 100644
index 00000000000000..ab6edf0779adbc
--- /dev/null
+++ b/sdk/src/exit.rs
@@ -0,0 +1,30 @@
+use std::fmt;
+
+#[derive(Default)]
+pub struct Exit {
+    exited: bool,
+    exits: Vec<Box<dyn FnOnce() + Send + Sync>>,
+}
+
+impl Exit {
+    pub fn register_exit(&mut self, exit: Box<dyn FnOnce() + Send + Sync>) {
+        if self.exited {
+            exit();
+        } else {
+            self.exits.push(exit);
+        }
+    }
+
+    pub fn exit(&mut self) {
+        self.exited = true;
+        for exit in self.exits.drain(..) {
+            exit();
+        }
+    }
+}
+
+impl fmt::Debug for Exit {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        write!(f, "{} exits", self.exits.len())
+    }
+}
diff --git a/sdk/src/feature_set.rs b/sdk/src/feature_set.rs
index aaccf5b0743c1d..1cf194ed0771f3 100644
--- a/sdk/src/feature_set.rs
+++ b/sdk/src/feature_set.rs
@@ -10,10 +10,6 @@ pub mod instructions_sysvar_enabled {
     solana_sdk::declare_id!("EnvhHCLvg55P7PDtbvR1NwuTuAeodqpusV3MR5QEK8gs");
 }
 
-pub mod secp256k1_program_enabled {
-    solana_sdk::declare_id!("E3PHP7w8kB7np3CTQ1qQ2tW3KCtjRSXBQgW9vM2mWv2Y");
-}
-
 pub mod consistent_recent_blockhashes_sysvar {
     solana_sdk::declare_id!("3h1BQWPDS5veRsq6mDBWruEpgPxRJkfwGexg5iiQ9mYg");
 }
@@ -51,14 +47,6 @@ pub mod no_overflow_rent_distribution {
     solana_sdk::declare_id!("4kpdyrcj5jS47CZb2oJGfVxjYbsMm2Kx97gFyZrxxwXz");
 }
 
-pub mod stake_program_v2 {
-    solana_sdk::declare_id!("Gvd9gGJZDHGMNf1b3jkxrfBQSR5etrfTQSBNKCvLSFJN");
-}
-
-pub mod rewrite_stake {
-    solana_sdk::declare_id!("6ap2eGy7wx5JmsWUmQ5sHwEWrFSDUxSti2k5Hbfv5BZG");
-}
-
 pub mod filter_stake_delegation_accounts {
     solana_sdk::declare_id!("GE7fRxmW46K6EmCD9AMZSbnaJ2e3LfqCZzdHi9hmYAgi");
 }
@@ -91,14 +79,6 @@ pub mod check_program_owner {
     solana_sdk::declare_id!("5XnbR5Es9YXEARRuP6mdvoxiW3hx5atNNeBmwVd8P3QD");
 }
 
-pub mod cpi_share_ro_and_exec_accounts {
-    solana_sdk::declare_id!("6VgVBi3uRVqp56TtEwNou8idgdmhCD1aYqX8FaJ1fnJb");
-}
-
-pub mod skip_ro_deserialization {
-    solana_sdk::declare_id!("6Sw5JV84f7QkDe8gvRxpcPWFnPpfpgEnNziiy8sELaCp");
-}
-
 pub mod require_stake_for_gossip {
     solana_sdk::declare_id!("6oNzd5Z3M2L1xo4Q5hoox7CR2DuW7m1ETLWH5jHJthwa");
 }
@@ -111,18 +91,10 @@ pub mod upgradeable_close_instruction {
     solana_sdk::declare_id!("FsPaByos3gA9bUEhp3EimQpQPCoSvCEigHod496NmABQ");
 }
 
-pub mod demote_sysvar_write_locks {
-    solana_sdk::declare_id!("86LJYRuq2zgtHuL3FccR6hqFJQMQkFoun4knAxcPiF1P");
-}
-
 pub mod sysvar_via_syscall {
     solana_sdk::declare_id!("7411E6gFQLDhQkdRjmpXwM1hzHMMoYQUjHicmvGPC1Nf");
 }
 
-pub mod check_duplicates_by_hash {
-    solana_sdk::declare_id!("8ZqTSYHgzyaYCcXJPMViRy6afCFSgNvYooPDeVdyj5GC");
-}
-
 pub mod enforce_aligned_host_addrs {
     solana_sdk::declare_id!("6Qob9Z4RwGdf599FDVCqsjuKjR8ZFR3oVs2ByRLWBsua");
 }
@@ -143,19 +115,80 @@ pub mod stake_program_v4 {
     solana_sdk::declare_id!("Dc7djyhP9aLfdq2zktpvskeAjpG56msCU1yexpxXiWZb");
 }
 
+pub mod memory_ops_syscalls {
+    solana_sdk::declare_id!("ENQi37wsVhTvFz2gUiZAAbqFEWGN2jwFsqdEDTE8A4MU");
+}
+
+pub mod secp256k1_recover_syscall_enabled {
+    solana_sdk::declare_id!("6RvdSWHh8oh72Dp7wMTS2DBkf3fRPtChfNrAo3cZZoXJ");
+}
+
+pub mod add_missing_program_error_mappings {
+    solana_sdk::declare_id!("3QEUpjhgPEt92nz3Mqf6pABkHPGCQwSvKtyGMq4SuQyL");
+}
+
+pub mod system_transfer_zero_check {
+    solana_sdk::declare_id!("BrTR9hzw4WBGFP65AJMbpAo64DcA3U6jdPSga9fMV5cS");
+}
+
+pub mod dedupe_config_program_signers {
+    solana_sdk::declare_id!("8kEuAshXLsgkUEdcFVLqrjCGGHVWFW99ZZpxvAzzMtBp");
+}
+
+pub mod verify_tx_signatures_len {
+    solana_sdk::declare_id!("EVW9B5xD9FFK7vw1SBARwMA4s5eRo5eKJdKpsBikzKBz");
+}
+
+pub mod vote_stake_checked_instructions {
+    solana_sdk::declare_id!("BcWknVcgvonN8sL4HE4XFuEVgfcee5MwxWPAgP6ZV89X");
+}
+
+pub mod updated_verify_policy {
+    solana_sdk::declare_id!("k15tVxtkgsmo7dy6iJ56N5hBCxuQAtqRgYwoTDuwbia");
+}
+
+pub mod neon_evm_compute_budget {
+    solana_sdk::declare_id!("GLrVvDPkQi5PMYUrsYWT9doZhSHr1BVZXqj5DbFps3rS");
+}
+
+pub mod rent_for_sysvars {
+    solana_sdk::declare_id!("BKCPBQQBZqggVnFso5nQ8rQ4RwwogYwjuUt9biBjxwNF");
+}
+
+pub mod libsecp256k1_0_5_upgrade_enabled {
+    solana_sdk::declare_id!("DhsYfRjxfnh2g7HKJYSzT79r74Afa1wbHkAgHndrA1oy");
+}
+
+pub mod merge_nonce_error_into_system_error {
+    solana_sdk::declare_id!("21AWDosvp3pBamFW91KB35pNoaoZVTM7ess8nr2nt53B");
+}
+
+pub mod spl_token_v2_set_authority_fix {
+    solana_sdk::declare_id!("FToKNBYyiF4ky9s8WsmLBXHCht17Ek7RXaLZGHzzQhJ1");
+}
+
+pub mod stake_merge_with_unmatched_credits_observed {
+    solana_sdk::declare_id!("meRgp4ArRPhD3KtCY9c5yAf2med7mBLsjKTPeVUHqBL");
+}
+
+pub mod gate_large_block {
+    solana_sdk::declare_id!("2ry7ygxiYURULZCrypHhveanvP5tzZ4toRwVp89oCNSj");
+}
+
+pub mod mem_overlap_fix {
+    solana_sdk::declare_id!("vXDCFK7gphrEmyf5VnKgLmqbdJ4UxD2eZH1qbdouYKF");
+}
+
 lazy_static! {
     /// Map of feature identifiers to user-visible description
     pub static ref FEATURE_NAMES: HashMap<Pubkey, &'static str> = [
         (instructions_sysvar_enabled::id(), "instructions sysvar"),
-        (secp256k1_program_enabled::id(), "secp256k1 program"),
         (consistent_recent_blockhashes_sysvar::id(), "consistent recentblockhashes sysvar"),
         (deprecate_rewards_sysvar::id(), "deprecate unused rewards sysvar"),
         (pico_inflation::id(), "pico inflation"),
         (full_inflation::devnet_and_testnet::id(), "full inflation on devnet and testnet"),
         (spl_token_v2_multisig_fix::id(), "spl-token multisig fix"),
         (no_overflow_rent_distribution::id(), "no overflow rent distribution"),
-        (stake_program_v2::id(), "solana_stake_program v2"),
-        (rewrite_stake::id(), "rewrite stake"),
         (filter_stake_delegation_accounts::id(), "filter stake_delegation_accounts #14062"),
         (bpf_loader_upgradeable_program::id(), "upgradeable bpf loader"),
         (stake_program_v3::id(), "solana_stake_program v3"),
@@ -166,19 +199,30 @@ lazy_static! {
         (warp_timestamp_again::id(), "warp timestamp again, adjust bounding to 25% fast 80% slow #15204"),
         (check_init_vote_data::id(), "check initialized Vote data"),
         (check_program_owner::id(), "limit programs to operating on accounts owned by itself"),
-        (cpi_share_ro_and_exec_accounts::id(), "share RO and Executable accounts during cross-program invocations"),
-        (skip_ro_deserialization::id(), "skip deserialization of read-only accounts"),
         (require_stake_for_gossip::id(), "require stakes for propagating crds values through gossip #15561"),
         (cpi_data_cost::id(), "charge the compute budget for data passed via CPI"),
         (upgradeable_close_instruction::id(), "close upgradeable buffer accounts"),
-        (demote_sysvar_write_locks::id(), "demote builtins and sysvar write locks to readonly #15497"),
         (sysvar_via_syscall::id(), "provide sysvars via syscalls"),
-        (check_duplicates_by_hash::id(), "use transaction message hash for duplicate check"),
         (enforce_aligned_host_addrs::id(), "enforce aligned host addresses"),
         (set_upgrade_authority_via_cpi_enabled::id(), "set upgrade authority instruction via cpi calls for upgradable programs"),
         (update_data_on_realloc::id(), "Retain updated data values modified after realloc via CPI"),
         (keccak256_syscall_enabled::id(), "keccak256 syscall"),
         (stake_program_v4::id(), "solana_stake_program v4"),
+        (memory_ops_syscalls::id(), "add syscalls for memory operations"),
+        (secp256k1_recover_syscall_enabled::id(), "secp256k1_recover syscall"),
+        (add_missing_program_error_mappings::id(), "add missing program error mappings"),
+        (system_transfer_zero_check::id(), "perform all checks for transfers of 0 lamports"),
+        (dedupe_config_program_signers::id(), "dedupe config program signers"),
+        (vote_stake_checked_instructions::id(), "vote/state program checked instructions #18345"),
+        (updated_verify_policy::id(), "Update verify policy"),
+        (neon_evm_compute_budget::id(), "bump neon_evm's compute budget"),
+        (rent_for_sysvars::id(), "collect rent from accounts owned by sysvars"),
+        (libsecp256k1_0_5_upgrade_enabled::id(), "upgrade libsecp256k1 to v0.5.0"),
+        (merge_nonce_error_into_system_error::id(), "merge NonceError into SystemError"),
+        (spl_token_v2_set_authority_fix::id(), "spl-token set_authority fix"),
+        (stake_merge_with_unmatched_credits_observed::id(), "allow merging active stakes with unmatched credits_observed #18985"),
+        (gate_large_block::id(), "validator checks block cost against max limit in realtime, reject if exceeds."),
+        (mem_overlap_fix::id(), "Memory overlap fix"),
         /*************** ADD NEW FEATURES HERE ***************/
     ]
     .iter()
diff --git a/sdk/src/genesis_config.rs b/sdk/src/genesis_config.rs
index 8cd985b7870b4b..3c7c363f1c4525 100644
--- a/sdk/src/genesis_config.rs
+++ b/sdk/src/genesis_config.rs
@@ -160,7 +160,7 @@ impl GenesisConfig {
     }
 
     pub fn load(ledger_path: &Path) -> Result<Self, std::io::Error> {
-        let filename = Self::genesis_filename(&ledger_path);
+        let filename = Self::genesis_filename(ledger_path);
         let file = OpenOptions::new()
             .read(true)
             .open(&filename)
@@ -198,7 +198,7 @@ impl GenesisConfig {
 
         std::fs::create_dir_all(&ledger_path)?;
 
-        let mut file = File::create(Self::genesis_filename(&ledger_path))?;
+        let mut file = File::create(Self::genesis_filename(ledger_path))?;
         file.write_all(&serialized)
     }
 
@@ -339,8 +339,8 @@ mod tests {
                 && account.lamports == 10_000));
 
         let path = &make_tmp_path("genesis_config");
-        config.write(&path).expect("write");
-        let loaded_config = GenesisConfig::load(&path).expect("load");
+        config.write(path).expect("write");
+        let loaded_config = GenesisConfig::load(path).expect("load");
         assert_eq!(config.hash(), loaded_config.hash());
         let _ignored = std::fs::remove_file(&path);
     }
diff --git a/sdk/src/keyed_account.rs b/sdk/src/keyed_account.rs
index 19cc48eb1a151e..6188ae8fb4f446 100644
--- a/sdk/src/keyed_account.rs
+++ b/sdk/src/keyed_account.rs
@@ -270,6 +270,9 @@ mod tests {
     }
     crate::declare_id!("TestSysvar111111111111111111111111111111111");
     impl solana_program::sysvar::SysvarId for TestSysvar {
+        fn id() -> crate::pubkey::Pubkey {
+            id()
+        }
         fn check_id(pubkey: &crate::pubkey::Pubkey) -> bool {
             check_id(pubkey)
         }
diff --git a/sdk/src/lib.rs b/sdk/src/lib.rs
index 16d531e541bbb5..ee185b155c5107 100644
--- a/sdk/src/lib.rs
+++ b/sdk/src/lib.rs
@@ -21,6 +21,7 @@ pub mod entrypoint;
 pub mod entrypoint_deprecated;
 pub mod entrypoint_native;
 pub mod epoch_info;
+pub mod exit;
 pub mod feature;
 pub mod feature_set;
 pub mod genesis_config;
@@ -43,7 +44,6 @@ pub mod secp256k1_instruction;
 pub mod shred_version;
 pub mod signature;
 pub mod signer;
-pub mod stake_weighted_timestamp;
 pub mod system_transaction;
 pub mod timing;
 pub mod transaction;
diff --git a/sdk/src/nonce_keyed_account.rs b/sdk/src/nonce_keyed_account.rs
index 14fc508b54f125..d9e6fc4ae5a4ed 100644
--- a/sdk/src/nonce_keyed_account.rs
+++ b/sdk/src/nonce_keyed_account.rs
@@ -1,7 +1,7 @@
 use crate::{
     account::{ReadableAccount, WritableAccount},
     account_utils::State as AccountUtilsState,
-    ic_msg,
+    feature_set, ic_msg,
     keyed_account::KeyedAccount,
     nonce_account::create_account,
     process_instruction::InvokeContext,
@@ -10,7 +10,7 @@ use solana_program::{
     instruction::{checked_add, InstructionError},
     nonce::{self, state::Versions, State},
     pubkey::Pubkey,
-    system_instruction::NonceError,
+    system_instruction::{nonce_to_instruction_error, NonceError},
     sysvar::{recent_blockhashes::RecentBlockhashes, rent::Rent},
 };
 use std::collections::HashSet;
@@ -53,12 +53,17 @@ impl<'a> NonceKeyedAccount for KeyedAccount<'a> {
         signers: &HashSet<Pubkey>,
         invoke_context: &dyn InvokeContext,
     ) -> Result<(), InstructionError> {
+        let merge_nonce_error_into_system_error = invoke_context
+            .is_feature_active(&feature_set::merge_nonce_error_into_system_error::id());
         if recent_blockhashes.is_empty() {
             ic_msg!(
                 invoke_context,
                 "Advance nonce account: recent blockhash list is empty",
             );
-            return Err(NonceError::NoRecentBlockhashes.into());
+            return Err(nonce_to_instruction_error(
+                NonceError::NoRecentBlockhashes,
+                merge_nonce_error_into_system_error,
+            ));
         }
 
         let state = AccountUtilsState::<Versions>::state(self)?.convert_to_current();
@@ -78,7 +83,10 @@ impl<'a> NonceKeyedAccount for KeyedAccount<'a> {
                         invoke_context,
                         "Advance nonce account: nonce can only advance once per slot"
                     );
-                    return Err(NonceError::NotExpired.into());
+                    return Err(nonce_to_instruction_error(
+                        NonceError::NotExpired,
+                        merge_nonce_error_into_system_error,
+                    ));
                 }
 
                 let new_data = nonce::state::Data {
@@ -94,7 +102,10 @@ impl<'a> NonceKeyedAccount for KeyedAccount<'a> {
                     "Advance nonce account: Account {} state is invalid",
                     self.unsigned_key()
                 );
-                Err(NonceError::BadAccountState.into())
+                Err(nonce_to_instruction_error(
+                    NonceError::BadAccountState,
+                    merge_nonce_error_into_system_error,
+                ))
             }
         }
     }
@@ -108,6 +119,8 @@ impl<'a> NonceKeyedAccount for KeyedAccount<'a> {
         signers: &HashSet<Pubkey>,
         invoke_context: &dyn InvokeContext,
     ) -> Result<(), InstructionError> {
+        let merge_nonce_error_into_system_error = invoke_context
+            .is_feature_active(&feature_set::merge_nonce_error_into_system_error::id());
         let signer = match AccountUtilsState::<Versions>::state(self)?.convert_to_current() {
             State::Uninitialized => {
                 if lamports > self.lamports()? {
@@ -128,7 +141,10 @@ impl<'a> NonceKeyedAccount for KeyedAccount<'a> {
                             invoke_context,
                             "Withdraw nonce account: nonce can only advance once per slot"
                         );
-                        return Err(NonceError::NotExpired.into());
+                        return Err(nonce_to_instruction_error(
+                            NonceError::NotExpired,
+                            merge_nonce_error_into_system_error,
+                        ));
                     }
                     self.set_state(&Versions::new_current(State::Uninitialized))?;
                 } else {
@@ -180,12 +196,17 @@ impl<'a> NonceKeyedAccount for KeyedAccount<'a> {
         rent: &Rent,
         invoke_context: &dyn InvokeContext,
     ) -> Result<(), InstructionError> {
+        let merge_nonce_error_into_system_error = invoke_context
+            .is_feature_active(&feature_set::merge_nonce_error_into_system_error::id());
         if recent_blockhashes.is_empty() {
             ic_msg!(
                 invoke_context,
                 "Initialize nonce account: recent blockhash list is empty",
             );
-            return Err(NonceError::NoRecentBlockhashes.into());
+            return Err(nonce_to_instruction_error(
+                NonceError::NoRecentBlockhashes,
+                merge_nonce_error_into_system_error,
+            ));
         }
 
         match AccountUtilsState::<Versions>::state(self)?.convert_to_current() {
@@ -213,7 +234,10 @@ impl<'a> NonceKeyedAccount for KeyedAccount<'a> {
                     "Initialize nonce account: Account {} state is invalid",
                     self.unsigned_key()
                 );
-                Err(NonceError::BadAccountState.into())
+                Err(nonce_to_instruction_error(
+                    NonceError::BadAccountState,
+                    merge_nonce_error_into_system_error,
+                ))
             }
         }
     }
@@ -224,6 +248,8 @@ impl<'a> NonceKeyedAccount for KeyedAccount<'a> {
         signers: &HashSet<Pubkey>,
         invoke_context: &dyn InvokeContext,
     ) -> Result<(), InstructionError> {
+        let merge_nonce_error_into_system_error = invoke_context
+            .is_feature_active(&feature_set::merge_nonce_error_into_system_error::id());
         match AccountUtilsState::<Versions>::state(self)?.convert_to_current() {
             State::Initialized(data) => {
                 if !signers.contains(&data.authority) {
@@ -246,7 +272,10 @@ impl<'a> NonceKeyedAccount for KeyedAccount<'a> {
                     "Authorize nonce account: Account {} state is invalid",
                     self.unsigned_key()
                 );
-                Err(NonceError::BadAccountState.into())
+                Err(nonce_to_instruction_error(
+                    NonceError::BadAccountState,
+                    merge_nonce_error_into_system_error,
+                ))
             }
         }
     }
@@ -273,7 +302,7 @@ mod test {
         nonce::{self, State},
         nonce_account::verify_nonce_account,
         process_instruction::MockInvokeContext,
-        system_instruction::NonceError,
+        system_instruction::SystemError,
         sysvar::recent_blockhashes::create_test_recent_blockhashes,
     };
     use solana_program::hash::Hash;
@@ -306,7 +335,7 @@ mod test {
             let authorized = keyed_account.unsigned_key();
             keyed_account
                 .initialize_nonce_account(
-                    &authorized,
+                    authorized,
                     &recent_blockhashes,
                     &rent,
                     &MockInvokeContext::new(vec![]),
@@ -367,7 +396,7 @@ mod test {
                 keyed_account
                     .withdraw_nonce_account(
                         withdraw_lamports,
-                        &to_keyed,
+                        to_keyed,
                         &recent_blockhashes,
                         &rent,
                         &signers,
@@ -456,7 +485,7 @@ mod test {
                 &signers,
                 &MockInvokeContext::new(vec![]),
             );
-            assert_eq!(result, Err(NonceError::NoRecentBlockhashes.into()));
+            assert_eq!(result, Err(SystemError::NonceNoRecentBlockhashes.into()));
         })
     }
 
@@ -485,7 +514,7 @@ mod test {
                 &signers,
                 &MockInvokeContext::new(vec![]),
             );
-            assert_eq!(result, Err(NonceError::NotExpired.into()));
+            assert_eq!(result, Err(SystemError::NonceBlockhashNotExpired.into()));
         })
     }
 
@@ -505,7 +534,7 @@ mod test {
                 &signers,
                 &MockInvokeContext::new(vec![]),
             );
-            assert_eq!(result, Err(NonceError::BadAccountState.into()));
+            assert_eq!(result, Err(InstructionError::InvalidAccountData));
         })
     }
 
@@ -597,7 +626,7 @@ mod test {
                 nonce_keyed
                     .withdraw_nonce_account(
                         withdraw_lamports,
-                        &to_keyed,
+                        to_keyed,
                         &recent_blockhashes,
                         &rent,
                         &signers,
@@ -639,7 +668,7 @@ mod test {
                 let lamports = nonce_keyed.account.borrow().lamports();
                 let result = nonce_keyed.withdraw_nonce_account(
                     lamports,
-                    &to_keyed,
+                    to_keyed,
                     &recent_blockhashes,
                     &rent,
                     &signers,
@@ -669,7 +698,7 @@ mod test {
                 let lamports = nonce_keyed.account.borrow().lamports() + 1;
                 let result = nonce_keyed.withdraw_nonce_account(
                     lamports,
-                    &to_keyed,
+                    to_keyed,
                     &recent_blockhashes,
                     &rent,
                     &signers,
@@ -699,7 +728,7 @@ mod test {
                 nonce_keyed
                     .withdraw_nonce_account(
                         withdraw_lamports,
-                        &to_keyed,
+                        to_keyed,
                         &recent_blockhashes,
                         &rent,
                         &signers,
@@ -722,7 +751,7 @@ mod test {
                 nonce_keyed
                     .withdraw_nonce_account(
                         withdraw_lamports,
-                        &to_keyed,
+                        to_keyed,
                         &recent_blockhashes,
                         &rent,
                         &signers,
@@ -779,7 +808,7 @@ mod test {
                 nonce_keyed
                     .withdraw_nonce_account(
                         withdraw_lamports,
-                        &to_keyed,
+                        to_keyed,
                         &recent_blockhashes,
                         &rent,
                         &signers,
@@ -808,7 +837,7 @@ mod test {
                 nonce_keyed
                     .withdraw_nonce_account(
                         withdraw_lamports,
-                        &to_keyed,
+                        to_keyed,
                         &recent_blockhashes,
                         &rent,
                         &signers,
@@ -852,13 +881,13 @@ mod test {
                 let withdraw_lamports = nonce_keyed.account.borrow().lamports();
                 let result = nonce_keyed.withdraw_nonce_account(
                     withdraw_lamports,
-                    &to_keyed,
+                    to_keyed,
                     &recent_blockhashes,
                     &rent,
                     &signers,
                     &MockInvokeContext::new(vec![]),
                 );
-                assert_eq!(result, Err(NonceError::NotExpired.into()));
+                assert_eq!(result, Err(SystemError::NonceBlockhashNotExpired.into()));
             })
         })
     }
@@ -888,7 +917,7 @@ mod test {
                 let withdraw_lamports = nonce_keyed.account.borrow().lamports() + 1;
                 let result = nonce_keyed.withdraw_nonce_account(
                     withdraw_lamports,
-                    &to_keyed,
+                    to_keyed,
                     &recent_blockhashes,
                     &rent,
                     &signers,
@@ -924,7 +953,7 @@ mod test {
                 let withdraw_lamports = nonce_keyed.account.borrow().lamports() - min_lamports + 1;
                 let result = nonce_keyed.withdraw_nonce_account(
                     withdraw_lamports,
-                    &to_keyed,
+                    to_keyed,
                     &recent_blockhashes,
                     &rent,
                     &signers,
@@ -960,7 +989,7 @@ mod test {
                 let withdraw_lamports = u64::MAX - 54;
                 let result = nonce_keyed.withdraw_nonce_account(
                     withdraw_lamports,
-                    &to_keyed,
+                    to_keyed,
                     &recent_blockhashes,
                     &rent,
                     &signers,
@@ -1024,7 +1053,7 @@ mod test {
                 &rent,
                 &MockInvokeContext::new(vec![]),
             );
-            assert_eq!(result, Err(NonceError::NoRecentBlockhashes.into()));
+            assert_eq!(result, Err(SystemError::NonceNoRecentBlockhashes.into()));
         })
     }
 
@@ -1053,7 +1082,7 @@ mod test {
                 &rent,
                 &MockInvokeContext::new(vec![]),
             );
-            assert_eq!(result, Err(NonceError::BadAccountState.into()));
+            assert_eq!(result, Err(InstructionError::InvalidAccountData));
         })
     }
 
@@ -1131,7 +1160,7 @@ mod test {
                 &signers,
                 &MockInvokeContext::new(vec![]),
             );
-            assert_eq!(result, Err(NonceError::BadAccountState.into()));
+            assert_eq!(result, Err(InstructionError::InvalidAccountData));
         })
     }
 
@@ -1149,7 +1178,7 @@ mod test {
             let authorized = &Pubkey::default().clone();
             nonce_account
                 .initialize_nonce_account(
-                    &authorized,
+                    authorized,
                     &recent_blockhashes,
                     &rent,
                     &MockInvokeContext::new(vec![]),
@@ -1176,7 +1205,7 @@ mod test {
             let authorized = nonce_account.unsigned_key();
             nonce_account
                 .initialize_nonce_account(
-                    &authorized,
+                    authorized,
                     &recent_blockhashes,
                     &Rent::free(),
                     &MockInvokeContext::new(vec![]),
@@ -1211,7 +1240,7 @@ mod test {
             let authorized = nonce_account.unsigned_key();
             nonce_account
                 .initialize_nonce_account(
-                    &authorized,
+                    authorized,
                     &recent_blockhashes,
                     &Rent::free(),
                     &MockInvokeContext::new(vec![]),
diff --git a/sdk/src/process_instruction.rs b/sdk/src/process_instruction.rs
index c97dd9ac5b460c..d740c87e8dceea 100644
--- a/sdk/src/process_instruction.rs
+++ b/sdk/src/process_instruction.rs
@@ -2,11 +2,10 @@ use solana_sdk::{
     account::AccountSharedData,
     instruction::{CompiledInstruction, Instruction, InstructionError},
     keyed_account::{create_keyed_accounts_unified, KeyedAccount},
-    message::Message,
     pubkey::Pubkey,
     sysvar::Sysvar,
 };
-use std::{cell::RefCell, fmt::Debug, rc::Rc, sync::Arc};
+use std::{cell::RefCell, collections::HashSet, fmt::Debug, rc::Rc, sync::Arc};
 
 /// Prototype of a native loader entry point
 ///
@@ -62,10 +61,9 @@ pub trait InvokeContext {
     /// Verify and update PreAccount state based on program execution
     fn verify_and_update(
         &mut self,
-        message: &Message,
         instruction: &CompiledInstruction,
-        accounts: &[Rc<RefCell<AccountSharedData>>],
-        caller_pivileges: Option<&[bool]>,
+        accounts: &[(Pubkey, Rc<RefCell<AccountSharedData>>)],
+        write_privileges: &[bool],
     ) -> Result<(), InstructionError>;
     /// Get the program ID of the currently executing program
     fn get_caller(&self) -> Result<&Pubkey, InstructionError>;
@@ -90,7 +88,7 @@ pub trait InvokeContext {
     fn record_instruction(&self, instruction: &Instruction);
     /// Get the bank's active feature set
     fn is_feature_active(&self, feature_id: &Pubkey) -> bool;
-    /// Get an account from a pre-account
+    /// Get an account by its key
     fn get_account(&self, pubkey: &Pubkey) -> Option<Rc<RefCell<AccountSharedData>>>;
     /// Update timing
     fn update_timing(
@@ -163,7 +161,7 @@ pub struct BpfComputeBudget {
     /// Number of compute units consumed by an invoke call (not including the cost incurred by
     /// the called program)
     pub invoke_units: u64,
-    /// Maximum cross-program invocation depth allowed including the original caller
+    /// Maximum cross-program invocation depth allowed
     pub max_invoke_depth: usize,
     /// Base number of compute units consumed to call SHA256
     pub sha256_base_cost: u64,
@@ -181,6 +179,10 @@ pub struct BpfComputeBudget {
     pub cpi_bytes_per_unit: u64,
     /// Base number of compute units consumed to get a sysvar
     pub sysvar_base_cost: u64,
+    /// Number of compute units consumed to call secp256k1_recover
+    pub secp256k1_recover_cost: u64,
+    /// Optional program heap region size, if `None` then loader default
+    pub heap_size: Option<usize>,
 }
 impl Default for BpfComputeBudget {
     fn default() -> Self {
@@ -204,6 +206,8 @@ impl BpfComputeBudget {
             max_cpi_instruction_size: 1280, // IPv6 Min MTU size
             cpi_bytes_per_unit: 250,        // ~50MB at 200,000 units
             sysvar_base_cost: 100,
+            secp256k1_recover_cost: 25_000,
+            heap_size: None,
         }
     }
 }
@@ -330,6 +334,7 @@ pub struct MockInvokeContext<'a> {
     pub programs: Vec<(Pubkey, ProcessInstructionWithContext)>,
     pub accounts: Vec<(Pubkey, Rc<RefCell<AccountSharedData>>)>,
     pub sysvars: Vec<(Pubkey, Option<Rc<Vec<u8>>>)>,
+    pub disabled_features: HashSet<Pubkey>,
 }
 impl<'a> MockInvokeContext<'a> {
     pub fn new(keyed_accounts: Vec<KeyedAccount<'a>>) -> Self {
@@ -344,6 +349,7 @@ impl<'a> MockInvokeContext<'a> {
             programs: vec![],
             accounts: vec![],
             sysvars: vec![],
+            disabled_features: HashSet::default(),
         };
         invoke_context
             .invoke_stack
@@ -393,10 +399,9 @@ impl<'a> InvokeContext for MockInvokeContext<'a> {
     }
     fn verify_and_update(
         &mut self,
-        _message: &Message,
         _instruction: &CompiledInstruction,
-        _accounts: &[Rc<RefCell<AccountSharedData>>],
-        _caller_pivileges: Option<&[bool]>,
+        _accounts: &[(Pubkey, Rc<RefCell<AccountSharedData>>)],
+        _write_pivileges: &[bool],
     ) -> Result<(), InstructionError> {
         Ok(())
     }
@@ -438,8 +443,8 @@ impl<'a> InvokeContext for MockInvokeContext<'a> {
         None
     }
     fn record_instruction(&self, _instruction: &Instruction) {}
-    fn is_feature_active(&self, _feature_id: &Pubkey) -> bool {
-        true
+    fn is_feature_active(&self, feature_id: &Pubkey) -> bool {
+        !self.disabled_features.contains(feature_id)
     }
     fn get_account(&self, pubkey: &Pubkey) -> Option<Rc<RefCell<AccountSharedData>>> {
         for (key, account) in self.accounts.iter() {
diff --git a/sdk/src/secp256k1_instruction.rs b/sdk/src/secp256k1_instruction.rs
index 6ad7c7a365e94e..afe2b88b9e34a5 100644
--- a/sdk/src/secp256k1_instruction.rs
+++ b/sdk/src/secp256k1_instruction.rs
@@ -29,18 +29,18 @@ pub struct SecpSignatureOffsets {
 }
 
 pub fn new_secp256k1_instruction(
-    priv_key: &secp256k1::SecretKey,
+    priv_key: &libsecp256k1::SecretKey,
     message_arr: &[u8],
 ) -> Instruction {
-    let secp_pubkey = secp256k1::PublicKey::from_secret_key(priv_key);
+    let secp_pubkey = libsecp256k1::PublicKey::from_secret_key(priv_key);
     let eth_pubkey = construct_eth_pubkey(&secp_pubkey);
     let mut hasher = sha3::Keccak256::new();
     hasher.update(&message_arr);
     let message_hash = hasher.finalize();
     let mut message_hash_arr = [0u8; 32];
     message_hash_arr.copy_from_slice(&message_hash.as_slice());
-    let message = secp256k1::Message::parse(&message_hash_arr);
-    let (signature, recovery_id) = secp256k1::sign(&message, priv_key);
+    let message = libsecp256k1::Message::parse(&message_hash_arr);
+    let (signature, recovery_id) = libsecp256k1::sign(&message, priv_key);
     let signature_arr = signature.serialize();
     assert_eq!(signature_arr.len(), SIGNATURE_SERIALIZED_SIZE);
 
@@ -90,7 +90,9 @@ pub fn new_secp256k1_instruction(
     }
 }
 
-pub fn construct_eth_pubkey(pubkey: &secp256k1::PublicKey) -> [u8; HASHED_PUBKEY_SERIALIZED_SIZE] {
+pub fn construct_eth_pubkey(
+    pubkey: &libsecp256k1::PublicKey,
+) -> [u8; HASHED_PUBKEY_SERIALIZED_SIZE] {
     let mut addr = [0u8; HASHED_PUBKEY_SERIALIZED_SIZE];
     addr.copy_from_slice(&sha3::Keccak256::digest(&pubkey.serialize()[1..])[12..]);
     assert_eq!(addr.len(), HASHED_PUBKEY_SERIALIZED_SIZE);
@@ -100,6 +102,7 @@ pub fn construct_eth_pubkey(pubkey: &secp256k1::PublicKey) -> [u8; HASHED_PUBKEY
 pub fn verify_eth_addresses(
     data: &[u8],
     instruction_datas: &[&[u8]],
+    libsecp256k1_0_5_upgrade_enabled: bool,
 ) -> Result<(), Secp256k1Error> {
     if data.is_empty() {
         return Err(Secp256k1Error::InvalidInstructionDataSize);
@@ -131,16 +134,25 @@ pub fn verify_eth_addresses(
         if sig_end >= signature_instruction.len() {
             return Err(Secp256k1Error::InvalidSignature);
         }
-        let signature =
-            secp256k1::Signature::parse_slice(&signature_instruction[sig_start..sig_end])
-                .map_err(|_| Secp256k1Error::InvalidSignature)?;
 
-        let recovery_id = secp256k1::RecoveryId::parse(signature_instruction[sig_end])
+        let sig_parse_result = if libsecp256k1_0_5_upgrade_enabled {
+            libsecp256k1::Signature::parse_standard_slice(
+                &signature_instruction[sig_start..sig_end],
+            )
+        } else {
+            libsecp256k1::Signature::parse_overflowing_slice(
+                &signature_instruction[sig_start..sig_end],
+            )
+        };
+
+        let signature = sig_parse_result.map_err(|_| Secp256k1Error::InvalidSignature)?;
+
+        let recovery_id = libsecp256k1::RecoveryId::parse(signature_instruction[sig_end])
             .map_err(|_| Secp256k1Error::InvalidRecoveryId)?;
 
         // Parse out pubkey
         let eth_address_slice = get_data_slice(
-            &instruction_datas,
+            instruction_datas,
             offsets.eth_address_instruction_index,
             offsets.eth_address_offset,
             HASHED_PUBKEY_SERIALIZED_SIZE,
@@ -148,7 +160,7 @@ pub fn verify_eth_addresses(
 
         // Parse out message
         let message_slice = get_data_slice(
-            &instruction_datas,
+            instruction_datas,
             offsets.message_instruction_index,
             offsets.message_data_offset,
             offsets.message_data_size as usize,
@@ -158,8 +170,8 @@ pub fn verify_eth_addresses(
         hasher.update(message_slice);
         let message_hash = hasher.finalize();
 
-        let pubkey = secp256k1::recover(
-            &secp256k1::Message::parse_slice(&message_hash).unwrap(),
+        let pubkey = libsecp256k1::recover(
+            &libsecp256k1::Message::parse_slice(&message_hash).unwrap(),
             &signature,
             &recovery_id,
         )
@@ -203,7 +215,7 @@ pub mod test {
         let writer = std::io::Cursor::new(&mut instruction_data[1..]);
         bincode::serialize_into(writer, &offsets).unwrap();
 
-        verify_eth_addresses(&instruction_data, &[&[0u8; 100]])
+        verify_eth_addresses(&instruction_data, &[&[0u8; 100]], false)
     }
 
     #[test]
@@ -218,7 +230,7 @@ pub mod test {
         instruction_data.truncate(instruction_data.len() - 1);
 
         assert_eq!(
-            verify_eth_addresses(&instruction_data, &[&[0u8; 100]]),
+            verify_eth_addresses(&instruction_data, &[&[0u8; 100]], false),
             Err(Secp256k1Error::InvalidInstructionDataSize)
         );
 
diff --git a/sdk/src/signature.rs b/sdk/src/signature.rs
index 725e6ffd886316..bf4f5e4322ef84 100644
--- a/sdk/src/signature.rs
+++ b/sdk/src/signature.rs
@@ -29,7 +29,7 @@ impl crate::sanitize::Sanitize for Signature {}
 
 impl Signature {
     pub fn new(signature_slice: &[u8]) -> Self {
-        Self(GenericArray::clone_from_slice(&signature_slice))
+        Self(GenericArray::clone_from_slice(signature_slice))
     }
 
     pub(self) fn verify_verbose(
@@ -54,7 +54,7 @@ pub trait Signable {
     }
     fn verify(&self) -> bool {
         self.get_signature()
-            .verify(&self.pubkey().as_ref(), self.signable_data().borrow())
+            .verify(self.pubkey().as_ref(), self.signable_data().borrow())
     }
 
     fn pubkey(&self) -> Pubkey;
diff --git a/sdk/src/signer/keypair.rs b/sdk/src/signer/keypair.rs
index aa6f463256817d..b32c348f9372e8 100644
--- a/sdk/src/signer/keypair.rs
+++ b/sdk/src/signer/keypair.rs
@@ -80,6 +80,10 @@ impl Signer for Keypair {
     fn try_sign_message(&self, message: &[u8]) -> Result<Signature, SignerError> {
         Ok(self.sign_message(message))
     }
+
+    fn is_interactive(&self) -> bool {
+        false
+    }
 }
 
 impl<T> PartialEq<T> for Keypair
diff --git a/sdk/src/signer/mod.rs b/sdk/src/signer/mod.rs
index bf7dcc52e05d4a..27a4d0706659f4 100644
--- a/sdk/src/signer/mod.rs
+++ b/sdk/src/signer/mod.rs
@@ -68,6 +68,8 @@ pub trait Signer {
     }
     /// Fallibly produces an Ed25519 signature over the provided `message` bytes.
     fn try_sign_message(&self, message: &[u8]) -> Result<Signature, SignerError>;
+    /// Whether the impelmentation requires user interaction to sign
+    fn is_interactive(&self) -> bool;
 }
 
 impl<T> From<T> for Box<dyn Signer>
diff --git a/sdk/src/signer/null_signer.rs b/sdk/src/signer/null_signer.rs
index d5b5ccd38bafcc..2e9508511832fd 100644
--- a/sdk/src/signer/null_signer.rs
+++ b/sdk/src/signer/null_signer.rs
@@ -28,6 +28,10 @@ impl Signer for NullSigner {
     fn try_sign_message(&self, _message: &[u8]) -> Result<Signature, SignerError> {
         Ok(Signature::default())
     }
+
+    fn is_interactive(&self) -> bool {
+        false
+    }
 }
 
 impl<T> PartialEq<T> for NullSigner
diff --git a/sdk/src/signer/presigner.rs b/sdk/src/signer/presigner.rs
index 4b9c12c11a7527..a5f16fb6e18f5c 100644
--- a/sdk/src/signer/presigner.rs
+++ b/sdk/src/signer/presigner.rs
@@ -46,6 +46,10 @@ impl Signer for Presigner {
             Err(PresignerError::VerificationFailure.into())
         }
     }
+
+    fn is_interactive(&self) -> bool {
+        false
+    }
 }
 
 impl<T> PartialEq<T> for Presigner
diff --git a/sdk/src/signer/signers.rs b/sdk/src/signer/signers.rs
index abc0772096a838..e4b07c8cd8305c 100644
--- a/sdk/src/signer/signers.rs
+++ b/sdk/src/signer/signers.rs
@@ -10,6 +10,7 @@ pub trait Signers {
     fn try_pubkeys(&self) -> Result<Vec<Pubkey>, SignerError>;
     fn sign_message(&self, message: &[u8]) -> Vec<Signature>;
     fn try_sign_message(&self, message: &[u8]) -> Result<Vec<Signature>, SignerError>;
+    fn is_interactive(&self) -> bool;
 }
 
 macro_rules! default_keypairs_impl {
@@ -39,6 +40,10 @@ macro_rules! default_keypairs_impl {
             }
             Ok(signatures)
         }
+
+        fn is_interactive(&self) -> bool {
+            self.iter().any(|s| s.is_interactive())
+        }
     };
 }
 
@@ -118,6 +123,9 @@ mod tests {
         fn try_sign_message(&self, _message: &[u8]) -> Result<Signature, SignerError> {
             Ok(Signature::default())
         }
+        fn is_interactive(&self) -> bool {
+            false
+        }
     }
 
     struct Bar;
@@ -128,6 +136,9 @@ mod tests {
         fn try_sign_message(&self, _message: &[u8]) -> Result<Signature, SignerError> {
             Ok(Signature::default())
         }
+        fn is_interactive(&self) -> bool {
+            false
+        }
     }
 
     #[test]
diff --git a/sdk/src/transaction.rs b/sdk/src/transaction.rs
index 077e1b21cd0d77..9e0fe7881ebdd7 100644
--- a/sdk/src/transaction.rs
+++ b/sdk/src/transaction.rs
@@ -8,6 +8,7 @@ use crate::{
     hash::Hash,
     instruction::{CompiledInstruction, Instruction, InstructionError},
     message::Message,
+    nonce::NONCED_TX_MARKER_IX_INDEX,
     program_utils::limited_deserialize,
     pubkey::Pubkey,
     short_vec,
@@ -112,9 +113,12 @@ impl From<SanitizeError> for TransactionError {
 #[frozen_abi(digest = "2Kr1C1pRytLsmUbg8p2nLoZyrjrEQCriAYLTCYvwj1Fo")]
 #[derive(Debug, PartialEq, Default, Eq, Clone, Serialize, Deserialize, AbiExample)]
 pub struct Transaction {
-    /// A set of digital signatures of `account_keys`, `program_ids`, `recent_blockhash`, and `instructions`, signed by the first
-    /// signatures.len() keys of account_keys
-    /// NOTE: Serialization-related changes must be paired with the direct read at sigverify.
+    /// A set of digital signatures of a serialized [`Message`], signed by the
+    /// first `signatures.len()` keys of [`account_keys`].
+    ///
+    /// [`account_keys`]: Message::account_keys
+    ///
+    // NOTE: Serialization-related changes must be paired with the direct read at sigverify.
     #[serde(with = "short_vec")]
     pub signatures: Vec<Signature>,
 
@@ -361,6 +365,11 @@ impl Transaction {
         }
     }
 
+    /// Verify the length of signatures matches the value in the message header
+    pub fn verify_signatures_len(&self) -> bool {
+        self.signatures.len() == self.message.header.num_required_signatures as usize
+    }
+
     /// Verify the transaction and hash its message
     pub fn verify_and_hash_message(&self) -> Result<Hash> {
         let message_bytes = self.message_data();
@@ -387,7 +396,7 @@ impl Transaction {
             .collect()
     }
 
-    pub fn verify_precompiles(&self) -> Result<()> {
+    pub fn verify_precompiles(&self, libsecp256k1_0_5_upgrade_enabled: bool) -> Result<()> {
         for instruction in &self.message().instructions {
             // The Transaction may not be sanitized at this point
             if instruction.program_id_index as usize >= self.message().account_keys.len() {
@@ -402,7 +411,11 @@ impl Transaction {
                     .map(|instruction| instruction.data.as_ref())
                     .collect();
                 let data = &instruction.data;
-                let e = verify_eth_addresses(data, &instruction_datas);
+                let e = verify_eth_addresses(
+                    data,
+                    &instruction_datas,
+                    libsecp256k1_0_5_upgrade_enabled,
+                );
                 e.map_err(|_| TransactionError::InvalidAccountIndex)?;
             }
         }
@@ -455,11 +468,11 @@ pub fn uses_durable_nonce(tx: &Transaction) -> Option<&CompiledInstruction> {
     let message = tx.message();
     message
         .instructions
-        .get(0)
+        .get(NONCED_TX_MARKER_IX_INDEX as usize)
         .filter(|maybe_ix| {
             let prog_id_idx = maybe_ix.program_id_index as usize;
             match message.account_keys.get(prog_id_idx) {
-                Some(program_id) => system_program::check_id(&program_id),
+                Some(program_id) => system_program::check_id(program_id),
                 _ => false,
             }
         } && matches!(limited_deserialize(&maybe_ix.data), Ok(SystemInstruction::AdvanceNonceAccount))
@@ -968,7 +981,7 @@ mod tests {
         let (_, nonce_pubkey, tx) = nonced_transfer_tx();
         let nonce_ix = uses_durable_nonce(&tx).unwrap();
         assert_eq!(
-            get_nonce_pubkey_from_instruction(&nonce_ix, &tx),
+            get_nonce_pubkey_from_instruction(nonce_ix, &tx),
             Some(&nonce_pubkey),
         );
     }
diff --git a/stake-accounts/Cargo.toml b/stake-accounts/Cargo.toml
index f13b6316053e02..b769249641bfbc 100644
--- a/stake-accounts/Cargo.toml
+++ b/stake-accounts/Cargo.toml
@@ -3,7 +3,7 @@ name = "solana-stake-accounts"
 description = "Blockchain, Rebuilt for Scale"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 edition = "2018"
-version = "1.7.0"
+version = "1.7.11"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
@@ -11,15 +11,15 @@ documentation = "https://docs.rs/solana-stake-accounts"
 
 [dependencies]
 clap = "2.33.1"
-solana-clap-utils = { path = "../clap-utils", version = "=1.7.0" }
-solana-cli-config = { path = "../cli-config", version = "=1.7.0" }
-solana-client = { path = "../client", version = "=1.7.0" }
-solana-remote-wallet = { path = "../remote-wallet", version = "=1.7.0" }
-solana-sdk = { path = "../sdk", version = "=1.7.0" }
-solana-stake-program = { path = "../programs/stake", version = "=1.7.0" }
+solana-clap-utils = { path = "../clap-utils", version = "=1.7.11" }
+solana-cli-config = { path = "../cli-config", version = "=1.7.11" }
+solana-client = { path = "../client", version = "=1.7.11" }
+solana-remote-wallet = { path = "../remote-wallet", version = "=1.7.11" }
+solana-sdk = { path = "../sdk", version = "=1.7.11" }
+solana-stake-program = { path = "../programs/stake", version = "=1.7.11" }
 
 [dev-dependencies]
-solana-runtime = { path = "../runtime", version = "=1.7.0" }
+solana-runtime = { path = "../runtime", version = "=1.7.11" }
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
diff --git a/stake-accounts/src/args.rs b/stake-accounts/src/args.rs
index 025b07adaebcbd..56a0a3a6fe5bed 100644
--- a/stake-accounts/src/args.rs
+++ b/stake-accounts/src/args.rs
@@ -272,15 +272,15 @@ pub(crate) fn resolve_command(
             Ok(Command::Balance(resolved_args))
         }
         Command::Authorize(args) => {
-            let resolved_args = resolve_authorize_args(&mut wallet_manager, &args)?;
+            let resolved_args = resolve_authorize_args(&mut wallet_manager, args)?;
             Ok(Command::Authorize(resolved_args))
         }
         Command::SetLockup(args) => {
-            let resolved_args = resolve_set_lockup_args(&mut wallet_manager, &args)?;
+            let resolved_args = resolve_set_lockup_args(&mut wallet_manager, args)?;
             Ok(Command::SetLockup(resolved_args))
         }
         Command::Rebase(args) => {
-            let resolved_args = resolve_rebase_args(&mut wallet_manager, &args)?;
+            let resolved_args = resolve_rebase_args(&mut wallet_manager, args)?;
             Ok(Command::Rebase(resolved_args))
         }
         Command::Move(args) => {
diff --git a/stake-accounts/src/main.rs b/stake-accounts/src/main.rs
index 37a4da0cb8be18..94cca8701d4ff3 100644
--- a/stake-accounts/src/main.rs
+++ b/stake-accounts/src/main.rs
@@ -16,12 +16,10 @@ use solana_sdk::{
     pubkey::Pubkey,
     signature::{unique_signers, Signature, Signer},
     signers::Signers,
+    stake::{instruction::LockupArgs, state::Lockup},
     transaction::Transaction,
 };
-use solana_stake_program::{
-    stake_instruction::LockupArgs,
-    stake_state::{Lockup, StakeState},
-};
+use solana_stake_program::stake_state;
 use std::env;
 use std::error::Error;
 
@@ -52,7 +50,7 @@ fn get_balances(
 fn get_lockup(client: &RpcClient, address: &Pubkey) -> Result<Lockup, ClientError> {
     client
         .get_account(address)
-        .map(|account| StakeState::lockup_from(&account).unwrap())
+        .map(|account| stake_state::lockup_from(&account).unwrap())
 }
 
 fn get_lockups(
@@ -116,7 +114,7 @@ fn process_lockup_stake_accounts(
 ) -> Result<(), ClientError> {
     let addresses =
         stake_accounts::derive_stake_account_addresses(&args.base_pubkey, args.num_accounts);
-    let existing_lockups = get_lockups(&client, addresses)?;
+    let existing_lockups = get_lockups(client, addresses)?;
 
     let lockup = LockupArgs {
         epoch: args.lockup_epoch,
@@ -145,7 +143,7 @@ fn process_rebase_stake_accounts(
 ) -> Result<(), ClientError> {
     let addresses =
         stake_accounts::derive_stake_account_addresses(&args.base_pubkey, args.num_accounts);
-    let balances = get_balances(&client, addresses)?;
+    let balances = get_balances(client, addresses)?;
 
     let messages = stake_accounts::rebase_stake_accounts(
         &args.fee_payer.pubkey(),
@@ -174,7 +172,7 @@ fn process_move_stake_accounts(
     let args = &move_args.rebase_args;
     let addresses =
         stake_accounts::derive_stake_account_addresses(&args.base_pubkey, args.num_accounts);
-    let balances = get_balances(&client, addresses)?;
+    let balances = get_balances(client, addresses)?;
 
     let messages = stake_accounts::move_stake_accounts(
         &args.fee_payer.pubkey(),
diff --git a/stake-accounts/src/stake_accounts.rs b/stake-accounts/src/stake_accounts.rs
index 86dd6f956954a4..ef183c338b34d4 100644
--- a/stake-accounts/src/stake_accounts.rs
+++ b/stake-accounts/src/stake_accounts.rs
@@ -1,16 +1,20 @@
 use solana_sdk::{
-    clock::SECONDS_PER_DAY, instruction::Instruction, message::Message, pubkey::Pubkey,
-};
-use solana_stake_program::{
-    stake_instruction::{self, LockupArgs},
-    stake_state::{Authorized, Lockup, StakeAuthorize},
+    clock::SECONDS_PER_DAY,
+    instruction::Instruction,
+    message::Message,
+    pubkey::Pubkey,
+    stake::{
+        self,
+        instruction::{self as stake_instruction, LockupArgs},
+        state::{Authorized, Lockup, StakeAuthorize},
+    },
 };
 
 const DAYS_PER_YEAR: f64 = 365.25;
 const SECONDS_PER_YEAR: i64 = (SECONDS_PER_DAY as f64 * DAYS_PER_YEAR) as i64;
 
 pub(crate) fn derive_stake_account_address(base_pubkey: &Pubkey, i: usize) -> Pubkey {
-    Pubkey::create_with_seed(base_pubkey, &i.to_string(), &solana_stake_program::id()).unwrap()
+    Pubkey::create_with_seed(base_pubkey, &i.to_string(), &stake::program::id()).unwrap()
 }
 
 // Return derived addresses
@@ -45,7 +49,7 @@ pub(crate) fn new_stake_account(
     let instructions = stake_instruction::create_account_with_seed(
         funding_pubkey,
         &stake_account_address,
-        &base_pubkey,
+        base_pubkey,
         &index.to_string(),
         &authorized,
         &lockup,
@@ -62,14 +66,14 @@ fn authorize_stake_accounts_instructions(
     new_withdraw_authority_pubkey: &Pubkey,
 ) -> Vec<Instruction> {
     let instruction0 = stake_instruction::authorize(
-        &stake_account_address,
+        stake_account_address,
         stake_authority_pubkey,
         new_stake_authority_pubkey,
         StakeAuthorize::Staker,
         None,
     );
     let instruction1 = stake_instruction::authorize(
-        &stake_account_address,
+        stake_account_address,
         withdraw_authority_pubkey,
         new_withdraw_authority_pubkey,
         StakeAuthorize::Withdrawer,
@@ -98,7 +102,7 @@ fn rebase_stake_account(
         new_base_pubkey,
         &i.to_string(),
     );
-    let message = Message::new(&instructions, Some(&fee_payer_pubkey));
+    let message = Message::new(&instructions, Some(fee_payer_pubkey));
     Some(message)
 }
 
@@ -135,7 +139,7 @@ fn move_stake_account(
     );
 
     instructions.extend(authorize_instructions.into_iter());
-    let message = Message::new(&instructions, Some(&fee_payer_pubkey));
+    let message = Message::new(&instructions, Some(fee_payer_pubkey));
     Some(message)
 }
 
@@ -159,7 +163,7 @@ pub(crate) fn authorize_stake_accounts(
                 new_stake_authority_pubkey,
                 new_withdraw_authority_pubkey,
             );
-            Message::new(&instructions, Some(&fee_payer_pubkey))
+            Message::new(&instructions, Some(fee_payer_pubkey))
         })
         .collect::<Vec<_>>()
 }
@@ -219,7 +223,7 @@ pub(crate) fn lockup_stake_accounts(
                 return None;
             }
             let instruction = stake_instruction::set_lockup(address, &lockup, custodian_pubkey);
-            let message = Message::new(&[instruction], Some(&fee_payer_pubkey));
+            let message = Message::new(&[instruction], Some(fee_payer_pubkey));
             Some(message)
         })
         .collect()
@@ -284,8 +288,9 @@ mod tests {
         client::SyncClient,
         genesis_config::create_genesis_config,
         signature::{Keypair, Signer},
+        stake::state::StakeState,
     };
-    use solana_stake_program::stake_state::StakeState;
+    use solana_stake_program::stake_state;
 
     fn create_bank(lamports: u64) -> (Bank, Keypair, u64) {
         let (genesis_config, mint_keypair) = create_genesis_config(lamports);
@@ -301,7 +306,7 @@ mod tests {
     ) -> Keypair {
         let fee_payer_keypair = Keypair::new();
         client
-            .transfer_and_confirm(lamports, &funding_keypair, &fee_payer_keypair.pubkey())
+            .transfer_and_confirm(lamports, funding_keypair, &fee_payer_keypair.pubkey())
             .unwrap();
         fee_payer_keypair
     }
@@ -311,7 +316,7 @@ mod tests {
         base_pubkey: &Pubkey,
         i: usize,
     ) -> AccountSharedData {
-        let account_address = derive_stake_account_address(&base_pubkey, i);
+        let account_address = derive_stake_account_address(base_pubkey, i);
         AccountSharedData::from(client.get_account(&account_address).unwrap().unwrap())
     }
 
@@ -322,7 +327,7 @@ mod tests {
     ) -> Vec<(Pubkey, u64)> {
         (0..num_accounts)
             .map(|i| {
-                let address = derive_stake_account_address(&base_pubkey, i);
+                let address = derive_stake_account_address(base_pubkey, i);
                 (address, client.get_balance(&address).unwrap())
             })
             .collect()
@@ -335,10 +340,10 @@ mod tests {
     ) -> Vec<(Pubkey, Lockup)> {
         (0..num_accounts)
             .map(|i| {
-                let address = derive_stake_account_address(&base_pubkey, i);
+                let address = derive_stake_account_address(base_pubkey, i);
                 let account =
                     AccountSharedData::from(client.get_account(&address).unwrap().unwrap());
-                (address, StakeState::lockup_from(&account).unwrap())
+                (address, stake_state::lockup_from(&account).unwrap())
             })
             .collect()
     }
@@ -375,7 +380,7 @@ mod tests {
 
         let account = get_account_at(&bank_client, &base_pubkey, 0);
         assert_eq!(account.lamports(), lamports);
-        let authorized = StakeState::authorized_from(&account).unwrap();
+        let authorized = stake_state::authorized_from(&account).unwrap();
         assert_eq!(authorized.staker, stake_authority_pubkey);
         assert_eq!(authorized.withdrawer, withdraw_authority_pubkey);
     }
@@ -437,7 +442,7 @@ mod tests {
         }
 
         let account = get_account_at(&bank_client, &base_pubkey, 0);
-        let authorized = StakeState::authorized_from(&account).unwrap();
+        let authorized = stake_state::authorized_from(&account).unwrap();
         assert_eq!(authorized.staker, new_stake_authority_pubkey);
         assert_eq!(authorized.withdrawer, new_withdraw_authority_pubkey);
     }
@@ -493,7 +498,7 @@ mod tests {
         }
 
         let account = get_account_at(&bank_client, &base_pubkey, 0);
-        let lockup = StakeState::lockup_from(&account).unwrap();
+        let lockup = stake_state::lockup_from(&account).unwrap();
         assert_eq!(lockup.unix_timestamp, 1);
         assert_eq!(lockup.epoch, 0);
 
@@ -586,7 +591,7 @@ mod tests {
 
         // Ensure the new accounts are duplicates of the previous ones.
         let account = get_account_at(&bank_client, &new_base_pubkey, 0);
-        let authorized = StakeState::authorized_from(&account).unwrap();
+        let authorized = stake_state::authorized_from(&account).unwrap();
         assert_eq!(authorized.staker, stake_authority_pubkey);
         assert_eq!(authorized.withdrawer, withdraw_authority_pubkey);
     }
@@ -655,7 +660,7 @@ mod tests {
 
         // Ensure the new accounts have the new authorities.
         let account = get_account_at(&bank_client, &new_base_pubkey, 0);
-        let authorized = StakeState::authorized_from(&account).unwrap();
+        let authorized = stake_state::authorized_from(&account).unwrap();
         assert_eq!(authorized.staker, new_stake_authority_pubkey);
         assert_eq!(authorized.withdrawer, new_withdraw_authority_pubkey);
     }
diff --git a/stake-monitor/Cargo.toml b/stake-monitor/Cargo.toml
index bcad4696ba4127..45f2e4679cc34b 100644
--- a/stake-monitor/Cargo.toml
+++ b/stake-monitor/Cargo.toml
@@ -3,7 +3,7 @@ authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 edition = "2018"
 name = "solana-stake-monitor"
 description = "Blockchain, Rebuilt for Scale"
-version = "1.7.0"
+version = "1.7.11"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
@@ -11,24 +11,24 @@ documentation = "https://docs.rs/solana-stake-monitor"
 
 [dependencies]
 clap = "2.33.1"
-console = "0.11.3"
+console = "0.14.1"
 log = "0.4.11"
 serde = "1.0.122"
 serde_yaml = "0.8.13"
-solana-clap-utils = { path = "../clap-utils", version = "=1.7.0" }
-solana-cli-config = { path = "../cli-config", version = "=1.7.0" }
-solana-client = { path = "../client", version = "=1.7.0" }
-solana-logger = { path = "../logger", version = "=1.7.0" }
-solana-metrics = { path = "../metrics", version = "=1.7.0" }
-solana-sdk = { path = "../sdk", version = "=1.7.0" }
-solana-stake-program = { path = "../programs/stake", version = "=1.7.0" }
-solana-transaction-status = { path = "../transaction-status", version = "=1.7.0" }
-solana-version = { path = "../version", version = "=1.7.0" }
+solana-clap-utils = { path = "../clap-utils", version = "=1.7.11" }
+solana-cli-config = { path = "../cli-config", version = "=1.7.11" }
+solana-client = { path = "../client", version = "=1.7.11" }
+solana-logger = { path = "../logger", version = "=1.7.11" }
+solana-metrics = { path = "../metrics", version = "=1.7.11" }
+solana-rpc = { path = "../rpc", version = "=1.7.11" }
+solana-sdk = { path = "../sdk", version = "=1.7.11" }
+solana-transaction-status = { path = "../transaction-status", version = "=1.7.11" }
+solana-version = { path = "../version", version = "=1.7.11" }
 
 [dev-dependencies]
 serial_test = "0.4.0"
-solana-local-cluster = { path = "../local-cluster", version = "=1.7.0" }
-solana-core = { path = "../core", version = "=1.7.0" }
+solana-local-cluster = { path = "../local-cluster", version = "=1.7.11" }
+solana-core = { path = "../core", version = "=1.7.11" }
 tempfile = "3.1.0"
 
 [[bin]]
diff --git a/stake-monitor/README.md b/stake-monitor/README.md
deleted file mode 100644
index 6e9e719ddb165d..00000000000000
--- a/stake-monitor/README.md
+++ /dev/null
@@ -1,17 +0,0 @@
-## Overview
-`solana-stake-monitor` is a utility that scans all transactions to ensure that stake accounts remain in compliance with the following rules:
-
-1. The stake account must be created after genesis
-1. The "compliant balance" of a stake account is set upon stake account initialization, system transfers of additional funds into a compliant stake account are excluded from the "compliant balance"
-1. The stake account cannot have a lockup or custodian
-1. Withdrawing funds from the stake account trigger non-compliance
-1. Stake accounts split from a compliant stake account remain compliant, and the "compliant balance" is adjusted accordingly for the original stake account
-
-In terms of `solana` command-line subcommands:
-* `create-stake-account`: Creates a compliant stake account provided the `--lockup-date`, `--lockup-epoch`, or `--custodian` options are not specified
-* `delegate-stake` / `deactivate-stake` / `stake-authorize` / `split-stake`: These commands do not affect compliance
-* `withdraw-stake` / `stake-set-lockup`: These commands will cause non-compliance
-* `transfer`:  Any additional funds transferred after `create-stake-account` are excluded from the "compliant balance"
-
-System accounts can also be manually enrolled with the `solana-stake-monitor enroll` subcommand.
-An enrolled system account must always maintain a balance greater than the balance it had at enrollment minus 1 SOL.
diff --git a/stake-monitor/src/lib.rs b/stake-monitor/src/lib.rs
deleted file mode 100644
index 2b6f3fd5584a42..00000000000000
--- a/stake-monitor/src/lib.rs
+++ /dev/null
@@ -1,789 +0,0 @@
-#![allow(clippy::integer_arithmetic)]
-use log::*;
-use serde::{Deserialize, Serialize};
-use solana_client::{client_error::Result as ClientResult, rpc_client::RpcClient};
-use solana_metrics::{datapoint_error, datapoint_info};
-use solana_sdk::{
-    clock::Slot, native_token::LAMPORTS_PER_SOL, program_utils::limited_deserialize,
-    pubkey::Pubkey, signature::Signature, transaction::Transaction,
-};
-use solana_stake_program::{stake_instruction::StakeInstruction, stake_state::Lockup};
-use solana_transaction_status::{
-    EncodedConfirmedBlock, UiTransactionEncoding, UiTransactionStatusMeta,
-};
-use std::{collections::HashMap, thread::sleep, time::Duration};
-
-pub type PubkeyString = String;
-pub type SignatureString = String;
-
-#[derive(Serialize, Deserialize, Debug, PartialEq)]
-pub enum AccountOperation {
-    Initialize,
-    Withdraw,
-    SplitSource,
-    SplitDestination,
-    SystemAccountEnroll,
-    FailedToMaintainMinimumBalance,
-    MergeSource,
-}
-
-#[derive(Serialize, Deserialize, Debug)]
-pub struct AccountTransactionInfo {
-    pub op: AccountOperation,
-    pub slot: Slot,                 // Slot the transaction completed in
-    pub signature: SignatureString, // Transaction signature
-}
-
-#[derive(Serialize, Deserialize, Debug)]
-pub struct AccountInfo {
-    pub compliant_since: Option<Slot>, // The slot when the account was first in compliance
-    pub lamports: u64,                 // Account balance
-    pub transactions: Vec<AccountTransactionInfo>, // Transactions affecting the account
-}
-
-#[derive(Serialize, Deserialize, Default, Debug)]
-pub struct AccountsInfo {
-    pub slot: Slot, // Latest processed slot
-    pub account_info: HashMap<PubkeyString, AccountInfo>,
-}
-
-impl AccountsInfo {
-    // System accounts must be explicitly enrolled
-    pub fn enroll_system_account(&mut self, account_address: &Pubkey, slot: Slot, lamports: u64) {
-        self.account_info.insert(
-            account_address.to_string(),
-            AccountInfo {
-                compliant_since: Some(slot),
-                lamports,
-                transactions: vec![AccountTransactionInfo {
-                    op: AccountOperation::SystemAccountEnroll,
-                    slot,
-                    signature: Signature::default().to_string(),
-                }],
-            },
-        );
-    }
-}
-
-fn process_transaction(
-    slot: Slot,
-    transaction: &Transaction,
-    meta: &UiTransactionStatusMeta,
-    accounts: &mut HashMap<PubkeyString, AccountInfo>,
-) {
-    let mut last_instruction = true;
-    let message = &transaction.message;
-    let signature = transaction.signatures[0].to_string();
-
-    // Look for stake operations
-    for instruction in message.instructions.iter().rev() {
-        let program_pubkey = message.account_keys[instruction.program_id_index as usize];
-        if program_pubkey != solana_stake_program::id() {
-            continue;
-        }
-
-        // Only look for stake instructions in the last instruction of a
-        // transaction.  This ensures that the `meta.post_balances` for the
-        // transaction reflects the account balances after the stake instruction
-        // executed.  At this time the `solana` cli will only create transactions with the stake
-        // instruction as the last instruction.
-        if !last_instruction {
-            datapoint_error!(
-                "stake-monitor-failure",
-                ("slot", slot, i64),
-                ("err", "Stake instruction ignored", String)
-            );
-            continue;
-        }
-        last_instruction = false;
-
-        match limited_deserialize::<StakeInstruction>(&instruction.data) {
-            Err(err) => datapoint_error!(
-                "stake-monitor-failure",
-                ("slot", slot, i64),
-                (
-                    "err",
-                    format!("Failed to deserialize stake instruction: {}", err),
-                    String
-                )
-            ),
-            Ok(stake_instruction) => {
-                match stake_instruction {
-                    StakeInstruction::Initialize(_authorized, lockup) => {
-                        // The initialized stake account is at instruction account 0
-                        let stake_account_index = instruction.accounts[0] as usize;
-
-                        let stake_pubkey = message.account_keys[stake_account_index].to_string();
-
-                        // The amount staked is the stake account's post balance
-                        let lamports = meta.post_balances[stake_account_index];
-
-                        accounts.insert(
-                            stake_pubkey,
-                            AccountInfo {
-                                compliant_since: if lockup != Lockup::default() {
-                                    None // Initialize with a lockup or custodian is non-compliant
-                                } else {
-                                    Some(slot)
-                                },
-                                lamports,
-                                transactions: vec![AccountTransactionInfo {
-                                    op: AccountOperation::Initialize,
-                                    slot,
-                                    signature: signature.clone(),
-                                }],
-                            },
-                        );
-                    }
-                    StakeInstruction::Authorize(_, _)
-                    | StakeInstruction::AuthorizeWithSeed(_)
-                    | StakeInstruction::DelegateStake
-                    | StakeInstruction::Deactivate => {
-                        // These instructions are always permitted
-                    }
-                    StakeInstruction::Split(lamports) => {
-                        // Split is permitted and propagates compliance
-                        let source_stake_account_index = instruction.accounts[0] as usize;
-                        let split_stake_account_index = instruction.accounts[1] as usize;
-
-                        let source_stake_pubkey =
-                            message.account_keys[source_stake_account_index].to_string();
-                        let split_stake_pubkey =
-                            message.account_keys[split_stake_account_index].to_string();
-
-                        if let Some(mut source_account_info) =
-                            accounts.get_mut(&source_stake_pubkey)
-                        {
-                            if source_account_info.compliant_since.is_some() {
-                                source_account_info
-                                    .transactions
-                                    .push(AccountTransactionInfo {
-                                        op: AccountOperation::SplitSource,
-                                        slot,
-                                        signature: signature.clone(),
-                                    });
-                                source_account_info.lamports -= lamports;
-
-                                let split_account_info = AccountInfo {
-                                    compliant_since: source_account_info.compliant_since,
-                                    lamports,
-                                    transactions: vec![AccountTransactionInfo {
-                                        op: AccountOperation::SplitDestination,
-                                        slot,
-                                        signature: signature.clone(),
-                                    }],
-                                };
-                                accounts.insert(split_stake_pubkey, split_account_info);
-                            }
-                        }
-                    }
-                    StakeInstruction::Merge => {
-                        // Merge invalidates the source account, but does not affect the
-                        // destination account
-                        let source_merge_account_index = instruction.accounts[1] as usize;
-
-                        let source_stake_pubkey =
-                            message.account_keys[source_merge_account_index].to_string();
-
-                        if let Some(mut source_account_info) =
-                            accounts.get_mut(&source_stake_pubkey)
-                        {
-                            if source_account_info.compliant_since.is_some() {
-                                source_account_info.compliant_since = None;
-                                source_account_info
-                                    .transactions
-                                    .push(AccountTransactionInfo {
-                                        op: AccountOperation::MergeSource,
-                                        slot,
-                                        signature: signature.clone(),
-                                    });
-                            }
-                        }
-                    }
-                    StakeInstruction::Withdraw(_) => {
-                        // Withdrawing is not permitted
-
-                        let stake_account_index = instruction.accounts[0] as usize;
-                        let stake_pubkey = message.account_keys[stake_account_index].to_string();
-
-                        if let Some(mut account_info) = accounts.get_mut(&stake_pubkey) {
-                            if account_info.compliant_since.is_some() {
-                                account_info.compliant_since = None;
-                                account_info.transactions.push(AccountTransactionInfo {
-                                    op: AccountOperation::Withdraw,
-                                    slot,
-                                    signature: signature.clone(),
-                                });
-                            }
-                        }
-                    }
-                    StakeInstruction::SetLockup(_lockup_args) => {
-                        // No processing is required because SetLockup requires a custodian key,
-                        // and this is already blocked in the StakeInstruction::Initialize
-                        // processing
-                    }
-                }
-            }
-        }
-    }
-
-    // Ensure the balances of all monitored accounts remain in compliance
-    for (index, account_pubkey) in message.account_keys.iter().enumerate() {
-        if let Some(mut account_info) = accounts.get_mut(&account_pubkey.to_string()) {
-            let post_balance = meta.post_balances[index];
-            if account_info.compliant_since.is_some()
-                && post_balance <= account_info.lamports.saturating_sub(LAMPORTS_PER_SOL)
-            {
-                account_info.compliant_since = None;
-                account_info.transactions.push(AccountTransactionInfo {
-                    op: AccountOperation::FailedToMaintainMinimumBalance,
-                    slot,
-                    signature: signature.clone(),
-                });
-            }
-        }
-    }
-}
-
-fn process_confirmed_block(
-    slot: Slot,
-    confirmed_block: EncodedConfirmedBlock,
-    accounts: &mut HashMap<PubkeyString, AccountInfo>,
-) {
-    for rpc_transaction in confirmed_block.transactions {
-        match rpc_transaction.meta {
-            None => {
-                datapoint_error!(
-                    "stake-monitor-failure",
-                    ("slot", slot, i64),
-                    ("err", "Transaction meta not available", String)
-                );
-            }
-            Some(meta) => {
-                if meta.err.is_none() {
-                    if let Some(transaction) = rpc_transaction.transaction.decode() {
-                        if transaction.verify().is_ok() {
-                            process_transaction(slot, &transaction, &meta, accounts);
-                        } else {
-                            datapoint_error!(
-                                "stake-monitor-failure",
-                                ("slot", slot, i64),
-                                ("err", "Transaction signature verification failed", String)
-                            );
-                        }
-                    } else {
-                        error!("Transaction decode failed");
-                    }
-                }
-            }
-        }
-    }
-}
-
-fn load_blocks(
-    rpc_client: &RpcClient,
-    start_slot: Slot,
-    end_slot: Slot,
-) -> ClientResult<Vec<(Slot, EncodedConfirmedBlock)>> {
-    info!(
-        "Loading confirmed blocks between slots: {} - {}",
-        start_slot, end_slot
-    );
-
-    let slots = rpc_client.get_blocks(start_slot, Some(end_slot))?;
-
-    let mut blocks = vec![];
-    for slot in slots.into_iter() {
-        let block = rpc_client.get_block_with_encoding(slot, UiTransactionEncoding::Base64)?;
-        blocks.push((slot, block));
-    }
-    Ok(blocks)
-}
-
-pub fn process_slots(rpc_client: &RpcClient, accounts_info: &mut AccountsInfo, batch_size: u64) {
-    let end_slot = accounts_info.slot + batch_size;
-    loop {
-        let start_slot = accounts_info.slot + 1;
-        info!("start_slot:{} - end_slot:{}", start_slot, end_slot);
-        if start_slot >= end_slot {
-            break;
-        }
-        let latest_available_slot = rpc_client.get_slot().unwrap_or_else(|err| {
-            datapoint_error!(
-                "stake-monitor-failure",
-                ("err", format!("get_slot() failed: {}", err), String)
-            );
-            0
-        });
-
-        if accounts_info.slot >= latest_available_slot {
-            info!("Waiting for a slot greater than {}...", accounts_info.slot);
-            sleep(Duration::from_secs(5));
-            continue;
-        }
-
-        match load_blocks(&rpc_client, start_slot, end_slot) {
-            Ok(blocks) => {
-                info!("Loaded {} blocks", blocks.len());
-
-                if blocks.is_empty() && end_slot < latest_available_slot {
-                    accounts_info.slot = end_slot;
-                } else {
-                    for (slot, block) in blocks.into_iter() {
-                        process_confirmed_block(slot, block, &mut accounts_info.account_info);
-                        accounts_info.slot = slot;
-                    }
-                }
-                datapoint_info!("stake-monitor-slot", ("slot", accounts_info.slot, i64));
-            }
-            Err(err) => {
-                datapoint_error!(
-                    "stake-monitor-failure",
-                    (
-                        "err",
-                        format!(
-                            "failed to get blocks in range ({},{}): {}",
-                            start_slot, end_slot, err
-                        ),
-                        String
-                    )
-                );
-                sleep(Duration::from_secs(1));
-            }
-        }
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use super::*;
-    use serial_test::serial;
-    use solana_client::rpc_config::RpcSendTransactionConfig;
-    use solana_core::{rpc::JsonRpcConfig, validator::ValidatorConfig};
-    use solana_local_cluster::local_cluster::{ClusterConfig, LocalCluster};
-    use solana_sdk::{
-        commitment_config::CommitmentConfig,
-        genesis_config::ClusterType,
-        message::Message,
-        native_token::sol_to_lamports,
-        signature::{Keypair, Signer},
-        system_transaction,
-        transaction::Transaction,
-    };
-    use solana_stake_program::{stake_instruction, stake_state::Authorized};
-
-    #[test]
-    #[serial]
-    fn test_record() {
-        solana_logger::setup();
-        let mut accounts_info = AccountsInfo::default();
-
-        let one_sol = sol_to_lamports(1.0);
-        let cluster = LocalCluster::new(&mut ClusterConfig {
-            cluster_type: ClusterType::MainnetBeta,
-            node_stakes: vec![10; 1],
-            cluster_lamports: sol_to_lamports(1_000_000_000.0),
-            validator_configs: vec![ValidatorConfig {
-                rpc_config: JsonRpcConfig {
-                    enable_rpc_transaction_history: true,
-                    ..JsonRpcConfig::default()
-                },
-                ..ValidatorConfig::default()
-            }],
-            ..ClusterConfig::default()
-        });
-
-        let payer = &cluster.funding_keypair;
-
-        let rpc_client = RpcClient::new_socket(cluster.entry_point_info.rpc);
-
-        let (blockhash, _fee_calculator) = rpc_client.get_recent_blockhash().unwrap();
-
-        // Configure stake1
-        let stake1_keypair = Keypair::new();
-        let instructions = stake_instruction::create_account(
-            &payer.pubkey(),
-            &stake1_keypair.pubkey(),
-            &Authorized::auto(&payer.pubkey()),
-            &Lockup::default(),
-            one_sol,
-        );
-        let message = Message::new(&instructions, Some(&payer.pubkey()));
-        let stake1_signature = rpc_client
-            .send_transaction(&Transaction::new(
-                &[&payer, &stake1_keypair],
-                message,
-                blockhash,
-            ))
-            .unwrap();
-
-        rpc_client
-            .poll_for_signature_with_commitment(&stake1_signature, CommitmentConfig::processed())
-            .unwrap();
-
-        // A balance increase by system transfer is ignored
-        rpc_client
-            .send_transaction(&system_transaction::transfer(
-                &payer,
-                &stake1_keypair.pubkey(),
-                one_sol,
-                blockhash,
-            ))
-            .unwrap();
-
-        // Configure stake2 with non-compliant lockup
-        let stake2_keypair = Keypair::new();
-        let instructions = stake_instruction::create_account(
-            &payer.pubkey(),
-            &stake2_keypair.pubkey(),
-            &Authorized::auto(&payer.pubkey()),
-            &Lockup {
-                custodian: payer.pubkey(),
-                ..Lockup::default()
-            },
-            one_sol,
-        );
-        let message = Message::new(&instructions, Some(&payer.pubkey()));
-        let stake2_signature = rpc_client
-            .send_transaction(&Transaction::new(
-                &[&payer, &stake2_keypair],
-                message,
-                blockhash,
-            ))
-            .unwrap();
-
-        // Configure stake3
-        let stake3_keypair = Keypair::new();
-        let instructions = stake_instruction::create_account(
-            &payer.pubkey(),
-            &stake3_keypair.pubkey(),
-            &Authorized::auto(&stake3_keypair.pubkey()),
-            &Lockup::default(),
-            one_sol,
-        );
-        let message = Message::new(&instructions, Some(&payer.pubkey()));
-        let stake3_initialize_signature = rpc_client
-            .send_transaction(&Transaction::new(
-                &[&payer, &stake3_keypair],
-                message,
-                blockhash,
-            ))
-            .unwrap();
-
-        rpc_client
-            .poll_for_signature_with_commitment(
-                &stake3_initialize_signature,
-                CommitmentConfig::processed(),
-            )
-            .unwrap();
-
-        // Withdraw instruction causes non-compliance
-        let stake3_withdraw_signature = rpc_client
-            .send_transaction_with_config(
-                &Transaction::new(
-                    &[&payer, &stake3_keypair],
-                    Message::new(
-                        &[stake_instruction::withdraw(
-                            &stake3_keypair.pubkey(),
-                            &stake3_keypair.pubkey(),
-                            &payer.pubkey(),
-                            one_sol,
-                            None,
-                        )],
-                        Some(&payer.pubkey()),
-                    ),
-                    blockhash,
-                ),
-                RpcSendTransactionConfig {
-                    skip_preflight: true,
-                    ..RpcSendTransactionConfig::default()
-                },
-            )
-            .unwrap();
-
-        rpc_client
-            .poll_for_signature_with_commitment(
-                &stake3_withdraw_signature,
-                CommitmentConfig::processed(),
-            )
-            .unwrap();
-
-        // Configure stake4
-        let stake4_keypair = Keypair::new();
-        let instructions = stake_instruction::create_account(
-            &payer.pubkey(),
-            &stake4_keypair.pubkey(),
-            &Authorized::auto(&payer.pubkey()),
-            &Lockup::default(),
-            2 * one_sol,
-        );
-        let message = Message::new(&instructions, Some(&payer.pubkey()));
-        let stake4_initialize_signature = rpc_client
-            .send_transaction(&Transaction::new(
-                &[&payer, &stake4_keypair],
-                message,
-                blockhash,
-            ))
-            .unwrap();
-
-        rpc_client
-            .poll_for_signature_with_commitment(
-                &stake4_initialize_signature,
-                CommitmentConfig::processed(),
-            )
-            .unwrap();
-
-        // Split stake4 into stake5
-        let stake5_keypair = Keypair::new();
-        let stake45_split_signature = rpc_client
-            .send_transaction_with_config(
-                &Transaction::new(
-                    &[&payer, &stake5_keypair],
-                    Message::new(
-                        &stake_instruction::split(
-                            &stake4_keypair.pubkey(),
-                            &payer.pubkey(),
-                            one_sol,
-                            &stake5_keypair.pubkey(),
-                        ),
-                        Some(&payer.pubkey()),
-                    ),
-                    blockhash,
-                ),
-                RpcSendTransactionConfig {
-                    skip_preflight: true,
-                    ..RpcSendTransactionConfig::default()
-                },
-            )
-            .unwrap();
-
-        rpc_client
-            .poll_for_signature_with_commitment(
-                &stake45_split_signature,
-                CommitmentConfig::processed(),
-            )
-            .unwrap();
-
-        // System transfer 1
-        let system1_keypair = Keypair::new();
-
-        // Fund system1
-        let fund_system1_signature = rpc_client
-            .send_transaction(&system_transaction::transfer(
-                &payer,
-                &system1_keypair.pubkey(),
-                2 * one_sol,
-                blockhash,
-            ))
-            .unwrap();
-        rpc_client
-            .poll_for_signature_with_commitment(
-                &fund_system1_signature,
-                CommitmentConfig::processed(),
-            )
-            .unwrap();
-        accounts_info.enroll_system_account(
-            &system1_keypair.pubkey(),
-            rpc_client
-                .get_slot_with_commitment(CommitmentConfig::processed())
-                .unwrap(),
-            2 * one_sol,
-        );
-
-        // Withdraw 1 sol from system 1 to make it non-compliant
-        rpc_client
-            .send_transaction_with_config(
-                &system_transaction::transfer(
-                    &system1_keypair,
-                    &payer.pubkey(),
-                    one_sol,
-                    blockhash,
-                ),
-                RpcSendTransactionConfig {
-                    skip_preflight: true,
-                    ..RpcSendTransactionConfig::default()
-                },
-            )
-            .unwrap();
-
-        // System transfer 2
-        let system2_keypair = Keypair::new();
-
-        // Fund system2
-        let fund_system2_signature = rpc_client
-            .send_transaction(&system_transaction::transfer(
-                &payer,
-                &system2_keypair.pubkey(),
-                2 * one_sol,
-                blockhash,
-            ))
-            .unwrap();
-        rpc_client
-            .poll_for_signature_with_commitment(
-                &fund_system2_signature,
-                CommitmentConfig::processed(),
-            )
-            .unwrap();
-        accounts_info.enroll_system_account(
-            &system2_keypair.pubkey(),
-            rpc_client
-                .get_slot_with_commitment(CommitmentConfig::processed())
-                .unwrap(),
-            2 * one_sol,
-        );
-
-        // Withdraw 1 sol - 1 lamport from system 2, it's still compliant
-        rpc_client
-            .send_transaction_with_config(
-                &system_transaction::transfer(
-                    &system2_keypair,
-                    &payer.pubkey(),
-                    one_sol - 1,
-                    blockhash,
-                ),
-                RpcSendTransactionConfig {
-                    skip_preflight: true,
-                    ..RpcSendTransactionConfig::default()
-                },
-            )
-            .unwrap();
-
-        // Process all the transactions
-        let current_slot = rpc_client
-            .get_slot_with_commitment(CommitmentConfig::processed())
-            .unwrap();
-        process_slots(&rpc_client, &mut accounts_info, current_slot + 1);
-
-        //
-        // Check that `accounts_info` was populated with the expected results
-        //
-
-        info!("Check the data recorded for stake1");
-        let account_info = accounts_info
-            .account_info
-            .get(&stake1_keypair.pubkey().to_string())
-            .unwrap();
-        assert!(account_info.compliant_since.is_some());
-        assert_eq!(account_info.lamports, one_sol);
-        assert_eq!(account_info.transactions.len(), 1);
-        assert_eq!(
-            account_info.transactions[0].op,
-            AccountOperation::Initialize
-        );
-        assert_eq!(
-            account_info.transactions[0].signature,
-            stake1_signature.to_string()
-        );
-
-        info!("Check the data recorded for stake2");
-        let account_info = accounts_info
-            .account_info
-            .get(&stake2_keypair.pubkey().to_string())
-            .unwrap();
-        assert!(account_info.compliant_since.is_none());
-        assert_eq!(account_info.lamports, one_sol);
-        assert_eq!(account_info.transactions.len(), 1);
-        assert_eq!(
-            account_info.transactions[0].op,
-            AccountOperation::Initialize
-        );
-        assert_eq!(
-            account_info.transactions[0].signature,
-            stake2_signature.to_string()
-        );
-
-        info!("Check the data recorded for stake3");
-        let account_info = accounts_info
-            .account_info
-            .get(&stake3_keypair.pubkey().to_string())
-            .unwrap();
-        assert!(account_info.compliant_since.is_none());
-        assert_eq!(account_info.lamports, one_sol);
-        assert_eq!(account_info.transactions.len(), 2);
-        assert_eq!(
-            account_info.transactions[0].op,
-            AccountOperation::Initialize
-        );
-        assert_eq!(
-            account_info.transactions[0].signature,
-            stake3_initialize_signature.to_string()
-        );
-        assert_eq!(account_info.transactions[1].op, AccountOperation::Withdraw,);
-        assert_eq!(
-            account_info.transactions[1].signature,
-            stake3_withdraw_signature.to_string()
-        );
-
-        info!("Check the data recorded for stake4");
-        let account_info = accounts_info
-            .account_info
-            .get(&stake4_keypair.pubkey().to_string())
-            .unwrap();
-        assert!(account_info.compliant_since.is_some());
-        assert_eq!(account_info.lamports, one_sol);
-        assert_eq!(account_info.transactions.len(), 2);
-        assert_eq!(
-            account_info.transactions[0].op,
-            AccountOperation::Initialize
-        );
-        assert_eq!(
-            account_info.transactions[0].signature,
-            stake4_initialize_signature.to_string()
-        );
-        assert_eq!(
-            account_info.transactions[1].op,
-            AccountOperation::SplitSource,
-        );
-        assert_eq!(
-            account_info.transactions[1].signature,
-            stake45_split_signature.to_string()
-        );
-
-        info!("Check the data recorded for stake5");
-        let account_info = accounts_info
-            .account_info
-            .get(&stake5_keypair.pubkey().to_string())
-            .unwrap();
-        assert!(account_info.compliant_since.is_some());
-        assert_eq!(account_info.lamports, one_sol);
-        assert_eq!(account_info.transactions.len(), 1);
-        assert_eq!(
-            account_info.transactions[0].op,
-            AccountOperation::SplitDestination,
-        );
-        assert_eq!(
-            account_info.transactions[0].signature,
-            stake45_split_signature.to_string()
-        );
-
-        info!("Check the data recorded for system1");
-        let account_info = accounts_info
-            .account_info
-            .get(&system1_keypair.pubkey().to_string())
-            .unwrap();
-        assert!(account_info.compliant_since.is_none());
-        assert_eq!(account_info.lamports, 2 * one_sol);
-        assert_eq!(account_info.transactions.len(), 2);
-        assert_eq!(
-            account_info.transactions[0].op,
-            AccountOperation::SystemAccountEnroll,
-        );
-        assert_eq!(
-            account_info.transactions[1].op,
-            AccountOperation::FailedToMaintainMinimumBalance,
-        );
-
-        info!("Check the data recorded for system2");
-        let account_info = accounts_info
-            .account_info
-            .get(&system2_keypair.pubkey().to_string())
-            .unwrap();
-        assert!(account_info.compliant_since.is_some());
-        assert_eq!(account_info.lamports, 2 * one_sol);
-        assert_eq!(account_info.transactions.len(), 1);
-        assert_eq!(
-            account_info.transactions[0].op,
-            AccountOperation::SystemAccountEnroll,
-        );
-    }
-}
diff --git a/stake-monitor/src/main.rs b/stake-monitor/src/main.rs
deleted file mode 100644
index c0eaeae6fcc4d6..00000000000000
--- a/stake-monitor/src/main.rs
+++ /dev/null
@@ -1,230 +0,0 @@
-use clap::{
-    crate_description, crate_name, value_t, value_t_or_exit, App, AppSettings, Arg, SubCommand,
-};
-use console::Emoji;
-use log::*;
-use solana_clap_utils::{
-    input_parsers::pubkey_of,
-    input_validators::{is_pubkey, is_slot, is_url},
-};
-use solana_client::rpc_client::RpcClient;
-use solana_metrics::datapoint_error;
-use solana_sdk::{clock::Slot, native_token::lamports_to_sol, pubkey::Pubkey, system_program};
-use solana_stake_monitor::*;
-use std::{fs, io, process};
-
-fn load_accounts_info(data_file: &str) -> AccountsInfo {
-    let data_file_new = data_file.to_owned() + "new";
-    let accounts_info = solana_cli_config::load_config_file(&data_file_new)
-        .or_else(|_| solana_cli_config::load_config_file(data_file))
-        .unwrap_or_default();
-
-    // Ensure `data_file` always exists
-    save_accounts_info(data_file, &accounts_info).expect("save_accounts_info");
-
-    accounts_info
-}
-
-fn save_accounts_info(data_file: &str, accounts_info: &AccountsInfo) -> io::Result<()> {
-    let data_file_new = data_file.to_owned() + "new";
-    solana_cli_config::save_config_file(&accounts_info, &data_file_new)?;
-    let _ = fs::remove_file(data_file);
-    fs::rename(&data_file_new, data_file)
-}
-
-fn command_record(data_file: &str, json_rpc_url: String, first_slot: Slot, batch_size: u64) {
-    let mut accounts_info = load_accounts_info(&data_file);
-
-    info!("RPC URL: {}", json_rpc_url);
-    let rpc_client = RpcClient::new(json_rpc_url);
-    if accounts_info.slot < first_slot {
-        accounts_info.slot = first_slot;
-    }
-
-    loop {
-        process_slots(&rpc_client, &mut accounts_info, batch_size);
-        save_accounts_info(data_file, &accounts_info).unwrap_or_else(|err| {
-            datapoint_error!(
-                "stake-monitor-failure",
-                (
-                    "err",
-                    format!("failed to save accounts_info: {}", err),
-                    String
-                )
-            );
-        });
-    }
-}
-
-fn command_enroll(data_file: &str, json_rpc_url: String, account_address: &Pubkey) {
-    info!("RPC URL: {}", json_rpc_url);
-    let rpc_client = RpcClient::new(json_rpc_url);
-    let slot = rpc_client.get_slot().expect("get slot");
-
-    let account = rpc_client
-        .get_account(account_address)
-        .unwrap_or_else(|err| {
-            eprintln!(
-                "Unable to get account info for {}: {}",
-                account_address, err
-            );
-            process::exit(1);
-        });
-
-    if account.owner != system_program::id() && !account.data.is_empty() {
-        eprintln!("{} is not a system account", account_address);
-        process::exit(1);
-    }
-
-    let mut accounts_info = load_accounts_info(data_file);
-    accounts_info.enroll_system_account(account_address, slot, account.lamports);
-    save_accounts_info(data_file, &accounts_info).unwrap();
-    println!(
-        "Enrolled {} at slot {} with a balance of {} SOL",
-        account_address,
-        slot,
-        lamports_to_sol(account.lamports)
-    );
-}
-
-fn command_check(data_file: &str, account_address: &Pubkey) {
-    let accounts_info = load_accounts_info(data_file);
-
-    if let Some(account_info) = accounts_info.account_info.get(&account_address.to_string()) {
-        if let Some(slot) = account_info.compliant_since {
-            println!(
-                "{}Account compliant since slot {} with a balance of {} SOL",
-                Emoji("✅ ", ""),
-                slot,
-                lamports_to_sol(account_info.lamports)
-            );
-            process::exit(0);
-        } else {
-            eprintln!(
-                "{}Account not compliant due to: {:?}",
-                Emoji("❌ ", ""),
-                account_info.transactions.last().unwrap()
-            );
-            process::exit(1);
-        }
-    } else {
-        eprintln!("{} Unknown stake account", Emoji("⚠️ ", ""));
-        process::exit(1);
-    }
-}
-
-fn main() {
-    solana_logger::setup_with_default("solana=info");
-    solana_metrics::set_panic_hook("stake-monitor");
-
-    let matches = App::new(crate_name!())
-        .about(crate_description!())
-        .version(solana_version::version!())
-        .setting(AppSettings::SubcommandRequiredElseHelp)
-        .arg(
-            Arg::with_name("data_file")
-                .long("data-file")
-                .value_name("PATH")
-                .takes_value(true)
-                .default_value("stake-info.yml")
-                .global(true)
-                .help(
-                    "Output YAML file that receives the information for all stake accounts.\
-                       This file is updated atomically after each batch of slots is processed.",
-                ),
-        )
-        .arg(
-            Arg::with_name("json_rpc_url")
-                .long("url")
-                .value_name("URL")
-                .takes_value(true)
-                .validator(is_url)
-                .help("JSON RPC URL for the cluster"),
-        )
-        .arg({
-            let arg = Arg::with_name("config_file")
-                .short("C")
-                .long("config")
-                .value_name("PATH")
-                .takes_value(true)
-                .help("Configuration file to use");
-            if let Some(ref config_file) = *solana_cli_config::CONFIG_FILE {
-                arg.default_value(&config_file)
-            } else {
-                arg
-            }
-        })
-        .subcommand(
-            SubCommand::with_name("record")
-                .about("Monitor all Cluster transactions for state account compliance")
-                .arg(
-                    Arg::with_name("first_slot")
-                        .long("--first-slot")
-                        .value_name("SLOT")
-                        .validator(is_slot)
-                        .takes_value(true)
-                        .default_value("0")
-                        .help("Don't process slots lower than this value"),
-                )
-                .arg(
-                    Arg::with_name("batch_size")
-                        .long("--batch-size")
-                        .value_name("NUMBER")
-                        .takes_value(true)
-                        .default_value("10")
-                        .help("Process up to this many slots in one batch"),
-                ),
-        )
-        .subcommand(
-            SubCommand::with_name("check")
-                .about("Check if an account is in compliance")
-                .arg(
-                    Arg::with_name("account_address")
-                        .index(1)
-                        .value_name("ADDRESS")
-                        .validator(is_pubkey)
-                        .required(true)
-                        .help("Account address"),
-                ),
-        )
-        .subcommand(
-            SubCommand::with_name("enroll")
-                .about("Enroll a system account for balance monitoring")
-                .arg(
-                    Arg::with_name("account_address")
-                        .index(1)
-                        .value_name("ADDRESS")
-                        .validator(is_pubkey)
-                        .required(true)
-                        .help("Account address"),
-                ),
-        )
-        .get_matches();
-
-    let data_file = value_t_or_exit!(matches, "data_file", String);
-    let json_rpc_url = value_t!(matches, "json_rpc_url", String).unwrap_or_else(|_| {
-        let config = if let Some(config_file) = matches.value_of("config_file") {
-            solana_cli_config::Config::load(config_file).unwrap_or_default()
-        } else {
-            solana_cli_config::Config::default()
-        };
-        config.json_rpc_url
-    });
-
-    match matches.subcommand() {
-        ("record", Some(matches)) => {
-            let batch_size = value_t_or_exit!(matches, "batch_size", u64);
-            let first_slot = value_t_or_exit!(matches, "first_slot", Slot);
-            command_record(&data_file, json_rpc_url, first_slot, batch_size);
-        }
-        ("check", Some(matches)) => {
-            let account_address = pubkey_of(&matches, "account_address").unwrap();
-            command_check(&data_file, &account_address);
-        }
-        ("enroll", Some(matches)) => {
-            let account_address = pubkey_of(&matches, "account_address").unwrap();
-            command_enroll(&data_file, json_rpc_url, &account_address);
-        }
-        _ => unreachable!(),
-    }
-}
diff --git a/storage-bigtable/Cargo.toml b/storage-bigtable/Cargo.toml
index d238005b487f66..e522e36c0ffa37 100644
--- a/storage-bigtable/Cargo.toml
+++ b/storage-bigtable/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "solana-storage-bigtable"
-version = "1.7.0"
+version = "1.7.11"
 description = "Solana Storage BigTable"
 authors = ["Solana Maintainers <maintainers@solana.com>"]
 repository = "https://github.com/solana-labs/solana"
@@ -18,18 +18,18 @@ enum-iterator = "0.6.0"
 flate2 = "1.0.14"
 goauth = "0.10.0"
 log = "0.4.11"
-prost = "0.7.0"
-prost-types = "0.7.0"
+prost = "0.8.0"
+prost-types = "0.8.0"
 rand_core = "0.6.2"
 serde = "1.0.122"
 serde_derive = "1.0.103"
 smpl_jwt = "0.6.0"
-solana-sdk = { path = "../sdk", version = "=1.7.0" }
-solana-storage-proto = { path = "../storage-proto", version = "=1.7.0" }
-solana-transaction-status = { path = "../transaction-status", version = "=1.7.0" }
+solana-sdk = { path = "../sdk", version = "=1.7.11" }
+solana-storage-proto = { path = "../storage-proto", version = "=1.7.11" }
+solana-transaction-status = { path = "../transaction-status", version = "=1.7.11" }
 thiserror = "1.0"
 futures = "0.3.8"
-tonic = { version = "0.4.0", features = ["tls", "transport"] }
+tonic = { version = "0.5.0", features = ["tls", "transport"] }
 zstd = "0.5.1"
 
 [lib]
diff --git a/storage-bigtable/build-proto/Cargo.lock b/storage-bigtable/build-proto/Cargo.lock
index c9737432bf6780..1a5e69f19d6982 100644
--- a/storage-bigtable/build-proto/Cargo.lock
+++ b/storage-bigtable/build-proto/Cargo.lock
@@ -1,5 +1,7 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
+version = 3
+
 [[package]]
 name = "anyhow"
 version = "1.0.31"
@@ -77,9 +79,9 @@ dependencies = [
 
 [[package]]
 name = "itertools"
-version = "0.9.0"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "284f18f85651fe11e8a991b2adb42cb078325c996ed026d994719efcfca1d54b"
+checksum = "69ddb889f9d0d08a67338271fa9b62996bc788c7796a5c18cf057420aaed5eaf"
 dependencies = [
  "either",
 ]
@@ -132,9 +134,9 @@ dependencies = [
 
 [[package]]
 name = "prost"
-version = "0.7.0"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e6984d2f1a23009bd270b8bb56d0926810a3d483f59c987d77969e9d8e840b2"
+checksum = "de5e2533f59d08fcf364fd374ebda0692a70bd6d7e66ef97f306f45c6c5d8020"
 dependencies = [
  "bytes",
  "prost-derive",
@@ -142,9 +144,9 @@ dependencies = [
 
 [[package]]
 name = "prost-build"
-version = "0.7.0"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32d3ebd75ac2679c2af3a92246639f9fcc8a442ee420719cc4fe195b98dd5fa3"
+checksum = "355f634b43cdd80724ee7848f95770e7e70eefa6dcf14fea676216573b8fd603"
 dependencies = [
  "bytes",
  "heck",
@@ -160,9 +162,9 @@ dependencies = [
 
 [[package]]
 name = "prost-derive"
-version = "0.7.0"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "169a15f3008ecb5160cba7d37bcd690a7601b6d30cfb87a117d45e59d52af5d4"
+checksum = "600d2f334aa05acb02a755e217ef1ab6dea4d51b58b7846588b747edec04efba"
 dependencies = [
  "anyhow",
  "itertools",
@@ -173,9 +175,9 @@ dependencies = [
 
 [[package]]
 name = "prost-types"
-version = "0.7.0"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b518d7cdd93dab1d1122cf07fa9a60771836c668dde9d9e2a139f957f0d9f1bb"
+checksum = "603bbd6394701d13f3f25aada59c7de9d35a6a5887cfc156181234a44002771b"
 dependencies = [
  "bytes",
  "prost",
@@ -183,7 +185,7 @@ dependencies = [
 
 [[package]]
 name = "proto"
-version = "1.7.0"
+version = "1.7.11"
 dependencies = [
  "tonic-build",
 ]
@@ -300,9 +302,9 @@ dependencies = [
 
 [[package]]
 name = "tonic-build"
-version = "0.4.0"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1e8546fd40d56d28089835c0a81bb396848103b00f888aea42d46eb5974df07"
+checksum = "25db9a497663a9a779693ef67b6e6aef8345b3d3ff8d50ef92eae6c88cb1e386"
 dependencies = [
  "proc-macro2",
  "prost-build",
diff --git a/storage-bigtable/build-proto/Cargo.toml b/storage-bigtable/build-proto/Cargo.toml
index 554b9f9d9fd04e..e00d5879e9ba31 100644
--- a/storage-bigtable/build-proto/Cargo.toml
+++ b/storage-bigtable/build-proto/Cargo.toml
@@ -7,9 +7,9 @@ license = "Apache-2.0"
 name = "proto"
 publish = false
 repository = "https://github.com/solana-labs/solana"
-version = "1.7.0"
+version = "1.7.11"
 
 [workspace]
 
 [dependencies]
-tonic-build = "0.4.0"
+tonic-build = "0.5.0"
diff --git a/storage-bigtable/proto/google.bigtable.v2.rs b/storage-bigtable/proto/google.bigtable.v2.rs
index 9936e2d1d414fb..d993d1df1fdc3f 100644
--- a/storage-bigtable/proto/google.bigtable.v2.rs
+++ b/storage-bigtable/proto/google.bigtable.v2.rs
@@ -244,6 +244,7 @@ pub struct RowFilter {
     pub filter: ::core::option::Option<row_filter::Filter>,
 }
 /// Nested message and enum types in `RowFilter`.
+#[allow(clippy::enum_variant_names)]
 pub mod row_filter {
     /// A RowFilter which sends rows through several RowFilters in sequence.
     #[derive(Clone, PartialEq, ::prost::Message)]
@@ -897,6 +898,7 @@ pub mod bigtable_client {
     #![allow(unused_variables, dead_code, missing_docs)]
     use tonic::codegen::*;
     #[doc = " Service for reading from and writing to existing Bigtable tables."]
+    #[derive(Debug, Clone)]
     pub struct BigtableClient<T> {
         inner: tonic::client::Grpc<T>,
     }
@@ -914,17 +916,43 @@ pub mod bigtable_client {
     impl<T> BigtableClient<T>
     where
         T: tonic::client::GrpcService<tonic::body::BoxBody>,
-        T::ResponseBody: Body + HttpBody + Send + 'static,
+        T::ResponseBody: Body + Send + Sync + 'static,
         T::Error: Into<StdError>,
-        <T::ResponseBody as HttpBody>::Error: Into<StdError> + Send,
+        <T::ResponseBody as Body>::Error: Into<StdError> + Send,
     {
         pub fn new(inner: T) -> Self {
             let inner = tonic::client::Grpc::new(inner);
             Self { inner }
         }
-        pub fn with_interceptor(inner: T, interceptor: impl Into<tonic::Interceptor>) -> Self {
-            let inner = tonic::client::Grpc::with_interceptor(inner, interceptor);
-            Self { inner }
+        pub fn with_interceptor<F>(
+            inner: T,
+            interceptor: F,
+        ) -> BigtableClient<InterceptedService<T, F>>
+        where
+            F: FnMut(tonic::Request<()>) -> Result<tonic::Request<()>, tonic::Status>,
+            T: Service<
+                http::Request<tonic::body::BoxBody>,
+                Response = http::Response<
+                    <T as tonic::client::GrpcService<tonic::body::BoxBody>>::ResponseBody,
+                >,
+            >,
+            <T as Service<http::Request<tonic::body::BoxBody>>>::Error:
+                Into<StdError> + Send + Sync,
+        {
+            BigtableClient::new(InterceptedService::new(inner, interceptor))
+        }
+        #[doc = r" Compress requests with `gzip`."]
+        #[doc = r""]
+        #[doc = r" This requires the server to support it otherwise it might respond with an"]
+        #[doc = r" error."]
+        pub fn send_gzip(mut self) -> Self {
+            self.inner = self.inner.send_gzip();
+            self
+        }
+        #[doc = r" Enable decompressing responses with `gzip`."]
+        pub fn accept_gzip(mut self) -> Self {
+            self.inner = self.inner.accept_gzip();
+            self
         }
         #[doc = " Streams back the contents of all requested rows in key order, optionally"]
         #[doc = " applying the same Reader filter to each. Depending on their size,"]
@@ -1052,16 +1080,4 @@ pub mod bigtable_client {
             self.inner.unary(request.into_request(), path, codec).await
         }
     }
-    impl<T: Clone> Clone for BigtableClient<T> {
-        fn clone(&self) -> Self {
-            Self {
-                inner: self.inner.clone(),
-            }
-        }
-    }
-    impl<T> std::fmt::Debug for BigtableClient<T> {
-        fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-            write!(f, "BigtableClient {{ ... }}")
-        }
-    }
 }
diff --git a/storage-bigtable/src/access_token.rs b/storage-bigtable/src/access_token.rs
index 60335b802b675e..e73962b2b28fbc 100644
--- a/storage-bigtable/src/access_token.rs
+++ b/storage-bigtable/src/access_token.rs
@@ -1,16 +1,18 @@
 /// A module for managing a Google API access token
-use goauth::{
-    auth::{JwtClaims, Token},
-    credentials::Credentials,
-};
-use log::*;
-use smpl_jwt::Jwt;
-use std::{
-    sync::{
-        atomic::{AtomicBool, Ordering},
-        {Arc, RwLock},
+use {
+    goauth::{
+        auth::{JwtClaims, Token},
+        credentials::Credentials,
+    },
+    log::*,
+    smpl_jwt::Jwt,
+    std::{
+        sync::{
+            atomic::{AtomicBool, Ordering},
+            {Arc, RwLock},
+        },
+        time::Instant,
     },
-    time::Instant,
 };
 
 pub use goauth::scopes::Scope;
diff --git a/storage-bigtable/src/bigtable.rs b/storage-bigtable/src/bigtable.rs
index 964b4f60a07b16..a3d4b172d5d473 100644
--- a/storage-bigtable/src/bigtable.rs
+++ b/storage-bigtable/src/bigtable.rs
@@ -1,14 +1,19 @@
 // Primitives for reading/writing BigTable tables
 
-use crate::{
-    access_token::{AccessToken, Scope},
-    compression::{compress_best, decompress},
-    root_ca_certificate,
+use {
+    crate::{
+        access_token::{AccessToken, Scope},
+        compression::{compress_best, decompress},
+        root_ca_certificate,
+    },
+    log::*,
+    std::time::{Duration, Instant},
+    thiserror::Error,
+    tonic::{
+        codegen::InterceptedService, metadata::MetadataValue, transport::ClientTlsConfig, Request,
+        Status,
+    },
 };
-use log::*;
-use std::time::{Duration, Instant};
-use thiserror::Error;
-use tonic::{metadata::MetadataValue, transport::ClientTlsConfig, Request};
 
 mod google {
     mod rpc {
@@ -40,17 +45,17 @@ pub enum CellData<B, P> {
 
 #[derive(Debug, Error)]
 pub enum Error {
-    #[error("AccessToken error: {0}")]
-    AccessTokenError(String),
+    #[error("AccessToken: {0}")]
+    AccessToken(String),
 
-    #[error("Certificate error: {0}")]
-    CertificateError(String),
+    #[error("Certificate: {0}")]
+    Certificate(String),
 
-    #[error("I/O Error: {0}")]
-    IoError(std::io::Error),
+    #[error("I/O: {0}")]
+    Io(std::io::Error),
 
-    #[error("Transport error: {0}")]
-    TransportError(tonic::transport::Error),
+    #[error("Transport: {0}")]
+    Transport(tonic::transport::Error),
 
     #[error("Invalid URI {0}: {1}")]
     InvalidUri(String, String),
@@ -67,32 +72,33 @@ pub enum Error {
     #[error("Object is corrupt: {0}")]
     ObjectCorrupt(String),
 
-    #[error("RPC error: {0}")]
-    RpcError(tonic::Status),
+    #[error("RPC: {0}")]
+    Rpc(tonic::Status),
 
-    #[error("Timeout error")]
-    TimeoutError,
+    #[error("Timeout")]
+    Timeout,
 }
 
 impl std::convert::From<std::io::Error> for Error {
     fn from(err: std::io::Error) -> Self {
-        Self::IoError(err)
+        Self::Io(err)
     }
 }
 
 impl std::convert::From<tonic::transport::Error> for Error {
     fn from(err: tonic::transport::Error) -> Self {
-        Self::TransportError(err)
+        Self::Transport(err)
     }
 }
 
 impl std::convert::From<tonic::Status> for Error {
     fn from(err: tonic::Status) -> Self {
-        Self::RpcError(err)
+        Self::Rpc(err)
     }
 }
 
 pub type Result<T> = std::result::Result<T, Error>;
+type InterceptedRequestResult = std::result::Result<Request<()>, Status>;
 
 #[derive(Clone)]
 pub struct BigTableConnection {
@@ -137,7 +143,7 @@ impl BigTableConnection {
                     Scope::BigTableData
                 })
                 .await
-                .map_err(Error::AccessTokenError)?;
+                .map_err(Error::AccessToken)?;
 
                 let table_prefix = format!(
                     "projects/{}/instances/{}/tables/",
@@ -151,7 +157,7 @@ impl BigTableConnection {
                             .tls_config(
                             ClientTlsConfig::new()
                                 .ca_certificate(
-                                    root_ca_certificate::load().map_err(Error::CertificateError)?,
+                                    root_ca_certificate::load().map_err(Error::Certificate)?,
                                 )
                                 .domain_name("bigtable.googleapis.com"),
                         )?;
@@ -177,12 +183,12 @@ impl BigTableConnection {
     ///
     /// Clients require `&mut self`, due to `Tonic::transport::Channel` limitations, however
     /// creating new clients is cheap and thus can be used as a work around for ease of use.
-    pub fn client(&self) -> BigTable {
-        let client = if let Some(access_token) = &self.access_token {
-            let access_token = access_token.clone();
-            bigtable_client::BigtableClient::with_interceptor(
-                self.channel.clone(),
-                move |mut req: Request<()>| {
+    pub fn client(&self) -> BigTable<impl FnMut(Request<()>) -> InterceptedRequestResult> {
+        let access_token = self.access_token.clone();
+        let client = bigtable_client::BigtableClient::with_interceptor(
+            self.channel.clone(),
+            move |mut req: Request<()>| {
+                if let Some(access_token) = &access_token {
                     match MetadataValue::from_str(&access_token.get()) {
                         Ok(authorization_header) => {
                             req.metadata_mut()
@@ -192,12 +198,10 @@ impl BigTableConnection {
                             warn!("Failed to set authorization header: {}", err);
                         }
                     }
-                    Ok(req)
-                },
-            )
-        } else {
-            bigtable_client::BigtableClient::new(self.channel.clone())
-        };
+                }
+                Ok(req)
+            },
+        );
         BigTable {
             access_token: self.access_token.clone(),
             client,
@@ -239,14 +243,14 @@ impl BigTableConnection {
     }
 }
 
-pub struct BigTable {
+pub struct BigTable<F: FnMut(Request<()>) -> InterceptedRequestResult> {
     access_token: Option<AccessToken>,
-    client: bigtable_client::BigtableClient<tonic::transport::Channel>,
+    client: bigtable_client::BigtableClient<InterceptedService<tonic::transport::Channel, F>>,
     table_prefix: String,
     timeout: Option<Duration>,
 }
 
-impl BigTable {
+impl<F: FnMut(Request<()>) -> InterceptedRequestResult> BigTable<F> {
     async fn decode_read_rows_response(
         &self,
         mut rrr: tonic::codec::Streaming<ReadRowsResponse>,
@@ -265,7 +269,7 @@ impl BigTable {
         while let Some(res) = rrr.message().await? {
             if let Some(timeout) = self.timeout {
                 if Instant::now().duration_since(started) > timeout {
-                    return Err(Error::TimeoutError);
+                    return Err(Error::Timeout);
                 }
             }
             for (i, mut chunk) in res.chunks.into_iter().enumerate() {
@@ -628,7 +632,7 @@ where
         .ok_or_else(|| Error::ObjectNotFound(format!("{}/{}", table, key)))?
         .1;
 
-    let data = decompress(&value)?;
+    let data = decompress(value)?;
     T::decode(&data[..]).map_err(|err| {
         warn!("Failed to deserialize {}/{}: {}", table, key, err);
         Error::ObjectCorrupt(format!("{}/{}", table, key))
@@ -649,7 +653,7 @@ where
         .ok_or_else(|| Error::ObjectNotFound(format!("{}/{}", table, key)))?
         .1;
 
-    let data = decompress(&value)?;
+    let data = decompress(value)?;
     bincode::deserialize(&data).map_err(|err| {
         warn!("Failed to deserialize {}/{}: {}", table, key, err);
         Error::ObjectCorrupt(format!("{}/{}", table, key))
diff --git a/storage-bigtable/src/compression.rs b/storage-bigtable/src/compression.rs
index 665f93b4698d5d..866369729a4942 100644
--- a/storage-bigtable/src/compression.rs
+++ b/storage-bigtable/src/compression.rs
@@ -1,5 +1,7 @@
-use enum_iterator::IntoEnumIterator;
-use std::io::{self, BufReader, Read, Write};
+use {
+    enum_iterator::IntoEnumIterator,
+    std::io::{self, BufReader, Read, Write},
+};
 
 #[derive(Debug, Serialize, Deserialize, IntoEnumIterator)]
 pub enum CompressionMethod {
diff --git a/storage-bigtable/src/lib.rs b/storage-bigtable/src/lib.rs
index 767d34684d1ca8..d4e4c763d5ef69 100644
--- a/storage-bigtable/src/lib.rs
+++ b/storage-bigtable/src/lib.rs
@@ -1,22 +1,24 @@
 #![allow(clippy::integer_arithmetic)]
-use log::*;
-use serde::{Deserialize, Serialize};
-use solana_sdk::{
-    clock::{Slot, UnixTimestamp},
-    pubkey::Pubkey,
-    signature::Signature,
-    sysvar::is_sysvar_id,
-    transaction::{Transaction, TransactionError},
+use {
+    log::*,
+    serde::{Deserialize, Serialize},
+    solana_sdk::{
+        clock::{Slot, UnixTimestamp},
+        deserialize_utils::default_on_eof,
+        pubkey::Pubkey,
+        signature::Signature,
+        sysvar::is_sysvar_id,
+        transaction::{Transaction, TransactionError},
+    },
+    solana_storage_proto::convert::{generated, tx_by_addr},
+    solana_transaction_status::{
+        ConfirmedBlock, ConfirmedTransaction, ConfirmedTransactionStatusWithSignature, Reward,
+        TransactionByAddrInfo, TransactionConfirmationStatus, TransactionStatus,
+        TransactionStatusMeta, TransactionWithStatusMeta,
+    },
+    std::{collections::HashMap, convert::TryInto},
+    thiserror::Error,
 };
-use solana_storage_proto::convert::generated;
-use solana_storage_proto::convert::tx_by_addr;
-use solana_transaction_status::{
-    ConfirmedBlock, ConfirmedTransaction, ConfirmedTransactionStatusWithSignature, Reward,
-    TransactionByAddrInfo, TransactionConfirmationStatus, TransactionStatus, TransactionStatusMeta,
-    TransactionWithStatusMeta,
-};
-use std::{collections::HashMap, convert::TryInto};
-use thiserror::Error;
 
 #[macro_use]
 extern crate serde_derive;
@@ -81,6 +83,9 @@ fn key_to_slot(key: &str) -> Option<Slot> {
 // StoredConfirmedBlock holds the same contents as ConfirmedBlock, but is slightly compressed and avoids
 // some serde JSON directives that cause issues with bincode
 //
+// Note: in order to continue to support old bincode-serialized bigtable entries, if new fields are
+// added to ConfirmedBlock, they must either be excluded or set to `default_on_eof` here
+//
 #[derive(Serialize, Deserialize)]
 struct StoredConfirmedBlock {
     previous_blockhash: String,
@@ -89,6 +94,7 @@ struct StoredConfirmedBlock {
     transactions: Vec<StoredConfirmedBlockTransaction>,
     rewards: StoredConfirmedBlockRewards,
     block_time: Option<UnixTimestamp>,
+    #[serde(deserialize_with = "default_on_eof")]
     block_height: Option<u64>,
 }
 
@@ -232,6 +238,7 @@ impl From<StoredConfirmedBlockReward> for Reward {
             lamports,
             post_balance: 0,
             reward_type: None,
+            commission: None,
         }
     }
 }
@@ -554,7 +561,7 @@ impl LedgerStorage {
             let signature = transaction.signatures[0];
 
             for address in &transaction.message.account_keys {
-                if !is_sysvar_id(&address) {
+                if !is_sysvar_id(address) {
                     by_addr
                         .entry(address)
                         .or_default()
diff --git a/storage-bigtable/src/root_ca_certificate.rs b/storage-bigtable/src/root_ca_certificate.rs
index e0d43231d40ed6..80147dd3f86d1d 100644
--- a/storage-bigtable/src/root_ca_certificate.rs
+++ b/storage-bigtable/src/root_ca_certificate.rs
@@ -1,5 +1,7 @@
-use std::{fs::File, io::Read};
-use tonic::transport::Certificate;
+use {
+    std::{fs::File, io::Read},
+    tonic::transport::Certificate,
+};
 
 pub fn load() -> Result<Certificate, String> {
     // Respect the standard GRPC_DEFAULT_SSL_ROOTS_FILE_PATH environment variable if present,
diff --git a/storage-proto/Cargo.toml b/storage-proto/Cargo.toml
index 47406d55dd964c..6fbe663ba165e8 100644
--- a/storage-proto/Cargo.toml
+++ b/storage-proto/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "solana-storage-proto"
-version = "1.7.0"
+version = "1.7.11"
 description = "Solana Storage Protobuf Definitions"
 authors = ["Solana Maintainers <maintainers@solana.com>"]
 repository = "https://github.com/solana-labs/solana"
@@ -12,12 +12,12 @@ edition = "2018"
 [dependencies]
 bincode = "1.2.1"
 bs58 = "0.3.1"
-prost = "0.7.0"
+prost = "0.8.0"
 serde = "1.0.122"
 serde_derive = "1.0.103"
-solana-account-decoder = { path = "../account-decoder", version = "=1.7.0" }
-solana-sdk = { path = "../sdk", version = "=1.7.0" }
-solana-transaction-status = { path = "../transaction-status", version = "=1.7.0" }
+solana-account-decoder = { path = "../account-decoder", version = "=1.7.11" }
+solana-sdk = { path = "../sdk", version = "=1.7.11" }
+solana-transaction-status = { path = "../transaction-status", version = "=1.7.11" }
 
 [lib]
 crate-type = ["lib"]
@@ -25,3 +25,6 @@ name = "solana_storage_proto"
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
+
+[build-dependencies]
+tonic-build = "0.5.0"
diff --git a/storage-proto/README.md b/storage-proto/README.md
new file mode 100644
index 00000000000000..c9f13b1707dac2
--- /dev/null
+++ b/storage-proto/README.md
@@ -0,0 +1,5 @@
+# Storage Protobufs
+
+The `solana-storage-proto` structs used in `src/convert.rs` and elsewhere are
+auto-generated from protobuf definitions on build. To update these structs,
+simply make the desired edits to `proto/*.proto` files.
diff --git a/storage-proto/build-proto/.gitignore b/storage-proto/build-proto/.gitignore
deleted file mode 100644
index 2f7896d1d1365e..00000000000000
--- a/storage-proto/build-proto/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-target/
diff --git a/storage-proto/build-proto/Cargo.lock b/storage-proto/build-proto/Cargo.lock
deleted file mode 100644
index 32df23ca1edd90..00000000000000
--- a/storage-proto/build-proto/Cargo.lock
+++ /dev/null
@@ -1,358 +0,0 @@
-# This file is automatically @generated by Cargo.
-# It is not intended for manual editing.
-[[package]]
-name = "anyhow"
-version = "1.0.33"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1fd36ffbb1fb7c834eac128ea8d0e310c5aeb635548f9d58861e1308d46e71c"
-
-[[package]]
-name = "autocfg"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
-
-[[package]]
-name = "bytes"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b700ce4376041dcd0a327fd0097c41095743c4c8af8887265942faf1100bd040"
-
-[[package]]
-name = "cfg-if"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
-
-[[package]]
-name = "either"
-version = "1.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457"
-
-[[package]]
-name = "fixedbitset"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37ab347416e802de484e4d03c7316c48f1ecb56574dfd4a46a80f173ce1de04d"
-
-[[package]]
-name = "getrandom"
-version = "0.1.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc587bc0ec293155d5bfa6b9891ec18a1e330c234f896ea47fbada4cadbe47e6"
-dependencies = [
- "cfg-if",
- "libc",
- "wasi",
-]
-
-[[package]]
-name = "hashbrown"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04"
-
-[[package]]
-name = "heck"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205"
-dependencies = [
- "unicode-segmentation",
-]
-
-[[package]]
-name = "indexmap"
-version = "1.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55e2e4c765aa53a0424761bf9f41aa7a6ac1efa87238f59560640e27fca028f2"
-dependencies = [
- "autocfg",
- "hashbrown",
-]
-
-[[package]]
-name = "itertools"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "284f18f85651fe11e8a991b2adb42cb078325c996ed026d994719efcfca1d54b"
-dependencies = [
- "either",
-]
-
-[[package]]
-name = "libc"
-version = "0.2.81"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1482821306169ec4d07f6aca392a4681f66c75c9918aa49641a2595db64053cb"
-
-[[package]]
-name = "log"
-version = "0.4.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b"
-dependencies = [
- "cfg-if",
-]
-
-[[package]]
-name = "multimap"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1255076139a83bb467426e7f8d0134968a8118844faa755985e077cf31850333"
-
-[[package]]
-name = "petgraph"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "467d164a6de56270bd7c4d070df81d07beace25012d5103ced4e9ff08d6afdb7"
-dependencies = [
- "fixedbitset",
- "indexmap",
-]
-
-[[package]]
-name = "ppv-lite86"
-version = "0.2.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c36fa947111f5c62a733b652544dd0016a43ce89619538a8ef92724a6f501a20"
-
-[[package]]
-name = "proc-macro2"
-version = "1.0.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71"
-dependencies = [
- "unicode-xid",
-]
-
-[[package]]
-name = "prost"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e6984d2f1a23009bd270b8bb56d0926810a3d483f59c987d77969e9d8e840b2"
-dependencies = [
- "bytes",
- "prost-derive",
-]
-
-[[package]]
-name = "prost-build"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32d3ebd75ac2679c2af3a92246639f9fcc8a442ee420719cc4fe195b98dd5fa3"
-dependencies = [
- "bytes",
- "heck",
- "itertools",
- "log",
- "multimap",
- "petgraph",
- "prost",
- "prost-types",
- "tempfile",
- "which",
-]
-
-[[package]]
-name = "prost-derive"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "169a15f3008ecb5160cba7d37bcd690a7601b6d30cfb87a117d45e59d52af5d4"
-dependencies = [
- "anyhow",
- "itertools",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "prost-types"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b518d7cdd93dab1d1122cf07fa9a60771836c668dde9d9e2a139f957f0d9f1bb"
-dependencies = [
- "bytes",
- "prost",
-]
-
-[[package]]
-name = "proto"
-version = "1.7.0"
-dependencies = [
- "tonic-build",
-]
-
-[[package]]
-name = "quote"
-version = "1.0.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa563d17ecb180e500da1cfd2b028310ac758de548efdd203e18f283af693f37"
-dependencies = [
- "proc-macro2",
-]
-
-[[package]]
-name = "rand"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
-dependencies = [
- "getrandom",
- "libc",
- "rand_chacha",
- "rand_core",
- "rand_hc",
-]
-
-[[package]]
-name = "rand_chacha"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402"
-dependencies = [
- "ppv-lite86",
- "rand_core",
-]
-
-[[package]]
-name = "rand_core"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
-dependencies = [
- "getrandom",
-]
-
-[[package]]
-name = "rand_hc"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
-dependencies = [
- "rand_core",
-]
-
-[[package]]
-name = "redox_syscall"
-version = "0.1.57"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce"
-
-[[package]]
-name = "remove_dir_all"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7"
-dependencies = [
- "winapi",
-]
-
-[[package]]
-name = "syn"
-version = "1.0.60"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c700597eca8a5a762beb35753ef6b94df201c81cca676604f547495a0d7f0081"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-xid",
-]
-
-[[package]]
-name = "tempfile"
-version = "3.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9"
-dependencies = [
- "cfg-if",
- "libc",
- "rand",
- "redox_syscall",
- "remove_dir_all",
- "winapi",
-]
-
-[[package]]
-name = "thiserror"
-version = "1.0.23"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76cc616c6abf8c8928e2fdcc0dbfab37175edd8fb49a4641066ad1364fdab146"
-dependencies = [
- "thiserror-impl",
-]
-
-[[package]]
-name = "thiserror-impl"
-version = "1.0.23"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9be73a2caec27583d0046ef3796c3794f868a5bc813db689eed00c7631275cd1"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "tonic-build"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1e8546fd40d56d28089835c0a81bb396848103b00f888aea42d46eb5974df07"
-dependencies = [
- "proc-macro2",
- "prost-build",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "unicode-segmentation"
-version = "1.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e83e153d1053cbb5a118eeff7fd5be06ed99153f00dbcd8ae310c5fb2b22edc0"
-
-[[package]]
-name = "unicode-xid"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564"
-
-[[package]]
-name = "wasi"
-version = "0.9.0+wasi-snapshot-preview1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
-
-[[package]]
-name = "which"
-version = "4.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87c14ef7e1b8b8ecfc75d5eca37949410046e66f15d185c01d70824f1f8111ef"
-dependencies = [
- "libc",
- "thiserror",
-]
-
-[[package]]
-name = "winapi"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
-dependencies = [
- "winapi-i686-pc-windows-gnu",
- "winapi-x86_64-pc-windows-gnu",
-]
-
-[[package]]
-name = "winapi-i686-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
-
-[[package]]
-name = "winapi-x86_64-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
diff --git a/storage-proto/build-proto/Cargo.toml b/storage-proto/build-proto/Cargo.toml
deleted file mode 100644
index 554b9f9d9fd04e..00000000000000
--- a/storage-proto/build-proto/Cargo.toml
+++ /dev/null
@@ -1,15 +0,0 @@
-[package]
-authors = ["Solana Maintainers <maintainers@solana.com>"]
-description = "Blockchain, Rebuilt for Scale"
-edition = "2018"
-homepage = "https://solana.com/"
-license = "Apache-2.0"
-name = "proto"
-publish = false
-repository = "https://github.com/solana-labs/solana"
-version = "1.7.0"
-
-[workspace]
-
-[dependencies]
-tonic-build = "0.4.0"
diff --git a/storage-proto/build-proto/src/main.rs b/storage-proto/build-proto/src/main.rs
deleted file mode 100644
index 50acaceb7acd7a..00000000000000
--- a/storage-proto/build-proto/src/main.rs
+++ /dev/null
@@ -1,22 +0,0 @@
-fn main() -> Result<(), std::io::Error> {
-    let manifest_dir = std::path::PathBuf::from(env!("CARGO_MANIFEST_DIR"));
-
-    let out_dir = manifest_dir.join("../proto");
-    let proto_files = manifest_dir.join("../src");
-
-    println!("Protobuf directory: {}", proto_files.display());
-    println!("output directory: {}", out_dir.display());
-
-    tonic_build::configure()
-        .build_client(true)
-        .build_server(false)
-        .format(true)
-        .out_dir(&out_dir)
-        .compile(
-            &[
-                proto_files.join("confirmed_block.proto"),
-                proto_files.join("transaction_by_addr.proto"),
-            ],
-            &[proto_files],
-        )
-}
diff --git a/storage-proto/build.rs b/storage-proto/build.rs
new file mode 100644
index 00000000000000..dd64c828d8b581
--- /dev/null
+++ b/storage-proto/build.rs
@@ -0,0 +1,16 @@
+fn main() -> Result<(), std::io::Error> {
+    let proto_base_path = std::path::PathBuf::from("proto");
+    let proto_files = ["confirmed_block.proto", "transaction_by_addr.proto"];
+    let mut protos = Vec::new();
+    for proto_file in &proto_files {
+        let proto = proto_base_path.join(proto_file);
+        println!("cargo::rerun-if-changed={}", proto.display());
+        protos.push(proto);
+    }
+
+    tonic_build::configure()
+        .build_client(true)
+        .build_server(false)
+        .format(true)
+        .compile(&protos, &[proto_base_path])
+}
diff --git a/storage-proto/src/confirmed_block.proto b/storage-proto/proto/confirmed_block.proto
similarity index 98%
rename from storage-proto/src/confirmed_block.proto
rename to storage-proto/proto/confirmed_block.proto
index 6e0d88f3cf5d55..57f119febe1cdd 100644
--- a/storage-proto/src/confirmed_block.proto
+++ b/storage-proto/proto/confirmed_block.proto
@@ -88,6 +88,7 @@ message Reward {
     int64 lamports = 2;
     uint64 post_balance = 3;
     RewardType reward_type = 4;
+    string commission = 5;
 }
 
 message Rewards {
diff --git a/storage-proto/proto/solana.storage.confirmed_block.rs b/storage-proto/proto/solana.storage.confirmed_block.rs
deleted file mode 100644
index d2253b04ed9609..00000000000000
--- a/storage-proto/proto/solana.storage.confirmed_block.rs
+++ /dev/null
@@ -1,148 +0,0 @@
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct ConfirmedBlock {
-    #[prost(string, tag = "1")]
-    pub previous_blockhash: ::prost::alloc::string::String,
-    #[prost(string, tag = "2")]
-    pub blockhash: ::prost::alloc::string::String,
-    #[prost(uint64, tag = "3")]
-    pub parent_slot: u64,
-    #[prost(message, repeated, tag = "4")]
-    pub transactions: ::prost::alloc::vec::Vec<ConfirmedTransaction>,
-    #[prost(message, repeated, tag = "5")]
-    pub rewards: ::prost::alloc::vec::Vec<Reward>,
-    #[prost(message, optional, tag = "6")]
-    pub block_time: ::core::option::Option<UnixTimestamp>,
-    #[prost(message, optional, tag = "7")]
-    pub block_height: ::core::option::Option<BlockHeight>,
-}
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct ConfirmedTransaction {
-    #[prost(message, optional, tag = "1")]
-    pub transaction: ::core::option::Option<Transaction>,
-    #[prost(message, optional, tag = "2")]
-    pub meta: ::core::option::Option<TransactionStatusMeta>,
-}
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct Transaction {
-    #[prost(bytes = "vec", repeated, tag = "1")]
-    pub signatures: ::prost::alloc::vec::Vec<::prost::alloc::vec::Vec<u8>>,
-    #[prost(message, optional, tag = "2")]
-    pub message: ::core::option::Option<Message>,
-}
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct Message {
-    #[prost(message, optional, tag = "1")]
-    pub header: ::core::option::Option<MessageHeader>,
-    #[prost(bytes = "vec", repeated, tag = "2")]
-    pub account_keys: ::prost::alloc::vec::Vec<::prost::alloc::vec::Vec<u8>>,
-    #[prost(bytes = "vec", tag = "3")]
-    pub recent_blockhash: ::prost::alloc::vec::Vec<u8>,
-    #[prost(message, repeated, tag = "4")]
-    pub instructions: ::prost::alloc::vec::Vec<CompiledInstruction>,
-}
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct MessageHeader {
-    #[prost(uint32, tag = "1")]
-    pub num_required_signatures: u32,
-    #[prost(uint32, tag = "2")]
-    pub num_readonly_signed_accounts: u32,
-    #[prost(uint32, tag = "3")]
-    pub num_readonly_unsigned_accounts: u32,
-}
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct TransactionStatusMeta {
-    #[prost(message, optional, tag = "1")]
-    pub err: ::core::option::Option<TransactionError>,
-    #[prost(uint64, tag = "2")]
-    pub fee: u64,
-    #[prost(uint64, repeated, tag = "3")]
-    pub pre_balances: ::prost::alloc::vec::Vec<u64>,
-    #[prost(uint64, repeated, tag = "4")]
-    pub post_balances: ::prost::alloc::vec::Vec<u64>,
-    #[prost(message, repeated, tag = "5")]
-    pub inner_instructions: ::prost::alloc::vec::Vec<InnerInstructions>,
-    #[prost(string, repeated, tag = "6")]
-    pub log_messages: ::prost::alloc::vec::Vec<::prost::alloc::string::String>,
-    #[prost(message, repeated, tag = "7")]
-    pub pre_token_balances: ::prost::alloc::vec::Vec<TokenBalance>,
-    #[prost(message, repeated, tag = "8")]
-    pub post_token_balances: ::prost::alloc::vec::Vec<TokenBalance>,
-    #[prost(message, repeated, tag = "9")]
-    pub rewards: ::prost::alloc::vec::Vec<Reward>,
-}
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct TransactionError {
-    #[prost(bytes = "vec", tag = "1")]
-    pub err: ::prost::alloc::vec::Vec<u8>,
-}
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct InnerInstructions {
-    #[prost(uint32, tag = "1")]
-    pub index: u32,
-    #[prost(message, repeated, tag = "2")]
-    pub instructions: ::prost::alloc::vec::Vec<CompiledInstruction>,
-}
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct CompiledInstruction {
-    #[prost(uint32, tag = "1")]
-    pub program_id_index: u32,
-    #[prost(bytes = "vec", tag = "2")]
-    pub accounts: ::prost::alloc::vec::Vec<u8>,
-    #[prost(bytes = "vec", tag = "3")]
-    pub data: ::prost::alloc::vec::Vec<u8>,
-}
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct TokenBalance {
-    #[prost(uint32, tag = "1")]
-    pub account_index: u32,
-    #[prost(string, tag = "2")]
-    pub mint: ::prost::alloc::string::String,
-    #[prost(message, optional, tag = "3")]
-    pub ui_token_amount: ::core::option::Option<UiTokenAmount>,
-}
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct UiTokenAmount {
-    #[prost(double, tag = "1")]
-    pub ui_amount: f64,
-    #[prost(uint32, tag = "2")]
-    pub decimals: u32,
-    #[prost(string, tag = "3")]
-    pub amount: ::prost::alloc::string::String,
-    #[prost(string, tag = "4")]
-    pub ui_amount_string: ::prost::alloc::string::String,
-}
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct Reward {
-    #[prost(string, tag = "1")]
-    pub pubkey: ::prost::alloc::string::String,
-    #[prost(int64, tag = "2")]
-    pub lamports: i64,
-    #[prost(uint64, tag = "3")]
-    pub post_balance: u64,
-    #[prost(enumeration = "RewardType", tag = "4")]
-    pub reward_type: i32,
-}
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct Rewards {
-    #[prost(message, repeated, tag = "1")]
-    pub rewards: ::prost::alloc::vec::Vec<Reward>,
-}
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct UnixTimestamp {
-    #[prost(int64, tag = "1")]
-    pub timestamp: i64,
-}
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct BlockHeight {
-    #[prost(uint64, tag = "1")]
-    pub block_height: u64,
-}
-#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, ::prost::Enumeration)]
-#[repr(i32)]
-pub enum RewardType {
-    Unspecified = 0,
-    Fee = 1,
-    Rent = 2,
-    Staking = 3,
-    Voting = 4,
-}
diff --git a/storage-proto/proto/solana.storage.transaction_by_addr.rs b/storage-proto/proto/solana.storage.transaction_by_addr.rs
deleted file mode 100644
index 767320a28ed477..00000000000000
--- a/storage-proto/proto/solana.storage.transaction_by_addr.rs
+++ /dev/null
@@ -1,123 +0,0 @@
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct TransactionByAddr {
-    #[prost(message, repeated, tag = "1")]
-    pub tx_by_addrs: ::prost::alloc::vec::Vec<TransactionByAddrInfo>,
-}
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct TransactionByAddrInfo {
-    #[prost(bytes = "vec", tag = "1")]
-    pub signature: ::prost::alloc::vec::Vec<u8>,
-    #[prost(message, optional, tag = "2")]
-    pub err: ::core::option::Option<TransactionError>,
-    #[prost(uint32, tag = "3")]
-    pub index: u32,
-    #[prost(message, optional, tag = "4")]
-    pub memo: ::core::option::Option<Memo>,
-    #[prost(message, optional, tag = "5")]
-    pub block_time: ::core::option::Option<UnixTimestamp>,
-}
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct Memo {
-    #[prost(string, tag = "1")]
-    pub memo: ::prost::alloc::string::String,
-}
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct TransactionError {
-    #[prost(enumeration = "TransactionErrorType", tag = "1")]
-    pub transaction_error: i32,
-    #[prost(message, optional, tag = "2")]
-    pub instruction_error: ::core::option::Option<InstructionError>,
-}
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct InstructionError {
-    #[prost(uint32, tag = "1")]
-    pub index: u32,
-    #[prost(enumeration = "InstructionErrorType", tag = "2")]
-    pub error: i32,
-    #[prost(message, optional, tag = "3")]
-    pub custom: ::core::option::Option<CustomError>,
-}
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct UnixTimestamp {
-    #[prost(int64, tag = "1")]
-    pub timestamp: i64,
-}
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct CustomError {
-    #[prost(uint32, tag = "1")]
-    pub custom: u32,
-}
-#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, ::prost::Enumeration)]
-#[repr(i32)]
-pub enum TransactionErrorType {
-    AccountInUse = 0,
-    AccountLoadedTwice = 1,
-    AccountNotFound = 2,
-    ProgramAccountNotFound = 3,
-    InsufficientFundsForFee = 4,
-    InvalidAccountForFee = 5,
-    AlreadyProcessed = 6,
-    BlockhashNotFound = 7,
-    InstructionError = 8,
-    CallChainTooDeep = 9,
-    MissingSignatureForFee = 10,
-    InvalidAccountIndex = 11,
-    SignatureFailure = 12,
-    InvalidProgramForExecution = 13,
-    SanitizeFailure = 14,
-    ClusterMaintenance = 15,
-    AccountBorrowOutstandingTx = 16,
-}
-#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, ::prost::Enumeration)]
-#[repr(i32)]
-pub enum InstructionErrorType {
-    GenericError = 0,
-    InvalidArgument = 1,
-    InvalidInstructionData = 2,
-    InvalidAccountData = 3,
-    AccountDataTooSmall = 4,
-    InsufficientFunds = 5,
-    IncorrectProgramId = 6,
-    MissingRequiredSignature = 7,
-    AccountAlreadyInitialized = 8,
-    UninitializedAccount = 9,
-    UnbalancedInstruction = 10,
-    ModifiedProgramId = 11,
-    ExternalAccountLamportSpend = 12,
-    ExternalAccountDataModified = 13,
-    ReadonlyLamportChange = 14,
-    ReadonlyDataModified = 15,
-    DuplicateAccountIndex = 16,
-    ExecutableModified = 17,
-    RentEpochModified = 18,
-    NotEnoughAccountKeys = 19,
-    AccountDataSizeChanged = 20,
-    AccountNotExecutable = 21,
-    AccountBorrowFailed = 22,
-    AccountBorrowOutstanding = 23,
-    DuplicateAccountOutOfSync = 24,
-    Custom = 25,
-    InvalidError = 26,
-    ExecutableDataModified = 27,
-    ExecutableLamportChange = 28,
-    ExecutableAccountNotRentExempt = 29,
-    UnsupportedProgramId = 30,
-    CallDepth = 31,
-    MissingAccount = 32,
-    ReentrancyNotAllowed = 33,
-    MaxSeedLengthExceeded = 34,
-    InvalidSeeds = 35,
-    InvalidRealloc = 36,
-    ComputationalBudgetExceeded = 37,
-    PrivilegeEscalation = 38,
-    ProgramEnvironmentSetupFailure = 39,
-    ProgramFailedToComplete = 40,
-    ProgramFailedToCompile = 41,
-    Immutable = 42,
-    IncorrectAuthority = 43,
-    BorshIoError = 44,
-    AccountNotRentExempt = 45,
-    InvalidAccountOwner = 46,
-    ArithmeticOverflow = 47,
-    UnsupportedSysvar = 48,
-}
diff --git a/storage-proto/src/transaction_by_addr.proto b/storage-proto/proto/transaction_by_addr.proto
similarity index 99%
rename from storage-proto/src/transaction_by_addr.proto
rename to storage-proto/proto/transaction_by_addr.proto
index 7394a3aa92d35f..44e300ce3452a0 100644
--- a/storage-proto/src/transaction_by_addr.proto
+++ b/storage-proto/proto/transaction_by_addr.proto
@@ -99,6 +99,7 @@ enum InstructionErrorType {
     INVALID_ACCOUNT_OWNER = 46;
     ARITHMETIC_OVERFLOW = 47;
     UNSUPPORTED_SYSVAR = 48;
+    ILLEGAL_OWNER = 49;
 }
 
 message UnixTimestamp {
diff --git a/storage-proto/src/convert.rs b/storage-proto/src/convert.rs
index 1cf7da59615d8b..a2304bec7bd838 100644
--- a/storage-proto/src/convert.rs
+++ b/storage-proto/src/convert.rs
@@ -1,35 +1,37 @@
-use crate::{StoredExtendedRewards, StoredTransactionStatusMeta};
-use solana_account_decoder::parse_token::{real_number_string_trimmed, UiTokenAmount};
-use solana_sdk::{
-    hash::Hash,
-    instruction::CompiledInstruction,
-    instruction::InstructionError,
-    message::{Message, MessageHeader},
-    pubkey::Pubkey,
-    signature::Signature,
-    transaction::Transaction,
-    transaction::TransactionError,
-};
-use solana_transaction_status::{
-    ConfirmedBlock, InnerInstructions, Reward, RewardType, TransactionByAddrInfo,
-    TransactionStatusMeta, TransactionTokenBalance, TransactionWithStatusMeta,
-};
-use std::{
-    convert::{TryFrom, TryInto},
-    str::FromStr,
+use {
+    crate::{StoredExtendedRewards, StoredTransactionStatusMeta},
+    solana_account_decoder::parse_token::{real_number_string_trimmed, UiTokenAmount},
+    solana_sdk::{
+        hash::Hash,
+        instruction::CompiledInstruction,
+        instruction::InstructionError,
+        message::{Message, MessageHeader},
+        pubkey::Pubkey,
+        signature::Signature,
+        transaction::Transaction,
+        transaction::TransactionError,
+    },
+    solana_transaction_status::{
+        ConfirmedBlock, InnerInstructions, Reward, RewardType, TransactionByAddrInfo,
+        TransactionStatusMeta, TransactionTokenBalance, TransactionWithStatusMeta,
+    },
+    std::{
+        convert::{TryFrom, TryInto},
+        str::FromStr,
+    },
 };
 
 pub mod generated {
     include!(concat!(
-        env!("CARGO_MANIFEST_DIR"),
-        concat!("/proto/solana.storage.confirmed_block.rs")
+        env!("OUT_DIR"),
+        "/solana.storage.confirmed_block.rs"
     ));
 }
 
 pub mod tx_by_addr {
     include!(concat!(
-        env!("CARGO_MANIFEST_DIR"),
-        concat!("/proto/solana.storage.transaction_by_addr.rs")
+        env!("OUT_DIR"),
+        "/solana.storage.transaction_by_addr.rs"
     ));
 }
 
@@ -87,6 +89,7 @@ impl From<Reward> for generated::Reward {
                 Some(RewardType::Staking) => generated::RewardType::Staking,
                 Some(RewardType::Voting) => generated::RewardType::Voting,
             } as i32,
+            commission: reward.commission.map(|c| c.to_string()).unwrap_or_default(),
         }
     }
 }
@@ -105,6 +108,7 @@ impl From<generated::Reward> for Reward {
                 4 => Some(RewardType::Voting),
                 _ => None,
             },
+            commission: reward.commission.parse::<u8>().ok(),
         }
     }
 }
@@ -753,6 +757,9 @@ impl From<TransactionError> for tx_by_addr::TransactionError {
                             InstructionError::UnsupportedSysvar => {
                                 tx_by_addr::InstructionErrorType::UnsupportedSysvar
                             }
+                            InstructionError::IllegalOwner => {
+                                tx_by_addr::InstructionErrorType::IllegalOwner
+                            }
                         } as i32,
                         custom: match instruction_error {
                             InstructionError::Custom(custom) => {
@@ -836,6 +843,7 @@ mod test {
             lamports: 123,
             post_balance: 321,
             reward_type: None,
+            commission: None,
         };
         let gen_reward: generated::Reward = reward.clone().into();
         assert_eq!(reward, gen_reward.into());
diff --git a/storage-proto/src/lib.rs b/storage-proto/src/lib.rs
index a132a8797f7240..bcb876e65ad9b6 100644
--- a/storage-proto/src/lib.rs
+++ b/storage-proto/src/lib.rs
@@ -1,13 +1,15 @@
-use serde::{Deserialize, Serialize};
-use solana_account_decoder::{
-    parse_token::{real_number_string_trimmed, UiTokenAmount},
-    StringAmount,
+use {
+    serde::{Deserialize, Serialize},
+    solana_account_decoder::{
+        parse_token::{real_number_string_trimmed, UiTokenAmount},
+        StringAmount,
+    },
+    solana_sdk::{deserialize_utils::default_on_eof, transaction::Result},
+    solana_transaction_status::{
+        InnerInstructions, Reward, RewardType, TransactionStatusMeta, TransactionTokenBalance,
+    },
+    std::str::FromStr,
 };
-use solana_sdk::{deserialize_utils::default_on_eof, transaction::Result};
-use solana_transaction_status::{
-    InnerInstructions, Reward, RewardType, TransactionStatusMeta, TransactionTokenBalance,
-};
-use std::str::FromStr;
 
 pub mod convert;
 
@@ -21,6 +23,8 @@ pub struct StoredExtendedReward {
     post_balance: u64,
     #[serde(deserialize_with = "default_on_eof")]
     reward_type: Option<RewardType>,
+    #[serde(deserialize_with = "default_on_eof")]
+    commission: Option<u8>,
 }
 
 impl From<StoredExtendedReward> for Reward {
@@ -30,12 +34,14 @@ impl From<StoredExtendedReward> for Reward {
             lamports,
             post_balance,
             reward_type,
+            commission,
         } = value;
         Self {
             pubkey,
             lamports,
             post_balance,
             reward_type,
+            commission,
         }
     }
 }
@@ -47,13 +53,14 @@ impl From<Reward> for StoredExtendedReward {
             lamports,
             post_balance,
             reward_type,
-            ..
+            commission,
         } = value;
         Self {
             pubkey,
             lamports,
             post_balance,
             reward_type,
+            commission,
         }
     }
 }
diff --git a/streamer/Cargo.toml b/streamer/Cargo.toml
index 2f67f0f691f421..cb33af18bc6361 100644
--- a/streamer/Cargo.toml
+++ b/streamer/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "solana-streamer"
-version = "1.7.0"
+version = "1.7.11"
 description = "Solana Streamer"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -11,14 +11,14 @@ edition = "2018"
 
 [dependencies]
 log = "0.4.11"
-solana-metrics = { path = "../metrics", version = "=1.7.0" }
-solana-sdk = { path = "../sdk", version = "=1.7.0" }
+solana-metrics = { path = "../metrics", version = "=1.7.11" }
+solana-sdk = { path = "../sdk", version = "=1.7.11" }
 thiserror = "1.0"
-solana-measure = { path = "../measure", version = "=1.7.0" }
-solana-logger = { path = "../logger", version = "=1.7.0" }
+solana-measure = { path = "../measure", version = "=1.7.11" }
+solana-logger = { path = "../logger", version = "=1.7.11" }
 libc = "0.2.81"
 nix = "0.19.0"
-solana-perf = { path = "../perf", version = "=1.7.0" }
+solana-perf = { path = "../perf", version = "=1.7.11" }
 
 [dev-dependencies]
 
diff --git a/streamer/src/lib.rs b/streamer/src/lib.rs
index e0b9bd71769713..c8ba5f6d4b1c52 100644
--- a/streamer/src/lib.rs
+++ b/streamer/src/lib.rs
@@ -2,6 +2,7 @@
 pub mod packet;
 pub mod recvmmsg;
 pub mod sendmmsg;
+pub mod socket;
 pub mod streamer;
 
 #[macro_use]
diff --git a/streamer/src/packet.rs b/streamer/src/packet.rs
index f8837d3b43052f..3e7f7342246748 100644
--- a/streamer/src/packet.rs
+++ b/streamer/src/packet.rs
@@ -1,5 +1,8 @@
 //! The `packet` module defines data structures and methods to pull data from the network.
-use crate::recvmmsg::{recv_mmsg, NUM_RCVMMSGS};
+use crate::{
+    recvmmsg::{recv_mmsg, NUM_RCVMMSGS},
+    socket::SocketAddrSpace,
+};
 pub use solana_perf::packet::{
     limited_deserialize, to_packets_chunked, Packets, PacketsRecycler, NUM_PACKETS,
     PACKETS_PER_BATCH,
@@ -54,10 +57,16 @@ pub fn recv_from(obj: &mut Packets, socket: &UdpSocket, max_wait_ms: u64) -> Res
     Ok(i)
 }
 
-pub fn send_to(obj: &Packets, socket: &UdpSocket) -> Result<()> {
+pub fn send_to(
+    obj: &Packets,
+    socket: &UdpSocket,
+    socket_addr_space: &SocketAddrSpace,
+) -> Result<()> {
     for p in &obj.packets {
-        let a = p.meta.addr();
-        socket.send_to(&p.data[..p.meta.size], &a)?;
+        let addr = p.meta.addr();
+        if socket_addr_space.check(&addr) {
+            socket.send_to(&p.data[..p.meta.size], &addr)?;
+        }
     }
     Ok(())
 }
@@ -94,7 +103,7 @@ mod tests {
             m.meta.set_addr(&addr);
             m.meta.size = PACKET_DATA_SIZE;
         }
-        send_to(&p, &send_socket).unwrap();
+        send_to(&p, &send_socket, &SocketAddrSpace::Unspecified).unwrap();
 
         let recvd = recv_from(&mut p, &recv_socket, 1).unwrap();
 
@@ -147,7 +156,7 @@ mod tests {
                 m.meta.set_addr(&addr);
                 m.meta.size = 1;
             }
-            send_to(&p, &send_socket).unwrap();
+            send_to(&p, &send_socket, &SocketAddrSpace::Unspecified).unwrap();
         }
 
         let recvd = recv_from(&mut p, &recv_socket, 100).unwrap();
diff --git a/streamer/src/socket.rs b/streamer/src/socket.rs
new file mode 100644
index 00000000000000..b44ba5b8f939d6
--- /dev/null
+++ b/streamer/src/socket.rs
@@ -0,0 +1,39 @@
+use std::net::{IpAddr, SocketAddr};
+
+#[derive(Clone, Copy, PartialEq)]
+pub enum SocketAddrSpace {
+    Unspecified,
+    Global,
+}
+
+impl SocketAddrSpace {
+    pub fn new(allow_private_addr: bool) -> Self {
+        if allow_private_addr {
+            SocketAddrSpace::Unspecified
+        } else {
+            SocketAddrSpace::Global
+        }
+    }
+
+    /// Returns true if the IP address is valid.
+    pub fn check(&self, addr: &SocketAddr) -> bool {
+        if self == &SocketAddrSpace::Unspecified {
+            return true;
+        }
+        // TODO: remove these once IpAddr::is_global is stable.
+        match addr.ip() {
+            IpAddr::V4(addr) => {
+                // TODO: Consider excluding:
+                //    addr.is_loopback() || addr.is_link_local()
+                // || addr.is_broadcast() || addr.is_documentation()
+                // || addr.is_unspecified()
+                !addr.is_private()
+            }
+            IpAddr::V6(_) => {
+                // TODO: Consider excluding:
+                // addr.is_loopback() || addr.is_unspecified(),
+                true
+            }
+        }
+    }
+}
diff --git a/streamer/src/streamer.rs b/streamer/src/streamer.rs
index 349142a5655b22..10d04722753e05 100644
--- a/streamer/src/streamer.rs
+++ b/streamer/src/streamer.rs
@@ -1,8 +1,11 @@
 //! The `streamer` module defines a set of services for efficiently pulling data from UDP sockets.
 //!
 
-use crate::packet::{self, send_to, Packets, PacketsRecycler, PACKETS_PER_BATCH};
-use crate::recvmmsg::NUM_RCVMMSGS;
+use crate::{
+    packet::{self, send_to, Packets, PacketsRecycler, PACKETS_PER_BATCH},
+    recvmmsg::NUM_RCVMMSGS,
+    socket::SocketAddrSpace,
+};
 use solana_sdk::timing::{duration_as_ms, timestamp};
 use std::net::UdpSocket;
 use std::sync::atomic::{AtomicBool, Ordering};
@@ -21,10 +24,10 @@ pub enum StreamerError {
     Io(#[from] std::io::Error),
 
     #[error("receive timeout error")]
-    RecvTimeoutError(#[from] RecvTimeoutError),
+    RecvTimeout(#[from] RecvTimeoutError),
 
     #[error("send packets error")]
-    SendError(#[from] SendError<Packets>),
+    Send(#[from] SendError<Packets>),
 }
 
 pub type Result<T> = std::result::Result<T, StreamerError>;
@@ -36,13 +39,18 @@ fn recv_loop(
     recycler: &PacketsRecycler,
     name: &'static str,
     coalesce_ms: u64,
+    use_pinned_memory: bool,
 ) -> Result<()> {
     let mut recv_count = 0;
     let mut call_count = 0;
     let mut now = Instant::now();
     let mut num_max_received = 0; // Number of times maximum packets were received
     loop {
-        let mut msgs = Packets::new_with_recycler(recycler.clone(), PACKETS_PER_BATCH, name);
+        let mut msgs = if use_pinned_memory {
+            Packets::new_with_recycler(recycler.clone(), PACKETS_PER_BATCH, name)
+        } else {
+            Packets::with_capacity(PACKETS_PER_BATCH)
+        };
         loop {
             // Check for exit signal, even if socket is busy
             // (for instance the leader transaction socket)
@@ -84,6 +92,7 @@ pub fn receiver(
     recycler: PacketsRecycler,
     name: &'static str,
     coalesce_ms: u64,
+    use_pinned_memory: bool,
 ) -> JoinHandle<()> {
     let res = sock.set_read_timeout(Some(Duration::new(1, 0)));
     if res.is_err() {
@@ -100,15 +109,20 @@ pub fn receiver(
                 &recycler.clone(),
                 name,
                 coalesce_ms,
+                use_pinned_memory,
             );
         })
         .unwrap()
 }
 
-fn recv_send(sock: &UdpSocket, r: &PacketReceiver) -> Result<()> {
+fn recv_send(
+    sock: &UdpSocket,
+    r: &PacketReceiver,
+    socket_addr_space: &SocketAddrSpace,
+) -> Result<()> {
     let timer = Duration::new(1, 0);
     let msgs = r.recv_timeout(timer)?;
-    send_to(&msgs, sock)?;
+    send_to(&msgs, sock, socket_addr_space)?;
     Ok(())
 }
 
@@ -131,7 +145,12 @@ pub fn recv_batch(recvr: &PacketReceiver, max_batch: usize) -> Result<(Vec<Packe
     Ok((batch, len, duration_as_ms(&recv_start.elapsed())))
 }
 
-pub fn responder(name: &'static str, sock: Arc<UdpSocket>, r: PacketReceiver) -> JoinHandle<()> {
+pub fn responder(
+    name: &'static str,
+    sock: Arc<UdpSocket>,
+    r: PacketReceiver,
+    socket_addr_space: SocketAddrSpace,
+) -> JoinHandle<()> {
     Builder::new()
         .name(format!("solana-responder-{}", name))
         .spawn(move || {
@@ -139,10 +158,10 @@ pub fn responder(name: &'static str, sock: Arc<UdpSocket>, r: PacketReceiver) ->
             let mut last_error = None;
             let mut last_print = 0;
             loop {
-                if let Err(e) = recv_send(&sock, &r) {
+                if let Err(e) = recv_send(&sock, &r, &socket_addr_space) {
                     match e {
-                        StreamerError::RecvTimeoutError(RecvTimeoutError::Disconnected) => break,
-                        StreamerError::RecvTimeoutError(RecvTimeoutError::Timeout) => (),
+                        StreamerError::RecvTimeout(RecvTimeoutError::Disconnected) => break,
+                        StreamerError::RecvTimeout(RecvTimeoutError::Timeout) => (),
                         _ => {
                             errors += 1;
                             last_error = Some(e);
@@ -211,10 +230,16 @@ mod test {
             Recycler::default(),
             "test",
             1,
+            true,
         );
         let t_responder = {
             let (s_responder, r_responder) = channel();
-            let t_responder = responder("streamer_send_test", Arc::new(send), r_responder);
+            let t_responder = responder(
+                "streamer_send_test",
+                Arc::new(send),
+                r_responder,
+                SocketAddrSpace::Unspecified,
+            );
             let mut msgs = Packets::default();
             for i in 0..5 {
                 let mut b = Packet::default();
diff --git a/sys-tuner/Cargo.toml b/sys-tuner/Cargo.toml
index 32f35356e92519..56bf73437f0f27 100644
--- a/sys-tuner/Cargo.toml
+++ b/sys-tuner/Cargo.toml
@@ -3,7 +3,7 @@ authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 edition = "2018"
 name = "solana-sys-tuner"
 description = "The solana cluster system tuner daemon"
-version = "1.7.0"
+version = "1.7.11"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
@@ -14,9 +14,9 @@ publish = true
 clap = "2.33.1"
 log = "0.4.11"
 libc = "0.2.81"
-solana-clap-utils = { path = "../clap-utils", version = "=1.7.0" }
-solana-logger = { path = "../logger", version = "=1.7.0" }
-solana-version = { path = "../version", version = "=1.7.0" }
+solana-clap-utils = { path = "../clap-utils", version = "=1.7.11" }
+solana-logger = { path = "../logger", version = "=1.7.11" }
+solana-version = { path = "../version", version = "=1.7.11" }
 
 [target."cfg(unix)".dependencies]
 unix_socket2 = "0.5.4"
diff --git a/sys-tuner/src/main.rs b/sys-tuner/src/main.rs
index a89997250b5b5b..e00a64b43e9ec6 100644
--- a/sys-tuner/src/main.rs
+++ b/sys-tuner/src/main.rs
@@ -93,7 +93,7 @@ fn tune_kernel_udp_buffers_and_vmmap() {
     sysctl_write("net.core.wmem_default", "134217728");
 
     // increase mmap counts for many append_vecs
-    sysctl_write("vm.max_map_count", "700000");
+    sysctl_write("vm.max_map_count", "1000000");
 }
 
 #[cfg(unix)]
diff --git a/tokens/Cargo.toml b/tokens/Cargo.toml
index a1a695488f0d96..629b799d3194eb 100644
--- a/tokens/Cargo.toml
+++ b/tokens/Cargo.toml
@@ -3,7 +3,7 @@ name = "solana-tokens"
 description = "Blockchain, Rebuilt for Scale"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 edition = "2018"
-version = "1.7.0"
+version = "1.7.11"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
@@ -12,7 +12,7 @@ documentation = "https://docs.rs/solana-tokens"
 [dependencies]
 chrono = { version = "0.4", features = ["serde"] }
 clap = "2.33.0"
-console = "0.11.3"
+console = "0.14.1"
 csv = "1.1.3"
 ctrlc = { version = "3.1.5", features = ["termination"] }
 dirs-next = "2.0.0"
@@ -20,23 +20,23 @@ indexmap = "1.5.1"
 indicatif = "0.15.0"
 pickledb = "0.4.1"
 serde = { version = "1.0", features = ["derive"] }
-solana-account-decoder = { path = "../account-decoder", version = "=1.7.0" }
-solana-clap-utils = { path = "../clap-utils", version = "=1.7.0" }
-solana-cli-config = { path = "../cli-config", version = "=1.7.0" }
-solana-client = { path = "../client", version = "=1.7.0" }
-solana-remote-wallet = { path = "../remote-wallet", version = "=1.7.0" }
-solana-runtime = { path = "../runtime", version = "=1.7.0" }
-solana-sdk = { path = "../sdk", version = "=1.7.0" }
-solana-stake-program = { path = "../programs/stake", version = "=1.7.0" }
-solana-transaction-status = { path = "../transaction-status", version = "=1.7.0" }
-solana-version = { path = "../version", version = "=1.7.0" }
-spl-associated-token-account-v1-0 = { package = "spl-associated-token-account", version = "=1.0.2" }
-spl-token-v2-0 = { package = "spl-token", version = "=3.1.0", features = ["no-entrypoint"] }
+solana-account-decoder = { path = "../account-decoder", version = "=1.7.11" }
+solana-clap-utils = { path = "../clap-utils", version = "=1.7.11" }
+solana-cli-config = { path = "../cli-config", version = "=1.7.11" }
+solana-client = { path = "../client", version = "=1.7.11" }
+solana-remote-wallet = { path = "../remote-wallet", version = "=1.7.11" }
+solana-runtime = { path = "../runtime", version = "=1.7.11" }
+solana-sdk = { path = "../sdk", version = "=1.7.11" }
+solana-transaction-status = { path = "../transaction-status", version = "=1.7.11" }
+solana-version = { path = "../version", version = "=1.7.11" }
+spl-associated-token-account-v1-0 = { package = "spl-associated-token-account", version = "=1.0.3" }
+spl-token-v2-0 = { package = "spl-token", version = "=3.2.0", features = ["no-entrypoint"] }
 tempfile = "3.1.0"
 thiserror = "1.0"
 
 [dev-dependencies]
 bincode = "1.3.1"
-solana-core = { path = "../core", version = "=1.7.0" }
-solana-logger = { path = "../logger", version = "=1.7.0" }
-solana-program-test = { path = "../program-test", version = "=1.7.0" }
+solana-core = { path = "../core", version = "=1.7.11" }
+solana-logger = { path = "../logger", version = "=1.7.11" }
+solana-program-test = { path = "../program-test", version = "=1.7.11" }
+solana-streamer = { path = "../streamer", version = "=1.7.11" }
diff --git a/tokens/src/arg_parser.rs b/tokens/src/arg_parser.rs
index a63b30d115745f..6b8bf2bcff3b0c 100644
--- a/tokens/src/arg_parser.rs
+++ b/tokens/src/arg_parser.rs
@@ -1,5 +1,6 @@
 use crate::args::{
-    Args, BalancesArgs, Command, DistributeTokensArgs, SplTokenArgs, StakeArgs, TransactionLogArgs,
+    Args, BalancesArgs, Command, DistributeTokensArgs, SenderStakeArgs, SplTokenArgs, StakeArgs,
+    TransactionLogArgs,
 };
 use clap::{
     crate_description, crate_name, value_t, value_t_or_exit, App, Arg, ArgMatches, SubCommand,
@@ -102,9 +103,80 @@ where
                         .help("Fee payer"),
                 ),
         )
+        .subcommand(
+            SubCommand::with_name("create-stake")
+                .about("Create stake accounts")
+                .arg(
+                    Arg::with_name("db_path")
+                        .long("db-path")
+                        .required(true)
+                        .takes_value(true)
+                        .value_name("FILE")
+                        .help(
+                            "Location for storing distribution database. \
+                            The database is used for tracking transactions as they are finalized \
+                            and preventing double spends.",
+                        ),
+                )
+                .arg(
+                    Arg::with_name("input_csv")
+                        .long("input-csv")
+                        .required(true)
+                        .takes_value(true)
+                        .value_name("FILE")
+                        .help("Allocations CSV file"),
+                )
+                .arg(
+                    Arg::with_name("dry_run")
+                        .long("dry-run")
+                        .help("Do not execute any transfers"),
+                )
+                .arg(
+                    Arg::with_name("output_path")
+                        .long("output-path")
+                        .short("o")
+                        .value_name("FILE")
+                        .takes_value(true)
+                        .help("Write the transaction log to this file"),
+                )
+                .arg(
+                    Arg::with_name("sender_keypair")
+                        .long("from")
+                        .required(true)
+                        .takes_value(true)
+                        .value_name("SENDING_KEYPAIR")
+                        .validator(is_valid_signer)
+                        .help("Keypair to fund accounts"),
+                )
+                .arg(
+                    Arg::with_name("unlocked_sol")
+                        .default_value("1.0")
+                        .long("unlocked-sol")
+                        .takes_value(true)
+                        .value_name("SOL_AMOUNT")
+                        .help("Amount of SOL to put in system account to pay for fees"),
+                )
+                .arg(
+                    Arg::with_name("lockup_authority")
+                        .long("lockup-authority")
+                        .takes_value(true)
+                        .value_name("PUBKEY")
+                        .validator(is_valid_pubkey)
+                        .help("Lockup Authority Address"),
+                )
+                .arg(
+                    Arg::with_name("fee_payer")
+                        .long("fee-payer")
+                        .required(true)
+                        .takes_value(true)
+                        .value_name("KEYPAIR")
+                        .validator(is_valid_signer)
+                        .help("Fee payer"),
+                ),
+        )
         .subcommand(
             SubCommand::with_name("distribute-stake")
-                .about("Distribute stake accounts")
+                .about("Split to stake accounts")
                 .arg(
                     Arg::with_name("db_path")
                         .long("db-path")
@@ -363,6 +435,58 @@ fn parse_distribute_tokens_args(
     })
 }
 
+fn parse_create_stake_args(
+    matches: &ArgMatches<'_>,
+) -> Result<DistributeTokensArgs, Box<dyn Error>> {
+    let mut wallet_manager = maybe_wallet_manager()?;
+    let signer_matches = ArgMatches::default(); // No default signer
+
+    let sender_keypair_str = value_t_or_exit!(matches, "sender_keypair", String);
+    let sender_keypair = signer_from_path(
+        &signer_matches,
+        &sender_keypair_str,
+        "sender",
+        &mut wallet_manager,
+    )?;
+
+    let fee_payer_str = value_t_or_exit!(matches, "fee_payer", String);
+    let fee_payer = signer_from_path(
+        &signer_matches,
+        &fee_payer_str,
+        "fee-payer",
+        &mut wallet_manager,
+    )?;
+
+    let lockup_authority_str = value_t!(matches, "lockup_authority", String).ok();
+    let lockup_authority = lockup_authority_str
+        .map(|path| {
+            pubkey_from_path(
+                &signer_matches,
+                &path,
+                "lockup authority",
+                &mut wallet_manager,
+            )
+        })
+        .transpose()?;
+
+    let stake_args = StakeArgs {
+        unlocked_sol: sol_to_lamports(value_t_or_exit!(matches, "unlocked_sol", f64)),
+        lockup_authority,
+        sender_stake_args: None,
+    };
+    Ok(DistributeTokensArgs {
+        input_csv: value_t_or_exit!(matches, "input_csv", String),
+        transaction_db: value_t_or_exit!(matches, "db_path", String),
+        output_path: matches.value_of("output_path").map(|path| path.to_string()),
+        dry_run: matches.is_present("dry_run"),
+        sender_keypair,
+        fee_payer,
+        stake_args: Some(stake_args),
+        spl_token_args: None,
+        transfer_amount: None,
+    })
+}
+
 fn parse_distribute_stake_args(
     matches: &ArgMatches<'_>,
 ) -> Result<DistributeTokensArgs, Box<dyn Error>> {
@@ -421,13 +545,18 @@ fn parse_distribute_stake_args(
         })
         .transpose()?;
 
-    let stake_args = StakeArgs {
+    let lockup_authority_address = lockup_authority.as_ref().map(|keypair| keypair.pubkey());
+    let sender_stake_args = SenderStakeArgs {
         stake_account_address,
-        unlocked_sol: sol_to_lamports(value_t_or_exit!(matches, "unlocked_sol", f64)),
         stake_authority,
         withdraw_authority,
         lockup_authority,
     };
+    let stake_args = StakeArgs {
+        unlocked_sol: sol_to_lamports(value_t_or_exit!(matches, "unlocked_sol", f64)),
+        lockup_authority: lockup_authority_address,
+        sender_stake_args: Some(sender_stake_args),
+    };
     Ok(DistributeTokensArgs {
         input_csv: value_t_or_exit!(matches, "input_csv", String),
         transaction_db: value_t_or_exit!(matches, "db_path", String),
@@ -520,6 +649,9 @@ where
         ("distribute-tokens", Some(matches)) => {
             Command::DistributeTokens(parse_distribute_tokens_args(matches)?)
         }
+        ("create-stake", Some(matches)) => {
+            Command::DistributeTokens(parse_create_stake_args(matches)?)
+        }
         ("distribute-stake", Some(matches)) => {
             Command::DistributeTokens(parse_distribute_stake_args(matches)?)
         }
diff --git a/tokens/src/args.rs b/tokens/src/args.rs
index 962e3a3a0cf342..a83c7e182eaf30 100644
--- a/tokens/src/args.rs
+++ b/tokens/src/args.rs
@@ -1,5 +1,18 @@
 use solana_sdk::{pubkey::Pubkey, signature::Signer};
 
+pub struct SenderStakeArgs {
+    pub stake_account_address: Pubkey,
+    pub stake_authority: Box<dyn Signer>,
+    pub withdraw_authority: Box<dyn Signer>,
+    pub lockup_authority: Option<Box<dyn Signer>>,
+}
+
+pub struct StakeArgs {
+    pub unlocked_sol: u64,
+    pub lockup_authority: Option<Pubkey>,
+    pub sender_stake_args: Option<SenderStakeArgs>,
+}
+
 pub struct DistributeTokensArgs {
     pub input_csv: String,
     pub transaction_db: String,
@@ -12,14 +25,6 @@ pub struct DistributeTokensArgs {
     pub transfer_amount: Option<u64>,
 }
 
-pub struct StakeArgs {
-    pub unlocked_sol: u64,
-    pub stake_account_address: Pubkey,
-    pub stake_authority: Box<dyn Signer>,
-    pub withdraw_authority: Box<dyn Signer>,
-    pub lockup_authority: Option<Box<dyn Signer>>,
-}
-
 #[derive(Default)]
 pub struct SplTokenArgs {
     pub token_account_address: Pubkey,
diff --git a/tokens/src/commands.rs b/tokens/src/commands.rs
index 29e83b662a69de..c4da5dabed6ef8 100644
--- a/tokens/src/commands.rs
+++ b/tokens/src/commands.rs
@@ -1,5 +1,5 @@
 use crate::{
-    args::{BalancesArgs, DistributeTokensArgs, StakeArgs, TransactionLogArgs},
+    args::{BalancesArgs, DistributeTokensArgs, SenderStakeArgs, StakeArgs, TransactionLogArgs},
     db::{self, TransactionInfo},
     spl_token::*,
     token_display::Token,
@@ -19,6 +19,7 @@ use solana_client::{
     rpc_client::RpcClient,
     rpc_config::RpcSendTransactionConfig,
     rpc_request::MAX_GET_SIGNATURE_STATUSES_QUERY_ITEMS,
+    rpc_response::Fees,
 };
 use solana_sdk::{
     clock::Slot,
@@ -27,13 +28,13 @@ use solana_sdk::{
     message::Message,
     native_token::{lamports_to_sol, sol_to_lamports},
     signature::{unique_signers, Signature, Signer},
+    stake::{
+        instruction::{self as stake_instruction, LockupArgs},
+        state::{Authorized, Lockup, StakeAuthorize},
+    },
     system_instruction,
     transaction::Transaction,
 };
-use solana_stake_program::{
-    stake_instruction::{self, LockupArgs},
-    stake_state::{Authorized, Lockup, StakeAuthorize},
-};
 use solana_transaction_status::TransactionStatus;
 use spl_associated_token_account_v1_0::get_associated_token_address;
 use spl_token_v2_0::solana_program::program_error::ProgramError;
@@ -139,7 +140,7 @@ fn apply_previous_transactions(
     for transaction_info in transaction_infos {
         let mut amount = transaction_info.amount;
         for allocation in allocations.iter_mut() {
-            if !has_same_recipient(&allocation, &transaction_info) {
+            if !has_same_recipient(allocation, transaction_info) {
                 continue;
             }
             if allocation.amount >= amount {
@@ -161,7 +162,7 @@ fn transfer<S: Signer>(
     to_pubkey: &Pubkey,
 ) -> ClientResult<Transaction> {
     let create_instruction =
-        system_instruction::transfer(&sender_keypair.pubkey(), &to_pubkey, lamports);
+        system_instruction::transfer(&sender_keypair.pubkey(), to_pubkey, lamports);
     let message = Message::new(&[create_instruction], Some(&sender_keypair.pubkey()));
     let (recent_blockhash, _fees) = client.get_recent_blockhash()?;
     Ok(Transaction::new(
@@ -178,77 +179,108 @@ fn distribution_instructions(
     lockup_date: Option<DateTime<Utc>>,
     do_create_associated_token_account: bool,
 ) -> Vec<Instruction> {
-    if args.stake_args.is_none() && args.spl_token_args.is_none() {
-        let from = args.sender_keypair.pubkey();
-        let to = allocation.recipient.parse().unwrap();
-        let lamports = allocation.amount;
-        let instruction = system_instruction::transfer(&from, &to, lamports);
-        return vec![instruction];
-    }
-
     if args.spl_token_args.is_some() {
         return build_spl_token_instructions(allocation, args, do_create_associated_token_account);
     }
 
-    let stake_args = args.stake_args.as_ref().unwrap();
-    let unlocked_sol = stake_args.unlocked_sol;
-    let sender_pubkey = args.sender_keypair.pubkey();
-    let stake_authority = stake_args.stake_authority.pubkey();
-    let withdraw_authority = stake_args.withdraw_authority.pubkey();
-
-    let mut instructions = stake_instruction::split(
-        &stake_args.stake_account_address,
-        &stake_authority,
-        allocation.amount - unlocked_sol,
-        &new_stake_account_address,
-    );
+    match &args.stake_args {
+        // No stake args; a simple token transfer.
+        None => {
+            let from = args.sender_keypair.pubkey();
+            let to = allocation.recipient.parse().unwrap();
+            let lamports = allocation.amount;
+            let instruction = system_instruction::transfer(&from, &to, lamports);
+            vec![instruction]
+        }
 
-    let recipient = allocation.recipient.parse().unwrap();
-
-    // Make the recipient the new stake authority
-    instructions.push(stake_instruction::authorize(
-        &new_stake_account_address,
-        &stake_authority,
-        &recipient,
-        StakeAuthorize::Staker,
-        None,
-    ));
-
-    // Make the recipient the new withdraw authority
-    instructions.push(stake_instruction::authorize(
-        &new_stake_account_address,
-        &withdraw_authority,
-        &recipient,
-        StakeAuthorize::Withdrawer,
-        None,
-    ));
-
-    // Add lockup
-    if let Some(lockup_date) = lockup_date {
-        let lockup_authority = stake_args
-            .lockup_authority
-            .as_ref()
-            .map(|signer| signer.pubkey())
-            .unwrap();
-        let lockup = LockupArgs {
-            unix_timestamp: Some(lockup_date.timestamp()),
-            epoch: None,
-            custodian: None,
-        };
-        instructions.push(stake_instruction::set_lockup(
-            &new_stake_account_address,
-            &lockup,
-            &lockup_authority,
-        ));
-    }
+        // Stake args provided, so create a recipient stake account.
+        Some(stake_args) => {
+            let unlocked_sol = stake_args.unlocked_sol;
+            let sender_pubkey = args.sender_keypair.pubkey();
+            let recipient = allocation.recipient.parse().unwrap();
+
+            let mut instructions = match &stake_args.sender_stake_args {
+                // No source stake account, so create a recipient stake account directly.
+                None => {
+                    // Make the recipient both the new stake and withdraw authority
+                    let authorized = Authorized {
+                        staker: recipient,
+                        withdrawer: recipient,
+                    };
+                    let mut lockup = Lockup::default();
+                    if let Some(lockup_date) = lockup_date {
+                        lockup.unix_timestamp = lockup_date.timestamp();
+                    }
+                    if let Some(lockup_authority) = stake_args.lockup_authority {
+                        lockup.custodian = lockup_authority;
+                    }
+                    stake_instruction::create_account(
+                        &sender_pubkey,
+                        new_stake_account_address,
+                        &authorized,
+                        &lockup,
+                        allocation.amount - unlocked_sol,
+                    )
+                }
+
+                // A sender stake account was provided, so create a recipient stake account by
+                // splitting the sender account.
+                Some(sender_stake_args) => {
+                    let stake_authority = sender_stake_args.stake_authority.pubkey();
+                    let withdraw_authority = sender_stake_args.withdraw_authority.pubkey();
+                    let mut instructions = stake_instruction::split(
+                        &sender_stake_args.stake_account_address,
+                        &stake_authority,
+                        allocation.amount - unlocked_sol,
+                        new_stake_account_address,
+                    );
+
+                    // Make the recipient the new stake authority
+                    instructions.push(stake_instruction::authorize(
+                        new_stake_account_address,
+                        &stake_authority,
+                        &recipient,
+                        StakeAuthorize::Staker,
+                        None,
+                    ));
+
+                    // Make the recipient the new withdraw authority
+                    instructions.push(stake_instruction::authorize(
+                        new_stake_account_address,
+                        &withdraw_authority,
+                        &recipient,
+                        StakeAuthorize::Withdrawer,
+                        None,
+                    ));
+
+                    // Add lockup
+                    if let Some(lockup_date) = lockup_date {
+                        let lockup = LockupArgs {
+                            unix_timestamp: Some(lockup_date.timestamp()),
+                            epoch: None,
+                            custodian: None,
+                        };
+                        instructions.push(stake_instruction::set_lockup(
+                            new_stake_account_address,
+                            &lockup,
+                            &stake_args.lockup_authority.unwrap(),
+                        ));
+                    }
+
+                    instructions
+                }
+            };
 
-    instructions.push(system_instruction::transfer(
-        &sender_pubkey,
-        &recipient,
-        unlocked_sol,
-    ));
+            // Transfer some unlocked tokens to recipient, which they can use for transaction fees.
+            instructions.push(system_instruction::transfer(
+                &sender_pubkey,
+                &recipient,
+                unlocked_sol,
+            ));
 
-    instructions
+            instructions
+        }
+    }
 }
 
 fn build_messages(
@@ -336,14 +368,17 @@ fn send_messages(
 
         let mut signers = vec![&*args.fee_payer, &*args.sender_keypair];
         if let Some(stake_args) = &args.stake_args {
-            signers.push(&*stake_args.stake_authority);
-            signers.push(&*stake_args.withdraw_authority);
             signers.push(&new_stake_account_keypair);
-            if !allocation.lockup_date.is_empty() {
-                if let Some(lockup_authority) = &stake_args.lockup_authority {
-                    signers.push(&**lockup_authority);
-                } else {
-                    return Err(Error::MissingLockupAuthority);
+            if let Some(sender_stake_args) = &stake_args.sender_stake_args {
+                signers.push(&*sender_stake_args.stake_authority);
+                signers.push(&*sender_stake_args.withdraw_authority);
+                signers.push(&new_stake_account_keypair);
+                if !allocation.lockup_date.is_empty() {
+                    if let Some(lockup_authority) = &sender_stake_args.lockup_authority {
+                        signers.push(&**lockup_authority);
+                    } else {
+                        return Err(Error::MissingLockupAuthority);
+                    }
                 }
             }
         }
@@ -352,8 +387,12 @@ fn send_messages(
             if args.dry_run {
                 Ok((Transaction::new_unsigned(message), std::u64::MAX))
             } else {
-                let (blockhash, _fee_calculator, last_valid_slot) = client
-                    .get_recent_blockhash_with_commitment(CommitmentConfig::default())?
+                let Fees {
+                    blockhash,
+                    last_valid_block_height,
+                    ..
+                } = client
+                    .get_fees_with_commitment(CommitmentConfig::default())?
                     .value;
                 let transaction = Transaction::new(&signers, message, blockhash);
                 let config = RpcSendTransactionConfig {
@@ -361,19 +400,21 @@ fn send_messages(
                     ..RpcSendTransactionConfig::default()
                 };
                 client.send_transaction_with_config(&transaction, config)?;
-                Ok((transaction, last_valid_slot))
+                Ok((transaction, last_valid_block_height))
             }
         };
         match result {
-            Ok((transaction, last_valid_slot)) => {
+            Ok((transaction, last_valid_block_height)) => {
+                let new_stake_account_address_option =
+                    args.stake_args.as_ref().map(|_| &new_stake_account_address);
                 db::set_transaction_info(
                     db,
                     &allocation.recipient.parse().unwrap(),
                     allocation.amount,
                     &transaction,
-                    args.stake_args.as_ref().map(|_| &new_stake_account_address),
+                    new_stake_account_address_option,
                     false,
-                    last_valid_slot,
+                    last_valid_block_height,
                     lockup_date,
                 )?;
             }
@@ -622,7 +663,7 @@ fn update_finalized_transactions(
             if info.finalized_date.is_some() {
                 None
             } else {
-                Some((&info.transaction, info.last_valid_slot))
+                Some((&info.transaction, info.last_valid_block_height))
             }
         })
         .collect();
@@ -637,7 +678,7 @@ fn update_finalized_transactions(
     {
         statuses.extend(
             client
-                .get_signature_statuses(&unconfirmed_signatures_chunk)?
+                .get_signature_statuses(unconfirmed_signatures_chunk)?
                 .value
                 .into_iter(),
         );
@@ -664,8 +705,8 @@ fn log_transaction_confirmations(
     statuses: Vec<Option<TransactionStatus>>,
     confirmations: &mut Option<usize>,
 ) -> Result<(), Error> {
-    let root_slot = client.get_slot()?;
-    for ((transaction, last_valid_slot), opt_transaction_status) in unconfirmed_transactions
+    let finalized_block_height = client.get_block_height()?;
+    for ((transaction, last_valid_block_height), opt_transaction_status) in unconfirmed_transactions
         .into_iter()
         .zip(statuses.into_iter())
     {
@@ -673,8 +714,8 @@ fn log_transaction_confirmations(
             db,
             &transaction.signatures[0],
             opt_transaction_status,
-            last_valid_slot,
-            root_slot,
+            last_valid_block_height,
+            finalized_block_height,
         ) {
             Ok(Some(confs)) => {
                 *confirmations = Some(cmp::min(confs, confirmations.unwrap_or(usize::MAX)));
@@ -708,8 +749,13 @@ fn check_payer_balances(
     let (distribution_source, unlocked_sol_source) = if let Some(stake_args) = &args.stake_args {
         let total_unlocked_sol = allocations.len() as u64 * stake_args.unlocked_sol;
         undistributed_tokens -= total_unlocked_sol;
+        let from_pubkey = if let Some(sender_stake_args) = &stake_args.sender_stake_args {
+            sender_stake_args.stake_account_address
+        } else {
+            args.sender_keypair.pubkey()
+        };
         (
-            stake_args.stake_account_address,
+            from_pubkey,
             Some((args.sender_keypair.pubkey(), total_unlocked_sol)),
         )
     } else {
@@ -909,7 +955,7 @@ pub fn test_process_distribute_tokens_with_client(
     check_output_file(&output_path, &db::open_db(&transaction_db, true).unwrap());
 }
 
-pub fn test_process_distribute_stake_with_client(client: &RpcClient, sender_keypair: Keypair) {
+pub fn test_process_create_stake_with_client(client: &RpcClient, sender_keypair: Keypair) {
     let exit = Arc::new(AtomicBool::default());
     let fee_payer = Keypair::new();
     let transaction = transfer(
@@ -975,11 +1021,137 @@ pub fn test_process_distribute_stake_with_client(client: &RpcClient, sender_keyp
     let output_path = output_file.path().to_str().unwrap().to_string();
 
     let stake_args = StakeArgs {
+        lockup_authority: None,
+        unlocked_sol: sol_to_lamports(1.0),
+        sender_stake_args: None,
+    };
+    let args = DistributeTokensArgs {
+        fee_payer: Box::new(fee_payer),
+        dry_run: false,
+        input_csv,
+        transaction_db: transaction_db.clone(),
+        output_path: Some(output_path.clone()),
+        stake_args: Some(stake_args),
+        spl_token_args: None,
+        sender_keypair: Box::new(sender_keypair),
+        transfer_amount: None,
+    };
+    let confirmations = process_allocations(client, &args, exit.clone()).unwrap();
+    assert_eq!(confirmations, None);
+
+    let transaction_infos =
+        db::read_transaction_infos(&db::open_db(&transaction_db, true).unwrap());
+    assert_eq!(transaction_infos.len(), 1);
+    assert_eq!(transaction_infos[0].recipient, alice_pubkey);
+    assert_eq!(transaction_infos[0].amount, expected_amount);
+
+    assert_eq!(
+        client.get_balance(&alice_pubkey).unwrap(),
+        sol_to_lamports(1.0),
+    );
+    let new_stake_account_address = transaction_infos[0].new_stake_account_address.unwrap();
+    assert_eq!(
+        client.get_balance(&new_stake_account_address).unwrap(),
+        expected_amount - sol_to_lamports(1.0),
+    );
+
+    check_output_file(&output_path, &db::open_db(&transaction_db, true).unwrap());
+
+    // Now, run it again, and check there's no double-spend.
+    process_allocations(client, &args, exit).unwrap();
+    let transaction_infos =
+        db::read_transaction_infos(&db::open_db(&transaction_db, true).unwrap());
+    assert_eq!(transaction_infos.len(), 1);
+    assert_eq!(transaction_infos[0].recipient, alice_pubkey);
+    assert_eq!(transaction_infos[0].amount, expected_amount);
+
+    assert_eq!(
+        client.get_balance(&alice_pubkey).unwrap(),
+        sol_to_lamports(1.0),
+    );
+    assert_eq!(
+        client.get_balance(&new_stake_account_address).unwrap(),
+        expected_amount - sol_to_lamports(1.0),
+    );
+
+    check_output_file(&output_path, &db::open_db(&transaction_db, true).unwrap());
+}
+
+pub fn test_process_distribute_stake_with_client(client: &RpcClient, sender_keypair: Keypair) {
+    let exit = Arc::new(AtomicBool::default());
+    let fee_payer = Keypair::new();
+    let transaction = transfer(
+        client,
+        sol_to_lamports(1.0),
+        &sender_keypair,
+        &fee_payer.pubkey(),
+    )
+    .unwrap();
+    client
+        .send_and_confirm_transaction_with_spinner(&transaction)
+        .unwrap();
+
+    let stake_account_keypair = Keypair::new();
+    let stake_account_address = stake_account_keypair.pubkey();
+    let stake_authority = Keypair::new();
+    let withdraw_authority = Keypair::new();
+
+    let authorized = Authorized {
+        staker: stake_authority.pubkey(),
+        withdrawer: withdraw_authority.pubkey(),
+    };
+    let lockup = Lockup::default();
+    let instructions = stake_instruction::create_account(
+        &sender_keypair.pubkey(),
+        &stake_account_address,
+        &authorized,
+        &lockup,
+        sol_to_lamports(3000.0),
+    );
+    let message = Message::new(&instructions, Some(&sender_keypair.pubkey()));
+    let signers = [&sender_keypair, &stake_account_keypair];
+    let (blockhash, _fees) = client.get_recent_blockhash().unwrap();
+    let transaction = Transaction::new(&signers, message, blockhash);
+    client
+        .send_and_confirm_transaction_with_spinner(&transaction)
+        .unwrap();
+
+    let expected_amount = sol_to_lamports(1000.0);
+    let alice_pubkey = solana_sdk::pubkey::new_rand();
+    let file = NamedTempFile::new().unwrap();
+    let input_csv = file.path().to_str().unwrap().to_string();
+    let mut wtr = csv::WriterBuilder::new().from_writer(file);
+    wtr.write_record(&["recipient", "amount", "lockup_date"])
+        .unwrap();
+    wtr.write_record(&[
+        alice_pubkey.to_string(),
+        lamports_to_sol(expected_amount).to_string(),
+        "".to_string(),
+    ])
+    .unwrap();
+    wtr.flush().unwrap();
+
+    let dir = tempdir().unwrap();
+    let transaction_db = dir
+        .path()
+        .join("transactions.db")
+        .to_str()
+        .unwrap()
+        .to_string();
+
+    let output_file = NamedTempFile::new().unwrap();
+    let output_path = output_file.path().to_str().unwrap().to_string();
+
+    let sender_stake_args = SenderStakeArgs {
         stake_account_address,
         stake_authority: Box::new(stake_authority),
         withdraw_authority: Box::new(withdraw_authority),
         lockup_authority: None,
+    };
+    let stake_args = StakeArgs {
         unlocked_sol: sol_to_lamports(1.0),
+        lockup_authority: None,
+        sender_stake_args: Some(sender_stake_args),
     };
     let args = DistributeTokensArgs {
         fee_payer: Box::new(fee_payer),
@@ -1037,14 +1209,18 @@ pub fn test_process_distribute_stake_with_client(client: &RpcClient, sender_keyp
 mod tests {
     use super::*;
     use solana_core::test_validator::TestValidator;
-    use solana_sdk::signature::{read_keypair_file, write_keypair_file, Signer};
-    use solana_stake_program::stake_instruction::StakeInstruction;
+    use solana_sdk::{
+        signature::{read_keypair_file, write_keypair_file, Signer},
+        stake::instruction::StakeInstruction,
+    };
+    use solana_streamer::socket::SocketAddrSpace;
     use solana_transaction_status::TransactionConfirmationStatus;
 
     #[test]
     fn test_process_token_allocations() {
         let alice = Keypair::new();
-        let test_validator = TestValidator::with_no_fees(alice.pubkey(), None);
+        let test_validator =
+            TestValidator::with_no_fees(alice.pubkey(), None, SocketAddrSpace::Unspecified);
         let url = test_validator.rpc_url();
 
         let client = RpcClient::new_with_commitment(url, CommitmentConfig::processed());
@@ -1054,17 +1230,30 @@ mod tests {
     #[test]
     fn test_process_transfer_amount_allocations() {
         let alice = Keypair::new();
-        let test_validator = TestValidator::with_no_fees(alice.pubkey(), None);
+        let test_validator =
+            TestValidator::with_no_fees(alice.pubkey(), None, SocketAddrSpace::Unspecified);
         let url = test_validator.rpc_url();
 
         let client = RpcClient::new_with_commitment(url, CommitmentConfig::processed());
         test_process_distribute_tokens_with_client(&client, alice, Some(sol_to_lamports(1.5)));
     }
 
+    #[test]
+    fn test_create_stake_allocations() {
+        let alice = Keypair::new();
+        let test_validator =
+            TestValidator::with_no_fees(alice.pubkey(), None, SocketAddrSpace::Unspecified);
+        let url = test_validator.rpc_url();
+
+        let client = RpcClient::new_with_commitment(url, CommitmentConfig::processed());
+        test_process_create_stake_with_client(&client, alice);
+    }
+
     #[test]
     fn test_process_stake_allocations() {
         let alice = Keypair::new();
-        let test_validator = TestValidator::with_no_fees(alice.pubkey(), None);
+        let test_validator =
+            TestValidator::with_no_fees(alice.pubkey(), None, SocketAddrSpace::Unspecified);
         let url = test_validator.rpc_url();
 
         let client = RpcClient::new_with_commitment(url, CommitmentConfig::processed());
@@ -1290,10 +1479,10 @@ mod tests {
         )); // Same recipient, same lockups
     }
 
-    const SET_LOCKUP_INDEX: usize = 4;
+    const SET_LOCKUP_INDEX: usize = 5;
 
     #[test]
-    fn test_set_stake_lockup() {
+    fn test_set_split_stake_lockup() {
         let lockup_date_str = "2021-01-07T00:00:00Z";
         let allocation = Allocation {
             recipient: Pubkey::default().to_string(),
@@ -1303,12 +1492,17 @@ mod tests {
         let stake_account_address = solana_sdk::pubkey::new_rand();
         let new_stake_account_address = solana_sdk::pubkey::new_rand();
         let lockup_authority = Keypair::new();
-        let stake_args = StakeArgs {
+        let lockup_authority_address = lockup_authority.pubkey();
+        let sender_stake_args = SenderStakeArgs {
             stake_account_address,
             stake_authority: Box::new(Keypair::new()),
             withdraw_authority: Box::new(Keypair::new()),
             lockup_authority: Some(Box::new(lockup_authority)),
+        };
+        let stake_args = StakeArgs {
+            lockup_authority: Some(lockup_authority_address),
             unlocked_sol: sol_to_lamports(1.0),
+            sender_stake_args: Some(sender_stake_args),
         };
         let args = DistributeTokensArgs {
             fee_payer: Box::new(Keypair::new()),
@@ -1379,7 +1573,12 @@ mod tests {
         let fees_in_sol = lamports_to_sol(fees);
 
         let alice = Keypair::new();
-        let test_validator = TestValidator::with_custom_fees(alice.pubkey(), fees, None);
+        let test_validator = TestValidator::with_custom_fees(
+            alice.pubkey(),
+            fees,
+            None,
+            SocketAddrSpace::Unspecified,
+        );
         let url = test_validator.rpc_url();
 
         let client = RpcClient::new_with_commitment(url, CommitmentConfig::processed());
@@ -1462,7 +1661,12 @@ mod tests {
         let fees = 10_000;
         let fees_in_sol = lamports_to_sol(fees);
         let alice = Keypair::new();
-        let test_validator = TestValidator::with_custom_fees(alice.pubkey(), fees, None);
+        let test_validator = TestValidator::with_custom_fees(
+            alice.pubkey(),
+            fees,
+            None,
+            SocketAddrSpace::Unspecified,
+        );
         let url = test_validator.rpc_url();
 
         let client = RpcClient::new_with_commitment(url, CommitmentConfig::processed());
@@ -1558,12 +1762,17 @@ mod tests {
             .send_and_confirm_transaction_with_spinner(&transaction)
             .unwrap();
 
-        StakeArgs {
+        let sender_stake_args = SenderStakeArgs {
             stake_account_address,
             stake_authority: Box::new(stake_authority),
             withdraw_authority: Box::new(withdraw_authority),
             lockup_authority: None,
+        };
+
+        StakeArgs {
+            lockup_authority: None,
             unlocked_sol,
+            sender_stake_args: Some(sender_stake_args),
         }
     }
 
@@ -1572,7 +1781,12 @@ mod tests {
         let fees = 10_000;
         let fees_in_sol = lamports_to_sol(fees);
         let alice = Keypair::new();
-        let test_validator = TestValidator::with_custom_fees(alice.pubkey(), fees, None);
+        let test_validator = TestValidator::with_custom_fees(
+            alice.pubkey(),
+            fees,
+            None,
+            SocketAddrSpace::Unspecified,
+        );
         let url = test_validator.rpc_url();
         let client = RpcClient::new_with_commitment(url, CommitmentConfig::processed());
 
@@ -1681,7 +1895,12 @@ mod tests {
         let fees = 10_000;
         let fees_in_sol = lamports_to_sol(fees);
         let alice = Keypair::new();
-        let test_validator = TestValidator::with_custom_fees(alice.pubkey(), fees, None);
+        let test_validator = TestValidator::with_custom_fees(
+            alice.pubkey(),
+            fees,
+            None,
+            SocketAddrSpace::Unspecified,
+        );
         let url = test_validator.rpc_url();
 
         let client = RpcClient::new_with_commitment(url, CommitmentConfig::processed());
@@ -1768,7 +1987,7 @@ mod tests {
         let sender = Keypair::new();
         let recipient = Pubkey::new_unique();
         let amount = sol_to_lamports(1.0);
-        let last_valid_slot = 222;
+        let last_valid_block_height = 222;
         let transaction = transfer(&client, amount, &sender, &recipient).unwrap();
 
         // Queue db data
@@ -1779,7 +1998,7 @@ mod tests {
             &transaction,
             None,
             false,
-            last_valid_slot,
+            last_valid_block_height,
             None,
         )
         .unwrap();
@@ -1868,7 +2087,7 @@ mod tests {
                 new_stake_account_address: None,
                 finalized_date: None,
                 transaction,
-                last_valid_slot,
+                last_valid_block_height,
                 lockup_date: None,
             }
         );
@@ -1890,7 +2109,7 @@ mod tests {
         let sender = Keypair::new();
         let recipient = Pubkey::new_unique();
         let amount = sol_to_lamports(1.0);
-        let last_valid_slot = 222;
+        let last_valid_block_height = 222;
         let transaction = transfer(&client, amount, &sender, &recipient).unwrap();
 
         // Queue db data
@@ -1901,7 +2120,7 @@ mod tests {
             &transaction,
             None,
             false,
-            last_valid_slot,
+            last_valid_block_height,
             None,
         )
         .unwrap();
@@ -1972,7 +2191,7 @@ mod tests {
             new_stake_account_address: None,
             finalized_date: None,
             transaction,
-            last_valid_slot,
+            last_valid_block_height,
             lockup_date: None,
         }));
         assert!(transaction_info.contains(&TransactionInfo {
@@ -1981,7 +2200,7 @@ mod tests {
             new_stake_account_address: None,
             finalized_date: None,
             transaction: Transaction::new_unsigned(message),
-            last_valid_slot: std::u64::MAX,
+            last_valid_block_height: std::u64::MAX,
             lockup_date: None,
         }));
 
@@ -1996,7 +2215,11 @@ mod tests {
     #[test]
     fn test_distribute_allocations_dump_db() {
         let sender_keypair = Keypair::new();
-        let test_validator = TestValidator::with_no_fees(sender_keypair.pubkey(), None);
+        let test_validator = TestValidator::with_no_fees(
+            sender_keypair.pubkey(),
+            None,
+            SocketAddrSpace::Unspecified,
+        );
         let url = test_validator.rpc_url();
         let client = RpcClient::new_with_commitment(url, CommitmentConfig::processed());
 
@@ -2063,7 +2286,7 @@ mod tests {
         let sender = Keypair::new();
         let recipient = Pubkey::new_unique();
         let amount = sol_to_lamports(1.0);
-        let last_valid_slot = 222;
+        let last_valid_block_height = 222;
         let transaction = transfer(&client, amount, &sender, &recipient).unwrap();
 
         // Queue unconfirmed transaction into db
@@ -2074,7 +2297,7 @@ mod tests {
             &transaction,
             None,
             false,
-            last_valid_slot,
+            last_valid_block_height,
             None,
         )
         .unwrap();
@@ -2156,7 +2379,7 @@ mod tests {
         let sender = Keypair::new();
         let recipient = Pubkey::new_unique();
         let amount = sol_to_lamports(1.0);
-        let last_valid_slot = 222;
+        let last_valid_block_height = 222;
         let transaction = transfer(&client, amount, &sender, &recipient).unwrap();
 
         // Queue unconfirmed transaction into db
@@ -2167,7 +2390,7 @@ mod tests {
             &transaction,
             None,
             false,
-            last_valid_slot,
+            last_valid_block_height,
             None,
         )
         .unwrap();
diff --git a/tokens/src/db.rs b/tokens/src/db.rs
index 1aaa92f06d6218..bd250597c78d0f 100644
--- a/tokens/src/db.rs
+++ b/tokens/src/db.rs
@@ -12,7 +12,7 @@ pub struct TransactionInfo {
     pub new_stake_account_address: Option<Pubkey>,
     pub finalized_date: Option<DateTime<Utc>>,
     pub transaction: Transaction,
-    pub last_valid_slot: Slot,
+    pub last_valid_block_height: Slot,
     pub lockup_date: Option<DateTime<Utc>>,
 }
 
@@ -38,7 +38,7 @@ impl Default for TransactionInfo {
             new_stake_account_address: None,
             finalized_date: None,
             transaction,
-            last_valid_slot: 0,
+            last_valid_block_height: 0,
             lockup_date: None,
         }
     }
@@ -108,7 +108,7 @@ pub fn set_transaction_info(
     transaction: &Transaction,
     new_stake_account_address: Option<&Pubkey>,
     finalized: bool,
-    last_valid_slot: Slot,
+    last_valid_block_height: u64,
     lockup_date: Option<DateTime<Utc>>,
 ) -> Result<(), Error> {
     let finalized_date = if finalized { Some(Utc::now()) } else { None };
@@ -118,7 +118,7 @@ pub fn set_transaction_info(
         new_stake_account_address: new_stake_account_address.cloned(),
         finalized_date,
         transaction: transaction.clone(),
-        last_valid_slot,
+        last_valid_block_height,
         lockup_date,
     };
     let signature = transaction.signatures[0];
@@ -134,11 +134,11 @@ pub fn update_finalized_transaction(
     db: &mut PickleDb,
     signature: &Signature,
     opt_transaction_status: Option<TransactionStatus>,
-    last_valid_slot: Slot,
-    root_slot: Slot,
+    last_valid_block_height: u64,
+    finalized_block_height: u64,
 ) -> Result<Option<usize>, Error> {
     if opt_transaction_status.is_none() {
-        if root_slot > last_valid_slot {
+        if finalized_block_height > last_valid_block_height {
             eprintln!(
                 "Signature not found {} and blockhash expired. Transaction either dropped or the validator purged the transaction status.",
                 signature
diff --git a/tokens/tests/commands.rs b/tokens/tests/commands.rs
index 67666f84ad3f63..7e6546168178f2 100644
--- a/tokens/tests/commands.rs
+++ b/tokens/tests/commands.rs
@@ -1,6 +1,7 @@
 use solana_client::rpc_client::RpcClient;
 use solana_core::test_validator::TestValidator;
 use solana_sdk::signature::{Keypair, Signer};
+use solana_streamer::socket::SocketAddrSpace;
 use solana_tokens::commands::test_process_distribute_tokens_with_client;
 
 #[test]
@@ -8,7 +9,8 @@ fn test_process_distribute_with_rpc_client() {
     solana_logger::setup();
 
     let mint_keypair = Keypair::new();
-    let test_validator = TestValidator::with_no_fees(mint_keypair.pubkey(), None);
+    let test_validator =
+        TestValidator::with_no_fees(mint_keypair.pubkey(), None, SocketAddrSpace::Unspecified);
 
     let client = RpcClient::new(test_validator.rpc_url());
     test_process_distribute_tokens_with_client(&client, mint_keypair, None);
diff --git a/transaction-status/Cargo.toml b/transaction-status/Cargo.toml
index e3f282ba1c4908..4bcf6fdc39f67a 100644
--- a/transaction-status/Cargo.toml
+++ b/transaction-status/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "solana-transaction-status"
-version = "1.7.0"
+version = "1.7.11"
 description = "Solana transaction status types"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -18,14 +18,13 @@ lazy_static = "1.4.0"
 serde = "1.0.122"
 serde_derive = "1.0.103"
 serde_json = "1.0.56"
-solana-account-decoder = { path = "../account-decoder", version = "=1.7.0" }
-solana-sdk = { path = "../sdk", version = "=1.7.0" }
-solana-runtime = { path = "../runtime", version = "=1.7.0" }
-solana-stake-program = { path = "../programs/stake", version = "=1.7.0" }
-solana-vote-program = { path = "../programs/vote", version = "=1.7.0" }
-spl-associated-token-account-v1-0 = { package = "spl-associated-token-account", version = "=1.0.2", features = ["no-entrypoint"] }
+solana-account-decoder = { path = "../account-decoder", version = "=1.7.11" }
+solana-sdk = { path = "../sdk", version = "=1.7.11" }
+solana-runtime = { path = "../runtime", version = "=1.7.11" }
+solana-vote-program = { path = "../programs/vote", version = "=1.7.11" }
+spl-associated-token-account-v1-0 = { package = "spl-associated-token-account", version = "=1.0.3", features = ["no-entrypoint"] }
 spl-memo = { version = "=3.0.1", features = ["no-entrypoint"] }
-spl-token-v2-0 = { package = "spl-token", version = "=3.1.0", features = ["no-entrypoint"] }
+spl-token-v2-0 = { package = "spl-token", version = "=3.2.0", features = ["no-entrypoint"] }
 thiserror = "1.0"
 
 [package.metadata.docs.rs]
diff --git a/transaction-status/src/lib.rs b/transaction-status/src/lib.rs
index 84a90d5317a795..6a145dbc080e36 100644
--- a/transaction-status/src/lib.rs
+++ b/transaction-status/src/lib.rs
@@ -339,6 +339,7 @@ pub struct Reward {
     pub lamports: i64,
     pub post_balance: u64, // Account balance in lamports after `lamports` was applied
     pub reward_type: Option<RewardType>,
+    pub commission: Option<u8>, // Vote account commission when the reward was credited, only present for voting and staking rewards
 }
 
 pub type Rewards = Vec<Reward>;
diff --git a/transaction-status/src/parse_accounts.rs b/transaction-status/src/parse_accounts.rs
index 20bd74a56b13d5..ebef018e716695 100644
--- a/transaction-status/src/parse_accounts.rs
+++ b/transaction-status/src/parse_accounts.rs
@@ -13,7 +13,7 @@ pub fn parse_accounts(message: &Message) -> Vec<ParsedAccount> {
     for (i, account_key) in message.account_keys.iter().enumerate() {
         accounts.push(ParsedAccount {
             pubkey: account_key.to_string(),
-            writable: message.is_writable(i, /*demote_sysvar_write_locks=*/ true),
+            writable: message.is_writable(i),
             signer: message.is_signer(i),
         });
     }
diff --git a/transaction-status/src/parse_instruction.rs b/transaction-status/src/parse_instruction.rs
index 4e2874ee54bb67..94ea9215db2fb6 100644
--- a/transaction-status/src/parse_instruction.rs
+++ b/transaction-status/src/parse_instruction.rs
@@ -9,7 +9,7 @@ use crate::{
 use inflector::Inflector;
 use serde_json::Value;
 use solana_account_decoder::parse_token::spl_token_id_v2_0;
-use solana_sdk::{instruction::CompiledInstruction, pubkey::Pubkey, system_program};
+use solana_sdk::{instruction::CompiledInstruction, pubkey::Pubkey, stake, system_program};
 use std::{collections::HashMap, str::from_utf8};
 use thiserror::Error;
 
@@ -19,7 +19,7 @@ lazy_static! {
     static ref BPF_UPGRADEABLE_LOADER_PROGRAM_ID: Pubkey = solana_sdk::bpf_loader_upgradeable::id();
     static ref MEMO_V1_PROGRAM_ID: Pubkey = Pubkey::new_from_array(spl_memo::v1::id().to_bytes());
     static ref MEMO_V3_PROGRAM_ID: Pubkey = Pubkey::new_from_array(spl_memo::id().to_bytes());
-    static ref STAKE_PROGRAM_ID: Pubkey = solana_stake_program::id();
+    static ref STAKE_PROGRAM_ID: Pubkey = stake::program::id();
     static ref SYSTEM_PROGRAM_ID: Pubkey = system_program::id();
     static ref TOKEN_PROGRAM_ID: Pubkey = spl_token_id_v2_0();
     static ref VOTE_PROGRAM_ID: Pubkey = solana_vote_program::id();
@@ -101,7 +101,7 @@ pub fn parse(
         ParsableProgram::SplAssociatedTokenAccount => {
             serde_json::to_value(parse_associated_token(instruction, account_keys)?)?
         }
-        ParsableProgram::SplMemo => parse_memo(instruction),
+        ParsableProgram::SplMemo => parse_memo(instruction)?,
         ParsableProgram::SplToken => serde_json::to_value(parse_token(instruction, account_keys)?)?,
         ParsableProgram::BpfLoader => {
             serde_json::to_value(parse_bpf_loader(instruction, account_keys)?)?
@@ -120,8 +120,10 @@ pub fn parse(
     })
 }
 
-fn parse_memo(instruction: &CompiledInstruction) -> Value {
-    Value::String(from_utf8(&instruction.data).unwrap().to_string())
+fn parse_memo(instruction: &CompiledInstruction) -> Result<Value, ParseInstructionError> {
+    from_utf8(&instruction.data)
+        .map(|s| Value::String(s.to_string()))
+        .map_err(|_| ParseInstructionError::InstructionNotParsable(ParsableProgram::SplMemo))
 }
 
 pub(crate) fn check_num_accounts(
@@ -170,4 +172,27 @@ mod test {
         let non_parsable_program_id = Pubkey::new(&[1; 32]);
         assert!(parse(&non_parsable_program_id, &memo_instruction, &[]).is_err());
     }
+
+    #[test]
+    fn test_parse_memo() {
+        let good_memo = "good memo".to_string();
+        assert_eq!(
+            parse_memo(&CompiledInstruction {
+                program_id_index: 0,
+                accounts: vec![],
+                data: good_memo.as_bytes().to_vec(),
+            })
+            .unwrap(),
+            Value::String(good_memo),
+        );
+
+        let bad_memo = vec![128u8];
+        assert!(std::str::from_utf8(&bad_memo).is_err());
+        assert!(parse_memo(&CompiledInstruction {
+            program_id_index: 0,
+            data: bad_memo,
+            accounts: vec![],
+        })
+        .is_err(),);
+    }
 }
diff --git a/transaction-status/src/parse_stake.rs b/transaction-status/src/parse_stake.rs
index a0f4ed7d818349..03a563f0a3fe17 100644
--- a/transaction-status/src/parse_stake.rs
+++ b/transaction-status/src/parse_stake.rs
@@ -3,8 +3,9 @@ use crate::parse_instruction::{
 };
 use bincode::deserialize;
 use serde_json::{json, Map};
-use solana_sdk::{instruction::CompiledInstruction, pubkey::Pubkey};
-use solana_stake_program::stake_instruction::StakeInstruction;
+use solana_sdk::{
+    instruction::CompiledInstruction, pubkey::Pubkey, stake::instruction::StakeInstruction,
+};
 
 pub fn parse_stake(
     instruction: &CompiledInstruction,
@@ -185,6 +186,86 @@ pub fn parse_stake(
                 info: value,
             })
         }
+        StakeInstruction::InitializeChecked => {
+            check_num_stake_accounts(&instruction.accounts, 4)?;
+            Ok(ParsedInstructionEnum {
+                instruction_type: "initializeChecked".to_string(),
+                info: json!({
+                    "stakeAccount": account_keys[instruction.accounts[0] as usize].to_string(),
+                    "rentSysvar": account_keys[instruction.accounts[1] as usize].to_string(),
+                    "staker": account_keys[instruction.accounts[2] as usize].to_string(),
+                    "withdrawer": account_keys[instruction.accounts[3] as usize].to_string(),
+                }),
+            })
+        }
+        StakeInstruction::AuthorizeChecked(authority_type) => {
+            check_num_stake_accounts(&instruction.accounts, 4)?;
+            let mut value = json!({
+                "stakeAccount": account_keys[instruction.accounts[0] as usize].to_string(),
+                "clockSysvar": account_keys[instruction.accounts[1] as usize].to_string(),
+                "authority": account_keys[instruction.accounts[2] as usize].to_string(),
+                "newAuthority": account_keys[instruction.accounts[3] as usize].to_string(),
+                "authorityType": authority_type,
+            });
+            let map = value.as_object_mut().unwrap();
+            if instruction.accounts.len() >= 5 {
+                map.insert(
+                    "custodian".to_string(),
+                    json!(account_keys[instruction.accounts[4] as usize].to_string()),
+                );
+            }
+            Ok(ParsedInstructionEnum {
+                instruction_type: "authorizeChecked".to_string(),
+                info: value,
+            })
+        }
+        StakeInstruction::AuthorizeCheckedWithSeed(args) => {
+            check_num_stake_accounts(&instruction.accounts, 4)?;
+            let mut value = json!({
+                    "stakeAccount": account_keys[instruction.accounts[0] as usize].to_string(),
+                    "authorityBase": account_keys[instruction.accounts[1] as usize].to_string(),
+                    "clockSysvar": account_keys[instruction.accounts[2] as usize].to_string(),
+                    "newAuthorized": account_keys[instruction.accounts[3] as usize].to_string(),
+                    "authorityType": args.stake_authorize,
+                    "authoritySeed": args.authority_seed,
+                    "authorityOwner": args.authority_owner.to_string(),
+            });
+            let map = value.as_object_mut().unwrap();
+            if instruction.accounts.len() >= 5 {
+                map.insert(
+                    "custodian".to_string(),
+                    json!(account_keys[instruction.accounts[4] as usize].to_string()),
+                );
+            }
+            Ok(ParsedInstructionEnum {
+                instruction_type: "authorizeCheckedWithSeed".to_string(),
+                info: value,
+            })
+        }
+        StakeInstruction::SetLockupChecked(lockup_args) => {
+            check_num_stake_accounts(&instruction.accounts, 2)?;
+            let mut lockup_map = Map::new();
+            if let Some(timestamp) = lockup_args.unix_timestamp {
+                lockup_map.insert("unixTimestamp".to_string(), json!(timestamp));
+            }
+            if let Some(epoch) = lockup_args.epoch {
+                lockup_map.insert("epoch".to_string(), json!(epoch));
+            }
+            if instruction.accounts.len() >= 3 {
+                lockup_map.insert(
+                    "custodian".to_string(),
+                    json!(account_keys[instruction.accounts[2] as usize].to_string()),
+                );
+            }
+            Ok(ParsedInstructionEnum {
+                instruction_type: "setLockupChecked".to_string(),
+                info: json!({
+                    "stakeAccount": account_keys[instruction.accounts[0] as usize].to_string(),
+                    "custodian": account_keys[instruction.accounts[1] as usize].to_string(),
+                    "lockup": lockup_map,
+                }),
+            })
+        }
     }
 }
 
@@ -195,10 +276,13 @@ fn check_num_stake_accounts(accounts: &[u8], num: usize) -> Result<(), ParseInst
 #[cfg(test)]
 mod test {
     use super::*;
-    use solana_sdk::{message::Message, pubkey::Pubkey};
-    use solana_stake_program::{
-        stake_instruction::{self, LockupArgs},
-        stake_state::{Authorized, Lockup, StakeAuthorize},
+    use solana_sdk::{
+        message::Message,
+        pubkey::Pubkey,
+        stake::{
+            instruction::{self, LockupArgs},
+            state::{Authorized, Lockup, StakeAuthorize},
+        },
     };
 
     #[test]
@@ -221,7 +305,7 @@ mod test {
         let lamports = 55;
 
         let instructions =
-            stake_instruction::create_account(&keys[0], &keys[1], &authorized, &lockup, lamports);
+            instruction::create_account(&keys[0], &keys[1], &authorized, &lockup, lamports);
         let message = Message::new(&instructions, None);
         assert_eq!(
             parse_stake(&message.instructions[1], &keys[0..3]).unwrap(),
@@ -244,13 +328,8 @@ mod test {
         );
         assert!(parse_stake(&message.instructions[1], &keys[0..2]).is_err());
 
-        let instruction = stake_instruction::authorize(
-            &keys[1],
-            &keys[0],
-            &keys[3],
-            StakeAuthorize::Staker,
-            None,
-        );
+        let instruction =
+            instruction::authorize(&keys[1], &keys[0], &keys[3], StakeAuthorize::Staker, None);
         let message = Message::new(&[instruction], None);
         assert_eq!(
             parse_stake(&message.instructions[0], &keys[0..3]).unwrap(),
@@ -267,23 +346,23 @@ mod test {
         );
         assert!(parse_stake(&message.instructions[0], &keys[0..2]).is_err());
 
-        let instruction = stake_instruction::authorize(
-            &keys[1],
+        let instruction = instruction::authorize(
+            &keys[2],
             &keys[0],
-            &keys[3],
+            &keys[4],
             StakeAuthorize::Withdrawer,
             Some(&keys[1]),
         );
         let message = Message::new(&[instruction], None);
         assert_eq!(
-            parse_stake(&message.instructions[0], &keys[0..3]).unwrap(),
+            parse_stake(&message.instructions[0], &keys[0..4]).unwrap(),
             ParsedInstructionEnum {
                 instruction_type: "authorize".to_string(),
                 info: json!({
-                    "stakeAccount": keys[1].to_string(),
-                    "clockSysvar": keys[2].to_string(),
+                    "stakeAccount": keys[2].to_string(),
+                    "clockSysvar": keys[3].to_string(),
                     "authority": keys[0].to_string(),
-                    "newAuthority": keys[3].to_string(),
+                    "newAuthority": keys[4].to_string(),
                     "authorityType": StakeAuthorize::Withdrawer,
                     "custodian": keys[1].to_string(),
                 }),
@@ -291,7 +370,7 @@ mod test {
         );
         assert!(parse_stake(&message.instructions[0], &keys[0..2]).is_err());
 
-        let instruction = stake_instruction::delegate_stake(&keys[1], &keys[0], &keys[2]);
+        let instruction = instruction::delegate_stake(&keys[1], &keys[0], &keys[2]);
         let message = Message::new(&[instruction], None);
         assert_eq!(
             parse_stake(&message.instructions[0], &keys[0..6]).unwrap(),
@@ -309,23 +388,27 @@ mod test {
         );
         assert!(parse_stake(&message.instructions[0], &keys[0..5]).is_err());
 
-        let instructions = stake_instruction::split(&keys[2], &keys[0], lamports, &keys[1]);
+        // This looks wrong, but in an actual compiled instruction, the order is:
+        //  * split account (signer, allocate + assign first)
+        //  * stake authority (signer)
+        //  * stake account
+        let instructions = instruction::split(&keys[2], &keys[1], lamports, &keys[0]);
         let message = Message::new(&instructions, None);
         assert_eq!(
-            parse_stake(&message.instructions[1], &keys[0..3]).unwrap(),
+            parse_stake(&message.instructions[2], &keys[0..3]).unwrap(),
             ParsedInstructionEnum {
                 instruction_type: "split".to_string(),
                 info: json!({
                     "stakeAccount": keys[2].to_string(),
-                    "newSplitAccount": keys[1].to_string(),
-                    "stakeAuthority": keys[0].to_string(),
+                    "newSplitAccount": keys[0].to_string(),
+                    "stakeAuthority": keys[1].to_string(),
                     "lamports": lamports,
                 }),
             }
         );
-        assert!(parse_stake(&message.instructions[1], &keys[0..2]).is_err());
+        assert!(parse_stake(&message.instructions[2], &keys[0..2]).is_err());
 
-        let instruction = stake_instruction::withdraw(&keys[1], &keys[0], &keys[2], lamports, None);
+        let instruction = instruction::withdraw(&keys[1], &keys[0], &keys[2], lamports, None);
         let message = Message::new(&[instruction], None);
         assert_eq!(
             parse_stake(&message.instructions[0], &keys[0..5]).unwrap(),
@@ -342,7 +425,7 @@ mod test {
             }
         );
         let instruction =
-            stake_instruction::withdraw(&keys[2], &keys[0], &keys[3], lamports, Some(&keys[1]));
+            instruction::withdraw(&keys[2], &keys[0], &keys[3], lamports, Some(&keys[1]));
         let message = Message::new(&[instruction], None);
         assert_eq!(
             parse_stake(&message.instructions[0], &keys[0..6]).unwrap(),
@@ -361,7 +444,7 @@ mod test {
         );
         assert!(parse_stake(&message.instructions[0], &keys[0..4]).is_err());
 
-        let instruction = stake_instruction::deactivate_stake(&keys[1], &keys[0]);
+        let instruction = instruction::deactivate_stake(&keys[1], &keys[0]);
         let message = Message::new(&[instruction], None);
         assert_eq!(
             parse_stake(&message.instructions[0], &keys[0..3]).unwrap(),
@@ -376,7 +459,7 @@ mod test {
         );
         assert!(parse_stake(&message.instructions[0], &keys[0..2]).is_err());
 
-        let instructions = stake_instruction::merge(&keys[1], &keys[0], &keys[2]);
+        let instructions = instruction::merge(&keys[1], &keys[0], &keys[2]);
         let message = Message::new(&instructions, None);
         assert_eq!(
             parse_stake(&message.instructions[0], &keys[0..5]).unwrap(),
@@ -394,11 +477,11 @@ mod test {
         assert!(parse_stake(&message.instructions[0], &keys[0..4]).is_err());
 
         let seed = "test_seed";
-        let instruction = stake_instruction::authorize_with_seed(
+        let instruction = instruction::authorize_with_seed(
             &keys[1],
             &keys[0],
             seed.to_string(),
-            &keys[2],
+            &keys[0],
             &keys[3],
             StakeAuthorize::Staker,
             None,
@@ -410,7 +493,7 @@ mod test {
                 instruction_type: "authorizeWithSeed".to_string(),
                 info: json!({
                     "stakeAccount": keys[1].to_string(),
-                    "authorityOwner": keys[2].to_string(),
+                    "authorityOwner": keys[0].to_string(),
                     "newAuthorized": keys[3].to_string(),
                     "authorityBase": keys[0].to_string(),
                     "authoritySeed": seed,
@@ -419,26 +502,26 @@ mod test {
                 }),
             }
         );
-        assert!(parse_stake(&message.instructions[0], &keys[0..1]).is_err());
+        assert!(parse_stake(&message.instructions[0], &keys[0..2]).is_err());
 
-        let instruction = stake_instruction::authorize_with_seed(
-            &keys[1],
+        let instruction = instruction::authorize_with_seed(
+            &keys[2],
             &keys[0],
             seed.to_string(),
-            &keys[2],
-            &keys[3],
+            &keys[0],
+            &keys[4],
             StakeAuthorize::Withdrawer,
-            Some(&keys[4]),
+            Some(&keys[1]),
         );
         let message = Message::new(&[instruction], None);
         assert_eq!(
-            parse_stake(&message.instructions[0], &keys[0..5]).unwrap(),
+            parse_stake(&message.instructions[0], &keys[0..4]).unwrap(),
             ParsedInstructionEnum {
                 instruction_type: "authorizeWithSeed".to_string(),
                 info: json!({
                     "stakeAccount": keys[2].to_string(),
-                    "authorityOwner": keys[2].to_string(),
-                    "newAuthorized": keys[3].to_string(),
+                    "authorityOwner": keys[0].to_string(),
+                    "newAuthorized": keys[4].to_string(),
                     "authorityBase": keys[0].to_string(),
                     "authoritySeed": seed,
                     "authorityType": StakeAuthorize::Withdrawer,
@@ -447,14 +530,14 @@ mod test {
                 }),
             }
         );
-        assert!(parse_stake(&message.instructions[0], &keys[0..1]).is_err());
+        assert!(parse_stake(&message.instructions[0], &keys[0..3]).is_err());
     }
 
     #[test]
     #[allow(clippy::same_item_push)]
-    fn test_parse_set_lockup() {
+    fn test_parse_stake_set_lockup() {
         let mut keys: Vec<Pubkey> = vec![];
-        for _ in 0..2 {
+        for _ in 0..3 {
             keys.push(Pubkey::new_unique());
         }
         let unix_timestamp = 1_234_567_890;
@@ -466,7 +549,7 @@ mod test {
             epoch: None,
             custodian: None,
         };
-        let instruction = stake_instruction::set_lockup(&keys[1], &lockup, &keys[0]);
+        let instruction = instruction::set_lockup(&keys[1], &lockup, &keys[0]);
         let message = Message::new(&[instruction], None);
         assert_eq!(
             parse_stake(&message.instructions[0], &keys[0..2]).unwrap(),
@@ -487,7 +570,7 @@ mod test {
             epoch: Some(epoch),
             custodian: None,
         };
-        let instruction = stake_instruction::set_lockup(&keys[1], &lockup, &keys[0]);
+        let instruction = instruction::set_lockup(&keys[1], &lockup, &keys[0]);
         let message = Message::new(&[instruction], None);
         assert_eq!(
             parse_stake(&message.instructions[0], &keys[0..2]).unwrap(),
@@ -509,7 +592,7 @@ mod test {
             epoch: Some(epoch),
             custodian: Some(custodian),
         };
-        let instruction = stake_instruction::set_lockup(&keys[1], &lockup, &keys[0]);
+        let instruction = instruction::set_lockup(&keys[1], &lockup, &keys[0]);
         let message = Message::new(&[instruction], None);
         assert_eq!(
             parse_stake(&message.instructions[0], &keys[0..2]).unwrap(),
@@ -528,5 +611,208 @@ mod test {
         );
 
         assert!(parse_stake(&message.instructions[0], &keys[0..1]).is_err());
+
+        let lockup = LockupArgs {
+            unix_timestamp: Some(unix_timestamp),
+            epoch: None,
+            custodian: None,
+        };
+        let instruction = instruction::set_lockup_checked(&keys[1], &lockup, &keys[0]);
+        let message = Message::new(&[instruction], None);
+        assert_eq!(
+            parse_stake(&message.instructions[0], &keys[0..2]).unwrap(),
+            ParsedInstructionEnum {
+                instruction_type: "setLockupChecked".to_string(),
+                info: json!({
+                    "stakeAccount": keys[1].to_string(),
+                    "custodian": keys[0].to_string(),
+                    "lockup": {
+                        "unixTimestamp": unix_timestamp
+                    }
+                }),
+            }
+        );
+
+        let lockup = LockupArgs {
+            unix_timestamp: Some(unix_timestamp),
+            epoch: Some(epoch),
+            custodian: None,
+        };
+        let instruction = instruction::set_lockup_checked(&keys[1], &lockup, &keys[0]);
+        let message = Message::new(&[instruction], None);
+        assert_eq!(
+            parse_stake(&message.instructions[0], &keys[0..2]).unwrap(),
+            ParsedInstructionEnum {
+                instruction_type: "setLockupChecked".to_string(),
+                info: json!({
+                    "stakeAccount": keys[1].to_string(),
+                    "custodian": keys[0].to_string(),
+                    "lockup": {
+                        "unixTimestamp": unix_timestamp,
+                        "epoch": epoch,
+                    }
+                }),
+            }
+        );
+        assert!(parse_stake(&message.instructions[0], &keys[0..1]).is_err());
+
+        let lockup = LockupArgs {
+            unix_timestamp: Some(unix_timestamp),
+            epoch: Some(epoch),
+            custodian: Some(keys[1]),
+        };
+        let instruction = instruction::set_lockup_checked(&keys[2], &lockup, &keys[0]);
+        let message = Message::new(&[instruction], None);
+        assert_eq!(
+            parse_stake(&message.instructions[0], &keys[0..3]).unwrap(),
+            ParsedInstructionEnum {
+                instruction_type: "setLockupChecked".to_string(),
+                info: json!({
+                    "stakeAccount": keys[2].to_string(),
+                    "custodian": keys[0].to_string(),
+                    "lockup": {
+                        "unixTimestamp": unix_timestamp,
+                        "epoch": epoch,
+                        "custodian": keys[1].to_string(),
+                    }
+                }),
+            }
+        );
+        assert!(parse_stake(&message.instructions[0], &keys[0..2]).is_err());
+    }
+
+    #[test]
+    #[allow(clippy::same_item_push)]
+    fn test_parse_stake_checked_instructions() {
+        let mut keys: Vec<Pubkey> = vec![];
+        for _ in 0..6 {
+            keys.push(Pubkey::new_unique());
+        }
+
+        let authorized = Authorized {
+            staker: keys[3],
+            withdrawer: keys[0],
+        };
+        let lamports = 55;
+
+        let instructions =
+            instruction::create_account_checked(&keys[0], &keys[1], &authorized, lamports);
+        let message = Message::new(&instructions, None);
+        assert_eq!(
+            parse_stake(&message.instructions[1], &keys[0..4]).unwrap(),
+            ParsedInstructionEnum {
+                instruction_type: "initializeChecked".to_string(),
+                info: json!({
+                    "stakeAccount": keys[1].to_string(),
+                    "rentSysvar": keys[2].to_string(),
+                    "staker": keys[3].to_string(),
+                    "withdrawer": keys[0].to_string(),
+                }),
+            }
+        );
+        assert!(parse_stake(&message.instructions[1], &keys[0..3]).is_err());
+
+        let instruction = instruction::authorize_checked(
+            &keys[2],
+            &keys[0],
+            &keys[1],
+            StakeAuthorize::Staker,
+            None,
+        );
+        let message = Message::new(&[instruction], None);
+        assert_eq!(
+            parse_stake(&message.instructions[0], &keys[0..4]).unwrap(),
+            ParsedInstructionEnum {
+                instruction_type: "authorizeChecked".to_string(),
+                info: json!({
+                    "stakeAccount": keys[2].to_string(),
+                    "clockSysvar": keys[3].to_string(),
+                    "authority": keys[0].to_string(),
+                    "newAuthority": keys[1].to_string(),
+                    "authorityType": StakeAuthorize::Staker,
+                }),
+            }
+        );
+        assert!(parse_stake(&message.instructions[0], &keys[0..3]).is_err());
+
+        let instruction = instruction::authorize_checked(
+            &keys[3],
+            &keys[0],
+            &keys[1],
+            StakeAuthorize::Withdrawer,
+            Some(&keys[2]),
+        );
+        let message = Message::new(&[instruction], None);
+        assert_eq!(
+            parse_stake(&message.instructions[0], &keys[0..5]).unwrap(),
+            ParsedInstructionEnum {
+                instruction_type: "authorizeChecked".to_string(),
+                info: json!({
+                    "stakeAccount": keys[3].to_string(),
+                    "clockSysvar": keys[4].to_string(),
+                    "authority": keys[0].to_string(),
+                    "newAuthority": keys[1].to_string(),
+                    "authorityType": StakeAuthorize::Withdrawer,
+                    "custodian": keys[2].to_string(),
+                }),
+            }
+        );
+        assert!(parse_stake(&message.instructions[0], &keys[0..4]).is_err());
+
+        let seed = "test_seed";
+        let instruction = instruction::authorize_checked_with_seed(
+            &keys[2],
+            &keys[0],
+            seed.to_string(),
+            &keys[0],
+            &keys[1],
+            StakeAuthorize::Staker,
+            None,
+        );
+        let message = Message::new(&[instruction], None);
+        assert_eq!(
+            parse_stake(&message.instructions[0], &keys[0..4]).unwrap(),
+            ParsedInstructionEnum {
+                instruction_type: "authorizeCheckedWithSeed".to_string(),
+                info: json!({
+                    "stakeAccount": keys[2].to_string(),
+                    "authorityOwner": keys[0].to_string(),
+                    "newAuthorized": keys[1].to_string(),
+                    "authorityBase": keys[0].to_string(),
+                    "authoritySeed": seed,
+                    "authorityType": StakeAuthorize::Staker,
+                    "clockSysvar": keys[3].to_string(),
+                }),
+            }
+        );
+        assert!(parse_stake(&message.instructions[0], &keys[0..3]).is_err());
+
+        let instruction = instruction::authorize_checked_with_seed(
+            &keys[3],
+            &keys[0],
+            seed.to_string(),
+            &keys[0],
+            &keys[1],
+            StakeAuthorize::Withdrawer,
+            Some(&keys[2]),
+        );
+        let message = Message::new(&[instruction], None);
+        assert_eq!(
+            parse_stake(&message.instructions[0], &keys[0..5]).unwrap(),
+            ParsedInstructionEnum {
+                instruction_type: "authorizeCheckedWithSeed".to_string(),
+                info: json!({
+                    "stakeAccount": keys[3].to_string(),
+                    "authorityOwner": keys[0].to_string(),
+                    "newAuthorized": keys[1].to_string(),
+                    "authorityBase": keys[0].to_string(),
+                    "authoritySeed": seed,
+                    "authorityType": StakeAuthorize::Withdrawer,
+                    "clockSysvar": keys[4].to_string(),
+                    "custodian": keys[2].to_string(),
+                }),
+            }
+        );
+        assert!(parse_stake(&message.instructions[0], &keys[0..4]).is_err());
     }
 }
diff --git a/transaction-status/src/parse_token.rs b/transaction-status/src/parse_token.rs
index 4bcb062b472bf2..dd10d0a0fd7c77 100644
--- a/transaction-status/src/parse_token.rs
+++ b/transaction-status/src/parse_token.rs
@@ -372,6 +372,15 @@ pub fn parse_token(
                 info: value,
             })
         }
+        TokenInstruction::SyncNative => {
+            check_num_token_accounts(&instruction.accounts, 1)?;
+            Ok(ParsedInstructionEnum {
+                instruction_type: "syncNative".to_string(),
+                info: json!({
+                    "account": account_keys[instruction.accounts[0] as usize].to_string(),
+                }),
+            })
+        }
     }
 }
 
@@ -930,7 +939,7 @@ mod test {
             }
         );
 
-        // Test Approve2, incl multisig
+        // Test ApproveChecked, incl multisig
         let approve_ix = approve_checked(
             &spl_token_v2_0::id(),
             &convert_pubkey(keys[1]),
@@ -996,7 +1005,7 @@ mod test {
             }
         );
 
-        // Test MintTo2
+        // Test MintToChecked
         let mint_to_ix = mint_to_checked(
             &spl_token_v2_0::id(),
             &convert_pubkey(keys[1]),
@@ -1027,7 +1036,7 @@ mod test {
             }
         );
 
-        // Test Burn2
+        // Test BurnChecked
         let burn_ix = burn_checked(
             &spl_token_v2_0::id(),
             &convert_pubkey(keys[1]),
@@ -1057,6 +1066,20 @@ mod test {
                 })
             }
         );
+
+        // Test SyncNative
+        let sync_native_ix = sync_native(&spl_token_v2_0::id(), &convert_pubkey(keys[0])).unwrap();
+        let message = Message::new(&[sync_native_ix], None);
+        let compiled_instruction = convert_compiled_instruction(&message.instructions[0]);
+        assert_eq!(
+            parse_token(&compiled_instruction, &keys).unwrap(),
+            ParsedInstructionEnum {
+                instruction_type: "syncNative".to_string(),
+                info: json!({
+                   "account": keys[0].to_string(),
+                })
+            }
+        );
     }
 
     #[test]
@@ -1421,5 +1444,14 @@ mod test {
         compiled_instruction.accounts =
             compiled_instruction.accounts[0..compiled_instruction.accounts.len() - 1].to_vec();
         assert!(parse_token(&compiled_instruction, &keys).is_err());
+
+        // Test SyncNative
+        let sync_native_ix = sync_native(&spl_token_v2_0::id(), &convert_pubkey(keys[0])).unwrap();
+        let message = Message::new(&[sync_native_ix], None);
+        let mut compiled_instruction = convert_compiled_instruction(&message.instructions[0]);
+        assert!(parse_token(&compiled_instruction, &[]).is_err());
+        compiled_instruction.accounts =
+            compiled_instruction.accounts[0..compiled_instruction.accounts.len() - 1].to_vec();
+        assert!(parse_token(&compiled_instruction, &keys).is_err());
     }
 }
diff --git a/transaction-status/src/parse_vote.rs b/transaction-status/src/parse_vote.rs
index 679e44c3ee646f..b8b11923e3814f 100644
--- a/transaction-status/src/parse_vote.rs
+++ b/transaction-status/src/parse_vote.rs
@@ -121,6 +121,19 @@ pub fn parse_vote(
                 }),
             })
         }
+        VoteInstruction::AuthorizeChecked(authority_type) => {
+            check_num_vote_accounts(&instruction.accounts, 4)?;
+            Ok(ParsedInstructionEnum {
+                instruction_type: "authorizeChecked".to_string(),
+                info: json!({
+                    "voteAccount": account_keys[instruction.accounts[0] as usize].to_string(),
+                    "clockSysvar": account_keys[instruction.accounts[1] as usize].to_string(),
+                    "authority": account_keys[instruction.accounts[2] as usize].to_string(),
+                    "newAuthority": account_keys[instruction.accounts[3] as usize].to_string(),
+                    "authorityType": authority_type,
+                }),
+            })
+        }
     }
 }
 
@@ -294,5 +307,24 @@ mod test {
             }
         );
         assert!(parse_vote(&message.instructions[0], &keys[0..3]).is_err());
+
+        let authority_type = VoteAuthorize::Voter;
+        let instruction =
+            vote_instruction::authorize_checked(&keys[1], &keys[0], &keys[3], authority_type);
+        let message = Message::new(&[instruction], None);
+        assert_eq!(
+            parse_vote(&message.instructions[0], &keys[0..4]).unwrap(),
+            ParsedInstructionEnum {
+                instruction_type: "authorizeChecked".to_string(),
+                info: json!({
+                    "voteAccount": keys[2].to_string(),
+                    "clockSysvar": keys[3].to_string(),
+                    "authority": keys[0].to_string(),
+                    "newAuthority": keys[1].to_string(),
+                    "authorityType": authority_type,
+                }),
+            }
+        );
+        assert!(parse_vote(&message.instructions[0], &keys[0..3]).is_err());
     }
 }
diff --git a/transaction-status/src/token_balances.rs b/transaction-status/src/token_balances.rs
index ab3bfa87ed9017..07d0fb2c9a3ac8 100644
--- a/transaction-status/src/token_balances.rs
+++ b/transaction-status/src/token_balances.rs
@@ -40,7 +40,7 @@ fn get_mint_decimals(bank: &Bank, mint: &Pubkey) -> Option<u8> {
     } else {
         let mint_account = bank.get_account(mint)?;
 
-        let decimals = Mint::unpack(&mint_account.data())
+        let decimals = Mint::unpack(mint_account.data())
             .map(|mint| mint.decimals)
             .ok()?;
 
@@ -69,7 +69,7 @@ pub fn collect_token_balances(
                 }
 
                 if let Some((mint, ui_token_amount)) =
-                    collect_token_balance_from_account(&bank, account_id, &mut mint_decimals)
+                    collect_token_balance_from_account(bank, account_id, &mut mint_decimals)
                 {
                     transaction_balances.push(TransactionTokenBalance {
                         account_index: index as u8,
@@ -91,12 +91,12 @@ pub fn collect_token_balance_from_account(
 ) -> Option<(String, UiTokenAmount)> {
     let account = bank.get_account(account_id)?;
 
-    let token_account = TokenAccount::unpack(&account.data()).ok()?;
+    let token_account = TokenAccount::unpack(account.data()).ok()?;
     let mint_string = &token_account.mint.to_string();
-    let mint = &Pubkey::from_str(&mint_string).unwrap_or_default();
+    let mint = &Pubkey::from_str(mint_string).unwrap_or_default();
 
-    let decimals = mint_decimals.get(&mint).cloned().or_else(|| {
-        let decimals = get_mint_decimals(bank, &mint)?;
+    let decimals = mint_decimals.get(mint).cloned().or_else(|| {
+        let decimals = get_mint_decimals(bank, mint)?;
         mint_decimals.insert(*mint, decimals);
         Some(decimals)
     })?;
diff --git a/upload-perf/Cargo.toml b/upload-perf/Cargo.toml
index fe6d1b7e16c8e0..2f546ea751c065 100644
--- a/upload-perf/Cargo.toml
+++ b/upload-perf/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "solana-upload-perf"
-version = "1.7.0"
+version = "1.7.11"
 description = "Metrics Upload Utility"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -11,7 +11,7 @@ publish = false
 
 [dependencies]
 serde_json = "1.0.56"
-solana-metrics = { path = "../metrics", version = "=1.7.0" }
+solana-metrics = { path = "../metrics", version = "=1.7.11" }
 
 [[bin]]
 name = "solana-upload-perf"
diff --git a/upload-perf/src/upload-perf.rs b/upload-perf/src/upload-perf.rs
index 34436be80f602a..d9835968844a3c 100644
--- a/upload-perf/src/upload-perf.rs
+++ b/upload-perf/src/upload-perf.rs
@@ -57,7 +57,7 @@ fn main() {
                 let name = v["name"].as_str().unwrap().trim_matches('\"').to_string();
 
                 if last_commit.is_none() {
-                    last_commit = get_last_metrics(&"commit".to_string(), &db, &name, &branch).ok();
+                    last_commit = get_last_metrics(&"commit".to_string(), &db, &name, branch).ok();
                 }
 
                 let median: i64 = v["median"].to_string().parse().unwrap();
@@ -76,11 +76,10 @@ fn main() {
                     */
                     
                 }
-                let last_median = get_last_metrics(&"median".to_string(), &db, &name, &branch)
+                let last_median =
+                    get_last_metrics(&"median".to_string(), &db, &name, branch).unwrap_or_default();
+                let last_deviation = get_last_metrics(&"deviation".to_string(), &db, &name, branch)
                     .unwrap_or_default();
-                let last_deviation =
-                    get_last_metrics(&"deviation".to_string(), &db, &name, &branch)
-                        .unwrap_or_default();
 
                 results.insert(name, (median, deviation, last_median, last_deviation));
             }
diff --git a/validator/Cargo.toml b/validator/Cargo.toml
index 82f22488ac5410..13c0a638bf8df3 100644
--- a/validator/Cargo.toml
+++ b/validator/Cargo.toml
@@ -3,7 +3,7 @@ authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 edition = "2018"
 name = "solana-validator"
 description = "Blockchain, Rebuilt for Scale"
-version = "1.7.0"
+version = "1.7.11"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
@@ -15,37 +15,39 @@ base64 = "0.12.3"
 bincode = "1.3.1"
 chrono = { version = "0.4.11", features = ["serde"] }
 clap = "2.33.1"
-console = "0.11.3"
+console = "0.14.1"
 core_affinity = "0.5.10"
 fd-lock = "2.0.0"
 indicatif = "0.15.0"
-jsonrpc-core = "17.0.0"
-jsonrpc-core-client = { version = "17.0.0", features = ["ipc", "ws"] }
-jsonrpc-derive = "17.0.0"
-jsonrpc-ipc-server = "17.0.0"
-jsonrpc-server-utils= "17.0.0"
+jsonrpc-core = "17.1.0"
+jsonrpc-core-client = { version = "17.1.0", features = ["ipc", "ws"] }
+jsonrpc-derive = "17.1.0"
+jsonrpc-ipc-server = "17.1.0"
+jsonrpc-server-utils= "17.1.0"
 log = "0.4.11"
 num_cpus = "1.13.0"
 rand = "0.7.0"
 serde = "1.0.112"
-solana-clap-utils = { path = "../clap-utils", version = "=1.7.0" }
-solana-cli-config = { path = "../cli-config", version = "=1.7.0" }
-solana-client = { path = "../client", version = "=1.7.0" }
-solana-core = { path = "../core", version = "=1.7.0" }
-solana-download-utils = { path = "../download-utils", version = "=1.7.0" }
-solana-faucet = { path = "../faucet", version = "=1.7.0" }
-solana-genesis-utils = { path = "../genesis-utils", version = "=1.7.0" }
-solana-gossip = { path = "../gossip", version = "=1.7.0" }
-solana-ledger = { path = "../ledger", version = "=1.7.0" }
-solana-logger = { path = "../logger", version = "=1.7.0" }
-solana-metrics = { path = "../metrics", version = "=1.7.0" }
-solana-net-utils = { path = "../net-utils", version = "=1.7.0" }
-solana-perf = { path = "../perf", version = "=1.7.0" }
-solana-rpc = { path = "../rpc", version = "=1.7.0" }
-solana-runtime = { path = "../runtime", version = "=1.7.0" }
-solana-sdk = { path = "../sdk", version = "=1.7.0" }
-solana-version = { path = "../version", version = "=1.7.0" }
-solana-vote-program = { path = "../programs/vote", version = "=1.7.0" }
+solana-clap-utils = { path = "../clap-utils", version = "=1.7.11" }
+solana-cli-config = { path = "../cli-config", version = "=1.7.11" }
+solana-client = { path = "../client", version = "=1.7.11" }
+solana-core = { path = "../core", version = "=1.7.11" }
+solana-download-utils = { path = "../download-utils", version = "=1.7.11" }
+solana-faucet = { path = "../faucet", version = "=1.7.11" }
+solana-genesis-utils = { path = "../genesis-utils", version = "=1.7.11" }
+solana-gossip = { path = "../gossip", version = "=1.7.11" }
+solana-ledger = { path = "../ledger", version = "=1.7.11" }
+solana-logger = { path = "../logger", version = "=1.7.11" }
+solana-metrics = { path = "../metrics", version = "=1.7.11" }
+solana-net-utils = { path = "../net-utils", version = "=1.7.11" }
+solana-perf = { path = "../perf", version = "=1.7.11" }
+solana-poh = { path = "../poh", version = "=1.7.11" }
+solana-rpc = { path = "../rpc", version = "=1.7.11" }
+solana-runtime = { path = "../runtime", version = "=1.7.11" }
+solana-sdk = { path = "../sdk", version = "=1.7.11" }
+solana-streamer = { path = "../streamer", version = "=1.7.11" }
+solana-version = { path = "../version", version = "=1.7.11" }
+solana-vote-program = { path = "../programs/vote", version = "=1.7.11" }
 symlink = "0.1.0"
 
 [target."cfg(unix)".dependencies]
diff --git a/validator/src/admin_rpc_service.rs b/validator/src/admin_rpc_service.rs
index 90bb631f08fe89..e173ead794320b 100644
--- a/validator/src/admin_rpc_service.rs
+++ b/validator/src/admin_rpc_service.rs
@@ -5,8 +5,11 @@ use {
     jsonrpc_ipc_server::{RequestContext, ServerBuilder},
     jsonrpc_server_utils::tokio,
     log::*,
-    solana_core::validator::{ValidatorExit, ValidatorStartProgress},
-    solana_sdk::signature::{read_keypair_file, Keypair, Signer},
+    solana_core::validator::ValidatorStartProgress,
+    solana_sdk::{
+        exit::Exit,
+        signature::{read_keypair_file, Keypair, Signer},
+    },
     std::{
         net::SocketAddr,
         path::Path,
@@ -21,7 +24,7 @@ pub struct AdminRpcRequestMetadata {
     pub rpc_addr: Option<SocketAddr>,
     pub start_time: SystemTime,
     pub start_progress: Arc<RwLock<ValidatorStartProgress>>,
-    pub validator_exit: Arc<RwLock<ValidatorExit>>,
+    pub validator_exit: Arc<RwLock<Exit>>,
     pub authorized_voter_keypairs: Arc<RwLock<Vec<Arc<Keypair>>>>,
 }
 impl Metadata for AdminRpcRequestMetadata {}
@@ -67,7 +70,7 @@ impl AdminRpc for AdminRpcImpl {
             warn!("validator exit requested");
             meta.validator_exit.write().unwrap().exit();
 
-            // TODO: Debug why ValidatorExit doesn't always cause the validator to fully exit
+            // TODO: Debug why Exit doesn't always cause the validator to fully exit
             // (rocksdb background processing or some other stuck thread perhaps?).
             //
             // If the process is still alive after five seconds, exit harder
@@ -122,13 +125,7 @@ impl AdminRpc for AdminRpcImpl {
 
     fn remove_all_authorized_voters(&self, meta: Self::Metadata) -> Result<()> {
         debug!("remove_all_authorized_voters received");
-        let mut a = meta.authorized_voter_keypairs.write().unwrap();
-
-        error!("authorized_voter_keypairs pre len: {}", a.len());
-        a.clear();
-        error!("authorized_voter_keypairs post len: {}", a.len());
-
-        //meta.authorized_voter_keypairs.write().unwrap().clear();
+        meta.authorized_voter_keypairs.write().unwrap().clear();
         Ok(())
     }
 }
diff --git a/validator/src/bin/solana-test-validator.rs b/validator/src/bin/solana-test-validator.rs
index 2215aecd619047..815822da618503 100644
--- a/validator/src/bin/solana-test-validator.rs
+++ b/validator/src/bin/solana-test-validator.rs
@@ -9,18 +9,20 @@ use {
         },
     },
     solana_client::rpc_client::RpcClient,
-    solana_core::rpc::JsonRpcConfig,
     solana_faucet::faucet::{run_local_faucet_with_port, FAUCET_PORT},
+    solana_rpc::rpc::JsonRpcConfig,
     solana_sdk::{
         account::AccountSharedData,
         clock::Slot,
         epoch_schedule::{EpochSchedule, MINIMUM_SLOTS_PER_EPOCH},
         native_token::sol_to_lamports,
         pubkey::Pubkey,
+        rent::Rent,
         rpc_port,
         signature::{read_keypair_file, write_keypair_file, Keypair, Signer},
         system_program,
     },
+    solana_streamer::socket::SocketAddrSpace,
     solana_validator::{
         admin_rpc_service, dashboard::Dashboard, println_name_value, redirect_stderr_to_file,
         test_validator::*,
@@ -42,6 +44,8 @@ use {
  */
 const DEFAULT_MAX_LEDGER_SHREDS: u64 = 10_000;
 
+const DEFAULT_FAUCET_SOL: f64 = 1_000_000.;
+
 #[derive(PartialEq)]
 enum Output {
     None,
@@ -53,6 +57,7 @@ fn main() {
     let default_rpc_port = rpc_port::DEFAULT_RPC_PORT.to_string();
     let default_faucet_port = FAUCET_PORT.to_string();
     let default_limit_ledger_size = DEFAULT_MAX_LEDGER_SHREDS.to_string();
+    let default_faucet_sol = DEFAULT_FAUCET_SOL.to_string();
 
     let matches = App::new("solana-test-validator")
         .about("Test Validator")
@@ -65,7 +70,7 @@ fn main() {
                 .takes_value(true)
                 .help("Configuration file to use");
             if let Some(ref config_file) = *solana_cli_config::CONFIG_FILE {
-                arg.default_value(&config_file)
+                arg.default_value(config_file)
             } else {
                 arg
             }
@@ -264,8 +269,87 @@ fn main() {
                 .default_value(default_limit_ledger_size.as_str())
                 .help("Keep this amount of shreds in root slots."),
         )
+        .arg(
+            Arg::with_name("faucet_sol")
+                .long("faucet-sol")
+                .takes_value(true)
+                .value_name("SOL")
+                .default_value(default_faucet_sol.as_str())
+                .help(
+                    "Give the faucet address this much SOL in genesis. \
+                     If the ledger already exists then this parameter is silently ignored",
+                ),
+        )
         .get_matches();
 
+    let output = if matches.is_present("quiet") {
+        Output::None
+    } else if matches.is_present("log") {
+        Output::Log
+    } else {
+        Output::Dashboard
+    };
+
+    let ledger_path = value_t_or_exit!(matches, "ledger_path", PathBuf);
+    let reset_ledger = matches.is_present("reset");
+
+    if !ledger_path.exists() {
+        fs::create_dir(&ledger_path).unwrap_or_else(|err| {
+            println!(
+                "Error: Unable to create directory {}: {}",
+                ledger_path.display(),
+                err
+            );
+            exit(1);
+        });
+    }
+
+    let mut ledger_fd_lock = FdLock::new(fs::File::open(&ledger_path).unwrap());
+    let _ledger_lock = ledger_fd_lock.try_lock().unwrap_or_else(|_| {
+        println!(
+            "Error: Unable to lock {} directory. Check if another validator is running",
+            ledger_path.display()
+        );
+        exit(1);
+    });
+
+    if reset_ledger {
+        remove_directory_contents(&ledger_path).unwrap_or_else(|err| {
+            println!("Error: Unable to remove {}: {}", ledger_path.display(), err);
+            exit(1);
+        })
+    }
+    solana_runtime::snapshot_utils::remove_tmp_snapshot_archives(&ledger_path);
+
+    let validator_log_symlink = ledger_path.join("validator.log");
+    let logfile = if output != Output::Log {
+        let validator_log_with_timestamp = format!(
+            "validator-{}.log",
+            SystemTime::now()
+                .duration_since(UNIX_EPOCH)
+                .unwrap()
+                .as_millis()
+        );
+
+        let _ = fs::remove_file(&validator_log_symlink);
+        symlink::symlink_file(&validator_log_with_timestamp, &validator_log_symlink).unwrap();
+
+        Some(
+            ledger_path
+                .join(validator_log_with_timestamp)
+                .into_os_string()
+                .into_string()
+                .unwrap(),
+        )
+    } else {
+        None
+    };
+    let _logger_thread = redirect_stderr_to_file(logfile);
+
+    solana_core::validator::report_target_features();
+
+    // TODO: Ideally test-validator should *only* allow private addresses.
+    let socket_addr_space = SocketAddrSpace::new(/*allow_private_addr=*/ true);
     let cli_config = if let Some(config_file) = matches.value_of("config_file") {
         solana_cli_config::Config::load(config_file).unwrap_or_default()
     } else {
@@ -284,15 +368,6 @@ fn main() {
                 .unwrap_or_else(|_| (Keypair::new().pubkey(), true))
         });
 
-    let ledger_path = value_t_or_exit!(matches, "ledger_path", PathBuf);
-    let reset_ledger = matches.is_present("reset");
-    let output = if matches.is_present("quiet") {
-        Output::None
-    } else if matches.is_present("log") {
-        Output::Log
-    } else {
-        Output::Dashboard
-    };
     let rpc_port = value_t_or_exit!(matches, "rpc_port", u16);
     let faucet_port = value_t_or_exit!(matches, "faucet_port", u16);
     let slots_per_epoch = value_t!(matches, "slots_per_epoch", Slot).ok();
@@ -376,60 +451,7 @@ fn main() {
         None
     };
 
-    if !ledger_path.exists() {
-        fs::create_dir(&ledger_path).unwrap_or_else(|err| {
-            println!(
-                "Error: Unable to create directory {}: {}",
-                ledger_path.display(),
-                err
-            );
-            exit(1);
-        });
-    }
-
-    let mut ledger_fd_lock = FdLock::new(fs::File::open(&ledger_path).unwrap());
-    let _ledger_lock = ledger_fd_lock.try_lock().unwrap_or_else(|_| {
-        println!(
-            "Error: Unable to lock {} directory. Check if another validator is running",
-            ledger_path.display()
-        );
-        exit(1);
-    });
-
-    if reset_ledger {
-        remove_directory_contents(&ledger_path).unwrap_or_else(|err| {
-            println!("Error: Unable to remove {}: {}", ledger_path.display(), err);
-            exit(1);
-        })
-    }
-    solana_runtime::snapshot_utils::remove_tmp_snapshot_archives(&ledger_path);
-
-    let validator_log_symlink = ledger_path.join("validator.log");
-    let logfile = if output != Output::Log {
-        let validator_log_with_timestamp = format!(
-            "validator-{}.log",
-            SystemTime::now()
-                .duration_since(UNIX_EPOCH)
-                .unwrap()
-                .as_millis()
-        );
-
-        let _ = fs::remove_file(&validator_log_symlink);
-        symlink::symlink_file(&validator_log_with_timestamp, &validator_log_symlink).unwrap();
-
-        Some(
-            ledger_path
-                .join(validator_log_with_timestamp)
-                .into_os_string()
-                .into_string()
-                .unwrap(),
-        )
-    } else {
-        None
-    };
-    let _logger_thread = redirect_stderr_to_file(logfile);
-
-    let faucet_lamports = sol_to_lamports(1_000_000.);
+    let faucet_lamports = sol_to_lamports(value_of(&matches, "faucet_sol").unwrap());
     let faucet_keypair_file = ledger_path.join("faucet-keypair.json");
     if !faucet_keypair_file.exists() {
         write_keypair_file(&Keypair::new(), faucet_keypair_file.to_str().unwrap()).unwrap_or_else(
@@ -470,6 +492,7 @@ fn main() {
             ("clone_account", "--clone"),
             ("mint_address", "--mint"),
             ("slots_per_epoch", "--slots-per-epoch"),
+            ("faucet_sol", "--faucet-sol"),
         ] {
             if matches.is_present(name) {
                 println!("{} argument ignored, ledger already exists", long);
@@ -546,6 +569,8 @@ fn main() {
             slots_per_epoch,
             /* enable_warmup_epochs = */ false,
         ));
+
+        genesis.rent = Rent::with_slots_per_epoch(slots_per_epoch);
     }
 
     if let Some(gossip_host) = gossip_host {
@@ -564,7 +589,7 @@ fn main() {
         genesis.bind_ip_addr(bind_address);
     }
 
-    match genesis.start_with_mint_address(mint_address) {
+    match genesis.start_with_mint_address(mint_address, socket_addr_space) {
         Ok(test_validator) => {
             if let Some(dashboard) = dashboard {
                 dashboard.run(Duration::from_millis(250));
diff --git a/validator/src/dashboard.rs b/validator/src/dashboard.rs
index d3051afe1a8be5..882aaabd5b409f 100644
--- a/validator/src/dashboard.rs
+++ b/validator/src/dashboard.rs
@@ -6,7 +6,8 @@ use {
     },
     solana_core::validator::ValidatorStartProgress,
     solana_sdk::{
-        clock::Slot, commitment_config::CommitmentConfig, native_token::Sol, pubkey::Pubkey,
+        clock::Slot, commitment_config::CommitmentConfig, exit::Exit, native_token::Sol,
+        pubkey::Pubkey,
     },
     std::{
         io,
@@ -31,7 +32,7 @@ impl Dashboard {
     pub fn new(
         ledger_path: &Path,
         log_path: Option<&Path>,
-        validator_exit: Option<&mut solana_core::validator::ValidatorExit>,
+        validator_exit: Option<&mut Exit>,
     ) -> Result<Self, io::Error> {
         println_name_value("Ledger location:", &format!("{}", ledger_path.display()));
         if let Some(log_path) = log_path {
@@ -194,7 +195,7 @@ async fn wait_for_validator_startup(
         }
 
         if admin_client.is_none() {
-            match admin_rpc_service::connect(&ledger_path).await {
+            match admin_rpc_service::connect(ledger_path).await {
                 Ok(new_admin_client) => admin_client = Some(new_admin_client),
                 Err(err) => {
                     progress_bar.set_message(&format!("Unable to connect to validator: {}", err));
diff --git a/validator/src/lib.rs b/validator/src/lib.rs
index 4ac27d88336110..25be76f12f855a 100644
--- a/validator/src/lib.rs
+++ b/validator/src/lib.rs
@@ -61,7 +61,7 @@ pub fn redirect_stderr_to_file(logfile: Option<String>) -> Option<JoinHandle<()>
             #[cfg(not(unix))]
             {
                 println!("logging to a file is not supported on this platform");
-                ()
+                None
             }
         }
     };
diff --git a/validator/src/main.rs b/validator/src/main.rs
index 5cd3cbada2d27e..45ba748c65ab8b 100644
--- a/validator/src/main.rs
+++ b/validator/src/main.rs
@@ -22,8 +22,6 @@ use {
     },
     solana_core::{
         ledger_cleanup_service::{DEFAULT_MAX_LEDGER_SHREDS, DEFAULT_MIN_MAX_LEDGER_SHREDS},
-        poh_service,
-        rpc::JsonRpcConfig,
         tpu::DEFAULT_TPU_COALESCE_MS,
         validator::{
             is_snapshot_config_invalid, Validator, ValidatorConfig, ValidatorStartProgress,
@@ -38,8 +36,13 @@ use {
     },
     solana_ledger::blockstore_db::BlockstoreRecoveryMode,
     solana_perf::recycler::enable_recycler_warming,
-    solana_rpc::rpc_pubsub_service::PubSubConfig,
+    solana_poh::poh_service,
+    solana_rpc::{rpc::JsonRpcConfig, rpc_pubsub_service::PubSubConfig},
     solana_runtime::{
+        accounts_db::{
+            AccountShrinkThreshold, DEFAULT_ACCOUNTS_SHRINK_OPTIMIZE_TOTAL_SPACE,
+            DEFAULT_ACCOUNTS_SHRINK_RATIO,
+        },
         accounts_index::{
             AccountIndex, AccountSecondaryIndexes, AccountSecondaryIndexesIncludeExclude,
         },
@@ -54,6 +57,7 @@ use {
         pubkey::Pubkey,
         signature::{Keypair, Signer},
     },
+    solana_streamer::socket::SocketAddrSpace,
     solana_validator::{
         admin_rpc_service, dashboard::Dashboard, new_spinner_progress_bar, println_name_value,
         redirect_stderr_to_file,
@@ -109,7 +113,7 @@ fn wait_for_restart_window(
 
     let min_idle_slots = (min_idle_time_in_minutes as f64 * 60. / DEFAULT_S_PER_SLOT) as Slot;
 
-    let admin_client = admin_rpc_service::connect(&ledger_path);
+    let admin_client = admin_rpc_service::connect(ledger_path);
     let rpc_addr = admin_rpc_service::runtime()
         .block_on(async move { admin_client.await?.rpc_addr().await })
         .map_err(|err| format!("Unable to get validator RPC address: {}", err))?;
@@ -354,6 +358,7 @@ fn start_gossip_node(
     expected_shred_version: Option<u16>,
     gossip_validators: Option<HashSet<Pubkey>>,
     should_check_duplicate_instance: bool,
+    socket_addr_space: SocketAddrSpace,
 ) -> (Arc<ClusterInfo>, Arc<AtomicBool>, GossipService) {
     let mut cluster_info = ClusterInfo::new(
         ClusterInfo::gossip_contact_info(
@@ -362,6 +367,7 @@ fn start_gossip_node(
             expected_shred_version.unwrap_or(0),
         ),
         identity_keypair.clone(),
+        socket_addr_space,
     );
     cluster_info.set_entrypoints(cluster_entrypoints.to_vec());
     cluster_info.restore_contact_info(ledger_path, 0);
@@ -445,7 +451,7 @@ fn get_rpc_node(
             .count();
 
         info!(
-            "Total {} RPC nodes found. {} trusted, {} blacklisted ",
+            "Total {} RPC nodes found. {} known, {} blacklisted ",
             rpc_peers_total, rpc_peers_trusted, rpc_peers_blacklisted
         );
 
@@ -458,7 +464,7 @@ fn get_rpc_node(
                 blacklisted_rpc_nodes.clear();
                 Some("Blacklist timeout expired".to_owned())
             } else {
-                Some("Wait for trusted rpc peers".to_owned())
+                Some("Wait for known rpc peers".to_owned())
             };
             continue;
         }
@@ -471,7 +477,7 @@ fn get_rpc_node(
             rpc_peers
         } else {
             let trusted_snapshot_hashes =
-                get_trusted_snapshot_hashes(&cluster_info, &validator_config.trusted_validators);
+                get_trusted_snapshot_hashes(cluster_info, &validator_config.trusted_validators);
 
             let mut eligible_rpc_peers = vec![];
 
@@ -595,7 +601,7 @@ fn check_vote_account(
         }
 
         for (_, vote_account_authorized_voter_pubkey) in vote_state.authorized_voters().iter() {
-            if !authorized_voter_pubkeys.contains(&vote_account_authorized_voter_pubkey) {
+            if !authorized_voter_pubkeys.contains(vote_account_authorized_voter_pubkey) {
                 return Err(format!(
                     "authorized voter {} not available",
                     vote_account_authorized_voter_pubkey
@@ -656,24 +662,25 @@ fn verify_reachable_ports(
     node: &Node,
     cluster_entrypoint: &ContactInfo,
     validator_config: &ValidatorConfig,
+    socket_addr_space: &SocketAddrSpace,
 ) -> bool {
     let mut udp_sockets = vec![&node.sockets.gossip, &node.sockets.repair];
 
-    if ContactInfo::is_valid_address(&node.info.serve_repair) {
+    if ContactInfo::is_valid_address(&node.info.serve_repair, socket_addr_space) {
         udp_sockets.push(&node.sockets.serve_repair);
     }
-    if ContactInfo::is_valid_address(&node.info.tpu) {
+    if ContactInfo::is_valid_address(&node.info.tpu, socket_addr_space) {
         udp_sockets.extend(node.sockets.tpu.iter());
     }
-    if ContactInfo::is_valid_address(&node.info.tpu_forwards) {
+    if ContactInfo::is_valid_address(&node.info.tpu_forwards, socket_addr_space) {
         udp_sockets.extend(node.sockets.tpu_forwards.iter());
     }
-    if ContactInfo::is_valid_address(&node.info.tvu) {
+    if ContactInfo::is_valid_address(&node.info.tvu, socket_addr_space) {
         udp_sockets.extend(node.sockets.tvu.iter());
         udp_sockets.extend(node.sockets.broadcast.iter());
         udp_sockets.extend(node.sockets.retransmit_sockets.iter());
     }
-    if ContactInfo::is_valid_address(&node.info.tvu_forwards) {
+    if ContactInfo::is_valid_address(&node.info.tvu_forwards, socket_addr_space) {
         udp_sockets.extend(node.sockets.tvu_forwards.iter());
     }
 
@@ -683,7 +690,7 @@ fn verify_reachable_ports(
             ("RPC", rpc_addr, &node.info.rpc),
             ("RPC pubsub", rpc_pubsub_addr, &node.info.rpc_pubsub),
         ] {
-            if ContactInfo::is_valid_address(&public_addr) {
+            if ContactInfo::is_valid_address(public_addr, socket_addr_space) {
                 tcp_listeners.push((
                     bind_addr.port(),
                     TcpListener::bind(bind_addr).unwrap_or_else(|err| {
@@ -748,14 +755,19 @@ fn rpc_bootstrap(
     start_progress: &Arc<RwLock<ValidatorStartProgress>>,
     minimal_snapshot_download_speed: f32,
     maximum_snapshot_download_abort: u64,
+    socket_addr_space: SocketAddrSpace,
 ) {
     if !no_port_check {
         let mut order: Vec<_> = (0..cluster_entrypoints.len()).collect();
         order.shuffle(&mut thread_rng());
-        if order
-            .into_iter()
-            .all(|i| !verify_reachable_ports(&node, &cluster_entrypoints[i], &validator_config))
-        {
+        if order.into_iter().all(|i| {
+            !verify_reachable_ports(
+                node,
+                &cluster_entrypoints[i],
+                validator_config,
+                &socket_addr_space,
+            )
+        }) {
             exit(1);
         }
     }
@@ -772,21 +784,22 @@ fn rpc_bootstrap(
             *start_progress.write().unwrap() = ValidatorStartProgress::SearchingForRpcService;
 
             gossip = Some(start_gossip_node(
-                &identity_keypair,
-                &cluster_entrypoints,
+                identity_keypair,
+                cluster_entrypoints,
                 ledger_path,
                 &node.info.gossip,
                 node.sockets.gossip.try_clone().unwrap(),
                 validator_config.expected_shred_version,
                 validator_config.gossip_validators.clone(),
                 should_check_duplicate_instance,
+                socket_addr_space,
             ));
         }
 
         let rpc_node_details = get_rpc_node(
             &gossip.as_ref().unwrap().0,
-            &cluster_entrypoints,
-            &validator_config,
+            cluster_entrypoints,
+            validator_config,
             &mut blacklisted_rpc_nodes,
             bootstrap_config.no_snapshot_fetch,
             bootstrap_config.no_untrusted_rpc,
@@ -813,7 +826,7 @@ fn rpc_bootstrap(
         .and_then(|_| {
             let genesis_config = download_then_check_genesis_hash(
                 &rpc_contact_info.rpc,
-                &ledger_path,
+                ledger_path,
                 validator_config.expected_genesis_hash,
                 bootstrap_config.max_genesis_archive_unpacked_size,
                 bootstrap_config.no_genesis_fetch,
@@ -894,7 +907,7 @@ fn rpc_bootstrap(
                             };
                             let ret = download_snapshot(
                                 &rpc_contact_info.rpc,
-                                &snapshot_output_dir,
+                                snapshot_output_dir,
                                 snapshot_hash,
                                 use_progress_bar,
                                 maximum_snapshots_to_retain,
@@ -911,11 +924,12 @@ fn rpc_bootstrap(
                                                && trusted_validators.len() == 1
                                                && bootstrap_config.no_untrusted_rpc {
                                                 warn!("The snapshot download is too slow, throughput: {} < min speed {} bytes/sec, but will NOT abort \
-                                                      and try a different node as it is the only trusted validator and the no-untrusted-rpc is set. \
+                                                      and try a different node as it is the only known validator and the --only-known-rpc flag \
+                                                      is set. \
                                                       Abort count: {}, Progress detail: {:?}",
                                                       download_progress.last_throughput, minimal_snapshot_download_speed,
                                                       download_abort_count, download_progress);
-                                                return true; // Do not abort download from the one-and-only trusted validator
+                                                return true; // Do not abort download from the one-and-only known validator
                                             }
                                         }
                                         warn!("The snapshot download is too slow, throughput: {} < min speed {} bytes/sec, will abort \
@@ -943,7 +957,7 @@ fn rpc_bootstrap(
                 check_vote_account(
                     &rpc_client,
                     &identity_keypair.pubkey(),
-                    &vote_account,
+                    vote_account,
                     &authorized_voter_keypairs
                         .read()
                         .unwrap()
@@ -988,6 +1002,28 @@ fn rpc_bootstrap(
     }
 }
 
+fn get_cluster_shred_version(entrypoints: &[SocketAddr]) -> Option<u16> {
+    let entrypoints = {
+        let mut index: Vec<_> = (0..entrypoints.len()).collect();
+        index.shuffle(&mut rand::thread_rng());
+        index.into_iter().map(|i| &entrypoints[i])
+    };
+    for entrypoint in entrypoints {
+        match solana_net_utils::get_cluster_shred_version(entrypoint) {
+            Err(err) => eprintln!("get_cluster_shred_version failed: {}, {}", entrypoint, err),
+            Ok(0) => eprintln!("zero sherd-version from entrypoint: {}", entrypoint),
+            Ok(shred_version) => {
+                info!(
+                    "obtained shred-version {} from {}",
+                    shred_version, entrypoint
+                );
+                return Some(shred_version);
+            }
+        }
+    }
+    None
+}
+
 pub fn main() {
     let default_dynamic_port_range =
         &format!("{}-{}", VALIDATOR_PORT_RANGE.0, VALIDATOR_PORT_RANGE.1);
@@ -1000,6 +1036,8 @@ pub fn main() {
         PubSubConfig::default().max_in_buffer_capacity.to_string();
     let default_rpc_pubsub_max_out_buffer_capacity =
         PubSubConfig::default().max_out_buffer_capacity.to_string();
+    let default_rpc_pubsub_max_active_subscriptions =
+        PubSubConfig::default().max_active_subscriptions.to_string();
     let default_rpc_send_transaction_retry_ms = ValidatorConfig::default()
         .send_transaction_retry_ms
         .to_string();
@@ -1010,6 +1048,9 @@ pub fn main() {
     let default_max_snapshot_to_retain = &DEFAULT_MAX_SNAPSHOTS_TO_RETAIN.to_string();
     let default_min_snapshot_download_speed = &DEFAULT_MIN_SNAPSHOT_DOWNLOAD_SPEED.to_string();
     let default_max_snapshot_download_abort = &MAX_SNAPSHOT_DOWNLOAD_ABORT.to_string();
+    let default_accounts_shrink_optimize_total_space =
+        &DEFAULT_ACCOUNTS_SHRINK_OPTIMIZE_TOTAL_SPACE.to_string();
+    let default_accounts_shrink_ratio = &DEFAULT_ACCOUNTS_SHRINK_RATIO.to_string();
 
     let matches = App::new(crate_name!()).about(crate_description!())
         .version(solana_version::version!())
@@ -1205,10 +1246,10 @@ pub fn main() {
                 .value_name("SLOT_DISTANCE")
                 .takes_value(true)
                 .default_value("150")
-                .help("If --trusted-validators are specified, report this validator healthy \
+                .help("If --known-validators are specified, report this validator healthy \
                        if its latest account hash is no further behind than this number of \
-                       slots from the latest trusted validator account hash. \
-                       If no --trusted-validators are specified, the validator will always \
+                       slots from the latest known validator account hash. \
+                       If no --known-validators are specified, the validator will always \
                        report itself to be healthy")
         )
         .arg(
@@ -1452,7 +1493,8 @@ pub fn main() {
         )
         .arg(
             Arg::with_name("trusted_validators")
-                .long("trusted-validator")
+                .alias("trusted-validator")
+                .long("known-validator")
                 .validator(is_pubkey)
                 .value_name("VALIDATOR IDENTITY")
                 .multiple(true)
@@ -1471,9 +1513,10 @@ pub fn main() {
         )
         .arg(
             Arg::with_name("no_untrusted_rpc")
-                .long("no-untrusted-rpc")
+                .alias("no-untrusted-rpc")
+                .long("only-known-rpc")
                 .takes_value(false)
-                .help("Use the RPC service of trusted validators only")
+                .help("Use the RPC service of known validators only")
         )
         .arg(
             Arg::with_name("repair_validators")
@@ -1500,7 +1543,7 @@ pub fn main() {
             Arg::with_name("no_rocksdb_compaction")
                 .long("no-rocksdb-compaction")
                 .takes_value(false)
-                .help("Disable manual compaction of the ledger database. May increase storage requirements.")
+                .help("Disable manual compaction of the ledger database (this is ignored).")
         )
         .arg(
             Arg::with_name("rocksdb_compaction_interval")
@@ -1604,6 +1647,16 @@ pub fn main() {
                 .default_value(&default_rpc_pubsub_max_out_buffer_capacity)
                 .help("The maximum size in bytes to which the outgoing websocket buffer can grow."),
         )
+        .arg(
+            Arg::with_name("rpc_pubsub_max_active_subscriptions")
+                .long("rpc-pubsub-max-active-subscriptions")
+                .takes_value(true)
+                .value_name("NUMBER")
+                .validator(is_parsable::<usize>)
+                .default_value(&default_rpc_pubsub_max_active_subscriptions)
+                .help("The maximum number of active subscriptions that RPC PubSub will accept \
+                       across all connections."),
+        )
         .arg(
             Arg::with_name("rpc_send_transaction_retry_ms")
                 .long("rpc-send-retry-ms")
@@ -1631,10 +1684,11 @@ pub fn main() {
         )
         .arg(
             Arg::with_name("halt_on_trusted_validators_accounts_hash_mismatch")
-                .long("halt-on-trusted-validators-accounts-hash-mismatch")
+                .alias("halt-on-trusted-validators-accounts-hash-mismatch")
+                .long("halt-on-known-validators-accounts-hash-mismatch")
                 .requires("trusted_validators")
                 .takes_value(false)
-                .help("Abort the validator if a bank hash mismatch is detected within trusted validator set"),
+                .help("Abort the validator if a bank hash mismatch is detected within known validator set"),
         )
         .arg(
             Arg::with_name("frozen_accounts")
@@ -1662,7 +1716,7 @@ pub fn main() {
                 .long("max-genesis-archive-unpacked-size")
                 .value_name("NUMBER")
                 .takes_value(true)
-                .default_value(&default_genesis_archive_unpacked_size)
+                .default_value(default_genesis_archive_unpacked_size)
                 .help(
                     "maximum total uncompressed file size of downloaded genesis archive",
                 ),
@@ -1752,6 +1806,12 @@ pub fn main() {
                 .long("no-accounts-db-caching")
                 .help("Disables accounts caching"),
         )
+        .arg(
+            Arg::with_name("accounts_db_skip_shrink")
+                .long("accounts-db-skip-shrink")
+                .help("Enables faster starting of validators by skipping shrink. \
+                      This option is for use during testing."),
+        )
         .arg(
             Arg::with_name("accounts_db_test_hash_calculation")
                 .long("accounts-db-test-hash-calculation")
@@ -1778,6 +1838,29 @@ pub fn main() {
                 .conflicts_with("no_accounts_db_caching")
                 .hidden(true)
         )
+        .arg(
+            Arg::with_name("accounts_shrink_optimize_total_space")
+                .long("accounts-shrink-optimize-total-space")
+                .takes_value(true)
+                .value_name("BOOLEAN")
+                .default_value(default_accounts_shrink_optimize_total_space)
+                .help("When this is set to true, the system will shrink the most \
+                       sparse accounts and when the overall shrink ratio is above \
+                       the specified accounts-shrink-ratio, the shrink will stop and \
+                       it will skip all other less sparse accounts."),
+        )
+        .arg(
+            Arg::with_name("accounts_shrink_ratio")
+                .long("accounts-shrink-ratio")
+                .takes_value(true)
+                .value_name("RATIO")
+                .default_value(default_accounts_shrink_ratio)
+                .help("Specifies the shrink ratio for the accounts to be shrunk. \
+                       The shrink ratio is defined as the ratio of the bytes alive over the  \
+                       total bytes used. If the account's shrink ratio is less than this ratio \
+                       it becomes a candidate for shrinking. The value must between 0. and 1.0 \
+                       inclusive."),
+        )
         .arg(
             Arg::with_name("no_duplicate_instance_check")
                 .long("no-duplicate-instance-check")
@@ -1785,6 +1868,13 @@ pub fn main() {
                 .help("Disables duplicate instance check")
                 .hidden(true),
         )
+        .arg(
+            Arg::with_name("allow_private_addr")
+                .long("allow-private-addr")
+                .takes_value(false)
+                .help("Allow contacting private ip addresses")
+                .hidden(true),
+        )
         .after_help("The default subcommand is run")
         .subcommand(
             SubCommand::with_name("exit")
@@ -1879,6 +1969,7 @@ pub fn main() {
         )
         .get_matches();
 
+    let socket_addr_space = SocketAddrSpace::new(matches.is_present("allow_private_addr"));
     let ledger_path = PathBuf::from(matches.value_of("ledger_path").unwrap());
 
     let operation = match matches.subcommand() {
@@ -1995,6 +2086,33 @@ pub fn main() {
         .exit();
     }));
 
+    let logfile = {
+        let logfile = matches
+            .value_of("logfile")
+            .map(|s| s.into())
+            .unwrap_or_else(|| format!("solana-validator-{}.log", identity_keypair.pubkey()));
+
+        if logfile == "-" {
+            None
+        } else {
+            println!("log file: {}", logfile);
+            Some(logfile)
+        }
+    };
+    let use_progress_bar = logfile.is_none();
+    let _logger_thread = redirect_stderr_to_file(logfile);
+
+    info!("{} {}", crate_name!(), solana_version::version!());
+    info!("Starting validator with: {:#?}", std::env::args_os());
+
+    let cuda = matches.is_present("cuda");
+    if cuda {
+        solana_perf::perf_libs::init_cuda();
+        enable_recycler_warming();
+    }
+
+    solana_core::validator::report_target_features();
+
     let authorized_voter_keypairs = keypairs_of(&matches, "authorized_voter_keypairs")
         .map(|keypairs| keypairs.into_iter().map(Arc::new).collect())
         .unwrap_or_else(|| vec![identity_keypair.clone()]);
@@ -2016,7 +2134,7 @@ pub fn main() {
 
     let private_rpc = matches.is_present("private_rpc");
     let no_port_check = matches.is_present("no_port_check");
-    let no_rocksdb_compaction = matches.is_present("no_rocksdb_compaction");
+    let no_rocksdb_compaction = true;
     let rocksdb_compaction_interval = value_t!(matches, "rocksdb_compaction_interval", u64).ok();
     let rocksdb_max_compaction_jitter =
         value_t!(matches, "rocksdb_max_compaction_jitter", u64).ok();
@@ -2047,7 +2165,7 @@ pub fn main() {
         &identity_keypair.pubkey(),
         &matches,
         "trusted_validators",
-        "--trusted-validator",
+        "--known-validator",
     );
     let repair_validators = validators_set(
         &identity_keypair.pubkey(),
@@ -2076,18 +2194,53 @@ pub fn main() {
     let account_indexes = process_account_indexes(&matches);
 
     let restricted_repair_only_mode = matches.is_present("restricted_repair_only_mode");
+    let accounts_shrink_optimize_total_space =
+        value_t_or_exit!(matches, "accounts_shrink_optimize_total_space", bool);
+    let shrink_ratio = value_t_or_exit!(matches, "accounts_shrink_ratio", f64);
+    if !(0.0..=1.0).contains(&shrink_ratio) {
+        eprintln!(
+            "The specified account-shrink-ratio is invalid, it must be between 0. and 1.0 inclusive: {}",
+            shrink_ratio
+        );
+        exit(1);
+    }
+
+    let accounts_shrink_ratio = if accounts_shrink_optimize_total_space {
+        AccountShrinkThreshold::TotalSpace { shrink_ratio }
+    } else {
+        AccountShrinkThreshold::IndividalStore { shrink_ratio }
+    };
+    let entrypoint_addrs = values_t!(matches, "entrypoint", String)
+        .unwrap_or_default()
+        .into_iter()
+        .map(|entrypoint| {
+            solana_net_utils::parse_host_port(&entrypoint).unwrap_or_else(|e| {
+                eprintln!("failed to parse entrypoint address: {}", e);
+                exit(1);
+            })
+        })
+        .collect::<HashSet<_>>()
+        .into_iter()
+        .collect::<Vec<_>>();
+    // TODO: Once entrypoints are updated to return shred-version, this should
+    // abort if it fails to obtain a shred-version, so that nodes always join
+    // gossip with a valid shred-version. The code to adopt entrypoint shred
+    // version can then be deleted from gossip and get_rpc_node above.
+    let expected_shred_version = value_t!(matches, "expected_shred_version", u16)
+        .ok()
+        .or_else(|| get_cluster_shred_version(&entrypoint_addrs));
+
     let mut validator_config = ValidatorConfig {
         require_tower: matches.is_present("require_tower"),
         tower_path: value_t!(matches, "tower", PathBuf).ok(),
         dev_halt_at_slot: value_t!(matches, "dev_halt_at_slot", Slot).ok(),
-        cuda: matches.is_present("cuda"),
         expected_genesis_hash: matches
             .value_of("expected_genesis_hash")
-            .map(|s| Hash::from_str(&s).unwrap()),
+            .map(|s| Hash::from_str(s).unwrap()),
         expected_bank_hash: matches
             .value_of("expected_bank_hash")
-            .map(|s| Hash::from_str(&s).unwrap()),
-        expected_shred_version: value_t!(matches, "expected_shred_version", u16).ok(),
+            .map(|s| Hash::from_str(s).unwrap()),
+        expected_shred_version,
         new_hard_forks: hardforks_of(&matches, "hard_forks"),
         rpc_config: JsonRpcConfig {
             enable_rpc_transaction_history: matches.is_present("enable_rpc_transaction_history"),
@@ -2141,6 +2294,11 @@ pub fn main() {
                 "rpc_pubsub_max_out_buffer_capacity",
                 usize
             ),
+            max_active_subscriptions: value_t_or_exit!(
+                matches,
+                "rpc_pubsub_max_active_subscriptions",
+                usize
+            ),
         },
         voting_disabled: matches.is_present("no_voting") || restricted_repair_only_mode,
         wait_for_supermajority: value_t!(matches, "wait_for_supermajority", Slot).ok(),
@@ -2170,9 +2328,11 @@ pub fn main() {
         account_indexes,
         accounts_db_caching_enabled: !matches.is_present("no_accounts_db_caching"),
         accounts_db_test_hash_calculation: matches.is_present("accounts_db_test_hash_calculation"),
+        accounts_db_skip_shrink: matches.is_present("accounts_db_skip_shrink"),
         accounts_db_use_index_hash_calculation: matches.is_present("accounts_db_index_hashing"),
         tpu_coalesce_ms,
         no_wait_for_vote_to_start_leader: matches.is_present("no_wait_for_vote_to_start_leader"),
+        accounts_shrink_ratio,
         ..ValidatorConfig::default()
     };
 
@@ -2332,19 +2492,6 @@ pub fn main() {
         validator_config.halt_on_trusted_validators_accounts_hash_mismatch = true;
     }
 
-    let entrypoint_addrs = values_t!(matches, "entrypoint", String)
-        .unwrap_or_default()
-        .into_iter()
-        .map(|entrypoint| {
-            solana_net_utils::parse_host_port(&entrypoint).unwrap_or_else(|e| {
-                eprintln!("failed to parse entrypoint address: {}", e);
-                exit(1);
-            })
-        })
-        .collect::<HashSet<_>>()
-        .into_iter()
-        .collect::<Vec<_>>();
-
     let public_rpc_addr = matches.value_of("public_rpc_addr").map(|addr| {
         solana_net_utils::parse_host_port(addr).unwrap_or_else(|e| {
             eprintln!("failed to parse public rpc address: {}", e);
@@ -2361,25 +2508,6 @@ pub fn main() {
         exit(1);
     });
 
-    let logfile = {
-        let logfile = matches
-            .value_of("logfile")
-            .map(|s| s.into())
-            .unwrap_or_else(|| format!("solana-validator-{}.log", identity_keypair.pubkey()));
-
-        if logfile == "-" {
-            None
-        } else {
-            println!("log file: {}", logfile);
-            Some(logfile)
-        }
-    };
-    let use_progress_bar = logfile.is_none();
-    let _logger_thread = redirect_stderr_to_file(logfile);
-
-    info!("{} {}", crate_name!(), solana_version::version!());
-    info!("Starting validator with: {:#?}", std::env::args_os());
-
     let start_progress = Arc::new(RwLock::new(ValidatorStartProgress::default()));
     admin_rpc_service::run(
         &ledger_path,
@@ -2484,10 +2612,6 @@ pub fn main() {
     solana_metrics::set_host_id(identity_keypair.pubkey().to_string());
     solana_metrics::set_panic_hook("validator");
 
-    if validator_config.cuda {
-        solana_perf::perf_libs::init_cuda();
-        enable_recycler_warming();
-    }
     solana_ledger::entry::init_poh();
     solana_runtime::snapshot_utils::remove_tmp_snapshot_archives(&snapshot_output_dir);
 
@@ -2510,6 +2634,7 @@ pub fn main() {
             &start_progress,
             minimal_snapshot_download_speed,
             maximum_snapshot_download_abort,
+            socket_addr_space,
         );
         *start_progress.write().unwrap() = ValidatorStartProgress::Initializing;
     }
@@ -2529,6 +2654,7 @@ pub fn main() {
         &validator_config,
         should_check_duplicate_instance,
         start_progress,
+        socket_addr_space,
     );
 
     if let Some(filename) = init_complete_file {
diff --git a/version/Cargo.toml b/version/Cargo.toml
index 4510f2799ce8c0..f50972a065b2b4 100644
--- a/version/Cargo.toml
+++ b/version/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "solana-version"
-version = "1.7.0"
+version = "1.7.11"
 description = "Solana Version"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -13,10 +13,10 @@ edition = "2018"
 log = "0.4.11"
 serde = "1.0.122"
 serde_derive = "1.0.103"
-solana-frozen-abi = { path = "../frozen-abi", version = "=1.7.0" }
-solana-frozen-abi-macro = { path = "../frozen-abi/macro", version = "=1.7.0" }
-solana-logger = { path = "../logger", version = "=1.7.0" }
-solana-sdk = { path = "../sdk", version = "=1.7.0" }
+solana-frozen-abi = { path = "../frozen-abi", version = "=1.7.11" }
+solana-frozen-abi-macro = { path = "../frozen-abi/macro", version = "=1.7.11" }
+solana-logger = { path = "../logger", version = "=1.7.11" }
+solana-sdk = { path = "../sdk", version = "=1.7.11" }
 
 [lib]
 name = "solana_version"
diff --git a/watchtower/Cargo.toml b/watchtower/Cargo.toml
index a0f2fec9b2f635..a1c3e60e6cd127 100644
--- a/watchtower/Cargo.toml
+++ b/watchtower/Cargo.toml
@@ -3,7 +3,7 @@ authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 edition = "2018"
 name = "solana-watchtower"
 description = "Blockchain, Rebuilt for Scale"
-version = "1.7.0"
+version = "1.7.11"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
@@ -13,15 +13,15 @@ documentation = "https://docs.rs/solana-watchtower"
 clap = "2.33.1"
 log = "0.4.11"
 humantime = "2.0.1"
-solana-clap-utils = { path = "../clap-utils", version = "=1.7.0" }
-solana-cli-config = { path = "../cli-config", version = "=1.7.0" }
-solana-cli-output = { path = "../cli-output", version = "=1.7.0" }
-solana-client = { path = "../client", version = "=1.7.0" }
-solana-logger = { path = "../logger", version = "=1.7.0" }
-solana-metrics = { path = "../metrics", version = "=1.7.0" }
-solana-notifier = { path = "../notifier", version = "=1.7.0" }
-solana-sdk = { path = "../sdk", version = "=1.7.0" }
-solana-version = { path = "../version", version = "=1.7.0" }
+solana-clap-utils = { path = "../clap-utils", version = "=1.7.11" }
+solana-cli-config = { path = "../cli-config", version = "=1.7.11" }
+solana-cli-output = { path = "../cli-output", version = "=1.7.11" }
+solana-client = { path = "../client", version = "=1.7.11" }
+solana-logger = { path = "../logger", version = "=1.7.11" }
+solana-metrics = { path = "../metrics", version = "=1.7.11" }
+solana-notifier = { path = "../notifier", version = "=1.7.11" }
+solana-sdk = { path = "../sdk", version = "=1.7.11" }
+solana-version = { path = "../version", version = "=1.7.11" }
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
diff --git a/watchtower/src/main.rs b/watchtower/src/main.rs
index d9b26c8d978019..3dd06dd8aaa51f 100644
--- a/watchtower/src/main.rs
+++ b/watchtower/src/main.rs
@@ -66,7 +66,7 @@ fn get_config() -> Config {
                 .global(true)
                 .help("Configuration file to use");
             if let Some(ref config_file) = *solana_cli_config::CONFIG_FILE {
-                arg.default_value(&config_file)
+                arg.default_value(config_file)
             } else {
                 arg
             }
@@ -190,7 +190,7 @@ fn get_cluster_info(
     for validator_identity in &config.validator_identity_pubkeys {
         validator_balances.insert(
             *validator_identity,
-            rpc_client.get_balance(&validator_identity)?,
+            rpc_client.get_balance(validator_identity)?,
         );
     }
 
@@ -299,7 +299,7 @@ fn main() -> Result<(), Box<dyn error::Error>> {
                         validator_errors.push(format!("{} missing", formatted_validator_identity));
                     }
 
-                    if let Some(balance) = validator_balances.get(&validator_identity) {
+                    if let Some(balance) = validator_balances.get(validator_identity) {
                         if *balance < config.minimum_validator_identity_balance {
                             failures.push((
                                 "balance",
diff --git a/web3.js/test/fixtures/noop-program/Cargo.toml b/web3.js/test/fixtures/noop-program/Cargo.toml
index 0b16472e902238..afd46c74e0221f 100644
--- a/web3.js/test/fixtures/noop-program/Cargo.toml
+++ b/web3.js/test/fixtures/noop-program/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "solana-bpf-rust-noop"
-version = "1.7.0"
+version = "1.7.11"
 description = "Solana BPF noop program written in Rust"
 authors = ["Solana Maintainers <maintainers@solana.com>"]
 repository = "https://github.com/solana-labs/solana"