From 6bb1dc15aa5e1696e344a015ac5c9e0642ded176 Mon Sep 17 00:00:00 2001
From: Lijun Wang <83639177+lijunwangs@users.noreply.github.com>
Date: Tue, 3 Sep 2024 12:30:54 -0700
Subject: [PATCH] Fixed cargo.lock in programs/sbf

---
 Cargo.lock              | 3184 ++++++++++++++++++++++++++++++---------
 programs/sbf/Cargo.lock |   34 +-
 2 files changed, 2466 insertions(+), 752 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index b1758b3277f087..13f32b7215bcdb 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -63,6 +63,51 @@ dependencies = [
  "zeroize",
 ]
 
+[[package]]
+name = "agave-accounts-hash-cache-tool"
+version = "2.1.0"
+dependencies = [
+ "ahash 0.8.10",
+ "bytemuck",
+ "clap 2.33.3",
+ "memmap2",
+ "rayon",
+ "solana-accounts-db",
+ "solana-clap-utils",
+ "solana-program",
+ "solana-version",
+]
+
+[[package]]
+name = "agave-cargo-registry"
+version = "2.1.0"
+dependencies = [
+ "clap 2.33.3",
+ "flate2",
+ "hex",
+ "hyper",
+ "log",
+ "rustc_version",
+ "serde",
+ "serde_derive",
+ "serde_json",
+ "sha2 0.10.8",
+ "solana-clap-utils",
+ "solana-cli",
+ "solana-cli-config",
+ "solana-cli-output",
+ "solana-logger",
+ "solana-remote-wallet",
+ "solana-rpc-client",
+ "solana-rpc-client-api",
+ "solana-sdk",
+ "solana-version",
+ "tar",
+ "tempfile",
+ "tokio",
+ "toml 0.8.12",
+]
+
 [[package]]
 name = "agave-geyser-plugin-interface"
 version = "2.1.0"
@@ -73,10 +118,115 @@ dependencies = [
  "thiserror",
 ]
 
+[[package]]
+name = "agave-install"
+version = "2.1.0"
+dependencies = [
+ "atty",
+ "bincode",
+ "bzip2",
+ "chrono",
+ "clap 2.33.3",
+ "console",
+ "crossbeam-channel",
+ "ctrlc",
+ "dirs-next",
+ "indicatif",
+ "lazy_static",
+ "nix",
+ "reqwest",
+ "scopeguard",
+ "semver",
+ "serde",
+ "serde_derive",
+ "serde_yaml 0.8.26",
+ "serde_yaml 0.9.34+deprecated",
+ "solana-clap-utils",
+ "solana-config-program",
+ "solana-logger",
+ "solana-rpc-client",
+ "solana-sdk",
+ "solana-version",
+ "tar",
+ "tempfile",
+ "url 2.5.2",
+ "winapi 0.3.9",
+ "winreg",
+]
+
+[[package]]
+name = "agave-ledger-tool"
+version = "2.1.0"
+dependencies = [
+ "assert_cmd",
+ "bs58",
+ "bytecount",
+ "chrono",
+ "clap 2.33.3",
+ "crossbeam-channel",
+ "csv",
+ "dashmap",
+ "futures 0.3.30",
+ "histogram",
+ "itertools 0.12.1",
+ "log",
+ "num_cpus",
+ "rayon",
+ "regex",
+ "serde",
+ "serde_derive",
+ "serde_json",
+ "signal-hook",
+ "solana-account-decoder",
+ "solana-accounts-db",
+ "solana-bpf-loader-program",
+ "solana-clap-utils",
+ "solana-cli-output",
+ "solana-compute-budget",
+ "solana-core",
+ "solana-cost-model",
+ "solana-entry",
+ "solana-geyser-plugin-manager",
+ "solana-gossip",
+ "solana-ledger",
+ "solana-log-collector",
+ "solana-logger",
+ "solana-measure",
+ "solana-program-runtime",
+ "solana-rpc",
+ "solana-runtime",
+ "solana-sdk",
+ "solana-stake-program",
+ "solana-storage-bigtable",
+ "solana-streamer",
+ "solana-transaction-status",
+ "solana-type-overrides",
+ "solana-unified-scheduler-pool",
+ "solana-version",
+ "solana-vote-program",
+ "solana_rbpf",
+ "thiserror",
+ "tikv-jemallocator",
+ "tokio",
+]
+
+[[package]]
+name = "agave-store-tool"
+version = "2.1.0"
+dependencies = [
+ "clap 2.33.3",
+ "solana-accounts-db",
+ "solana-sdk",
+ "solana-version",
+]
+
 [[package]]
 name = "agave-transaction-view"
 version = "2.1.0"
 dependencies = [
+ "agave-transaction-view",
+ "bincode",
+ "criterion",
  "solana-sdk",
  "solana-svm-transaction",
 ]
@@ -86,8 +236,9 @@ name = "agave-validator"
 version = "2.1.0"
 dependencies = [
  "agave-geyser-plugin-interface",
+ "assert_cmd",
  "chrono",
- "clap",
+ "clap 2.33.3",
  "console",
  "core_affinity",
  "crossbeam-channel",
@@ -103,12 +254,14 @@ dependencies = [
  "libloading 0.7.4",
  "log",
  "num_cpus",
+ "predicates 2.1.5",
  "rand 0.8.5",
  "rayon",
  "serde",
  "serde_json",
- "serde_yaml",
+ "serde_yaml 0.9.34+deprecated",
  "signal-hook",
+ "solana-account-decoder",
  "solana-accounts-db",
  "solana-clap-utils",
  "solana-cli-config",
@@ -119,6 +272,7 @@ dependencies = [
  "solana-genesis-utils",
  "solana-geyser-plugin-manager",
  "solana-gossip",
+ "solana-inline-spl",
  "solana-ledger",
  "solana-logger",
  "solana-metrics",
@@ -140,12 +294,33 @@ dependencies = [
  "solana-unified-scheduler-pool",
  "solana-version",
  "solana-vote-program",
+ "spl-token-2022",
  "symlink",
+ "tempfile",
  "thiserror",
  "tikv-jemallocator",
  "tokio",
 ]
 
+[[package]]
+name = "agave-watchtower"
+version = "2.1.0"
+dependencies = [
+ "clap 2.33.3",
+ "humantime",
+ "log",
+ "solana-clap-utils",
+ "solana-cli-config",
+ "solana-cli-output",
+ "solana-logger",
+ "solana-metrics",
+ "solana-notifier",
+ "solana-rpc-client",
+ "solana-rpc-client-api",
+ "solana-sdk",
+ "solana-version",
+]
+
 [[package]]
 name = "ahash"
 version = "0.7.8"
@@ -224,6 +399,12 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "anes"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299"
+
 [[package]]
 name = "ansi_term"
 version = "0.11.0"
@@ -233,6 +414,12 @@ dependencies = [
  "winapi 0.3.9",
 ]
 
+[[package]]
+name = "anstyle"
+version = "1.0.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1"
+
 [[package]]
 name = "anyhow"
 version = "1.0.86"
@@ -253,6 +440,15 @@ dependencies = [
  "syn 1.0.109",
 ]
 
+[[package]]
+name = "arbitrary"
+version = "1.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110"
+dependencies = [
+ "derive_arbitrary",
+]
+
 [[package]]
 name = "arc-swap"
 version = "1.7.1"
@@ -439,12 +635,34 @@ dependencies = [
  "syn 1.0.109",
 ]
 
+[[package]]
+name = "assert_cmd"
+version = "2.0.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc1835b7f27878de8525dc71410b5a31cdcc5f230aed5ba5df968e09c201b23d"
+dependencies = [
+ "anstyle",
+ "bstr",
+ "doc-comment",
+ "libc",
+ "predicates 3.1.2",
+ "predicates-core",
+ "predicates-tree",
+ "wait-timeout",
+]
+
 [[package]]
 name = "assert_matches"
 version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9b34d609dfbaf33d6889b2b7106d3ca345eacad44200913df5ba02bfd31d2ba9"
 
+[[package]]
+name = "assoc"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bfdc70193dadb9d7287fa4b633f15f90c876915b31f6af17da307fc59c9859a8"
+
 [[package]]
 name = "async-channel"
 version = "1.9.0"
@@ -660,11 +878,26 @@ dependencies = [
  "proc-macro2",
  "quote",
  "regex",
- "rustc-hash",
+ "rustc-hash 1.1.0",
  "shlex",
  "syn 2.0.58",
 ]
 
+[[package]]
+name = "bit-set"
+version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1"
+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.3.2"
@@ -689,6 +922,18 @@ dependencies = [
  "typenum",
 ]
 
+[[package]]
+name = "bitvec"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c"
+dependencies = [
+ "funty",
+ "radium",
+ "tap",
+ "wyz",
+]
+
 [[package]]
 name = "blake3"
 version = "1.5.1"
@@ -827,6 +1072,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "542f33a8835a0884b006a0c3df3dadd99c0c3f296ed26c2fdc8028e01ad6230c"
 dependencies = [
  "memchr",
+ "regex-automata",
  "serde",
 ]
 
@@ -846,6 +1092,22 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "byte-unit"
+version = "4.0.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "da78b32057b8fdfc352504708feeba7216dcd65a2c9ab02978cbd288d1279b6c"
+dependencies = [
+ "serde",
+ "utf8-width",
+]
+
+[[package]]
+name = "bytecount"
+version = "0.6.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5ce89b21cab1437276d2650d57e971f9d548a2d9037cc231abdc0562b97498ce"
+
 [[package]]
 name = "bytemuck"
 version = "1.17.1"
@@ -866,12 +1128,6 @@ dependencies = [
  "syn 2.0.58",
 ]
 
-[[package]]
-name = "byteorder"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fc10e8cc6b2580fda3f36eb6dc5316657f812a3df879a44a66fc9f0fdbc4855"
-
 [[package]]
 name = "byteorder"
 version = "1.5.0"
@@ -884,6 +1140,12 @@ version = "1.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50"
 
+[[package]]
+name = "bytesize"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a3e368af43e418a04d52505cf3dbc23dda4e3407ae2fa99fd0e4f308ce546acc"
+
 [[package]]
 name = "bzip2"
 version = "0.4.4"
@@ -905,6 +1167,15 @@ dependencies = [
  "pkg-config",
 ]
 
+[[package]]
+name = "camino"
+version = "1.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b96ec4966b5813e2c0507c1f86115c8c5abaadc3980879c3424042a02fd1ad3"
+dependencies = [
+ "serde",
+]
+
 [[package]]
 name = "caps"
 version = "0.5.5"
@@ -915,6 +1186,44 @@ dependencies = [
  "thiserror",
 ]
 
+[[package]]
+name = "cargo-platform"
+version = "0.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24b1f0365a6c6bb4020cd05806fd0d33c44d38046b8bd7f0e40814b9763cabfc"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "cargo_metadata"
+version = "0.15.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eee4243f1f26fc7a42710e7439c149e2b10b05472f88090acce52632f231a73a"
+dependencies = [
+ "camino",
+ "cargo-platform",
+ "semver",
+ "serde",
+ "serde_json",
+ "thiserror",
+]
+
+[[package]]
+name = "cast"
+version = "0.2.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4c24dab4283a142afa2fdca129b80ad2c6284e073930f964c3a1293c225ee39a"
+dependencies = [
+ "rustc_version",
+]
+
+[[package]]
+name = "cast"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5"
+
 [[package]]
 name = "cc"
 version = "1.0.94"
@@ -925,6 +1234,12 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "cesu8"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c"
+
 [[package]]
 name = "cexpr"
 version = "0.6.0"
@@ -964,7 +1279,7 @@ dependencies = [
  "num-traits",
  "serde",
  "wasm-bindgen",
- "windows-targets 0.52.0",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -977,17 +1292,44 @@ dependencies = [
 ]
 
 [[package]]
-name = "cipher"
-version = "0.4.4"
+name = "ciborium"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad"
+checksum = "42e69ffd6f0917f5c029256a24d0161db17cea3997d185db0d35926308770f0e"
 dependencies = [
- "crypto-common",
- "inout",
+ "ciborium-io",
+ "ciborium-ll",
+ "serde",
 ]
 
 [[package]]
-name = "clang-sys"
+name = "ciborium-io"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05afea1e0a06c9be33d539b876f1ce3692f4afea2cb41f740e7743225ed1c757"
+
+[[package]]
+name = "ciborium-ll"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "57663b653d948a338bfb3eeba9bb2fd5fcfaecb9e199e87e1eda4d9e8b240fd9"
+dependencies = [
+ "ciborium-io",
+ "half",
+]
+
+[[package]]
+name = "cipher"
+version = "0.4.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad"
+dependencies = [
+ "crypto-common",
+ "inout",
+]
+
+[[package]]
+name = "clang-sys"
 version = "1.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4"
@@ -1007,11 +1349,75 @@ dependencies = [
  "atty",
  "bitflags 1.3.2",
  "strsim 0.8.0",
- "textwrap",
+ "textwrap 0.11.0",
  "unicode-width",
  "vec_map",
 ]
 
+[[package]]
+name = "clap"
+version = "3.2.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123"
+dependencies = [
+ "atty",
+ "bitflags 1.3.2",
+ "clap_derive",
+ "clap_lex 0.2.4",
+ "indexmap 1.9.3",
+ "once_cell",
+ "strsim 0.10.0",
+ "termcolor",
+ "textwrap 0.16.1",
+]
+
+[[package]]
+name = "clap"
+version = "4.5.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed6719fffa43d0d87e5fd8caeab59be1554fb028cd30edc88fc4369b17971019"
+dependencies = [
+ "clap_builder",
+]
+
+[[package]]
+name = "clap_builder"
+version = "4.5.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "216aec2b177652e3846684cbfe25c9964d18ec45234f0f5da5157b207ed1aab6"
+dependencies = [
+ "anstyle",
+ "clap_lex 0.7.2",
+]
+
+[[package]]
+name = "clap_derive"
+version = "3.2.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae6371b8bdc8b7d3959e9cf7b22d4435ef3e79e138688421ec654acf8c81b008"
+dependencies = [
+ "heck",
+ "proc-macro-error",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "clap_lex"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5"
+dependencies = [
+ "os_str_bytes",
+]
+
+[[package]]
+name = "clap_lex"
+version = "0.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97"
+
 [[package]]
 name = "combine"
 version = "3.8.1"
@@ -1019,12 +1425,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "da3da6baa321ec19e1cc41d31bf599f00c783d0517095cdaf0332e3fe8d20680"
 dependencies = [
  "ascii",
- "byteorder 1.5.0",
+ "byteorder",
  "either",
  "memchr",
  "unreachable",
 ]
 
+[[package]]
+name = "combine"
+version = "4.6.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd"
+dependencies = [
+ "bytes",
+ "memchr",
+]
+
 [[package]]
 name = "concurrent-queue"
 version = "2.5.0"
@@ -1067,6 +1483,26 @@ dependencies = [
  "web-sys",
 ]
 
+[[package]]
+name = "const_format"
+version = "0.2.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3a214c7af3d04997541b18d432afaff4c455e79e2029079647e72fc2bd27673"
+dependencies = [
+ "const_format_proc_macros",
+]
+
+[[package]]
+name = "const_format_proc_macros"
+version = "0.2.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c7f6ff08fd20f4f299298a28e2dfa8a8ba1036e6cd2460ac1de7b425d76f2500"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-xid",
+]
+
 [[package]]
 name = "constant_time_eq"
 version = "0.3.0"
@@ -1125,6 +1561,55 @@ dependencies = [
  "cfg-if 0.1.10",
 ]
 
+[[package]]
+name = "criterion"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f2b12d017a929603d80db1831cd3a24082f8137ce19c69e6447f54f5fc8d692f"
+dependencies = [
+ "anes",
+ "cast 0.3.0",
+ "ciborium",
+ "clap 4.5.16",
+ "criterion-plot",
+ "is-terminal",
+ "itertools 0.10.5",
+ "num-traits",
+ "once_cell",
+ "oorandom",
+ "plotters",
+ "rayon",
+ "regex",
+ "serde",
+ "serde_derive",
+ "serde_json",
+ "tinytemplate",
+ "walkdir",
+]
+
+[[package]]
+name = "criterion-plot"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6b50826342786a51a89e2da3a28f1c32b06e387201bc2d19791f622c673706b1"
+dependencies = [
+ "cast 0.3.0",
+ "itertools 0.10.5",
+]
+
+[[package]]
+name = "criterion-stats"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "387df94cb74ada1b33e10ce034bb0d9360cc73edb5063e7d7d4120a40ee1c9d2"
+dependencies = [
+ "cast 0.2.7",
+ "num-traits",
+ "num_cpus",
+ "rand 0.4.6",
+ "thread-scoped",
+]
+
 [[package]]
 name = "crossbeam-channel"
 version = "0.5.13"
@@ -1148,8 +1633,7 @@ dependencies = [
 [[package]]
 name = "crossbeam-epoch"
 version = "0.9.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ec02e091aa634e2c3ada4a392989e7c3116673ef0ac5b72232439094d73b7fd"
+source = "git+https://github.com/anza-xyz/crossbeam?rev=fd279d707025f0e60951e429bf778b4813d1b6bf#fd279d707025f0e60951e429bf778b4813d1b6bf"
 dependencies = [
  "cfg-if 1.0.0",
  "crossbeam-utils",
@@ -1194,6 +1678,27 @@ dependencies = [
  "subtle",
 ]
 
+[[package]]
+name = "csv"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac574ff4d437a7b5ad237ef331c17ccca63c46479e5b5453eb8e10bb99a759fe"
+dependencies = [
+ "csv-core",
+ "itoa",
+ "ryu",
+ "serde",
+]
+
+[[package]]
+name = "csv-core"
+version = "0.1.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5efa2b3d7902f4b634a20cae3c9c4e6209dc4779feb6863329607560143efa70"
+dependencies = [
+ "memchr",
+]
+
 [[package]]
 name = "ctr"
 version = "0.9.2"
@@ -1203,13 +1708,23 @@ dependencies = [
  "cipher",
 ]
 
+[[package]]
+name = "ctrlc"
+version = "3.4.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "90eeab0aa92f3f9b4e87f258c72b139c207d251f9cbc1080a0086b86a8870dd3"
+dependencies = [
+ "nix",
+ "windows-sys 0.59.0",
+]
+
 [[package]]
 name = "curve25519-dalek"
-version = "3.2.1"
+version = "3.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90f9d052967f590a76e62eb387bd0bbb1b000182c3cefe5364db6b7211651bc0"
+checksum = "0b9fdf9972b2bd6af2d913799d9ebc165ea4d2e65878e329d9c6b372c4491b61"
 dependencies = [
- "byteorder 1.5.0",
+ "byteorder",
  "digest 0.9.0",
  "rand_core 0.5.1",
  "subtle",
@@ -1340,6 +1855,17 @@ dependencies = [
  "syn 1.0.109",
 ]
 
+[[package]]
+name = "derive_arbitrary"
+version = "1.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.58",
+]
+
 [[package]]
 name = "derive_more"
 version = "0.99.17"
@@ -1455,6 +1981,12 @@ dependencies = [
  "syn 2.0.58",
 ]
 
+[[package]]
+name = "doc-comment"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10"
+
 [[package]]
 name = "downcast"
 version = "0.11.0"
@@ -1482,7 +2014,7 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c762bae6dcaf24c4c84667b8579785430908723d5c889f469d76a41d59cc7a9d"
 dependencies = [
- "curve25519-dalek 3.2.1",
+ "curve25519-dalek 3.2.0",
  "ed25519",
  "rand 0.7.3",
  "serde",
@@ -1520,15 +2052,6 @@ version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2"
 
-[[package]]
-name = "elf"
-version = "0.0.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4841de15dbe0e49b9b62a417589299e3be0d557e0900d36acb87e6dae47197f5"
-dependencies = [
- "byteorder 0.5.3",
-]
-
 [[package]]
 name = "encode_unicode"
 version = "0.3.6"
@@ -1666,6 +2189,17 @@ version = "0.2.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d"
 
+[[package]]
+name = "filedescriptor"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7199d965852c3bac31f779ef99cbb4537f80e952e2d6aa0ffeb30cce00f4f46e"
+dependencies = [
+ "libc",
+ "thiserror",
+ "winapi 0.3.9",
+]
+
 [[package]]
 name = "filetime"
 version = "0.2.10"
@@ -1745,6 +2279,18 @@ version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c"
 
+[[package]]
+name = "fuchsia-cprng"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
+
+[[package]]
+name = "funty"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c"
+
 [[package]]
 name = "futures"
 version = "0.1.31"
@@ -1848,6 +2394,58 @@ dependencies = [
  "slab",
 ]
 
+[[package]]
+name = "gag"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a713bee13966e9fbffdf7193af71d54a6b35a0bb34997cd6c9519ebeb5005972"
+dependencies = [
+ "filedescriptor",
+ "tempfile",
+]
+
+[[package]]
+name = "gdbstub"
+version = "0.6.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f4e02bf1b1a624d96925c608f1b268d82a76cbc587ce9e59f7c755e9ea11c75c"
+dependencies = [
+ "bitflags 1.3.2",
+ "cfg-if 1.0.0",
+ "log",
+ "managed",
+ "num-traits",
+ "paste",
+]
+
+[[package]]
+name = "gen-headers"
+version = "2.1.0"
+dependencies = [
+ "log",
+ "regex",
+]
+
+[[package]]
+name = "gen-syscall-list"
+version = "2.1.0"
+dependencies = [
+ "regex",
+]
+
+[[package]]
+name = "generator"
+version = "0.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dbb949699c3e4df3a183b1d2142cb24277057055ed23c68ed58894f76c517223"
+dependencies = [
+ "cfg-if 1.0.0",
+ "libc",
+ "log",
+ "rustversion",
+ "windows",
+]
+
 [[package]]
 name = "generic-array"
 version = "0.14.7"
@@ -1977,13 +2575,23 @@ dependencies = [
  "tracing",
 ]
 
+[[package]]
+name = "half"
+version = "2.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888"
+dependencies = [
+ "cfg-if 1.0.0",
+ "crunchy",
+]
+
 [[package]]
 name = "hash32"
 version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b0c35f58762feb77d74ebe43bdbc3210f09be9fe6742234d573bacc26ed92b67"
 dependencies = [
- "byteorder 1.5.0",
+ "byteorder",
 ]
 
 [[package]]
@@ -2059,6 +2667,31 @@ version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286"
 
+[[package]]
+name = "hermit-abi"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc"
+
+[[package]]
+name = "hex"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
+
+[[package]]
+name = "hidapi"
+version = "2.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "03b876ecf37e86b359573c16c8366bc3eba52b689884a0fc42ba3f67203d2a8b"
+dependencies = [
+ "cc",
+ "cfg-if 1.0.0",
+ "libc",
+ "pkg-config",
+ "windows-sys 0.48.0",
+]
+
 [[package]]
 name = "histogram"
 version = "0.6.9"
@@ -2186,7 +2819,7 @@ dependencies = [
  "futures-util",
  "http",
  "hyper",
- "rustls",
+ "rustls 0.21.12",
  "tokio",
  "tokio-rustls",
 ]
@@ -2361,6 +2994,17 @@ version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "47be2f14c678be2fdcab04ab1171db51b2762ce6f0a8ee87c8dd4a04ed216135"
 
+[[package]]
+name = "is-terminal"
+version = "0.4.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "261f68e344040fbd0edea105bef17c66edf46f984ddb1115b775ce31be948f4b"
+dependencies = [
+ "hermit-abi 0.4.0",
+ "libc",
+ "windows-sys 0.52.0",
+]
+
 [[package]]
 name = "itertools"
 version = "0.10.5"
@@ -2386,17 +3030,37 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38"
 
 [[package]]
-name = "jobserver"
-version = "0.1.21"
+name = "jni"
+version = "0.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c71313ebb9439f74b00d9d2dcec36440beaf57a6aa0623068441dd7cd81a7f2"
+checksum = "c6df18c2e3db7e453d3c6ac5b3e9d5182664d28788126d39b91f2d1e22b017ec"
 dependencies = [
- "libc",
+ "cesu8",
+ "combine 4.6.7",
+ "jni-sys",
+ "log",
+ "thiserror",
+ "walkdir",
 ]
 
 [[package]]
-name = "js-sys"
-version = "0.3.70"
+name = "jni-sys"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130"
+
+[[package]]
+name = "jobserver"
+version = "0.1.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c71313ebb9439f74b00d9d2dcec36440beaf57a6aa0623068441dd7cd81a7f2"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "js-sys"
+version = "0.3.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a"
 dependencies = [
@@ -2597,7 +3261,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19"
 dependencies = [
  "cfg-if 1.0.0",
- "windows-targets 0.52.0",
+ "windows-targets 0.48.0",
 ]
 
 [[package]]
@@ -2631,31 +3295,15 @@ dependencies = [
  "base64 0.12.3",
  "digest 0.9.0",
  "hmac-drbg",
- "libsecp256k1-core 0.2.2",
- "libsecp256k1-gen-ecmult 0.2.1",
- "libsecp256k1-gen-genmult 0.2.1",
+ "libsecp256k1-core",
+ "libsecp256k1-gen-ecmult",
+ "libsecp256k1-gen-genmult",
  "rand 0.7.3",
  "serde",
  "sha2 0.9.9",
  "typenum",
 ]
 
-[[package]]
-name = "libsecp256k1"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0452aac8bab02242429380e9b2f94ea20cea2b37e2c1777a1358799bbe97f37"
-dependencies = [
- "arrayref",
- "base64 0.13.1",
- "digest 0.9.0",
- "libsecp256k1-core 0.3.0",
- "libsecp256k1-gen-ecmult 0.3.0",
- "libsecp256k1-gen-genmult 0.3.0",
- "rand 0.8.5",
- "serde",
-]
-
 [[package]]
 name = "libsecp256k1-core"
 version = "0.2.2"
@@ -2667,33 +3315,13 @@ dependencies = [
  "subtle",
 ]
 
-[[package]]
-name = "libsecp256k1-core"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5be9b9bb642d8522a44d533eab56c16c738301965504753b03ad1de3425d5451"
-dependencies = [
- "crunchy",
- "digest 0.9.0",
- "subtle",
-]
-
 [[package]]
 name = "libsecp256k1-gen-ecmult"
 version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ccab96b584d38fac86a83f07e659f0deafd0253dc096dab5a36d53efe653c5c3"
 dependencies = [
- "libsecp256k1-core 0.2.2",
-]
-
-[[package]]
-name = "libsecp256k1-gen-ecmult"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3038c808c55c87e8a172643a7d87187fc6c4174468159cb3090659d55bcb4809"
-dependencies = [
- "libsecp256k1-core 0.3.0",
+ "libsecp256k1-core",
 ]
 
 [[package]]
@@ -2702,16 +3330,7 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "67abfe149395e3aa1c48a2beb32b068e2334402df8181f818d3aee2b304c4f5d"
 dependencies = [
- "libsecp256k1-core 0.2.2",
-]
-
-[[package]]
-name = "libsecp256k1-gen-genmult"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3db8d6ba2cec9eacc40e6e8ccc98931840301f1006e95647ceb2dd5c3aa06f7c"
-dependencies = [
- "libsecp256k1-core 0.3.0",
+ "libsecp256k1-core",
 ]
 
 [[package]]
@@ -2737,6 +3356,12 @@ dependencies = [
  "thiserror",
 ]
 
+[[package]]
+name = "linked-hash-map"
+version = "0.5.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f"
+
 [[package]]
 name = "linux-raw-sys"
 version = "0.4.12"
@@ -2788,6 +3413,12 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "managed"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ca88d725a0a943b096803bd34e73a4437208b6077654cc4ecb2947a5f91618d"
+
 [[package]]
 name = "matches"
 version = "0.1.10"
@@ -2839,7 +3470,7 @@ version = "3.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "58c38e2799fc0978b65dfff8023ec7843e2330bb462f19198840b34b6582397d"
 dependencies = [
- "byteorder 1.5.0",
+ "byteorder",
  "keccak",
  "rand_core 0.6.4",
  "zeroize",
@@ -2893,15 +3524,6 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
-[[package]]
-name = "miow"
-version = "0.3.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9f1c5b025cda876f66ef43a113f91ebc9f4ccef34843000e0adf6ebbab84e21"
-dependencies = [
- "winapi 0.3.9",
-]
-
 [[package]]
 name = "mockall"
 version = "0.11.4"
@@ -2913,7 +3535,7 @@ dependencies = [
  "fragile",
  "lazy_static",
  "mockall_derive",
- "predicates",
+ "predicates 2.1.5",
  "predicates-tree",
 ]
 
@@ -3126,6 +3748,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
 dependencies = [
  "autocfg",
+ "libm",
 ]
 
 [[package]]
@@ -3185,9 +3808,15 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.18.0"
+version = "1.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+
+[[package]]
+name = "oorandom"
+version = "11.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+checksum = "b410bbe7e14ab526a0e86877eb47c6996a2bd7746f027ba551028c925390e4e9"
 
 [[package]]
 name = "opaque-debug"
@@ -3268,6 +3897,18 @@ dependencies = [
  "thiserror",
 ]
 
+[[package]]
+name = "os_str_bytes"
+version = "6.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2355d85b9a3786f481747ced0e0ff2ba35213a1f9bd406ed906554d7af805a1"
+
+[[package]]
+name = "owo-colors"
+version = "3.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f"
+
 [[package]]
 name = "parity-tokio-ipc"
 version = "0.9.0"
@@ -3439,6 +4080,16 @@ dependencies = [
  "indexmap 1.9.3",
 ]
 
+[[package]]
+name = "pickledb"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c53a5ade47760e8cc4986bdc5e72daeffaaaee64cbc374f9cfe0a00c1cd87b1f"
+dependencies = [
+ "serde",
+ "serde_yaml 0.8.26",
+]
+
 [[package]]
 name = "pin-project"
 version = "1.1.5"
@@ -3477,6 +4128,34 @@ version = "0.3.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "05da548ad6865900e60eaba7f589cc0783590a92e940c26953ff81ddbab2d677"
 
+[[package]]
+name = "plotters"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a15b6eccb8484002195a3e44fe65a4ce8e93a625797a063735536fd59cb01cf3"
+dependencies = [
+ "num-traits",
+ "plotters-backend",
+ "plotters-svg",
+ "wasm-bindgen",
+ "web-sys",
+]
+
+[[package]]
+name = "plotters-backend"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "414cec62c6634ae900ea1c56128dfe87cf63e7caece0852ec76aba307cebadb7"
+
+[[package]]
+name = "plotters-svg"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "81b30686a7d9c3e010b84284bdd26a29f2138574f52f5eb6f794fc0ad924e705"
+dependencies = [
+ "plotters-backend",
+]
+
 [[package]]
 name = "polyval"
 version = "0.6.2"
@@ -3521,6 +4200,17 @@ dependencies = [
  "regex",
 ]
 
+[[package]]
+name = "predicates"
+version = "3.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7e9086cc7640c29a356d1a29fd134380bee9d8f79a17410aa76e7ad295f42c97"
+dependencies = [
+ "anstyle",
+ "difflib",
+ "predicates-core",
+]
+
 [[package]]
 name = "predicates-core"
 version = "1.0.6"
@@ -3565,7 +4255,7 @@ version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1d6ea3c4595b96363c13943497db34af4460fb474a95c43f4446ad341b8c9785"
 dependencies = [
- "toml",
+ "toml 0.5.11",
 ]
 
 [[package]]
@@ -3574,7 +4264,7 @@ version = "3.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284"
 dependencies = [
- "toml_edit",
+ "toml_edit 0.21.1",
 ]
 
 [[package]]
@@ -3610,6 +4300,26 @@ dependencies = [
  "unicode-ident",
 ]
 
+[[package]]
+name = "proptest"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b4c2511913b88df1637da85cc8d96ec8e43a3f8bb8ccb71ee1ac240d6f3df58d"
+dependencies = [
+ "bit-set",
+ "bit-vec",
+ "bitflags 2.6.0",
+ "lazy_static",
+ "num-traits",
+ "rand 0.8.5",
+ "rand_chacha 0.3.1",
+ "rand_xorshift",
+ "regex-syntax",
+ "rusty-fork",
+ "tempfile",
+ "unarray",
+]
+
 [[package]]
 name = "prost"
 version = "0.11.9"
@@ -3664,6 +4374,14 @@ dependencies = [
  "prost",
 ]
 
+[[package]]
+name = "proto"
+version = "2.1.0"
+dependencies = [
+ "protobuf-src",
+ "tonic-build",
+]
+
 [[package]]
 name = "protobuf-src"
 version = "1.1.0+21.5"
@@ -3708,18 +4426,25 @@ dependencies = [
  "winapi 0.3.9",
 ]
 
+[[package]]
+name = "quick-error"
+version = "1.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
+
 [[package]]
 name = "quinn"
-version = "0.10.2"
+version = "0.11.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8cc2c5017e4b43d5995dcea317bc46c1e09404c0a9664d2908f7f02dfe943d75"
+checksum = "8c7c5fdde3cdae7203427dc4f0a68fe0ed09833edc525a03456b153b79828684"
 dependencies = [
  "bytes",
  "pin-project-lite",
  "quinn-proto",
  "quinn-udp",
- "rustc-hash",
- "rustls",
+ "rustc-hash 2.0.0",
+ "rustls 0.23.12",
+ "socket2 0.5.7",
  "thiserror",
  "tokio",
  "tracing",
@@ -3727,16 +4452,16 @@ dependencies = [
 
 [[package]]
 name = "quinn-proto"
-version = "0.10.6"
+version = "0.11.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "141bf7dfde2fbc246bfd3fe12f2455aa24b0fbd9af535d8c86c7bd1381ff2b1a"
+checksum = "fadfaed2cd7f389d0161bb73eeb07b7b78f8691047a6f3e73caaeae55310a4a6"
 dependencies = [
  "bytes",
  "rand 0.8.5",
- "ring 0.16.20",
- "rustc-hash",
- "rustls",
- "rustls-native-certs",
+ "ring 0.17.3",
+ "rustc-hash 2.0.0",
+ "rustls 0.23.12",
+ "rustls-platform-verifier",
  "slab",
  "thiserror",
  "tinyvec",
@@ -3745,15 +4470,15 @@ dependencies = [
 
 [[package]]
 name = "quinn-udp"
-version = "0.4.1"
+version = "0.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "055b4e778e8feb9f93c4e439f71dc2156ef13360b432b799e179a8c4cdf0b1d7"
+checksum = "4fe68c2e9e1a1234e218683dbdf9f9dfcb094113c5ac2b938dfcb9bab4c4140b"
 dependencies = [
- "bytes",
  "libc",
+ "once_cell",
  "socket2 0.5.7",
  "tracing",
- "windows-sys 0.48.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -3765,6 +4490,25 @@ dependencies = [
  "proc-macro2",
 ]
 
+[[package]]
+name = "radium"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09"
+
+[[package]]
+name = "rand"
+version = "0.4.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293"
+dependencies = [
+ "fuchsia-cprng",
+ "libc",
+ "rand_core 0.3.1",
+ "rdrand",
+ "winapi 0.3.9",
+]
+
 [[package]]
 name = "rand"
 version = "0.7.3"
@@ -3809,6 +4553,21 @@ dependencies = [
  "rand_core 0.6.4",
 ]
 
+[[package]]
+name = "rand_core"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b"
+dependencies = [
+ "rand_core 0.4.2",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc"
+
 [[package]]
 name = "rand_core"
 version = "0.5.1"
@@ -3836,6 +4595,24 @@ dependencies = [
  "rand_core 0.5.1",
 ]
 
+[[package]]
+name = "rand_pcg"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "59cad018caf63deb318e5a4586d99a24424a364f40f1e5778c29aca23f4fc73e"
+dependencies = [
+ "rand_core 0.6.4",
+]
+
+[[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.4",
+]
+
 [[package]]
 name = "rand_xoshiro"
 version = "0.6.0"
@@ -3874,6 +4651,19 @@ dependencies = [
  "crossbeam-utils",
 ]
 
+[[package]]
+name = "rbpf-cli"
+version = "2.1.0"
+
+[[package]]
+name = "rdrand"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2"
+dependencies = [
+ "rand_core 0.3.1",
+]
+
 [[package]]
 name = "redox_syscall"
 version = "0.1.56"
@@ -3979,8 +4769,8 @@ dependencies = [
  "once_cell",
  "percent-encoding 2.3.1",
  "pin-project-lite",
- "rustls",
- "rustls-pemfile",
+ "rustls 0.21.12",
+ "rustls-pemfile 1.0.0",
  "serde",
  "serde_json",
  "serde_urlencoded",
@@ -4095,6 +4885,12 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
 
+[[package]]
+name = "rustc-hash"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152"
+
 [[package]]
 name = "rustc_version"
 version = "0.4.0"
@@ -4134,18 +4930,33 @@ checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e"
 dependencies = [
  "log",
  "ring 0.17.3",
- "rustls-webpki",
+ "rustls-webpki 0.101.7",
  "sct",
 ]
 
+[[package]]
+name = "rustls"
+version = "0.23.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c58f8c84392efc0a126acce10fa59ff7b3d2ac06ab451a33f2741989b806b044"
+dependencies = [
+ "once_cell",
+ "ring 0.17.3",
+ "rustls-pki-types",
+ "rustls-webpki 0.102.7",
+ "subtle",
+ "zeroize",
+]
+
 [[package]]
 name = "rustls-native-certs"
-version = "0.6.3"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00"
+checksum = "e5bfb394eeed242e909609f56089eecfe5fda225042e8b171791b9c95f5931e5"
 dependencies = [
  "openssl-probe",
- "rustls-pemfile",
+ "rustls-pemfile 2.1.3",
+ "rustls-pki-types",
  "schannel",
  "security-framework",
 ]
@@ -4159,6 +4970,49 @@ dependencies = [
  "base64 0.13.1",
 ]
 
+[[package]]
+name = "rustls-pemfile"
+version = "2.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "196fe16b00e106300d3e45ecfcb764fa292a535d7326a29a5875c579c7417425"
+dependencies = [
+ "base64 0.22.1",
+ "rustls-pki-types",
+]
+
+[[package]]
+name = "rustls-pki-types"
+version = "1.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0"
+
+[[package]]
+name = "rustls-platform-verifier"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "afbb878bdfdf63a336a5e63561b1835e7a8c91524f51621db870169eac84b490"
+dependencies = [
+ "core-foundation",
+ "core-foundation-sys",
+ "jni",
+ "log",
+ "once_cell",
+ "rustls 0.23.12",
+ "rustls-native-certs",
+ "rustls-platform-verifier-android",
+ "rustls-webpki 0.102.7",
+ "security-framework",
+ "security-framework-sys",
+ "webpki-roots 0.26.5",
+ "winapi 0.3.9",
+]
+
+[[package]]
+name = "rustls-platform-verifier-android"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f87165f0995f63a9fbeea62b64d10b4d9d8e78ec6d7d51fb2125fda7bb36788f"
+
 [[package]]
 name = "rustls-webpki"
 version = "0.101.7"
@@ -4169,12 +5023,35 @@ dependencies = [
  "untrusted 0.9.0",
 ]
 
+[[package]]
+name = "rustls-webpki"
+version = "0.102.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "84678086bd54edf2b415183ed7a94d0efb049f1b646a33e22a36f3794be6ae56"
+dependencies = [
+ "ring 0.17.3",
+ "rustls-pki-types",
+ "untrusted 0.9.0",
+]
+
 [[package]]
 name = "rustversion"
 version = "1.0.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6"
 
+[[package]]
+name = "rusty-fork"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cb3dcc6e454c328bb824492db107ab7c0ae8fcffe4ad210136ef014458c1bc4f"
+dependencies = [
+ "fnv",
+ "quick-error",
+ "tempfile",
+ "wait-timeout",
+]
+
 [[package]]
 name = "ryu"
 version = "1.0.4"
@@ -4199,6 +5076,12 @@ dependencies = [
  "windows-sys 0.52.0",
 ]
 
+[[package]]
+name = "scoped-tls"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294"
+
 [[package]]
 name = "scopeguard"
 version = "1.2.0"
@@ -4231,6 +5114,7 @@ dependencies = [
  "core-foundation",
  "core-foundation-sys",
  "libc",
+ "num-bigint 0.4.6",
  "security-framework-sys",
 ]
 
@@ -4249,6 +5133,9 @@ name = "semver"
 version = "1.0.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
+dependencies = [
+ "serde",
+]
 
 [[package]]
 name = "seqlock"
@@ -4300,6 +5187,15 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "serde_spanned"
+version = "0.6.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d"
+dependencies = [
+ "serde",
+]
+
 [[package]]
 name = "serde_urlencoded"
 version = "0.7.1"
@@ -4334,6 +5230,18 @@ dependencies = [
  "syn 2.0.58",
 ]
 
+[[package]]
+name = "serde_yaml"
+version = "0.8.26"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "578a7433b776b56a35785ed5ce9a7e777ac0598aac5a6dd1b4b18a307c7fc71b"
+dependencies = [
+ "indexmap 1.9.3",
+ "ryu",
+ "serde",
+ "yaml-rust",
+]
+
 [[package]]
 name = "serde_yaml"
 version = "0.9.34+deprecated"
@@ -4347,6 +5255,31 @@ dependencies = [
  "unsafe-libyaml",
 ]
 
+[[package]]
+name = "serial_test"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0e56dd856803e253c8f298af3f4d7eb0ae5e23a737252cd90bb4f3b435033b2d"
+dependencies = [
+ "dashmap",
+ "futures 0.3.30",
+ "lazy_static",
+ "log",
+ "parking_lot 0.12.2",
+ "serial_test_derive",
+]
+
+[[package]]
+name = "serial_test_derive"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "91d129178576168c589c9ec973feedf7d3126c01ac2bf08795109aa35b69fb8f"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.58",
+]
+
 [[package]]
 name = "sha-1"
 version = "0.9.8"
@@ -4426,6 +5359,25 @@ version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
 
+[[package]]
+name = "shuttle"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2d9a8db61a44e2b663f169a08206a789bcbd22ba32011e14951562848e7b9c98"
+dependencies = [
+ "assoc",
+ "bitvec",
+ "generator",
+ "hex",
+ "owo-colors",
+ "rand 0.8.5",
+ "rand_core 0.6.4",
+ "rand_pcg",
+ "scoped-tls",
+ "smallvec",
+ "tracing",
+]
+
 [[package]]
 name = "signal-hook"
 version = "0.3.17"
@@ -4475,9 +5427,12 @@ dependencies = [
 
 [[package]]
 name = "slab"
-version = "0.4.2"
+version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8"
+checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67"
+dependencies = [
+ "autocfg",
+]
 
 [[package]]
 name = "smallvec"
@@ -4541,6 +5496,7 @@ name = "solana-account-decoder"
 version = "2.1.0"
 dependencies = [
  "Inflector",
+ "assert_matches",
  "base64 0.22.1",
  "bincode",
  "bs58",
@@ -4551,6 +5507,7 @@ dependencies = [
  "serde_json",
  "solana-config-program",
  "solana-sdk",
+ "spl-pod",
  "spl-token",
  "spl-token-2022",
  "spl-token-group-interface",
@@ -4559,47 +5516,112 @@ dependencies = [
  "zstd",
 ]
 
+[[package]]
+name = "solana-accounts-bench"
+version = "2.1.0"
+dependencies = [
+ "clap 2.33.3",
+ "log",
+ "rayon",
+ "solana-accounts-db",
+ "solana-logger",
+ "solana-measure",
+ "solana-sdk",
+ "solana-version",
+]
+
+[[package]]
+name = "solana-accounts-cluster-bench"
+version = "2.1.0"
+dependencies = [
+ "clap 2.33.3",
+ "log",
+ "rand 0.8.5",
+ "rayon",
+ "solana-account-decoder",
+ "solana-accounts-db",
+ "solana-clap-utils",
+ "solana-cli-config",
+ "solana-client",
+ "solana-core",
+ "solana-faucet",
+ "solana-gossip",
+ "solana-inline-spl",
+ "solana-local-cluster",
+ "solana-logger",
+ "solana-measure",
+ "solana-net-utils",
+ "solana-rpc-client",
+ "solana-rpc-client-api",
+ "solana-runtime",
+ "solana-sdk",
+ "solana-streamer",
+ "solana-test-validator",
+ "solana-transaction-status",
+ "solana-version",
+ "spl-token",
+]
+
 [[package]]
 name = "solana-accounts-db"
 version = "2.1.0"
 dependencies = [
  "ahash 0.8.10",
+ "assert_matches",
  "bincode",
  "blake3",
  "bv",
  "bytemuck",
  "bytemuck_derive",
  "bzip2",
+ "criterion",
  "crossbeam-channel",
  "dashmap",
+ "ed25519-dalek",
  "index_list",
  "indexmap 2.5.0",
  "itertools 0.12.1",
  "lazy_static",
+ "libsecp256k1",
  "log",
  "lz4",
  "memmap2",
+ "memoffset 0.9.0",
  "modular-bitfield",
  "num_cpus",
  "num_enum",
+ "qualifier_attr",
  "rand 0.8.5",
+ "rand_chacha 0.3.1",
  "rayon",
+ "rustc_version",
  "seqlock",
  "serde",
+ "serde_bytes",
  "serde_derive",
  "smallvec",
+ "solana-accounts-db",
  "solana-bucket-map",
+ "solana-compute-budget",
+ "solana-frozen-abi",
+ "solana-frozen-abi-macro",
  "solana-inline-spl",
  "solana-lattice-hash",
+ "solana-logger",
  "solana-measure",
  "solana-metrics",
  "solana-nohash-hasher",
  "solana-rayon-threadlimit",
  "solana-sdk",
+ "solana-stake-program",
  "solana-svm-transaction",
+ "solana-vote-program",
  "static_assertions",
+ "strum",
+ "strum_macros",
  "tar",
  "tempfile",
+ "test-case",
  "thiserror",
 ]
 
@@ -4612,6 +5634,7 @@ dependencies = [
  "log",
  "num-derive",
  "num-traits",
+ "rustc_version",
  "solana-log-collector",
  "solana-program",
  "solana-program-runtime",
@@ -4619,6 +5642,17 @@ dependencies = [
  "thiserror",
 ]
 
+[[package]]
+name = "solana-address-lookup-table-program-tests"
+version = "2.1.0"
+dependencies = [
+ "assert_matches",
+ "bincode",
+ "solana-address-lookup-table-program",
+ "solana-program-test",
+ "solana-sdk",
+]
+
 [[package]]
 name = "solana-atomic-u64"
 version = "2.1.0"
@@ -4626,6 +5660,30 @@ dependencies = [
  "parking_lot 0.12.2",
 ]
 
+[[package]]
+name = "solana-banking-bench"
+version = "2.1.0"
+dependencies = [
+ "clap 3.2.25",
+ "crossbeam-channel",
+ "log",
+ "rand 0.8.5",
+ "rayon",
+ "solana-client",
+ "solana-core",
+ "solana-gossip",
+ "solana-ledger",
+ "solana-logger",
+ "solana-measure",
+ "solana-perf",
+ "solana-poh",
+ "solana-runtime",
+ "solana-sdk",
+ "solana-streamer",
+ "solana-tpu-client",
+ "solana-version",
+]
+
 [[package]]
 name = "solana-banks-client"
 version = "2.1.0"
@@ -4633,7 +5691,9 @@ dependencies = [
  "borsh 1.5.1",
  "futures 0.3.30",
  "solana-banks-interface",
+ "solana-banks-server",
  "solana-program",
+ "solana-runtime",
  "solana-sdk",
  "tarpc",
  "thiserror",
@@ -4669,6 +5729,63 @@ dependencies = [
  "tokio-serde",
 ]
 
+[[package]]
+name = "solana-bench-streamer"
+version = "2.1.0"
+dependencies = [
+ "clap 3.2.25",
+ "crossbeam-channel",
+ "solana-net-utils",
+ "solana-streamer",
+ "solana-version",
+]
+
+[[package]]
+name = "solana-bench-tps"
+version = "2.1.0"
+dependencies = [
+ "chrono",
+ "clap 2.33.3",
+ "crossbeam-channel",
+ "csv",
+ "log",
+ "rand 0.8.5",
+ "rayon",
+ "serde",
+ "serde_json",
+ "serde_yaml 0.9.34+deprecated",
+ "serial_test",
+ "solana-clap-utils",
+ "solana-cli-config",
+ "solana-client",
+ "solana-connection-cache",
+ "solana-core",
+ "solana-faucet",
+ "solana-genesis",
+ "solana-gossip",
+ "solana-local-cluster",
+ "solana-logger",
+ "solana-measure",
+ "solana-metrics",
+ "solana-net-utils",
+ "solana-quic-client",
+ "solana-rpc",
+ "solana-rpc-client",
+ "solana-rpc-client-api",
+ "solana-rpc-client-nonce-utils",
+ "solana-runtime",
+ "solana-sdk",
+ "solana-streamer",
+ "solana-test-validator",
+ "solana-tps-client",
+ "solana-tpu-client",
+ "solana-transaction-status",
+ "solana-version",
+ "spl-instruction-padding",
+ "tempfile",
+ "thiserror",
+]
+
 [[package]]
 name = "solana-bloom"
 version = "2.1.0"
@@ -4677,8 +5794,12 @@ dependencies = [
  "fnv",
  "log",
  "rand 0.8.5",
+ "rayon",
+ "rustc_version",
  "serde",
  "serde_derive",
+ "solana-frozen-abi",
+ "solana-frozen-abi-macro",
  "solana-sanitize",
  "solana-sdk",
 ]
@@ -4691,7 +5812,11 @@ dependencies = [
  "ark-ec",
  "ark-ff",
  "ark-serialize",
+ "array-bytes",
  "bytemuck",
+ "serde",
+ "serde_derive",
+ "serde_json",
  "solana-program",
  "thiserror",
 ]
@@ -4700,10 +5825,13 @@ dependencies = [
 name = "solana-bpf-loader-program"
 version = "2.1.0"
 dependencies = [
+ "assert_matches",
  "bincode",
- "byteorder 1.5.0",
- "libsecp256k1 0.6.0",
+ "byteorder",
+ "libsecp256k1",
  "log",
+ "memoffset 0.9.0",
+ "rand 0.8.5",
  "scopeguard",
  "solana-bn254",
  "solana-compute-budget",
@@ -4716,10 +5844,23 @@ dependencies = [
  "solana-sdk",
  "solana-timings",
  "solana-type-overrides",
+ "solana-vote",
  "solana_rbpf",
+ "test-case",
  "thiserror",
 ]
 
+[[package]]
+name = "solana-bpf-loader-program-tests"
+version = "2.1.0"
+dependencies = [
+ "assert_matches",
+ "bincode",
+ "solana-bpf-loader-program",
+ "solana-program-test",
+ "solana-sdk",
+]
+
 [[package]]
 name = "solana-bucket-map"
 version = "2.1.0"
@@ -4727,11 +5868,14 @@ dependencies = [
  "bv",
  "bytemuck",
  "bytemuck_derive",
+ "fs_extra",
  "log",
  "memmap2",
  "modular-bitfield",
  "num_enum",
  "rand 0.8.5",
+ "rayon",
+ "solana-logger",
  "solana-measure",
  "solana-sdk",
  "tempfile",
@@ -4744,10 +5888,13 @@ dependencies = [
  "ahash 0.8.10",
  "lazy_static",
  "log",
+ "rand 0.8.5",
+ "rustc_version",
  "solana-address-lookup-table-program",
  "solana-bpf-loader-program",
  "solana-compute-budget-program",
  "solana-config-program",
+ "solana-frozen-abi",
  "solana-loader-v4-program",
  "solana-sdk",
  "solana-stake-program",
@@ -4755,15 +5902,50 @@ dependencies = [
  "solana-vote-program",
 ]
 
+[[package]]
+name = "solana-cargo-build-sbf"
+version = "2.1.0"
+dependencies = [
+ "assert_cmd",
+ "bzip2",
+ "cargo_metadata",
+ "clap 3.2.25",
+ "itertools 0.12.1",
+ "log",
+ "predicates 2.1.5",
+ "regex",
+ "reqwest",
+ "semver",
+ "serial_test",
+ "solana-download-utils",
+ "solana-logger",
+ "solana-sdk",
+ "tar",
+]
+
+[[package]]
+name = "solana-cargo-test-sbf"
+version = "2.1.0"
+dependencies = [
+ "cargo_metadata",
+ "clap 3.2.25",
+ "itertools 0.12.1",
+ "log",
+ "regex",
+ "solana-logger",
+]
+
 [[package]]
 name = "solana-clap-utils"
 version = "2.1.0"
 dependencies = [
+ "assert_matches",
  "chrono",
- "clap",
+ "clap 2.33.3",
  "rpassword",
  "solana-remote-wallet",
  "solana-sdk",
+ "tempfile",
  "thiserror",
  "tiny-bip39",
  "uriparse",
@@ -4771,19 +5953,99 @@ dependencies = [
 ]
 
 [[package]]
-name = "solana-cli-config"
+name = "solana-clap-v3-utils"
 version = "2.1.0"
 dependencies = [
- "dirs-next",
- "lazy_static",
- "serde",
- "serde_derive",
- "serde_yaml",
- "solana-clap-utils",
+ "assert_matches",
+ "chrono",
+ "clap 3.2.25",
+ "rpassword",
+ "solana-remote-wallet",
  "solana-sdk",
- "url 2.5.2",
-]
-
+ "solana-zk-token-sdk",
+ "tempfile",
+ "thiserror",
+ "tiny-bip39",
+ "uriparse",
+ "url 2.5.2",
+]
+
+[[package]]
+name = "solana-cli"
+version = "2.1.0"
+dependencies = [
+ "assert_matches",
+ "bincode",
+ "bs58",
+ "clap 2.33.3",
+ "console",
+ "const_format",
+ "criterion-stats",
+ "crossbeam-channel",
+ "ctrlc",
+ "hex",
+ "humantime",
+ "log",
+ "num-traits",
+ "pretty-hex",
+ "reqwest",
+ "semver",
+ "serde",
+ "serde_derive",
+ "serde_json",
+ "solana-account-decoder",
+ "solana-bpf-loader-program",
+ "solana-clap-utils",
+ "solana-cli-config",
+ "solana-cli-output",
+ "solana-client",
+ "solana-compute-budget",
+ "solana-config-program",
+ "solana-connection-cache",
+ "solana-decode-error",
+ "solana-faucet",
+ "solana-loader-v4-program",
+ "solana-logger",
+ "solana-program-runtime",
+ "solana-pubsub-client",
+ "solana-quic-client",
+ "solana-remote-wallet",
+ "solana-rpc",
+ "solana-rpc-client",
+ "solana-rpc-client-api",
+ "solana-rpc-client-nonce-utils",
+ "solana-sdk",
+ "solana-streamer",
+ "solana-test-validator",
+ "solana-tps-client",
+ "solana-tpu-client",
+ "solana-transaction-status",
+ "solana-udp-client",
+ "solana-version",
+ "solana-vote-program",
+ "solana_rbpf",
+ "spl-memo",
+ "tempfile",
+ "test-case",
+ "thiserror",
+ "tiny-bip39",
+]
+
+[[package]]
+name = "solana-cli-config"
+version = "2.1.0"
+dependencies = [
+ "anyhow",
+ "dirs-next",
+ "lazy_static",
+ "serde",
+ "serde_derive",
+ "serde_yaml 0.9.34+deprecated",
+ "solana-clap-utils",
+ "solana-sdk",
+ "url 2.5.2",
+]
+
 [[package]]
 name = "solana-cli-output"
 version = "2.1.0"
@@ -4791,8 +6053,9 @@ dependencies = [
  "Inflector",
  "base64 0.22.1",
  "chrono",
- "clap",
+ "clap 2.33.3",
  "console",
+ "ed25519-dalek",
  "humantime",
  "indicatif",
  "pretty-hex",
@@ -4815,6 +6078,7 @@ version = "2.1.0"
 dependencies = [
  "async-trait",
  "bincode",
+ "crossbeam-channel",
  "dashmap",
  "futures 0.3.30",
  "futures-util",
@@ -4839,10 +6103,41 @@ dependencies = [
  "tokio",
 ]
 
+[[package]]
+name = "solana-client-test"
+version = "2.1.0"
+dependencies = [
+ "futures-util",
+ "rand 0.8.5",
+ "serde_json",
+ "solana-client",
+ "solana-ledger",
+ "solana-logger",
+ "solana-measure",
+ "solana-merkle-tree",
+ "solana-perf",
+ "solana-pubsub-client",
+ "solana-rayon-threadlimit",
+ "solana-rpc",
+ "solana-rpc-client",
+ "solana-rpc-client-api",
+ "solana-runtime",
+ "solana-sdk",
+ "solana-streamer",
+ "solana-test-validator",
+ "solana-transaction-status",
+ "solana-version",
+ "systemstat",
+ "tokio",
+ "tungstenite",
+]
+
 [[package]]
 name = "solana-compute-budget"
 version = "2.1.0"
 dependencies = [
+ "rustc_version",
+ "solana-frozen-abi",
  "solana-sdk",
 ]
 
@@ -4863,6 +6158,7 @@ dependencies = [
  "serde",
  "serde_derive",
  "solana-log-collector",
+ "solana-logger",
  "solana-program-runtime",
  "solana-sdk",
  "solana-short-vec",
@@ -4877,11 +6173,15 @@ dependencies = [
  "crossbeam-channel",
  "futures-util",
  "indexmap 2.5.0",
+ "indicatif",
  "log",
  "rand 0.8.5",
+ "rand_chacha 0.3.1",
  "rayon",
+ "solana-logger",
  "solana-measure",
  "solana-metrics",
+ "solana-net-utils",
  "solana-sdk",
  "thiserror",
  "tokio",
@@ -4894,6 +6194,7 @@ dependencies = [
  "ahash 0.8.10",
  "anyhow",
  "arrayvec",
+ "assert_matches",
  "base64 0.22.1",
  "bincode",
  "bs58",
@@ -4902,6 +6203,7 @@ dependencies = [
  "crossbeam-channel",
  "dashmap",
  "etcd-client",
+ "fs_extra",
  "futures 0.3.30",
  "histogram",
  "itertools 0.12.1",
@@ -4917,27 +6219,35 @@ dependencies = [
  "rand_chacha 0.3.1",
  "rayon",
  "rolling-file",
- "rustls",
+ "rustc_version",
+ "rustls 0.23.12",
  "serde",
  "serde_bytes",
  "serde_derive",
+ "serde_json",
+ "serial_test",
  "solana-accounts-db",
  "solana-bloom",
  "solana-builtins-default-costs",
  "solana-client",
  "solana-compute-budget",
  "solana-connection-cache",
+ "solana-core",
  "solana-cost-model",
  "solana-entry",
  "solana-fee",
+ "solana-frozen-abi",
+ "solana-frozen-abi-macro",
  "solana-geyser-plugin-manager",
  "solana-gossip",
  "solana-ledger",
+ "solana-logger",
  "solana-measure",
  "solana-metrics",
  "solana-net-utils",
  "solana-perf",
  "solana-poh",
+ "solana-program-runtime",
  "solana-quic-client",
  "solana-rayon-threadlimit",
  "solana-rpc",
@@ -4948,6 +6258,7 @@ dependencies = [
  "solana-sdk",
  "solana-send-transaction-service",
  "solana-short-vec",
+ "solana-stake-program",
  "solana-streamer",
  "solana-svm",
  "solana-svm-transaction",
@@ -4960,11 +6271,14 @@ dependencies = [
  "solana-vote",
  "solana-vote-program",
  "solana-wen-restart",
+ "static_assertions",
  "strum",
  "strum_macros",
  "sys-info",
  "sysctl",
+ "systemstat",
  "tempfile",
+ "test-case",
  "thiserror",
  "tokio",
  "trees",
@@ -4975,15 +6289,24 @@ name = "solana-cost-model"
 version = "2.1.0"
 dependencies = [
  "ahash 0.8.10",
+ "itertools 0.12.1",
  "lazy_static",
  "log",
+ "rand 0.8.5",
+ "rustc_version",
  "solana-builtins-default-costs",
  "solana-compute-budget",
+ "solana-frozen-abi",
+ "solana-frozen-abi-macro",
+ "solana-logger",
  "solana-metrics",
  "solana-runtime-transaction",
  "solana-sdk",
  "solana-svm-transaction",
+ "solana-system-program",
  "solana-vote-program",
+ "static_assertions",
+ "test-case",
 ]
 
 [[package]]
@@ -5001,6 +6324,7 @@ dependencies = [
 name = "solana-decode-error"
 version = "2.1.0"
 dependencies = [
+ "num-derive",
  "num-traits",
 ]
 
@@ -5008,6 +6332,39 @@ dependencies = [
 name = "solana-define-syscall"
 version = "2.1.0"
 
+[[package]]
+name = "solana-dos"
+version = "2.1.0"
+dependencies = [
+ "bincode",
+ "clap 3.2.25",
+ "crossbeam-channel",
+ "itertools 0.12.1",
+ "log",
+ "rand 0.8.5",
+ "serde",
+ "solana-bench-tps",
+ "solana-client",
+ "solana-connection-cache",
+ "solana-core",
+ "solana-faucet",
+ "solana-gossip",
+ "solana-local-cluster",
+ "solana-logger",
+ "solana-measure",
+ "solana-net-utils",
+ "solana-perf",
+ "solana-quic-client",
+ "solana-rpc",
+ "solana-rpc-client",
+ "solana-runtime",
+ "solana-sdk",
+ "solana-streamer",
+ "solana-tps-client",
+ "solana-tpu-client",
+ "solana-version",
+]
+
 [[package]]
 name = "solana-download-utils"
 version = "2.1.0"
@@ -5020,10 +6377,22 @@ dependencies = [
  "solana-sdk",
 ]
 
+[[package]]
+name = "solana-ed25519-program-tests"
+version = "2.1.0"
+dependencies = [
+ "assert_matches",
+ "ed25519-dalek",
+ "rand 0.8.5",
+ "solana-program-test",
+ "solana-sdk",
+]
+
 [[package]]
 name = "solana-entry"
 version = "2.1.0"
 dependencies = [
+ "assert_matches",
  "bincode",
  "crossbeam-channel",
  "dlopen2",
@@ -5032,6 +6401,7 @@ dependencies = [
  "rand 0.8.5",
  "rayon",
  "serde",
+ "solana-logger",
  "solana-measure",
  "solana-merkle-tree",
  "solana-metrics",
@@ -5045,8 +6415,8 @@ name = "solana-faucet"
 version = "2.1.0"
 dependencies = [
  "bincode",
- "byteorder 1.5.0",
- "clap",
+ "byteorder",
+ "clap 2.33.3",
  "crossbeam-channel",
  "log",
  "serde",
@@ -5070,6 +6440,64 @@ dependencies = [
  "solana-svm-transaction",
 ]
 
+[[package]]
+name = "solana-frozen-abi"
+version = "2.1.0"
+dependencies = [
+ "bitflags 2.6.0",
+ "bs58",
+ "bv",
+ "generic-array",
+ "im",
+ "log",
+ "memmap2",
+ "rustc_version",
+ "serde",
+ "serde_bytes",
+ "serde_derive",
+ "sha2 0.10.8",
+ "solana-frozen-abi-macro",
+ "solana-logger",
+ "thiserror",
+]
+
+[[package]]
+name = "solana-frozen-abi-macro"
+version = "2.1.0"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "rustc_version",
+ "syn 2.0.58",
+]
+
+[[package]]
+name = "solana-genesis"
+version = "2.1.0"
+dependencies = [
+ "base64 0.22.1",
+ "bincode",
+ "clap 2.33.3",
+ "itertools 0.12.1",
+ "serde",
+ "serde_json",
+ "serde_yaml 0.9.34+deprecated",
+ "solana-accounts-db",
+ "solana-clap-utils",
+ "solana-cli-config",
+ "solana-entry",
+ "solana-ledger",
+ "solana-logger",
+ "solana-rpc-client",
+ "solana-rpc-client-api",
+ "solana-runtime",
+ "solana-sdk",
+ "solana-stake-program",
+ "solana-version",
+ "solana-vote-program",
+ "tempfile",
+]
+
 [[package]]
 name = "solana-genesis-utils"
 version = "2.1.0"
@@ -5113,7 +6541,7 @@ dependencies = [
  "assert_matches",
  "bincode",
  "bv",
- "clap",
+ "clap 2.33.3",
  "crossbeam-channel",
  "flate2",
  "indexmap 2.5.0",
@@ -5121,17 +6549,22 @@ dependencies = [
  "log",
  "lru",
  "num-traits",
+ "num_cpus",
  "rand 0.8.5",
  "rand_chacha 0.3.1",
  "rayon",
+ "rustc_version",
  "serde",
  "serde_bytes",
  "serde_derive",
+ "serial_test",
  "solana-bloom",
  "solana-clap-utils",
  "solana-client",
  "solana-connection-cache",
  "solana-entry",
+ "solana-frozen-abi",
+ "solana-frozen-abi-macro",
  "solana-ledger",
  "solana-logger",
  "solana-measure",
@@ -5150,6 +6583,7 @@ dependencies = [
  "solana-vote",
  "solana-vote-program",
  "static_assertions",
+ "test-case",
  "thiserror",
 ]
 
@@ -5161,6 +6595,23 @@ dependencies = [
  "solana-program",
 ]
 
+[[package]]
+name = "solana-keygen"
+version = "2.1.0"
+dependencies = [
+ "bs58",
+ "clap 3.2.25",
+ "dirs-next",
+ "num_cpus",
+ "solana-clap-v3-utils",
+ "solana-cli-config",
+ "solana-remote-wallet",
+ "solana-sdk",
+ "solana-version",
+ "tempfile",
+ "tiny-bip39",
+]
+
 [[package]]
 name = "solana-lattice-hash"
 version = "2.1.0"
@@ -5168,6 +6619,9 @@ dependencies = [
  "base64 0.22.1",
  "blake3",
  "bytemuck",
+ "criterion",
+ "rand 0.8.5",
+ "rand_chacha 0.3.1",
 ]
 
 [[package]]
@@ -5177,7 +6631,8 @@ dependencies = [
  "assert_matches",
  "bincode",
  "bitflags 2.6.0",
- "byteorder 1.5.0",
+ "bs58",
+ "byteorder",
  "chrono",
  "chrono-humanize",
  "crossbeam-channel",
@@ -5201,6 +6656,7 @@ dependencies = [
  "rayon",
  "reed-solomon-erasure",
  "rocksdb",
+ "rustc_version",
  "scopeguard",
  "serde",
  "serde_bytes",
@@ -5210,6 +6666,9 @@ dependencies = [
  "solana-bpf-loader-program",
  "solana-cost-model",
  "solana-entry",
+ "solana-frozen-abi",
+ "solana-frozen-abi-macro",
+ "solana-logger",
  "solana-measure",
  "solana-metrics",
  "solana-perf",
@@ -5225,12 +6684,14 @@ dependencies = [
  "solana-transaction-status",
  "solana-vote",
  "solana-vote-program",
+ "spl-pod",
  "spl-token",
  "spl-token-2022",
  "static_assertions",
  "strum",
  "strum_macros",
  "tempfile",
+ "test-case",
  "thiserror",
  "tokio",
  "tokio-stream",
@@ -5241,6 +6702,7 @@ dependencies = [
 name = "solana-loader-v4-program"
 version = "2.1.0"
 dependencies = [
+ "bincode",
  "log",
  "solana-bpf-loader-program",
  "solana-compute-budget",
@@ -5253,20 +6715,74 @@ dependencies = [
 ]
 
 [[package]]
-name = "solana-log-collector"
-version = "2.1.0"
-dependencies = [
- "log",
-]
-
-[[package]]
-name = "solana-logger"
+name = "solana-local-cluster"
 version = "2.1.0"
 dependencies = [
- "env_logger",
- "lazy_static",
+ "assert_matches",
+ "crossbeam-channel",
+ "fs_extra",
+ "gag",
+ "itertools 0.12.1",
  "log",
-]
+ "rand 0.8.5",
+ "rayon",
+ "serial_test",
+ "solana-accounts-db",
+ "solana-client",
+ "solana-config-program",
+ "solana-core",
+ "solana-download-utils",
+ "solana-entry",
+ "solana-gossip",
+ "solana-ledger",
+ "solana-local-cluster",
+ "solana-logger",
+ "solana-pubsub-client",
+ "solana-quic-client",
+ "solana-rpc-client",
+ "solana-rpc-client-api",
+ "solana-runtime",
+ "solana-sdk",
+ "solana-stake-program",
+ "solana-streamer",
+ "solana-thin-client",
+ "solana-tpu-client",
+ "solana-turbine",
+ "solana-vote",
+ "solana-vote-program",
+ "static_assertions",
+ "strum",
+ "tempfile",
+ "trees",
+]
+
+[[package]]
+name = "solana-log-analyzer"
+version = "2.1.0"
+dependencies = [
+ "byte-unit",
+ "clap 3.2.25",
+ "serde",
+ "serde_json",
+ "solana-logger",
+ "solana-version",
+]
+
+[[package]]
+name = "solana-log-collector"
+version = "2.1.0"
+dependencies = [
+ "log",
+]
+
+[[package]]
+name = "solana-logger"
+version = "2.1.0"
+dependencies = [
+ "env_logger",
+ "lazy_static",
+ "log",
+]
 
 [[package]]
 name = "solana-measure"
@@ -5276,11 +6792,29 @@ dependencies = [
  "solana-sdk",
 ]
 
+[[package]]
+name = "solana-memory-management"
+version = "2.1.0"
+
+[[package]]
+name = "solana-merkle-root-bench"
+version = "2.1.0"
+dependencies = [
+ "clap 2.33.3",
+ "log",
+ "solana-accounts-db",
+ "solana-logger",
+ "solana-measure",
+ "solana-sdk",
+ "solana-version",
+]
+
 [[package]]
 name = "solana-merkle-tree"
 version = "2.1.0"
 dependencies = [
  "fast-math",
+ "hex",
  "solana-program",
 ]
 
@@ -5289,10 +6823,13 @@ name = "solana-metrics"
 version = "2.1.0"
 dependencies = [
  "crossbeam-channel",
+ "env_logger",
  "gethostname",
  "lazy_static",
  "log",
+ "rand 0.8.5",
  "reqwest",
+ "serial_test",
  "solana-sdk",
  "thiserror",
 ]
@@ -5304,11 +6841,24 @@ dependencies = [
  "solana-define-syscall",
 ]
 
+[[package]]
+name = "solana-net-shaper"
+version = "2.1.0"
+dependencies = [
+ "clap 3.2.25",
+ "rand 0.8.5",
+ "serde",
+ "serde_derive",
+ "serde_json",
+ "solana-logger",
+]
+
 [[package]]
 name = "solana-net-utils"
 version = "2.1.0"
 dependencies = [
  "bincode",
+ "clap 3.2.25",
  "crossbeam-channel",
  "log",
  "nix",
@@ -5316,7 +6866,9 @@ dependencies = [
  "serde",
  "serde_derive",
  "socket2 0.5.7",
+ "solana-logger",
  "solana-sdk",
+ "solana-version",
  "tokio",
  "url 2.5.2",
 ]
@@ -5327,11 +6879,32 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8b8a731ed60e89177c8a7ab05fe0f1511cedd3e70e773f288f9de33a9cfdc21e"
 
+[[package]]
+name = "solana-notifier"
+version = "2.1.0"
+dependencies = [
+ "log",
+ "reqwest",
+ "serde_json",
+ "solana-sdk",
+]
+
+[[package]]
+name = "solana-package-metadata-macro"
+version = "2.1.0"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.58",
+ "toml 0.8.12",
+]
+
 [[package]]
 name = "solana-perf"
 version = "2.1.0"
 dependencies = [
  "ahash 0.8.10",
+ "assert_matches",
  "bincode",
  "bv",
  "caps",
@@ -5343,31 +6916,59 @@ dependencies = [
  "log",
  "nix",
  "rand 0.8.5",
+ "rand_chacha 0.3.1",
  "rayon",
+ "rustc_version",
  "serde",
+ "solana-frozen-abi",
+ "solana-frozen-abi-macro",
+ "solana-logger",
  "solana-metrics",
  "solana-rayon-threadlimit",
  "solana-sdk",
  "solana-short-vec",
  "solana-vote-program",
+ "test-case",
 ]
 
 [[package]]
 name = "solana-poh"
 version = "2.1.0"
 dependencies = [
+ "assert_matches",
+ "bincode",
  "core_affinity",
  "crossbeam-channel",
  "log",
+ "rand 0.8.5",
  "solana-entry",
  "solana-ledger",
+ "solana-logger",
  "solana-measure",
  "solana-metrics",
+ "solana-perf",
+ "solana-poh",
  "solana-runtime",
  "solana-sdk",
  "thiserror",
 ]
 
+[[package]]
+name = "solana-poh-bench"
+version = "2.1.0"
+dependencies = [
+ "clap 3.2.25",
+ "log",
+ "rayon",
+ "solana-entry",
+ "solana-logger",
+ "solana-measure",
+ "solana-perf",
+ "solana-rayon-threadlimit",
+ "solana-sdk",
+ "solana-version",
+]
+
 [[package]]
 name = "solana-poseidon"
 version = "2.1.0"
@@ -5382,6 +6983,10 @@ dependencies = [
 name = "solana-program"
 version = "2.1.0"
 dependencies = [
+ "anyhow",
+ "arbitrary",
+ "array-bytes",
+ "assert_matches",
  "base64 0.22.1",
  "bincode",
  "bitflags 2.6.0",
@@ -5396,29 +7001,40 @@ dependencies = [
  "console_log",
  "curve25519-dalek 4.1.3",
  "getrandom 0.2.10",
+ "itertools 0.12.1",
  "js-sys",
  "lazy_static",
+ "libsecp256k1",
  "log",
  "memoffset 0.9.0",
  "num-bigint 0.4.6",
  "num-derive",
  "num-traits",
  "parking_lot 0.12.2",
+ "qualifier_attr",
  "rand 0.8.5",
+ "rustc_version",
  "serde",
  "serde_bytes",
  "serde_derive",
+ "serde_json",
+ "serial_test",
  "sha2 0.10.8",
  "sha3",
  "solana-atomic-u64",
  "solana-decode-error",
  "solana-define-syscall",
+ "solana-frozen-abi",
+ "solana-frozen-abi-macro",
+ "solana-logger",
  "solana-msg",
  "solana-program-memory",
  "solana-sanitize",
  "solana-sdk-macro",
  "solana-secp256k1-recover",
  "solana-short-vec",
+ "static_assertions",
+ "test-case",
  "thiserror",
  "wasm-bindgen",
 ]
@@ -5435,6 +7051,7 @@ dependencies = [
 name = "solana-program-runtime"
 version = "2.1.0"
 dependencies = [
+ "assert_matches",
  "base64 0.22.1",
  "bincode",
  "enum-iterator",
@@ -5445,9 +7062,13 @@ dependencies = [
  "num-traits",
  "percentage",
  "rand 0.8.5",
+ "rustc_version",
  "serde",
  "solana-compute-budget",
+ "solana-frozen-abi",
+ "solana-frozen-abi-macro",
  "solana-log-collector",
+ "solana-logger",
  "solana-measure",
  "solana-metrics",
  "solana-sdk",
@@ -5455,6 +7076,7 @@ dependencies = [
  "solana-type-overrides",
  "solana-vote",
  "solana_rbpf",
+ "test-case",
  "thiserror",
 ]
 
@@ -5482,10 +7104,12 @@ dependencies = [
  "solana-program-runtime",
  "solana-runtime",
  "solana-sdk",
+ "solana-stake-program",
  "solana-svm",
  "solana-timings",
  "solana-vote-program",
  "solana_rbpf",
+ "test-case",
  "thiserror",
  "tokio",
 ]
@@ -5494,6 +7118,7 @@ dependencies = [
 name = "solana-pubsub-client"
 version = "2.1.0"
 dependencies = [
+ "anyhow",
  "crossbeam-channel",
  "futures-util",
  "log",
@@ -5519,17 +7144,20 @@ version = "2.1.0"
 dependencies = [
  "async-mutex",
  "async-trait",
+ "crossbeam-channel",
  "futures 0.3.30",
  "itertools 0.12.1",
  "lazy_static",
  "log",
  "quinn",
  "quinn-proto",
- "rustls",
+ "rustls 0.23.12",
  "solana-connection-cache",
+ "solana-logger",
  "solana-measure",
  "solana-metrics",
  "solana-net-utils",
+ "solana-perf",
  "solana-rpc-client-api",
  "solana-sdk",
  "solana-streamer",
@@ -5549,8 +7177,10 @@ dependencies = [
 name = "solana-remote-wallet"
 version = "2.1.0"
 dependencies = [
+ "assert_matches",
  "console",
  "dialoguer",
+ "hidapi",
  "log",
  "num-derive",
  "num-traits",
@@ -5584,6 +7214,7 @@ dependencies = [
  "serde",
  "serde_derive",
  "serde_json",
+ "serial_test",
  "soketto",
  "solana-account-decoder",
  "solana-accounts-db",
@@ -5595,6 +7226,7 @@ dependencies = [
  "solana-ledger",
  "solana-measure",
  "solana-metrics",
+ "solana-net-utils",
  "solana-perf",
  "solana-poh",
  "solana-rayon-threadlimit",
@@ -5611,9 +7243,11 @@ dependencies = [
  "solana-version",
  "solana-vote",
  "solana-vote-program",
+ "spl-pod",
  "spl-token",
  "spl-token-2022",
  "stream-cancel",
+ "symlink",
  "thiserror",
  "tokio",
  "tokio-util 0.7.1",
@@ -5623,11 +7257,16 @@ dependencies = [
 name = "solana-rpc-client"
 version = "2.1.0"
 dependencies = [
+ "assert_matches",
  "async-trait",
  "base64 0.22.1",
  "bincode",
  "bs58",
+ "crossbeam-channel",
+ "futures 0.3.30",
  "indicatif",
+ "jsonrpc-core",
+ "jsonrpc-http-server",
  "log",
  "reqwest",
  "reqwest-middleware",
@@ -5651,6 +7290,7 @@ dependencies = [
  "anyhow",
  "base64 0.22.1",
  "bs58",
+ "const_format",
  "jsonrpc-core",
  "reqwest",
  "reqwest-middleware",
@@ -5670,27 +7310,66 @@ dependencies = [
 name = "solana-rpc-client-nonce-utils"
 version = "2.1.0"
 dependencies = [
+ "anyhow",
+ "clap 2.33.3",
+ "futures 0.3.30",
+ "serde_json",
+ "solana-account-decoder",
+ "solana-clap-utils",
  "solana-rpc-client",
+ "solana-rpc-client-api",
  "solana-sdk",
  "thiserror",
+ "tokio",
+]
+
+[[package]]
+name = "solana-rpc-test"
+version = "2.1.0"
+dependencies = [
+ "bincode",
+ "bs58",
+ "crossbeam-channel",
+ "futures-util",
+ "log",
+ "reqwest",
+ "serde",
+ "serde_json",
+ "solana-account-decoder",
+ "solana-client",
+ "solana-connection-cache",
+ "solana-logger",
+ "solana-pubsub-client",
+ "solana-rpc",
+ "solana-rpc-client",
+ "solana-rpc-client-api",
+ "solana-sdk",
+ "solana-streamer",
+ "solana-test-validator",
+ "solana-tpu-client",
+ "solana-transaction-status",
+ "tokio",
 ]
 
 [[package]]
 name = "solana-runtime"
 version = "2.1.0"
 dependencies = [
+ "agave-transaction-view",
  "aquamarine",
  "arrayref",
+ "assert_matches",
  "base64 0.22.1",
  "bincode",
  "blake3",
  "bv",
  "bytemuck",
- "byteorder 1.5.0",
+ "byteorder",
  "bzip2",
  "crossbeam-channel",
  "dashmap",
  "dir-diff",
+ "ed25519-dalek",
  "flate2",
  "fnv",
  "im",
@@ -5698,9 +7377,11 @@ dependencies = [
  "itertools 0.12.1",
  "lazy_static",
  "libc",
+ "libsecp256k1",
  "log",
  "lz4",
  "memmap2",
+ "memoffset 0.9.0",
  "mockall",
  "modular-bitfield",
  "num-derive",
@@ -5710,8 +7391,10 @@ dependencies = [
  "percentage",
  "qualifier_attr",
  "rand 0.8.5",
+ "rand_chacha 0.3.1",
  "rayon",
  "regex",
+ "rustc_version",
  "serde",
  "serde_derive",
  "serde_json",
@@ -5724,13 +7407,17 @@ dependencies = [
  "solana-config-program",
  "solana-cost-model",
  "solana-fee",
+ "solana-frozen-abi",
+ "solana-frozen-abi-macro",
  "solana-inline-spl",
  "solana-loader-v4-program",
+ "solana-logger",
  "solana-measure",
  "solana-metrics",
  "solana-perf",
  "solana-program-runtime",
  "solana-rayon-threadlimit",
+ "solana-runtime",
  "solana-runtime-transaction",
  "solana-sdk",
  "solana-stake-program",
@@ -5753,6 +7440,7 @@ dependencies = [
  "symlink",
  "tar",
  "tempfile",
+ "test-case",
  "thiserror",
  "zstd",
 ]
@@ -5762,9 +7450,14 @@ name = "solana-runtime-transaction"
 version = "2.1.0"
 dependencies = [
  "agave-transaction-view",
+ "bincode",
+ "criterion",
  "log",
+ "rand 0.8.5",
+ "rustc_version",
  "solana-builtins-default-costs",
  "solana-compute-budget",
+ "solana-program",
  "solana-sdk",
  "solana-svm-transaction",
  "thiserror",
@@ -5775,529 +7468,66 @@ name = "solana-sanitize"
 version = "2.1.0"
 
 [[package]]
-name = "solana-sbf-programs"
+name = "solana-sdk"
 version = "2.1.0"
 dependencies = [
- "agave-validator",
+ "anyhow",
+ "assert_matches",
  "bincode",
+ "bitflags 2.6.0",
  "borsh 1.5.1",
- "byteorder 1.5.0",
- "elf",
- "itertools 0.10.5",
+ "bs58",
+ "bytemuck",
+ "bytemuck_derive",
+ "byteorder",
+ "chrono",
+ "curve25519-dalek 4.1.3",
+ "derivation-path",
+ "digest 0.10.7",
+ "ed25519-dalek",
+ "ed25519-dalek-bip32",
+ "generic-array",
+ "getrandom 0.1.14",
+ "hex",
+ "hmac 0.12.1",
+ "itertools 0.12.1",
+ "js-sys",
+ "lazy_static",
+ "libsecp256k1",
  "log",
- "miow",
- "net2",
- "solana-account-decoder",
- "solana-accounts-db",
- "solana-bpf-loader-program",
- "solana-cli-output",
- "solana-compute-budget",
- "solana-fee",
- "solana-ledger",
- "solana-log-collector",
+ "memmap2",
+ "num-derive",
+ "num-traits",
+ "num_enum",
+ "pbkdf2 0.11.0",
+ "qstring",
+ "qualifier_attr",
+ "rand 0.7.3",
+ "rand 0.8.5",
+ "rustc_version",
+ "serde",
+ "serde_bytes",
+ "serde_derive",
+ "serde_json",
+ "serde_with",
+ "sha2 0.10.8",
+ "sha3",
+ "siphasher",
+ "solana-bn254",
+ "solana-decode-error",
+ "solana-frozen-abi",
+ "solana-frozen-abi-macro",
  "solana-logger",
- "solana-measure",
  "solana-program",
- "solana-program-runtime",
- "solana-runtime",
- "solana-runtime-transaction",
- "solana-sbf-rust-invoke-dep",
- "solana-sbf-rust-realloc-dep",
- "solana-sbf-rust-realloc-invoke-dep",
+ "solana-program-memory",
+ "solana-sanitize",
  "solana-sdk",
- "solana-svm",
- "solana-svm-transaction",
- "solana-timings",
- "solana-transaction-status",
- "solana-type-overrides",
- "solana_rbpf",
-]
-
-[[package]]
-name = "solana-sbf-rust-128bit"
-version = "2.1.0"
-dependencies = [
- "solana-program",
- "solana-sbf-rust-128bit-dep",
-]
-
-[[package]]
-name = "solana-sbf-rust-128bit-dep"
-version = "2.1.0"
-dependencies = [
- "solana-program",
-]
-
-[[package]]
-name = "solana-sbf-rust-alloc"
-version = "2.1.0"
-dependencies = [
- "solana-program",
-]
-
-[[package]]
-name = "solana-sbf-rust-alt-bn128"
-version = "2.1.0"
-dependencies = [
- "array-bytes",
- "solana-bn254",
- "solana-program",
-]
-
-[[package]]
-name = "solana-sbf-rust-alt-bn128-compression"
-version = "2.1.0"
-dependencies = [
- "array-bytes",
- "solana-bn254",
- "solana-program",
-]
-
-[[package]]
-name = "solana-sbf-rust-big-mod-exp"
-version = "2.1.0"
-dependencies = [
- "array-bytes",
- "serde",
- "serde_derive",
- "serde_json",
- "solana-program",
-]
-
-[[package]]
-name = "solana-sbf-rust-call-args"
-version = "2.1.0"
-dependencies = [
- "borsh 1.5.1",
- "solana-program",
-]
-
-[[package]]
-name = "solana-sbf-rust-call-depth"
-version = "2.1.0"
-dependencies = [
- "solana-program",
-]
-
-[[package]]
-name = "solana-sbf-rust-caller-access"
-version = "2.1.0"
-dependencies = [
- "solana-program",
-]
-
-[[package]]
-name = "solana-sbf-rust-curve25519"
-version = "2.1.0"
-dependencies = [
- "solana-curve25519",
- "solana-program",
- "solana-zk-token-sdk",
-]
-
-[[package]]
-name = "solana-sbf-rust-custom-heap"
-version = "2.1.0"
-dependencies = [
- "solana-program",
-]
-
-[[package]]
-name = "solana-sbf-rust-dep-crate"
-version = "2.1.0"
-dependencies = [
- "byteorder 1.5.0",
- "solana-program",
-]
-
-[[package]]
-name = "solana-sbf-rust-deprecated-loader"
-version = "2.1.0"
-dependencies = [
- "solana-program",
-]
-
-[[package]]
-name = "solana-sbf-rust-dup-accounts"
-version = "2.1.0"
-dependencies = [
- "solana-program",
-]
-
-[[package]]
-name = "solana-sbf-rust-error-handling"
-version = "2.1.0"
-dependencies = [
- "num-derive",
- "num-traits",
- "solana-decode-error",
- "solana-program",
- "thiserror",
-]
-
-[[package]]
-name = "solana-sbf-rust-external-spend"
-version = "2.1.0"
-dependencies = [
- "solana-program",
-]
-
-[[package]]
-name = "solana-sbf-rust-finalize"
-version = "2.1.0"
-dependencies = [
- "solana-program",
-]
-
-[[package]]
-name = "solana-sbf-rust-get-minimum-delegation"
-version = "2.1.0"
-dependencies = [
- "solana-program",
-]
-
-[[package]]
-name = "solana-sbf-rust-inner_instruction_alignment_check"
-version = "2.1.0"
-dependencies = [
- "solana-program",
-]
-
-[[package]]
-name = "solana-sbf-rust-instruction-introspection"
-version = "2.1.0"
-dependencies = [
- "solana-program",
-]
-
-[[package]]
-name = "solana-sbf-rust-invoke"
-version = "2.1.0"
-dependencies = [
- "solana-program",
- "solana-sbf-rust-invoke-dep",
- "solana-sbf-rust-invoked-dep",
- "solana-sbf-rust-realloc-dep",
-]
-
-[[package]]
-name = "solana-sbf-rust-invoke-and-error"
-version = "2.1.0"
-dependencies = [
- "solana-program",
-]
-
-[[package]]
-name = "solana-sbf-rust-invoke-and-ok"
-version = "2.1.0"
-dependencies = [
- "solana-program",
-]
-
-[[package]]
-name = "solana-sbf-rust-invoke-and-return"
-version = "2.1.0"
-dependencies = [
- "solana-program",
-]
-
-[[package]]
-name = "solana-sbf-rust-invoke-dep"
-version = "2.1.0"
-
-[[package]]
-name = "solana-sbf-rust-invoked"
-version = "2.1.0"
-dependencies = [
- "solana-program",
- "solana-sbf-rust-invoked-dep",
-]
-
-[[package]]
-name = "solana-sbf-rust-invoked-dep"
-version = "2.1.0"
-dependencies = [
- "solana-program",
-]
-
-[[package]]
-name = "solana-sbf-rust-iter"
-version = "2.1.0"
-dependencies = [
- "solana-program",
-]
-
-[[package]]
-name = "solana-sbf-rust-log-data"
-version = "2.1.0"
-dependencies = [
- "solana-program",
-]
-
-[[package]]
-name = "solana-sbf-rust-many-args"
-version = "2.1.0"
-dependencies = [
- "solana-program",
- "solana-sbf-rust-many-args-dep",
-]
-
-[[package]]
-name = "solana-sbf-rust-many-args-dep"
-version = "2.1.0"
-dependencies = [
- "solana-program",
-]
-
-[[package]]
-name = "solana-sbf-rust-mem"
-version = "2.1.0"
-dependencies = [
- "solana-program",
- "solana-sbf-rust-mem-dep",
-]
-
-[[package]]
-name = "solana-sbf-rust-mem-dep"
-version = "2.1.0"
-dependencies = [
- "solana-program",
-]
-
-[[package]]
-name = "solana-sbf-rust-membuiltins"
-version = "2.1.0"
-dependencies = [
- "solana-program",
- "solana-sbf-rust-mem-dep",
-]
-
-[[package]]
-name = "solana-sbf-rust-noop"
-version = "2.1.0"
-dependencies = [
- "solana-program",
-]
-
-[[package]]
-name = "solana-sbf-rust-panic"
-version = "2.1.0"
-dependencies = [
- "solana-program",
-]
-
-[[package]]
-name = "solana-sbf-rust-param-passing"
-version = "2.1.0"
-dependencies = [
- "solana-program",
- "solana-sbf-rust-param-passing-dep",
-]
-
-[[package]]
-name = "solana-sbf-rust-param-passing-dep"
-version = "2.1.0"
-dependencies = [
- "solana-program",
-]
-
-[[package]]
-name = "solana-sbf-rust-poseidon"
-version = "2.1.0"
-dependencies = [
- "array-bytes",
- "solana-poseidon",
- "solana-program",
-]
-
-[[package]]
-name = "solana-sbf-rust-rand"
-version = "2.1.0"
-dependencies = [
- "getrandom 0.2.10",
- "rand 0.8.5",
- "solana-program",
-]
-
-[[package]]
-name = "solana-sbf-rust-realloc"
-version = "2.1.0"
-dependencies = [
- "solana-program",
- "solana-sbf-rust-realloc-dep",
-]
-
-[[package]]
-name = "solana-sbf-rust-realloc-dep"
-version = "2.1.0"
-dependencies = [
- "solana-program",
-]
-
-[[package]]
-name = "solana-sbf-rust-realloc-invoke"
-version = "2.1.0"
-dependencies = [
- "solana-program",
- "solana-sbf-rust-realloc-dep",
- "solana-sbf-rust-realloc-invoke-dep",
-]
-
-[[package]]
-name = "solana-sbf-rust-realloc-invoke-dep"
-version = "2.1.0"
-
-[[package]]
-name = "solana-sbf-rust-remaining-compute-units"
-version = "2.1.0"
-dependencies = [
- "solana-program",
-]
-
-[[package]]
-name = "solana-sbf-rust-ro-account_modify"
-version = "2.1.0"
-dependencies = [
- "solana-program",
-]
-
-[[package]]
-name = "solana-sbf-rust-ro-modify"
-version = "2.1.0"
-dependencies = [
- "solana-program",
-]
-
-[[package]]
-name = "solana-sbf-rust-sanity"
-version = "2.1.0"
-dependencies = [
- "solana-program",
-]
-
-[[package]]
-name = "solana-sbf-rust-secp256k1-recover"
-version = "2.1.0"
-dependencies = [
- "libsecp256k1 0.7.0",
- "solana-program",
- "solana-secp256k1-recover",
-]
-
-[[package]]
-name = "solana-sbf-rust-sha"
-version = "2.1.0"
-dependencies = [
- "blake3",
- "solana-program",
-]
-
-[[package]]
-name = "solana-sbf-rust-sibling-inner-instructions"
-version = "2.1.0"
-dependencies = [
- "solana-program",
-]
-
-[[package]]
-name = "solana-sbf-rust-sibling-instructions"
-version = "2.1.0"
-dependencies = [
- "solana-program",
-]
-
-[[package]]
-name = "solana-sbf-rust-simulation"
-version = "2.1.0"
-dependencies = [
- "solana-program",
-]
-
-[[package]]
-name = "solana-sbf-rust-spoof1"
-version = "2.1.0"
-dependencies = [
- "solana-program",
-]
-
-[[package]]
-name = "solana-sbf-rust-spoof1-system"
-version = "2.1.0"
-dependencies = [
- "solana-program",
-]
-
-[[package]]
-name = "solana-sbf-rust-sysvar"
-version = "2.1.0"
-dependencies = [
- "solana-program",
-]
-
-[[package]]
-name = "solana-sbf-rust-upgradeable"
-version = "2.1.0"
-dependencies = [
- "solana-program",
-]
-
-[[package]]
-name = "solana-sbf-rust-upgraded"
-version = "2.1.0"
-dependencies = [
- "solana-program",
-]
-
-[[package]]
-name = "solana-sdk"
-version = "2.1.0"
-dependencies = [
- "bincode",
- "bitflags 2.6.0",
- "borsh 1.5.1",
- "bs58",
- "bytemuck",
- "bytemuck_derive",
- "byteorder 1.5.0",
- "chrono",
- "derivation-path",
- "digest 0.10.7",
- "ed25519-dalek",
- "ed25519-dalek-bip32",
- "generic-array",
- "getrandom 0.1.14",
- "hmac 0.12.1",
- "itertools 0.12.1",
- "js-sys",
- "lazy_static",
- "libsecp256k1 0.6.0",
- "log",
- "memmap2",
- "num-derive",
- "num-traits",
- "num_enum",
- "pbkdf2 0.11.0",
- "qstring",
- "qualifier_attr",
- "rand 0.7.3",
- "rand 0.8.5",
- "serde",
- "serde_bytes",
- "serde_derive",
- "serde_json",
- "serde_with",
- "sha2 0.10.8",
- "sha3",
- "siphasher",
- "solana-bn254",
- "solana-decode-error",
- "solana-program",
- "solana-program-memory",
- "solana-sanitize",
  "solana-sdk-macro",
  "solana-secp256k1-recover",
  "solana-short-vec",
+ "static_assertions",
  "thiserror",
+ "tiny-bip39",
  "uriparse",
  "wasm-bindgen",
 ]
@@ -6316,9 +7546,13 @@ dependencies = [
 name = "solana-secp256k1-recover"
 version = "2.1.0"
 dependencies = [
+ "anyhow",
  "borsh 1.5.1",
- "libsecp256k1 0.6.0",
+ "libsecp256k1",
+ "rustc_version",
  "solana-define-syscall",
+ "solana-frozen-abi",
+ "solana-frozen-abi-macro",
  "thiserror",
 ]
 
@@ -6336,6 +7570,7 @@ dependencies = [
  "log",
  "solana-client",
  "solana-connection-cache",
+ "solana-logger",
  "solana-measure",
  "solana-metrics",
  "solana-runtime",
@@ -6347,21 +7582,62 @@ dependencies = [
 name = "solana-short-vec"
 version = "2.1.0"
 dependencies = [
+ "assert_matches",
+ "bincode",
+ "rustc_version",
  "serde",
+ "serde_json",
+ "solana-frozen-abi",
+ "solana-frozen-abi-macro",
+]
+
+[[package]]
+name = "solana-stake-accounts"
+version = "2.1.0"
+dependencies = [
+ "clap 2.33.3",
+ "solana-clap-utils",
+ "solana-cli-config",
+ "solana-remote-wallet",
+ "solana-rpc-client",
+ "solana-rpc-client-api",
+ "solana-runtime",
+ "solana-sdk",
+ "solana-stake-program",
+ "solana-version",
 ]
 
 [[package]]
 name = "solana-stake-program"
 version = "2.1.0"
 dependencies = [
+ "assert_matches",
  "bincode",
  "log",
+ "proptest",
+ "rustc_version",
+ "solana-compute-budget",
  "solana-config-program",
  "solana-log-collector",
+ "solana-logger",
  "solana-program-runtime",
  "solana-sdk",
  "solana-type-overrides",
  "solana-vote-program",
+ "test-case",
+]
+
+[[package]]
+name = "solana-stake-program-tests"
+version = "2.1.0"
+dependencies = [
+ "assert_matches",
+ "bincode",
+ "rustc_version",
+ "solana-program-test",
+ "solana-sdk",
+ "solana-vote-program",
+ "test-case",
 ]
 
 [[package]]
@@ -6402,6 +7678,7 @@ version = "2.1.0"
 dependencies = [
  "bincode",
  "bs58",
+ "enum-iterator",
  "prost",
  "protobuf-src",
  "serde",
@@ -6415,6 +7692,7 @@ dependencies = [
 name = "solana-streamer"
 version = "2.1.0"
 dependencies = [
+ "assert_matches",
  "async-channel",
  "bytes",
  "crossbeam-channel",
@@ -6433,9 +7711,10 @@ dependencies = [
  "quinn",
  "quinn-proto",
  "rand 0.8.5",
- "rustls",
+ "rustls 0.23.12",
  "smallvec",
  "socket2 0.5.7",
+ "solana-logger",
  "solana-measure",
  "solana-metrics",
  "solana-perf",
@@ -6450,30 +7729,72 @@ dependencies = [
 name = "solana-svm"
 version = "2.1.0"
 dependencies = [
+ "assert_matches",
+ "bincode",
  "itertools 0.12.1",
+ "lazy_static",
+ "libsecp256k1",
  "log",
  "percentage",
+ "prost",
  "qualifier_attr",
+ "rand 0.8.5",
+ "rustc_version",
  "serde",
  "serde_derive",
+ "shuttle",
  "solana-bpf-loader-program",
  "solana-compute-budget",
+ "solana-compute-budget-program",
  "solana-fee",
+ "solana-frozen-abi",
+ "solana-frozen-abi-macro",
  "solana-loader-v4-program",
  "solana-log-collector",
+ "solana-logger",
  "solana-measure",
  "solana-program-runtime",
  "solana-runtime-transaction",
  "solana-sdk",
+ "solana-svm",
+ "solana-svm-conformance",
  "solana-svm-rent-collector",
  "solana-svm-transaction",
  "solana-system-program",
  "solana-timings",
  "solana-type-overrides",
  "solana-vote",
+ "test-case",
  "thiserror",
 ]
 
+[[package]]
+name = "solana-svm-conformance"
+version = "2.1.0"
+dependencies = [
+ "prost",
+ "prost-build",
+ "prost-types",
+]
+
+[[package]]
+name = "solana-svm-example-paytube"
+version = "2.1.0"
+dependencies = [
+ "solana-bpf-loader-program",
+ "solana-client",
+ "solana-compute-budget",
+ "solana-logger",
+ "solana-program-runtime",
+ "solana-sdk",
+ "solana-svm",
+ "solana-system-program",
+ "solana-test-validator",
+ "spl-associated-token-account",
+ "spl-token",
+ "termcolor",
+]
+
 [[package]]
 name = "solana-svm-rent-collector"
 version = "2.1.0"
@@ -6492,11 +7813,14 @@ dependencies = [
 name = "solana-system-program"
 version = "2.1.0"
 dependencies = [
+ "assert_matches",
  "bincode",
  "log",
  "serde",
  "serde_derive",
+ "solana-compute-budget",
  "solana-log-collector",
+ "solana-logger",
  "solana-program-runtime",
  "solana-sdk",
  "solana-type-overrides",
@@ -6540,6 +7864,7 @@ dependencies = [
  "log",
  "rayon",
  "solana-connection-cache",
+ "solana-logger",
  "solana-rpc-client",
  "solana-rpc-client-api",
  "solana-sdk",
@@ -6554,6 +7879,61 @@ dependencies = [
  "solana-sdk",
 ]
 
+[[package]]
+name = "solana-tokens"
+version = "2.1.0"
+dependencies = [
+ "assert_matches",
+ "bincode",
+ "chrono",
+ "clap 2.33.3",
+ "console",
+ "csv",
+ "ctrlc",
+ "indexmap 2.5.0",
+ "indicatif",
+ "pickledb",
+ "serde",
+ "serde_derive",
+ "solana-account-decoder",
+ "solana-clap-utils",
+ "solana-cli-config",
+ "solana-logger",
+ "solana-remote-wallet",
+ "solana-rpc-client",
+ "solana-rpc-client-api",
+ "solana-sdk",
+ "solana-streamer",
+ "solana-test-validator",
+ "solana-transaction-status",
+ "solana-version",
+ "spl-associated-token-account",
+ "spl-token",
+ "tempfile",
+ "thiserror",
+]
+
+[[package]]
+name = "solana-tps-client"
+version = "2.1.0"
+dependencies = [
+ "log",
+ "serial_test",
+ "solana-client",
+ "solana-connection-cache",
+ "solana-quic-client",
+ "solana-rpc-client",
+ "solana-rpc-client-api",
+ "solana-runtime",
+ "solana-sdk",
+ "solana-streamer",
+ "solana-test-validator",
+ "solana-tpu-client",
+ "solana-transaction-status",
+ "tempfile",
+ "thiserror",
+]
+
 [[package]]
 name = "solana-tpu-client"
 version = "2.1.0"
@@ -6565,14 +7945,41 @@ dependencies = [
  "indicatif",
  "log",
  "rayon",
- "solana-connection-cache",
+ "solana-connection-cache",
+ "solana-measure",
+ "solana-pubsub-client",
+ "solana-rpc-client",
+ "solana-rpc-client-api",
+ "solana-sdk",
+ "thiserror",
+ "tokio",
+]
+
+[[package]]
+name = "solana-transaction-dos"
+version = "2.1.0"
+dependencies = [
+ "bincode",
+ "clap 2.33.3",
+ "log",
+ "rand 0.8.5",
+ "rayon",
+ "solana-clap-utils",
+ "solana-cli",
+ "solana-client",
+ "solana-core",
+ "solana-faucet",
+ "solana-gossip",
+ "solana-local-cluster",
+ "solana-logger",
  "solana-measure",
- "solana-pubsub-client",
+ "solana-net-utils",
  "solana-rpc-client",
- "solana-rpc-client-api",
+ "solana-runtime",
  "solana-sdk",
- "thiserror",
- "tokio",
+ "solana-streamer",
+ "solana-transaction-status",
+ "solana-version",
 ]
 
 [[package]]
@@ -6618,6 +8025,7 @@ dependencies = [
 name = "solana-turbine"
 version = "2.1.0"
 dependencies = [
+ "assert_matches",
  "bincode",
  "bytes",
  "crossbeam-channel",
@@ -6630,10 +8038,11 @@ dependencies = [
  "rand 0.8.5",
  "rand_chacha 0.3.1",
  "rayon",
- "rustls",
+ "rustls 0.23.12",
  "solana-entry",
  "solana-gossip",
  "solana-ledger",
+ "solana-logger",
  "solana-measure",
  "solana-metrics",
  "solana-perf",
@@ -6646,6 +8055,7 @@ dependencies = [
  "solana-sdk",
  "solana-streamer",
  "static_assertions",
+ "test-case",
  "thiserror",
  "tokio",
 ]
@@ -6654,8 +8064,10 @@ dependencies = [
 name = "solana-type-overrides"
 version = "2.1.0"
 dependencies = [
+ "futures 0.3.30",
  "lazy_static",
  "rand 0.8.5",
+ "shuttle",
 ]
 
 [[package]]
@@ -6688,10 +8100,12 @@ dependencies = [
  "crossbeam-channel",
  "dashmap",
  "derivative",
+ "lazy_static",
  "log",
  "qualifier_attr",
  "scopeguard",
  "solana-ledger",
+ "solana-logger",
  "solana-runtime",
  "solana-sdk",
  "solana-timings",
@@ -6699,14 +8113,25 @@ dependencies = [
  "vec_extract_if_polyfill",
 ]
 
+[[package]]
+name = "solana-upload-perf"
+version = "2.1.0"
+dependencies = [
+ "serde_json",
+ "solana-metrics",
+]
+
 [[package]]
 name = "solana-version"
 version = "2.1.0"
 dependencies = [
  "log",
+ "rustc_version",
  "semver",
  "serde",
  "serde_derive",
+ "solana-frozen-abi",
+ "solana-frozen-abi-macro",
  "solana-sanitize",
  "solana-sdk",
 ]
@@ -6715,10 +8140,15 @@ dependencies = [
 name = "solana-vote"
 version = "2.1.0"
 dependencies = [
+ "bincode",
  "itertools 0.12.1",
  "log",
+ "rand 0.8.5",
+ "rustc_version",
  "serde",
  "serde_derive",
+ "solana-frozen-abi",
+ "solana-frozen-abi-macro",
  "solana-sdk",
  "thiserror",
 ]
@@ -6727,16 +8157,22 @@ dependencies = [
 name = "solana-vote-program"
 version = "2.1.0"
 dependencies = [
+ "assert_matches",
  "bincode",
  "log",
  "num-derive",
  "num-traits",
+ "rustc_version",
  "serde",
  "serde_derive",
+ "solana-frozen-abi",
+ "solana-frozen-abi-macro",
+ "solana-logger",
  "solana-metrics",
  "solana-program",
  "solana-program-runtime",
  "solana-sdk",
+ "test-case",
  "thiserror",
 ]
 
@@ -6745,20 +8181,28 @@ name = "solana-wen-restart"
 version = "2.1.0"
 dependencies = [
  "anyhow",
+ "assert_matches",
  "log",
  "prost",
  "prost-build",
  "prost-types",
  "protobuf-src",
+ "rand 0.8.5",
  "rayon",
+ "serial_test",
+ "solana-accounts-db",
  "solana-entry",
  "solana-gossip",
  "solana-ledger",
+ "solana-logger",
  "solana-program",
  "solana-runtime",
  "solana-sdk",
+ "solana-streamer",
  "solana-timings",
+ "solana-vote",
  "solana-vote-program",
+ "tempfile",
 ]
 
 [[package]]
@@ -6774,6 +8218,23 @@ dependencies = [
  "solana-zk-sdk",
 ]
 
+[[package]]
+name = "solana-zk-keygen"
+version = "2.1.0"
+dependencies = [
+ "bs58",
+ "clap 3.2.25",
+ "dirs-next",
+ "solana-clap-v3-utils",
+ "solana-remote-wallet",
+ "solana-sdk",
+ "solana-version",
+ "solana-zk-token-sdk",
+ "tempfile",
+ "thiserror",
+ "tiny-bip39",
+]
+
 [[package]]
 name = "solana-zk-sdk"
 version = "2.1.0"
@@ -6798,6 +8259,7 @@ dependencies = [
  "solana-sdk",
  "subtle",
  "thiserror",
+ "tiny-bip39",
  "zeroize",
 ]
 
@@ -6806,6 +8268,8 @@ name = "solana-zk-token-proof-program"
 version = "2.1.0"
 dependencies = [
  "bytemuck",
+ "criterion",
+ "curve25519-dalek 4.1.3",
  "num-derive",
  "num-traits",
  "solana-log-collector",
@@ -6814,6 +8278,18 @@ dependencies = [
  "solana-zk-token-sdk",
 ]
 
+[[package]]
+name = "solana-zk-token-proof-program-tests"
+version = "2.1.0"
+dependencies = [
+ "bytemuck",
+ "curve25519-dalek 4.1.3",
+ "solana-compute-budget",
+ "solana-program-test",
+ "solana-sdk",
+ "solana-zk-token-sdk",
+]
+
 [[package]]
 name = "solana-zk-token-sdk"
 version = "2.1.0"
@@ -6823,7 +8299,7 @@ dependencies = [
  "bincode",
  "bytemuck",
  "bytemuck_derive",
- "byteorder 1.5.0",
+ "byteorder",
  "curve25519-dalek 4.1.3",
  "itertools 0.12.1",
  "lazy_static",
@@ -6840,6 +8316,7 @@ dependencies = [
  "solana-sdk",
  "subtle",
  "thiserror",
+ "tiny-bip39",
  "zeroize",
 ]
 
@@ -6849,14 +8326,16 @@ version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1c1941b5ef0c3ce8f2ac5dd984d0fb1a97423c4ff2a02eec81e3913f02e2ac2b"
 dependencies = [
- "byteorder 1.5.0",
- "combine",
+ "byteorder",
+ "combine 3.8.1",
+ "gdbstub",
  "hash32",
  "libc",
  "log",
  "rand 0.8.5",
  "rustc-demangle",
  "scroll",
+ "shuttle",
  "thiserror",
  "winapi 0.3.9",
 ]
@@ -6933,6 +8412,16 @@ dependencies = [
  "thiserror",
 ]
 
+[[package]]
+name = "spl-instruction-padding"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8cdbcd2652240c5b04befd4807c2b0f9412c66b18db398ca955f236a8ff1c378"
+dependencies = [
+ "num_enum",
+ "solana-program",
+]
+
 [[package]]
 name = "spl-memo"
 version = "5.0.0"
@@ -7222,7 +8711,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "225e483f02d0ad107168dc57381a8a40c3aeea6abe47f37506931f861643cfa8"
 dependencies = [
  "bitflags 1.3.2",
- "byteorder 1.5.0",
+ "byteorder",
  "libc",
  "thiserror",
  "walkdir",
@@ -7249,6 +8738,26 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "systemstat"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a24aec24a9312c83999a28e3ef9db7e2afd5c64bf47725b758cdc1cafd5b0bd2"
+dependencies = [
+ "bytesize",
+ "lazy_static",
+ "libc",
+ "nom",
+ "time",
+ "winapi 0.3.9",
+]
+
+[[package]]
+name = "tap"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
+
 [[package]]
 name = "tar"
 version = "0.4.41"
@@ -7318,9 +8827,9 @@ dependencies = [
 
 [[package]]
 name = "termcolor"
-version = "1.1.3"
+version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755"
+checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755"
 dependencies = [
  "winapi-util",
 ]
@@ -7331,6 +8840,39 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76"
 
+[[package]]
+name = "test-case"
+version = "3.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eb2550dd13afcd286853192af8601920d959b14c401fcece38071d53bf0768a8"
+dependencies = [
+ "test-case-macros",
+]
+
+[[package]]
+name = "test-case-core"
+version = "3.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "adcb7fd841cd518e279be3d5a3eb0636409487998a4aff22f3de87b81e88384f"
+dependencies = [
+ "cfg-if 1.0.0",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.58",
+]
+
+[[package]]
+name = "test-case-macros"
+version = "3.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c89e72a01ed4c579669add59014b9a524d609c0c88c6a585ce37485879f6ffb"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.58",
+ "test-case-core",
+]
+
 [[package]]
 name = "textwrap"
 version = "0.11.0"
@@ -7340,6 +8882,12 @@ dependencies = [
  "unicode-width",
 ]
 
+[[package]]
+name = "textwrap"
+version = "0.16.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "23d434d3f8967a09480fb04132ebe0a3e088c173e6d0ee7897abbdf4eab0f8b9"
+
 [[package]]
 name = "thiserror"
 version = "1.0.63"
@@ -7360,6 +8908,12 @@ dependencies = [
  "syn 2.0.58",
 ]
 
+[[package]]
+name = "thread-scoped"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bcbb6aa301e5d3b0b5ef639c9a9c7e2f1c944f177b460c04dc24c69b1fa2bd99"
+
 [[package]]
 name = "thread_local"
 version = "1.1.8"
@@ -7433,7 +8987,7 @@ dependencies = [
  "once_cell",
  "pbkdf2 0.4.0",
  "rand 0.7.3",
- "rustc-hash",
+ "rustc-hash 1.1.0",
  "sha2 0.9.9",
  "thiserror",
  "unicode-normalization",
@@ -7441,6 +8995,16 @@ dependencies = [
  "zeroize",
 ]
 
+[[package]]
+name = "tinytemplate"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc"
+dependencies = [
+ "serde",
+ "serde_json",
+]
+
 [[package]]
 name = "tinyvec"
 version = "1.6.0"
@@ -7459,8 +9023,7 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
 [[package]]
 name = "tokio"
 version = "1.29.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "532826ff75199d5833b9d2c5fe410f29235e25704ee5f0ef599fb51c21f4a4da"
+source = "git+https://github.com/anza-xyz/solana-tokio.git?rev=7cf47705faacf7bf0e43e4131a5377b3291fce21#7cf47705faacf7bf0e43e4131a5377b3291fce21"
 dependencies = [
  "autocfg",
  "backtrace",
@@ -7489,8 +9052,7 @@ dependencies = [
 [[package]]
 name = "tokio-macros"
 version = "2.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e"
+source = "git+https://github.com/anza-xyz/solana-tokio.git?rev=7cf47705faacf7bf0e43e4131a5377b3291fce21#7cf47705faacf7bf0e43e4131a5377b3291fce21"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -7513,7 +9075,7 @@ version = "0.24.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081"
 dependencies = [
- "rustls",
+ "rustls 0.21.12",
  "tokio",
 ]
 
@@ -7552,7 +9114,7 @@ checksum = "212d5dcb2a1ce06d81107c3d0ffa3121fe974b73f068c8282cb1c32328113b6c"
 dependencies = [
  "futures-util",
  "log",
- "rustls",
+ "rustls 0.21.12",
  "tokio",
  "tokio-rustls",
  "tungstenite",
@@ -7598,11 +9160,26 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "toml"
+version = "0.8.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e9dd1545e8208b4a5af1aa9bbd0b4cf7e9ea08fabc5d0a5c67fcaafa17433aa3"
+dependencies = [
+ "serde",
+ "serde_spanned",
+ "toml_datetime",
+ "toml_edit 0.22.12",
+]
+
 [[package]]
 name = "toml_datetime"
 version = "0.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1"
+dependencies = [
+ "serde",
+]
 
 [[package]]
 name = "toml_edit"
@@ -7612,7 +9189,20 @@ checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1"
 dependencies = [
  "indexmap 2.5.0",
  "toml_datetime",
- "winnow",
+ "winnow 0.5.25",
+]
+
+[[package]]
+name = "toml_edit"
+version = "0.22.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3328d4f68a705b2a4498da1d580585d39a6510f98318a2cec3018a7ec61ddef"
+dependencies = [
+ "indexmap 2.5.0",
+ "serde",
+ "serde_spanned",
+ "toml_datetime",
+ "winnow 0.6.18",
 ]
 
 [[package]]
@@ -7636,7 +9226,7 @@ dependencies = [
  "percent-encoding 2.3.1",
  "pin-project",
  "prost",
- "rustls-pemfile",
+ "rustls-pemfile 1.0.0",
  "tokio",
  "tokio-rustls",
  "tokio-stream",
@@ -7693,11 +9283,10 @@ checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52"
 
 [[package]]
 name = "tracing"
-version = "0.1.35"
+version = "0.1.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a400e31aa60b9d44a52a8ee0343b5b18566b03a8321e0d321f695cf56e940160"
+checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
 dependencies = [
- "cfg-if 1.0.0",
  "log",
  "pin-project-lite",
  "tracing-attributes",
@@ -7767,14 +9356,14 @@ version = "0.20.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9e3dac10fd62eaf6617d3a904ae222845979aec67c615d1c842b4002c7666fb9"
 dependencies = [
- "byteorder 1.5.0",
+ "byteorder",
  "bytes",
  "data-encoding",
  "http",
  "httparse",
  "log",
  "rand 0.8.5",
- "rustls",
+ "rustls 0.21.12",
  "sha1",
  "thiserror",
  "url 2.5.2",
@@ -7794,6 +9383,12 @@ version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9"
 
+[[package]]
+name = "unarray"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eaea85b334db583fe3274d12b4cd1880032beab409c0d774be044d4480ab9a94"
+
 [[package]]
 name = "unicase"
 version = "2.6.0"
@@ -7911,6 +9506,12 @@ version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"
 
+[[package]]
+name = "utf8-width"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "86bd8d4e895da8537e5315b8254664e6b769c4ff3db18321b297a1e7004392e3"
+
 [[package]]
 name = "valuable"
 version = "0.1.0"
@@ -7947,6 +9548,15 @@ version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
 
+[[package]]
+name = "wait-timeout"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9f200f5b12eb75f8c1ed65abd4b2db8a6e1b138a20de009dacee265a2498f3f6"
+dependencies = [
+ "libc",
+]
+
 [[package]]
 name = "walkdir"
 version = "2.3.1"
@@ -8049,9 +9659,9 @@ checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484"
 
 [[package]]
 name = "web-sys"
-version = "0.3.40"
+version = "0.3.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b72fe77fd39e4bd3eaa4412fd299a0be6b3dfe9d2597e2f1c20beb968f41d17"
+checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -8063,7 +9673,7 @@ version = "0.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b291546d5d9d1eab74f069c77749f2cb8504a12caa20f0f2de93ddbf6f411888"
 dependencies = [
- "rustls-webpki",
+ "rustls-webpki 0.101.7",
 ]
 
 [[package]]
@@ -8072,6 +9682,15 @@ version = "0.25.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "14247bb57be4f377dfb94c72830b8ce8fc6beac03cf4bf7b9732eadd414123fc"
 
+[[package]]
+name = "webpki-roots"
+version = "0.26.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0bd24728e5af82c6c4ec1b66ac4844bdf8156257fccda846ec58b42cd0cdbe6a"
+dependencies = [
+ "rustls-pki-types",
+]
+
 [[package]]
 name = "which"
 version = "4.2.5"
@@ -8126,6 +9745,70 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
+[[package]]
+name = "windows"
+version = "0.58.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dd04d41d93c4992d421894c18c8b43496aa748dd4c081bac0dc93eb0489272b6"
+dependencies = [
+ "windows-core",
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-core"
+version = "0.58.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ba6d44ec8c2591c134257ce647b7ea6b20335bf6379a27dac5f1641fcf59f99"
+dependencies = [
+ "windows-implement",
+ "windows-interface",
+ "windows-result",
+ "windows-strings",
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-implement"
+version = "0.58.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.58",
+]
+
+[[package]]
+name = "windows-interface"
+version = "0.58.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.58",
+]
+
+[[package]]
+name = "windows-result"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e"
+dependencies = [
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-strings"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10"
+dependencies = [
+ "windows-result",
+ "windows-targets 0.52.6",
+]
+
 [[package]]
 name = "windows-sys"
 version = "0.48.0"
@@ -8141,7 +9824,16 @@ version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
 dependencies = [
- "windows-targets 0.52.0",
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.59.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
+dependencies = [
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -8161,17 +9853,18 @@ dependencies = [
 
 [[package]]
 name = "windows-targets"
-version = "0.52.0"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd"
+checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
 dependencies = [
- "windows_aarch64_gnullvm 0.52.0",
- "windows_aarch64_msvc 0.52.0",
- "windows_i686_gnu 0.52.0",
- "windows_i686_msvc 0.52.0",
- "windows_x86_64_gnu 0.52.0",
- "windows_x86_64_gnullvm 0.52.0",
- "windows_x86_64_msvc 0.52.0",
+ "windows_aarch64_gnullvm 0.52.6",
+ "windows_aarch64_msvc 0.52.6",
+ "windows_i686_gnu 0.52.6",
+ "windows_i686_gnullvm",
+ "windows_i686_msvc 0.52.6",
+ "windows_x86_64_gnu 0.52.6",
+ "windows_x86_64_gnullvm 0.52.6",
+ "windows_x86_64_msvc 0.52.6",
 ]
 
 [[package]]
@@ -8182,9 +9875,9 @@ checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc"
 
 [[package]]
 name = "windows_aarch64_gnullvm"
-version = "0.52.0"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea"
+checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
 
 [[package]]
 name = "windows_aarch64_msvc"
@@ -8194,9 +9887,9 @@ checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3"
 
 [[package]]
 name = "windows_aarch64_msvc"
-version = "0.52.0"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef"
+checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
 
 [[package]]
 name = "windows_i686_gnu"
@@ -8206,9 +9899,15 @@ checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241"
 
 [[package]]
 name = "windows_i686_gnu"
-version = "0.52.0"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313"
+checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
+
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
 
 [[package]]
 name = "windows_i686_msvc"
@@ -8218,9 +9917,9 @@ checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00"
 
 [[package]]
 name = "windows_i686_msvc"
-version = "0.52.0"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a"
+checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
 
 [[package]]
 name = "windows_x86_64_gnu"
@@ -8230,9 +9929,9 @@ checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1"
 
 [[package]]
 name = "windows_x86_64_gnu"
-version = "0.52.0"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd"
+checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
@@ -8242,9 +9941,9 @@ checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
-version = "0.52.0"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e"
+checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
 
 [[package]]
 name = "windows_x86_64_msvc"
@@ -8254,9 +9953,9 @@ checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"
 
 [[package]]
 name = "windows_x86_64_msvc"
-version = "0.52.0"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04"
+checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
 [[package]]
 name = "winnow"
@@ -8267,6 +9966,15 @@ dependencies = [
  "memchr",
 ]
 
+[[package]]
+name = "winnow"
+version = "0.6.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f"
+dependencies = [
+ "memchr",
+]
+
 [[package]]
 name = "winreg"
 version = "0.50.0"
@@ -8277,6 +9985,15 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
+[[package]]
+name = "wyz"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed"
+dependencies = [
+ "tap",
+]
+
 [[package]]
 name = "x509-parser"
 version = "0.14.0"
@@ -8306,6 +10023,15 @@ dependencies = [
  "rustix",
 ]
 
+[[package]]
+name = "yaml-rust"
+version = "0.4.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85"
+dependencies = [
+ "linked-hash-map",
+]
+
 [[package]]
 name = "zerocopy"
 version = "0.7.31"
@@ -8328,9 +10054,9 @@ dependencies = [
 
 [[package]]
 name = "zeroize"
-version = "1.3.0"
+version = "1.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4756f7db3f7b5574938c3eb1c117038b8e07f95ee6718c0efad4ac21508f1efd"
+checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde"
 dependencies = [
  "zeroize_derive",
 ]
diff --git a/programs/sbf/Cargo.lock b/programs/sbf/Cargo.lock
index 73820754738288..1033acfc5220b8 100644
--- a/programs/sbf/Cargo.lock
+++ b/programs/sbf/Cargo.lock
@@ -3746,15 +3746,9 @@ dependencies = [
 
 [[package]]
 name = "quinn"
-<<<<<<< HEAD
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e4ceeeeabace7857413798eb1ffa1e9c905a9946a57d81fb69b4b71c4d8eb3ad"
-=======
 version = "0.11.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8c7c5fdde3cdae7203427dc4f0a68fe0ed09833edc525a03456b153b79828684"
->>>>>>> fc7ff6bd20 (Updated quinn to fix the stateless retry connection corruption)
 dependencies = [
  "bytes",
  "pin-project-lite",
@@ -3770,15 +3764,9 @@ dependencies = [
 
 [[package]]
 name = "quinn-proto"
-<<<<<<< HEAD
-version = "0.11.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ddf517c03a109db8100448a4be38d498df8a210a99fe0e1b9eaf39e78c640efe"
-=======
 version = "0.11.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fadfaed2cd7f389d0161bb73eeb07b7b78f8691047a6f3e73caaeae55310a4a6"
->>>>>>> fc7ff6bd20 (Updated quinn to fix the stateless retry connection corruption)
 dependencies = [
  "bytes",
  "rand 0.8.5",
@@ -4202,16 +4190,16 @@ dependencies = [
  "once_cell",
  "ring 0.17.3",
  "rustls-pki-types",
- "rustls-webpki 0.102.4",
+ "rustls-webpki 0.102.7",
  "subtle",
  "zeroize",
 ]
 
 [[package]]
 name = "rustls-native-certs"
-version = "0.7.0"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f1fb85efa936c42c6d5fc28d2629bb51e4b2f4b8a5211e297d599cc5a093792"
+checksum = "e5bfb394eeed242e909609f56089eecfe5fda225042e8b171791b9c95f5931e5"
 dependencies = [
  "openssl-probe",
  "rustls-pemfile 2.1.3",
@@ -4247,9 +4235,9 @@ checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0"
 
 [[package]]
 name = "rustls-platform-verifier"
-version = "0.3.1"
+version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5f0d26fa1ce3c790f9590868f0109289a044acb954525f933e2aa3b871c157d"
+checksum = "afbb878bdfdf63a336a5e63561b1835e7a8c91524f51621db870169eac84b490"
 dependencies = [
  "core-foundation",
  "core-foundation-sys",
@@ -4259,10 +4247,10 @@ dependencies = [
  "rustls 0.23.12",
  "rustls-native-certs",
  "rustls-platform-verifier-android",
- "rustls-webpki 0.102.4",
+ "rustls-webpki 0.102.7",
  "security-framework",
  "security-framework-sys",
- "webpki-roots 0.26.2",
+ "webpki-roots 0.26.5",
  "winapi 0.3.9",
 ]
 
@@ -4284,9 +4272,9 @@ dependencies = [
 
 [[package]]
 name = "rustls-webpki"
-version = "0.102.4"
+version = "0.102.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff448f7e92e913c4b7d4c6d8e4540a1724b319b4152b8aef6d4cf8339712b33e"
+checksum = "84678086bd54edf2b415183ed7a94d0efb049f1b646a33e22a36f3794be6ae56"
 dependencies = [
  "ring 0.17.3",
  "rustls-pki-types",
@@ -8202,9 +8190,9 @@ checksum = "14247bb57be4f377dfb94c72830b8ce8fc6beac03cf4bf7b9732eadd414123fc"
 
 [[package]]
 name = "webpki-roots"
-version = "0.26.2"
+version = "0.26.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c452ad30530b54a4d8e71952716a212b08efd0f3562baa66c29a618b07da7c3"
+checksum = "0bd24728e5af82c6c4ec1b66ac4844bdf8156257fccda846ec58b42cd0cdbe6a"
 dependencies = [
  "rustls-pki-types",
 ]